diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-02 14:09:07 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-02 14:09:07 +0100 |
commit | b17a3ef12038de50228bade1f05502c74e135321 (patch) | |
tree | 9026dffec53f92cba48ca9a500a4f778e6304380 /dev-libs/iniparser | |
parent | 3cf7c3ef441822c889356fd1812ebf2944a59851 (diff) |
gentoo resync : 02.09.2020
Diffstat (limited to 'dev-libs/iniparser')
-rw-r--r-- | dev-libs/iniparser/Manifest | 10 | ||||
-rw-r--r-- | dev-libs/iniparser/files/iniparser-3.0-autotools.patch | 4 | ||||
-rw-r--r-- | dev-libs/iniparser/files/iniparser-3.0b-cpp.patch | 30 | ||||
-rw-r--r-- | dev-libs/iniparser/files/iniparser-4.0-out-of-bounds-read.patch | 15 | ||||
-rw-r--r-- | dev-libs/iniparser/iniparser-3.1-r2.ebuild | 50 | ||||
-rw-r--r-- | dev-libs/iniparser/iniparser-4.1.ebuild | 33 |
6 files changed, 66 insertions, 76 deletions
diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest index 70ebef0e4acc..edbeeb0c2806 100644 --- a/dev-libs/iniparser/Manifest +++ b/dev-libs/iniparser/Manifest @@ -1,8 +1,8 @@ -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 +AUX iniparser-3.0-autotools.patch 833 BLAKE2B 6d1328b0b5c7afcf769a55d5fa03741449364343a174f466afbb6eeac3a1fd8df799f4f1f866c982c15eb9f5c32dd04b8e914e621b788c770f77a3546c66ef95 SHA512 7da9af6dd9d72148fcdc2a0cf11b1308e33ccf208448af6e7aa3cb3e1f2f34696b8098458a3903b498445dc5627e15e7ccb20347de13f7ddb8e5e999890acd21 +AUX iniparser-3.0b-cpp.patch 1032 BLAKE2B bc558d7c0263b2fef25a0cca617a717378a203f3acc95ec276c66122d5f1db99bbd510f35b07107ffc4f59fc6c853d961211be66c5999a7b8a991b00e21b2d33 SHA512 62a2514898a710293c7dabea089aa21597c47eec030eca1d0f3d8a3f7043f7811f374ef56b3b60527568b012af593e86c66f3e7c52f9ff64a000975978e88379 +AUX iniparser-4.0-out-of-bounds-read.patch 330 BLAKE2B b60d6a3a514d5e5704e2a97c67ead108150375d850d6afe6f57815e9c4b434415596c514632e0575ea1cdf0cb464d6ca12e47780db5cd237bcf38849771ee41a SHA512 f1f01120fbf740cce5749f8ee9ba2014794523bc045999f45ad28a2bd4842d1e822b65fab2feb0751cba074de956c753949fb8b188454daf129c1ba8f0b6a1d4 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-r2.ebuild 1174 BLAKE2B 34cf773316a4448856fccf1f3fab4dfbc14ba847b64dfb71e1da7350b476a1f6a6eec9c082e9d9a953aff544090aaefb623c17e3070a07924db2aec13303af36 SHA512 c472f665c77a614ed87bbd319ddc29c2305e4180388bf34c2355c20d3d2eb3e83e1f29f3ace908f5d0afc65434b26f9dea3e90e029a3fdb0dc70fb0a8ae1819c -EBUILD iniparser-4.1.ebuild 1734 BLAKE2B 72bb745a5ef7d4981b1a773d02d4b74d4a6d050f201a63ca9d1dcf64e909d5192b52db804b41bc44150db2e393c56fb6c4205520debf60a0b1b878bba4065173 SHA512 5a7fc67c611460747db3ce304ad9f79b3750f86d757838a7afea3da18e0395dc0d428058090907bcc99d90b5a6e6b174b5105127c94733e5db05c97ac65d716d +EBUILD iniparser-3.1-r2.ebuild 1282 BLAKE2B b437ffcd1d48a77053cb1c75dd387769df7c0ab03e7b63185f3a455e56c0cad54f0ecb098fc8fe3c703d32e150d15b7e58d9d6e0920554381a8f568df265d89d SHA512 8e6de570ff690a11bd91fa35473a674ef61a92686e50a18ab3d9e9934d88f010b06cef725f15a82257ddca87368b83307b68a5b27b864b3ad194fb605965060d +EBUILD iniparser-4.1.ebuild 1552 BLAKE2B 4587d192bfce6a57bea9beac7fcb4f08cdccbb7d97f9e4fe52367fd3b1f1e46e2b51d8c31527251d0f0151e70b0dbd83068e1ed32dc8ffa0d893731b4a1e29ac SHA512 dd2ebecfb0eef87f2e44fcb874dcac8e3b500738399035af24d8fa94cd1117f6c617ff9aa2fa8c2c979b5a65b9aab58092e5d4cef8cf039a7916ba7d05350a50 MISC metadata.xml 435 BLAKE2B 788d24983bfab5491f783ec20479370e6e01686d0f5a379c490a0b93d8379a3062e46b497cb911298df3d0de7f0eaaf1606e11a365e92ca5b93041dc935fc9ad SHA512 452ccec03580def2966c0eb2f50af057776387e01819e1ce5226e628204ea94554658309dfb0c54d413f95ed588f44b84133526b164ae557ad6ac7926aa51a51 diff --git a/dev-libs/iniparser/files/iniparser-3.0-autotools.patch b/dev-libs/iniparser/files/iniparser-3.0-autotools.patch index 89c7f63d29af..361c96a7d4fb 100644 --- a/dev-libs/iniparser/files/iniparser-3.0-autotools.patch +++ b/dev-libs/iniparser/files/iniparser-3.0-autotools.patch @@ -1,5 +1,5 @@ --- /dev/null -+++ Makefile.am ++++ b/Makefile.am @@ -0,0 +1,8 @@ +ACLOCAL_AMFLAGS = -I config + @@ -10,7 +10,7 @@ + +include_HEADERS = src/dictionary.h src/iniparser.h --- /dev/null -+++ configure.ac ++++ b/configure.ac @@ -0,0 +1,24 @@ +AC_PREREQ([2.65]) +AC_INIT([iniparser], [3.0], [ndevilla@free.fr]) diff --git a/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch b/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch index cb331b813093..b7cd17d2d226 100644 --- a/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch +++ b/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch @@ -1,9 +1,8 @@ -diff -ur iniparser3.0b/src/dictionary.c iniparser3.0b-patched/src/dictionary.c ---- iniparser3.0b/src/dictionary.c 2007-11-24 05:39:18.000000000 +0800 -+++ iniparser3.0b-patched/src/dictionary.c 2009-04-01 21:38:09.000000000 +0800 -@@ -38,6 +38,9 @@ +--- a/src/dictionary.c ++++ b/src/dictionary.c +@@ -32,6 +32,9 @@ /*--------------------------------------------------------------------------- - Private functions + Private functions ---------------------------------------------------------------------------*/ +#ifdef __cplusplus +extern "C" { @@ -11,9 +10,9 @@ diff -ur iniparser3.0b/src/dictionary.c iniparser3.0b-patched/src/dictionary.c /* Doubles the allocated size associated to a pointer */ /* 'size' is the current allocated size. */ -@@ -401,5 +404,10 @@ - dictionary_del(d); - return 0 ; +@@ -394,5 +397,10 @@ + dictionary_del(d); + return 0 ; } + +#ifdef __cplusplus @@ -22,12 +21,11 @@ diff -ur iniparser3.0b/src/dictionary.c iniparser3.0b-patched/src/dictionary.c + #endif /* vim: set ts=4 et sw=4 tw=75 */ -diff -ur iniparser3.0b/src/iniparser.h iniparser3.0b-patched/src/iniparser.h ---- iniparser3.0b/src/iniparser.h 2007-11-24 05:38:19.000000000 +0800 -+++ iniparser3.0b-patched/src/iniparser.h 2009-04-01 21:38:02.000000000 +0800 -@@ -41,6 +41,10 @@ - #define iniparser_getstr(d, k) iniparser_getstring(d, k, NULL) - #define iniparser_setstr iniparser_setstring +--- a/src/iniparser.h ++++ b/src/iniparser.h +@@ -49,6 +49,10 @@ + int iniparser_getnsec(dictionary * d); + +#ifdef __cplusplus +extern "C" { @@ -35,8 +33,8 @@ diff -ur iniparser3.0b/src/iniparser.h iniparser3.0b-patched/src/iniparser.h + /*-------------------------------------------------------------------------*/ /** - @brief Get number of sections in a dictionary -@@ -277,4 +281,8 @@ + @brief Get name for section n in a dictionary. +@@ -304,4 +308,8 @@ /*--------------------------------------------------------------------------*/ void iniparser_freedict(dictionary * d); 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 index 962566cd5b7f..f6488810ac12 100644 --- 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 @@ -1,17 +1,6 @@ -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) +@@ -663,7 +663,7 @@ while (fgets(line+last, ASCIILINESZ-last, in)!=NULL) { lineno++ ; len = (int)strlen(line)-1; @@ -19,4 +8,4 @@ index be37fec..fb1b549 100644 + if (len<=0) continue; /* Safety check against buffer overflows */ - if (line[len]!='\n' && !feof(in)) { + if (line[len]!='\n') { diff --git a/dev-libs/iniparser/iniparser-3.1-r2.ebuild b/dev-libs/iniparser/iniparser-3.1-r2.ebuild index 357f9b4f3b5f..5c50f4305ea2 100644 --- a/dev-libs/iniparser/iniparser-3.1-r2.ebuild +++ b/dev-libs/iniparser/iniparser-3.1-r2.ebuild @@ -1,47 +1,55 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -AUTOTOOLS_AUTORECONF=1 -inherit autotools-utils autotools-multilib +inherit autotools multilib-minimal 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="" - +IUSE="doc examples" # the tests are rather examples than tests, no point in running them RESTRICT="test" -S="${WORKDIR}/${PN}" +BDEPEND="doc? ( app-doc/doxygen )" -DOCS=( AUTHORS README ) +S="${WORKDIR}/${PN}" PATCHES=( - "${FILESDIR}/${PN}-3.0b-cpp.patch" - "${FILESDIR}/${PN}-3.0-autotools.patch" - "${FILESDIR}/${PN}-4.0-out-of-bounds-read.patch" + "${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 +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE="${S}" econf \ + --disable-static +} +multilib_src_install_all() { if use doc; then emake -C doc - dohtml -r html/* + HTML_DOCS=( html/. ) fi - if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins test/*.{c,ini,py} + einstalldocs + + if use examples; then + docinto examples + dodoc test/*.{c,ini,py} + docompress -x /usr/share/doc/${PF}/examples fi + + # no static archives + find "${ED}" -name '*.la' -delete || die } diff --git a/dev-libs/iniparser/iniparser-4.1.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild index 02c8405c8e5b..44a31f60eaa5 100644 --- a/dev-libs/iniparser/iniparser-4.1.ebuild +++ b/dev-libs/iniparser/iniparser-4.1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit multilib toolchain-funcs flag-o-matic +inherit toolchain-funcs flag-o-matic DESCRIPTION="A free stand-alone ini file parsing library" HOMEPAGE="https://github.com/ndevilla/iniparser" @@ -11,27 +11,24 @@ 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 ~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" +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" -DEPEND="doc? ( app-doc/doxygen )" -RDEPEND="" - -DOCS=( AUTHORS README.md ) +BDEPEND="doc? ( app-doc/doxygen )" _newlib_so_with_symlinks() { local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}" - local libdir="$(get_libdir)" newlib.so ${source} ${base}.so.${current}.${revision}.${age} + local i for i in ".${current}" '' ; do - dosym ${base}.so.${current}.${revision}.${age} /usr/${libdir}/${base}.so${i} + dosym ${base}.so.${current}.${revision}.${age} /usr/$(get_libdir)/${base}.so${i} done } src_prepare() { - rm -R html || die - eapply_user + default + rm -r html || die } src_configure() { @@ -54,7 +51,6 @@ src_test() { } src_install() { - use static-libs && newlib.a lib${PN}.a lib${PN}${SLOT}.a _newlib_so_with_symlinks lib${PN}${SLOT}.so.1 lib${PN}${SLOT} 1 0 0 insinto /usr/include/${PN}${SLOT} @@ -62,14 +58,13 @@ src_install() { if use doc; then emake -C doc - HTML_DOCS=html/ + HTML_DOCS=( html/. ) fi - if use examples ; then - local examplesdir="/usr/share/doc/${PF}/examples" - insinto "${examplesdir}" - doins example/* - docompress -x "${examplesdir}" + if use examples; then + docinto examples + dodoc -r example/. + docompress -x /usr/share/doc/${PF}/examples fi einstalldocs |