[arch-commits] Commit in iptables/repos (3 files)

[Ronald van Haren]

    Date: Wednesday, December 16, 2009 @ 12:10:23
  Author: ronald
Revision: 61471

Merged revisions 61470 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/iptables/trunk

........
  r61470 | ronald | 2009-12-16 18:09:53 +0100 (Wed, 16 Dec 2009) | 2 lines
  
  upgpkg: iptables 1.4.6-1
      disable ip forwarding by default FS#15892 FS#17262; fix RATEEST FS#17046
........

Modified:
  iptables/repos/testing-x86_64/	(properties)
  iptables/repos/testing-x86_64/PKGBUILD
  iptables/repos/testing-x86_64/iptables.conf.d

-----------------+
 PKGBUILD        |    6 +++++-
 iptables.conf.d |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)


Property changes on: iptables/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /iptables/trunk:1-61457
   + /iptables/trunk:1-61470

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-12-16 17:09:53 UTC (rev 61470)
+++ testing-x86_64/PKGBUILD	2009-12-16 17:10:23 UTC (rev 61471)
@@ -19,11 +19,15 @@
          '6e0e88c2ed0c3715d1409ee3258a0046'
          '14186bbafe21bb0638c0cb8e0903c829'
          'e53a83bb4d8ac8b7eadd7bd58294751d'
-         'c7cf6e4455c228e50d20ce3edd75ee59')
+         'a9020ee7586417b87c026d435b4be50d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
+  # http://bugs.archlinux.org/task/17046
+  sed -ie '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in
+  sed -ie '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in
+
  ./configure --prefix=/usr --with-kernel=usr/src/linux-$(uname -r) \
 	--libexecdir=/usr/lib/iptables --sysconfdir=/etc \
 	--with-xtlibdir=/usr/lib/iptables \

Modified: testing-x86_64/iptables.conf.d
===================================================================
--- testing-x86_64/iptables.conf.d	2009-12-16 17:09:53 UTC (rev 61470)
+++ testing-x86_64/iptables.conf.d	2009-12-16 17:10:23 UTC (rev 61471)
@@ -5,4 +5,4 @@
 
 IPTABLES_CONF=/etc/iptables/iptables.rules
 IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-IPTABLES_FORWARD=1  # enable IP forwarding?
+IPTABLES_FORWARD=0  # enable IP forwarding?