From d13a130578dea9cbc3543c5acee2cd40ab50891f Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 22 Sep 2019 09:31:12 +0200 Subject: [PATCH] - added link patch: don't propagate -lpcap everywhere; release 2 --- iptables-link.patch | 11 +++++++++++ iptables.spec | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 iptables-link.patch diff --git a/iptables-link.patch b/iptables-link.patch new file mode 100644 index 0000000..4ce489b --- /dev/null +++ b/iptables-link.patch @@ -0,0 +1,11 @@ +--- iptables-1.8.3/configure.ac.orig 2019-05-27 17:09:32.000000000 +0200 ++++ iptables-1.8.3/configure.ac 2019-09-22 08:36:45.230554448 +0200 +@@ -117,7 +117,7 @@ + AM_CONDITIONAL([ENABLE_CONNLABEL], [test "$enable_connlabel" = "yes"]) + + if test "x$enable_bpfc" = "xyes" || test "x$enable_nfsynproxy" = "xyes"; then +- AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool)) ++ AC_CHECK_LIB(pcap, pcap_compile, [:], AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool)) + fi + + PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0], diff --git a/iptables.spec b/iptables.spec index cdf6371..3eafef7 100644 --- a/iptables.spec +++ b/iptables.spec @@ -36,7 +36,7 @@ Summary(uk.UTF-8): Утиліти для керування пакетними Summary(zh_CN.UTF-8): Linux内核包过滤管理工具 Name: iptables%{?with_vserver:-vserver} Version: 1.8.3 -Release: 1 +Release: 2 License: GPL v2 Group: Networking/Admin Source0: https://netfilter.org/projects/iptables/files/%{orgname}-%{version}.tar.bz2 @@ -59,6 +59,7 @@ Patch0: %{orgname}-man.patch Patch1: %{orgname}-batch.patch Patch2: no-libiptc.patch Patch3: %{orgname}-aligned_u64.patch +Patch4: %{orgname}-link.patch Patch5: ebtables-X.patch # --- ADDITIONAL/CHANGED EXTENSIONS: @@ -244,7 +245,7 @@ Uwaga: nie jest to w pełni zgodny zamiennik! %endif %patch2 -p1 %patch3 -p1 - +%patch4 -p1 %patch5 -p1 %{?with_ipt_IPV4OPTSSTRIP:%patch10 -p1} -- 2.44.0