* [gentoo-commits] repo/gentoo:master commit in: net-misc/ipv6calc/files/, net-misc/ipv6calc/
@ 2024-09-14 6:24 Petr Vaněk
0 siblings, 0 replies; 6+ messages in thread
From: Petr Vaněk @ 2024-09-14 6:24 UTC (permalink / raw
To: gentoo-commits
commit: 19abd6c5b138e37fcaa17028a6a55fecd9006fef
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 06:22:35 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 06:24:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19abd6c5
net-misc/ipv6calc: drop 2.2.0, 3.1.1, 3.2.0, 4.0.0, 4.0.1
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
net-misc/ipv6calc/Manifest | 4 --
.../ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch | 34 ----------
net-misc/ipv6calc/ipv6calc-2.2.0.ebuild | 69 --------------------
net-misc/ipv6calc/ipv6calc-3.1.1.ebuild | 67 -------------------
net-misc/ipv6calc/ipv6calc-3.2.0.ebuild | 67 -------------------
net-misc/ipv6calc/ipv6calc-4.0.0.ebuild | 75 ---------------------
net-misc/ipv6calc/ipv6calc-4.0.1.ebuild | 76 ----------------------
7 files changed, 392 deletions(-)
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 062ea0d83d1b..f311aad59897 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,5 +1 @@
-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
-DIST ipv6calc-4.0.0.tar.gz 1682616 BLAKE2B 5a26f6c4c8a9a2ea49c8762690c18e523ebde370817e71ae56f1cda211324695f046e85bba56f0b19e17869d72adb0ee8739fdbd4e8c4503d4a286107212eda4 SHA512 939dfcbe68c6e110acfe23f6f221471bda03ad165f5785bbc9aabd03b3192ab3cdb99df458db79edfa3c3d2f3202f1f2f189b7a9fd9a5ae27a7084de2fbd907d
DIST ipv6calc-4.0.1.tar.gz 1705407 BLAKE2B 599573570df946f3362e213e481b8016b037de6263ed53aa61fd39b69810b2cf05a9c76408904bac4b076a4061091be8adbd6d5648a1f5bdc5d021ebd5123acb SHA512 6e60f4808b2622235ea9c43c99868798e7014fbee7dc51349cfe2ba28badcc767d45f9e30dc14d3b78c4a88ef2ff80083b4b0be64e93ed17b17817995364b3ce
diff --git a/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch b/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch
deleted file mode 100644
index 4639fa7406f1..000000000000
--- a/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/708056
-
-From 8c7eea58f2034113ae91ff7adc2bda72465b7d1a Mon Sep 17 00:00:00 2001
-From: Peter Bieringer <pb@bieringer.de>
-Date: Fri, 24 Jan 2020 07:15:55 +0100
-Subject: [PATCH] ipv6logconv/ipv6logconv.{h,c}: fix multiple definition of
- 'cache_lru_limit'
-
---- a/ipv6logconv/ipv6logconv.c
-+++ b/ipv6logconv/ipv6logconv.c
-@@ -58,7 +58,7 @@ static void lineparser(const long int outputtype);
- /* LRU cache */
-
- #define CACHE_LRU_SIZE 200
--
-+int cache_lru_limit;
- static int cache_lru_max = 0;
- static int cache_lru_last = 0;
- static char cache_lru_key_token[CACHE_LRU_SIZE][NI_MAXHOST];
---- a/ipv6logconv/ipv6logconv.h
-+++ b/ipv6logconv/ipv6logconv.h
-@@ -20,8 +20,7 @@
- #define DEBUG_ipv6logconv_general 0x00000001l
- #define DEBUG_ipv6logconv_processing 0x00000002l
-
--/* prototyping */
--int cache_lru_limit;
-+extern int cache_lru_limit;
-
- extern int feature_reg;
- extern int feature_ieee;
---
-2.27.0
-
diff --git a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
deleted file mode 100644
index 498fe326ea83..000000000000
--- a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-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="geoip test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/openssl:=
- geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
- test? ( dev-perl/Digest-SHA1 )
-"
-
-PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-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
- if use geoip; then
- myconf=$(use_enable geoip)
- myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
- fi
- econf \
- --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 \
- ${myconf}
-}
-
-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
-}
diff --git a/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild b/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
deleted file mode 100644
index 811fa957aae5..000000000000
--- a/net-misc/ipv6calc/ipv6calc-3.1.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-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="geoip test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/openssl:=
- geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
- test? ( dev-perl/Digest-SHA1 )
-"
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-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
- if use geoip; then
- myconf=$(use_enable geoip)
- myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
- fi
- econf \
- --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 \
- ${myconf}
-}
-
-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
-}
diff --git a/net-misc/ipv6calc/ipv6calc-3.2.0.ebuild b/net-misc/ipv6calc/ipv6calc-3.2.0.ebuild
deleted file mode 100644
index 42eca99cbb18..000000000000
--- a/net-misc/ipv6calc/ipv6calc-3.2.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 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="geoip test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/openssl:=
- geoip? ( >=dev-libs/geoip-1.4.7 )
-"
-DEPEND="${RDEPEND}
- test? ( dev-perl/Digest-SHA1 )
-"
-
-#dev-perl/URI is needed for web interface, that is not installed now
-
-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
- if use geoip; then
- myconf=$(use_enable geoip)
- myconf+=" --with-geoip-db=${EPREFIX}/usr/share/GeoIP"
- fi
- econf \
- --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 \
- ${myconf}
-}
-
-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
-}
diff --git a/net-misc/ipv6calc/ipv6calc-4.0.0.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.0.ebuild
deleted file mode 100644
index 3aa11efa4dd8..000000000000
--- a/net-misc/ipv6calc/ipv6calc-4.0.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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 )
-"
-
-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-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
-}
diff --git a/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild b/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild
deleted file mode 100644
index 084598853945..000000000000
--- a/net-misc/ipv6calc/ipv6calc-4.0.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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 )
-"
-
-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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/ipv6calc/files/, net-misc/ipv6calc/
@ 2025-07-25 1:14 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-07-25 1:14 UTC (permalink / raw
To: gentoo-commits
commit: b9d8f6bf8f045107cfa1241f49f8042af05edc50
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Thu Jul 24 14:04:52 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 25 01:12:10 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9d8f6bf
net-misc/ipv6calc: add 4.3.2
md5 digest :
drop legacy md5 support and depend to >=openssl-3.0.0
add libmd alternative support
it's handle by openssl useflag (more common than libmd), enabled by default
fix deps for cgi :
add www-servers/apache for aspx call
add dev-perl/HTML-Parser for entities.pm
rm dev-perl/Digest-SHA1 (and test useflag), replaced by SHA (dev-lang/perl)
fix deps for GeoIP2 :
--enable-mmdb is required, also dev-libs/libmaxminddb
clang has know issues : filter lto and as-needed
skip tests that requires an apache instance
two patches with PR pending upstream for musl and non-native-symlinks
Closes: https://bugs.gentoo.org/684130
Closes: https://bugs.gentoo.org/716222
Closes: https://bugs.gentoo.org/725198
Closes: https://bugs.gentoo.org/820833
Closes: https://bugs.gentoo.org/820878
Closes: https://bugs.gentoo.org/834060
Closes: https://bugs.gentoo.org/924502
Closes: https://bugs.gentoo.org/937777
Closes: https://bugs.gentoo.org/944049
Closes: https://bugs.gentoo.org/948587
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/43139
Closes: https://github.com/gentoo/gentoo/pull/43139
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/ipv6calc/Manifest | 1 +
.../files/ipv6calc-4.3.2-fix_directcall_ar.patch | 27 ++++++
.../files/ipv6calc-4.3.2-ldconfig_musl.patch | 27 ++++++
net-misc/ipv6calc/ipv6calc-4.3.2.ebuild | 95 ++++++++++++++++++++++
net-misc/ipv6calc/metadata.xml | 3 +
5 files changed, 153 insertions(+)
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index f311aad59897..c2e1cb928338 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1 +1,2 @@
DIST ipv6calc-4.0.1.tar.gz 1705407 BLAKE2B 599573570df946f3362e213e481b8016b037de6263ed53aa61fd39b69810b2cf05a9c76408904bac4b076a4061091be8adbd6d5648a1f5bdc5d021ebd5123acb SHA512 6e60f4808b2622235ea9c43c99868798e7014fbee7dc51349cfe2ba28badcc767d45f9e30dc14d3b78c4a88ef2ff80083b4b0be64e93ed17b17817995364b3ce
+DIST ipv6calc-4.3.2.tar.gz 1971792 BLAKE2B ea889f755aaf8b81fa2dd287d9fdd19127dde09221f22a3d6d2a42941a32c0851847ba3d6a37c33ad76552975e9ad515bcd14f0a83f6ada9abc657e0b979c204 SHA512 acb203feba7f4e800a715f740b3070314d3d1281758a6b99321d156f2ebaddffb6a088167a4c13ff92d4bd9565e7b0536d4f72643605544e99d222f8f5aa6efe
diff --git a/net-misc/ipv6calc/files/ipv6calc-4.3.2-fix_directcall_ar.patch b/net-misc/ipv6calc/files/ipv6calc-4.3.2-fix_directcall_ar.patch
new file mode 100644
index 000000000000..af4706084113
--- /dev/null
+++ b/net-misc/ipv6calc/files/ipv6calc-4.3.2-fix_directcall_ar.patch
@@ -0,0 +1,27 @@
+https://github.com/pbiering/ipv6calc/pull/49
+diff --git a/databases/lib/Makefile.in b/databases/lib/Makefile.in
+index ed3c55d..a3846a7 100644
+--- a/databases/lib/Makefile.in
++++ b/databases/lib/Makefile.in
+@@ -26,7 +26,7 @@ else
+ endif
+
+ CC = @CC@
+-AR = ar
++AR ?= ar
+ RANLIB = @RANLIB@
+
+ OBJS = libipv6calc_db_wrapper.o \
+diff --git a/lib/Makefile.in b/lib/Makefile.in
+index 827e3ae..846b3d1 100644
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -26,7 +26,7 @@ endif
+ SHARED_LIBRARY=@SHARED_LIBRARY@
+
+ CC = @CC@
+-AR = ar
++AR ?= ar
+ RANLIB = @RANLIB@
+
+ OBJS = libipv6calc.o \
diff --git a/net-misc/ipv6calc/files/ipv6calc-4.3.2-ldconfig_musl.patch b/net-misc/ipv6calc/files/ipv6calc-4.3.2-ldconfig_musl.patch
new file mode 100644
index 000000000000..2abd5967922b
--- /dev/null
+++ b/net-misc/ipv6calc/files/ipv6calc-4.3.2-ldconfig_musl.patch
@@ -0,0 +1,27 @@
+https://github.com/pbiering/ipv6calc/pull/49
+diff --git a/databases/lib/Makefile.in b/databases/lib/Makefile.in
+index ed3c55d..a57a080 100644
+--- a/databases/lib/Makefile.in
++++ b/databases/lib/Makefile.in
+@@ -91,7 +91,7 @@ ifeq ($(SHARED_LIBRARY), yes)
+ echo "Install shared library"
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 755 libipv6calc_db_wrapper.so.@PACKAGE_VERSION@ $(DESTDIR)$(libdir)
+- /sbin/ldconfig -n $(DESTDIR)$(libdir)
++ /sbin/ldconfig $(DESTDIR)$(libdir)
+ else
+ echo "Nothing to do (shared library mode is not enabled)"
+ endif
+diff --git a/lib/Makefile.in b/lib/Makefile.in
+index 827e3ae..61527b7 100644
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -121,7 +121,7 @@ ifeq ($(SHARED_LIBRARY), yes)
+ echo "Install shared library"
+ mkdir -p $(DESTDIR)$(libdir)
+ install -m 755 libipv6calc.so.@PACKAGE_VERSION@ $(DESTDIR)$(libdir)
+- /sbin/ldconfig -n $(DESTDIR)$(libdir)
++ /sbin/ldconfig $(DESTDIR)$(libdir)
+ else
+ echo "Nothing to do (shared library mode is not enabled)"
+ endif
diff --git a/net-misc/ipv6calc/ipv6calc-4.3.2.ebuild b/net-misc/ipv6calc/ipv6calc-4.3.2.ebuild
new file mode 100644
index 000000000000..445b2163d613
--- /dev/null
+++ b/net-misc/ipv6calc/ipv6calc-4.3.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic toolchain-funcs
+
+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 +openssl"
+
+RDEPEND="
+ cgi? (
+ dev-perl/HTML-Parser
+ dev-perl/URI
+ www-servers/apache
+ )
+ geoip? (
+ dev-libs/geoip
+ dev-libs/libmaxminddb:=
+ )
+ openssl? ( >=dev-libs/openssl-3.0.0:= )
+ !openssl? ( app-crypt/libmd )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ # https://github.com/pbiering/ipv6calc/pull/49
+ "${FILESDIR}"/${P}-fix_directcall_ar.patch
+ "${FILESDIR}"/${P}-ldconfig_musl.patch
+)
+
+DOCS=( ChangeLog CREDITS README README.MaxMindDB README.GeoIP2 TODO USAGE )
+HTML_DOCS=( doc/ipv6calc.html )
+
+src_configure() {
+ # something is broken with clang. to investigate.
+ # see https://github.com/pbiering/ipv6calc/issues/45
+ tc-is-clang && append-ldflags $(no-as-needed) && filter-lto
+
+ # These options are broken. You can't disable them. That's
+ # okay because we want then force enabled.
+ # > libipv6calc_db_wrapper_BuiltIn.c:244:91:
+ # > error: ‘dbipv4addr_registry_status’ undeclared (first use in this function)
+ # --disable-db-as-registry
+ # --disable-db-cc-registry
+
+ tc-export AR
+ 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
+ # disable legacy md5
+ # use libmd or openssl-evp-md5 (by default)
+ --disable-openssl-md5
+ $(use_enable openssl openssl-evp-md5)
+ $(use_enable !openssl libmd-md5)
+ $(use_enable cgi mod_ipv6calc)
+ $(use_enable geoip)
+ $(use_enable geoip mmdb)
+ )
+
+ if use geoip; then
+ myeconfargs+=( "--with-geoip-db=${EPREFIX}/usr/share/GeoIP" )
+ fi
+
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ if [[ ${EUID} -eq 0 ]]; then
+ # Disable tests that fail as root
+ echo true > ipv6logstats/test_ipv6logstats.sh
+ fi
+ # it requires an apache instance
+ echo true > mod_ipv6calc/test_mod_ipv6calc.sh
+ # it requires network
+ echo true > ipv6calcweb/test_ipv6calcweb.sh
+ echo true > ipv6calcweb/test_ipv6calcweb_form.sh
+ default
+}
diff --git a/net-misc/ipv6calc/metadata.xml b/net-misc/ipv6calc/metadata.xml
index cc8d5e5812fc..e4786626959d 100644
--- a/net-misc/ipv6calc/metadata.xml
+++ b/net-misc/ipv6calc/metadata.xml
@@ -2,6 +2,9 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
+ <use>
+ <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> instead of <pkg>app-crypt/libmd</pkg> for MD5 digest</flag>
+ </use>
<upstream>
<remote-id type="github">pbiering/ipv6calc</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/ipv6calc/files/, net-misc/ipv6calc/
@ 2025-07-25 6:15 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-07-25 6:15 UTC (permalink / raw
To: gentoo-commits
commit: ace303b997ad0bfa7c6143fe1002a037fcff178b
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Fri Jul 25 05:09:25 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 25 06:14:53 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace303b9
net-misc/ipv6calc: missing dies, don't call ldconfig
ldconfig is not helpfull here (no reverse dep),
the abspath may be wrong in some env,
ldconfig from musl doesn't support any arg.
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/43146
Closes: https://github.com/gentoo/gentoo/pull/43146
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/ipv6calc/files/ipv6calc-4.3.2-ldconfig_musl.patch | 10 +++++-----
net-misc/ipv6calc/ipv6calc-4.3.2.ebuild | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/net-misc/ipv6calc/files/ipv6calc-4.3.2-ldconfig_musl.patch b/net-misc/ipv6calc/files/ipv6calc-4.3.2-ldconfig_musl.patch
index 2abd5967922b..a883a03477d4 100644
--- a/net-misc/ipv6calc/files/ipv6calc-4.3.2-ldconfig_musl.patch
+++ b/net-misc/ipv6calc/files/ipv6calc-4.3.2-ldconfig_musl.patch
@@ -1,14 +1,15 @@
-https://github.com/pbiering/ipv6calc/pull/49
+ldconfig is not helpfull here
+the abspath may be wrong in some env
+ldconfig from musl doesn't support any arg
diff --git a/databases/lib/Makefile.in b/databases/lib/Makefile.in
index ed3c55d..a57a080 100644
--- a/databases/lib/Makefile.in
+++ b/databases/lib/Makefile.in
-@@ -91,7 +91,7 @@ ifeq ($(SHARED_LIBRARY), yes)
+@@ -91,7 +91,6 @@ ifeq ($(SHARED_LIBRARY), yes)
echo "Install shared library"
mkdir -p $(DESTDIR)$(libdir)
install -m 755 libipv6calc_db_wrapper.so.@PACKAGE_VERSION@ $(DESTDIR)$(libdir)
- /sbin/ldconfig -n $(DESTDIR)$(libdir)
-+ /sbin/ldconfig $(DESTDIR)$(libdir)
else
echo "Nothing to do (shared library mode is not enabled)"
endif
@@ -16,12 +17,11 @@ diff --git a/lib/Makefile.in b/lib/Makefile.in
index 827e3ae..61527b7 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
-@@ -121,7 +121,7 @@ ifeq ($(SHARED_LIBRARY), yes)
+@@ -121,7 +121,6 @@ ifeq ($(SHARED_LIBRARY), yes)
echo "Install shared library"
mkdir -p $(DESTDIR)$(libdir)
install -m 755 libipv6calc.so.@PACKAGE_VERSION@ $(DESTDIR)$(libdir)
- /sbin/ldconfig -n $(DESTDIR)$(libdir)
-+ /sbin/ldconfig $(DESTDIR)$(libdir)
else
echo "Nothing to do (shared library mode is not enabled)"
endif
diff --git a/net-misc/ipv6calc/ipv6calc-4.3.2.ebuild b/net-misc/ipv6calc/ipv6calc-4.3.2.ebuild
index 445b2163d613..c4ac0f939bb3 100644
--- a/net-misc/ipv6calc/ipv6calc-4.3.2.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-4.3.2.ebuild
@@ -84,12 +84,12 @@ src_configure() {
src_test() {
if [[ ${EUID} -eq 0 ]]; then
# Disable tests that fail as root
- echo true > ipv6logstats/test_ipv6logstats.sh
+ echo true > ipv6logstats/test_ipv6logstats.sh || die
fi
# it requires an apache instance
- echo true > mod_ipv6calc/test_mod_ipv6calc.sh
+ echo true > mod_ipv6calc/test_mod_ipv6calc.sh || die
# it requires network
- echo true > ipv6calcweb/test_ipv6calcweb.sh
- echo true > ipv6calcweb/test_ipv6calcweb_form.sh
+ echo true > ipv6calcweb/test_ipv6calcweb.sh || die
+ echo true > ipv6calcweb/test_ipv6calcweb_form.sh || die
default
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/ipv6calc/files/, net-misc/ipv6calc/
@ 2025-07-26 21:33 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-07-26 21:33 UTC (permalink / raw
To: gentoo-commits
commit: 6767b170ee365946ed1a635ed9ce1467ee0286ff
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Sat Jul 26 12:48:17 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 26 21:31:52 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6767b170
net-misc/ipv6calc: fix build with clang and --as-needed
Add a patch merged in upstream to fix link issues with clang and
--as-needed.
The issue with lto and the module for apache is still there.
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/43174
Closes: https://github.com/gentoo/gentoo/pull/43174
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../ipv6calc/files/ipv6calc-4.3.2-fix_libs.patch | 246 +++++++++++++++++++++
...6calc-4.3.2.ebuild => ipv6calc-4.3.2-r1.ebuild} | 17 +-
2 files changed, 257 insertions(+), 6 deletions(-)
diff --git a/net-misc/ipv6calc/files/ipv6calc-4.3.2-fix_libs.patch b/net-misc/ipv6calc/files/ipv6calc-4.3.2-fix_libs.patch
new file mode 100644
index 000000000000..e1d8053c3f70
--- /dev/null
+++ b/net-misc/ipv6calc/files/ipv6calc-4.3.2-fix_libs.patch
@@ -0,0 +1,246 @@
+PR merged
+https://github.com/pbiering/ipv6calc/pull/50.patch
+From c92628f1fb4a7b61ddde19bab8e75ae258d000b7 Mon Sep 17 00:00:00 2001
+From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+Date: Sat, 26 Jul 2025 07:40:08 +0200
+Subject: [PATCH] fix link issues with clang and --as-needed
+
+> ld.lld: error: undefined reference: EVP_MD_CTX_new
+> >>> referenced by ../lib/libipv6calc.so.4.3.2
+
+> ./ipv6calc: symbol lookup error:
+> ../databases/lib/libipv6calc_db_wrapper.so.4.3.2: undefined symbol: log2
+
+add MD5_LIB for libmd/openssl
+add EXTDB_LIB where IPV6CALC_LIB is called
+
+move extern math in LIBS instead of LDFLAGS
+
+Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
+---
+ configure.ac | 22 ++++++++++------------
+ databases/lib/Makefile.in | 4 +++-
+ ipv6calc/Makefile.in | 6 +++---
+ ipv6loganon/Makefile.in | 6 +++---
+ ipv6logconv/Makefile.in | 6 +++---
+ ipv6logstats/Makefile.in | 6 +++---
+ lib/Makefile.in | 4 +++-
+ 7 files changed, 28 insertions(+), 26 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 65d57e4b..268e8a22 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -481,27 +481,24 @@ if test "$ENABLE_BUNDLED_MD5" = "1"; then
+ AC_DEFINE(ENABLE_BUNDLED_MD5, 1, Define if bundled MD5 should be used)
+ else
+ if test "$ENABLE_LIBMD_MD5" = "1"; then
+- LDFLAGS_EXTRA="${LDFLAGS_EXTRA:+$LDFLAGS_EXTRA }-lmd"
+- LDFLAGS_EXTRA_MOD_IPV6CALC="-lmd $LDFLAGS_EXTRA_MOD_IPV6CALC"
+- LDFLAGS_EXTRA_STATIC="${LDFLAGS_EXTRA_STATIC:+$LDFLAGS_EXTRA_STATIC }-lmd -lz -ldl -lpthread -lc"
++ MD5_LIB="-lmd"
++ LDFLAGS_EXTRA_STATIC="${LDFLAGS_EXTRA_STATIC:+$LDFLAGS_EXTRA_STATIC }-lz -ldl -lpthread -lc"
+
+ AC_DEFINE(ENABLE_LIBMD_MD5, 1, Define if libmd MD5 should be used)
+ AC_MSG_RESULT([*** use of libmd MD5 implementation])
+ fi
+
+ if test "$ENABLE_OPENSSL_EVP_MD5" = "1"; then
+- LDFLAGS_EXTRA="${LDFLAGS_EXTRA:+$LDFLAGS_EXTRA }-lcrypto"
+- LDFLAGS_EXTRA_MOD_IPV6CALC="-lcrypto $LDFLAGS_EXTRA_MOD_IPV6CALC"
+- LDFLAGS_EXTRA_STATIC="${LDFLAGS_EXTRA_STATIC:+$LDFLAGS_EXTRA_STATIC }-lcrypto -lz -ldl -lpthread -lc"
++ MD5_LIB="-lcrypto"
++ LDFLAGS_EXTRA_STATIC="${LDFLAGS_EXTRA_STATIC:+$LDFLAGS_EXTRA_STATIC }-lz -ldl -lpthread -lc"
+
+ AC_DEFINE(ENABLE_OPENSSL_EVP_MD5, 1, Define if OpenSSL EVP MD5 should be used)
+ AC_MSG_RESULT([*** use of OpenSSL EVP MD5 implementation])
+ fi
+
+ if test "$ENABLE_OPENSSL_MD5" = "1"; then
+- LDFLAGS_EXTRA="${LDFLAGS_EXTRA:+$LDFLAGS_EXTRA }-lcrypto"
+- LDFLAGS_EXTRA_MOD_IPV6CALC="-lcrypto $LDFLAGS_EXTRA_MOD_IPV6CALC"
+- LDFLAGS_EXTRA_STATIC="${LDFLAGS_EXTRA_STATIC:+$LDFLAGS_EXTRA_STATIC }-lcrypto -lz -ldl -lpthread -lc"
++ MD5_LIB="-lcrypto"
++ LDFLAGS_EXTRA_STATIC="${LDFLAGS_EXTRA_STATIC:+$LDFLAGS_EXTRA_STATIC }-lz -ldl -lpthread -lc"
+
+ AC_DEFINE(ENABLE_OPENSSL_MD5, 1, Define if OpenSSL legacy MD5 should be used)
+ AC_MSG_RESULT([*** use of OpenSSL legacy MD5 implementation])
+@@ -509,6 +506,7 @@ else
+ fi
+
+ AC_SUBST(MD5_INCLUDE)
++AC_SUBST(MD5_LIB)
+ AC_SUBST(ENABLE_BUNDLED_MD5)
+ AC_SUBST(ENABLE_LIBMD_MD5)
+ AC_SUBST(ENABLE_OPENSSL_EVP_MD5)
+@@ -767,19 +765,19 @@ if test "$require_libdb" = "yes"; then
+ DB_VERSION=`/sbin/ldconfig -p | grep -E '#?\s*libdb-[0-9]+.[0-9]+' | sed -e 's/^#\?\s*libdb-\([0-9]*\)\.\([0-9]*\).*/\1.\2/' | sort -n | tail -1`
+ if test -n "$DB_VERSION"; then
+ AC_MSG_RESULT([Berkeley DB library version found: libdb-$DB_VERSION])
+- LDFLAGS_EXTRA_STATIC="-ldb-$DB_VERSION${LDFLAGS_EXTRA_STATIC:+ $LDFLAGS_EXTRA_STATIC}"
++ EXTDB_LIB="-ldb-$DB_VERSION"
+ fi
+ ],[
+ AC_MSG_WARN([Missing /sbin/ldconfig, cannot detect Berkeley DB library version])
+ ])
+
+- LDFLAGS_EXTRA="${LDFLAGS_EXTRA:+$LDFLAGS_EXTRA }-ldb"
+- LDFLAGS_EXTRA_MOD_IPV6CALC="-ldb $LDFLAGS_EXTRA_MOD_IPV6CALC"
++ EXTDB_LIB="-ldb"
+ HAVE_BERKELEY_DB_SUPPORT=1
+ AC_DEFINE(HAVE_BERKELEY_DB_SUPPORT, 1, Define if Berkeley DB support is required.)
+ AC_MSG_RESULT([*** Berkeley DB library found and usable (required)])
+ fi
+
++AC_SUBST(EXTDB_LIB)
+
+ dnl *************************************************
+ dnl MaxMindDB support (GeoIP2, DB-IP, IP2Location)
+diff --git a/databases/lib/Makefile.in b/databases/lib/Makefile.in
+index a3846a72..061bb0bc 100644
+--- a/databases/lib/Makefile.in
++++ b/databases/lib/Makefile.in
+@@ -17,6 +17,8 @@ LDFLAGS += @LDFLAGS@
+
+ INCLUDES= -I../../lib -I../.. @MMDB_INCLUDE_L2@ @IP2LOCATION_INCLUDE_L2@
+
++LIBS = @MMDB_LIB_L1@ @IP2LOCATION_LIB_L1@ @EXTDB_LIB@ @DYNLOAD_LIB@ -lm
++
+ SHARED_LIBRARY=@SHARED_LIBRARY@
+
+ ifeq ($(shell uname), Darwin)
+@@ -71,7 +73,7 @@ libipv6calc_db_wrapper.a: $(OBJS)
+ libipv6calc_db_wrapper.so.@PACKAGE_VERSION@: $(OBJS)
+ ifeq ($(SHARED_LIBRARY), yes)
+ echo "Create shared library (libipv6calc_db_wrapper.so)"
+- $(CC) -o libipv6calc_db_wrapper.so.@PACKAGE_VERSION@ $(OBJS) $(CFLAGS) $(LDFLAGS) -shared -Wl,$(SO_NAME_FLAGS),libipv6calc_db_wrapper.so.@PACKAGE_VERSION@
++ $(CC) -o libipv6calc_db_wrapper.so.@PACKAGE_VERSION@ $(OBJS) $(CFLAGS) $(LDFLAGS) $(LIBS) -shared -Wl,$(SO_NAME_FLAGS),libipv6calc_db_wrapper.so.@PACKAGE_VERSION@
+ else
+ echo "Nothing to do (shared library mode is not enabled)"
+ endif
+diff --git a/ipv6calc/Makefile.in b/ipv6calc/Makefile.in
+index b3442f04..55d48643 100644
+--- a/ipv6calc/Makefile.in
++++ b/ipv6calc/Makefile.in
+@@ -19,7 +19,7 @@ LDFLAGS += @LDFLAGS_EXTRA@
+
+ INCLUDES= @MD5_INCLUDE@ @GETOPT_INCLUDE@ @MMDB_INCLUDE_L1@ @IP2LOCATION_INCLUDE_L1@ -I../ -I../lib/ -I../databases/lib/
+
+-LIBS = @IPV6CALC_LIB@ @MMDB_LIB_L1@ @IP2LOCATION_LIB_L1@ @DYNLOAD_LIB@
++LIBS = @IPV6CALC_LIB@ @MMDB_LIB_L1@ @IP2LOCATION_LIB_L1@ @EXTDB_LIB@ @MD5_LIB@ @DYNLOAD_LIB@ -lm
+
+ GETOBJS = @LIBOBJS@
+
+@@ -49,10 +49,10 @@ libipv6calc_db_wrapper:
+ cd ../ && ${MAKE} lib-make
+
+ ipv6calc: $(OBJS) libipv6calc libipv6calc_db_wrapper
+- $(CC) -o ipv6calc $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS) -lm
++ $(CC) -o ipv6calc $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS)
+
+ static: ipv6calc
+- $(CC) -o ipv6calc-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS) $(LDFLAGS_EXTRA_STATIC) -lm -static
++ $(CC) -o ipv6calc-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS) $(LDFLAGS_EXTRA_STATIC) -static
+
+ distclean:
+ ${MAKE} clean
+diff --git a/ipv6loganon/Makefile.in b/ipv6loganon/Makefile.in
+index 81b02a48..9e234846 100644
+--- a/ipv6loganon/Makefile.in
++++ b/ipv6loganon/Makefile.in
+@@ -19,7 +19,7 @@ LDFLAGS += @LDFLAGS_EXTRA@
+
+ INCLUDES= $(COPTS) @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE_L1@ @MMDB_INCLUDE_L1@ -I../ -I../lib/
+
+-LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB_L1@ @MMDB_LIB_L1@ @DYNLOAD_LIB@
++LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB_L1@ @MMDB_LIB_L1@ @EXTDB_LIB@ @DYNLOAD_LIB@ -lm
+
+ GETOBJS = @LIBOBJS@
+
+@@ -47,10 +47,10 @@ libipv6calc_db_wrapper:
+ cd ../ && ${MAKE} lib-make
+
+ ipv6loganon: $(OBJS) libipv6calc libipv6calc_db_wrapper
+- $(CC) -o ipv6loganon $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS) -lm
++ $(CC) -o ipv6loganon $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS)
+
+ static: ipv6loganon
+- $(CC) -o ipv6loganon-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS) $(LDFLAGS_EXTRA_STATIC) -lm -static
++ $(CC) -o ipv6loganon-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS) $(LDFLAGS_EXTRA_STATIC) -static
+
+ distclean:
+ ${MAKE} clean
+diff --git a/ipv6logconv/Makefile.in b/ipv6logconv/Makefile.in
+index dfd1e0b4..b624eb73 100644
+--- a/ipv6logconv/Makefile.in
++++ b/ipv6logconv/Makefile.in
+@@ -19,7 +19,7 @@ LDFLAGS += @LDFLAGS_EXTRA@
+
+ INCLUDES= @MD5_INCLUDE@ @GETOPT_INCLUDE@ @IP2LOCATION_INCLUDE_L1@ @MMDB_INCLUDE_L1@ -I../ -I../lib/ -I../databases/lib/
+
+-LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB_L1@ @MMDB_LIB_L1@ @DYNLOAD_LIB@
++LIBS = @IPV6CALC_LIB@ @IP2LOCATION_LIB_L1@ @MMDB_LIB_L1@ @EXTDB_LIB@ @DYNLOAD_LIB@ -lm
+
+ GETOBJS = @LIBOBJS@
+
+@@ -47,10 +47,10 @@ libipv6calc_db_wrapper:
+ cd ../ && ${MAKE} lib-make
+
+ ipv6logconv: $(OBJS) libipv6calc libipv6calc_db_wrapper
+- $(CC) -o ipv6logconv $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS) -lm
++ $(CC) -o ipv6logconv $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS)
+
+ static: ipv6logconv
+- $(CC) -o ipv6logconv-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS) $(LDFLAGS_EXTRA_STATIC) -lm -static
++ $(CC) -o ipv6logconv-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS) $(LDFLAGS_EXTRA_STATIC) -static
+
+ distclean:
+ ${MAKE} clean
+diff --git a/ipv6logstats/Makefile.in b/ipv6logstats/Makefile.in
+index 241723a4..98c093c2 100644
+--- a/ipv6logstats/Makefile.in
++++ b/ipv6logstats/Makefile.in
+@@ -19,7 +19,7 @@ LDFLAGS += @LDFLAGS_EXTRA@
+
+ INCLUDES= $(COPTS) @MD5_INCLUDE@ @GETOPT_INCLUDE@ @MMDB_INCLUDE_L1@ @IP2LOCATION_INCLUDE_L1@ -I../ -I../lib/ -I../databases/lib/
+
+-LIBS = @IPV6CALC_LIB@ @MMDB_LIB_L1@ @IP2LOCATION_LIB_L1@ @DYNLOAD_LIB@
++LIBS = @IPV6CALC_LIB@ @MMDB_LIB_L1@ @IP2LOCATION_LIB_L1@ @EXTDB_LIB@ @DYNLOAD_LIB@ -lm
+
+ GETOBJS = @LIBOBJS@
+
+@@ -47,10 +47,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) $(LDFLAGS) $(LIBS) -lm
++ $(CC) -o ipv6logstats $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS)
+
+ static: ipv6logstats
+- $(CC) -o ipv6logstats-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS) $(LDFLAGS_EXTRA_STATIC) -lm -static
++ $(CC) -o ipv6logstats-static $(OBJS) $(GETOBJS) $(LDFLAGS) $(LIBS) $(LDFLAGS_EXTRA_STATIC) -static
+
+ distclean:
+ ${MAKE} clean
+diff --git a/lib/Makefile.in b/lib/Makefile.in
+index 846b3d1f..1b9acec4 100644
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -17,6 +17,8 @@ LDFLAGS += @LDFLAGS@
+
+ INCLUDES= -I. -I../ -I../databases/lib/ @GETOPT_INCLUDE@ @MD5_INCLUDE@ @MMDB_INCLUDE_L1@ @IP2LOCATION_INCLUDE_L1@
+
++LIBS = @MD5_LIB@ -lm
++
+ ifeq ($(shell uname), Darwin)
+ SO_NAME_FLAGS=-install_name
+ else
+@@ -102,7 +104,7 @@ ifeq ($(SHARED_LIBRARY), yes)
+ cd ../ && ${MAKE} db-ipv4-assignment-make
+ cd ../ && ${MAKE} db-ipv6-assignment-make
+ echo "Creates shared library (libipv6calc.so)"
+- $(CC) -o libipv6calc.so.@PACKAGE_VERSION@ $(OBJS) $(CFLAGS) $(LDFLAGS) -shared -Wl,$(SO_NAME_FLAGS),libipv6calc.so.@PACKAGE_VERSION@
++ $(CC) -o libipv6calc.so.@PACKAGE_VERSION@ $(OBJS) $(CFLAGS) $(LDFLAGS) $(LIBS) -shared -Wl,$(SO_NAME_FLAGS),libipv6calc.so.@PACKAGE_VERSION@
+ else
+ echo "Nothing to do (shared library mode is not enabled)"
+ endif
diff --git a/net-misc/ipv6calc/ipv6calc-4.3.2.ebuild b/net-misc/ipv6calc/ipv6calc-4.3.2-r1.ebuild
similarity index 91%
rename from net-misc/ipv6calc/ipv6calc-4.3.2.ebuild
rename to net-misc/ipv6calc/ipv6calc-4.3.2-r1.ebuild
index c4ac0f939bb3..7ebd707f9917 100644
--- a/net-misc/ipv6calc/ipv6calc-4.3.2.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-4.3.2-r1.ebuild
@@ -3,7 +3,7 @@
EAPI="8"
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
DESCRIPTION="IPv6 address calculator"
HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
@@ -30,19 +30,24 @@ RDEPEND="
DEPEND="${RDEPEND}"
PATCHES=(
- # https://github.com/pbiering/ipv6calc/pull/49
- "${FILESDIR}"/${P}-fix_directcall_ar.patch
"${FILESDIR}"/${P}-ldconfig_musl.patch
+ # both are merged. to be removed.
+ "${FILESDIR}"/${P}-fix_directcall_ar.patch
+ "${FILESDIR}"/${P}-fix_libs.patch
)
DOCS=( ChangeLog CREDITS README README.MaxMindDB README.GeoIP2 TODO USAGE )
HTML_DOCS=( doc/ipv6calc.html )
+src_prepare() {
+ default
+ # configure.ac is patched
+ eautoconf
+}
+
src_configure() {
- # something is broken with clang. to investigate.
# see https://github.com/pbiering/ipv6calc/issues/45
- tc-is-clang && append-ldflags $(no-as-needed) && filter-lto
-
+ use cgi && tc-is-clang && filter-lto
# These options are broken. You can't disable them. That's
# okay because we want then force enabled.
# > libipv6calc_db_wrapper_BuiltIn.c:244:91:
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/ipv6calc/files/, net-misc/ipv6calc/
@ 2025-09-23 13:43 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-09-23 13:43 UTC (permalink / raw
To: gentoo-commits
commit: 9560e80cc86e9dd1a8f55fa8be10b5d444db6ae9
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Tue Sep 23 02:17:28 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 23 13:42:08 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9560e80c
net-misc/ipv6calc: fix linking order in configure
Closes: https://bugs.gentoo.org/962710
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/43905
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/ipv6calc-4.3.2-fix_configure.patch | 65 ++++++++++++++++++++++
net-misc/ipv6calc/ipv6calc-4.3.2-r1.ebuild | 1 +
2 files changed, 66 insertions(+)
diff --git a/net-misc/ipv6calc/files/ipv6calc-4.3.2-fix_configure.patch b/net-misc/ipv6calc/files/ipv6calc-4.3.2-fix_configure.patch
new file mode 100644
index 000000000000..04f4ff8d7066
--- /dev/null
+++ b/net-misc/ipv6calc/files/ipv6calc-4.3.2-fix_configure.patch
@@ -0,0 +1,65 @@
+PR merged https://github.com/pbiering/ipv6calc/pull/51.patch
+use LIBS instead of LDFLAGS #962710
+fix the failure that might happen with --as-needed
+--- a/configure.ac
++++ b/configure.ac
+@@ -310,8 +310,8 @@ AC_CHECK_HEADER(md5.h, [
+ AC_MSG_RESULT([libmd/md5.h header file found])
+ AC_CHECK_LIB(md, MD5Init,
+ [
+- LDFLAGS_ORIG="$LDFLAGS"
+- LDFLAGS="-lmd $LDFLAGS"
++ LIBS_ORIG="$LIBS"
++ LIBS="-lmd $LIBS"
+ HAVE_LIBMD_MD5=1
+ AC_CHECK_FUNCS(MD5Init MD5Update MD5Final,
+ [
+@@ -319,7 +319,7 @@ AC_CHECK_HEADER(md5.h, [
+ AC_MSG_RESULT([libmd crypto library supports MD5])
+ HAVE_OPENSSL_MD5=0
+ ])
+- LDFLAGS="$LDFLAGS_ORIG"
++ LIBS="$LIBS_ORIG"
+
+ if test "$HAVE_LIBMD_MD5" = "1"; then
+ AC_MSG_RESULT([*** libmd crypto library supports MD5])
+@@ -336,8 +336,8 @@ AC_CHECK_HEADER(openssl/evp.h, [
+ AC_MSG_RESULT([openssl/evp.h header file found])
+ AC_CHECK_LIB(crypto, EVP_DigestInit_ex,
+ [
+- LDFLAGS_ORIG="$LDFLAGS"
+- LDFLAGS="-lcrypto $LDFLAGS"
++ LIBS_ORIG="$LIBS"
++ LIBS="-lcrypto $LIBS"
+ HAVE_OPENSSL_EVP_MD5=1
+ HAVE_OPENSSL_EVP_MD5_LEGACY=1
+
+@@ -357,7 +357,7 @@ AC_CHECK_HEADER(openssl/evp.h, [
+ HAVE_OPENSSL_EVP_MD5_LEGACY=0
+ ])
+
+- LDFLAGS="$LDFLAGS_ORIG"
++ LIBS="$LIBS_ORIG"
+
+ if test "$HAVE_OPENSSL_EVP_MD5" = "1"; then
+ AC_MSG_RESULT([*** OpenSSL crypto library supports MD5 via EVP implementation])
+@@ -374,8 +374,8 @@ AC_CHECK_HEADER(openssl/md5.h, [
+ AC_MSG_RESULT([openssl/md5.h header file found])
+ AC_CHECK_LIB(crypto, MD5_Init,
+ [
+- LDFLAGS_ORIG="$LDFLAGS"
+- LDFLAGS="-lcrypto $LDFLAGS"
++ LIBS_ORIG="$LIBS"
++ LIBS="-lcrypto $LIBS"
+ HAVE_OPENSSL_MD5=1
+ AC_CHECK_FUNCS(MD5_Init MD5_Update MD5_Final,
+ [
+@@ -383,7 +383,7 @@ AC_CHECK_HEADER(openssl/md5.h, [
+ AC_MSG_RESULT([OpenSSL crypto library supports MD5 via legacy implementation])
+ HAVE_OPENSSL_MD5=0
+ ])
+- LDFLAGS="$LDFLAGS_ORIG"
++ LIBS="$LIBS_ORIG"
+
+ if test "$HAVE_OPENSSL_MD5" = "1"; then
+ AC_MSG_RESULT([*** OpenSSL crypto library supports MD5 via legacy implementation])
diff --git a/net-misc/ipv6calc/ipv6calc-4.3.2-r1.ebuild b/net-misc/ipv6calc/ipv6calc-4.3.2-r1.ebuild
index 387b548a470e..c6db22add90c 100644
--- a/net-misc/ipv6calc/ipv6calc-4.3.2-r1.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-4.3.2-r1.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
# both are merged. to be removed.
"${FILESDIR}"/${P}-fix_directcall_ar.patch
"${FILESDIR}"/${P}-fix_libs.patch
+ "${FILESDIR}"/${P}-fix_configure.patch
)
DOCS=( ChangeLog CREDITS README README.MaxMindDB README.GeoIP2 TODO USAGE )
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/ipv6calc/files/, net-misc/ipv6calc/
@ 2025-09-23 13:43 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2025-09-23 13:43 UTC (permalink / raw
To: gentoo-commits
commit: 38ff123d35b6dfc1b489ffa2c7b8d5e86f244b61
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Tue Sep 23 06:19:48 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 23 13:42:10 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ff123d
net-misc/ipv6calc: remove old
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
Part-of: https://github.com/gentoo/gentoo/pull/43905
Closes: https://github.com/gentoo/gentoo/pull/43905
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/ipv6calc/Manifest | 2 -
.../files/ipv6calc-4.0.1-underlinking.patch | 79 ------------------
net-misc/ipv6calc/ipv6calc-4.0.1-r1.ebuild | 80 ------------------
net-misc/ipv6calc/ipv6calc-4.3.3.ebuild | 97 ----------------------
4 files changed, 258 deletions(-)
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 93de7be82c4a..fe8793bad30f 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,4 +1,2 @@
-DIST ipv6calc-4.0.1.tar.gz 1705407 BLAKE2B 599573570df946f3362e213e481b8016b037de6263ed53aa61fd39b69810b2cf05a9c76408904bac4b076a4061091be8adbd6d5648a1f5bdc5d021ebd5123acb SHA512 6e60f4808b2622235ea9c43c99868798e7014fbee7dc51349cfe2ba28badcc767d45f9e30dc14d3b78c4a88ef2ff80083b4b0be64e93ed17b17817995364b3ce
DIST ipv6calc-4.3.2.tar.gz 1971792 BLAKE2B ea889f755aaf8b81fa2dd287d9fdd19127dde09221f22a3d6d2a42941a32c0851847ba3d6a37c33ad76552975e9ad515bcd14f0a83f6ada9abc657e0b979c204 SHA512 acb203feba7f4e800a715f740b3070314d3d1281758a6b99321d156f2ebaddffb6a088167a4c13ff92d4bd9565e7b0536d4f72643605544e99d222f8f5aa6efe
-DIST ipv6calc-4.3.3.tar.gz 1985400 BLAKE2B 510fea78079c373f7ad3ab828fc525d1649bf4886a0ebccc98482f5fe067700e79bbb7e0777e85073da47296a64ab0fc22e511840c2359109a6a97b23f863a94 SHA512 0e75c5aa1d0ed92a6088f4a20e3f03d2ae113f845907bf8e4f5d344e0d388bc17b2271de63edf7fda106aca2334c735e3bdc5792e628b906a0a97c7ea82ca2ee
DIST ipv6calc-4.4.0.tar.gz 1990779 BLAKE2B 051888aa43f4c87a182e171dd710ed244f7bc9ff2d0cc65074abe155149ea605d33cca747b40ee78cd5242a61b9c8c9225b5d5345b24f48469365548f81f73ec SHA512 be14b0d00e789ab065fad3de1622383967d225ca67021acd826d5baf058c1381795dc0379e86e05abf2e5fef2a6ef991f1b6e8435eaf271fc1302dfd48c34e26
diff --git a/net-misc/ipv6calc/files/ipv6calc-4.0.1-underlinking.patch b/net-misc/ipv6calc/files/ipv6calc-4.0.1-underlinking.patch
deleted file mode 100644
index 787ef1a3180c..000000000000
--- a/net-misc/ipv6calc/files/ipv6calc-4.0.1-underlinking.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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
deleted file mode 100644
index 7a5c10c8252b..000000000000
--- a/net-misc/ipv6calc/ipv6calc-4.0.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2025 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
-}
diff --git a/net-misc/ipv6calc/ipv6calc-4.3.3.ebuild b/net-misc/ipv6calc/ipv6calc-4.3.3.ebuild
deleted file mode 100644
index 2eb09221a49f..000000000000
--- a/net-misc/ipv6calc/ipv6calc-4.3.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit autotools flag-o-matic toolchain-funcs
-
-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 +openssl"
-
-RDEPEND="
- cgi? (
- dev-perl/HTML-Parser
- dev-perl/URI
- www-servers/apache
- )
- geoip? (
- dev-libs/geoip
- dev-libs/libmaxminddb:=
- )
- openssl? ( >=dev-libs/openssl-3.0.0:= )
- !openssl? ( app-crypt/libmd )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3.2-ldconfig_musl.patch
-)
-
-DOCS=( ChangeLog CREDITS README README.MaxMindDB README.GeoIP2 TODO USAGE )
-HTML_DOCS=( doc/ipv6calc.html )
-
-src_prepare() {
- default
- # configure.ac is patched
- eautoconf
-}
-
-src_configure() {
- # see https://github.com/pbiering/ipv6calc/issues/45
- use cgi && tc-is-clang && filter-lto
- # These options are broken. You can't disable them. That's
- # okay because we want then force enabled.
- # > libipv6calc_db_wrapper_BuiltIn.c:244:91:
- # > error: ‘dbipv4addr_registry_status’ undeclared (first use in this function)
- # --disable-db-as-registry
- # --disable-db-cc-registry
-
- tc-export AR
- 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
- # disable legacy md5
- # use libmd or openssl-evp-md5 (by default)
- --disable-openssl-md5
- $(use_enable openssl openssl-evp-md5)
- $(use_enable !openssl libmd-md5)
- $(use_enable cgi mod_ipv6calc)
- $(use_enable geoip)
- $(use_enable geoip mmdb)
- )
-
- if use geoip; then
- myeconfargs+=( "--with-geoip-db=${EPREFIX}/usr/share/GeoIP" )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- if [[ ${EUID} -eq 0 ]]; then
- # Disable tests that fail as root
- echo true > ipv6logstats/test_ipv6logstats.sh || die
- fi
- # it requires an apache instance
- echo true > mod_ipv6calc/test_mod_ipv6calc.sh || die
- # it requires network
- echo true > ipv6calcweb/test_ipv6calcweb.sh || die
- echo true > ipv6calcweb/test_ipv6calcweb_form.sh || die
- default
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-09-23 13:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-23 13:43 [gentoo-commits] repo/gentoo:master commit in: net-misc/ipv6calc/files/, net-misc/ipv6calc/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-09-23 13:43 Sam James
2025-07-26 21:33 Sam James
2025-07-25 6:15 Sam James
2025-07-25 1:14 Sam James
2024-09-14 6:24 Petr Vaněk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox