From 66e6f0ce7bba0819a5eef15c8522870ab0c373219a9f1717dd74da55bdc5b959 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 26 Jul 2007 23:45:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/iptables?expand=0&rev=5 --- iptables-1.3.7-extensions.diff | 13 - iptables-1.3.7-newlines.diff | 58 - iptables-1.3.7-shlibs.diff | 1428 ----------------- iptables-1.3.7.tar.bz2 | 3 - ....7-batch.diff => iptables-1.3.8-batch.diff | 0 ....bz2 => iptables-1.3.8-debian-docs.tar.bz2 | 0 ...efile.diff => iptables-1.3.8-makefile.diff | 0 ...=> iptables-1.3.8-strict-aliasing-fix.diff | 0 iptables-1.3.8.tar.bz2 | 3 + iptables.changes | 37 + iptables.spec | 52 +- 11 files changed, 81 insertions(+), 1513 deletions(-) delete mode 100644 iptables-1.3.7-extensions.diff delete mode 100644 iptables-1.3.7-newlines.diff delete mode 100644 iptables-1.3.7-shlibs.diff delete mode 100644 iptables-1.3.7.tar.bz2 rename iptables-1.3.7-batch.diff => iptables-1.3.8-batch.diff (100%) rename iptables-1.3.7-debian-docs.tar.bz2 => iptables-1.3.8-debian-docs.tar.bz2 (100%) rename iptables-1.3.7-makefile.diff => iptables-1.3.8-makefile.diff (100%) rename iptables-1.3.7-strict-aliasing-fix.diff => iptables-1.3.8-strict-aliasing-fix.diff (100%) create mode 100644 iptables-1.3.8.tar.bz2 diff --git a/iptables-1.3.7-extensions.diff b/iptables-1.3.7-extensions.diff deleted file mode 100644 index d0244eb..0000000 --- a/iptables-1.3.7-extensions.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- extensions/Makefile -+++ extensions/Makefile -@@ -5,8 +5,8 @@ - # header files are present in the include/linux directory of this iptables - # package (HW) - # --PF_EXT_SLIB:=ah addrtype comment connlimit connmark conntrack dscp ecn esp hashlimit helper icmp iprange length limit mac mark multiport owner physdev pkttype policy realm rpc sctp standard state tcp tcpmss tos ttl udp unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE NOTRACK REDIRECT REJECT SAME SNAT TARPIT TCPMSS TOS TRACE TTL ULOG --PF6_EXT_SLIB:=connmark eui64 hl icmp6 length limit mac mark multiport owner physdev policy standard state tcp udp CONNMARK HL LOG NFQUEUE MARK TRACE -+PF_EXT_SLIB:=ah addrtype comment connbytes connlimit connmark conntrack dccp dscp ecn esp hashlimit helper icmp iprange length limit mac mark multiport owner physdev pkttype policy quota realm recent rpc sctp standard state statistic string tcp tcpmss tos ttl udp unclean CLASSIFY CLUSTERIP CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE NOTRACK REDIRECT REJECT SAME SNAT TARPIT TCPMSS TOS TRACE TTL ULOG -+PF6_EXT_SLIB:=ah connmark dst esp eui64 frag hbh hl icmp6 ipv6header length limit mac mark multiport owner physdev policy rt standard state tcp udp CONNMARK HL LOG NFQUEUE MARK REJECT TRACE - - ifeq ($(DO_SELINUX), 1) - PF_EXT_SE_SLIB:=SECMARK CONNSECMARK diff --git a/iptables-1.3.7-newlines.diff b/iptables-1.3.7-newlines.diff deleted file mode 100644 index 75e11b4..0000000 --- a/iptables-1.3.7-newlines.diff +++ /dev/null @@ -1,58 +0,0 @@ ---- ip6tables-restore.c -+++ ip6tables-restore.c -@@ -156,13 +156,13 @@ - if (optind == argc - 1) { - in = fopen(argv[optind], "r"); - if (!in) { -- fprintf(stderr, "Can't open %s: %s", argv[optind], -+ fprintf(stderr, "Can't open %s: %s\n", argv[optind], - strerror(errno)); - exit(1); - } - } - else if (optind < argc) { -- fprintf(stderr, "Unknown arguments found on commandline"); -+ fprintf(stderr, "Unknown arguments found on commandline\n"); - exit(1); - } - else in = stdin; ---- ip6tables-save.c -+++ ip6tables-save.c -@@ -351,7 +351,7 @@ - } - - if (optind < argc) { -- fprintf(stderr, "Unknown arguments found on commandline"); -+ fprintf(stderr, "Unknown arguments found on commandline\n"); - exit(1); - } - ---- iptables-restore.c -+++ iptables-restore.c -@@ -159,13 +159,13 @@ - if (optind == argc - 1) { - in = fopen(argv[optind], "r"); - if (!in) { -- fprintf(stderr, "Can't open %s: %s", argv[optind], -+ fprintf(stderr, "Can't open %s: %s\n", argv[optind], - strerror(errno)); - exit(1); - } - } - else if (optind < argc) { -- fprintf(stderr, "Unknown arguments found on commandline"); -+ fprintf(stderr, "Unknown arguments found on commandline\n"); - exit(1); - } - else in = stdin; ---- iptables-save.c -+++ iptables-save.c -@@ -368,7 +368,7 @@ - } - - if (optind < argc) { -- fprintf(stderr, "Unknown arguments found on commandline"); -+ fprintf(stderr, "Unknown arguments found on commandline\n"); - exit(1); - } - diff --git a/iptables-1.3.7-shlibs.diff b/iptables-1.3.7-shlibs.diff deleted file mode 100644 index 3273e55..0000000 --- a/iptables-1.3.7-shlibs.diff +++ /dev/null @@ -1,1428 +0,0 @@ ---- extensions/libip6t_HL.c -+++ extensions/libip6t_HL.c -@@ -160,7 +160,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target6(&HL); - } ---- extensions/libip6t_LOG.c -+++ extensions/libip6t_LOG.c -@@ -284,7 +284,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target6(&log); - } ---- extensions/libip6t_MARK.c -+++ extensions/libip6t_MARK.c -@@ -125,7 +125,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target6(&mark); - } ---- extensions/libip6t_NFLOG.c -+++ extensions/libip6t_NFLOG.c -@@ -155,7 +155,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target6(&nflog); - } ---- extensions/libip6t_NFQUEUE.c -+++ extensions/libip6t_NFQUEUE.c -@@ -108,7 +108,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target6(&nfqueue); - } ---- extensions/libip6t_REJECT.c -+++ extensions/libip6t_REJECT.c -@@ -164,7 +164,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target6(&reject); - } ---- extensions/libip6t_ROUTE.c -+++ extensions/libip6t_ROUTE.c -@@ -234,7 +234,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target6(&route); - } ---- extensions/libip6t_SECMARK.c -+++ extensions/libip6t_SECMARK.c -@@ -119,7 +119,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target6(&secmark); - } ---- extensions/libip6t_TRACE.c -+++ extensions/libip6t_TRACE.c -@@ -57,7 +57,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target6(&trace); - } ---- extensions/libip6t_ah.c -+++ extensions/libip6t_ah.c -@@ -220,7 +220,7 @@ - .extra_opts = opts - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match6(&ah); ---- extensions/libip6t_condition.c -+++ extensions/libip6t_condition.c -@@ -99,7 +99,7 @@ - }; - - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match6(&condition); ---- extensions/libip6t_dst.c -+++ extensions/libip6t_dst.c -@@ -262,7 +262,7 @@ - .extra_opts = opts - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match6(&optstruct); ---- extensions/libip6t_esp.c -+++ extensions/libip6t_esp.c -@@ -178,7 +178,7 @@ - .extra_opts = opts - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match6(&esp); ---- extensions/libip6t_eui64.c -+++ extensions/libip6t_eui64.c -@@ -70,7 +70,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&eui64); - } ---- extensions/libip6t_frag.c -+++ extensions/libip6t_frag.c -@@ -265,7 +265,7 @@ - .extra_opts = opts - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match6(&frag); ---- extensions/libip6t_fuzzy.c -+++ extensions/libip6t_fuzzy.c -@@ -150,7 +150,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&fuzzy_match); - } ---- extensions/libip6t_hashlimit.c -+++ extensions/libip6t_hashlimit.c -@@ -363,7 +363,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&hashlimit); - } ---- extensions/libip6t_hbh.c -+++ extensions/libip6t_hbh.c -@@ -255,7 +255,7 @@ - .extra_opts = opts, - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match6(&optstruct); ---- extensions/libip6t_hl.c -+++ extensions/libip6t_hl.c -@@ -143,7 +143,7 @@ - }; - - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&hl); - } ---- extensions/libip6t_icmp6.c -+++ extensions/libip6t_icmp6.c -@@ -272,7 +272,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&icmpv6); - } ---- extensions/libip6t_ipv6header.c -+++ extensions/libip6t_ipv6header.c -@@ -310,7 +310,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&ipv6header); - } ---- extensions/libip6t_length.c -+++ extensions/libip6t_length.c -@@ -146,7 +146,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&length); - } ---- extensions/libip6t_limit.c -+++ extensions/libip6t_limit.c -@@ -189,7 +189,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&limit); - } ---- extensions/libip6t_mac.c -+++ extensions/libip6t_mac.c -@@ -133,7 +133,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&mac); - } ---- extensions/libip6t_mark.c -+++ extensions/libip6t_mark.c -@@ -136,7 +136,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&mark); - } ---- extensions/libip6t_multiport.c -+++ extensions/libip6t_multiport.c -@@ -450,7 +450,7 @@ - .extra_opts = opts, - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match6(&multiport); ---- extensions/libip6t_nth.c -+++ extensions/libip6t_nth.c -@@ -223,7 +223,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&nth); - } ---- extensions/libip6t_owner.c -+++ extensions/libip6t_owner.c -@@ -242,7 +242,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&owner); - } ---- extensions/libip6t_physdev.c -+++ extensions/libip6t_physdev.c -@@ -186,7 +186,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&physdev); - } ---- extensions/libip6t_policy.c -+++ extensions/libip6t_policy.c -@@ -472,7 +472,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&policy); - } ---- extensions/libip6t_random.c -+++ extensions/libip6t_random.c -@@ -144,7 +144,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&rand_match); - } ---- extensions/libip6t_rt.c -+++ extensions/libip6t_rt.c -@@ -355,7 +355,7 @@ - .extra_opts = opts, - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match6(&rt); ---- extensions/libip6t_sctp.c -+++ extensions/libip6t_sctp.c -@@ -543,7 +543,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&standard); - } ---- extensions/libip6t_standard.c -+++ extensions/libip6t_standard.c -@@ -60,7 +60,7 @@ - .extra_opts = opts, - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target6(&standard); - } ---- extensions/libip6t_state.c -+++ extensions/libip6t_state.c -@@ -157,7 +157,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&state); - } ---- extensions/libip6t_tcp.c -+++ extensions/libip6t_tcp.c -@@ -409,7 +409,7 @@ - .extra_opts = opts, - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match6(&tcp); ---- extensions/libip6t_udp.c -+++ extensions/libip6t_udp.c -@@ -221,7 +221,7 @@ - .extra_opts = opts, - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match6(&udp); ---- extensions/libipt_BALANCE.c -+++ extensions/libipt_BALANCE.c -@@ -144,7 +144,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&balance); - } ---- extensions/libipt_CLASSIFY.c -+++ extensions/libipt_CLASSIFY.c -@@ -123,7 +123,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&classify); - } ---- extensions/libipt_CLUSTERIP.c -+++ extensions/libipt_CLUSTERIP.c -@@ -262,7 +262,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&clusterip); - } ---- extensions/libipt_CONNMARK.c -+++ extensions/libipt_CONNMARK.c -@@ -214,7 +214,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&connmark_target); - } ---- extensions/libipt_CONNSECMARK.c -+++ extensions/libipt_CONNSECMARK.c -@@ -120,7 +120,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&connsecmark); - } ---- extensions/libipt_DNAT.c -+++ extensions/libipt_DNAT.c -@@ -243,7 +243,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&dnat); - } ---- extensions/libipt_DSCP.c -+++ extensions/libipt_DSCP.c -@@ -158,7 +158,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&dscp); - } ---- extensions/libipt_ECN.c -+++ extensions/libipt_ECN.c -@@ -179,7 +179,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&ecn); - } ---- extensions/libipt_FTOS.c -+++ extensions/libipt_FTOS.c -@@ -127,7 +127,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&ftos); - } ---- extensions/libipt_IPMARK.c -+++ extensions/libipt_IPMARK.c -@@ -162,7 +162,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&ipmark); - } ---- extensions/libipt_IPV4OPTSSTRIP.c -+++ extensions/libipt_IPV4OPTSSTRIP.c -@@ -68,7 +68,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&IPV4OPTSSTRIP); - } ---- extensions/libipt_LOG.c -+++ extensions/libipt_LOG.c -@@ -284,7 +284,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&log); - } ---- extensions/libipt_MARK.c -+++ extensions/libipt_MARK.c -@@ -236,7 +236,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&mark_v0); - register_target(&mark_v1); ---- extensions/libipt_MASQUERADE.c -+++ extensions/libipt_MASQUERADE.c -@@ -159,7 +159,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&masq); - } ---- extensions/libipt_MIRROR.c -+++ extensions/libipt_MIRROR.c -@@ -56,7 +56,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&mirror); - } ---- extensions/libipt_NETLINK.c -+++ extensions/libipt_NETLINK.c -@@ -150,7 +150,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&netlink); - } ---- extensions/libipt_NETMAP.c -+++ extensions/libipt_NETMAP.c -@@ -192,7 +192,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&target_module); - } ---- extensions/libipt_NFLOG.c -+++ extensions/libipt_NFLOG.c -@@ -155,7 +155,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&nflog); - } ---- extensions/libipt_NFQUEUE.c -+++ extensions/libipt_NFQUEUE.c -@@ -108,7 +108,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&nfqueue); - } ---- extensions/libipt_NOTRACK.c -+++ extensions/libipt_NOTRACK.c -@@ -57,7 +57,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(¬rack); - } ---- extensions/libipt_REDIRECT.c -+++ extensions/libipt_REDIRECT.c -@@ -164,7 +164,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&redir); - } ---- extensions/libipt_REJECT.c -+++ extensions/libipt_REJECT.c -@@ -183,7 +183,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&reject); - } ---- extensions/libipt_ROUTE.c -+++ extensions/libipt_ROUTE.c -@@ -258,7 +258,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&route); - } ---- extensions/libipt_SAME.c -+++ extensions/libipt_SAME.c -@@ -202,7 +202,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&same); - } ---- extensions/libipt_SECMARK.c -+++ extensions/libipt_SECMARK.c -@@ -119,7 +119,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&secmark); - } ---- extensions/libipt_SET.c -+++ extensions/libipt_SET.c -@@ -174,7 +174,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&ipt_set_target); - } ---- extensions/libipt_SNAT.c -+++ extensions/libipt_SNAT.c -@@ -243,7 +243,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&snat); - } ---- extensions/libipt_TARPIT.c -+++ extensions/libipt_TARPIT.c -@@ -52,7 +52,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&tarpit); - } ---- extensions/libipt_TCPLAG.c -+++ extensions/libipt_TCPLAG.c -@@ -212,4 +212,5 @@ - * so have to go ahead and use it. This registers your target into - * the list of available targets so that your options become available. - */ --void _init( void ) { register_target( &targ ); } -+static void __attribute__((constructor)) _init(void) -+{ register_target( &targ ); } ---- extensions/libipt_TCPMSS.c -+++ extensions/libipt_TCPMSS.c -@@ -128,7 +128,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&mss); - } ---- extensions/libipt_TOS.c -+++ extensions/libipt_TOS.c -@@ -168,7 +168,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&tos); - } ---- extensions/libipt_TRACE.c -+++ extensions/libipt_TRACE.c -@@ -57,7 +57,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&trace); - } ---- extensions/libipt_TTL.c -+++ extensions/libipt_TTL.c -@@ -160,7 +160,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&TTL); - } ---- extensions/libipt_ULOG.c -+++ extensions/libipt_ULOG.c -@@ -231,7 +231,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&ulog); - } ---- extensions/libipt_XOR.c -+++ extensions/libipt_XOR.c -@@ -108,7 +108,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&XOR); - } ---- extensions/libipt_account.c -+++ extensions/libipt_account.c -@@ -270,7 +270,7 @@ - }; - - /* Function which registers match */ --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&account); - } ---- extensions/libipt_addrtype.c -+++ extensions/libipt_addrtype.c -@@ -201,7 +201,7 @@ - }; - - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&addrtype); - } ---- extensions/libipt_ah.c -+++ extensions/libipt_ah.c -@@ -183,7 +183,7 @@ - .extra_opts = opts - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match(&ah); ---- extensions/libipt_childlevel.c -+++ extensions/libipt_childlevel.c -@@ -109,7 +109,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&childlevel); - } ---- extensions/libipt_comment.c -+++ extensions/libipt_comment.c -@@ -113,7 +113,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&comment); - } ---- extensions/libipt_condition.c -+++ extensions/libipt_condition.c -@@ -99,7 +99,7 @@ - }; - - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match(&condition); ---- extensions/libipt_connbytes.c -+++ extensions/libipt_connbytes.c -@@ -199,7 +199,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&state); - } ---- extensions/libipt_connlimit.c -+++ extensions/libipt_connlimit.c -@@ -126,7 +126,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&connlimit); - } ---- extensions/libipt_connmark.c -+++ extensions/libipt_connmark.c -@@ -145,7 +145,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&connmark_match); - } ---- extensions/libipt_connrate.c -+++ extensions/libipt_connrate.c -@@ -173,7 +173,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&state); - } ---- extensions/libipt_conntrack.c -+++ extensions/libipt_conntrack.c -@@ -544,7 +544,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&conntrack); - } ---- extensions/libipt_dccp.c -+++ extensions/libipt_dccp.c -@@ -367,7 +367,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&dccp); - } ---- extensions/libipt_dscp.c -+++ extensions/libipt_dscp.c -@@ -166,7 +166,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&dscp); - } ---- extensions/libipt_dstlimit.c -+++ extensions/libipt_dstlimit.c -@@ -334,7 +334,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&dstlimit); - } ---- extensions/libipt_ecn.c -+++ extensions/libipt_ecn.c -@@ -165,7 +165,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&ecn); - } ---- extensions/libipt_esp.c -+++ extensions/libipt_esp.c -@@ -186,7 +186,7 @@ - .extra_opts = opts - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match(&esp); ---- extensions/libipt_fuzzy.c -+++ extensions/libipt_fuzzy.c -@@ -152,7 +152,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&fuzzy_match); - } ---- extensions/libipt_hashlimit.c -+++ extensions/libipt_hashlimit.c -@@ -363,7 +363,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&hashlimit); - } ---- extensions/libipt_helper.c -+++ extensions/libipt_helper.c -@@ -95,7 +95,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&helper); - } ---- extensions/libipt_icmp.c -+++ extensions/libipt_icmp.c -@@ -301,7 +301,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&icmp); - } ---- extensions/libipt_iprange.c -+++ extensions/libipt_iprange.c -@@ -178,7 +178,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&iprange); - } ---- extensions/libipt_ipv4options.c -+++ extensions/libipt_ipv4options.c -@@ -305,7 +305,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&ipv4options_struct); - } ---- extensions/libipt_length.c -+++ extensions/libipt_length.c -@@ -145,7 +145,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&length); - } ---- extensions/libipt_limit.c -+++ extensions/libipt_limit.c -@@ -190,7 +190,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&limit); - } ---- extensions/libipt_mac.c -+++ extensions/libipt_mac.c -@@ -134,7 +134,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&mac); - } ---- extensions/libipt_mark.c -+++ extensions/libipt_mark.c -@@ -137,7 +137,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&mark); - } ---- extensions/libipt_mport.c -+++ extensions/libipt_mport.c -@@ -280,7 +280,7 @@ - .extra_opts = opts - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match(&mport); ---- extensions/libipt_multiport.c -+++ extensions/libipt_multiport.c -@@ -456,7 +456,7 @@ - .extra_opts = opts - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match(&multiport); ---- extensions/libipt_nth.c -+++ extensions/libipt_nth.c -@@ -224,7 +224,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&nth); - } ---- extensions/libipt_osf.c -+++ extensions/libipt_osf.c -@@ -159,7 +159,7 @@ - }; - - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&osf_match); - } ---- extensions/libipt_owner.c -+++ extensions/libipt_owner.c -@@ -244,7 +244,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&owner); - } ---- extensions/libipt_physdev.c -+++ extensions/libipt_physdev.c -@@ -187,7 +187,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&physdev); - } ---- extensions/libipt_pkttype.c -+++ extensions/libipt_pkttype.c -@@ -161,7 +161,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&pkttype); - } ---- extensions/libipt_policy.c -+++ extensions/libipt_policy.c -@@ -430,7 +430,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&policy); - } ---- extensions/libipt_psd.c -+++ extensions/libipt_psd.c -@@ -188,7 +188,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&psd); - } ---- extensions/libipt_quota.c -+++ extensions/libipt_quota.c -@@ -100,7 +100,7 @@ - .extra_opts = opts - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match("a); ---- extensions/libipt_random.c -+++ extensions/libipt_random.c -@@ -144,7 +144,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&rand_match); - } ---- extensions/libipt_realm.c -+++ extensions/libipt_realm.c -@@ -264,7 +264,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&realm); - } ---- extensions/libipt_recent.c -+++ extensions/libipt_recent.c -@@ -234,7 +234,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&recent); - } ---- extensions/libipt_record_rpc.c -+++ extensions/libipt_record_rpc.c -@@ -59,7 +59,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&record_rpc); - } ---- extensions/libipt_rpc.c -+++ extensions/libipt_rpc.c -@@ -366,7 +366,7 @@ - }; - - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&rpcstruct); - } ---- extensions/libipt_sctp.c -+++ extensions/libipt_sctp.c -@@ -543,7 +543,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&sctp); - } ---- extensions/libipt_set.c -+++ extensions/libipt_set.c -@@ -161,7 +161,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&set); - } ---- extensions/libipt_standard.c -+++ extensions/libipt_standard.c -@@ -63,7 +63,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target(&standard); - } ---- extensions/libipt_state.c -+++ extensions/libipt_state.c -@@ -157,7 +157,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&state); - } ---- extensions/libipt_statistic.c -+++ extensions/libipt_statistic.c -@@ -169,7 +169,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&statistic); - } ---- extensions/libipt_string.c -+++ extensions/libipt_string.c -@@ -348,7 +348,7 @@ - }; - - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&string); - } ---- extensions/libipt_tcp.c -+++ extensions/libipt_tcp.c -@@ -409,7 +409,7 @@ - .extra_opts = opts - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match(&tcp); ---- extensions/libipt_tcpmss.c -+++ extensions/libipt_tcpmss.c -@@ -146,7 +146,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&tcpmss); - } ---- extensions/libipt_time.c -+++ extensions/libipt_time.c -@@ -543,7 +543,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(×truct); - } ---- extensions/libipt_tos.c -+++ extensions/libipt_tos.c -@@ -166,7 +166,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&tos); - } ---- extensions/libipt_ttl.c -+++ extensions/libipt_ttl.c -@@ -166,7 +166,7 @@ - }; - - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&ttl); - } ---- extensions/libipt_u32.c -+++ extensions/libipt_u32.c -@@ -257,7 +257,7 @@ - .extra_opts = opts - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match(&u32); ---- extensions/libipt_udp.c -+++ extensions/libipt_udp.c -@@ -223,7 +223,7 @@ - .extra_opts = opts - }; - --void -+static void __attribute__((constructor)) - _init(void) - { - register_match(&udp); ---- extensions/libipt_unclean.c -+++ extensions/libipt_unclean.c -@@ -48,7 +48,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match(&unclean); - } ---- extensions/libip6t_CONNMARK.c -+++ extensions/libip6t_CONNMARK.c -@@ -214,7 +214,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target6(&connmark_target); - } ---- extensions/libip6t_CONNSECMARK.c -+++ extensions/libip6t_CONNSECMARK.c -@@ -118,7 +118,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_target6(&connsecmark); - } ---- extensions/libip6t_connmark.c -+++ extensions/libip6t_connmark.c -@@ -145,7 +145,7 @@ - .extra_opts = opts - }; - --void _init(void) -+static void __attribute__((constructor)) _init(void) - { - register_match6(&connmark_match); - } diff --git a/iptables-1.3.7.tar.bz2 b/iptables-1.3.7.tar.bz2 deleted file mode 100644 index 1e49ec1..0000000 --- a/iptables-1.3.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e00cea0029eaf7923a4a901265d5aa8159804b520fda9c12df54d350073ce02 -size 196205 diff --git a/iptables-1.3.7-batch.diff b/iptables-1.3.8-batch.diff similarity index 100% rename from iptables-1.3.7-batch.diff rename to iptables-1.3.8-batch.diff diff --git a/iptables-1.3.7-debian-docs.tar.bz2 b/iptables-1.3.8-debian-docs.tar.bz2 similarity index 100% rename from iptables-1.3.7-debian-docs.tar.bz2 rename to iptables-1.3.8-debian-docs.tar.bz2 diff --git a/iptables-1.3.7-makefile.diff b/iptables-1.3.8-makefile.diff similarity index 100% rename from iptables-1.3.7-makefile.diff rename to iptables-1.3.8-makefile.diff diff --git a/iptables-1.3.7-strict-aliasing-fix.diff b/iptables-1.3.8-strict-aliasing-fix.diff similarity index 100% rename from iptables-1.3.7-strict-aliasing-fix.diff rename to iptables-1.3.8-strict-aliasing-fix.diff diff --git a/iptables-1.3.8.tar.bz2 b/iptables-1.3.8.tar.bz2 new file mode 100644 index 0000000..0c58608 --- /dev/null +++ b/iptables-1.3.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5c8a091ed9a1fa2dab86b4d87719064b50c202e8503046f50f299a361e6211c +size 172584 diff --git a/iptables.changes b/iptables.changes index 376eb43..e562809 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Thu Jul 26 16:20:40 CEST 2007 - prusnak@suse.cz + +- updated to 1.3.8 + * Fix build error of conntrack match + * Remove whitespace in ip6tables.c + * `-p all' and `-p 0' should be allowed in ip6tables + * hashlimit doc update + * add --random option to DNAT and REDIRECT + * Makefile uses POSIX conform directory check + * Fix missing newlines in iptables-save/restore output + * Update quota manpage for SMP + * Output for unspecified proto is `all' instead of `0' + * Fix iptables-save with --random option + * Remove unnecessary IP_NAT_RANGE_PROTO_RANDOM ifdefs + * Remove libnsl from LDLIBS + * Fix problem with iptables-restore and quotes + * Remove unnecessary includes + * Fix --modprobe parameter + * ip6tables-restore should output error of modprobe after failed to load + * Add random option to SNAT + * Fix missing space in error message + * Fixes for manpages of tcp, udp, and icmp{,6} + * Add ip6tables mh extension + * Fix tcpmss manpage + * Add ip6tables TCPMSS extension + * Add UDPLITE multiport support + * Fix missing space in ruleset listing + * Remove extensions for unmaintained/obsolete patchlets + * Fix greedy debug grep + * Fix type in manpage + * Fix compile/install error for iptables-xml with DO_MULTI=1 +- dropped obsolete patches: + * newlines.diff (included in update) + * shlibs.diff (done by sed in %prep section) + * extensions.diff + ------------------------------------------------------------------- Wed May 9 13:39:08 CEST 2007 - prusnak@suse.cz diff --git a/iptables.spec b/iptables.spec index 991b038..08c3e5c 100644 --- a/iptables.spec +++ b/iptables.spec @@ -1,5 +1,5 @@ # -# spec file for package iptables (Version 1.3.7) +# spec file for package iptables (Version 1.3.8) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,20 +12,17 @@ Name: iptables BuildRequires: kernel-source -License: GNU General Public License (GPL) +License: GPL v2 or later Group: Productivity/Networking/Security Autoreqprov: on -Version: 1.3.7 -Release: 21 +Version: 1.3.8 +Release: 1 Summary: IP Packet Filter Administration Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-%{version}-debian-docs.tar.bz2 Patch0: %{name}-%{version}-makefile.diff Patch1: %{name}-%{version}-batch.diff Patch2: %{name}-%{version}-strict-aliasing-fix.diff -Patch3: %{name}-%{version}-shlibs.diff -Patch4: %{name}-%{version}-extensions.diff -Patch5: %{name}-%{version}-newlines.diff URL: http://www.iptables.org BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,10 +57,9 @@ Authors: %patch0 %patch1 %patch2 -%patch3 -%patch4 -%patch5 -chmod +x extensions/.CLUSTERIP-test +for file in extensions/*.c; do + sed -i 's:_init(:static __attribute__((constructor)) _init(:' $file +done %build [ -z "$KERNEL_DIR" ] && KERNEL_DIR="/usr/src/linux"; @@ -105,6 +101,40 @@ rm -rf $RPM_BUILD_ROOT %{_prefix}/include/* %changelog +* Thu Jul 26 2007 - prusnak@suse.cz +- updated to 1.3.8 + * Fix build error of conntrack match + * Remove whitespace in ip6tables.c + * `-p all' and `-p 0' should be allowed in ip6tables + * hashlimit doc update + * add --random option to DNAT and REDIRECT + * Makefile uses POSIX conform directory check + * Fix missing newlines in iptables-save/restore output + * Update quota manpage for SMP + * Output for unspecified proto is `all' instead of `0' + * Fix iptables-save with --random option + * Remove unnecessary IP_NAT_RANGE_PROTO_RANDOM ifdefs + * Remove libnsl from LDLIBS + * Fix problem with iptables-restore and quotes + * Remove unnecessary includes + * Fix --modprobe parameter + * ip6tables-restore should output error of modprobe after failed to load + * Add random option to SNAT + * Fix missing space in error message + * Fixes for manpages of tcp, udp, and icmp{,6} + * Add ip6tables mh extension + * Fix tcpmss manpage + * Add ip6tables TCPMSS extension + * Add UDPLITE multiport support + * Fix missing space in ruleset listing + * Remove extensions for unmaintained/obsolete patchlets + * Fix greedy debug grep + * Fix type in manpage + * Fix compile/install error for iptables-xml with DO_MULTI=1 +- dropped obsolete patches: + * newlines.diff (included in update) + * shlibs.diff (done by sed in %%prep section) + * extensions.diff * Wed May 09 2007 - prusnak@suse.cz - added newlines to error messages (newlines.diff) [#271847] * Tue Mar 13 2007 - prusnak@suse.cz