summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2011-05-29 19:45:19 +0400
committerVlad Glagolev2011-05-29 19:45:19 +0400
commit4d3f46d53d063bdf4131908209fb6468a901ef29 (patch)
treebf92bfb7327051c603f1f4f6627bde69c14e4487
parentd4e17304ef580cc4409eccc16efea0297fa25bb6 (diff)
iptables: fixed build process
-rw-r--r--net/iptables/HISTORY4
-rwxr-xr-xnet/iptables/PRE_BUILD4
-rw-r--r--net/iptables/mk.patch15
3 files changed, 23 insertions, 0 deletions
diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index 799509b9a5..2a63568a4b 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,7 @@
+2011-05-29 Vlad Glagolev <stealth@sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * mk.patch: added, to fix symlinks for xtables-multi
+
2011-05-27 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.4.11, use netfilter.gpg from section
diff --git a/net/iptables/PRE_BUILD b/net/iptables/PRE_BUILD
new file mode 100755
index 0000000000..f50ccbfa3c
--- /dev/null
+++ b/net/iptables/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/mk.patch"
diff --git a/net/iptables/mk.patch b/net/iptables/mk.patch
new file mode 100644
index 0000000000..eb7daab7ef
--- /dev/null
+++ b/net/iptables/mk.patch
@@ -0,0 +1,15 @@
+--- Makefile.in.orig 2011-05-26 20:15:37.000000000 +0400
++++ Makefile.in 2011-05-29 19:36:38.767926751 +0400
+@@ -1320,9 +1320,9 @@
+ install-exec-hook:
+ -if test -z "${DESTDIR}"; then /sbin/ldconfig; fi;
+ ${INSTALL} -dm0755 "${DESTDIR}${bindir}";
+- for i in ${v4_bin_links}; do ${LN_S} -f "${sbindir}/iptables-multi" "${DESTDIR}${bindir}/$$i"; done;
+- for i in ${v4_sbin_links}; do ${LN_S} -f iptables-multi "${DESTDIR}${sbindir}/$$i"; done;
+- for i in ${v6_sbin_links}; do ${LN_S} -f ip6tables-multi "${DESTDIR}${sbindir}/$$i"; done;
++ for i in ${v4_bin_links}; do ${LN_S} -f "${sbindir}/xtables-multi" "${DESTDIR}${bindir}/$$i"; done;
++ for i in ${v4_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done;
++ for i in ${v6_sbin_links}; do ${LN_S} -f xtables-multi "${DESTDIR}${sbindir}/$$i"; done;
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.