lp:~arges/ubuntu/quantal/iptables/fix-lp982961

Created by Chris J Arges on 2013-01-30 and last modified on 2013-01-30
Get this branch:
bzr branch lp:~arges/ubuntu/quantal/iptables/fix-lp982961
Only Chris J Arges can upload to this branch. If you are Chris J Arges please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Chris J Arges
Status:
Development

Recent revisions

35. By Chris J Arges on 2013-01-30

Add debian/patches/0002-libxt_RATEEST-link-with-lm.patch and
debian/patches/0003-libxt_statistic-link-with-lm.patch to fix broken
RATEEST and statistic modules. (LP: #982961)

34. By Jamie Strandboge on 2012-09-17

debian/patches/9006-lp1042260-fix-add-inverted-physdev.patch: add back
inverted option for --physdev-is-in, --physdev-is-out and
--physdev-is-bridged (LP: #1042260)

33. By Jamie Strandboge on 2012-07-20

* Merge from Debian unstable. Remaining changes:
  - 9000-howtos.patch: add howtos/ and install them
  - 9001-Fixed-FTBS-by-copying-linux-types.h-from-linux-3.2.patch: Fix FTBS
    against linux 3.2 headers
  - 9002-libxt_recent-Add-support-for-reap-option.patch: add --reap support.
    Merge in changes from 1.4.12-1ubuntu4 into this patch
  - debian/control: Build-Depends on linuxdoc-tools
  - debian/iptables.install: install NAT and packetfilter howtos into
    /usr/share/doc
  - debian/iptables-dev.install: install netfilter howto into /usr/share/doc
  - debian/iptables-dev.doc-base.netfilter-extensions,
    debian/iptables-dev.doc-base.netfilter-hacking,
    debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter: add
    howtos
* Drop libipq support since it has been obsoleted in 3.5 and later kernels.
  Per upstream, users of libipq should transition to nfnetlink_queue (from
  libnfnetlink0) instead. (LP: #1020598)
  - debian/control: remove reference to libipq
  - debian/rules: compile with --disable-libipq
  - debian/iptables.lintian-overrides: remove reference to libipq0
  - debian/iptables-dev.install: remove usr/share/man/man3 only used with
    libipq manpages
  - dropped 9001-build-libipq_pic.la.patch, no longer required
* 9003-lp1020490.patch: fix --ctproto 0 output (LP: #1020490)
* 9004-argv-is-null.patch: ip(6)tables-restore: make sure argv is NULL
  terminated
* debian/patches/9005-lp1027252-fixrestore.patch: fix iptables-restore with
  gcc-4.7 and -O1 or higher (LP: #1027252)

32. By Tim Gardner on 2011-12-09

Update to use reap patch which was accepted upstream in slightly different form.

31. By Tim Gardner on 2011-11-30

* Restore support for --reap, patch submitted to upstream.
  -LP: #887332

* Fix FTBS against linux 3.2 headers by copying linux/types.h to
  local include directory. This package unfortunately has a
  number of local kernel headers that are getting out of date.

30. By Colin Watson on 2011-11-18

releasing version 1.4.12-1ubuntu2

29. By Colin Watson on 2011-11-18

clarify changelog

28. By Colin Watson on 2011-11-18

Stop shipping libipq_pic.la again. Apparently this was a mistaken
merge, and should have been libipq_pic.a; but we haven't been shipping
the latter since natty, perlipq and nepenthes apparently both build fine
anyway, and including a .la file with incorrect paths in dependency_libs
actively breaks the collectd build.

27. By Jamie Strandboge on 2011-11-07

* Merge from Debian unstable (LP: #887192). Remaining changes:
  - 9000-howtos.patch: add howtos/ and install them
  - 9001-build-libipq_pic.la.patch: Build libipq_pic.la with -fPIC
  - debian/control: Build-Depends on linuxdoc-tools
  - debian/iptables.install: install NAT and packetfilter howtos into
    /usr/share/doc
  - debian/iptables-dev.install: install netfilter howto into /usr/share/doc
  - debian/iptables-dev.doc-base.netfilter-extensions,
    debian/iptables-dev.doc-base.netfilter-hacking,
    debian/iptables.doc-base.nat, debian/iptables.doc-base.packet-filter: add
    howtos
  - debian/iptables-dev.install: install lib/*.la in usr/lib
  - No longer apply the following:
    + 9002-xt_recent-reap.patch: this requires a rewrite of the patch. For
      now adjust series to not apply, file a bug, assigning to the kernel
      team. Once they have resubmitted upstream, we can take the new patch.
    + 9003-compilation-error.patch: no longer needed with newer iptables

26. By Jamie Strandboge on 2010-11-12

[ Lorenzo De Liso ]
* Merge from debian unstable (LP: #671652), remaining changes:
  - Don't fail to run iptables-save if iptables module isn't loaded.
  - Revert changes between 1.4.1.1-3 and 1.4.1.1-4, thus bringing back
    the howtos.
  - Added linuxdoc-tools to Build-Depends
  - Modified debian/iptables{,-dev}.install to match DM syntax
    (removed debian/tmp)
  - Added -fno-strict-aliasing -Werror switches to regular_CFLAGS
    for catching errors early
  - Removed unused TC_NUM_RULES() and TC_GET_RULE()
* debian/patches/03-compilation-error.patch: updated
* debian/patches/0600-makefile_jedi_handwaving.patch: updated
* Dropped changes:
  - debian/patches/0902-docs-version-reference.diff: modifies files inside
    the debian/ directory and hence is not needed

[ Jamie Strandboge ]
* debian/patches/9000-howtos.patch:
  - combine 0102-howtos.patch and 0103-sgml_errors.patch into this patch
    and apply after the Debian patches for easier maintenance
  - add DEP-3 comments
* debian/patches/9001-build-libipq_pic.la.patch:
  - Build libipq_pic.la with -fPIC
  - add DEP-3 comments
* debian/iptables-dev.install: install lib/*.la in usr/lib
* merge debian/patches/9002-xt_recent-reap.patch:
  - support for the xt_recent filter --reap switch (refreshed and updated)
  - add DEP-3 comments
* debian/patches/9003-compilation-error.patch:
  - renamed 03-compilation-error.patch as 9003-compilation-error.patch
  - apply after Debian patches for easier maintenance
  - add DEP-3 comments
* debian/iptables.doc-base.{nat|packet-filter}: update for 2.6
* Dropped changes:
  - Replaced ipt_DSCP.h by xpt_DSCP.h in ipt_ECN.h and ipt_echn.h (applied
    upstream)
  - 9001-build-libipq_pic.a.patch (using la instead)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/raring/iptables
This branch contains Public information 
Everyone can see this information.

Subscribers