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/
Date: Sun, 06 May 2018 12:29:58
Message-Id: 1525609786.d4e4be15ecce347f5cad9dc570cccdd763f7b0c9.jer@gentoo
1 commit: d4e4be15ecce347f5cad9dc570cccdd763f7b0c9
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 6 12:06:41 2018 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sun May 6 12:29:46 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e4be15
7
8 net-firewall/conntrack-tools: Fix patch.
9
10 Package-Manager: Portage-2.3.36, Repoman-2.3.9
11
12 .../conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch | 10 ++++------
13 1 file changed, 4 insertions(+), 6 deletions(-)
14
15 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
16 index 739857790c3..01ef537a735 100644
17 --- a/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch
18 +++ b/net-firewall/conntrack-tools/files/conntrack-tools-1.4.4-rpc.patch
19 @@ -1,6 +1,5 @@
20 -diff -ruN conntrack-tools-1.4.4.orig/configure.ac conntrack-tools-1.4.4/configure.ac
21 ---- conntrack-tools-1.4.4.orig/configure.ac 2016-08-22 10:43:02.954671362 -0000
22 -+++ conntrack-tools-1.4.4/configure.ac 2017-09-24 19:50:37.225517482 -0000
23 +--- a/configure.ac
24 ++++ b/configure.ac
25 @@ -50,6 +50,25 @@
26 AS_HELP_STRING([--enable-systemd], [Build systemd support]),
27 [enable_systemd="$enableval"], [enable_systemd="no"])
28 @@ -27,9 +26,8 @@ diff -ruN conntrack-tools-1.4.4.orig/configure.ac conntrack-tools-1.4.4/configur
29 PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
30 PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
31 PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.6])
32 -diff -ruN conntrack-tools-1.4.4.orig/src/helpers/Makefile.am conntrack-tools-1.4.4/src/helpers/Makefile.am
33 ---- conntrack-tools-1.4.4.orig/src/helpers/Makefile.am 2015-02-11 15:36:00.650610125 -0000
34 -+++ conntrack-tools-1.4.4/src/helpers/Makefile.am 2017-09-24 19:52:11.644990587 -0000
35 +--- a/src/helpers/Makefile.am
36 ++++ b/src/helpers/Makefile.am
37 @@ -22,8 +22,8 @@
38 ct_helper_ftp_la_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)