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

Last change on this file since 85d173b 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
RevLine 
[6a3c6dc]1Submitted By: Jim Gifford (jim at cross-lfs dot org)
2Date: 01-26-2009
3Initial Package Version: 1.4.2
4Origin: Upstream
5Upstream Status: Applied
6Description: This patch fixed issues that have been resolved in the current iptables tree.
7
8diff -Naur iptables-1.4.2.orig/extensions/libxt_hashlimit.c iptables-1.4.2/extensions/libxt_hashlimit.c
9--- iptables-1.4.2.orig/extensions/libxt_hashlimit.c 2008-10-08 09:31:58.000000000 -0700
10+++ iptables-1.4.2/extensions/libxt_hashlimit.c 2009-01-26 14:56:10.367249615 -0800
11@@ -636,7 +636,7 @@
12 if (info->cfg.max != 0)
13 printf("--hashlimit-htable-max %u ", info->cfg.max);
14 if (info->cfg.gc_interval != XT_HASHLIMIT_GCINTERVAL)
15- printf("--hashlimit-htable-gcinterval %u", info->cfg.gc_interval);
16+ printf("--hashlimit-htable-gcinterval %u ", info->cfg.gc_interval);
17 if (info->cfg.expire != XT_HASHLIMIT_EXPIRE)
18 printf("--hashlimit-htable-expire %u ", info->cfg.expire);
19
20diff -Naur iptables-1.4.2.orig/extensions/libxt_iprange.c iptables-1.4.2/extensions/libxt_iprange.c
21--- iptables-1.4.2.orig/extensions/libxt_iprange.c 2008-10-08 09:31:58.000000000 -0700
22+++ iptables-1.4.2/extensions/libxt_iprange.c 2009-01-26 14:58:09.455715602 -0800
23@@ -5,6 +5,7 @@
24 #include <stdlib.h>
25 #include <getopt.h>
26
27+#include <netinet/in.h>
28 #include <xtables.h>
29 #include <linux/netfilter.h>
30 #include <linux/netfilter/xt_iprange.h>
31diff -Naur iptables-1.4.2.orig/extensions/libxt_owner.c iptables-1.4.2/extensions/libxt_owner.c
32--- iptables-1.4.2.orig/extensions/libxt_owner.c 2008-10-08 09:31:58.000000000 -0700
33+++ iptables-1.4.2/extensions/libxt_owner.c 2009-01-26 14:58:48.846988126 -0800
34@@ -324,7 +324,7 @@
35 return;
36 if (info->invert & flag)
37 printf("! ");
38- printf(label);
39+ printf("%s ", label);
40
41 switch (info->match & flag) {
42 case IPT_OWNER_UID:
43@@ -375,7 +375,7 @@
44 return;
45 if (info->invert & flag)
46 printf("! ");
47- printf(label);
48+ printf("%s ", label);
49
50 switch (info->match & flag) {
51 case IP6T_OWNER_UID:
52diff -Naur iptables-1.4.2.orig/extensions/libxt_TOS.c iptables-1.4.2/extensions/libxt_TOS.c
53--- iptables-1.4.2.orig/extensions/libxt_TOS.c 2008-10-08 09:31:58.000000000 -0700
54+++ iptables-1.4.2/extensions/libxt_TOS.c 2009-01-26 14:57:52.122570191 -0800
55@@ -8,6 +8,7 @@
56 #include <stdio.h>
57 #include <stdlib.h>
58 #include <string.h>
59+#include <netinet/in.h>
60
61 #include <xtables.h>
62 #include <linux/netfilter/xt_DSCP.h>
63diff -Naur iptables-1.4.2.orig/include/xtables.h.in iptables-1.4.2/include/xtables.h.in
64--- iptables-1.4.2.orig/include/xtables.h.in 2008-10-08 09:31:58.000000000 -0700
65+++ iptables-1.4.2/include/xtables.h.in 2009-01-26 14:57:30.449986869 -0800
66@@ -5,6 +5,7 @@
67 #include <sys/types.h>
68 #include <stdbool.h>
69 #include <net/if.h>
70+#include <netinet/in.h>
71 #include <linux/types.h>
72 #include <linux/netfilter/x_tables.h>
73
74diff -Naur iptables-1.4.2.orig/Makefile.in iptables-1.4.2/Makefile.in
75--- iptables-1.4.2.orig/Makefile.in 2008-10-13 05:36:47.000000000 -0700
76+++ iptables-1.4.2/Makefile.in 2009-01-26 14:58:29.770686408 -0800
77@@ -87,7 +87,7 @@
78 "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
79 libLTLIBRARIES_INSTALL = $(INSTALL)
80 LTLIBRARIES = $(lib_LTLIBRARIES)
81-libxtables_la_LIBADD =
82+libxtables_la_DEPENDENCIES =
83 am_libxtables_la_OBJECTS = xtables.lo
84 libxtables_la_OBJECTS = $(am_libxtables_la_OBJECTS)
85 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
86@@ -353,11 +353,12 @@
87 lib_LTLIBRARIES = libxtables.la
88 libxtables_la_SOURCES = xtables.c
89 libxtables_la_LDFLAGS = -version 0:0:0
90+libxtables_la_LIBADD = -ldl
91
92 # iptables, dynamic
93 iptables_SOURCES = iptables-standalone.c iptables.c
94 iptables_LDFLAGS = -rdynamic
95-iptables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext4.a libxtables.la
96+iptables_LDADD = libiptc/libiptc.a extensions/libext4.a libxtables.la -ldl -lm
97 iptables_multi_SOURCES = iptables-multi.c iptables-save.c \
98 iptables-restore.c iptables-xml.c \
99 iptables-standalone.c iptables.c
100@@ -375,13 +376,13 @@
101 # iptables-multi, semi-static
102 iptables_static_SOURCES = ${iptables_multi_SOURCES} xtables.c
103 iptables_static_CFLAGS = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1
104-iptables_static_LDADD = -lm libiptc/libiptc.a extensions/libext4.a
105+iptables_static_LDADD = libiptc/libiptc.a extensions/libext4.a -lm
106 iptables_xml_SOURCES = iptables-xml.c
107
108 # ip6tables, dynamic
109 ip6tables_SOURCES = ip6tables-standalone.c ip6tables.c
110 ip6tables_LDFLAGS = -rdynamic
111-ip6tables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext6.a libxtables.la
112+ip6tables_LDADD = libiptc/libiptc.a extensions/libext6.a libxtables.la -ldl -lm
113 ip6tables_multi_SOURCES = ip6tables-multi.c ip6tables-save.c \
114 ip6tables-restore.c ip6tables-standalone.c \
115 ip6tables.c
116@@ -399,7 +400,7 @@
117 # iptables-multi, semi-static
118 ip6tables_static_SOURCES = ${ip6tables_multi_SOURCES} xtables.c
119 ip6tables_static_CFLAGS = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1
120-ip6tables_static_LDADD = -lm libiptc/libiptc.a extensions/libext6.a
121+ip6tables_static_LDADD = libiptc/libiptc.a extensions/libext6.a -lm
122 noinst_LIBRARIES := libiptc/libiptc.a
123 man_MANS := iptables.8 iptables-restore.8 iptables-save.8 \
124 iptables-xml.8 ip6tables.8 ip6tables-restore.8 \
125@@ -1529,7 +1530,7 @@
126 # ldconfig may fail when we are not root (as is the case in build systems)
127 # so add appropriate protection that it does not let `make` fail.
128 install-exec-hook:
129- -/sbin/ldconfig || :;
130+ -[ -z "$(DESTDIR)" ] && /sbin/ldconfig
131 # Tell versions [3.59,3.63) of GNU make to not export all variables.
132 # Otherwise a system limit (for SysV at least) may be exceeded.
133 .NOEXPORT:
Note: See TracBrowser for help on using the repository browser.