[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/files/, dev-libs/libzip/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/files/, dev-libs/libzip/

[Andreas Sturmlechner]

commit:     496ef5159327a6ec7726c0ec5ec849e16f416b7a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  2 08:34:07 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 08:39:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=496ef515

dev-libs/libzip: Security revbump for CVE-2017-14107

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../libzip/files/libzip-1.2.0-CVE-2017-12858.patch |  2 +-
 .../libzip/files/libzip-1.2.0-CVE-2017-14107.patch | 27 ++++++++++++++
 dev-libs/libzip/libzip-1.2.0-r2.ebuild             | 41 ++++++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch
index b7586e45a56..26236510fee 100644
--- a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch
+++ b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch
@@ -34,4 +34,4 @@ index a369900..e5a7cc9 100644
 -	}
  	return -1;
      }
- 
\ No newline at end of file
+ 

diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch
new file mode 100644
index 00000000000..3d1f9a0aabc
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-14107.patch
@@ -0,0 +1,27 @@
+From 9b46957ec98d85a572e9ef98301247f39338a3b5 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Tue, 29 Aug 2017 10:25:03 +0200
+Subject: [PATCH] Make eocd checks more consistent between zip and zip64 cases.
+
+---
+ lib/zip_open.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/lib/zip_open.c b/lib/zip_open.c
+index 3bd593b..9d3a4cb 100644
+--- a/lib/zip_open.c
++++ b/lib/zip_open.c
+@@ -847,7 +847,12 @@ _zip_read_eocd64(zip_source_t *src, zip_buffer_t *buffer, zip_uint64_t buf_offse
+         zip_error_set(error, ZIP_ER_SEEK, EFBIG);
+         return NULL;
+     }
+-    if ((flags & ZIP_CHECKCONS) && offset+size != eocd_offset) {
++    if (offset+size > buf_offset + eocd_offset) {
++	/* cdir spans past EOCD record */
++	zip_error_set(error, ZIP_ER_INCONS, 0);
++	return NULL;
++    }
++    if ((flags & ZIP_CHECKCONS) && offset+size != buf_offset + eocd_offset) {
+ 	zip_error_set(error, ZIP_ER_INCONS, 0);
+ 	return NULL;
+     }

diff --git a/dev-libs/libzip/libzip-1.2.0-r2.ebuild b/dev-libs/libzip/libzip-1.2.0-r2.ebuild
new file mode 100644
index 00000000000..524782f42c3
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.2.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="https://nih.at/libzip/"
+SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="static-libs"
+
+RDEPEND="
+	sys-libs/zlib
+	elibc_musl? ( sys-libs/fts-standalone )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS.md API-CHANGES THANKS )
+
+PATCHES=(
+	"${FILESDIR}/${P}-headers.patch"
+	"${FILESDIR}/${P}-fts.patch"
+	"${FILESDIR}/${P}-CVE-2017-12858.patch"
+	"${FILESDIR}/${P}-CVE-2017-14107.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	use static-libs || rm "${ED%/}"/usr/$(get_libdir)/libzip.a || die
+	find "${D}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/files/, dev-libs/libzip/

[Andreas Sturmlechner]

commit:     19c3e94aa0d6f570381cd5f57e13c0e7925077c0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 16:45:11 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 17:32:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c3e94a

dev-libs/libzip: Add missing limits.h includes

Thanks-to: Reuben Farrelly <reuben-gentoo-bugzilla <AT> reub.net>
Closes: https://bugs.gentoo.org/733326
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../libzip/files/libzip-1.7.3-missing-header.patch | 43 ++++++++++++++++++++++
 dev-libs/libzip/libzip-1.7.3.ebuild                |  2 +
 2 files changed, 45 insertions(+)

diff --git a/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch b/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch
new file mode 100644
index 00000000000..bebe3802841
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-1.7.3-missing-header.patch
@@ -0,0 +1,43 @@
+From fd89e242d16128dedef08f47d99ae56aa19b0591 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
+Date: Wed, 15 Jul 2020 12:16:16 +0200
+Subject: [PATCH] Include limits.h for INT_MAX
+
+---
+ lib/zip_crypto_openssl.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/zip_crypto_openssl.c b/lib/zip_crypto_openssl.c
+index 1cb00479..60f92758 100644
+--- a/lib/zip_crypto_openssl.c
++++ b/lib/zip_crypto_openssl.c
+@@ -38,6 +38,7 @@
+ #include "zip_crypto.h"
+ 
+ #include <openssl/rand.h>
++#include <limits.h>
+ 
+ #if OPENSSL_VERSION_NUMBER < 0x1010000fL || defined(LIBRESSL_VERSION_NUMBER)
+ #define USE_OPENSSL_1_0_API
+
+From b4a4f778806fe2c3ca9ec57c0411a8dcf462e655 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Wed, 15 Jul 2020 12:38:07 +0200
+Subject: [PATCH] Include limits.h for INT_MAX.
+
+---
+ lib/zip_crypto_mbedtls.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/zip_crypto_mbedtls.c b/lib/zip_crypto_mbedtls.c
+index c348ad2a..7063c6b6 100644
+--- a/lib/zip_crypto_mbedtls.c
++++ b/lib/zip_crypto_mbedtls.c
+@@ -41,6 +41,7 @@
+ #include <mbedtls/entropy.h>
+ #include <mbedtls/pkcs5.h>
+ 
++#include <limits.h>
+ 
+ _zip_crypto_aes_t *
+ _zip_crypto_aes_new(const zip_uint8_t *key, zip_uint16_t key_size, zip_error_t *error) {

diff --git a/dev-libs/libzip/libzip-1.7.3.ebuild b/dev-libs/libzip/libzip-1.7.3.ebuild
index 8edc5a80ac6..1f81a4ee336 100644
--- a/dev-libs/libzip/libzip-1.7.3.ebuild
+++ b/dev-libs/libzip/libzip-1.7.3.ebuild
@@ -37,6 +37,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-missing-header.patch ) # bug 733326
+
 pkg_setup() {
 	# Upstream doesn't support building dynamic & static
 	# simultaneously: https://github.com/nih-at/libzip/issues/76

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/files/, dev-libs/libzip/

[Andreas Sturmlechner]

commit:     30fc49dd8f340fdc6284fef60aab8b1a56183db3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 19:29:43 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 19:29:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30fc49dd

dev-libs/libzip: Drop 1.3.0

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/libzip/Manifest                         |  1 -
 dev-libs/libzip/files/libzip-1.2.0-fts.patch     | 11 ------
 dev-libs/libzip/files/libzip-1.2.0-headers.patch | 12 ------
 dev-libs/libzip/libzip-1.3.0.ebuild              | 48 ------------------------
 4 files changed, 72 deletions(-)

diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index b8f03031b82..713cf88635c 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,3 +1,2 @@
-DIST libzip-1.3.0.tar.xz 955876 BLAKE2B 9bb59cb34ed7e85e3161770f0eef7ed1f59fb2f7f648cd201fa5dc6c62339481ad72a71024df443c04ef0c7efe6f00838a3ac316da2ef06c0045ab69ade8f71b SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900
 DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643

diff --git a/dev-libs/libzip/files/libzip-1.2.0-fts.patch b/dev-libs/libzip/files/libzip-1.2.0-fts.patch
deleted file mode 100644
index bd9bf232c0a..00000000000
--- a/dev-libs/libzip/files/libzip-1.2.0-fts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2016-05-28 10:35:31.000000000 +0100
-+++ b/configure.ac	2017-02-25 23:34:22.309684397 +0100
-@@ -65,6 +65,8 @@
-     AC_DEFINE([HAVE___PROGNAME], [1], [Define if libc defines __progname])
- fi
- 
-+AC_SEARCH_LIBS(fts_open, fts)
-+
- AC_CACHE_CHECK([whether we are building for a Win32 host], [ac_cv_win32_host],
- 	       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#ifdef _WIN32
-  choke me

diff --git a/dev-libs/libzip/files/libzip-1.2.0-headers.patch b/dev-libs/libzip/files/libzip-1.2.0-headers.patch
deleted file mode 100644
index f1a6d5d0819..00000000000
--- a/dev-libs/libzip/files/libzip-1.2.0-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -3,8 +3,7 @@
- 
- lib_LTLIBRARIES = libzip.la
- noinst_HEADERS = zipint.h gladman-fcrypt.h
--include_HEADERS = zip.h
--nodist_libinclude_HEADERS = zipconf.h
-+include_HEADERS = zip.h zipconf.h
- 
- # also update CMakeLists.txt when changing version
- libzip_la_LDFLAGS=-no-undefined -version-info 3:0:1

diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild
deleted file mode 100644
index 14b5af8dd18..00000000000
--- a/dev-libs/libzip/libzip-1.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Library for manipulating zip archives"
-HOMEPAGE="https://nih.at/libzip/"
-SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0/5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="bzip2 static-libs"
-
-RDEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	elibc_musl? ( sys-libs/fts-standalone )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS NEWS.md API-CHANGES THANKS )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.0-headers.patch"
-	"${FILESDIR}/${PN}-1.2.0-fts.patch"
-)
-
-src_prepare() {
-	default
-
-	# fails in portage build only
-	sed -i -e "/encryption-nonrandom-aes.*.test/d" regress/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with bzip2)
-}
-
-src_install() {
-	default
-	use static-libs || rm "${ED%/}"/usr/$(get_libdir)/libzip.a || die
-	find "${D}" -name '*.la' -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/files/, dev-libs/libzip/

[Andreas Sturmlechner]

commit:     8ae28c0fa697b98cc15aace97cf1668df29b5fd7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 24 17:12:33 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 24 17:16:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ae28c0f

dev-libs/libzip: Security revbump for CVE-2017-12858

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../libzip/files/libzip-1.2.0-CVE-2017-12858.patch | 37 ++++++++++++++++++++
 dev-libs/libzip/libzip-1.2.0-r1.ebuild             | 40 ++++++++++++++++++++++
 2 files changed, 77 insertions(+)

diff --git a/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch
new file mode 100644
index 00000000000..b7586e45a56
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-1.2.0-CVE-2017-12858.patch
@@ -0,0 +1,37 @@
+From 2217022b7d1142738656d891e00b3d2d9179b796 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Mon, 14 Aug 2017 10:55:44 +0200
+Subject: [PATCH] Fix double free().
+
+Found by Brian 'geeknik' Carpenter using AFL.
+---
+ THANKS           | 1 +
+ lib/zip_dirent.c | 3 ---
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/THANKS b/THANKS
+index be0cca9..a80ee1d 100644
+--- a/THANKS
++++ b/THANKS
+@@ -12,6 +12,7 @@ BALATON Zoltan <balaton@eik.bme.hu>
+ Benjamin Gilbert <bgilbert@backtick.net>
+ Boaz Stolk <bstolk@aweta.nl>
+ Bogdan <bogiebog@gmail.com>
++Brian 'geeknik' Carpenter <geeknik@protonmail.ch>
+ Chris Nehren <cnehren+libzip@pobox.com>
+ Coverity <info@coverity.com>
+ Dane Springmeyer <dane.springmeyer@gmail.com>
+diff --git a/lib/zip_dirent.c b/lib/zip_dirent.c
+index a369900..e5a7cc9 100644
+--- a/lib/zip_dirent.c
++++ b/lib/zip_dirent.c
+@@ -579,9 +579,6 @@ _zip_dirent_read(zip_dirent_t *zde, zip_source_t *src, zip_buffer_t *buffer, boo
+     }
+ 
+     if (!_zip_dirent_process_winzip_aes(zde, error)) {
+-	if (!from_buffer) {
+-	    _zip_buffer_free(buffer);
+-	}
+ 	return -1;
+     }
+ 
\ No newline at end of file

diff --git a/dev-libs/libzip/libzip-1.2.0-r1.ebuild b/dev-libs/libzip/libzip-1.2.0-r1.ebuild
new file mode 100644
index 00000000000..61f933dcd36
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.2.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="http://www.nih.at/libzip/"
+SRC_URI="http://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="static-libs"
+
+RDEPEND="
+	sys-libs/zlib
+	elibc_musl? ( sys-libs/fts-standalone )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS.md API-CHANGES THANKS )
+
+PATCHES=(
+	"${FILESDIR}/${P}-headers.patch"
+	"${FILESDIR}/${P}-fts.patch"
+	"${FILESDIR}/${P}-CVE-2017-12858.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	use static-libs || rm "${ED%/}"/usr/$(get_libdir)/libzip.a || die
+	find "${D}" -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libzip/files/, dev-libs/libzip/

[Manuel Rüger]

commit:     9eee67b0615568e7c522f563e72616e9482d8a47
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  2 22:22:04 2016 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 22:22:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eee67b0

dev-libs/libzip: Version bump

Package-Manager: portage-2.2.27

 dev-libs/libzip/Manifest                           |  1 +
 .../libzip/files/libzip-1.1-missing-extern.patch   | 21 +++++++++++++++
 dev-libs/libzip/libzip-1.1.ebuild                  | 30 ++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 9d18e7b..5a167ef 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1 +1,2 @@
 DIST libzip-1.0.1.tar.xz 450308 SHA256 f948d597afbb471de8d528d0e35ed977de85b2f4d76fdd74abbb985550e5d840 SHA512 df51ca44e97e2644a5d6930e3c76830453579c1486d11b9529d3cef173bb5ae873ef34b0af0ea6403dd4076805371fa93975a18ce56e37aa2a52500eb279887b WHIRLPOOL 6705e5739417738d474a85e10c72718c2feaae68698d6fc71af17d2761c76acab705fcf6c8c69be165afca9230dc55c47843d9b0281abde445aad23addef1c41
+DIST libzip-1.1.tar.xz 458528 SHA256 13b0b49637f9857ab8ba7335f529e26d02aadacf2074bf0c9b28889a0fc83b24 SHA512 0a250835155eb2ed19a00718e086b3e05741c9bcf01c7c73ed6e83fd989d9fb0bddf192f69c989f75860e4e9a44490b263fd08d9b06994e534fc0374667df2f0 WHIRLPOOL 7d59cbfb32d96230ef57e4dd7e57fbef5e3d2e1a3c92044bcee876c8de855e84eb189608c0c123265cb9e47ccf4b3cf216186f27a0f6afb14c1dca3dfd4d42fc

diff --git a/dev-libs/libzip/files/libzip-1.1-missing-extern.patch b/dev-libs/libzip/files/libzip-1.1-missing-extern.patch
new file mode 100644
index 0000000..b678871
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-1.1-missing-extern.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User Thomas Klausner <tk@giga.or.at>
+# Date 1453987295 -3600
+#      Thu Jan 28 14:21:35 2016 +0100
+# Node ID 1472ec4a4519a53165a8ce66ffb5d328305509b9
+# Parent  25c609cdb41d1963cffff26338ac3b8d47072196
+Add 'extern int optopt;' for Linux and perhaps others.
+
+Reported by Remi Collet.
+
+diff -r 25c609cdb41d -r 1472ec4a4519 src/ziptool.c
+--- a/src/ziptool.c	Thu Jan 28 09:54:45 2016 +0100
++++ b/src/ziptool.c	Thu Jan 28 14:21:35 2016 +0100
+@@ -48,6 +48,7 @@
+ #ifndef HAVE_GETOPT
+ #include "getopt.h"
+ #endif
++extern int optopt;
+ 
+ #include "zip.h"
+ #include "compat.h"

diff --git a/dev-libs/libzip/libzip-1.1.ebuild b/dev-libs/libzip/libzip-1.1.ebuild
new file mode 100644
index 0000000..75c3201
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+inherit autotools-utils
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="http://www.nih.at/libzip/"
+SRC_URI="http://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="static-libs"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+"
+
+DOCS=( AUTHORS NEWS README THANKS )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.11.2-headers.patch"
+	"${FILESDIR}/${P}-missing-extern.patch"
+)