* [gentoo-commits] repo/gentoo:master commit in: net-dns/idnkit/files/, net-dns/idnkit/
@ 2018-03-01 19:08 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2018-03-01 19:08 UTC (permalink / raw
To: gentoo-commits
commit: e6c6c5139173b75e5ae4c72fa49a610c2cae01d4
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 1 19:07:31 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Mar 1 19:08:19 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6c6c513
net-dns/idnkit: Fix parallel make issue in check target.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch | 10 ++++++++++
net-dns/idnkit/idnkit-1.0-r2.ebuild | 3 ++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch b/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch
new file mode 100644
index 00000000000..3e6dcf13b15
--- /dev/null
+++ b/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch
@@ -0,0 +1,10 @@
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -296,6 +296,7 @@
+ rm -f Makefile
+
+ test check: test-localdir test-subdirs
++test-subdirs: test-localdir
+
+ @LITEONLY_TRUE@test-localdir: $(TESTLITELIB).la $(SAMPLES)
+ @LITEONLY_FALSE@test-localdir: $(TESTLIB).la $(TESTLITELIB).la $(SAMPLES)
diff --git a/net-dns/idnkit/idnkit-1.0-r2.ebuild b/net-dns/idnkit/idnkit-1.0-r2.ebuild
index 5c0878d1b46..d49a09a1fa6 100644
--- a/net-dns/idnkit/idnkit-1.0-r2.ebuild
+++ b/net-dns/idnkit/idnkit-1.0-r2.ebuild
@@ -21,7 +21,8 @@ S=${WORKDIR}/${P}-src
src_prepare() {
# Bug 263135, old broken libtool bundled
rm -f aclocal.m4 || die "rm failed"
- epatch "${FILESDIR}/${P}-autotools.patch"
+ epatch "${FILESDIR}"/${P}-autotools.patch
+ epatch "${FILESDIR}"/${P}-test-subdirs.patch
mv configure.{in,ac} || die
eautoreconf
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/idnkit/files/, net-dns/idnkit/
@ 2018-03-05 14:53 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2018-03-05 14:53 UTC (permalink / raw
To: gentoo-commits
commit: 24ead86d0301f1f3e484fbf545464bab557db341
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 4 14:19:43 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Mar 5 14:53:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24ead86d
net-dns/idnkit: Drop faulty patch.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-dns/idnkit/files/idnkit-2.3-log_h.patch | 38 -----------------------------
net-dns/idnkit/idnkit-2.3.ebuild | 3 ---
2 files changed, 41 deletions(-)
diff --git a/net-dns/idnkit/files/idnkit-2.3-log_h.patch b/net-dns/idnkit/files/idnkit-2.3-log_h.patch
deleted file mode 100644
index 975ea0b58db..00000000000
--- a/net-dns/idnkit/files/idnkit-2.3-log_h.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-net-dns/bind-tools uses idn/log.h
-
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -1,6 +1,7 @@
- nobase_include_HEADERS = \
- idn/api.h \
- idn/export.h \
-+ idn/log.h \
- idn/res.h \
- idn/resconf.h \
- idn/result.h
-@@ -22,7 +23,6 @@
- idn/langlocalmap.h \
- idn/localconverter.h \
- idn/localencoding.h \
-- idn/log.h \
- idn/logmacro.h \
- idn/lowercasemap.h \
- idn/maplist.h \
---- a/include/Makefile.in
-+++ b/include/Makefile.in
-@@ -226,6 +226,7 @@
- nobase_include_HEADERS = \
- idn/api.h \
- idn/export.h \
-+ idn/log.h \
- idn/res.h \
- idn/resconf.h \
- idn/result.h
-@@ -247,7 +248,6 @@
- idn/langlocalmap.h \
- idn/localconverter.h \
- idn/localencoding.h \
-- idn/log.h \
- idn/logmacro.h \
- idn/lowercasemap.h \
- idn/maplist.h \
diff --git a/net-dns/idnkit/idnkit-2.3.ebuild b/net-dns/idnkit/idnkit-2.3.ebuild
index 6935a925254..69306f66fb5 100644
--- a/net-dns/idnkit/idnkit-2.3.ebuild
+++ b/net-dns/idnkit/idnkit-2.3.ebuild
@@ -18,9 +18,6 @@ DEPEND="
RDEPEND="
${DEPEND}
"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3-log_h.patch
-)
src_configure() {
econf \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/idnkit/files/, net-dns/idnkit/
@ 2021-04-18 17:55 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-04-18 17:55 UTC (permalink / raw
To: gentoo-commits
commit: a4739023a6623f7ba3b820527e7ef67b4a0efcf3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 10:18:43 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 18 17:55:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4739023
net-dns/idnkit: Drop 1.0-r2
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-dns/idnkit/Manifest | 1 -
net-dns/idnkit/files/idnkit-1.0-autotools.patch | 64 ----------------------
net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch | 10 ----
net-dns/idnkit/idnkit-1.0-r2.ebuild | 42 --------------
4 files changed, 117 deletions(-)
diff --git a/net-dns/idnkit/Manifest b/net-dns/idnkit/Manifest
index 05f1c89fabb..addf7170975 100644
--- a/net-dns/idnkit/Manifest
+++ b/net-dns/idnkit/Manifest
@@ -1,2 +1 @@
-DIST idnkit-1.0-src.tar.gz 432823 BLAKE2B 4e96bed174ea704ec0eb5c6655cb65145ed808b2bf9582ec9b6dcb8606de7a006937a2f8d8fce386dbc328e074b95ca504464c1ed6d16acc7be82d9904f2c2b4 SHA512 74f2db007a1991610f62a7a060d534f724f08395a16a7d76fda0824e9017aa47ffe4e251c90d0481218b70534fcd2b32724a66223042f59c1e16c1ff39f3be19
DIST idnkit-2.3.tar.bz2 1473267 BLAKE2B efc2a93527c217b32bfd0e2546944b30d39c3fa046e17c11f2084721f966dc838bfa821c88378c0604cbeafb8d4970cf3c19122182448d5e48c2d392a42225c6 SHA512 a0cbc111d4b7d5f444c9b79ae76378fd2edf18097adca27d5ebf811e12091f609ec45d2c62a95b1e295bd1fa644bd8a38d79841f7f4e85dcd1f6a1cd5ca622e4
diff --git a/net-dns/idnkit/files/idnkit-1.0-autotools.patch b/net-dns/idnkit/files/idnkit-1.0-autotools.patch
deleted file mode 100644
index d0918bc9184..00000000000
--- a/net-dns/idnkit/files/idnkit-1.0-autotools.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/configure.in 2003-03-11 00:53:20.000000000 +0100
-+++ b/configure.in 2010-03-12 14:15:24.000000000 +0100
-@@ -629,6 +629,41 @@
- fi
- fi
-
-+AC_DEFUN(AC_FIND_SYSTEM_SHOBJ,[
-+AC_MSG_CHECKING(for $1 shared object)
-+shobj_name=$1
-+shobj_path=
-+case "$host" in
-+*-hpux*)
-+ SOEXT=sl
-+ ;;
-+*)
-+ SOEXT=so
-+ ;;
-+esac
-+for shobj_libdir in /lib /usr/lib; do
-+ if test -f $shobj_libdir/$shobj_name.$SOEXT; then
-+ shobj_path=$shobj_libdir/$shobj_name.$SOEXT
-+ else
-+ shobj_path=`ls -r $shobj_libdir/$shobj_name.$SOEXT* 2>/dev/null | head -1`
-+ if test "$shobj_path" != "" -a -f "$shobj_path"; then
-+ :
-+ else
-+ shobj_path=
-+ fi
-+ fi
-+ if test "$shobj_path" != ""; then
-+ AC_MSG_RESULT($shobj_path)
-+ shobj_pathsymbol=SOPATH_`echo $shobj_name | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-+ AC_DEFINE_UNQUOTED($shobj_pathsymbol, "$shobj_path")
-+ break
-+ fi
-+done
-+if test "$shobj_path" = ""; then
-+ AC_MSG_RESULT(no)
-+fi
-+])dnl
-+
- dnl Find system shared object paths.
- AC_FIND_SYSTEM_SHOBJ(libc)
- if test "$install_runidn" = yes ; then
---- a/lib/Makefile.in 2003-03-12 17:14:41.000000000 +0100
-+++ b/lib/Makefile.in 2010-03-12 15:54:35.000000000 +0100
-@@ -241,7 +241,7 @@
-
- install-common:
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-- $(LIBTOOL) $(INSTALL_DATA) $(LITELIB).la \
-+ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(LITELIB).la \
- $(DESTDIR)$(libdir)/$(LITELIB).la
- -[ -f $(DESTDIR)$(libdir)/$(LITELIB).a ] \
- && $(RANLIB) $(DESTDIR)$(libdir)/$(LITELIB).a
-@@ -262,7 +262,7 @@
-
- install-nolite:
- $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
-- $(LIBTOOL) $(INSTALL_DATA) $(LIB).la \
-+ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIB).la \
- $(DESTDIR)$(libdir)/$(LIB).la
- -[ -f $(DESTDIR)$(libdir)/$(LIB).a ] \
- && $(RANLIB) $(DESTDIR)$(libdir)/$(LIB).a
diff --git a/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch b/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch
deleted file mode 100644
index 3e6dcf13b15..00000000000
--- a/net-dns/idnkit/files/idnkit-1.0-test-subdirs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
-@@ -296,6 +296,7 @@
- rm -f Makefile
-
- test check: test-localdir test-subdirs
-+test-subdirs: test-localdir
-
- @LITEONLY_TRUE@test-localdir: $(TESTLITELIB).la $(SAMPLES)
- @LITEONLY_FALSE@test-localdir: $(TESTLIB).la $(TESTLITELIB).la $(SAMPLES)
diff --git a/net-dns/idnkit/idnkit-1.0-r2.ebuild b/net-dns/idnkit/idnkit-1.0-r2.ebuild
deleted file mode 100644
index 318812138e9..00000000000
--- a/net-dns/idnkit/idnkit-1.0-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools epatch
-
-DESCRIPTION="Toolkit for Internationalized Domain Names (IDN)"
-HOMEPAGE="https://www.nic.ad.jp/ja/idn/idnkit/download/"
-SRC_URI="https://www.nic.ad.jp/ja/idn/idnkit/download/sources/${P}-src.tar.gz"
-
-LICENSE="JNIC"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="virtual/libiconv"
-
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
- # Bug 263135, old broken libtool bundled
- rm -f aclocal.m4 || die "rm failed"
- epatch "${FILESDIR}"/${P}-autotools.patch
- epatch "${FILESDIR}"/${P}-test-subdirs.patch
- mv configure.{in,ac} || die
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
- if has_version dev-libs/libiconv; then
- myconf="--with-iconv"
- fi
- econf $(use_enable static-libs static) ${myconf}
-}
-
-src_install() {
- default
- use static-libs || find "${ED}" -name 'lib*.la' -delete
- dodoc ChangeLog DISTFILES NEWS README README.ja
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dns/idnkit/files/, net-dns/idnkit/
@ 2025-02-10 9:01 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-02-10 9:01 UTC (permalink / raw
To: gentoo-commits
commit: a5e6a6d51e03408edadbee16bb7e8b5cc1e8883a
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Tue Jan 21 16:34:46 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 09:00:22 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e6a6d5
net-dns/idnkit: Fix incompatible pointers
Part of modern C conversion
Bug: https://bugs.gentoo.org/919224
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/40248
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/idnkit-2.3-incompatible-pointers.patch | 29 ++++++++++++++++++++++
.../{idnkit-2.3-r1.ebuild => idnkit-2.3-r2.ebuild} | 4 ++-
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/net-dns/idnkit/files/idnkit-2.3-incompatible-pointers.patch b/net-dns/idnkit/files/idnkit-2.3-incompatible-pointers.patch
new file mode 100644
index 000000000000..130d18b2307f
--- /dev/null
+++ b/net-dns/idnkit/files/idnkit-2.3-incompatible-pointers.patch
@@ -0,0 +1,29 @@
+Fix incompatible pointers for modern C, hope that restrict qualifier
+holds in this scenario
+https://bugs.gentoo.org/919224
+--- a/lib/localconverter.c
++++ b/lib/localconverter.c
+@@ -599,12 +599,12 @@
+ inleft = 0;
+ outbuf = NULL;
+ outleft = 0;
+- iconv(ictx, (const char **)NULL, &inleft, &outbuf, &outleft);
++ iconv(ictx, NULL, &inleft, &outbuf, &outleft);
+
+ inleft = strlen(from);
+ inbuf = from;
+ outleft = tolen - 1; /* reserve space for terminating NUL */
+- sz = iconv(ictx, (const char **)&inbuf, &inleft, &to, &outleft);
++ sz = iconv(ictx, (char ** restrict)&inbuf, &inleft, &to, &outleft);
+
+ if (sz == (size_t)(-1) || inleft > 0) {
+ switch (errno) {
+@@ -630,7 +630,7 @@
+ * Append a sequence of state reset.
+ */
+ inleft = 0;
+- sz = iconv(ictx, (const char **)NULL, &inleft, &to, &outleft);
++ sz = iconv(ictx, NULL, &inleft, &to, &outleft);
+ if (sz == (size_t)(-1)) {
+ switch (errno) {
+ case EILSEQ:
diff --git a/net-dns/idnkit/idnkit-2.3-r1.ebuild b/net-dns/idnkit/idnkit-2.3-r2.ebuild
similarity index 84%
rename from net-dns/idnkit/idnkit-2.3-r1.ebuild
rename to net-dns/idnkit/idnkit-2.3-r2.ebuild
index 67dd9b43e2e0..3a20fa937d68 100644
--- a/net-dns/idnkit/idnkit-2.3-r1.ebuild
+++ b/net-dns/idnkit/idnkit-2.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -19,6 +19,8 @@ DEPEND="
dev-lang/perl
"
+PATCHES=( "${FILESDIR}"/"${P}"-incompatible-pointers.patch )
+
src_configure() {
econf $(use_enable liteonly)
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-10 9:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-05 14:53 [gentoo-commits] repo/gentoo:master commit in: net-dns/idnkit/files/, net-dns/idnkit/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2025-02-10 9:01 Sam James
2021-04-18 17:55 Andreas Sturmlechner
2018-03-01 19:08 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox