[gentoo-commits] repo/gentoo:master commit in: net-firewall/conntrack-tools/files/, net-firewall/conntrack-tools/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     63b37321e1252a117a3959d5c03eef6da5bb5958
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  2 14:31:38 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Apr  2 14:47:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b37321

net-firewall/conntrack-tools: Old

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-firewall/conntrack-tools/Manifest              |  1 -
 .../conntrack-tools-1.4.4-r1.ebuild                | 94 ----------------------
 .../files/conntrack-tools-1.4.4-rpc.patch          | 41 ----------
 3 files changed, 136 deletions(-)

diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index 4a070bd0d63..dffd9a990d9 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,2 +1 @@
-DIST conntrack-tools-1.4.4.tar.bz2 1010504 BLAKE2B 4190672f017f434b6b4a1841022d64256eac1953c6f62aecb087e2ef0f5c83ad57809c9170de816eb7e0f934c41de0a541328bab7e064243e48e9f18ade3f5fb SHA512 f53bd620bfd4e854e792416527a3090d883c5f00d1d8365e52ce3ba204218dc431490703985d3fdae44decbcddb24ed610bf81a6a99bd7ea01482f95f71df0f5
 DIST conntrack-tools-1.4.5.tar.bz2 479562 BLAKE2B 229531d1c6c237e539df5b83525dca5ce0b009a76a2a5f873282eabc73cc00095c15c686bc68f9364e81efc846bfa8eac8b08f7fd476199d10d0c25190ca2456 SHA512 480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1

diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.4-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.4-r1.ebuild
deleted file mode 100644
index 6d420e097be..00000000000
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils linux-info
-
-DESCRIPTION="Connection tracking userspace tools"
-HOMEPAGE="http://conntrack-tools.netfilter.org"
-SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa x86"
-IUSE="doc +libtirpc"
-
-RDEPEND="
-	>=net-libs/libmnl-1.0.3
-	>=net-libs/libnetfilter_conntrack-1.0.6
-	>=net-libs/libnetfilter_cthelper-1.0.0
-	>=net-libs/libnetfilter_cttimeout-1.0.0
-	>=net-libs/libnetfilter_queue-1.0.2
-	>=net-libs/libnfnetlink-1.0.1
-	!libtirpc? ( sys-libs/glibc[rpc(-)] )
-	libtirpc? ( net-libs/libtirpc )
-"
-DEPEND="
-	${RDEPEND}
-	doc? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-	)
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex
-"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if kernel_is lt 2 6 18 ; then
-		die "${PN} requires at least 2.6.18 kernel version"
-	fi
-
-	#netfilter core team has changed some option names with kernel 2.6.20
-	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
-	else
-		CONFIG_CHECK="~NF_CT_NETLINK"
-	fi
-	CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK
-		~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS"
-
-	check_extra_config
-
-	linux_config_exists || \
-		linux_chkconfig_present "NF_CONNTRACK_IPV4" || \
-		linux_chkconfig_present "NF_CONNTRACK_IPV6" || \
-		ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \
-			"are not set when one at least should be."
-}
-
-src_prepare() {
-	default
-
-	# bug #474858
-	sed -i -e 's:/var/lock:/run/lock:' doc/stats/conntrackd.conf || die
-
-	# bug #631902
-	epatch "${FILESDIR}/${P}-rpc.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with libtirpc)
-}
-
-src_compile() {
-	default
-	use doc && emake -C doc/manual
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/conntrackd.initd-r3" conntrackd
-	newconfd "${FILESDIR}/conntrackd.confd-r2" conntrackd
-
-	insinto /etc/conntrackd
-	doins doc/stats/conntrackd.conf
-
-	dodoc -r doc/sync doc/stats AUTHORS TODO
-	use doc && dodoc doc/manual/${PN}.html
-}

diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch
deleted file mode 100644
index 01ef537a735..00000000000
--- a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -50,6 +50,25 @@
-         AS_HELP_STRING([--enable-systemd], [Build systemd support]),
-         [enable_systemd="$enableval"], [enable_systemd="no"])
- 
-+AC_ARG_WITH([libtirpc],
-+           AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
-+           [], [ with_libtirpc=no ])
-+
-+AS_IF([test "x$with_libtirpc" != xno],
-+      [PKG_CHECK_MODULES([TIRPC],
-+                         [libtirpc],
-+                         [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
-+                        [AC_MSG_ERROR([libtirpc requested, but library not found.])]
-+                       )],
-+      [AC_CHECK_HEADER(rpc/rpc.h,
-+                      [RPC_CFLAGS=""; RPC_LIBS="";],
-+                      [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
-+                     )]
-+)
-+
-+AC_SUBST(RPC_CFLAGS)
-+AC_SUBST(RPC_LIBS)
-+
- PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
- PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
- PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.6])
---- a/src/helpers/Makefile.am
-+++ b/src/helpers/Makefile.am
-@@ -22,8 +22,8 @@
- ct_helper_ftp_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)
- 
- ct_helper_rpc_la_SOURCES = rpc.c
--ct_helper_rpc_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS)
--ct_helper_rpc_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)
-+ct_helper_rpc_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) $(RPC_LIBS)
-+ct_helper_rpc_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS) $(RPC_CFLAGS)
- 
- ct_helper_tftp_la_SOURCES = tftp.c
- ct_helper_tftp_la_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS)