[gentoo-commits] repo/gentoo:master commit in: net-libs/udns/, net-libs/udns/files/

[gentoo-commits] repo/gentoo:master commit in: net-libs/udns/, net-libs/udns/files/

[Sam James]

commit:     358a7757b4c68cd58ed9b51de11e3bdbcf0e5780
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 04:46:15 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 04:50:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358a7757

net-libs/udns: fix build w/ clang 16

Closes: https://bugs.gentoo.org/874759
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../udns/files/udns-0.4-configure-clang16.patch    | 24 ++++++++++++++++++++++
 .../udns/{udns-0.4.ebuild => udns-0.4-r1.ebuild}   | 10 ++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/net-libs/udns/files/udns-0.4-configure-clang16.patch b/net-libs/udns/files/udns-0.4-configure-clang16.patch
new file mode 100644
index 000000000000..6b2dcda26ca0
--- /dev/null
+++ b/net-libs/udns/files/udns-0.4-configure-clang16.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/874759
+--- a/configure
++++ b/configure
+@@ -65,9 +65,9 @@ ac_prog_ranlib_v
+ 
+ ac_ign ac_yesno "for getopt()" ac_have GETOPT ac_link <<EOF
+ #include <stdio.h>
++#include <unistd.h>
+ extern int optind;
+ extern char *optarg;
+-extern int getopt(int, char **, char *);
+ int main(int argc, char **argv) {
+   getopt(argc, argv, "abc");
+   return optarg ? optind : 0;
+@@ -75,7 +75,8 @@ int main(int argc, char **argv) {
+ EOF
+ 
+ if ac_library_find_v 'socket and connect' "" "-lsocket -lnsl" <<EOF
+-int main() { socket(); connect(); return 0; }
++#include <sys/socket.h>
++int main() { socket(0, 0, 0); connect(0, 0, 0); return 0; }
+ EOF
+ then :
+ else

diff --git a/net-libs/udns/udns-0.4.ebuild b/net-libs/udns/udns-0.4-r1.ebuild
similarity index 84%
rename from net-libs/udns/udns-0.4.ebuild
rename to net-libs/udns/udns-0.4-r1.ebuild
index da981b2165e9..f8f8c3675854 100644
--- a/net-libs/udns/udns-0.4.ebuild
+++ b/net-libs/udns/udns-0.4-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+inherit edo toolchain-funcs
 
 DESCRIPTION="Async-capable DNS stub resolver library"
 HOMEPAGE="http://www.corpit.ru/mjt/udns.html"
@@ -14,9 +14,13 @@ SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="ipv6 static +tools"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4-configure-clang16.patch
+)
+
 src_configure() {
 	# Uses non-standard configure script, econf doesn't work
-	CC="$(tc-getCC)" ./configure $(use_enable ipv6) || die "Configure failed"
+	CC="$(tc-getCC)" edo ./configure $(use_enable ipv6)
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: net-libs/udns/, net-libs/udns/files/

[Andreas K. Hüttel]

commit:     36070ced4c5ae90f37ed76f1f969b2309d724479
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 21:03:13 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 21:03:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36070ced

net-libs/udns: drop 0.4-r2

Bug: https://bugs.gentoo.org/874759
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 .../udns/files/udns-0.4-configure-clang16.patch    | 24 -----------
 .../udns-0.4-configure-pton-ntop-clang16.patch     | 22 ----------
 net-libs/udns/udns-0.4-r2.ebuild                   | 47 ----------------------
 3 files changed, 93 deletions(-)

diff --git a/net-libs/udns/files/udns-0.4-configure-clang16.patch b/net-libs/udns/files/udns-0.4-configure-clang16.patch
deleted file mode 100644
index 6b2dcda26ca0..000000000000
--- a/net-libs/udns/files/udns-0.4-configure-clang16.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/874759
---- a/configure
-+++ b/configure
-@@ -65,9 +65,9 @@ ac_prog_ranlib_v
- 
- ac_ign ac_yesno "for getopt()" ac_have GETOPT ac_link <<EOF
- #include <stdio.h>
-+#include <unistd.h>
- extern int optind;
- extern char *optarg;
--extern int getopt(int, char **, char *);
- int main(int argc, char **argv) {
-   getopt(argc, argv, "abc");
-   return optarg ? optind : 0;
-@@ -75,7 +75,8 @@ int main(int argc, char **argv) {
- EOF
- 
- if ac_library_find_v 'socket and connect' "" "-lsocket -lnsl" <<EOF
--int main() { socket(); connect(); return 0; }
-+#include <sys/socket.h>
-+int main() { socket(0, 0, 0); connect(0, 0, 0); return 0; }
- EOF
- then :
- else

diff --git a/net-libs/udns/files/udns-0.4-configure-pton-ntop-clang16.patch b/net-libs/udns/files/udns-0.4-configure-pton-ntop-clang16.patch
deleted file mode 100644
index 5eb0010092a8..000000000000
--- a/net-libs/udns/files/udns-0.4-configure-pton-ntop-clang16.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Bug: https://bugs.gentoo.org/883285
-
-From e39b749619191226ccbf8730084c0d2dcadc9065 Mon Sep 17 00:00:00 2001
-From: Violet Purcell <vimproved@inventati.org>
-Date: Sat, 8 Jul 2023 18:34:11 +0000
-Subject: [PATCH] Fix detection of dns_pton and dns_ntop with clang 16
-
---- a/configure
-+++ b/configure
-@@ -94,7 +94,8 @@ int main() {
-   char buf[64];
-   long x = 0;
-   inet_pton(AF_INET, &x, buf);
--  return inet_ntop(AF_INET, &x, buf, sizeof(buf));
-+  inet_ntop(AF_INET, &x, buf, sizeof(buf));
-+  return 0;
- } 
- EOF
- 
--- 
-2.41.0
-

diff --git a/net-libs/udns/udns-0.4-r2.ebuild b/net-libs/udns/udns-0.4-r2.ebuild
deleted file mode 100644
index a963d2ac18b4..000000000000
--- a/net-libs/udns/udns-0.4-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo toolchain-funcs
-
-DESCRIPTION="Async-capable DNS stub resolver library"
-HOMEPAGE="http://www.corpit.ru/mjt/udns.html"
-SRC_URI="http://www.corpit.ru/mjt/udns/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
-IUSE="ipv6 static +tools"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4-configure-clang16.patch
-	"${FILESDIR}"/${PN}-0.4-configure-pton-ntop-clang16.patch
-)
-
-src_configure() {
-	# Uses non-standard configure script, econf doesn't work
-	CC="$(tc-getCC)" edo ./configure $(use_enable ipv6)
-}
-
-src_compile() {
-	emake $(usex tools shared sharedlib)
-}
-
-src_install() {
-	dolib.so libudns.so.0
-	dosym libudns.so.0 /usr/$(get_libdir)/libudns.so
-
-	if use tools; then
-		newbin dnsget_s dnsget
-		newbin ex-rdns_s ex-rdns
-		newbin rblcheck_s rblcheck
-	fi
-
-	doheader udns.h
-
-	doman udns.3
-	use tools && doman dnsget.1 rblcheck.1
-
-	dodoc NEWS NOTES TODO
-}