* [gentoo-commits] repo/gentoo:master commit in: net-firewall/conntrack-tools/files/, net-firewall/conntrack-tools/
@ 2017-11-01 22:06 Andreas Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2017-11-01 22:06 UTC (permalink / raw
To: gentoo-commits
commit: d94fc3980f778d1d88ec93f83b0b4ebb41a3fe14
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 20:16:18 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 1 22:06:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94fc398
net-firewall/conntrack-tools: Add support for libtirpc, bug 631902
Closes: https://bugs.gentoo.org/631902
Package-Manager: Portage-2.3.10, Repoman-2.3.3
.../conntrack-tools-1.4.4-r1.ebuild | 94 ++++++++++++++++++++++
.../files/conntrack-tools-1.4.4-rpc.patch | 43 ++++++++++
net-firewall/conntrack-tools/metadata.xml | 3 +
3 files changed, 140 insertions(+)
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
new file mode 100644
index 00000000000..c5d0f532f96
--- /dev/null
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.4-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="~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
new file mode 100644
index 00000000000..739857790c3
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch
@@ -0,0 +1,43 @@
+diff -ruN conntrack-tools-1.4.4.orig/configure.ac conntrack-tools-1.4.4/configure.ac
+--- conntrack-tools-1.4.4.orig/configure.ac 2016-08-22 10:43:02.954671362 -0000
++++ conntrack-tools-1.4.4/configure.ac 2017-09-24 19:50:37.225517482 -0000
+@@ -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])
+diff -ruN conntrack-tools-1.4.4.orig/src/helpers/Makefile.am conntrack-tools-1.4.4/src/helpers/Makefile.am
+--- conntrack-tools-1.4.4.orig/src/helpers/Makefile.am 2015-02-11 15:36:00.650610125 -0000
++++ conntrack-tools-1.4.4/src/helpers/Makefile.am 2017-09-24 19:52:11.644990587 -0000
+@@ -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)
diff --git a/net-firewall/conntrack-tools/metadata.xml b/net-firewall/conntrack-tools/metadata.xml
index 10198984dfc..cd2eeff6fa9 100644
--- a/net-firewall/conntrack-tools/metadata.xml
+++ b/net-firewall/conntrack-tools/metadata.xml
@@ -10,4 +10,7 @@
the userspace command line interface, and conntrackd, the userspace
daemon.
</longdescription>
+ <use>
+ <flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/conntrack-tools/files/, net-firewall/conntrack-tools/
@ 2018-05-06 12:29 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2018-05-06 12:29 UTC (permalink / raw
To: gentoo-commits
commit: 3926d04685b958e893c2aa661a52414b29495888
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun May 6 12:19:07 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun May 6 12:29:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3926d046
net-firewall/conntrack-tools: Version 1.4.5.
Package-Manager: Portage-2.3.36, Repoman-2.3.9
net-firewall/conntrack-tools/Manifest | 1 +
.../conntrack-tools/conntrack-tools-1.4.5.ebuild | 94 ++++++++++++++++++++++
.../files/conntrack-tools-1.4.5-rpc.patch | 41 ++++++++++
3 files changed, 136 insertions(+)
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index d804cd46cd8..c9803426dc7 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,3 +1,4 @@
DIST conntrack-tools-1.4.2.tar.bz2 472074 BLAKE2B 9e3a90b80ea5d47737d5d5bbecd922110f2abc50e922fa2236a61f02e72c8cd4626d51fa31801f6f8b1be26b4ff71f216bd89d3599eebfc12b0f7a69bff3ec4e SHA512 1fed742593caf8bbac96a58df8f7e806d1c0f1dfea8fc601d65aa89b4243b1022949a2bf03ab0ca25994a13e50b3b1ee43a31827e0dc4da1399801ddac623d56
DIST conntrack-tools-1.4.3.tar.bz2 487111 BLAKE2B 9b8f43129898bdc0c2475a4081333864fb4145a89ced96f7c88d8c8b52bbc9ceb55254b7f9c9776cccc3b89ba6b2aacfb91790ca052defe1a0290a10e85bbb3a SHA512 be76a0ddb7470249c58ceab72cb94ffc05f5cc6d740a0755c9c782e948b4234eb1da4f7c7df1f14e4125cca9f12f3b4d2dcd444fe011941952aa3eeb13cb72c3
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.5.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
new file mode 100644
index 00000000000..e2a4a8a94ac
--- /dev/null
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools 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="~amd64 ~arm64 ~hppa ~x86"
+IUSE="doc +libtirpc"
+
+RDEPEND="
+ >=net-libs/libmnl-1.0.3
+ >=net-libs/libnetfilter_conntrack-1.0.7
+ >=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
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.5-rpc.patch
+)
+
+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
+
+ 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.5-rpc.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-rpc.patch
new file mode 100644
index 00000000000..1f7fc44f44a
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-rpc.patch
@@ -0,0 +1,41 @@
+--- 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.7])
+--- a/src/helpers/Makefile.am
++++ b/src/helpers/Makefile.am
+@@ -30,8 +30,8 @@
+ ct_helper_mdns_la_CFLAGS = $(HELPER_CFLAGS)
+
+ ct_helper_rpc_la_SOURCES = rpc.c
+-ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS)
+-ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS)
++ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS) $(RPC_LIBS)
++ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) $(RPC_CFLAGS)
+
+ ct_helper_tftp_la_SOURCES = tftp.c
+ ct_helper_tftp_la_LDFLAGS = $(HELPER_LDFLAGS)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/conntrack-tools/files/, net-firewall/conntrack-tools/
@ 2020-04-02 14:47 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2020-04-02 14:47 UTC (permalink / raw
To: gentoo-commits
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)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-firewall/conntrack-tools/files/, net-firewall/conntrack-tools/
@ 2022-11-24 8:40 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-11-24 8:40 UTC (permalink / raw
To: gentoo-commits
commit: 8bc234767b0bb665c2cb28a46be27a8f4835d48a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 08:37:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 24 08:37:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bc23476
net-firewall/conntrack-tools: fix build w/ clang 16
Closes: https://bugs.gentoo.org/871168
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../conntrack-tools-1.4.7-r1.ebuild | 114 +++++++++++++++++++++
...kefile.am-don-t-suppress-various-warnings.patch | 28 +++++
...k-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch | 19 ++++
...5-0003-Fix-Wimplicit-function-declaration.patch | 56 ++++++++++
4 files changed, 217 insertions(+)
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.7-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.7-r1.ebuild
new file mode 100644
index 000000000000..07701cad4d77
--- /dev/null
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.7-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
+inherit autotools linux-info systemd verify-sig
+
+DESCRIPTION="Connection tracking userspace tools"
+HOMEPAGE="https://conntrack-tools.netfilter.org"
+SRC_URI="https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2
+ verify-sig? ( https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc +cthelper +cttimeout systemd"
+
+RDEPEND="
+ >=net-libs/libmnl-1.0.3
+ >=net-libs/libnetfilter_conntrack-1.0.9
+ >=net-libs/libnetfilter_queue-1.0.2
+ >=net-libs/libnfnetlink-1.0.1
+ net-libs/libtirpc
+ cthelper? (
+ >=net-libs/libnetfilter_cthelper-1.0.0
+ )
+ cttimeout? (
+ >=net-libs/libnetfilter_cttimeout-1.0.0
+ )
+ systemd? (
+ >=sys-apps/systemd-227
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/xmlto
+ )
+ verify-sig? ( sec-keys/openpgp-keys-netfilter )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch
+ "${FILESDIR}"/${PN}-1.4.5-0002-Fix-Wstrict-prototypes.patch
+ "${FILESDIR}"/${PN}-1.4.5-0003-Fix-Wimplicit-function-declaration.patch
+)
+
+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
+
+ # Drop once Clang 16 patches merged (implicit func decl, etc)
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable cthelper) \
+ $(use_enable cttimeout) \
+ $(use_enable systemd)
+}
+
+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
+
+ systemd_dounit "${FILESDIR}"/conntrackd.service
+
+ 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.5-0001-Makefile.am-don-t-suppress-various-warnings.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch
new file mode 100644
index 000000000000..bc9bd8d3a13d
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch
@@ -0,0 +1,28 @@
+https://bugzilla.netfilter.org/show_bug.cgi?id=1637
+
+From a450f6374dc1b0296578599adf77f9ac025fab85 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 24 Nov 2022 07:51:23 +0000
+Subject: [PATCH 1/3] Makefile.am: don't suppress various warnings
+
+These will become fatal with Clang 16 and GCC 14 anyway, but let's
+address the real problem (followup commit).
+
+We do have to keep one wrt yyerror() & const char* though, but
+the issue is contained to the code Bison generates.
+
+Bug: https://bugzilla.netfilter.org/show_bug.cgi?id=1637
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -60,8 +60,8 @@ if HAVE_SYSTEMD
+ conntrackd_SOURCES += systemd.c
+ endif
+
+-# yacc and lex generate dirty code
+-read_config_yy.o read_config_lex.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations -Wno-implicit-function-declaration -Wno-nested-externs -Wno-undef -Wno-redundant-decls -Wno-sign-compare
++# yacc and lex generate dirty code (issue is in yyerror() wrt const char* vs. char*)
++read_config_yy.o read_config_lex.o: AM_CFLAGS += -Wno-incompatible-pointer-types -Wno-discarded-qualifiers
+
+ conntrackd_LDADD = ${LIBMNL_LIBS} ${LIBNETFILTER_CONNTRACK_LIBS} \
+ ${libdl_LIBS} ${LIBNFNETLINK_LIBS}
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch
new file mode 100644
index 000000000000..e170ec07ba0a
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0002-Fix-Wstrict-prototypes.patch
@@ -0,0 +1,19 @@
+https://bugzilla.netfilter.org/show_bug.cgi?id=1637
+
+From 11965f7020fbadcc9784daf598687841e96ef3fe Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 24 Nov 2022 07:52:01 +0000
+Subject: [PATCH 2/3] Fix -Wstrict-prototypes
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/network.c
++++ b/src/network.c
+@@ -113,7 +113,7 @@ void nethdr_track_update_seq(uint32_t seq)
+ STATE_SYNC(last_seq_recv) = seq;
+ }
+
+-int nethdr_track_is_seq_set()
++int nethdr_track_is_seq_set(void)
+ {
+ return local_seq_set;
+ }
diff --git a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..eb34f4ffd4e4
--- /dev/null
+++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-0003-Fix-Wimplicit-function-declaration.patch
@@ -0,0 +1,56 @@
+https://bugzilla.netfilter.org/show_bug.cgi?id=1637
+
+From a6df37777fc47c2473a13501c17eb3cbbf922ec1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 24 Nov 2022 07:57:37 +0000
+Subject: [PATCH 3/3] Fix -Wimplicit-function-declaration
+
+Bug: https://bugzilla.netfilter.org/show_bug.cgi?id=1637
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/read_config_lex.l
++++ b/src/read_config_lex.l
+@@ -21,6 +21,7 @@
+
+ #include <string.h>
+
++#include "log.h"
+ #include "conntrackd.h"
+ #include "read_config_yy.h"
+ %}
+@@ -174,7 +175,7 @@ notrack [N|n][O|o][T|t][R|r][A|a][C|c][K|k]
+ %%
+
+ int
+-yywrap()
++yywrap(void)
+ {
+ return 1;
+ }
+--- a/src/read_config_yy.y
++++ b/src/read_config_yy.y
+@@ -31,14 +31,25 @@
+ #include "cidr.h"
+ #include "helper.h"
+ #include "stack.h"
++#include "log.h"
++
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++
+ #include <sched.h>
+ #include <dlfcn.h>
++
+ #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
+ #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
+
+ extern char *yytext;
+ extern int yylineno;
+
++int yylex (void);
++int yyerror (char *msg);
++void yyrestart (FILE *input_file);
++
+ struct ct_conf conf;
+
+ static void __kernel_filter_start(void);
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-11-24 8:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-06 12:29 [gentoo-commits] repo/gentoo:master commit in: net-firewall/conntrack-tools/files/, net-firewall/conntrack-tools/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2022-11-24 8:40 Sam James
2020-04-02 14:47 Jeroen Roovers
2017-11-01 22:06 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox