diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-25 13:09:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-02-25 13:11:42 +0000 |
| commit | 7b9d3a45f28094c416a1ba449607c8b4ad291b4d (patch) | |
| tree | 1ecc99f7b3eee1273823f43fa89bd315b764905a /testing/ipt-netflow/kernel-vs-userspace.patch | |
| parent | b5541800d4d765b8252488dc841be11ca3fba53e (diff) | |
| download | aports-7b9d3a45f28094c416a1ba449607c8b4ad291b4d.tar.bz2 aports-7b9d3a45f28094c416a1ba449607c8b4ad291b4d.tar.xz | |
testing/ipt-netflow: fix build again
Use upstream source repo rather than Rush's github clone
Diffstat (limited to 'testing/ipt-netflow/kernel-vs-userspace.patch')
| -rw-r--r-- | testing/ipt-netflow/kernel-vs-userspace.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/testing/ipt-netflow/kernel-vs-userspace.patch b/testing/ipt-netflow/kernel-vs-userspace.patch new file mode 100644 index 0000000000..8f9857fa8b --- /dev/null +++ b/testing/ipt-netflow/kernel-vs-userspace.patch @@ -0,0 +1,56 @@ +diff --git a/configure b/configure +index 3f10e2a..b43f024 100755 +--- a/configure ++++ b/configure +@@ -256,6 +256,8 @@ do + --ipt-inc=*) IPTINC="$ac_optarg" ;; + --kver=*) KVERSION="$ac_optarg" ;; + --kdir=*) KDIR="$ac_optarg" ;; ++ --disable-kernel) NOKERNEL=1;; ++ --disable-ipt) NOIPT=1;; + --make) echo called from make ;; + --help) show_help ;; + -*) echo Invalid option: $ac_option; exit 1 ;; +@@ -353,22 +355,26 @@ kernel_check_config() { + kconfig CONFIG_IP6_NF_IPTABLES "ip6tables target" + } + +-kernel_find_version #KVERSION +-test "$KLIBMOD" || KLIBMOD=$KVERSION +-echo "Kernel version: $KVERSION ($KHOW)" +-kernel_find_source #KDIR +-echo "Kernel sources: $KDIR ($KSHOW)" +-kernel_check_consistency +-kernel_check_config +- +-test "$IPTBIN" || IPTBIN=`which iptables` +- +-iptables_find_version #IPTVER +-iptables_try_pkgconfig #try to configure from pkg-config +-iptables_find_src #IPTSRC +-iptables_src_version #check that IPTSRC match to IPTVER +-iptables_inc #IPTINC +-iptables_modules #IPTLIB ++if ! test "$NOKERNEL"; then ++ kernel_find_version #KVERSION ++ test "$KLIBMOD" || KLIBMOD=$KVERSION ++ echo "Kernel version: $KVERSION ($KHOW)" ++ kernel_find_source #KDIR ++ echo "Kernel sources: $KDIR ($KSHOW)" ++ kernel_check_consistency ++ kernel_check_config ++fi ++ ++if ! test "$NOIPT"; then ++ test "$IPTBIN" || IPTBIN=`which iptables` ++ ++ iptables_find_version #IPTVER ++ iptables_try_pkgconfig #try to configure from pkg-config ++ iptables_find_src #IPTSRC ++ iptables_src_version #check that IPTSRC match to IPTVER ++ iptables_inc #IPTINC ++ iptables_modules #IPTLIB ++fi + + REPLACE="\ + s!@KVERSION@!$KVERSION!;\ |