Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index fb574822228e18e9ed466aaebf0876c3aa878f5f..299d7664599290d5a7a4c828746d58c820d0d633 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -88,15 +88,6 @@ if ( -d "/var/ipfire/langs/${language}/" ) {
     };
 };
 
-### Read IPFire Buildversion
-$FIREBUILD = "File not found: firebuild\n";
-if (open(MYFile, "<${swroot}/firebuild")) {
-    $FIREBUILD = <MYFile>;
-    chomp($FIREBUILD);
-    $FIREBUILD = "(Build: $FIREBUILD)";
-    close(MYFile);
-};
-
 require "${swroot}/langs/en.pl";
 require "${swroot}/langs/${language}.pl";
 eval `/bin/cat /srv/web/ipfire/html/themes/$settings{'THEME'}/include/functions.pl`;

diff --git a/config/rootfiles/common/armv5tel/installer b/config/rootfiles/common/armv5tel/installer
deleted file mode 100644 (file)
index ef5e901..0000000
--- a/config/rootfiles/common/armv5tel/installer
+++ /dev/null
@@ -1,3 +0,0 @@
-#etc/system-release
-#opt/pakfire/db/core/mine
-#var/ipfire/firebuild

diff --git a/config/rootfiles/common/as86 b/config/rootfiles/common/as86
deleted file mode 100644 (file)
index 96a23e3..0000000
--- a/config/rootfiles/common/as86
+++ /dev/null
@@ -1,5 +0,0 @@
-#usr/bin/as86
-#usr/bin/as86_encap
-#var/ipfire/firebuild
-#etc/system-release
-#opt/pakfire/db/core/mine

diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 0e2cbb67b04ac3eec6686940117c4e5251ea197b..7796d86658078791654fae1fe1d1eddf67b3ea2d 100644 (file)
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -199,5 +199,3 @@ var/ipfire/wakeonlan
 var/ipfire/wireless
 #var/ipfire/wireless/config
 #var/ipfire/wireless/settings
-var/ipfire/firebuild
-etc/system-release

diff --git a/config/rootfiles/common/pakfire b/config/rootfiles/common/pakfire
index f46a7b0df15e0e411ca1b775a9273c4386eae0d2..ab439c5bd43b4e5b09f4f961cd59409e3dd8dc25 100644 (file)
--- a/config/rootfiles/common/pakfire
+++ b/config/rootfiles/common/pakfire
@@ -1,7 +1,4 @@
-#opt/pakfire
 opt/pakfire/cache
-#opt/pakfire/db
-opt/pakfire/db/core
 opt/pakfire/db/installed
 opt/pakfire/db/lists
 opt/pakfire/db/meta

diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 1e91b37438ca79f0a708841013680160ae77957f..da95512b58f5f2d40dbfee52b2b63470dfadb119 100644 (file)
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -50,6 +50,10 @@ media/floppy
 media/usbkey
 mnt
 #opt
+#opt/pakfire
+#opt/pakfire/db
+#opt/pakfire/db/core
+opt/pakfire/db/core/mine
 #root
 root/.bash_logout
 root/.bash_profile

diff --git a/lfs/as86 b/lfs/as86
deleted file mode 100644 (file)
index 0acc340..0000000
--- a/lfs/as86
+++ /dev/null
@@ -1,77 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# 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        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 0.16.17
-
-THISAPP    = as86-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 69bca69aec7a272362bc9e050d289d12
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)

diff --git a/lfs/cdrom b/lfs/cdrom
index f19031d1819db7f14b9437cb62b8bd19ff1b1c51..5a85002bae545d35d6b3bb75e086505bcaaaf796 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -52,6 +52,10 @@ md5 :
 ###############################################################################
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       # Update /etc/system-release, because the string might have changed
+       # since stage2 has been executed..
+       echo "$(SYSTEM_RELEASE)" > /etc/system-release
+
        rm -rf /install/cdrom /tmp/*
        mkdir -p /install/cdrom/doc
 

diff --git a/lfs/stage2 b/lfs/stage2
index beb0abbcb2d4fb0a884080c1856c8c7f3b826092..5c15f4183778d83ede77ab86fa36f48cda25d0ed 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -121,4 +121,11 @@ $(TARGET) :
        -mkdir -pv /usr/share/doc/licenses/
        cp -vf $(DIR_SRC)/doc/COPYING /usr/share/doc/licenses/GPLv3
 
+       # System release
+       echo "$(SYSTEM_RELEASE)" > /etc/system-release
+
+       # Pakfire
+       -mkdir -pv /opt/pakfire/db/core
+       echo "$(PAKFIRE_CORE)" > /opt/pakfire/db/core/mine
+
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index fe3634f0bb19c0d795f863652e77d22a069f6c2b..9bae8a679f0f0c661a11029e3654f4d9ca3a51b3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -83,6 +83,22 @@ if [ -z $EDITOR ]; then
        [ -z $EDITOR ] && exiterror "You should have installed an editor."
 fi
 
+# Prepare string for /etc/system-release.
+SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})"
+if [ "$(git status -s | wc -l)" == "0" ]; then
+       GIT_STATUS=""
+else
+       GIT_STATUS="-dirty"
+fi
+case "$GIT_BRANCH" in
+       core*|beta?|rc?)
+               SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS"
+               ;;
+       *)
+               SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
+               ;;
+esac
+
 prepareenv() {
     ############################################################################
     #                                                                          #
@@ -773,35 +789,12 @@ buildipfire() {
   ipfiremake wavemon
   ipfiremake iptraf-ng
   ipfiremake iotop
-  echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
-  cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
-  echo >> $BASEDIR/build/var/ipfire/firebuild
-  git log -1 >> $BASEDIR/build/var/ipfire/firebuild
-  echo >> $BASEDIR/build/var/ipfire/firebuild
-  git status >> $BASEDIR/build/var/ipfire/firebuild
-  echo >> $BASEDIR/build/var/ipfire/firebuild
-  cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
-  echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
-  if [ "$(git status -s | wc -l)" == "0" ]; then
-       GIT_STATUS=""
-  else
-       GIT_STATUS="-dirty"
-  fi
-  case "$GIT_BRANCH" in
-       core*|beta?|rc?)
-           echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH$GIT_STATUS" > $BASEDIR/build/etc/system-release
-           ;;
-       *)
-           echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" > $BASEDIR/build/etc/system-release
-           ;;
-  esac
 }
 
 buildinstaller() {
   # Run installer scripts one by one
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
-  ipfiremake as86
   ipfiremake memtest
   ipfiremake installer
   installmake strip

diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor
index d631e867f915e123e918383b3c9caa86af1e5a71..878080eff3bbe4c220cbfa2fba85f16494a0f2a9 100644 (file)
--- a/src/initscripts/init.d/tor
+++ b/src/initscripts/init.d/tor
@@ -9,6 +9,8 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
+FILEDESCRIPTORS="65535"
+
 eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
 
 function tor_is_enabled() {
@@ -36,6 +38,11 @@ case "${1}" in
                # Setup firewall.
                setup_firewall
 
+               # Increasing open file descriptors.
+               if [ -n "${FILEDESCRIPTORS}" ]; then
+                       ulimit -n "${FILEDESCRIPTORS}"
+               fi
+
                boot_mesg "Starting tor..."
                loadproc /usr/bin/tor \
                        --runasdaemon 1 \

diff --git a/tools/make-functions b/tools/make-functions
index 6d77db442cae7c6d2c05493a3893081a0b4656b4..3ff647c5166decc3c1ab4638f6498ded99ea78eb 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -414,7 +414,8 @@ lfsmake2() {
        chroot $LFS /tools/bin/env -i   HOME=/root \
                                                TERM=$TERM PS1='\u:\w\$ ' \
                                                PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
-                                               VERSION=$VERSION \
+                                               VERSION=$VERSION PAKFIRE_CORE="${PAKFIRE_CORE}" \
+                                               SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
                                                CONFIG_ROOT=$CONFIG_ROOT \
                                                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                                CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
@@ -521,6 +522,7 @@ installmake() {
                                                TERM=$TERM PS1='\u:\w\$ ' \
                                                PATH=/tools/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin \
                                                VERSION=$VERSION \
+                                               SYSTEM_RELEASE="${SYSTEM_RELEASE}" \
                                                CONFIG_ROOT=$CONFIG_ROOT \
                                                NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
                                                CFLAGS="-Os" CXXFLAGS="-Os" \