iptables branch, master, updated. v1.4.12.1-14-g62fc25f

[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  62fc25fd1625f0f65b9eed3e15fe929dd0aff2c5 (commit)
       via  dbe77cc974cee656eae37e75039dd1a410a4535b (commit)
       via  3775fb69f63b76191bc3571bfa8538c18173d90f (commit)
       via  a49002efbdc5813ee193aa8fde3da3e35ff0d38f (commit)
      from  891d5790b3f4caeed80f1449d280617c54df8837 (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 62fc25fd1625f0f65b9eed3e15fe929dd0aff2c5
Merge: 891d5790b3f4caeed80f1449d280617c54df8837 dbe77cc974cee656eae37e75039dd1a410a4535b
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Thu Sep 8 17:00:49 2011 +0200

    Merge branch 'master' of git://dev.medozas.de/iptables

commit dbe77cc974cee656eae37e75039dd1a410a4535b
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sun Aug 28 14:19:43 2011 +0200

    include: refresh include files from kernel 3.1-rc3
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit 3775fb69f63b76191bc3571bfa8538c18173d90f
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sun Aug 28 14:16:14 2011 +0200

    libxt_addrtype: add support for revision 1
    
    Rev 1 was added to the kernel in commit v2.6.39-rc1~468^2~10^2~1 but
    there was no corresponding iptables patch so far.
    
    Cc: Florian Westphal <fw at strlen.de>
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

commit a49002efbdc5813ee193aa8fde3da3e35ff0d38f
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Sun Aug 28 14:10:19 2011 +0200

    libxt_addrtype: rename from libipt_addrtype
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>

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

Summary of changes:
 extensions/{libipt_addrtype.c => libxt_addrtype.c} |   56 ++---
 .../{libipt_addrtype.man => libxt_addrtype.man}    |    0 
 include/linux/kernel.h                             |   33 ---
 include/linux/netfilter.h                          |   18 ++-
 include/linux/netfilter/ipset/ip_set.h             |  225 ++++++++++++++++++++
 include/linux/netfilter/nf_conntrack_common.h      |   14 ++
 .../linux/netfilter/nf_conntrack_tuple_common.h    |    3 +-
 include/linux/netfilter/x_tables.h                 |    5 +
 include/linux/netfilter/xt_CT.h                    |    2 +
 include/linux/netfilter/xt_TCPOPTSTRIP.h           |    2 +
 include/linux/netfilter/xt_TPROXY.h                |    2 +
 include/linux/netfilter/xt_addrtype.h              |   44 ++++
 include/linux/netfilter/xt_cluster.h               |    2 +
 include/linux/netfilter/xt_connbytes.h             |    4 +-
 include/linux/netfilter/xt_connlimit.h             |    2 +
 include/linux/netfilter/xt_physdev.h               |    3 -
 include/linux/netfilter/xt_policy.h                |   11 -
 include/linux/netfilter/xt_quota.h                 |    4 +-
 include/linux/netfilter/xt_sctp.h                  |    4 +-
 include/linux/netfilter/xt_set.h                   |   81 +------
 include/linux/netfilter/xt_socket.h                |    2 +
 include/linux/netfilter/xt_time.h                  |    2 +
 include/linux/netfilter/xt_u32.h                   |    2 +
 include/linux/netfilter_ipv4/ip_tables.h           |   82 ++++----
 include/linux/netfilter_ipv4/ipt_CLUSTERIP.h       |   16 +-
 include/linux/netfilter_ipv4/ipt_ECN.h             |    8 +-
 include/linux/netfilter_ipv4/ipt_SAME.h            |    8 +-
 include/linux/netfilter_ipv4/ipt_TTL.h             |    6 +-
 include/linux/netfilter_ipv4/ipt_addrtype.h        |   16 +-
 include/linux/netfilter_ipv4/ipt_ah.h              |    6 +-
 include/linux/netfilter_ipv4/ipt_ecn.h             |   10 +-
 include/linux/netfilter_ipv4/ipt_ttl.h             |    6 +-
 include/linux/netfilter_ipv6/ip6_tables.h          |  100 ++++------
 include/linux/netfilter_ipv6/ip6t_HL.h             |    6 +-
 include/linux/netfilter_ipv6/ip6t_REJECT.h         |    4 +-
 include/linux/netfilter_ipv6/ip6t_ah.h             |   10 +-
 include/linux/netfilter_ipv6/ip6t_frag.h           |   10 +-
 include/linux/netfilter_ipv6/ip6t_hl.h             |    6 +-
 include/linux/netfilter_ipv6/ip6t_ipv6header.h     |    8 +-
 include/linux/netfilter_ipv6/ip6t_mh.h             |    6 +-
 include/linux/netfilter_ipv6/ip6t_opts.h           |   12 +-
 include/linux/netfilter_ipv6/ip6t_rt.h             |   13 +-
 include/linux/types.h                              |   13 ++
 43 files changed, 543 insertions(+), 324 deletions(-)
 rename extensions/{libipt_addrtype.c => libxt_addrtype.c} (82%)
 rename extensions/{libipt_addrtype.man => libxt_addrtype.man} (100%)
 create mode 100644 include/linux/netfilter/ipset/ip_set.h
 create mode 100644 include/linux/netfilter/xt_addrtype.h


hooks/post-receive
-- 
iptables