Here are a couple of fixes. I have also taken the liberty to move the
main code into a directory of its own to unclutter the toplevel directory.
This does not impact AFAICS.
With this in, it would be prudent to produce a 1.4.12.
===
The following changes since commit a1cd1f2a4a35427c68cd0d1bd2761d5be42b12b1:
doc: fix trivial typo in libipt_SNAT (2011-06-01 02:35:28 +0200)
are available in the git repository at:
git://dev.medozas.de/iptables master
Jan Engelhardt (4):
src: move all libiptc pieces into its directory
src: move all iptables pieces into a separate directory
tests: add some sample rulesets to test save-restore cycle
option: fix ignored negation before implicit extension loading
Maciej Åenczykowski (1):
xtables-multi: fix absence of xml translator in IPv6-only builds
.gitignore | 15 --
Makefile.am | 78 +---------
configure.ac | 5 +-
iptables/.gitignore | 14 ++
iptables/Makefile.am | 67 ++++++++
ip6tables-multi.h => iptables/ip6tables-multi.h | 0
.../ip6tables-restore.8 | 0
.../ip6tables-restore.c | 0
ip6tables-save.8 => iptables/ip6tables-save.8 | 0
ip6tables-save.c => iptables/ip6tables-save.c | 0
.../ip6tables-standalone.c | 0
ip6tables.8.in => iptables/ip6tables.8.in | 0
ip6tables.c => iptables/ip6tables.c | 8 +-
iptables-apply => iptables/iptables-apply | 0
iptables-apply.8 => iptables/iptables-apply.8 | 0
iptables-multi.h => iptables/iptables-multi.h | 1 -
iptables-restore.8 => iptables/iptables-restore.8 | 0
iptables-restore.c => iptables/iptables-restore.c | 0
iptables-save.8 => iptables/iptables-save.8 | 0
iptables-save.c => iptables/iptables-save.c | 0
.../iptables-standalone.c | 0
iptables-xml.1 => iptables/iptables-xml.1 | 0
iptables-xml.c => iptables/iptables-xml.c | 4 +-
iptables.8.in => iptables/iptables.8.in | 0
iptables.c => iptables/iptables.c | 4 +-
iptables.xslt => iptables/iptables.xslt | 0
xshared.c => iptables/xshared.c | 12 +-
xshared.h => iptables/xshared.h | 2 +-
xtables-multi.c => iptables/xtables-multi.c | 6 +-
iptables/xtables-multi.h | 6 +
xtables.c => iptables/xtables.c | 0
xtables.pc.in => iptables/xtables.pc.in | 0
xtoptions.c => iptables/xtoptions.c | 0
libiptc/.gitignore | 1 +
libiptc/Makefile.am | 12 ++
libiptc.pc.in => libiptc/libiptc.pc.in | 0
tests/options-ipv4.rules | 52 ++++++
tests/options-most.rules | 172 ++++++++++++++++++++
38 files changed, 352 insertions(+), 107 deletions(-)
create mode 100644 iptables/.gitignore
create mode 100644 iptables/Makefile.am
rename ip6tables-multi.h => iptables/ip6tables-multi.h (100%)
rename ip6tables-restore.8 => iptables/ip6tables-restore.8 (100%)
rename ip6tables-restore.c => iptables/ip6tables-restore.c (100%)
rename ip6tables-save.8 => iptables/ip6tables-save.8 (100%)
rename ip6tables-save.c => iptables/ip6tables-save.c (100%)
rename ip6tables-standalone.c => iptables/ip6tables-standalone.c (100%)
rename ip6tables.8.in => iptables/ip6tables.8.in (100%)
rename ip6tables.c => iptables/ip6tables.c (99%)
rename iptables-apply => iptables/iptables-apply (100%)
rename iptables-apply.8 => iptables/iptables-apply.8 (100%)
rename iptables-multi.h => iptables/iptables-multi.h (83%)
rename iptables-restore.8 => iptables/iptables-restore.8 (100%)
rename iptables-restore.c => iptables/iptables-restore.c (100%)
rename iptables-save.8 => iptables/iptables-save.8 (100%)
rename iptables-save.c => iptables/iptables-save.c (100%)
rename iptables-standalone.c => iptables/iptables-standalone.c (100%)
rename iptables-xml.1 => iptables/iptables-xml.1 (100%)
rename iptables-xml.c => iptables/iptables-xml.c (99%)
rename iptables.8.in => iptables/iptables.8.in (100%)
rename iptables.c => iptables/iptables.c (99%)
rename iptables.xslt => iptables/iptables.xslt (100%)
rename xshared.c => iptables/xshared.c (96%)
rename xshared.h => iptables/xshared.h (97%)
rename xtables-multi.c => iptables/xtables-multi.c (93%)
create mode 100644 iptables/xtables-multi.h
rename xtables.c => iptables/xtables.c (100%)
rename xtables.pc.in => iptables/xtables.pc.in (100%)
rename xtoptions.c => iptables/xtoptions.c (100%)
create mode 100644 libiptc/.gitignore
create mode 100644 libiptc/Makefile.am
rename libiptc.pc.in => libiptc/libiptc.pc.in (100%)
create mode 100644 tests/options-ipv4.rules
create mode 100644 tests/options-most.rules
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
