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, fifteen has been updated via d02853e73cd65332ebeda9490e3306931ebd7406 (commit) via 065c9931acf1296f287e9f783ec0a4668289c886 (commit) via e2eb09157ee4e40b383319cfcf16ad69fc5d73d5 (commit) via 0d655f6cd52ceada1e5bb6e157b22eb0280e71ee (commit) via 6adacba0552880f002b892796ce44467dd413c21 (commit) from 83dfa1d7b2e5946a9405a27dba9b3a81d958baee (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 d02853e73cd65332ebeda9490e3306931ebd7406 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Sep 30 21:16:03 2013 +0200
Create /etc/system-release in stage2.
commit 065c9931acf1296f287e9f783ec0a4668289c886 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Sep 30 21:08:44 2013 +0200
Write /opt/pakfire/db/core/mine in stage2.
commit e2eb09157ee4e40b383319cfcf16ad69fc5d73d5 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Sep 30 21:00:15 2013 +0200
Remove /var/ipfire/firebuild.
This file provides lots of bogous information and information about the build system that is not of much interest.
commit 0d655f6cd52ceada1e5bb6e157b22eb0280e71ee Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Sep 30 20:52:23 2013 +0200
as86: Remove unused package.
Was needed to build mbr.
commit 6adacba0552880f002b892796ce44467dd413c21 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Sep 30 12:14:09 2013 +0200
tor: Increase number of max. open file descriptors.
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/header.pl | 9 ---- config/rootfiles/common/armv5tel/installer | 3 -- config/rootfiles/common/as86 | 5 -- config/rootfiles/common/configroot | 2 - config/rootfiles/common/pakfire | 3 -- config/rootfiles/common/stage2 | 4 ++ lfs/as86 | 77 ------------------------------ lfs/stage2 | 7 +++ make.sh | 39 +++++++-------- src/initscripts/init.d/tor | 7 +++ tools/make-functions | 3 +- 11 files changed, 36 insertions(+), 123 deletions(-) delete mode 100644 config/rootfiles/common/armv5tel/installer delete mode 100644 config/rootfiles/common/as86 delete mode 100644 lfs/as86
Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index fb57482..299d766 100644 --- 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 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 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 0e2cbb6..7796d86 100644 --- 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 f46a7b0..ab439c5 100644 --- 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 1e91b37..da95512 100644 --- 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 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/stage2 b/lfs/stage2 index beb0abb..5c15f41 100644 --- 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 fe3634f..9bae8a6 100755 --- 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 d631e86..878080e 100644 --- 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 6d77db4..3a16c02 100644 --- 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" \
hooks/post-receive -- IPFire 2.x development tree