From 2d84d999d1eb8546bda0407b6978d4a96466b4d0 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Fri, 3 Jun 2011 11:45:58 +0200 Subject: [PATCH] iptables: fixed broken symlinks to multi-call binary (patch should be send upstream) --- ...ptables-1.4.11-symlink-xtables-multi.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 network/iptables/iptables-1.4.11-symlink-xtables-multi.patch diff --git a/network/iptables/iptables-1.4.11-symlink-xtables-multi.patch b/network/iptables/iptables-1.4.11-symlink-xtables-multi.patch new file mode 100644 index 000000000..ebd99e25f --- /dev/null +++ b/network/iptables/iptables-1.4.11-symlink-xtables-multi.patch @@ -0,0 +1,49 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../iptables/iptables-1.4.11-symlink-xtables-multi.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Description: Fix broken symlinks to multi-call binary + +Since iptables 1.4.11 there is only one multi-call binary installed which is +named 'xtables-multi' but without this patch broken symlinks to the former +program names 'iptables-multi' and 'ip6tables-multi' are created. + +--- iptables-1.4.11/Makefile.am.orig 2011-06-03 11:21:15.736005388 +0200 ++++ iptables-1.4.11/Makefile.am 2011-06-03 11:22:31.952005388 +0200 +@@ -96,6 +96,6 @@ + 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; +--- iptables-1.4.11/Makefile.in.orig 2011-06-03 11:21:21.048005388 +0200 ++++ iptables-1.4.11/Makefile.in 2011-06-03 11:23:26.332005388 +0200 +@@ -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.