[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4bc65841fd0ea2f3b46655f742db04d6212e50f4

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3650 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  4bc65841fd0ea2f3b46655f742db04d6212e50f4 (commit)
       via  42c105ee5d7173efab67e24ac7413599c6991c64 (commit)
      from  6987acf5f3a7f2a70ecfc30a30a44cda5fd47a1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4bc65841fd0ea2f3b46655f742db04d6212e50f4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Apr 1 17:04:27 2012 +0200

    iptables: Update to 1.4.13.

commit 42c105ee5d7173efab67e24ac7413599c6991c64
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Apr 1 17:02:04 2012 +0200

    e2fsprogs: Update to 1.42.2.

-----------------------------------------------------------------------

Summary of changes:
 e2fsprogs/e2fsprogs.nm |    7 ++++---
 iptables/iptables.nm   |   21 +++------------------
 2 files changed, 7 insertions(+), 21 deletions(-)

Difference in files:
diff --git a/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm
index ce65673..d38b414 100644
--- a/e2fsprogs/e2fsprogs.nm
+++ b/e2fsprogs/e2fsprogs.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = e2fsprogs
-version    = 1.41.11
-release    = 2
+version    = 1.42.2
+release    = 1
 
 groups     = System/Filesystems
 url        = http://e2fsprogs.sourceforge.net/
@@ -18,7 +18,7 @@ description
 	and third extended (ext2/ext3) filesystems.
 end
 
-source_dl  =
+source_dl  = http://prdownloads.sourceforge.net/%{name}/
 
 build
 	requires
@@ -26,6 +26,7 @@ build
 		libselinux-devel
 		libsepol-devel
 		libuuid-devel
+		psmisc
 	end
 
 	prepare_cmds
diff --git a/iptables/iptables.nm b/iptables/iptables.nm
index ea53b4c..b809b20 100644
--- a/iptables/iptables.nm
+++ b/iptables/iptables.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = iptables
-version    = 1.4.12.2
+version    = 1.4.13
 release    = 1
 
 groups     = Networking/Tools
@@ -30,9 +30,6 @@ build
 	CFLAGS += -fno-strict-aliasing
 
 	configure_options += \
-		--bindir=/bin \
-		--sbindir=/sbin \
-		--libdir=/%{lib} \
 		--libexecdir=/%{lib} \
 		--sysconfdir=/etc \
 		--with-pkgconfigdir=%{libdir}/pkgconfig \
@@ -58,20 +55,8 @@ build
 		install -v -m 644 include/libiptc/*.h \
 			%{BUILDROOT}/usr/include/libiptc
 
-		mkdir -pv %{BUILDROOT}%{libdir}
-		rm -vf %{BUILDROOT}/%{lib}/libip{tc,4tc,6tc,q}.so %{BUILDROOT}/%{lib}/libxtables.so
-		ln -svf ../../%{lib}/libiptc.so.0 %{BUILDROOT}%{libdir}/libiptc.so
-		ln -svf ../../%{lib}/libip4tc.so.0 %{BUILDROOT}%{libdir}/libip4tc.so
-		ln -svf ../../%{lib}/libip6tc.so.0 %{BUILDROOT}%{libdir}/libip6tc.so
-		ln -svf ../../%{lib}/libipq.so.0 %{BUILDROOT}%{libdir}/libipq.so
-		ln -svf ../../%{lib}/libxtables.so.7 %{BUILDROOT}%{libdir}/libxtables.so
-
-		# Replace absolute symlink
-		ln -svf ../sbin/xtables-multi %{BUILDROOT}/bin/iptables-xml
-
-		# Move binary which links to /usr/lib to /usr.
-		mkdir -pv %{BUILDROOT}/usr/sbin
-		mv -v %{BUILDROOT}/{,usr/}sbin/nfnl_osf
+		# Remove relative symlinks.
+		ln -svf ../sbin/xtables-multi %{BUILDROOT}/usr/bin/iptables-xml
 	end
 end
 


hooks/post-receive
--
IPFire 3.x development tree