public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/iniparser/files/, dev-libs/iniparser/
@ 2015-08-10 17:06 Sebastian Pipping
  0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2015-08-10 17:06 UTC (permalink / raw
  To: gentoo-commits

commit:     bd4460074770ea6d83a310a2ebc4cb98540f3070
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 16:25:30 2015 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 17:06:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd446007

dev-libs/iniparser: 4.0 (bug #408558)

Package-Manager: portage-2.2.20

 dev-libs/iniparser/Manifest                        |  1 +
 .../iniparser/files/iniparser-4.0-cflags.patch     | 28 +++++++++
 .../iniparser/files/iniparser-4.0-soname.patch     | 35 +++++++++++
 dev-libs/iniparser/iniparser-4.0.ebuild            | 71 ++++++++++++++++++++++
 4 files changed, 135 insertions(+)

diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index c3a2be8..67f9115 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -1 +1,2 @@
 DIST iniparser-3.1.tar.gz 39097 SHA256 aedf23881b834519aea5e861b2400606d211da049cd59d3cfb4568e0d9eff5c5 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86 WHIRLPOOL 1b8e6d5c34918cf51db605a7bc81eed75b521a57b403bbf26b572506735d78f58bad250512d53cfc08959c827713c8477a877b66b900a553a9c8099757df6d89
+DIST iniparser-4.0.tar.gz 41188 SHA256 e0bbd664bb3f0d64c21ac2d67a843b1c7a3a9710e96393344d170ab8b33e92ba SHA512 86080d4e4cb85e252f9c75116d9a548a2f08f2131e269834a0d16597da4e4c5790dff8304be082f2a8dcc75d17585e9a8fad3f0f4766bff8914f6ef2b0d6fa05 WHIRLPOOL 614ddb56f0aefc69ef98cf9b7bbdfe6300d0eaee048315550a9f38cecef05aa47a198859b929a520296f4ebef03377b12c41f062c3e95d32cacca1ef1b3797af

diff --git a/dev-libs/iniparser/files/iniparser-4.0-cflags.patch b/dev-libs/iniparser/files/iniparser-4.0-cflags.patch
new file mode 100644
index 0000000..817b087
--- /dev/null
+++ b/dev-libs/iniparser/files/iniparser-4.0-cflags.patch
@@ -0,0 +1,28 @@
+From 14370f5ce94cce077c798db6611ef65cd1822df2 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 8 Aug 2015 19:04:08 +0200
+Subject: [PATCH 1/2] Respect user CFLAGS
+
+---
+ Makefile | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 78708a5..744405a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,11 +6,6 @@
+ CC      ?= gcc
+ 
+ CFLAGS  += -fPIC -Wall -Wextra -ansi -pedantic
+-ifndef DEBUG
+-CFLAGS	+= -O2
+-else
+-CFLAGS  += -g
+-endif
+ 
+ # Ar settings to build the library
+ AR	    ?= ar
+-- 
+2.5.0
+

diff --git a/dev-libs/iniparser/files/iniparser-4.0-soname.patch b/dev-libs/iniparser/files/iniparser-4.0-soname.patch
new file mode 100644
index 0000000..0536b67
--- /dev/null
+++ b/dev-libs/iniparser/files/iniparser-4.0-soname.patch
@@ -0,0 +1,35 @@
+From c3a112a89d3cbbfe0edc4fbac366a47986d6c118 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 8 Aug 2015 19:10:27 +0200
+Subject: [PATCH 2/2] Adjust soname and make target non-phony
+
+---
+ Makefile | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 744405a..323e579 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,6 +14,7 @@ ARFLAGS = rcv
+ SHLD = ${CC} ${CFLAGS}
+ LDSHFLAGS = -shared -Wl,-Bsymbolic
+ LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
++SONAME_CURRENT = 1
+ 
+ # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX)
+ # RANLIB  = ranlib
+@@ -52,8 +53,8 @@ libiniparser.a:	$(OBJS)
+ 	$(QUIET_RANLIB)$(RANLIB) $@
+ 
+ libiniparser.so:	$(OBJS)
+-	$(QUIET_LINK)$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@.0 $(OBJS) \
+-		-Wl,-soname=`basename $@`.0
++	$(QUIET_LINK)$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@ $(OBJS) \
++		-Wl,-soname=libiniparser4.so.$(SONAME_CURRENT)
+ 
+ clean:
+ 	$(RM) $(OBJS)
+-- 
+2.5.0
+

diff --git a/dev-libs/iniparser/iniparser-4.0.ebuild b/dev-libs/iniparser/iniparser-4.0.ebuild
new file mode 100644
index 0000000..5631f41
--- /dev/null
+++ b/dev-libs/iniparser/iniparser-4.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A free stand-alone ini file parsing library"
+HOMEPAGE="https://github.com/ndevilla/iniparser"
+SRC_URI="https://github.com/ndevilla/iniparser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-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 )"
+RDEPEND=""
+
+DOCS=( AUTHORS README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-soname.patch
+)
+
+_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}
+	for i in ".${current}" '' ; do
+		dosym ${base}.so.${current}.${revision}.${age} /usr/${libdir}/${base}.so${i}
+	done
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	rm -R html || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" V=1
+}
+
+src_install() {
+	newlib.a lib${PN}.a lib${PN}${SLOT}.a
+	_newlib_so_with_symlinks lib${PN}.so lib${PN}${SLOT} 1 0 0
+
+	insinto /usr/include/${PN}${SLOT}
+	doins src/*.h
+
+	if use doc; then
+		emake -C doc
+		dohtml -r html/*
+	fi
+
+	if use examples ; then
+		local examplesdir="/usr/share/doc/${PF}/examples"
+		insinto "${examplesdir}"
+		doins example/*
+		docompress -x "${examplesdir}"
+	fi
+
+	dodoc "${DOCS[@]}"
+}
+
+src_test() {
+	emake -C test CC="$(tc-getCC)" V=1
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/iniparser/files/, dev-libs/iniparser/
@ 2018-03-27 23:52 Sebastian Pipping
  0 siblings, 0 replies; 3+ messages in thread
From: Sebastian Pipping @ 2018-03-27 23:52 UTC (permalink / raw
  To: gentoo-commits

commit:     bc65b297ed53567c1b41d8709db1bc91ac475a44
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 23:31:45 2018 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 23:51:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc65b297

dev-libs/iniparser: 4.1 + EAPI 6

Bug: https://bugs.gentoo.org/647588
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-libs/iniparser/Manifest                        |  2 +-
 .../iniparser/files/iniparser-4.0-cflags.patch     | 28 -----------------
 .../iniparser/files/iniparser-4.0-soname.patch     | 35 ----------------------
 .../{iniparser-4.0.ebuild => iniparser-4.1.ebuild} | 24 +++++++--------
 4 files changed, 12 insertions(+), 77 deletions(-)

diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index 8d619ca45f3..f061f9715a2 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -1,2 +1,2 @@
 DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
-DIST iniparser-4.0.tar.gz 41188 BLAKE2B a5ed070b9a4a99f92c54d319a7068a8d49462d512be37c2ab4ff50a6fc83d936ed577884984d4c6a6eaae5ce2f67570f8a2569be88c99cfdd56d03aebe48330f SHA512 86080d4e4cb85e252f9c75116d9a548a2f08f2131e269834a0d16597da4e4c5790dff8304be082f2a8dcc75d17585e9a8fad3f0f4766bff8914f6ef2b0d6fa05
+DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968

diff --git a/dev-libs/iniparser/files/iniparser-4.0-cflags.patch b/dev-libs/iniparser/files/iniparser-4.0-cflags.patch
deleted file mode 100644
index 817b087e6d2..00000000000
--- a/dev-libs/iniparser/files/iniparser-4.0-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 14370f5ce94cce077c798db6611ef65cd1822df2 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 8 Aug 2015 19:04:08 +0200
-Subject: [PATCH 1/2] Respect user CFLAGS
-
----
- Makefile | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 78708a5..744405a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -6,11 +6,6 @@
- CC      ?= gcc
- 
- CFLAGS  += -fPIC -Wall -Wextra -ansi -pedantic
--ifndef DEBUG
--CFLAGS	+= -O2
--else
--CFLAGS  += -g
--endif
- 
- # Ar settings to build the library
- AR	    ?= ar
--- 
-2.5.0
-

diff --git a/dev-libs/iniparser/files/iniparser-4.0-soname.patch b/dev-libs/iniparser/files/iniparser-4.0-soname.patch
deleted file mode 100644
index 0536b671a5c..00000000000
--- a/dev-libs/iniparser/files/iniparser-4.0-soname.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c3a112a89d3cbbfe0edc4fbac366a47986d6c118 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 8 Aug 2015 19:10:27 +0200
-Subject: [PATCH 2/2] Adjust soname and make target non-phony
-
----
- Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 744405a..323e579 100644
---- a/Makefile
-+++ b/Makefile
-@@ -14,6 +14,7 @@ ARFLAGS = rcv
- SHLD = ${CC} ${CFLAGS}
- LDSHFLAGS = -shared -Wl,-Bsymbolic
- LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
-+SONAME_CURRENT = 1
- 
- # Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX)
- # RANLIB  = ranlib
-@@ -52,8 +53,8 @@ libiniparser.a:	$(OBJS)
- 	$(QUIET_RANLIB)$(RANLIB) $@
- 
- libiniparser.so:	$(OBJS)
--	$(QUIET_LINK)$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@.0 $(OBJS) \
--		-Wl,-soname=`basename $@`.0
-+	$(QUIET_LINK)$(SHLD) $(LDSHFLAGS) $(LDFLAGS) -o $@ $(OBJS) \
-+		-Wl,-soname=libiniparser4.so.$(SONAME_CURRENT)
- 
- clean:
- 	$(RM) $(OBJS)
--- 
-2.5.0
-

diff --git a/dev-libs/iniparser/iniparser-4.0.ebuild b/dev-libs/iniparser/iniparser-4.1.ebuild
similarity index 80%
rename from dev-libs/iniparser/iniparser-4.0.ebuild
rename to dev-libs/iniparser/iniparser-4.1.ebuild
index b051667437c..d108cf9d01b 100644
--- a/dev-libs/iniparser/iniparser-4.0.ebuild
+++ b/dev-libs/iniparser/iniparser-4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils multilib toolchain-funcs flag-o-matic
+inherit multilib toolchain-funcs flag-o-matic
 
 DESCRIPTION="A free stand-alone ini file parsing library"
 HOMEPAGE="https://github.com/ndevilla/iniparser"
@@ -19,11 +19,6 @@ RDEPEND=""
 
 DOCS=( AUTHORS README.md )
 
-PATCHES=(
-	"${FILESDIR}"/${P}-cflags.patch
-	"${FILESDIR}"/${P}-soname.patch
-)
-
 _newlib_so_with_symlinks() {
 	local source="${1}" base="${2}" current="${3}" revision="${4}" age="${5}"
 	local libdir="$(get_libdir)"
@@ -35,8 +30,8 @@ _newlib_so_with_symlinks() {
 }
 
 src_prepare() {
-	epatch "${PATCHES[@]}"
 	rm -R html || die
+	eapply_user
 }
 
 src_configure() {
@@ -44,7 +39,10 @@ src_configure() {
 }
 
 _emake() {
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 "$@"
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" V=1 \
+		SO_TARGET=lib${PN}${SLOT}.so.1 \
+		ADDITIONAL_CFLAGS= \
+		"$@"
 }
 
 src_compile() {
@@ -57,14 +55,14 @@ src_test() {
 
 src_install() {
 	use static-libs && newlib.a lib${PN}.a lib${PN}${SLOT}.a
-	_newlib_so_with_symlinks lib${PN}.so lib${PN}${SLOT} 1 0 0
+	_newlib_so_with_symlinks lib${PN}${SLOT}.so.1 lib${PN}${SLOT} 1 0 0
 
 	insinto /usr/include/${PN}${SLOT}
 	doins src/*.h
 
 	if use doc; then
 		emake -C doc
-		dohtml -r html/*
+		HTML_DOCS=html/
 	fi
 
 	if use examples ; then
@@ -74,5 +72,5 @@ src_install() {
 		docompress -x "${examplesdir}"
 	fi
 
-	dodoc "${DOCS[@]}"
+	einstalldocs
 }


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/iniparser/files/, dev-libs/iniparser/
@ 2025-03-03  0:45 Ionen Wolkens
  0 siblings, 0 replies; 3+ messages in thread
From: Ionen Wolkens @ 2025-03-03  0:45 UTC (permalink / raw
  To: gentoo-commits

commit:     1b3ff108224f86ce2692688a217ca54ebc91938a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  3 00:42:25 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Mar  3 00:44:43 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b3ff108

dev-libs/iniparser: drop 3.1-r3, 4.1-r2

Hopefully nothing needs these anymore, been quiet with 4.2.x.

wrt 3.x, most packages also depend on >=4.1 either way.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-libs/iniparser/Manifest                        |  2 -
 .../iniparser/files/iniparser-3.0-autotools.patch  | 38 --------------
 dev-libs/iniparser/files/iniparser-3.0b-cpp.patch  | 45 -----------------
 .../files/iniparser-4.0-out-of-bounds-read.patch   | 11 ----
 .../files/iniparser-4.1-CVE-null-getstring.patch   | 43 ----------------
 dev-libs/iniparser/iniparser-3.1-r3.ebuild         | 50 -------------------
 dev-libs/iniparser/iniparser-4.1-r2.ebuild         | 58 ----------------------
 7 files changed, 247 deletions(-)

diff --git a/dev-libs/iniparser/Manifest b/dev-libs/iniparser/Manifest
index 84c4c4356f6a..1360907fc22f 100644
--- a/dev-libs/iniparser/Manifest
+++ b/dev-libs/iniparser/Manifest
@@ -1,4 +1,2 @@
-DIST iniparser-3.1.tar.gz 39097 BLAKE2B 4ada36f5bb95476c06deffa7938a750bcdeb0bd5bb817b24274c1e1c588d9abbd23c3a58f3cb3b6f961912f3e12e74aadf224da4cd81863b874e4a84d11c1744 SHA512 8fd8324c5629fdc3e3eff00afb5f0832402ccc760c5b92db82aa29b340ec891419ca2c4fee3a4d4d67cf9bc51c76b095bc0c458e087c2b8e72ac36867c47ae86
-DIST iniparser-4.1.tar.gz 44732 BLAKE2B a3480dab512b41eb9635c733b76048ab089a311c2970aae5ce89d103ff6ab1923d5824a5fca3bf445ba213ecd9954018fdef2831fd98c1a43c9ae7d4fb1cb388 SHA512 a8125aaaead1f9dfde380fa1e45bae31ca2312be029f2c53b4072cb3b127d16578a95c7c0aee1e3dda5e7b8db7a865ba6dfe8a1d80eb673061b3babef744e968
 DIST iniparser-v4.2.5.tar.bz2 34574 BLAKE2B 47eeffa4f441d491c153717df5b713e56181e090509b4496e9768b7f4654970b9cc6f261f9c821afbd2769b194a5742f82d20fc46471c92577bcde5ad350f989 SHA512 db7ebab3336bf9854efc9a70784762b1917da616d4c1f5e6c2409b238dd967967c196df85f444c1d21732dc47d195ca044a93ae2b0d8d556fe150e7dd1b78d64
 DIST iniparser-v4.2.6.tar.bz2 34731 BLAKE2B ce63256b8a6640e188184f7d1d7de40690ca612938d6d06cb97d012fe40e05e647510d97221bc61fa25db47a96565b21e7fd346f370afde7d3c461f93c3e2fc0 SHA512 6a37c0bad24093c5852d232e13e1c2182ab97508be3b03a44ea5510a70884cb7ac1fa8a9e8415ece2d2a13c9b38efabc1d37d920d894a198b89cd04731f32392

diff --git a/dev-libs/iniparser/files/iniparser-3.0-autotools.patch b/dev-libs/iniparser/files/iniparser-3.0-autotools.patch
deleted file mode 100644
index 361c96a7d4fb..000000000000
--- a/dev-libs/iniparser/files/iniparser-3.0-autotools.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- /dev/null
-+++ b/Makefile.am
-@@ -0,0 +1,8 @@
-+ACLOCAL_AMFLAGS = -I config
-+
-+lib_LTLIBRARIES = libiniparser.la
-+
-+libiniparser_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
-+libiniparser_la_SOURCES = src/dictionary.c  src/iniparser.c
-+
-+include_HEADERS = src/dictionary.h  src/iniparser.h
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,24 @@
-+AC_PREREQ([2.65])
-+AC_INIT([iniparser], [3.0], [ndevilla@free.fr])
-+
-+AC_CONFIG_AUX_DIR(config)
-+AC_CONFIG_MACRO_DIR(config)
-+
-+AM_INIT_AUTOMAKE([1.8 foreign])
-+
-+SHARED_VERSION_INFO="0"
-+AC_SUBST(SHARED_VERSION_INFO)
-+
-+# Checks for programs.
-+AC_PROG_CC
-+AC_SYS_LARGEFILE
-+
-+LT_INIT
-+# Checks for header files.
-+AC_CHECK_HEADERS([ ctype.h stdio.h stdlib.h string.h ])
-+
-+# Checks for library functions.
-+AC_CHECK_FUNCS([strcmp])
-+
-+AC_CONFIG_FILES([Makefile])
-+AC_OUTPUT

diff --git a/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch b/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch
deleted file mode 100644
index b7cd17d2d226..000000000000
--- a/dev-libs/iniparser/files/iniparser-3.0b-cpp.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/src/dictionary.c
-+++ b/src/dictionary.c
-@@ -32,6 +32,9 @@
- /*---------------------------------------------------------------------------
-                             Private functions
-  ---------------------------------------------------------------------------*/
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- /* Doubles the allocated size associated to a pointer */
- /* 'size' is the current allocated size. */
-@@ -394,5 +397,10 @@
-     dictionary_del(d);
-     return 0 ;
- }
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
- /* vim: set ts=4 et sw=4 tw=75 */
---- a/src/iniparser.h
-+++ b/src/iniparser.h
-@@ -49,6 +49,10 @@
- int iniparser_getnsec(dictionary * d);
- 
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
- /*-------------------------------------------------------------------------*/
- /**
-   @brief    Get name for section n in a dictionary.
-@@ -304,4 +308,8 @@
- /*--------------------------------------------------------------------------*/
- void iniparser_freedict(dictionary * d);
- 
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif

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
deleted file mode 100644
index f6488810ac12..000000000000
--- a/dev-libs/iniparser/files/iniparser-4.0-out-of-bounds-read.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/iniparser.c
-+++ b/src/iniparser.c
-@@ -663,7 +663,7 @@
-     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') {

diff --git a/dev-libs/iniparser/files/iniparser-4.1-CVE-null-getstring.patch b/dev-libs/iniparser/files/iniparser-4.1-CVE-null-getstring.patch
deleted file mode 100644
index bf3c035fda07..000000000000
--- a/dev-libs/iniparser/files/iniparser-4.1-CVE-null-getstring.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ace9871f65d11b5d73f0b9ee8cf5d2807439442d Mon Sep 17 00:00:00 2001
-From: Antonio <antoniolrt@gmail.com>
-Date: Fri, 2 Jun 2023 15:03:10 -0300
-Subject: [PATCH] Handle null return from iniparser_getstring
-
-Fix handling of NULL returns from iniparser_getstring in
-iniparser_getboolean, iniparser_getlongint and iniparser_getdouble,
-avoiding a crash.
----
- src/iniparser.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/iniparser.c b/src/iniparser.c
-index f1d1658..dbceb20 100644
---- a/src/iniparser.c
-+++ b/src/iniparser.c
-@@ -456,7 +456,7 @@ long int iniparser_getlongint(const dictionary * d, const char * key, long int n
-     const char * str ;
- 
-     str = iniparser_getstring(d, key, INI_INVALID_KEY);
--    if (str==INI_INVALID_KEY) return notfound ;
-+    if (str==NULL || str==INI_INVALID_KEY) return notfound ;
-     return strtol(str, NULL, 0);
- }
- 
-@@ -511,7 +511,7 @@ double iniparser_getdouble(const dictionary * d, const char * key, double notfou
-     const char * str ;
- 
-     str = iniparser_getstring(d, key, INI_INVALID_KEY);
--    if (str==INI_INVALID_KEY) return notfound ;
-+    if (str==NULL || str==INI_INVALID_KEY) return notfound ;
-     return atof(str);
- }
- 
-@@ -553,7 +553,7 @@ int iniparser_getboolean(const dictionary * d, const char * key, int notfound)
-     const char * c ;
- 
-     c = iniparser_getstring(d, key, INI_INVALID_KEY);
--    if (c==INI_INVALID_KEY) return notfound ;
-+    if (c==NULL || c==INI_INVALID_KEY) return notfound ;
-     if (c[0]=='y' || c[0]=='Y' || c[0]=='1' || c[0]=='t' || c[0]=='T') {
-         ret = 1 ;
-     } else if (c[0]=='n' || c[0]=='N' || c[0]=='0' || c[0]=='f' || c[0]=='F') {

diff --git a/dev-libs/iniparser/iniparser-3.1-r3.ebuild b/dev-libs/iniparser/iniparser-3.1-r3.ebuild
deleted file mode 100644
index 00798d267bb7..000000000000
--- a/dev-libs/iniparser/iniparser-3.1-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc examples"
-# the tests are rather examples than tests, no point in running them
-RESTRICT="test"
-
-BDEPEND="doc? ( app-text/doxygen )"
-
-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
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	if use doc; then
-		emake -C doc
-		HTML_DOCS=( html/. )
-	fi
-
-	default
-
-	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-r2.ebuild b/dev-libs/iniparser/iniparser-4.1-r2.ebuild
deleted file mode 100644
index d48fac06d4e7..000000000000
--- a/dev-libs/iniparser/iniparser-4.1-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Free stand-alone ini file parsing library"
-HOMEPAGE="https://github.com/ndevilla/iniparser/"
-SRC_URI="
-	https://github.com/ndevilla/iniparser/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc examples"
-
-BDEPEND="doc? ( app-text/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CVE-null-getstring.patch
-)
-
-src_prepare() {
-	default
-
-	rm -r html || die
-}
-
-src_compile() {
-	append-lfs-flags
-	tc-export AR CC
-
-	emake V=1 ADDITIONAL_CFLAGS=
-	use doc && emake -C doc
-}
-
-src_test() {
-	emake V=1 -C test
-}
-
-src_install() {
-	dolib.so lib${PN}.so.1
-	dosym -r /usr/$(get_libdir)/lib${PN}.so{.1,}
-
-	doheader src/*.h
-
-	if use examples; then
-		docinto examples
-		dodoc -r example/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	use doc && local HTML_DOCS=( html/. )
-	einstalldocs
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-03  0:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-03  0:45 [gentoo-commits] repo/gentoo:master commit in: dev-libs/iniparser/files/, dev-libs/iniparser/ Ionen Wolkens
  -- strict thread matches above, loose matches on Subject: below --
2018-03-27 23:52 Sebastian Pipping
2015-08-10 17:06 Sebastian Pipping

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox