iptables branch, master, updated. v1.4.12.1-28-g0ab10b1

[Jan Engelhardt]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "iptables".

The branch, master has been updated
       via  0ab10b11093ec250b404e3bead1d39177d1cbfa0 (commit)
       via  de4d2d3b716d83a6d3831aaf902c5adb5d1d14c9 (commit)
       via  14da56743c6cdf25da35b7b5ca7a5d201771990d (commit)
       via  1639fe86579f86f5f6a954a9b0adde2e16ad1980 (commit)
       via  7e5e866a36a76c153e5903b8251f90cfe07a1d34 (commit)
       via  2325c0fedf7507f94aa3bb11cc65a70d33836f8f (commit)
       via  160f25b09fc5695a65a8aaf485ebece85e1f853c (commit)
       via  296dca39be1166c4b7c6367c1b97ee95aebddfc3 (commit)
       via  9cf67deb62f127902e686c48b951861bf848d0ab (commit)
       via  34d23bd14002aeeae0374d2561ad329e5cdc96e2 (commit)
       via  1e4965232d77ab752c9c781afcf854f4b173c7b1 (commit)
       via  b171b546cb529e2996df05fe91cba058fae9fd99 (commit)
       via  5fa68e820a641039e48045a82560ed13471ecff4 (commit)
       via  5e5ea1ccf61d96879531929874109c17c1894908 (commit)
      from  62fc25fd1625f0f65b9eed3e15fe929dd0aff2c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0ab10b11093ec250b404e3bead1d39177d1cbfa0
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sat Aug 27 10:34:01 2011 +0200

    ip6tables-restore: make code look alike with iptables-restore
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit de4d2d3b716d83a6d3831aaf902c5adb5d1d14c9
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sat Aug 27 12:50:32 2011 +0200

    libiptc: use a family-invariant xtc_ops struct for code reduction
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 14da56743c6cdf25da35b7b5ca7a5d201771990d
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sat Aug 27 09:56:16 2011 +0200

    src: resolve old macro names that are indirections
    
    Command used:
    
    	git grep -f <(pcregrep -hior
    	'(?<=#define\s)IP6?(T_\w+)(?=\s+X\1)' include/)
    
    and then fix all occurrences.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 1639fe86579f86f5f6a954a9b0adde2e16ad1980
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sat Aug 27 11:39:52 2011 +0200

    libiptc: combine common types: _handle
    
    No real API/ABI change incurred, since the definition of the structs'
    types is not visible anyhow.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 7e5e866a36a76c153e5903b8251f90cfe07a1d34
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sat Aug 27 11:16:16 2011 +0200

    libiptc: replace ipt_chainlabel by xt_chainlabel
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 2325c0fedf7507f94aa3bb11cc65a70d33836f8f
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sat Aug 27 11:12:49 2011 +0200

    libiptc: combine common types
    
    Make an xt_chainlabel type out of ipt_chainlabel and ip6t_chainlabel,
    and add backward-API #defines. The ABI naturally does not change
    either, so no soversion bump.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 160f25b09fc5695a65a8aaf485ebece85e1f853c
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sat Aug 27 10:59:31 2011 +0200

    libiptc: remove unused HOOK_DROPPING thing
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 296dca39be1166c4b7c6367c1b97ee95aebddfc3
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sat Aug 27 13:06:37 2011 +0200

    iptables-save: remove binary dumping dead code
    
    Was never implemented, kill it.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 9cf67deb62f127902e686c48b951861bf848d0ab
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sun Sep 11 17:24:26 2011 +0200

    libiptc: resolve compile failure
    
      CC     libip4tc.lo
    In file included from libip4tc.c:118:0:
    libiptc.c:70:8: error: redefinition of "struct xt_error_target"
    ../include/linux/netfilter/x_tables.h:69:8: note: originally defined here
    
    Remove libiptc's duplicate definition and substitute names.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 34d23bd14002aeeae0374d2561ad329e5cdc96e2
Merge: 62fc25fd1625f0f65b9eed3e15fe929dd0aff2c5 1e4965232d77ab752c9c781afcf854f4b173c7b1
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sun Sep 11 17:14:04 2011 +0200

    Merge branch 'stable'

-----------------------------------------------------------------------

Summary of changes:
 extensions/GNUmakefile.in       |   12 ++--
 extensions/libipt_realm.c       |   10 ++--
 include/Makefile.am             |    2 +-
 include/ip6tables.h             |   10 ++--
 include/iptables.h              |   16 +++---
 include/libiptc/libip6tc.h      |  110 +++++++++++++++++++-------------------
 include/libiptc/libiptc.h       |  110 +++++++++++++++++++-------------------
 include/libiptc/xtcshared.h     |   20 +++++++
 iptables/ip6tables-restore.8    |    4 +-
 iptables/ip6tables-restore.c    |   64 ++++++++++++----------
 iptables/ip6tables-save.c       |   84 ++++++++++++-----------------
 iptables/ip6tables-standalone.c |    2 +-
 iptables/ip6tables.c            |  112 +++++++++++++++++++-------------------
 iptables/iptables-restore.8     |    5 ++-
 iptables/iptables-restore.c     |   48 ++++++++--------
 iptables/iptables-save.c        |   84 ++++++++++++-----------------
 iptables/iptables-standalone.c  |    2 +-
 iptables/iptables-xml.c         |   36 ++++++------
 iptables/iptables.c             |  110 +++++++++++++++++++-------------------
 iptables/xshared.c              |    2 +-
 libiptc/Makefile.am             |    4 +-
 libiptc/libip4tc.c              |   56 +++++++------------
 libiptc/libip6tc.c              |   38 ++++++-------
 libiptc/libiptc.c               |   54 ++++++++++---------
 24 files changed, 495 insertions(+), 500 deletions(-)
 create mode 100644 include/libiptc/xtcshared.h


hooks/post-receive
-- 
iptables