Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-firewall/conntrack-tools/files/, net-firewall/conntrack-tools/
Date: Sun, 06 May 2018 12:29:58
Message-Id: 1525609791.3926d04685b958e893c2aa661a52414b29495888.jer@gentoo
1 commit: 3926d04685b958e893c2aa661a52414b29495888
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 6 12:19:07 2018 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sun May 6 12:29:51 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3926d046
7
8 net-firewall/conntrack-tools: Version 1.4.5.
9
10 Package-Manager: Portage-2.3.36, Repoman-2.3.9
11
12 net-firewall/conntrack-tools/Manifest | 1 +
13 .../conntrack-tools/conntrack-tools-1.4.5.ebuild | 94 ++++++++++++++++++++++
14 .../files/conntrack-tools-1.4.5-rpc.patch | 41 ++++++++++
15 3 files changed, 136 insertions(+)
16
17 diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
18 index d804cd46cd8..c9803426dc7 100644
19 --- a/net-firewall/conntrack-tools/Manifest
20 +++ b/net-firewall/conntrack-tools/Manifest
21 @@ -1,3 +1,4 @@
22 DIST conntrack-tools-1.4.2.tar.bz2 472074 BLAKE2B 9e3a90b80ea5d47737d5d5bbecd922110f2abc50e922fa2236a61f02e72c8cd4626d51fa31801f6f8b1be26b4ff71f216bd89d3599eebfc12b0f7a69bff3ec4e SHA512 1fed742593caf8bbac96a58df8f7e806d1c0f1dfea8fc601d65aa89b4243b1022949a2bf03ab0ca25994a13e50b3b1ee43a31827e0dc4da1399801ddac623d56
23 DIST conntrack-tools-1.4.3.tar.bz2 487111 BLAKE2B 9b8f43129898bdc0c2475a4081333864fb4145a89ced96f7c88d8c8b52bbc9ceb55254b7f9c9776cccc3b89ba6b2aacfb91790ca052defe1a0290a10e85bbb3a SHA512 be76a0ddb7470249c58ceab72cb94ffc05f5cc6d740a0755c9c782e948b4234eb1da4f7c7df1f14e4125cca9f12f3b4d2dcd444fe011941952aa3eeb13cb72c3
24 DIST conntrack-tools-1.4.4.tar.bz2 1010504 BLAKE2B 4190672f017f434b6b4a1841022d64256eac1953c6f62aecb087e2ef0f5c83ad57809c9170de816eb7e0f934c41de0a541328bab7e064243e48e9f18ade3f5fb SHA512 f53bd620bfd4e854e792416527a3090d883c5f00d1d8365e52ce3ba204218dc431490703985d3fdae44decbcddb24ed610bf81a6a99bd7ea01482f95f71df0f5
25 +DIST conntrack-tools-1.4.5.tar.bz2 479562 BLAKE2B 229531d1c6c237e539df5b83525dca5ce0b009a76a2a5f873282eabc73cc00095c15c686bc68f9364e81efc846bfa8eac8b08f7fd476199d10d0c25190ca2456 SHA512 480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1
26
27 diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
28 new file mode 100644
29 index 00000000000..e2a4a8a94ac
30 --- /dev/null
31 +++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.5.ebuild
32 @@ -0,0 +1,94 @@
33 +# Copyright 1999-2018 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=6
37 +inherit autotools linux-info
38 +
39 +DESCRIPTION="Connection tracking userspace tools"
40 +HOMEPAGE="http://conntrack-tools.netfilter.org"
41 +SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
42 +
43 +LICENSE="GPL-2"
44 +SLOT="0"
45 +KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
46 +IUSE="doc +libtirpc"
47 +
48 +RDEPEND="
49 + >=net-libs/libmnl-1.0.3
50 + >=net-libs/libnetfilter_conntrack-1.0.7
51 + >=net-libs/libnetfilter_cthelper-1.0.0
52 + >=net-libs/libnetfilter_cttimeout-1.0.0
53 + >=net-libs/libnetfilter_queue-1.0.2
54 + >=net-libs/libnfnetlink-1.0.1
55 + !libtirpc? ( sys-libs/glibc[rpc(-)] )
56 + libtirpc? ( net-libs/libtirpc )
57 +"
58 +DEPEND="
59 + ${RDEPEND}
60 + doc? (
61 + app-text/docbook-xml-dtd:4.1.2
62 + app-text/xmlto
63 + )
64 + virtual/pkgconfig
65 + sys-devel/bison
66 + sys-devel/flex
67 +"
68 +PATCHES=(
69 + "${FILESDIR}"/${PN}-1.4.5-rpc.patch
70 +)
71 +
72 +pkg_setup() {
73 + linux-info_pkg_setup
74 +
75 + if kernel_is lt 2 6 18 ; then
76 + die "${PN} requires at least 2.6.18 kernel version"
77 + fi
78 +
79 + #netfilter core team has changed some option names with kernel 2.6.20
80 + if kernel_is lt 2 6 20 ; then
81 + CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
82 + else
83 + CONFIG_CHECK="~NF_CT_NETLINK"
84 + fi
85 + CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK
86 + ~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS"
87 +
88 + check_extra_config
89 +
90 + linux_config_exists || \
91 + linux_chkconfig_present "NF_CONNTRACK_IPV4" || \
92 + linux_chkconfig_present "NF_CONNTRACK_IPV6" || \
93 + ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \
94 + "are not set when one at least should be."
95 +}
96 +
97 +src_prepare() {
98 + default
99 +
100 + # bug #474858
101 + sed -i -e 's:/var/lock:/run/lock:' doc/stats/conntrackd.conf || die
102 +
103 + eautoreconf
104 +}
105 +
106 +src_configure() {
107 + econf $(use_with libtirpc)
108 +}
109 +
110 +src_compile() {
111 + default
112 + use doc && emake -C doc/manual
113 +}
114 +
115 +src_install() {
116 + default
117 +
118 + newinitd "${FILESDIR}/conntrackd.initd-r3" conntrackd
119 + newconfd "${FILESDIR}/conntrackd.confd-r2" conntrackd
120 +
121 + insinto /etc/conntrackd
122 + doins doc/stats/conntrackd.conf
123 +
124 + dodoc -r doc/sync doc/stats AUTHORS TODO
125 + use doc && dodoc doc/manual/${PN}.html
126 +}
127
128 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
129 new file mode 100644
130 index 00000000000..1f7fc44f44a
131 --- /dev/null
132 +++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.5-rpc.patch
133 @@ -0,0 +1,41 @@
134 +--- a/configure.ac
135 ++++ b/configure.ac
136 +@@ -50,6 +50,25 @@
137 + AS_HELP_STRING([--enable-systemd], [Build systemd support]),
138 + [enable_systemd="$enableval"], [enable_systemd="no"])
139 +
140 ++AC_ARG_WITH([libtirpc],
141 ++ AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
142 ++ [], [ with_libtirpc=no ])
143 ++
144 ++AS_IF([test "x$with_libtirpc" != xno],
145 ++ [PKG_CHECK_MODULES([TIRPC],
146 ++ [libtirpc],
147 ++ [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
148 ++ [AC_MSG_ERROR([libtirpc requested, but library not found.])]
149 ++ )],
150 ++ [AC_CHECK_HEADER(rpc/rpc.h,
151 ++ [RPC_CFLAGS=""; RPC_LIBS="";],
152 ++ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
153 ++ )]
154 ++)
155 ++
156 ++AC_SUBST(RPC_CFLAGS)
157 ++AC_SUBST(RPC_LIBS)
158 ++
159 + PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
160 + PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
161 + PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.7])
162 +--- a/src/helpers/Makefile.am
163 ++++ b/src/helpers/Makefile.am
164 +@@ -30,8 +30,8 @@
165 + ct_helper_mdns_la_CFLAGS = $(HELPER_CFLAGS)
166 +
167 + ct_helper_rpc_la_SOURCES = rpc.c
168 +-ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS)
169 +-ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS)
170 ++ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS) $(RPC_LIBS)
171 ++ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) $(RPC_CFLAGS)
172 +
173 + ct_helper_tftp_la_SOURCES = tftp.c
174 + ct_helper_tftp_la_LDFLAGS = $(HELPER_LDFLAGS)