From 35c82de6d753a71d04edac3c6e5d06fa349e5ebd Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Tue, 22 Apr 2008 17:06:31 +1000 Subject: [PATCH] iptables-imq: 1.3.8-2.6.21 -> 1.4.0-2.6.24 --- iptables-imq/.footprint | 95 ++++++++++++++++++----------------------- iptables-imq/.md5sum | 6 +-- iptables-imq/Pkgfile | 22 +++++++--- iptables-imq/README | 12 ++---- 4 files changed, 64 insertions(+), 71 deletions(-) diff --git a/iptables-imq/.footprint b/iptables-imq/.footprint index 160f5b115..844e31062 100644 --- a/iptables-imq/.footprint +++ b/iptables-imq/.footprint @@ -3,99 +3,84 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/libipq.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/iptables/ --rwxr-xr-x root/root usr/lib/iptables/libip6t_CONNMARK.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_HL.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_IMQ.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_LOG.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_MARK.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_NFLOG.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_NFQUEUE.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_REJECT.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_TCPMSS.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_ah.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_connmark.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_esp.so +-rwxr-xr-x root/root usr/lib/iptables/libip6t_dst.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_eui64.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_frag.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_hashlimit.so +-rwxr-xr-x root/root usr/lib/iptables/libip6t_hbh.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_hl.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_icmp6.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_ipv6header.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_length.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_limit.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_mac.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_mark.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_mh.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_multiport.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_owner.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_physdev.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_policy.so -rwxr-xr-x root/root usr/lib/iptables/libip6t_rt.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_sctp.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_standard.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_state.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_tcp.so --rwxr-xr-x root/root usr/lib/iptables/libip6t_udp.so --rwxr-xr-x root/root usr/lib/iptables/libipt_CLASSIFY.so -rwxr-xr-x root/root usr/lib/iptables/libipt_CLUSTERIP.so --rwxr-xr-x root/root usr/lib/iptables/libipt_CONNMARK.so -rwxr-xr-x root/root usr/lib/iptables/libipt_DNAT.so --rwxr-xr-x root/root usr/lib/iptables/libipt_DSCP.so -rwxr-xr-x root/root usr/lib/iptables/libipt_ECN.so --rwxr-xr-x root/root usr/lib/iptables/libipt_IMQ.so -rwxr-xr-x root/root usr/lib/iptables/libipt_LOG.so --rwxr-xr-x root/root usr/lib/iptables/libipt_MARK.so -rwxr-xr-x root/root usr/lib/iptables/libipt_MASQUERADE.so -rwxr-xr-x root/root usr/lib/iptables/libipt_MIRROR.so -rwxr-xr-x root/root usr/lib/iptables/libipt_NETMAP.so --rwxr-xr-x root/root usr/lib/iptables/libipt_NFLOG.so --rwxr-xr-x root/root usr/lib/iptables/libipt_NFQUEUE.so --rwxr-xr-x root/root usr/lib/iptables/libipt_NOTRACK.so -rwxr-xr-x root/root usr/lib/iptables/libipt_REDIRECT.so -rwxr-xr-x root/root usr/lib/iptables/libipt_REJECT.so -rwxr-xr-x root/root usr/lib/iptables/libipt_SAME.so -rwxr-xr-x root/root usr/lib/iptables/libipt_SNAT.so --rwxr-xr-x root/root usr/lib/iptables/libipt_TCPMSS.so -rwxr-xr-x root/root usr/lib/iptables/libipt_TOS.so -rwxr-xr-x root/root usr/lib/iptables/libipt_TTL.so -rwxr-xr-x root/root usr/lib/iptables/libipt_ULOG.so -rwxr-xr-x root/root usr/lib/iptables/libipt_addrtype.so -rwxr-xr-x root/root usr/lib/iptables/libipt_ah.so --rwxr-xr-x root/root usr/lib/iptables/libipt_comment.so --rwxr-xr-x root/root usr/lib/iptables/libipt_connbytes.so --rwxr-xr-x root/root usr/lib/iptables/libipt_connmark.so -rwxr-xr-x root/root usr/lib/iptables/libipt_conntrack.so --rwxr-xr-x root/root usr/lib/iptables/libipt_dccp.so --rwxr-xr-x root/root usr/lib/iptables/libipt_dscp.so -rwxr-xr-x root/root usr/lib/iptables/libipt_ecn.so --rwxr-xr-x root/root usr/lib/iptables/libipt_esp.so --rwxr-xr-x root/root usr/lib/iptables/libipt_hashlimit.so --rwxr-xr-x root/root usr/lib/iptables/libipt_helper.so -rwxr-xr-x root/root usr/lib/iptables/libipt_icmp.so -rwxr-xr-x root/root usr/lib/iptables/libipt_iprange.so --rwxr-xr-x root/root usr/lib/iptables/libipt_length.so --rwxr-xr-x root/root usr/lib/iptables/libipt_limit.so --rwxr-xr-x root/root usr/lib/iptables/libipt_mac.so --rwxr-xr-x root/root usr/lib/iptables/libipt_mark.so --rwxr-xr-x root/root usr/lib/iptables/libipt_multiport.so -rwxr-xr-x root/root usr/lib/iptables/libipt_owner.so --rwxr-xr-x root/root usr/lib/iptables/libipt_physdev.so --rwxr-xr-x root/root usr/lib/iptables/libipt_pkttype.so -rwxr-xr-x root/root usr/lib/iptables/libipt_policy.so --rwxr-xr-x root/root usr/lib/iptables/libipt_quota.so -rwxr-xr-x root/root usr/lib/iptables/libipt_realm.so -rwxr-xr-x root/root usr/lib/iptables/libipt_recent.so --rwxr-xr-x root/root usr/lib/iptables/libipt_sctp.so --rwxr-xr-x root/root usr/lib/iptables/libipt_standard.so --rwxr-xr-x root/root usr/lib/iptables/libipt_state.so --rwxr-xr-x root/root usr/lib/iptables/libipt_statistic.so --rwxr-xr-x root/root usr/lib/iptables/libipt_string.so --rwxr-xr-x root/root usr/lib/iptables/libipt_tcp.so --rwxr-xr-x root/root usr/lib/iptables/libipt_tcpmss.so -rwxr-xr-x root/root usr/lib/iptables/libipt_tos.so -rwxr-xr-x root/root usr/lib/iptables/libipt_ttl.so --rwxr-xr-x root/root usr/lib/iptables/libipt_udp.so -rwxr-xr-x root/root usr/lib/iptables/libipt_unclean.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_CLASSIFY.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_CONNMARK.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_DSCP.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_MARK.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_NFLOG.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_NFQUEUE.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_NOTRACK.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_TCPMSS.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_TRACE.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_comment.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_connbytes.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_connlimit.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_connmark.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_dccp.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_dscp.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_esp.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_hashlimit.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_helper.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_length.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_limit.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_mac.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_mark.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_multiport.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_physdev.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_pkttype.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_quota.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_sctp.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_standard.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_state.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_statistic.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_string.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_tcp.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_tcpmss.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_time.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_u32.so +-rwxr-xr-x root/root usr/lib/iptables/libxt_udp.so -rw-r--r-- root/root usr/lib/libipq.a drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man3/ @@ -111,12 +96,16 @@ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/ipq_set_verdict.3.gz -rw-r--r-- root/root usr/man/man3/libipq.3.gz drwxr-xr-x root/root usr/man/man8/ +-rw-r--r-- root/root usr/man/man8/ip6tables-restore.8.gz +-rw-r--r-- root/root usr/man/man8/ip6tables-save.8.gz -rw-r--r-- root/root usr/man/man8/ip6tables.8.gz -rw-r--r-- root/root usr/man/man8/iptables-restore.8.gz -rw-r--r-- root/root usr/man/man8/iptables-save.8.gz -rw-r--r-- root/root usr/man/man8/iptables.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/ip6tables +-rwxr-xr-x root/root usr/sbin/ip6tables-restore +-rwxr-xr-x root/root usr/sbin/ip6tables-save -rwxr-xr-x root/root usr/sbin/iptables -rwxr-xr-x root/root usr/sbin/iptables-restore -rwxr-xr-x root/root usr/sbin/iptables-save diff --git a/iptables-imq/.md5sum b/iptables-imq/.md5sum index d906b6490..8dbf15e53 100644 --- a/iptables-imq/.md5sum +++ b/iptables-imq/.md5sum @@ -1,3 +1,3 @@ -133a27ce2aa95581e91d364827f68293 iptables-1.3.6-imq.diff -0a9209f928002e5eee9cdff8fef4d4b3 iptables-1.3.8.tar.bz2 -a0c1fcfe2965fb8a5dda2674f65b1021 linux-2.6.21-img2.diff +0289aa81badbab94d375a935c4d1e614 iptables-1.4.0-imq.diff +90cfa8a554a29b0b859a625e701af2a7 iptables-1.4.0.tar.bz2 +6279d2e7c99000d48841251520cf8905 linux-2.6.24-imq.diff diff --git a/iptables-imq/Pkgfile b/iptables-imq/Pkgfile index 0340b8ad6..7038a9d4f 100644 --- a/iptables-imq/Pkgfile +++ b/iptables-imq/Pkgfile @@ -5,20 +5,28 @@ # Depends on: iproute2 name=iptables-imq -version=1.3.8-2.6.21 -patch=1.3.6-imq +version=1.4.0-2.6.24 release=1 source=(ftp://ftp.netfilter.org/pub/iptables/iptables-${version%%-*}.tar.bz2 \ - http://www.linuximq.net/patchs/linux-${version##*-}-img2.diff \ - http://www.linuximq.net/patchs/iptables-$patch.diff) + http://www.linuximq.net/patchs/linux-${version##*-}-imq.diff \ + http://www.linuximq.net/patchs/iptables-${version%%-*}-imq.diff) build() { + local kernel_version + cd iptables-${version%%-*} - patch -p1 -i $SRC/iptables-$patch.diff + patch -p 1 -i ../iptables-${version%%-*}-imq.diff chmod +x extensions/.IMQ-test* - make KERNEL_DIR=/usr/src/linux-$(uname -r) PREFIX=/usr all - make KERNEL_DIR=/usr/src/linux-$(uname -r) PREFIX=/usr DESTDIR=$PKG install install-devel + # we do not want/need these kernel-headers included + # in the iptables sources. + rm include/linux/netfilter_ipv4/ip_tables.h + rm include/linux/netfilter_ipv6/ip6_tables.h + + # use the patched kernel source kernel-headers + kernel_version="`uname -r`" + make -j 1 PREFIX=/usr KERNEL_DIR=/usr/src/linux-$kernel_version KBUILD_OUTPUT=/usr COPT_FLAGS="$CFLAGS" + make PREFIX=/usr DESTDIR=$PKG install install-devel } diff --git a/iptables-imq/README b/iptables-imq/README index 42e61064a..10e2ec84c 100644 --- a/iptables-imq/README +++ b/iptables-imq/README @@ -5,19 +5,16 @@ REQUIREMENTS: PRECAUTION: - Stop firewall and any QoS before updating! - PRE-INSTALL: Adds a alias for iptables. Patch the kernel source with: - cd /usr/src/linux-2.6.21.x + cd /usr/src/linux-2.6.24.x (copy from the pkgmk source after downloading or wget the patch off the site) - patch -p1 -i ../linux-2.6.21-img2.diff - - enable IMQ filter as a module + # patch -p1 -i ../linux-2.6.24-imq.diff + # make oldconfig .config file: @@ -40,6 +37,5 @@ POST-REMOVE: NOTES: You need to add many rules for imq to work google for the - "wonder shaper" alternitively use my "bws" program thats highly alpha and in - is work in progress, in romster's ports (not yet but will be soon). + "wonder shaper".