diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 2c08a1bd2..e2513f036 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.41-ipfire -# Tue May 31 14:26:02 2011 +# Linux kernel version: 2.6.32.45-ipfire +# Thu Dec 29 15:32:08 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -3593,7 +3593,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set # CONFIG_EXOFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -3642,7 +3644,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_ATARI_PARTITION is not set # CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set +CONFIG_BSD_DISKLABEL=y # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 4b23df337..98d222a45 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -3624,7 +3624,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set # CONFIG_EXOFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -3673,7 +3675,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_ATARI_PARTITION is not set # CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set +CONFIG_BSD_DISKLABEL=y # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index 72fd49098..f5c7ba88c 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -3385,7 +3385,9 @@ CONFIG_JFFS2_CMODE_PRIORITY=y # CONFIG_QNX4FS_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG is not set # CONFIG_EXOFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m @@ -3433,7 +3435,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_ATARI_PARTITION is not set # CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set +CONFIG_BSD_DISKLABEL=y # CONFIG_MINIX_SUBPARTITION is not set # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set diff --git a/config/rootfiles/common/coreutils b/config/rootfiles/common/coreutils index 22094c7e2..3901b697e 100644 --- a/config/rootfiles/common/coreutils +++ b/config/rootfiles/common/coreutils @@ -20,8 +20,7 @@ bin/rmdir bin/sleep bin/sync bin/true -#bin/uname -bin/uname.bak +bin/uname etc/dircolors usr/bin/[ usr/bin/basename diff --git a/config/rootfiles/core/54/filelists/GeoIP b/config/rootfiles/core/54/filelists/GeoIP new file mode 100644 index 000000000..0258236c0 --- /dev/null +++ b/config/rootfiles/core/54/filelists/GeoIP @@ -0,0 +1 @@ +usr/local/share/GeoIP/GeoIP.dat diff --git a/config/rootfiles/core/54/filelists/files b/config/rootfiles/core/54/filelists/files index ff13db675..01c4951df 100644 --- a/config/rootfiles/core/54/filelists/files +++ b/config/rootfiles/core/54/filelists/files @@ -12,6 +12,7 @@ etc/rc.d/init.d/snort usr/local/bin/hddshutdown usr/local/bin/makegraphs usr/local/bin/scanhd +srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/hardwaregraphs.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/media.cgi diff --git a/config/rootfiles/core/54/update.sh b/config/rootfiles/core/54/update.sh index 59f97cfc8..61d10113d 100644 --- a/config/rootfiles/core/54/update.sh +++ b/config/rootfiles/core/54/update.sh @@ -43,6 +43,10 @@ done # Flush old usb-modeswitch data rm -rf /usr/share/usb_modeswitch +# +# Flush old snort rules +rm -rf /etc/snort/rules + # #Extract files extract_files diff --git a/config/rootfiles/installer/glibc b/config/rootfiles/installer/glibc index 73e445e7a..4a4672680 120000 --- a/config/rootfiles/installer/glibc +++ b/config/rootfiles/installer/glibc @@ -1 +1 @@ -../common/glibc \ No newline at end of file +../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/installer/util-linux b/config/rootfiles/installer/util-linux index c8ab83eac..f672071b7 120000 --- a/config/rootfiles/installer/util-linux +++ b/config/rootfiles/installer/util-linux @@ -1 +1 @@ -../common/util-linux \ No newline at end of file +../common/i586/util-linux \ No newline at end of file diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index e667c83da..75e59b18d 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2011 IPFire Team # # # # 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 # @@ -65,30 +65,35 @@ print <Development:
-Project Leader - Michael Tremer -(mitch\@ipfire.org)
-Vice Project Leader - Christian Schmidt -(maniacikarus\@ipfire.org)
-Maintainer IPFire 2.x - Arne Fitzenreiter -(arne\@ipfire.org)
-Developer - Stefan Schantl -(stevee\@ipfire.org)
-Developer - Jan Paul Tücking -(earl\@ipfire.org)
-Developer & Webmaster - Heiner Schmeling -(cm\@ipfire.org)
-Developer (Addons) - Peter Pfeiffer -(peterman\@ipfire.org)
-Supporter, Wiki-Admin & Sponsor - Ronald Wiesinger -(rowie\@ipfire.org)
-Supporter & Wiki-Admin - Silvio Rechenbach -(exciter\@ipfire.org)
-Sponsor - Peter Schaelchli -(scp\@ipfire.org)
-Sponsor - Sven Nierlein -(affect\@versatel.de)
-Sponsor - Rene Zingel -(linuxadmin\@ipfire.org)
+Arne Fitzenreiter +(arne.fitzenreiter\@ipfire.org) - Maintainer IPFire 2.x
+Michael Tremer +(michael.tremer\@ipfire.org) - Project Leader
+Christian Schmidt +(christian.schmidt\@ipfire.org) - Vice Project Leader
+Stefan Schantl +(stefan.schantl\@ipfire.org)
+Jan Paul Tücking +(jan.tuecking\@ipfire.org)
+Heiner Schmeling +(heiner.schmeling\@ipfire.org)
+Ronald Wiesinger +(ronald.wiesinger\@ipfire.org)
+Silvio Rechenbach +(silvio.rechenbach\@ipfire.org)
+Dirk Wagner +(dirk.wagner\@ipfire.org)
+Erik Kapfer +(erik.kapfer\@ipfire.org)
+Alfred Haas +(alfred.haas\@ipfire.org)
+ +

Inactive:
+ +Peter Pfeiffer +(peter.pfeifer\@ipfire.org)
+Peter Schälchli +(peter.schaelchli\@ipfire.org)

Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.
There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, Hddtemp and Wake-on-LAN.
diff --git a/lfs/coreutils b/lfs/coreutils index d5c437dd1..7bdc0ecd3 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # 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 # @@ -108,15 +108,9 @@ ifeq "$(ROOT)" "" mv -v /usr/bin/{head,sleep,nice} /bin ln -sf test /bin/[ #ln -sf ../../bin/install /usr/bin - mv -f /bin/uname /bin/uname.bak - cp -vf $(DIR_SRC)/src/scripts/uname /bin/uname - chmod 755 /bin/uname dircolors -p > /etc/dircolors else rm /tools/bin/hostname - mv -f /tools/bin/uname /tools/bin/uname.bak - cp -vf $(DIR_SRC)/src/scripts/uname /tools/bin/uname - chmod 755 /tools/bin/uname endif @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/flash-images b/lfs/flash-images index fb1ca3da9..7888423b6 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # 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 # @@ -90,7 +90,6 @@ endif echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings -touch $(MNThdd)/lib/modules/$(KVER)-ipfire/modules.dep - mv $(MNThdd)/bin/uname.bak $(MNThdd)/bin/uname mkdir $(MNThdd)/proc mount --bind /proc $(MNThdd)/proc mount --bind /dev $(MNThdd)/dev diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe index 34bc5a890..050c9294f 100644 --- a/lfs/nagios_nrpe +++ b/lfs/nagios_nrpe @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nagios_nrpe -PAK_VER = 1 +PAK_VER = 2 DEPS = "nagios" @@ -78,9 +78,16 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --libexecdir=/usr/lib/nagios \ - --with-nrpe-user=nobody --with-nrpe-group=nobody \ - --with-nagios-user=nobody --with-nagios-group=nobody + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/nagios \ + --with-nrpe-user=nobody \ + --with-nrpe-group=nobody \ + --with-nagios-user=nobody \ + --with-nagios-group=nobody \ + --enable-command-args \ + ac_cv_lib_wrap_main=no + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/xen-image b/lfs/xen-image index 4ab32b492..bd46b641a 100644 --- a/lfs/xen-image +++ b/lfs/xen-image @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team # # # # 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 # @@ -115,7 +115,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) echo "HOSTNAME=$(SNAME)" >> $(MNThdd)/var/ipfire/main/settings echo "THEME=ipfire" >> $(MNThdd)/var/ipfire/main/settings touch $(MNThdd)/lib/modules/$(KVER)-ipfire-xen/modules.dep - mv $(MNThdd)/bin/uname.bak $(MNThdd)/bin/uname mkdir $(MNThdd)/proc mount --bind /proc $(MNThdd)/proc mount --bind /dev $(MNThdd)/dev diff --git a/make.sh b/make.sh index 415c19588..ccdb4c639 100755 --- a/make.sh +++ b/make.sh @@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` MACHINE=`uname -m` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=2 +TOOLCHAINVER=3 BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then @@ -240,7 +240,7 @@ buildtoolchain() { ;; # ARM - armv5tel:armv5tel|armv5tel:armv5tejl) + armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l) # These are working. ;; armv5tel:*) @@ -260,12 +260,11 @@ buildtoolchain() { NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}` export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1} ORG_PATH=$PATH - export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH - lfsmake1 fake-environ PASS=1 lfsmake1 ccache PASS=1 lfsmake1 make PASS=1 lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 + export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH if [ "${MACHINE_TYPE}" = "arm" ]; then lfsmake1 linux TOOLS=1 HEADERS=1 else @@ -273,7 +272,7 @@ buildtoolchain() { fi lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 - lfsmake1 fake-environ PASS=2 + lfsmake1 fake-environ lfsmake1 tcl lfsmake1 expect lfsmake1 dejagnu @@ -1003,6 +1002,7 @@ downloadsrc) ERROR=0 for i in *; do if [ -f "$i" -a "$i" != "Config" ]; then + lfsmakecommoncheck ${i} > /dev/null || continue make -s -f $i LFS_BASEDIR=$BASEDIR MACHINE=$MACHINE \ MESSAGE="$i\t " md5 >> $LOGFILE 2>&1 if [ $? -ne 0 ]; then diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 799059a3b..daa1c3f26 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -463,9 +463,6 @@ int main(int argc, char *argv[]) /* Save language und local settings */ write_lang_configs(shortlangname); - /* Rename uname */ - rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname"); - /* mount proc filesystem */ mysystem("mkdir /harddisk/proc"); mysystem("/bin/mount --bind /proc /harddisk/proc"); diff --git a/src/scripts/uname b/src/scripts/uname deleted file mode 100644 index c1996fda1..000000000 --- a/src/scripts/uname +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -uname= -for i in /bin/uname.bak /tools/bin/uname.bak; do - if [ -x "$i" ]; then - uname=${i} - break - fi -done - -if [ -z "${uname}" ]; then - exit 127 -fi - -machine=$(${uname} -m) -kernel=$(${uname} -r) -output=$(${uname} $@) - -# Overwrite kernel version to hack kernel 3.x versions. -output=$(sed -e "s/${kernel}/${KVER}/g" <<<${output}) - -case "${machine}" in - armv*) - echo "${output}" | \ - sed -e "s/armv.*l/${MACHINE}/g" - ;; - - i?86) - echo "${output}" | \ - sed -e "s/i.86/${MACHINE}/g" - ;; -esac