Viewing all changes in revision 8.
- Committer: Bazaar Package Importer
- Date: 2006-11-15 14:56:29 UTC
- mfrom: (5.1.2 upstream)
- Revision ID: james.westby@ubuntu.com-20061115145629-p3x7z4rgtyjnz31j
* Merge from debian unstable.
* Remaining Ubuntu changes:
- Build with -fno-stack-protector to fix failing ICMP module (Malone: #66681)
- Took references to 2.4 kernel out of doc-base control files (Jordan
Mantha, Malone #25972).
- Use linux-libc-dev instead of local copy of kernel-headers (Fabio M.
Di Nitto).
* Remaining Ubuntu changes:
- Build with -fno-stack-protector to fix failing ICMP module (Malone: #66681)
- Took references to 2.4 kernel out of doc-base control files (Jordan
Mantha, Malone #25972).
- Use linux-libc-dev instead of local copy of kernel-headers (Fabio M.
Di Nitto).
- files added:
- changelogs/000-changes-iptables-1.3.6.txt
- iptables/include/libipulog
- patches/pom
- scripts
- files removed:
- changelogs/000-changes-iptables-1.3.5.txt
- iptables/ipset
- linux/include/net/netfilter/ipv4
- linux/include/net/netfilter/ipv6
- patch-o-matic-ng
- files modified:
- Makefile
- linux/include/linux/netfilter/nf_conntrack_ftp.h *
- linux/include/linux/netfilter/nf_conntrack_sctp.h *
- linux/include/linux/netfilter/nf_conntrack_tcp.h *
- linux/include/linux/netfilter/nf_conntrack_tuple_common.h *
- linux/include/linux/netfilter/nfnetlink.h *
- linux/include/linux/netfilter/nfnetlink_log.h *
- linux/include/linux/netfilter/nfnetlink_queue.h *
- linux/include/linux/netfilter/x_tables.h *
- linux/include/linux/netfilter/xt_CLASSIFY.h *
- linux/include/linux/netfilter/xt_CONNMARK.h *
- linux/include/linux/netfilter/xt_MARK.h *
- linux/include/linux/netfilter/xt_NFQUEUE.h *
- linux/include/linux/netfilter/xt_comment.h *
- linux/include/linux/netfilter/xt_connbytes.h *
- linux/include/linux/netfilter/xt_connmark.h *
- linux/include/linux/netfilter/xt_dccp.h *
- linux/include/linux/netfilter/xt_esp.h *
- linux/include/linux/netfilter/xt_helper.h *
- linux/include/linux/netfilter/xt_length.h *
- linux/include/linux/netfilter/xt_limit.h *
- linux/include/linux/netfilter/xt_mac.h *
- linux/include/linux/netfilter/xt_mark.h *
- linux/include/linux/netfilter/xt_multiport.h *
- linux/include/linux/netfilter/xt_physdev.h *
- linux/include/linux/netfilter/xt_pkttype.h *
- linux/include/linux/netfilter/xt_policy.h *
- linux/include/linux/netfilter/xt_realm.h *
- linux/include/linux/netfilter/xt_sctp.h *
- linux/include/linux/netfilter/xt_state.h *
- linux/include/linux/netfilter/xt_string.h *
- linux/include/linux/netfilter/xt_tcpmss.h *
- linux/include/linux/netfilter/xt_tcpudp.h *
- linux/include/linux/netfilter_arp/arp_tables.h *
- linux/include/linux/netfilter_arp/arpt_mangle.h *
- linux/include/linux/netfilter_bridge/ebt_802_3.h *
- linux/include/linux/netfilter_bridge/ebt_among.h *
- linux/include/linux/netfilter_bridge/ebt_arp.h *
- linux/include/linux/netfilter_bridge/ebt_arpreply.h *
- linux/include/linux/netfilter_bridge/ebt_ip.h *
- linux/include/linux/netfilter_bridge/ebt_limit.h *
- linux/include/linux/netfilter_bridge/ebt_log.h *
- linux/include/linux/netfilter_bridge/ebt_mark_m.h *
- linux/include/linux/netfilter_bridge/ebt_mark_t.h *
- linux/include/linux/netfilter_bridge/ebt_nat.h *
- linux/include/linux/netfilter_bridge/ebt_pkttype.h *
- linux/include/linux/netfilter_bridge/ebt_redirect.h *
- linux/include/linux/netfilter_bridge/ebt_stp.h *
- linux/include/linux/netfilter_bridge/ebt_ulog.h *
- linux/include/linux/netfilter_bridge/ebt_vlan.h *
- linux/include/linux/netfilter_bridge/ebtables.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_amanda.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_core.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_ftp.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_helper.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_icmp.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_irc.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_pptp.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_protocol.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_sctp.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_tcp.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_tftp.h *
- linux/include/linux/netfilter_ipv4/ip_conntrack_tuple.h *
- linux/include/linux/netfilter_ipv4/ip_nat.h *
- linux/include/linux/netfilter_ipv4/ip_nat_core.h *
- linux/include/linux/netfilter_ipv4/ip_nat_helper.h *
- linux/include/linux/netfilter_ipv4/ip_nat_pptp.h *
- linux/include/linux/netfilter_ipv4/ip_nat_protocol.h *
- linux/include/linux/netfilter_ipv4/ip_nat_rule.h *
- linux/include/linux/netfilter_ipv4/ip_queue.h *
- linux/include/linux/netfilter_ipv4/ip_tables.h *
- linux/include/linux/netfilter_ipv4/ipt_CLASSIFY.h *
- linux/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h *
- linux/include/linux/netfilter_ipv4/ipt_CONNMARK.h *
- linux/include/linux/netfilter_ipv4/ipt_DSCP.h *
- linux/include/linux/netfilter_ipv4/ipt_ECN.h *
- linux/include/linux/netfilter_ipv4/ipt_LOG.h *
- linux/include/linux/netfilter_ipv4/ipt_MARK.h *
- linux/include/linux/netfilter_ipv4/ipt_NFQUEUE.h *
- linux/include/linux/netfilter_ipv4/ipt_REJECT.h *
- linux/include/linux/netfilter_ipv4/ipt_SAME.h *
- linux/include/linux/netfilter_ipv4/ipt_TCPMSS.h *
- linux/include/linux/netfilter_ipv4/ipt_TOS.h *
- linux/include/linux/netfilter_ipv4/ipt_TTL.h *
- linux/include/linux/netfilter_ipv4/ipt_ULOG.h *
- linux/include/linux/netfilter_ipv4/ipt_addrtype.h *
- linux/include/linux/netfilter_ipv4/ipt_ah.h *
- linux/include/linux/netfilter_ipv4/ipt_comment.h *
- linux/include/linux/netfilter_ipv4/ipt_connbytes.h *
- linux/include/linux/netfilter_ipv4/ipt_connmark.h *
- linux/include/linux/netfilter_ipv4/ipt_conntrack.h *
- linux/include/linux/netfilter_ipv4/ipt_dccp.h *
- linux/include/linux/netfilter_ipv4/ipt_dscp.h *
- linux/include/linux/netfilter_ipv4/ipt_ecn.h *
- linux/include/linux/netfilter_ipv4/ipt_esp.h *
- linux/include/linux/netfilter_ipv4/ipt_hashlimit.h *
- linux/include/linux/netfilter_ipv4/ipt_helper.h *
- linux/include/linux/netfilter_ipv4/ipt_iprange.h *
- linux/include/linux/netfilter_ipv4/ipt_length.h *
- linux/include/linux/netfilter_ipv4/ipt_limit.h *
- linux/include/linux/netfilter_ipv4/ipt_mac.h *
- linux/include/linux/netfilter_ipv4/ipt_mark.h *
- linux/include/linux/netfilter_ipv4/ipt_multiport.h *
- linux/include/linux/netfilter_ipv4/ipt_owner.h *
- linux/include/linux/netfilter_ipv4/ipt_physdev.h *
- linux/include/linux/netfilter_ipv4/ipt_pkttype.h *
- linux/include/linux/netfilter_ipv4/ipt_policy.h *
- linux/include/linux/netfilter_ipv4/ipt_realm.h *
- linux/include/linux/netfilter_ipv4/ipt_recent.h *
- linux/include/linux/netfilter_ipv4/ipt_sctp.h *
- linux/include/linux/netfilter_ipv4/ipt_state.h *
- linux/include/linux/netfilter_ipv4/ipt_string.h *
- linux/include/linux/netfilter_ipv4/ipt_tcpmss.h *
- linux/include/linux/netfilter_ipv4/ipt_tos.h *
- linux/include/linux/netfilter_ipv4/ipt_ttl.h *
- linux/include/linux/netfilter_ipv6/ip6_tables.h *
- linux/include/linux/netfilter_ipv6/ip6t_HL.h *
- linux/include/linux/netfilter_ipv6/ip6t_LOG.h *
- linux/include/linux/netfilter_ipv6/ip6t_MARK.h *
- linux/include/linux/netfilter_ipv6/ip6t_REJECT.h *
- linux/include/linux/netfilter_ipv6/ip6t_ah.h *
- linux/include/linux/netfilter_ipv6/ip6t_esp.h *
- linux/include/linux/netfilter_ipv6/ip6t_frag.h *
- linux/include/linux/netfilter_ipv6/ip6t_hl.h *
- linux/include/linux/netfilter_ipv6/ip6t_ipv6header.h *
- linux/include/linux/netfilter_ipv6/ip6t_length.h *
- linux/include/linux/netfilter_ipv6/ip6t_limit.h *
- linux/include/linux/netfilter_ipv6/ip6t_mac.h *
- linux/include/linux/netfilter_ipv6/ip6t_mark.h *
- linux/include/linux/netfilter_ipv6/ip6t_multiport.h *
- linux/include/linux/netfilter_ipv6/ip6t_opts.h *
- linux/include/linux/netfilter_ipv6/ip6t_owner.h *
- linux/include/linux/netfilter_ipv6/ip6t_physdev.h *
- linux/include/linux/netfilter_ipv6/ip6t_policy.h *
- linux/include/linux/netfilter_ipv6/ip6t_rt.h *
- linux/include/net/netfilter/nf_conntrack_core.h *
- linux/include/net/netfilter/nf_conntrack_helper.h *
- linux/include/net/netfilter/nf_conntrack_l3proto.h *
- linux/include/net/netfilter/nf_conntrack_protocol.h *
- linux/include/net/netfilter/nf_conntrack_tuple.h *
- linux/net/bridge/netfilter/ebt_802_3.c *
- linux/net/bridge/netfilter/ebt_among.c *
- linux/net/bridge/netfilter/ebt_arp.c *
- linux/net/bridge/netfilter/ebt_arpreply.c *
- linux/net/bridge/netfilter/ebt_dnat.c *
- linux/net/bridge/netfilter/ebt_ip.c *
- linux/net/bridge/netfilter/ebt_limit.c *
- linux/net/bridge/netfilter/ebt_log.c *
- linux/net/bridge/netfilter/ebt_mark.c *
- linux/net/bridge/netfilter/ebt_mark_m.c *
- linux/net/bridge/netfilter/ebt_pkttype.c *
- linux/net/bridge/netfilter/ebt_redirect.c *
- linux/net/bridge/netfilter/ebt_snat.c *
- linux/net/bridge/netfilter/ebt_stp.c *
- linux/net/bridge/netfilter/ebt_ulog.c *
- linux/net/bridge/netfilter/ebt_vlan.c *
- linux/net/bridge/netfilter/ebtable_broute.c *
- linux/net/bridge/netfilter/ebtable_filter.c *
- linux/net/bridge/netfilter/ebtable_nat.c *
- linux/net/bridge/netfilter/ebtables.c *
- linux/net/decnet/netfilter/dn_rtmsg.c *
- linux/net/ipv4/netfilter/arp_tables.c *
- linux/net/ipv4/netfilter/arpt_mangle.c *
- linux/net/ipv4/netfilter/arptable_filter.c *
- linux/net/ipv4/netfilter/ip_conntrack_amanda.c *
- linux/net/ipv4/netfilter/ip_conntrack_core.c *
- linux/net/ipv4/netfilter/ip_conntrack_ftp.c *
- linux/net/ipv4/netfilter/ip_conntrack_helper_h323.c *
- linux/net/ipv4/netfilter/ip_conntrack_helper_h323_asn1.c *
- linux/net/ipv4/netfilter/ip_conntrack_helper_h323_types.c *
- linux/net/ipv4/netfilter/ip_conntrack_helper_pptp.c *
- linux/net/ipv4/netfilter/ip_conntrack_irc.c *
- linux/net/ipv4/netfilter/ip_conntrack_netbios_ns.c *
- linux/net/ipv4/netfilter/ip_conntrack_netlink.c *
- linux/net/ipv4/netfilter/ip_conntrack_proto_generic.c *
- linux/net/ipv4/netfilter/ip_conntrack_proto_gre.c *
- linux/net/ipv4/netfilter/ip_conntrack_proto_icmp.c *
- linux/net/ipv4/netfilter/ip_conntrack_proto_sctp.c *
- linux/net/ipv4/netfilter/ip_conntrack_proto_tcp.c *
- linux/net/ipv4/netfilter/ip_conntrack_proto_udp.c *
- linux/net/ipv4/netfilter/ip_conntrack_standalone.c *
- linux/net/ipv4/netfilter/ip_conntrack_tftp.c *
- linux/net/ipv4/netfilter/ip_nat_amanda.c *
- linux/net/ipv4/netfilter/ip_nat_core.c *
- linux/net/ipv4/netfilter/ip_nat_ftp.c *
- linux/net/ipv4/netfilter/ip_nat_helper.c *
- linux/net/ipv4/netfilter/ip_nat_helper_h323.c *
- linux/net/ipv4/netfilter/ip_nat_helper_pptp.c *
- linux/net/ipv4/netfilter/ip_nat_irc.c *
- linux/net/ipv4/netfilter/ip_nat_proto_gre.c *
- linux/net/ipv4/netfilter/ip_nat_proto_icmp.c *
- linux/net/ipv4/netfilter/ip_nat_proto_tcp.c *
- linux/net/ipv4/netfilter/ip_nat_proto_udp.c *
- linux/net/ipv4/netfilter/ip_nat_proto_unknown.c *
- linux/net/ipv4/netfilter/ip_nat_rule.c *
- linux/net/ipv4/netfilter/ip_nat_snmp_basic.c *
- linux/net/ipv4/netfilter/ip_nat_standalone.c *
- linux/net/ipv4/netfilter/ip_nat_tftp.c *
- linux/net/ipv4/netfilter/ip_queue.c *
- linux/net/ipv4/netfilter/ip_tables.c *
- linux/net/ipv4/netfilter/ipt_CLUSTERIP.c *
- linux/net/ipv4/netfilter/ipt_DSCP.c *
- linux/net/ipv4/netfilter/ipt_ECN.c *
- linux/net/ipv4/netfilter/ipt_LOG.c *
- linux/net/ipv4/netfilter/ipt_MASQUERADE.c *
- linux/net/ipv4/netfilter/ipt_NETMAP.c *
- linux/net/ipv4/netfilter/ipt_REDIRECT.c *
- linux/net/ipv4/netfilter/ipt_REJECT.c *
- linux/net/ipv4/netfilter/ipt_SAME.c *
- linux/net/ipv4/netfilter/ipt_TCPMSS.c *
- linux/net/ipv4/netfilter/ipt_TOS.c *
- linux/net/ipv4/netfilter/ipt_TTL.c *
- linux/net/ipv4/netfilter/ipt_ULOG.c *
- linux/net/ipv4/netfilter/ipt_addrtype.c *
- linux/net/ipv4/netfilter/ipt_ah.c *
- linux/net/ipv4/netfilter/ipt_dscp.c *
- linux/net/ipv4/netfilter/ipt_ecn.c *
- linux/net/ipv4/netfilter/ipt_hashlimit.c *
- linux/net/ipv4/netfilter/ipt_iprange.c *
- linux/net/ipv4/netfilter/ipt_owner.c *
- linux/net/ipv4/netfilter/ipt_recent.c *
- linux/net/ipv4/netfilter/ipt_tos.c *
- linux/net/ipv4/netfilter/ipt_ttl.c *
- linux/net/ipv4/netfilter/iptable_filter.c *
- linux/net/ipv4/netfilter/iptable_mangle.c *
- linux/net/ipv4/netfilter/iptable_raw.c *
- linux/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c *
- linux/net/ipv4/netfilter/nf_conntrack_proto_icmp.c *
- linux/net/ipv6/netfilter/ip6_queue.c *
- linux/net/ipv6/netfilter/ip6_tables.c *
- linux/net/ipv6/netfilter/ip6t_HL.c *
- linux/net/ipv6/netfilter/ip6t_LOG.c *
- linux/net/ipv6/netfilter/ip6t_REJECT.c *
- linux/net/ipv6/netfilter/ip6t_ah.c *
- linux/net/ipv6/netfilter/ip6t_dst.c *
- linux/net/ipv6/netfilter/ip6t_eui64.c *
- linux/net/ipv6/netfilter/ip6t_frag.c *
- linux/net/ipv6/netfilter/ip6t_hbh.c *
- linux/net/ipv6/netfilter/ip6t_hl.c *
- linux/net/ipv6/netfilter/ip6t_ipv6header.c *
- linux/net/ipv6/netfilter/ip6t_owner.c *
- linux/net/ipv6/netfilter/ip6t_rt.c *
- linux/net/ipv6/netfilter/ip6table_filter.c *
- linux/net/ipv6/netfilter/ip6table_mangle.c *
- linux/net/ipv6/netfilter/ip6table_raw.c *
- linux/net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c *
- linux/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c *
- linux/net/ipv6/netfilter/nf_conntrack_reasm.c *
- linux/net/netfilter/core.c *
- linux/net/netfilter/nf_conntrack_core.c *
- linux/net/netfilter/nf_conntrack_ftp.c *
- linux/net/netfilter/nf_conntrack_l3proto_generic.c *
- linux/net/netfilter/nf_conntrack_netlink.c *
- linux/net/netfilter/nf_conntrack_proto_generic.c *
- linux/net/netfilter/nf_conntrack_proto_sctp.c *
- linux/net/netfilter/nf_conntrack_proto_tcp.c *
- linux/net/netfilter/nf_conntrack_proto_udp.c *
- linux/net/netfilter/nf_conntrack_standalone.c *
- linux/net/netfilter/nf_log.c *
- linux/net/netfilter/nf_queue.c *
- linux/net/netfilter/nf_sockopt.c *
- linux/net/netfilter/nfnetlink.c *
- linux/net/netfilter/nfnetlink_log.c *
- linux/net/netfilter/nfnetlink_queue.c *
- linux/net/netfilter/x_tables.c *
- linux/net/netfilter/xt_CLASSIFY.c *
- linux/net/netfilter/xt_CONNMARK.c *
- linux/net/netfilter/xt_MARK.c *
- linux/net/netfilter/xt_NFQUEUE.c *
- linux/net/netfilter/xt_NOTRACK.c *
- linux/net/netfilter/xt_comment.c *
- linux/net/netfilter/xt_connbytes.c *
- linux/net/netfilter/xt_connmark.c *
- linux/net/netfilter/xt_conntrack.c *
- linux/net/netfilter/xt_dccp.c *
- linux/net/netfilter/xt_esp.c *
- linux/net/netfilter/xt_helper.c *
- linux/net/netfilter/xt_length.c *
- linux/net/netfilter/xt_limit.c *
- linux/net/netfilter/xt_mac.c *
- linux/net/netfilter/xt_mark.c *
- linux/net/netfilter/xt_multiport.c *
- linux/net/netfilter/xt_physdev.c *
- linux/net/netfilter/xt_pkttype.c *
- linux/net/netfilter/xt_policy.c *
- linux/net/netfilter/xt_realm.c *
- linux/net/netfilter/xt_sctp.c *
- linux/net/netfilter/xt_state.c *
- linux/net/netfilter/xt_string.c *
- linux/net/netfilter/xt_tcpmss.c *
- linux/net/netfilter/xt_tcpudp.c *
expand all
collapse all
added
removed
