gentoo resync : 02.11.2017

4 files changed, 143 insertions, 1 deletions

diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index b1acd4345ee3..187e11c1f13b 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,3 +1,4 @@
+AUX conntrack-tools-1.4.4-rpc.patch 2175 SHA256 3c547bd659c006568fb006d99876378d653f42c4b2d6950b93e4276d483bd0fd SHA512 ab7708533cc889d5bf5d360a9ff4b6aef668196d9b6b123a2898cf86b61eb41c69a0610cf27d00b625946695c8de2857b61e568b7b923cd917ba8b2d8ff05416 WHIRLPOOL 74e28723c01fe41a6601d310191bbd7c7a40e53a8ebd4cf9b16dbc304854eeaec8ddeb430185146d20c11482e319de442bff5492835339dc85528b7def7728ff
 AUX conntrackd.confd-r2 441 SHA256 355f91c830f82343a058060e5dd060f72a940471f43c970d46a5ea63c40987c0 SHA512 3d72d56d44094593f6ff1eac421fe6a4f0d20450ce698c175adf1b18a859b1a24c7120fa60431b2a00da62ae3749c4619106c8e93fb8fc763ceefc26a82d2ed2 WHIRLPOOL d583647cca267234ef942a27159203317391c990b997a139c9251b43788fbcc1284d5e6cf8f15570dc4803d7dae7283a8bc6d4c9ffc76a4710b0de784c3a69ad
 AUX conntrackd.initd-r3 2238 SHA256 cd271cebad9a0111d091ada71f60118d6e22fd5b0b3c0bf8b5be3aacf5797e48 SHA512 445c19ad42e92136e9dfd6b7885334075e72971b73ff7178c6bf16a31e0c037f17d9d039394fa8002f0ad5182a353f7c803d3f900e8873b671eecca94ced78fe WHIRLPOOL c3700e30e522d90ef8319728c1968d9c5d8726b759558ed4e71569c1f8e1e18d4744781e3f4d268f9bc895a404c9a261ecca46d68bbfee1ed0c1fad8df8eb024
 DIST conntrack-tools-1.4.2.tar.bz2 472074 SHA256 e5c423dc077f9ca8767eaa6cf40446943905711c6a8fe27f9cc1977d4d6aa11e SHA512 1fed742593caf8bbac96a58df8f7e806d1c0f1dfea8fc601d65aa89b4243b1022949a2bf03ab0ca25994a13e50b3b1ee43a31827e0dc4da1399801ddac623d56 WHIRLPOOL 7405e8b812c98c06bdcdbfea983178f5830001cf247b9a63aac6e19e2497b1bf2bdf8c7c6445dad60f5463eff6cc0ea58d14eca2990b2b3b3f54032daca85572
@@ -5,7 +6,8 @@ DIST conntrack-tools-1.4.3.tar.bz2 487111 SHA256 af3ccc60356cfedf941065fdaaf9cd5
 DIST conntrack-tools-1.4.4.tar.bz2 1010504 SHA256 b7caf4fcc4c03575df57d25e5216584d597fd916c891f191dac616ce68bdba6c SHA512 f53bd620bfd4e854e792416527a3090d883c5f00d1d8365e52ce3ba204218dc431490703985d3fdae44decbcddb24ed610bf81a6a99bd7ea01482f95f71df0f5 WHIRLPOOL ba7c6a917e92651c2fbd23f5839bd42c9ee45dfb1bb12a0949e5610fb72ef5d1aceae0d191604574eee789301576c61b2177b9d1cb5e826f657fe2634f3f99b1
 EBUILD conntrack-tools-1.4.2.ebuild 1938 SHA256 da6e262b2f91ee35e2b6f5231499f4460e8019cce9aaeadf67758eed9205b9b5 SHA512 b7bc4438561d199cba668ebc1ef691ea0a7d737cee8beeeed1c703d479d9161da68f6b2125b9555decda6dd9271955f4c146ff002a3c53a5263db9f7a5a95695 WHIRLPOOL 1c02cf2cace3ee2e30e3f1c0627eddd0a28fda75da59c9fab6590ef36f206deb4006cc88dc6b0f04cdc199a11a988147d7debbd25a662a3fcc1860976adb998c
 EBUILD conntrack-tools-1.4.3.ebuild 1935 SHA256 d793d340a15d5f993b3d7ba10299bfa22f62ce7073b4f4f7eaade156e0bfc060 SHA512 80fa97972a0dce17a5c08bae77123ac0931115cc3d36414c3cb959fbe9edba6ee33a659fdf5c83a6f4c8dfeef94584059adce56955040c56ae958c00a31ef448 WHIRLPOOL 6f27859600c680bd87e015b408e23da8559d5d476a8aa4c71e57ba296ff1ac0d603499a2b3e05018c37d27b77f51d88792ef4bc7924c4b848cef9ed61b11b5c9
+EBUILD conntrack-tools-1.4.4-r1.ebuild 2084 SHA256 8c5d722d407d42a46c5a53707e2e7a19997f7c794d7f4838623c3bf7cc8276f8 SHA512 e08319a89e625b04872d32144db7d6ad4c157200df5b905d7d9cc8b193688b044d3cd968c24b58d06a4a5aaf4061d063289a3fddfda869b64b514f64b7bacf78 WHIRLPOOL 824576404be21f294640dd1f3a1aede8c3e090d19965f114a0215b52a522ffaf68e59547b32d74183d8d0b9429c8c9093d9c1b0ef7d850860c0d949c2b3dd1ad
 EBUILD conntrack-tools-1.4.4.ebuild 1900 SHA256 e1a22bf9e2e2f24c7b3a2f3b0ed805dc232bc340a193e0474cc5417839c1a5fa SHA512 1b009478cd4a93a1aedaab452c947c6c76e0d18cbdbdccef72e995bc7217066883c98c7232fe76a9946b87f8dbb595eef33aba5e21230d22a1c9268171896d83 WHIRLPOOL 8721e444e796145e8dcf131c07d3f42ae859670a67afc667366496c6ea4b4be983fe2ec32831ede286c0d1e5b3b721a74ddb6da32bcada6592d8b78153b9d1a9
 MISC ChangeLog 3183 SHA256 c777c2b67199bb522e9b10e54d506d48d74b5c07dbdde24586598cedeee33a70 SHA512 3b0de1360e830cf5c54efc06fdc814d58c79d05a9e709a7b8f5a251e1446cdc3fcc92aee5a11bab29f7a80984f651184b411c4297e7a6322173f484d977eb392 WHIRLPOOL 77625a82d74a7ea07014a8686425acecb20ac0dd184b1b23b0c27f74ea950237531e8d5818ba31e25068ed1bf687492a6a92b79b5f9a1f6af37d609800565b9b
 MISC ChangeLog-2015 11264 SHA256 f3873bea101ceea13c3eeadc8aa97feecacb9ffcff9592f703848a314a58c60c SHA512 116e47437dd346ff680bb0a555444115d4aeb23eda0d01c625dee69cfcea6170cf9de2c6a653096e0ddca9f01660b449ce28dd351d20c6ff3a01c11ec75c305a WHIRLPOOL 241401bf7fe4ff1b192273d74650f15ed3ec76c78feacda504def80d48ee7a0d348ef575b89f622c561db160c196e03690a3bad7eb3ee774b09e35b58afb8821
-MISC metadata.xml 481 SHA256 6b661f627a957ab2e3872c728ccad7da40b22879ba97e508494ddc3479ed9879 SHA512 155c9d013b08eac1798c429411aecfc64c7e2f2cf50a3389fc6c30a5805b36bd85b6914f7e7cd4d14cb5d9d8e762db502200fd4b77322ccffd7641fd465a2273 WHIRLPOOL 314fd96d97a7e9527937f5c62e046ed0df7506e69874d32eeb66f27275e02b2f9c53629e3b81a512b82888530b7b1aaadfc57f4767cf2e6aa039318a33e97b86
+MISC metadata.xml 586 SHA256 0432d6d4e2194662f39db93265ff3308453ee4de03ed3d2fc5b7399950c3b44f SHA512 84bb40112cdc8fac909d4315bd5ef80f365f30919edb394524123272ad3c3cbf74da6a5957a7c06d42c2c802f9fe1af2d4d791bcb36258336b86b91abea92af9 WHIRLPOOL 10ba7019508223b07e1280dcf809dbca0f6dd0d002e11f89228284df5ef17d5cb4f326ccf6b8faf364b739613f49b6e7e4c162c506738dbcbe615d428d19924d
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 000000000000..c5d0f532f96d
--- /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 000000000000..739857790c3d
--- /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 10198984dfc7..cd2eeff6fa91 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>