lp:~ari-tczew/ubuntu/saucy/iptables/lp-1228525-1134554-1187177

Created by Artur Rona on 2013-09-21 and last modified on 2014-05-18
Get this branch:
bzr branch lp:~ari-tczew/ubuntu/saucy/iptables/lp-1228525-1134554-1187177
Only Artur Rona can upload to this branch. If you are Artur Rona please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Artur Rona
Status:
Merged

Recent revisions

39. By Artur Rona on 2013-09-21

* Merge changes from Debian, version 1.4.18-1.1 to fix FTBFS
  in package perlipq due to missing dependecy: (LP: #1228525)
  - debian/control
  - debian/iptables-dev.install
* Fix unresolved @PACKAGE_VERSION@ in manpage. Cherry-pick from
  Debian, version 1.4.20-2: (LP: #1134554)
  - debian/iptables.install
  - debian/iptables.manpages
  - debian/nfnl_osf.8
  - 0201-iptables-xml_man_section.patch
* Fix incorrectly calling setsockopt, cherry-pick: (LP: #1187177)
  - debian/patches/calling-setsockopt-incorrectly.patch
[ gregor herrmann ]
* Fix "libipq.h includes non-existing linux/netfilter_ipv4/ip_queue.h":
  ship /usr/include/linux/netfilter_ipv4/ip_queue.h in iptables-dev;
  add Breaks on linux-libc-dev << 3.5
  (Closes: #707535)
[ Dominic Hargreaves ]
* Non-maintainer upload

38. By Chris J Arges on 2013-06-07

[ Chris J Arges ]
* Merge from Debian unstable (LP: #1191004). Remaining changes:
  - debian/control: add linuxdoc-tools dep, remove libipq references
  - debian/rules: compile with --disable-libipq
  - 9000-howtos.patch: add howtos/ and install them
  - 9002-libxt_recent-Add-support-for-reap-option.patch: Some changes are
    upstream, patch needed for additional reap option checks.
  - debian/iptables.install: install NAT and packetfilter howtos 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: remove usr/share/man/man3 only used with
    libipq manpages
* Dropped changes:
  - debian/iptables.lintian-overrides: remove unuseful lintian override
    delta
  - 9001-build-libipq_pic.la.patch: remove patch that hasn't been applied
    since 12.04.
  - 9001-Fixed-FTBS-by-copying-linux-types.h-from-linux-3.2.patch:
    changes are upstream.
  - 9003-lp1020490.patch: changes are upstream.
  - 9004-argv-is-null.patch: changes are upstream.
  - 9005-lp1027252-fixrestore.patch: changes are upstream.
  - 9006-lp1042260-fix-inverted-physdev.patch: changes are upstream.
  - 9007-lp982961-xtables-lm-noasneeded.patch: changes are upstream.
  - 9009-libxt-string-fix-space-around-arguments.patch: changes are upstream.

37. By Chris J Arges on 2013-02-18

libxt_string: fix space around arguments. (LP: #1074923)

36. By Wookey on 2012-12-08

Make package honour dpkg-buildflags (fixes arm64 build) (LP: #1081592)

35. By Dimitri John Ledkov on 2012-12-03

9007-lp982961-xtables-lm-noasneeded.patch: fix linking of 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

Branch metadata

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

Subscribers