source: clfs-embedded/patches/iptables-1.4.2-fixes-1.patch@ baaf929

Last change on this file since baaf929 was 6a3c6dc, checked in by Jim Gifford <clfs@…>, 16 years ago

Updates to IPTables and Dropbear
  • Property mode set to 100644
File size: 5.5 KB

  • extensions/libxt_hashlimit.c 

    Submitted By: Jim Gifford (jim at cross-lfs dot org)
Date: 01-26-2009
Initial Package Version: 1.4.2
Origin: Upstream
Upstream Status: Applied
Description: This patch fixed issues that have been resolved in the current iptables tree.

diff -Naur iptables-1.4.2.orig/extensions/libxt_hashlimit.c iptables-1.4.2/extensions/libxt_hashlimit.c
    old new  
    636636        if (info->cfg.max != 0)
    637637                printf("--hashlimit-htable-max %u ", info->cfg.max);
    638638        if (info->cfg.gc_interval != XT_HASHLIMIT_GCINTERVAL)
    639                 printf("--hashlimit-htable-gcinterval %u", info->cfg.gc_interval);
     639                printf("--hashlimit-htable-gcinterval %u ", info->cfg.gc_interval);
    640640        if (info->cfg.expire != XT_HASHLIMIT_EXPIRE)
    641641                printf("--hashlimit-htable-expire %u ", info->cfg.expire);
    642642

  • extensions/libxt_iprange.c 

    diff -Naur iptables-1.4.2.orig/extensions/libxt_iprange.c iptables-1.4.2/extensions/libxt_iprange.c
    old new  
    55#include <stdlib.h>
    66#include <getopt.h>
    77
     8#include <netinet/in.h>
    89#include <xtables.h>
    910#include <linux/netfilter.h>
    1011#include <linux/netfilter/xt_iprange.h>

  • extensions/libxt_owner.c 

    diff -Naur iptables-1.4.2.orig/extensions/libxt_owner.c iptables-1.4.2/extensions/libxt_owner.c
    old new  
    324324                return;
    325325        if (info->invert & flag)
    326326                printf("! ");
    327         printf(label);
     327        printf("%s ", label);
    328328
    329329        switch (info->match & flag) {
    330330        case IPT_OWNER_UID:
    … …  
    375375                return;
    376376        if (info->invert & flag)
    377377                printf("! ");
    378         printf(label);
     378        printf("%s ", label);
    379379
    380380        switch (info->match & flag) {
    381381        case IP6T_OWNER_UID:

  • extensions/libxt_TOS.c 

    diff -Naur iptables-1.4.2.orig/extensions/libxt_TOS.c iptables-1.4.2/extensions/libxt_TOS.c
    old new  
    88#include <stdio.h>
    99#include <stdlib.h>
    1010#include <string.h>
     11#include <netinet/in.h>
    1112
    1213#include <xtables.h>
    1314#include <linux/netfilter/xt_DSCP.h>

  • include/xtables.h.in 

    diff -Naur iptables-1.4.2.orig/include/xtables.h.in iptables-1.4.2/include/xtables.h.in
    old new  
    55#include <sys/types.h>
    66#include <stdbool.h>
    77#include <net/if.h>
     8#include <netinet/in.h>
    89#include <linux/types.h>
    910#include <linux/netfilter/x_tables.h>
    1011

  • iptables-1.4.2 

    diff -Naur iptables-1.4.2.orig/Makefile.in iptables-1.4.2/Makefile.in
    old new  
    8787        "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
    8888libLTLIBRARIES_INSTALL = $(INSTALL)
    8989LTLIBRARIES = $(lib_LTLIBRARIES)
    90 libxtables_la_LIBADD =
     90libxtables_la_DEPENDENCIES =
    9191am_libxtables_la_OBJECTS = xtables.lo
    9292libxtables_la_OBJECTS = $(am_libxtables_la_OBJECTS)
    9393binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    … …  
    353353lib_LTLIBRARIES = libxtables.la
    354354libxtables_la_SOURCES = xtables.c
    355355libxtables_la_LDFLAGS = -version 0:0:0
     356libxtables_la_LIBADD = -ldl
    356357
    357358# iptables, dynamic
    358359iptables_SOURCES = iptables-standalone.c iptables.c
    359360iptables_LDFLAGS = -rdynamic
    360 iptables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext4.a libxtables.la
     361iptables_LDADD = libiptc/libiptc.a extensions/libext4.a libxtables.la -ldl -lm
    361362iptables_multi_SOURCES = iptables-multi.c iptables-save.c \
    362363                            iptables-restore.c iptables-xml.c \
    363364                            iptables-standalone.c iptables.c
    … …  
    375376# iptables-multi, semi-static
    376377iptables_static_SOURCES = ${iptables_multi_SOURCES} xtables.c
    377378iptables_static_CFLAGS = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1
    378 iptables_static_LDADD = -lm libiptc/libiptc.a extensions/libext4.a
     379iptables_static_LDADD = libiptc/libiptc.a extensions/libext4.a -lm
    379380iptables_xml_SOURCES = iptables-xml.c
    380381
    381382# ip6tables, dynamic
    382383ip6tables_SOURCES = ip6tables-standalone.c ip6tables.c
    383384ip6tables_LDFLAGS = -rdynamic
    384 ip6tables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext6.a libxtables.la
     385ip6tables_LDADD = libiptc/libiptc.a extensions/libext6.a libxtables.la -ldl -lm
    385386ip6tables_multi_SOURCES = ip6tables-multi.c ip6tables-save.c \
    386387                            ip6tables-restore.c ip6tables-standalone.c \
    387388                            ip6tables.c
    … …  
    399400# iptables-multi, semi-static
    400401ip6tables_static_SOURCES = ${ip6tables_multi_SOURCES} xtables.c
    401402ip6tables_static_CFLAGS = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1
    402 ip6tables_static_LDADD = -lm libiptc/libiptc.a extensions/libext6.a
     403ip6tables_static_LDADD = libiptc/libiptc.a extensions/libext6.a -lm
    403404noinst_LIBRARIES := libiptc/libiptc.a
    404405man_MANS := iptables.8 iptables-restore.8 iptables-save.8 \
    405406                    iptables-xml.8 ip6tables.8 ip6tables-restore.8 \
    … …  
    15291530# ldconfig may fail when we are not root (as is the case in build systems)
    15301531# so add appropriate protection that it does not let `make` fail.
    15311532install-exec-hook:
    1532         -/sbin/ldconfig || :;
     1533        -[ -z "$(DESTDIR)" ] && /sbin/ldconfig
    15331534# Tell versions [3.59,3.63) of GNU make to not export all variables.
    15341535# Otherwise a system limit (for SysV at least) may be exceeded.
    15351536.NOEXPORT:
Note: See TracBrowser for help on using the repository browser.