Please pull from
git://dev.medozas.de/iptables master
to recive
Jan Engelhardt (8):
libxtables: recognize IP6TABLES_LIB_DIR old-style environment variable
build: move -ldl to proper LDADD
libxtables: remove unused XT_LIB_DIR macro
libxtables: decouple non-xtables parts from header
src: remove iptables_rule_match indirection macro
src: remove unused ipt_tryload macro
libxtables: move compat defines to xtables.c
src: consolidate duplicate code in iptables/internal.h
.gitignore | 2 +-
Makefile.am | 8 +-
configure.ac | 2 +-
include/ip6tables.h | 11 +---
include/iptables.h | 11 +---
include/iptables/internal.h.in | 13 ++++
include/linux/netfilter/xt_NFLOG.h | 2 +-
include/xtables.h.in | 22 +++-----
include/xtables/internal.h.in | 17 ------
ip6tables.c | 35 ++++-------
iptables-xml.c | 19 ++++--
iptables.c | 37 ++++--------
xtables.c | 111 +++++++++++++-----------------------
13 files changed, 108 insertions(+), 182 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
