gentoo auto-resync : 15:09:2022 - 05:12:09

4 files changed, 161 insertions, 0 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index ec62ff9ced95..2f3c8cd31aae 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index b9d21ae396f5..b431ae495e8e 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,4 +1,5 @@
 AUX ipv6calc-2.2.0-gcc-10.patch 942 BLAKE2B 2732dca8ac3e593fb51bcc09777278044b6b37fe55007963728483595bfe93eb297ca95e9f79ba01755ed377bebb85cc3475c7289a4ca765d0a2301646d7de88 SHA512 ffef37d1944ed07ba6c4645f160e041c0423f4c5affeeb75f973386e658edb3cf8d5cd34d8462c63850c4ffdb6ad54bef782261925f7dde4f8a0d42fb3f09003
+AUX ipv6calc-4.0.1-underlinking.patch 3192 BLAKE2B 033b639239598b85e10ec3e1651f976c5ee6957be8abcf6df12c69bcd8d41ac9003097cd52e5f65da03ef160291a0376cc430fd8e4c005ca87b44ce198618689 SHA512 0fbf8994c51105d25159da1bf563a134e74639eefde8d5cccd2451a93f64133e1d31b49187e5b17479c68ddb14c393ccaee799739dc92d70bfd269a71ecf3441
 DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2f745213059ed2b0f36d7a9049a7a659d0419e6f684661247c7714d3e9886fe0a6782f5dd35895c46f2583310dcd SHA512 6e9acde56e245ffae0903305659881eb763524336da285d5048b655728c7d7b031ae7b4190f01f663e3d7134defbb8987c8f47ddd75bf8c8368ec1b918ee42e3
 DIST ipv6calc-3.1.1.tar.gz 1634300 BLAKE2B 941df0c0d649cf5879e1abfde1e4c0f41fcdbe4cb945552df42b9a39ec317dda7e25c85711f103e024bc3774e46f52d3754e6e0b004b098baeac3d863d3ec38e SHA512 0cf726fec47a592168bb0715dd96c16033fe85e1c462530ef6898236cf89199fede81a9ffc78b3210c9e007da03279c7d45aa00a7a9a7f00f5f9bc82b7cc1695
 DIST ipv6calc-3.2.0.tar.gz 1645414 BLAKE2B b74406a867b03e22244c1890133ce9553c40b5a737bd1711783e94b7f3afc43cfcff26e12583552a4c0fcc9ecd51174fb20844bddac22732d08e995de9e0f5ef SHA512 f7cd3d8820acd06c016e6f439129516d61300ba1660fe3acfec319f4dbd73de77f0a339bef31fd42bb0a4ab2e68d0e4771b1526f3217d3504cb4605d7b9b0195
@@ -8,5 +9,6 @@ EBUILD ipv6calc-2.2.0.ebuild 1574 BLAKE2B f1a636fe26ceb3618358222498bd68e517c0ed
 EBUILD ipv6calc-3.1.1.ebuild 1531 BLAKE2B 6ec62ec4b7b14c5ac33672c35b2699f02d1c0d07e71c3718cbfdeb3b5c577bd8897c2803239c600edaa580c8b472bf932855b63c3af607de16fd7edb446a90dd SHA512 85189a0d6df24ae0c09369ea7a0a1fb567c77bee782443f633fff509fc874101fed583cb0991c59e55c4e5138449ba30874134a3ededb64264c60ad914e3809d
 EBUILD ipv6calc-3.2.0.ebuild 1535 BLAKE2B ba17e83c53f680a204cbc5467fa30323c07c5c009ebd33b7a820b70b371beab6359ced1f5f5ddc390ea09fba8896205d82d8dcefa96e4b800be78c3e78cfc18a SHA512 d6a0445fb3ef4eca4e0c57312f34d1d94289f7feb6d79d10e4589845b57f7d18401c91555f76757d76e0d970f902df3e907f65e6ee11dfc54fa9e605e4c8c42c
 EBUILD ipv6calc-4.0.0.ebuild 1613 BLAKE2B b6257c007601fe976a9ac89ea80d282b0425139490e6e3f426b0942a90a9e5c80e61017976ee6e97e2fbd5abb92a08b3be6d0966d04e01b949c5cf74f0bbfbe8 SHA512 302fbdce9435dbf1042d1561ef03738ed3b9a870280679e182c5308df99c13898825f7c83add111587551afe534e7e8f9431509b21a66314e2bd571c4cd59292
+EBUILD ipv6calc-4.0.1-r1.ebuild 1710 BLAKE2B 2a4df1b1d5443acbd01fecdf9db55821325375f14e8b1f7efee6ea3d2738041b7966b8e43abcfd39ab385854ce221458c251522d322870cbf844dd7ed1359b8a SHA512 b166c51fbce64210a9507bc9bed84771dec3bbabce92fe44148b9b47d2f67af4a50cd38b2eeb0f14ddef8c6cbc401b2ae5d9e888512227addbf747203d6de88d
 EBUILD ipv6calc-4.0.1.ebuild 1651 BLAKE2B 5ba62fe0ff17a6fefb84c9e2b37251b9fd76a75a1cd42a9a5bd74223b1bdb641600a7ef2de11a440b0a219fd21a172e8fa8eb29224e99eeddedd81848cc4d696 SHA512 d850a4ee003e032c5b55d504c8ea155b10d1b76a2186e20b1c114295f3194578f9aa9fa1884e229971e1cf655c4b244575983e800650e2adb542cd9a4919fdd2
 MISC metadata.xml 335 BLAKE2B 80a2b9fa130b3475f0045dc1626eb166078e1f091632013bcb48af829da11ab8f8c6fa61e107ddf1636eac2282493d370eb639669383f7f00e56cbbdb8ce5028 SHA512 a95df3df487415da7ba079eb8de0466bda61770e128761b8d8a9158aac7b22727287d2f35ba7bc6ad00c2e80037892dac6c9e2ce7ad1beec2bc9b2329e14688c
diff --git a/net-misc/ipv6calc/files/ipv6calc-4.0.1-underlinking.patch b/net-misc/ipv6calc/files/ipv6calc-4.0.1-underlinking.patch
new file mode 100644
index 000000000000..787ef1a3180c
--- /dev/null
+++ b/net-misc/ipv6calc/files/ipv6calc-4.0.1-underlinking.patch
@@ -0,0 +1,79 @@
+https://github.com/pbiering/ipv6calc/pull/35
+
+From e73dfa578b2af3f75b86e7584cfffcad79d75764 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 15 Sep 2022 00:23:37 +0100
+Subject: [PATCH] Fix underlinking with -lm (LDFLAGS order)
+
+LDFLAGS must come _before_ any libraries,
+as some take effect based on arguments afterwards.
+
+For example, -Wl,--as-needed (which some distributions
+set by default, even) will discard (or not know about)
+any objects listed before it.
+
+See also e.g.
+https://wiki.gentoo.org/wiki/Project:Quality_Assurance/As-needed#Importance_of_linking_order.
+
+Bug: https://bugs.gentoo.org/661536
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/ipv6calc/Makefile.in
++++ b/ipv6calc/Makefile.in
+@@ -49,10 +49,10 @@ libipv6calc_db_wrapper:
+ 		cd ../ && ${MAKE} lib-make
+ 
+ ipv6calc:	$(OBJS) libipv6calc libipv6calc_db_wrapper
+-		$(CC) -o ipv6calc $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA)
++		$(CC) -o ipv6calc $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA) $(LIBS) -lm
+ 
+ static:		ipv6calc
+-		$(CC) -o ipv6calc-static $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) -static
++		$(CC) -o ipv6calc-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) $(LIBS) -lm -static
+ 
+ distclean:
+ 		${MAKE} clean
+--- a/ipv6loganon/Makefile.in
++++ b/ipv6loganon/Makefile.in
+@@ -49,10 +49,10 @@ libipv6calc_db_wrapper:
+ 		cd ../ && ${MAKE} lib-make
+ 
+ ipv6loganon:	$(OBJS) libipv6calc libipv6calc_db_wrapper
+-		$(CC) -o ipv6loganon $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA)
++		$(CC) -o ipv6loganon $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA) $(LIBS) -lm
+ 
+ static:		ipv6loganon
+-		$(CC) -o ipv6loganon-static $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) -static
++		$(CC) -o ipv6loganon-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) $(LIBS) -lm -static
+ 
+ distclean:
+ 		${MAKE} clean
+--- a/ipv6logconv/Makefile.in
++++ b/ipv6logconv/Makefile.in
+@@ -49,10 +49,10 @@ libipv6calc_db_wrapper:
+ 		cd ../ && ${MAKE} lib-make
+ 
+ ipv6logconv:	$(OBJS) libipv6calc libipv6calc_db_wrapper
+-		$(CC) -o ipv6logconv $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA)
++		$(CC) -o ipv6logconv $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA) $(LIBS) -lm
+ 
+ static:		ipv6logconv
+-		$(CC) -o ipv6logconv-static $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) -static
++		$(CC) -o ipv6logconv-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) $(LIBS) -lm -static
+ 
+ distclean:
+ 		${MAKE} clean
+--- a/ipv6logstats/Makefile.in
++++ b/ipv6logstats/Makefile.in
+@@ -49,10 +49,10 @@ libipv6calc_db_wrapper.a:
+ $(OBJS):	ipv6logstatsoptions.h ipv6logstatshelp.h ipv6logstats.h
+ 
+ ipv6logstats:	$(OBJS) libipv6calc.a libipv6calc_db_wrapper.a
+-		$(CC) -o ipv6logstats $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA)
++		$(CC) -o ipv6logstats $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA) $(LIBS) -lm
+ 
+ static:		ipv6logstats
+-		$(CC) -o ipv6logstats-static $(OBJS) $(GETOBJS) $(LIBS) -lm $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) -static
++		$(CC) -o ipv6logstats-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LDFLAGS_EXTRA_STATIC) $(LIBS) -lm -static
+ 
+ distclean:
+ 		${MAKE} clean
diff --git a/net-misc/ipv6calc/ipv6calc-4.0.1-r1.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..e784349e1260
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-4.0.1-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="IPv6 address calculator"
+HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cgi geoip test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	cgi? (
+		dev-perl/URI
+		dev-perl/Digest-SHA1
+	)
+	dev-libs/openssl:=
+	geoip? ( >=dev-libs/geoip-1.4.7 )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/Digest-SHA1 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.1-underlinking.patch
+)
+
+src_configure() {
+	# These options are broken.  You can't disable them.  That's
+	# okay because we want then force enabled.
+	# --disable-db-as-registry
+	# --disable-db-cc-registry
+	local myeconfargs=(
+		--disable-compiler-warning-to-error
+		--disable-bundled-getopt
+		--disable-bundled-md5
+		--enable-shared
+		--enable-dynamic-load
+		--enable-db-ieee
+		--enable-db-ipv4
+		--enable-db-ipv6
+		--disable-dbip
+		--disable-dbip2
+		--disable-external
+		--disable-ip2location
+		--enable-openssl-evp-md5
+		--enable-openssl-md5
+		$(use_enable geoip)
+		$(use_enable cgi mod_ipv6calc )
+	)
+
+	if use geoip; then
+		myeconfargs+=( "--with-geoip-db=${EPREFIX}/usr/share/GeoIP" )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake distclean
+	# Disable default CFLAGS (-O2 and -g)
+	emake DEFAULT_CFLAGS=""
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		# Disable tests that fail as root
+		echo true > ipv6logstats/test_ipv6logstats.sh
+	fi
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog CREDITS README TODO USAGE
+}