gentoo Easter resync : 12.04.2020

5 files changed, 76 insertions, 5 deletions

diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index 125673ddb1cd..7c0f84abd8fe 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -1,7 +1,9 @@
 AUX iniparser-3.0-autotools.patch 829 BLAKE2B 808f8f7870151286ef4e4baea4ce80df3cc1230d2d341fcbcffcdfb7aba16051edbf1cabdb64189c49f80845fc33593e2eeea1eb1bd50e131215e2be96b89777 SHA512 7cfdd1d5e2c604125ec33a4e0332b32b77452445b59244d4c13e4c1b635ebeafd5cb6dd345c22101951acd71aab7621c4a2f36b9596d449a74b469d9f812610a
 AUX iniparser-3.0b-cpp.patch 1446 BLAKE2B e538e93d01e8521b9f3726bc4d24fee827f5ae3ccae81976cdb42abef62001a6d2a7b2abd7792df4b31fac00a7f4de69d750610253579ae3a2e618b704fee18b SHA512 8eb2058e332783ae11ef5cbebec153ee1938352f111e3efe332035aa013cf6d01a917aef9a7b8f46f7bd070986e5e686e584d46dedf30276baeb8da0954631a9
+AUX iniparser-4.0-out-of-bounds-read.patch 768 BLAKE2B d1de412aa113ed5e0c7f4f91bc6a18293fa1855b8982bcb1641d3e224c3528c2c0e35398555d12b0db9f08db7c318ce39668b0f6f091db34b063910e0ed31367 SHA512 c7b28f1cf3c853a00c56fbf686adc6ae11d7b6b5d838d6624d92ef6366400ce27a54332e2d17561275db08866bb050d3a4096b8e32ec109477537c839f0808d7
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
 DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
-EBUILD iniparser-3.1-r1.ebuild 1125 BLAKE2B 27415830ee79eb081e945679f987bc010775534ecadf7779a684c6799e504d38266c2ff7e8a1609d382de6d42f8e95584b80be314eb450e4f75595ffd7664e3a SHA512 40aea5a1efdb26763ec80784fdb83dec3b48367f891f5a1c819e8b14fcdb70cd0f32fbecf01929f42169e5d990f7857735543235517add60149fe03aacf82ac8
-EBUILD iniparser-4.1.ebuild 1738 BLAKE2B 20b78bd168542b2ad574eac3c000cefe5ed9c2948285a410980a8cdc02ee8d14a46ceee8a58ba91858a35e64d647eb5a718c232814fb3c718ef728e9dc78eec6 SHA512 714cb972ed91378756de579ab7eee404bcb4965e151c5ea4c9f6c780f3b7d759e0158451456b6c3192f23c12abcbbfbab45714592a4a416f7ab005bf3363e48a
+EBUILD iniparser-3.1-r1.ebuild 1123 BLAKE2B 733d93b577ae7736bd622c77842a0f265bb4ef09e01e2c3e10783cc240d478488c25f98279a7913876d00e33e7b935b6375bc7b08401fe9d7ea06d1b70ae43e4 SHA512 3e050fa55aacc1a9f3cdd1b728ec605ade2861f89886501e5609e899ed839928c5d1ad551a85806aece2e0c41a39f30ea7c10484b0f27f4c68a48a4e85cf8c2b
+EBUILD iniparser-3.1-r2.ebuild 1183 BLAKE2B 91a6c213b27fd375517b3b85ee507e29974894d664d372a1667a1bcfbde1167e3a9d69b630c7430a90c0335e01a4bbdbbf87c014d2089a59f37eaf49c5240df5 SHA512 7aade24bf81af8834d903d623da9b3a6b1a1f16d9733287cb57817a2af19ee547abe69c05040c5dea0ae4c1ea7df92380460a9b5d0d69b366bbbdeddca7af54d
+EBUILD iniparser-4.1.ebuild 1734 BLAKE2B 72bb745a5ef7d4981b1a773d02d4b74d4a6d050f201a63ca9d1dcf64e909d5192b52db804b41bc44150db2e393c56fb6c4205520debf60a0b1b878bba4065173 SHA512 5a7fc67c611460747db3ce304ad9f79b3750f86d757838a7afea3da18e0395dc0d428058090907bcc99d90b5a6e6b174b5105127c94733e5db05c97ac65d716d
 MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51
diff --git a/dev-libs/iniparser/files/iniparser-4.0-out-of-bounds-read.patch b/dev-libs/iniparser/files/iniparser-4.0-out-of-bounds-read.patch
new file mode 100644
index 000000000000..962566cd5b7f
--- /dev/null
+++ b/dev-libs/iniparser/files/iniparser-4.0-out-of-bounds-read.patch
@@ -0,0 +1,22 @@
+From 4f870752abbb756911d7b11405d49e9769d082bd Mon Sep 17 00:00:00 2001
+From: Emmanuel Leblond <emmanuel.leblond@gmail.com>
+Date: Fri, 8 Apr 2016 22:13:36 +0200
+Subject: [PATCH] Fix #68 when reading file with only \0 char
+
+---
+ src/iniparser.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/iniparser.c b/src/iniparser.c
+index be37fec..fb1b549 100644
+--- a/src/iniparser.c
++++ b/src/iniparser.c
+@@ -678,7 +678,7 @@ dictionary * iniparser_load(const char * ininame)
+     while (fgets(line+last, ASCIILINESZ-last, in)!=NULL) {
+         lineno++ ;
+         len = (int)strlen(line)-1;
+-        if (len==0)
++        if (len<=0)
+             continue;
+         /* Safety check against buffer overflows */
+         if (line[len]!='\n' && !feof(in)) {
diff --git a/dev-libs/iniparser/iniparser-3.1-r1.ebuild b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
index ba2f2f89afba..7b22da3d5edc 100644
--- a/dev-libs/iniparser/iniparser-3.1-r1.ebuild
+++ b/dev-libs/iniparser/iniparser-3.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ndevilla.free.fr/iniparser/"
 SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )
diff --git a/dev-libs/iniparser/iniparser-3.1-r2.ebuild b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
new file mode 100644
index 000000000000..cb25e429b9da
--- /dev/null
+++ b/dev-libs/iniparser/iniparser-3.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils autotools-multilib
+
+DESCRIPTION="A free stand-alone ini file parsing library"
+HOMEPAGE="http://ndevilla.free.fr/iniparser/"
+
+SRC_URI="http://ndevilla.free.fr/iniparser/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )
+		sys-devel/libtool"
+RDEPEND=""
+
+# the tests are rather examples than tests, no point in running them
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( AUTHORS README )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0b-cpp.patch"
+	"${FILESDIR}/${PN}-3.0-autotools.patch"
+	"${FILESDIR}/${PN}-4.0-out-of-bounds-read.patch"
+)
+
+src_install() {
+	autotools-multilib_src_install
+
+	if use doc; then
+		emake -C doc
+		dohtml -r html/*
+	fi
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins test/*.{c,ini,py}
+	fi
+}
diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild
index 060ad3e13df0..02c8405c8e5b 100644
--- a/dev-libs/iniparser/iniparser-4.1.ebuild
+++ b/dev-libs/iniparser/iniparser-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"