[git.ipfire.org] IPFire 2.x development tree branch, core80, updated. 13eef3ba74c47e8beabd87c006b597c6c46e9e46 - IPFire-SCM

18 Jul 2014

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 2.x development tree".
The branch, core80 has been updated
       via  13eef3ba74c47e8beabd87c006b597c6c46e9e46 (commit)
       via  89066697c4c257896feaf017ecc72814d01f3682 (commit)
       via  94abd48b1c666f7ec1009515ffb651f522f9f89b (commit)
       via  b8cee3bb81787328e3bb2c6d9edb31ac0015a717 (commit)
       via  da3dbb2a428127f345c4881a757cce8f60df767f (commit)
       via  0f860889ab02872ede525a78de9e22d29b54277d (commit)
      from  5b71042c5426855ee58a56d16d11a4cc5d0f5253 (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 13eef3ba74c47e8beabd87c006b597c6c46e9e46
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Jul 18 15:31:15 2014 +0200
ddns: Update to version 003.
commit 89066697c4c257896feaf017ecc72814d01f3682
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Jul 18 15:20:13 2014 +0200
gmp: Ship MMX/SSE/SSE2 enabled version.
commit 94abd48b1c666f7ec1009515ffb651f522f9f89b
Merge: da3dbb2 b8cee3b
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Jul 18 14:55:47 2014 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
commit b8cee3bb81787328e3bb2c6d9edb31ac0015a717
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Jul 18 12:52:20 2014 +0200
gmp: fix build on Intel buildmachines.
on newer Intel buildsystems the gmp configure script enables some
    sse2 optimizations that not work on old cpu's (ALIX, K6 ...)
commit da3dbb2a428127f345c4881a757cce8f60df767f
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Fri Jul 18 10:20:41 2014 +0200
buildsystem: Explicitely compile with -mtune=generic
commit 0f860889ab02872ede525a78de9e22d29b54277d
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Thu Jul 17 21:03:53 2014 +0200
core80: Fix configuration update and resurrect permissions.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/{ => armv5tel}/gmp  |  0
 config/rootfiles/common/{ => i586}/gmp      |  4 ++++
 config/rootfiles/common/stage2              |  1 +
 config/rootfiles/core/80/filelists/i586/gmp |  1 +
 config/rootfiles/core/80/update.sh          | 16 +++++++++-----
 lfs/ddns                                    |  4 ++--
 lfs/gmp                                     | 34 ++++++++++++++++++++++++++---
 lfs/gmp-compat                              |  3 ++-
 lfs/stage2                                  |  2 +-
 tools/make-functions                        |  2 +-
 10 files changed, 54 insertions(+), 13 deletions(-)
 copy config/rootfiles/common/{ => armv5tel}/gmp (100%)
 rename config/rootfiles/common/{ => i586}/gmp (80%)
 create mode 120000 config/rootfiles/core/80/filelists/i586/gmp
Difference in files:

diff --git a/config/rootfiles/common/armv5tel/gmp b/config/rootfiles/common/armv5tel/gmp
new file mode 100644
index 0000000..67f557f
--- /dev/null
+++ b/config/rootfiles/common/armv5tel/gmp
@@ -0,0 +1,21 @@
+#usr/include/gmp.h
+#usr/include/gmpxx.h
+#usr/include/mp.h
+#usr/lib/libgmp.a
+#usr/lib/libgmp.la
+#usr/lib/libgmp.so
+usr/lib/libgmp.so.10
+usr/lib/libgmp.so.10.0.5
+#usr/lib/libgmpxx.a
+#usr/lib/libgmpxx.la
+#usr/lib/libgmpxx.so
+usr/lib/libgmpxx.so.4
+usr/lib/libgmpxx.so.4.2.5
+#usr/lib/libmp.a
+#usr/lib/libmp.la
+#usr/lib/libmp.so
+usr/lib/libmp.so.3
+usr/lib/libmp.so.3.1.25
+#usr/share/info/gmp.info
+#usr/share/info/gmp.info-1
+#usr/share/info/gmp.info-2
diff --git a/config/rootfiles/common/gmp b/config/rootfiles/common/gmp
deleted file mode 100644
index 67f557f..0000000
--- a/config/rootfiles/common/gmp
+++ /dev/null
@@ -1,21 +0,0 @@
-#usr/include/gmp.h
-#usr/include/gmpxx.h
-#usr/include/mp.h
-#usr/lib/libgmp.a
-#usr/lib/libgmp.la
-#usr/lib/libgmp.so
-usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.0.5
-#usr/lib/libgmpxx.a
-#usr/lib/libgmpxx.la
-#usr/lib/libgmpxx.so
-usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.2.5
-#usr/lib/libmp.a
-#usr/lib/libmp.la
-#usr/lib/libmp.so
-usr/lib/libmp.so.3
-usr/lib/libmp.so.3.1.25
-#usr/share/info/gmp.info
-#usr/share/info/gmp.info-1
-#usr/share/info/gmp.info-2
diff --git a/config/rootfiles/common/i586/gmp b/config/rootfiles/common/i586/gmp
new file mode 100644
index 0000000..db6a000
--- /dev/null
+++ b/config/rootfiles/common/i586/gmp
@@ -0,0 +1,25 @@
+#usr/include/gmp.h
+#usr/include/gmpxx.h
+#usr/include/mp.h
+#usr/lib/libgmp.a
+#usr/lib/libgmp.la
+#usr/lib/libgmp.so
+usr/lib/libgmp.so.10
+usr/lib/libgmp.so.10.0.5
+#usr/lib/libgmpxx.a
+#usr/lib/libgmpxx.la
+#usr/lib/libgmpxx.so
+usr/lib/libgmpxx.so.4
+usr/lib/libgmpxx.so.4.2.5
+#usr/lib/libmp.a
+#usr/lib/libmp.la
+#usr/lib/libmp.so
+usr/lib/libmp.so.3
+usr/lib/libmp.so.3.1.25
+usr/lib/sse2/libgmp.so.10
+usr/lib/sse2/libgmp.so.10.0.5
+usr/lib/sse2/libmp.so.3
+usr/lib/sse2/libmp.so.3.1.25
+#usr/share/info/gmp.info
+#usr/share/info/gmp.info-1
+#usr/share/info/gmp.info-2
diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 085092d..39bf555 100644
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -74,6 +74,7 @@ usr/lib/libgcc_s.so.1
 #usr/lib/libstdc++.la
 #usr/lib/libstdc++.so
 usr/lib/libstdc++.so.6
+#usr/lib/sse2
 #usr/local
 #usr/local/bin
 #usr/local/bin/archive.files
diff --git a/config/rootfiles/core/80/filelists/i586/gmp b/config/rootfiles/core/80/filelists/i586/gmp
new file mode 120000
index 0000000..52a09cd
--- /dev/null
+++ b/config/rootfiles/core/80/filelists/i586/gmp
@@ -0,0 +1 @@
+../../../../common/i586/gmp
\ No newline at end of file
diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh
index baba3e2..b8b5b58 100644
--- a/config/rootfiles/core/80/update.sh
+++ b/config/rootfiles/core/80/update.sh
@@ -61,13 +61,19 @@ rm -f \
    /opt/pakfire/db/rootfiles/libgpg-error
# Regenerate squid configuration file
-/srv/web/ipfire/cgi-bin/proxy.cgi
+sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi
-# Generate ddns configuration file
-/srv/web/ipfire/cgi-bin/ddns.cgi
+# Fix broken proxy configuration permissions
+chown -R nobody.nobody \
+	/var/ipfire/proxy/advanced \
+	/var/ipfire/proxy/acl-1.4 \
+	/var/ipfire/proxy/enable \
+	/var/ipfire/proxy/settings \
+	/var/ipfire/proxy/squid.conf \
+	/var/ipfire/proxy/transparent
-touch /var/ipfire/ddns/ddns.conf
-chown nobody.nobody /var/ipfire/ddns/ddns.conf
+# Generate ddns configuration file
+sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi
# Update crontab
 sed -i /var/spool/cron/root.orig -e "/setddns.pl/d"
diff --git a/lfs/ddns b/lfs/ddns
index a14f3c2..c8348ce 100644
--- a/lfs/ddns
+++ b/lfs/ddns
@@ -24,7 +24,7 @@
include Config
-VER        = 002
+VER        = 003
THISAPP    = ddns-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 307f36e6dadf537470a6b682b1536724
+$(DL_FILE)_MD5 = 9ff8ab5fa716859b51f63b0a241f1337
install : $(TARGET)
diff --git a/lfs/gmp b/lfs/gmp
index cf52276..1e518a2 100644
--- a/lfs/gmp
+++ b/lfs/gmp
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014   IPFire Team   info@ipfire.org                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -34,8 +34,15 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
ifeq "$(MACHINE)" "i586"
    CONFIGURE_ARGS = ABI=32
+	BUILDTARGET_PENTIUM4 = $(patsubst $(MACHINE)-%,pentium4-%,$(BUILDTARGET))
 endif
+CONFIGURE_OPTIONS = \
+	--prefix=/usr \
+	--enable-cxx \
+	--enable-mpbsd \
+	--disable-nls
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -74,9 +81,30 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
-		--enable-cxx --enable-mpbsd --disable-nls
+	cd $(DIR_APP) && \
+		$(CONFIGURE_ARGS) \
+		./configure \
+			--build=$(BUILDTARGET) \
+			$(CONFIGURE_OPTIONS)
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && make install
+
+ifeq "$(MACHINE)" "i586"
+	# Build SSE/SSE2 optimised version for x86
+	cd $(DIR_APP) && make clean
+	cd $(DIR_APP) && \
+		$(CONFIGURE_ARGS) \
+		./configure \
+			--build=$(BUILDTARGET_PENTIUM4) \
+			$(CONFIGURE_OPTIONS) \
+			CFLAGS="$(CFLAGS) -march=pentium4" \
+			CXXFLAGS="$(CXXFLAGS) -march=pentium4"
+	cd $(DIR_APP) && make $(MAKETUNING)
+
+	-mkdir -pv /usr/lib/sse2
+	cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.0.5 /usr/lib/sse2
+	cd $(DIR_APP) && install -v -m 755 .libs/libmp.so.3.1.25 /usr/lib/sse2
+endif
+
    @rm -rf $(DIR_APP)
    @$(POSTBUILD)
diff --git a/lfs/gmp-compat b/lfs/gmp-compat
index 3d20e88..438e957 100644
--- a/lfs/gmp-compat
+++ b/lfs/gmp-compat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014   IPFire Team   info@ipfire.org                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
    @$(PREBUILD)
    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
    cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \
+		--build=$(BUILDTARGET) \
    	--enable-cxx --enable-mpbsd --disable-nls
    cd $(DIR_APP) && make $(MAKETUNING)
    cd $(DIR_APP) && install -m 644 .libs/libgmp.so.3.5.2 /usr/lib
diff --git a/lfs/stage2 b/lfs/stage2
index 956f589..a084816 100644
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -53,7 +53,7 @@ $(TARGET) :
    -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
    -install -dv -m 0750 /root
    -install -dv -m 1777 /tmp /var/tmp
-	-mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
+	-mkdir -pv /usr/{,local/}{bin,include,lib{,/sse2},sbin,src}
    -mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
    -mkdir -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
    -mkdir -pv /usr/{,local/}share/man/man{1..8}
diff --git a/tools/make-functions b/tools/make-functions
index ba66547..5a557a6 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -71,7 +71,7 @@ configure_target() {
    	i586)
    		BUILDTARGET="${target_arch}-pc-linux-gnu"
    		CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu"
-			CFLAGS_ARCH="-march=i586 -fomit-frame-pointer"
+			CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
    		;;
armv5tel)
hooks/post-receive
--
IPFire 2.x development tree

    