All patches have been gathered and collected, pullable at the usual
place of
git://dev.medozas.de/iptables master
with contents:
Jamal Hadi Salim (5):
libxtables: set names of programs
libxtables: add xtables_set_revision
libxtables: make iptables and ip6tables use xtables_free_opts
libxtables: consolidate merge_options into xtables_merge_options
libxtables: consolidate init calls into one function
Jan Engelhardt (4):
libipq: add missing doc for NF_ values
build: restructure Makefile for include/ directory
libipq: fix compile error
build: remove unneeded -ldl from iptables_xml_LDADD
Marc Fournier (1):
doc: fix option typo in libxt_multiport
Shaul Karl (1):
doc: fix one layout issue in iptables-restore.8
Makefile.am | 8 ++--
configure.ac | 3 +-
extensions/libxt_multiport.man | 4 +-
include/Makefile.am | 8 +++
include/ip6tables.h | 2 +
include/iptables.h | 2 +
include/xtables.h.in | 9 +++-
ip6tables-restore.c | 10 +++-
ip6tables-save.c | 10 +++-
ip6tables-standalone.c | 11 ++++-
ip6tables.c | 70 ++++------------------------
iptables-restore.8 | 1 -
iptables-restore.c | 10 +++-
iptables-save.c | 10 +++-
iptables-standalone.c | 10 +++-
iptables.c | 76 +++++--------------------------
libipq/Makefile.am | 1 -
libipq/ipq_set_verdict.3 | 7 +++
libipq/libipq.c | 2 +
xtables.c | 99 +++++++++++++++++++++++++++++-----------
20 files changed, 180 insertions(+), 173 deletions(-)
--
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
