source:
clfs-embedded/patches/iptables-1.4.2-fixes-1.patch@
406ca8f
Last change on this file since 406ca8f was 6a3c6dc, checked in by , 16 years ago | |
---|---|
|
|
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 636 636 if (info->cfg.max != 0) 637 637 printf("--hashlimit-htable-max %u ", info->cfg.max); 638 638 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); 640 640 if (info->cfg.expire != XT_HASHLIMIT_EXPIRE) 641 641 printf("--hashlimit-htable-expire %u ", info->cfg.expire); 642 642 -
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 5 5 #include <stdlib.h> 6 6 #include <getopt.h> 7 7 8 #include <netinet/in.h> 8 9 #include <xtables.h> 9 10 #include <linux/netfilter.h> 10 11 #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 324 324 return; 325 325 if (info->invert & flag) 326 326 printf("! "); 327 printf( label);327 printf("%s ", label); 328 328 329 329 switch (info->match & flag) { 330 330 case IPT_OWNER_UID: … … 375 375 return; 376 376 if (info->invert & flag) 377 377 printf("! "); 378 printf( label);378 printf("%s ", label); 379 379 380 380 switch (info->match & flag) { 381 381 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 8 8 #include <stdio.h> 9 9 #include <stdlib.h> 10 10 #include <string.h> 11 #include <netinet/in.h> 11 12 12 13 #include <xtables.h> 13 14 #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 5 5 #include <sys/types.h> 6 6 #include <stdbool.h> 7 7 #include <net/if.h> 8 #include <netinet/in.h> 8 9 #include <linux/types.h> 9 10 #include <linux/netfilter/x_tables.h> 10 11 -
iptables-1.4.2
diff -Naur iptables-1.4.2.orig/Makefile.in iptables-1.4.2/Makefile.in
old new 87 87 "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" 88 88 libLTLIBRARIES_INSTALL = $(INSTALL) 89 89 LTLIBRARIES = $(lib_LTLIBRARIES) 90 libxtables_la_ LIBADD=90 libxtables_la_DEPENDENCIES = 91 91 am_libxtables_la_OBJECTS = xtables.lo 92 92 libxtables_la_OBJECTS = $(am_libxtables_la_OBJECTS) 93 93 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) … … 353 353 lib_LTLIBRARIES = libxtables.la 354 354 libxtables_la_SOURCES = xtables.c 355 355 libxtables_la_LDFLAGS = -version 0:0:0 356 libxtables_la_LIBADD = -ldl 356 357 357 358 # iptables, dynamic 358 359 iptables_SOURCES = iptables-standalone.c iptables.c 359 360 iptables_LDFLAGS = -rdynamic 360 iptables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext4.a libxtables.la361 iptables_LDADD = libiptc/libiptc.a extensions/libext4.a libxtables.la -ldl -lm 361 362 iptables_multi_SOURCES = iptables-multi.c iptables-save.c \ 362 363 iptables-restore.c iptables-xml.c \ 363 364 iptables-standalone.c iptables.c … … 375 376 # iptables-multi, semi-static 376 377 iptables_static_SOURCES = ${iptables_multi_SOURCES} xtables.c 377 378 iptables_static_CFLAGS = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1 378 iptables_static_LDADD = -lm libiptc/libiptc.a extensions/libext4.a379 iptables_static_LDADD = libiptc/libiptc.a extensions/libext4.a -lm 379 380 iptables_xml_SOURCES = iptables-xml.c 380 381 381 382 # ip6tables, dynamic 382 383 ip6tables_SOURCES = ip6tables-standalone.c ip6tables.c 383 384 ip6tables_LDFLAGS = -rdynamic 384 ip6tables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext6.a libxtables.la385 ip6tables_LDADD = libiptc/libiptc.a extensions/libext6.a libxtables.la -ldl -lm 385 386 ip6tables_multi_SOURCES = ip6tables-multi.c ip6tables-save.c \ 386 387 ip6tables-restore.c ip6tables-standalone.c \ 387 388 ip6tables.c … … 399 400 # iptables-multi, semi-static 400 401 ip6tables_static_SOURCES = ${ip6tables_multi_SOURCES} xtables.c 401 402 ip6tables_static_CFLAGS = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1 402 ip6tables_static_LDADD = -lm libiptc/libiptc.a extensions/libext6.a403 ip6tables_static_LDADD = libiptc/libiptc.a extensions/libext6.a -lm 403 404 noinst_LIBRARIES := libiptc/libiptc.a 404 405 man_MANS := iptables.8 iptables-restore.8 iptables-save.8 \ 405 406 iptables-xml.8 ip6tables.8 ip6tables-restore.8 \ … … 1529 1530 # ldconfig may fail when we are not root (as is the case in build systems) 1530 1531 # so add appropriate protection that it does not let `make` fail. 1531 1532 install-exec-hook: 1532 - /sbin/ldconfig || :;1533 -[ -z "$(DESTDIR)" ] && /sbin/ldconfig 1533 1534 # Tell versions [3.59,3.63) of GNU make to not export all variables. 1534 1535 # Otherwise a system limit (for SysV at least) may be exceeded. 1535 1536 .NOEXPORT:
Note:
See TracBrowser
for help on using the repository browser.