diffstat of debian/ for iptables_1.3.6.0debian1-5 iptables_1.3.6.0debian1-5ubuntu5osso4 changelog | 149 ++++++++++++++++++++++++++++++++++++++++ control | 4 - iptables.doc-base.nat | 2 iptables.doc-base.packet-filter | 2 iptables.install | 3 rules | 51 +++++++++++-- 6 files changed, 196 insertions(+), 15 deletions(-) diff -Nru iptables-1.3.6.0debian1/debian/changelog iptables-1.3.6.0debian1/debian/changelog --- iptables-1.3.6.0debian1/debian/changelog 2019-04-09 00:29:24.000000000 +0000 +++ iptables-1.3.6.0debian1/debian/changelog 2008-04-02 12:44:37.000000000 +0000 @@ -1,3 +1,76 @@ +iptables (1.3.6.0debian1-5ubuntu5osso4) unstable; urgency=low + + * Kernel header dependency changed for diablo release. Fixes: NB#83552 + + -- Jukka Rissanen Tue, 1 Apr 2008 16:07:10 +0300 + +iptables (1.3.6.0debian1-5ubuntu5osso3) unstable; urgency=low + + * manual pages, howtos etc documentation is not installed + * shared object modules that are not needed, are not installed + + -- Jukka Rissanen Tue, 4 Dec 2007 16:43:59 +0200 + +iptables (1.3.6.0debian1-5ubuntu5osso2) unstable; urgency=low + + * Removed original maintainer from control file because Nokia build + system got confused about it. + + -- Jukka Rissanen Tue, 20 Nov 2007 10:24:55 +0200 + +iptables (1.3.6.0debian1-5ubuntu5osso1) unstable; urgency=low + + * Version for Osso with IPv6 support + * Turned off selinux support + + -- Jukka Rissanen Mon, 19 Nov 2007 12:46:39 +0200 + +iptables (1.3.6.0debian1-5ubuntu5) gutsy; urgency=low + + * patches/all/090_enable-ipv6-rt.patch: include broken-out patch for + "rt" build, which was missed when applying the patch inline in the + previous version. + + -- Kees Cook Wed, 04 Jul 2007 17:11:52 -0700 + +iptables (1.3.6.0debian1-5ubuntu4) gutsy; urgency=low + + * iptables/extensions/Makefile: enable "rt" module for ip6tables + (LP: #114184). + + -- Kees Cook Wed, 04 Jul 2007 03:56:20 -0700 + +iptables (1.3.6.0debian1-5ubuntu3) gutsy; urgency=low + + * patches/all/012-2.6.22-headers-fix.patch: + + Fix FTBFS on gutsy due to renamed header files in linux-libc-dev. + Patch taken from upstream svn (rev 6001). (LP: #120908) + * iptables/extensions/.CLUSTERIP-test: + + Fix CLUSTERIP detection code to reenable the module (it was accidentally + removed when we started using linux-libc-dev instead of bundled headers). + (LP: #113863) + + -- Soren Hansen Mon, 18 Jun 2007 10:35:01 +0200 + +iptables (1.3.6.0debian1-5ubuntu2) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 5 Mar 2007 01:19:06 +0000 + +iptables (1.3.6.0debian1-5ubuntu1) feisty; urgency=low + + * Merge from debian unstable. + * Remaining Ubuntu changes: + - Build with -fno-stack-protector to fix failing ICMP module (Malone: #66681) + - Took references to 2.4 kernel out of doc-base control files (Jordan + Mantha, Malone #25972). + - Use linux-libc-dev instead of local copy of kernel-headers (Fabio M. + Di Nitto). + + -- Andrew Mitchell Thu, 7 Dec 2006 01:25:07 +1300 + iptables (1.3.6.0debian1-5) unstable; urgency=high * cleaned dirty iptables/, fixes diff bloat and compilation problems @@ -20,6 +93,18 @@ -- Laurence J. Lane Thu, 9 Nov 2006 05:58:51 -0500 +iptables (1.3.6.0debian1-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable. + * Remaining Ubuntu changes: + - Build with -fno-stack-protector to fix failing ICMP module (Malone: #66681) + - Took references to 2.4 kernel out of doc-base control files (Jordan + Mantha, Malone #25972). + - Use linux-libc-dev instead of local copy of kernel-headers (Fabio M. + Di Nitto). + + -- Andrew Mitchell Wed, 15 Nov 2006 14:56:29 +1300 + iptables (1.3.6.0debian1-2) unstable; urgency=low * physdev-truncated.man.patch: fixed misssed instance of the error @@ -60,6 +145,28 @@ -- Laurence J. Lane Fri, 27 Oct 2006 19:39:57 -0400 +iptables (1.3.5.0debian1-1ubuntu2) edgy; urgency=low + + * Build with -fno-stack-protector to fix failing ICMP module (Malone: #66681) + + -- Andrew Mitchell Mon, 23 Oct 2006 20:39:03 +1300 + +iptables (1.3.5.0debian1-1ubuntu1) edgy; urgency=low + + * Resynchronise with Debian (closes: Malone #30992, #40601, #51044). + * Switch from linux-kernel-headers to linux-libc-dev (closes: Malone + #65830). + * Drop patches/all/003-no-local-kernel-headers.patch; + includes IPT_F_GOTO since Linux + 2.6.14. + * Remaining Ubuntu changes: + - Took references to 2.4 kernel out of doc-base control files (Jordan + Mantha, Malone #25972). + - Use linux-libc-dev instead of local copy of kernel-headers (Fabio M. + Di Nitto). + + -- Colin Watson Fri, 13 Oct 2006 18:08:42 +0100 + iptables (1.3.5.0debian1-1) unstable; urgency=low * New upstream release @@ -87,6 +194,32 @@ -- Laurence J. Lane Sun, 20 Aug 2006 21:29:33 -0400 +iptables (1.3.3-2ubuntu4) dapper; urgency=low + + * Took references to 2.4 kernel out of doc-base control files + (closes:Malone #25972) + + -- Jordan Mantha Fri, 17 Mar 2006 04:13:06 -0800 + +iptables (1.3.3-2ubuntu3) dapper; urgency=low + + * Fix variable KERNEL_DIR. It is just '/usr'. not '/usr/include'. + This reenables nearly all extension modules (Ubuntu: #19978) + + -- Reinhard Tartler Wed, 23 Nov 2005 19:10:47 +0000 + +iptables (1.3.3-2ubuntu2) dapper; urgency=low + + * fixed borked merge. MoM does not deal with binary changes in debdiffs + + -- Reinhard Tartler Wed, 23 Nov 2005 10:16:49 +0100 + +iptables (1.3.3-2ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + + -- Scott James Remnant Tue, 08 Nov 2005 07:29:09 +0000 + iptables (1.3.3-2) unstable; urgency=low * added pomng exclude hack to prep.sh @@ -109,6 +242,21 @@ -- Laurence J. Lane Sun, 24 Jul 2005 21:03:39 -0400 +iptables (1.3.1-2ubuntu1) breezy; urgency=low + + * Drop ip_queue_vwmark from patch-o-matic-ng-20050618 tarball and ippool: + - These extensions require kernel patches that are not part of the + stock kernel. + * Switch to use linux-kernel-headers instead of local copy of + kernel-headers: + - Add patches/all/003-no-local-kernel-headers.patch to cope with a missing + define. + - Change debian/rules KERNEL_DIR to point to /usr/include. + - Add build-dep on linux-kernel-headers (>= 2.6.11.2-0ubuntu10) to ensure + we have recent enough headers to build. + + -- Fabio M. Di Nitto Tue, 12 Jul 2005 07:37:51 +0200 + iptables (1.3.1-2) unstable; urgency=low * added missing 2.6.12 kernel headers @@ -849,3 +997,4 @@ * Initial release. -- Christoph Lameter Sun, 26 Mar 2000 18:49:18 -0800 + diff -Nru iptables-1.3.6.0debian1/debian/control iptables-1.3.6.0debian1/debian/control --- iptables-1.3.6.0debian1/debian/control 2019-04-09 00:29:24.000000000 +0000 +++ iptables-1.3.6.0debian1/debian/control 2008-04-01 13:09:36.000000000 +0000 @@ -1,8 +1,8 @@ Source: iptables Section: net Priority: important -Maintainer: Laurence J. Lane -Build-Depends: debhelper (>>4.0), linuxdoc-tools, libselinux1-dev +Maintainer: Jukka Rissanen +Build-Depends: debhelper (>>4.0), linuxdoc-tools, kernel-diablo-headers Standards-Version: 3.7.2.0 Package: iptables diff -Nru iptables-1.3.6.0debian1/debian/iptables.doc-base.nat iptables-1.3.6.0debian1/debian/iptables.doc-base.nat --- iptables-1.3.6.0debian1/debian/iptables.doc-base.nat 2019-04-09 00:29:24.000000000 +0000 +++ iptables-1.3.6.0debian1/debian/iptables.doc-base.nat 2007-11-19 11:39:11.000000000 +0000 @@ -1,5 +1,5 @@ Document: nat -Title: Linux 2.4 NAT HOWTO +Title: Linux NAT HOWTO Author: Rusty Russell Abstract: This document describes how to do masquerading, transparent proxying, port forwarding, and other forms of Network Address diff -Nru iptables-1.3.6.0debian1/debian/iptables.doc-base.packet-filter iptables-1.3.6.0debian1/debian/iptables.doc-base.packet-filter --- iptables-1.3.6.0debian1/debian/iptables.doc-base.packet-filter 2019-04-09 00:29:24.000000000 +0000 +++ iptables-1.3.6.0debian1/debian/iptables.doc-base.packet-filter 2007-11-19 11:39:11.000000000 +0000 @@ -1,5 +1,5 @@ Document: packet-filter -Title: Linux 2.4 Packet Filtering HOWTO +Title: Linux Packet Filtering HOWTO Author: Rusty Russell Abstract: This document describes how to use iptables to filter IP packets for the 2.4+ Linux kernels. diff -Nru iptables-1.3.6.0debian1/debian/iptables.install iptables-1.3.6.0debian1/debian/iptables.install --- iptables-1.3.6.0debian1/debian/iptables.install 2019-04-09 00:29:24.000000000 +0000 +++ iptables-1.3.6.0debian1/debian/iptables.install 2007-12-04 14:50:39.000000000 +0000 @@ -1,5 +1,2 @@ -debian/build/iptables_profectio/*.8 usr/share/man/man8 debian/build/iptables_profectio/*-save sbin debian/build/iptables_profectio/*-restore sbin -debian/build/docs/NAT* usr/share/doc/iptables/html -debian/build/docs/packet-filtering* usr/share/doc/iptables/html diff -Nru iptables-1.3.6.0debian1/debian/rules iptables-1.3.6.0debian1/debian/rules --- iptables-1.3.6.0debian1/debian/rules 2019-04-09 00:29:24.000000000 +0000 +++ iptables-1.3.6.0debian1/debian/rules 2007-12-04 14:50:39.000000000 +0000 @@ -1,5 +1,8 @@ #!/usr/bin/make -f +DO_SELINUX=0 +export DO_SELINUX + IPTABLES = iptables_profectio KERNEL = kernel_profectio @@ -12,17 +15,28 @@ BINDIR := BINDIR=/sbin LIBDIR := LIBDIR=/lib DESTDIR := DESTDIR=$(CURDIR)/debian/iptables -KERNEL_DIR := KERNEL_DIR=$(BUILD_DIR)/$(KERNEL) +#KERNEL_DIR := KERNEL_DIR=$(BUILD_DIR)/$(KERNEL) +KERNEL_DIR := KERNEL_DIR=/usr BUILD_VARS := $(LIBDIR) $(KERNEL_DIR) INSTALL_VARS := $(DESTDIR) $(MANDIR) $(LIBDIR) $(BINDIR) $(KERNEL_DIR) -BUILD_TARGETS := all ip6tables-save ip6tables-restore iptables.8 ip6tables.8 +BUILD_TARGETS := all ip6tables-save ip6tables-restore # iptables.8 ip6tables.8 +KEEP_THESE = libipt_IDLETIMER.so libipt_REJECT.so libipt_icmp.so \ + libipt_limit.so libipt_standard.so libipt_tcp.so libipt_udp.so \ + libip6t_REJECT.so libip6t_icmp6.so libip6t_limit.so libip6t_standard.so \ + libip6t_tcp.so libip6t_udp.so build_howtos := $(foreach howto,$(wildcard $(CURDIR)/howtos/*.sgml),sgml2html $(howto);) manregex := $(SHELL) $(CURDIR)/scripts/manregex MAN_PAGES := $(SRC_DIR)/*.8 +links: $(STAMP_DIR)/links +$(STAMP_DIR)/links: + -mkdir -p $(STAMP_DIR) + -ln -s /usr/src/rx-34-kernel-headers /usr/src/linux + touch $@ + prep: $(STAMP_DIR)/prep $(STAMP_DIR)/prep: install -d $(STAMP_DIR) @@ -36,12 +50,12 @@ cd $(DOCS_DIR); $(build_howtos) touch $@ -build: prep howtos +build: links prep dh_testdir $(MAKE) -C $(SRC_DIR) $(BUILD_TARGETS) $(BUILD_VARS) - - $(manregex) $(MAN_PAGES) + + #$(manregex) $(MAN_PAGES) cd $(SRC_DIR); ar rcs libiptables.a iptables.o cd $(SRC_DIR); ar rcs libip6tables.a ip6tables.o @@ -56,8 +70,29 @@ dh_testroot $(MAKE) -C $(SRC_DIR) install $(INSTALL_VARS) - install -m0644 -D $(CURDIR)/debian/iptables.lintian \ - $(CURDIR)/debian/iptables/usr/share/lintian/overrides/iptables + + # Remove the modules we do not need + -for i in `ls $(CURDIR)/debian/iptables/lib/iptables/*.so`; \ + do \ + keep=0; \ + BASENAME=`basename $$i`; \ + for j in $(KEEP_THESE); \ + do \ + if [ "$$j" = "$$BASENAME" ]; then \ + keep=1; \ + echo "keeping $$i"; \ + break; \ + fi; \ + done; \ + if [ "$$keep" != "1" ]; then \ + echo "removing $$i"; \ + rm -f $$i; \ + fi; \ + done + + #install -m0644 -D $(CURDIR)/debian/iptables.lintian \ + # $(CURDIR)/debian/iptables/usr/share/lintian/overrides/iptables + binary-indep: build install @@ -65,7 +100,7 @@ dh_testdir dh_testroot dh_install - dh_installdocs + #dh_installdocs dh_installchangelogs dh_strip dh_compress