mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-17 14:49:30 -07:00
net-misc/ipv6calc: remove old
Signed-off-by: Nicolas PARLANT <nicolas.parlant@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@gentoo.org>
This commit is contained in:
Nicolas PARLANT
committed by
Sam James
Sam James
parent
b724420367
commit
38ff123d35
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user