From 45abde762d84f351e801596dbd336461959dd157 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 11 Dec 2011 01:14:23 +0100 Subject: [PATCH 01/12] core54: add GeoIP database to updater. --- config/rootfiles/core/54/filelists/GeoIP | 1 + 1 file changed, 1 insertion(+) create mode 100644 config/rootfiles/core/54/filelists/GeoIP 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 From e23114f49c2cc5d5af3b811fc0e266434606bc9b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 11 Dec 2011 01:15:07 +0100 Subject: [PATCH 02/12] core54: flush snort rules. --- config/rootfiles/core/54/update.sh | 4 ++++ 1 file changed, 4 insertions(+) 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 From 4c8608f0160f9a0e0b3cbf0adece33ac16baeeb5 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 11 Dec 2011 12:17:19 +0100 Subject: [PATCH 03/12] Build preload lib to fake output of uname. --- lfs/fake-environ | 58 +++++++++++++++++++++++++++++++++++++++ make.sh | 4 ++- src/fake-environ/Makefile | 31 +++++++++++++++++++++ src/fake-environ/uname.c | 50 +++++++++++++++++++++++++++++++++ tools/make-functions | 21 ++++++++++++++ 5 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 lfs/fake-environ create mode 100644 src/fake-environ/Makefile create mode 100644 src/fake-environ/uname.c diff --git a/lfs/fake-environ b/lfs/fake-environ new file mode 100644 index 000000000..7a0f1a4d3 --- /dev/null +++ b/lfs/fake-environ @@ -0,0 +1,58 @@ +############################################################################### +# # +# 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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0 + +THISAPP = fake-environ +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)-tools$(PASS) + +############################################################################### +# Top-level Rules +############################################################################### + +install : $(TARGET) + +check : + +download : + +md5 : + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : + @$(PREBUILD) + @rm -rf $(DIR_APP) + cp -rvf $(DIR_SRC)/src/$(THISAPP) $(DIR_APP) + + cd $(DIR_APP) && make install CFLAGS="$(CFLAGS)" \ + TOOLS_DIR="$(TOOLS_DIR)" + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f98d84ad2..8b9f48a2b 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=1 +TOOLCHAINVER=2 BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then @@ -242,6 +242,7 @@ buildtoolchain() { 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 @@ -253,6 +254,7 @@ buildtoolchain() { fi lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 + lfsmake1 fake-environ PASS=2 lfsmake1 tcl lfsmake1 expect lfsmake1 dejagnu diff --git a/src/fake-environ/Makefile b/src/fake-environ/Makefile new file mode 100644 index 000000000..a75bdf27f --- /dev/null +++ b/src/fake-environ/Makefile @@ -0,0 +1,31 @@ + +ifeq "$(CFLAGS)" "" + $(error CLFAGS not defined.) +endif + +ifeq "$(TOOLS_DIR)" "" + $(error TOOLS_DIR not defined.) +endif + +LIB = libpakfire_preload.so + +SOURCES = $(wildcard *.c) +OBJECTS = $(patsubst %.c,%.o,$(SOURCES)) + +.PHONY: all +all: $(LIB) + +%.o: %.c Makefile + $(CC) $(CFLAGS) -o $@ -c $< + +$(LIB): $(OBJECTS) + $(CC) $(CFLAGS) -shared -o $@ $? -ldl + +.PHONY: install +install: all + -mkdir -pv $(TOOLS_DIR)/lib/ + install -p -m 755 $(LIB) $(TOOLS_DIR)/lib + +.PHONY: clean +clean: + $(LIB) diff --git a/src/fake-environ/uname.c b/src/fake-environ/uname.c new file mode 100644 index 000000000..2485a810f --- /dev/null +++ b/src/fake-environ/uname.c @@ -0,0 +1,50 @@ + + +#include +#include +#include +#include /* for EXIT_FAILURE */ +#include /* for _exit() */ +#include +#include +#include +#include +#include + +#ifndef RTLD_NEXT +#define RTLD_NEXT ((void *) -1l) +#endif + +typedef int (*uname_t)(struct utsname * buf); + +static void *get_libc_func(const char *funcname) { + char *error; + + void *func = dlsym(RTLD_NEXT, funcname); + if ((error = dlerror()) != NULL) { + fprintf(stderr, "I can't locate libc function `%s' error: %s", funcname, error); + _exit(EXIT_FAILURE); + } + + return func; +} + +int uname(struct utsname *buf) { + char *env = NULL; + + /* Call real uname to get the information we need. */ + uname_t real_uname = (uname_t)get_libc_func("uname"); + int ret = real_uname((struct utsname *) buf); + + /* Replace release if requested. */ + if ((env = getenv("UTS_RELEASE")) != NULL) { + strncpy(buf->release, env, _UTSNAME_RELEASE_LENGTH); + } + + /* Replace machine type if requested. */ + if ((env = getenv("UTS_MACHINE")) != NULL) { + strncpy(buf->machine, env, _UTSNAME_MACHINE_LENGTH); + } + + return ret; +} diff --git a/tools/make-functions b/tools/make-functions index e693ff94f..144411cd3 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -270,10 +270,26 @@ exiterror() { exit 1 } +fake_environ() { + [ -e "${BASEDIR}/build/tools/lib/libpakfire_preload.so" ] || return + + local env="LD_PRELOAD=/tools/lib/libpakfire_preload.so" + + # Fake kernel version, because some of the packages do not compile + # with kernel 3.0 and later. + env="${env} UTS_RELEASE=${KVER}" + + # Fake machine version. + env="${env} UTS_MACHINE=${MACHINE}" + + echo "${env}" +} + entershell() { if [ ! -e $BASEDIR/build/usr/src/lfs/ ]; then exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/" fi + echo "Entering to a shell inside LFS chroot, go out with exit" $linux32 chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \ PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \ @@ -288,6 +304,7 @@ entershell() { MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ KGCC="ccache /usr/bin/gcc" \ + $(fake_environ) \ /tools/bin/bash if [ $? -ne 0 ]; then beautify message FAIL @@ -371,6 +388,7 @@ lfsmake1() { ROOT=$LFS \ KVER=$KVER \ MAKETUNING=$MAKETUNING \ + $(fake_environ) \ install >> $LOGFILE 2>&1 local COMPILE_SUCCESS=$? local PKG_TIME_END=`date +%s` @@ -401,6 +419,7 @@ lfsmake2() { KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ + $(fake_environ) \ /tools/bin/bash -x -c "cd /usr/src/lfs && \ make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1 local COMPILE_SUCCESS=$? @@ -433,6 +452,7 @@ ipfiremake() { KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ + $(fake_environ) \ /bin/bash -x -c "cd /usr/src/lfs && \ make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1 @@ -464,6 +484,7 @@ ipfiredist() { KVER=$KVER \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ + $(fake_environ) \ /bin/bash -x -c "cd /usr/src/lfs && \ make -f $1 LFS_BASEDIR=/usr/src dist" >>$LOGFILE 2>&1 From b848d53c8471748c751e1f00cd886ddb9ca0cb02 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 11 Dec 2011 12:17:19 +0100 Subject: [PATCH 04/12] Build preload lib to fake output of uname. --- lfs/fake-environ | 58 +++++++++++++++++++++++++++++++++++++++ make.sh | 4 ++- src/fake-environ/Makefile | 31 +++++++++++++++++++++ src/fake-environ/uname.c | 50 +++++++++++++++++++++++++++++++++ tools/make-functions | 21 ++++++++++++++ 5 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 lfs/fake-environ create mode 100644 src/fake-environ/Makefile create mode 100644 src/fake-environ/uname.c diff --git a/lfs/fake-environ b/lfs/fake-environ new file mode 100644 index 000000000..b72491253 --- /dev/null +++ b/lfs/fake-environ @@ -0,0 +1,58 @@ +############################################################################### +# # +# 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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0 + +THISAPP = fake-environ +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)-tools$(PASS) + +############################################################################### +# Top-level Rules +############################################################################### + +install : $(TARGET) + +check : + +download : + +md5 : + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : + @$(PREBUILD) + @rm -rf $(DIR_APP) + cp -rvf $(DIR_SRC)/src/$(THISAPP) $(DIR_APP) + + cd $(DIR_APP) && make install CFLAGS="$(CFLAGS)" \ + TOOLS_DIR="/tools" + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f98d84ad2..8b9f48a2b 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=1 +TOOLCHAINVER=2 BUILDMACHINE=$MACHINE if [ "$MACHINE" = "x86_64" ]; then @@ -242,6 +242,7 @@ buildtoolchain() { 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 @@ -253,6 +254,7 @@ buildtoolchain() { fi lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 + lfsmake1 fake-environ PASS=2 lfsmake1 tcl lfsmake1 expect lfsmake1 dejagnu diff --git a/src/fake-environ/Makefile b/src/fake-environ/Makefile new file mode 100644 index 000000000..a75bdf27f --- /dev/null +++ b/src/fake-environ/Makefile @@ -0,0 +1,31 @@ + +ifeq "$(CFLAGS)" "" + $(error CLFAGS not defined.) +endif + +ifeq "$(TOOLS_DIR)" "" + $(error TOOLS_DIR not defined.) +endif + +LIB = libpakfire_preload.so + +SOURCES = $(wildcard *.c) +OBJECTS = $(patsubst %.c,%.o,$(SOURCES)) + +.PHONY: all +all: $(LIB) + +%.o: %.c Makefile + $(CC) $(CFLAGS) -o $@ -c $< + +$(LIB): $(OBJECTS) + $(CC) $(CFLAGS) -shared -o $@ $? -ldl + +.PHONY: install +install: all + -mkdir -pv $(TOOLS_DIR)/lib/ + install -p -m 755 $(LIB) $(TOOLS_DIR)/lib + +.PHONY: clean +clean: + $(LIB) diff --git a/src/fake-environ/uname.c b/src/fake-environ/uname.c new file mode 100644 index 000000000..2485a810f --- /dev/null +++ b/src/fake-environ/uname.c @@ -0,0 +1,50 @@ + + +#include +#include +#include +#include /* for EXIT_FAILURE */ +#include /* for _exit() */ +#include +#include +#include +#include +#include + +#ifndef RTLD_NEXT +#define RTLD_NEXT ((void *) -1l) +#endif + +typedef int (*uname_t)(struct utsname * buf); + +static void *get_libc_func(const char *funcname) { + char *error; + + void *func = dlsym(RTLD_NEXT, funcname); + if ((error = dlerror()) != NULL) { + fprintf(stderr, "I can't locate libc function `%s' error: %s", funcname, error); + _exit(EXIT_FAILURE); + } + + return func; +} + +int uname(struct utsname *buf) { + char *env = NULL; + + /* Call real uname to get the information we need. */ + uname_t real_uname = (uname_t)get_libc_func("uname"); + int ret = real_uname((struct utsname *) buf); + + /* Replace release if requested. */ + if ((env = getenv("UTS_RELEASE")) != NULL) { + strncpy(buf->release, env, _UTSNAME_RELEASE_LENGTH); + } + + /* Replace machine type if requested. */ + if ((env = getenv("UTS_MACHINE")) != NULL) { + strncpy(buf->machine, env, _UTSNAME_MACHINE_LENGTH); + } + + return ret; +} diff --git a/tools/make-functions b/tools/make-functions index e693ff94f..144411cd3 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -270,10 +270,26 @@ exiterror() { exit 1 } +fake_environ() { + [ -e "${BASEDIR}/build/tools/lib/libpakfire_preload.so" ] || return + + local env="LD_PRELOAD=/tools/lib/libpakfire_preload.so" + + # Fake kernel version, because some of the packages do not compile + # with kernel 3.0 and later. + env="${env} UTS_RELEASE=${KVER}" + + # Fake machine version. + env="${env} UTS_MACHINE=${MACHINE}" + + echo "${env}" +} + entershell() { if [ ! -e $BASEDIR/build/usr/src/lfs/ ]; then exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/" fi + echo "Entering to a shell inside LFS chroot, go out with exit" $linux32 chroot $LFS /tools/bin/env -i HOME=/root TERM=$TERM PS1='\u:\w\$ ' \ PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \ @@ -288,6 +304,7 @@ entershell() { MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ KGCC="ccache /usr/bin/gcc" \ + $(fake_environ) \ /tools/bin/bash if [ $? -ne 0 ]; then beautify message FAIL @@ -371,6 +388,7 @@ lfsmake1() { ROOT=$LFS \ KVER=$KVER \ MAKETUNING=$MAKETUNING \ + $(fake_environ) \ install >> $LOGFILE 2>&1 local COMPILE_SUCCESS=$? local PKG_TIME_END=`date +%s` @@ -401,6 +419,7 @@ lfsmake2() { KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ + $(fake_environ) \ /tools/bin/bash -x -c "cd /usr/src/lfs && \ make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1 local COMPILE_SUCCESS=$? @@ -433,6 +452,7 @@ ipfiremake() { KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ + $(fake_environ) \ /bin/bash -x -c "cd /usr/src/lfs && \ make -f $* LFS_BASEDIR=/usr/src install" >>$LOGFILE 2>&1 @@ -464,6 +484,7 @@ ipfiredist() { KVER=$KVER \ BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \ MACHINE_TYPE="$MACHINE_TYPE" \ + $(fake_environ) \ /bin/bash -x -c "cd /usr/src/lfs && \ make -f $1 LFS_BASEDIR=/usr/src dist" >>$LOGFILE 2>&1 From 5e3aa60749506205f13c6db588930de61e84f46f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 11 Dec 2011 12:29:54 +0100 Subject: [PATCH 05/12] Enable build for armv5tel on armv7l. --- tools/make-functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/make-functions b/tools/make-functions index 144411cd3..a55f29cf7 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -225,7 +225,7 @@ if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE ]; then CXXFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer" C2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer" CXX2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer" -elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE ]; then +elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE -o 'armv7l' = $MACHINE ]; then echo "`date -u '+%b %e %T'`: Machine is ARM (or equivalent)" >> $LOGFILE MACHINE=armv5tel MACHINE_TYPE=arm @@ -235,7 +235,7 @@ elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE ]; then C2FLAGS="$CFLAGS" CXX2FLAGS="$CXXFLAGS" else - echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE" >> $LOGFILE + echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE" exit 1 fi From 8bd492fd495cdf954d65052bc1470a08cd13fbd8 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 11 Dec 2011 13:15:27 +0100 Subject: [PATCH 06/12] CFLAGS: Explicitely enforce softfp. --- tools/make-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make-functions b/tools/make-functions index a55f29cf7..783b46e14 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -230,7 +230,7 @@ elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE -o 'armv7l' = $MACHINE ]; MACHINE=armv5tel MACHINE_TYPE=arm BUILDTARGET=${MACHINE}-unknown-linux-gnueabi - CFLAGS="-O2 -march=armv5te -fomit-frame-pointer -pipe" + CFLAGS="-O2 -march=armv5te -mfloat-abi=soft -fomit-frame-pointer -pipe" CXXFLAGS="$CFLAGS" C2FLAGS="$CFLAGS" CXX2FLAGS="$CXXFLAGS" From f13d4e0b09e9aa8f8a47b402438848deaf5a26d1 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 11 Dec 2011 13:22:24 +0100 Subject: [PATCH 07/12] Fix detection weather a toolchain can be built on host. --- make.sh | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/make.sh b/make.sh index 8b9f48a2b..415c19588 100755 --- a/make.sh +++ b/make.sh @@ -229,9 +229,28 @@ prepareenv() { } buildtoolchain() { - if [ "$(uname -m)" = "x86_64" ]; then - exiterror "Cannot build toolchain on x86_64. Please use the download." - fi + local error=false + case "${MACHINE}:$(uname -m)" in + # x86 + i586:i586|i586:i686) + # These are working. + ;; + i586:*) + error=true + ;; + + # ARM + armv5tel:armv5tel|armv5tel:armv5tejl) + # These are working. + ;; + armv5tel:*) + error=true + ;; + esac + + ${error} && \ + exiterror "Cannot build ${MACHINE} toolchain on $(uname -m). Please use the download if any." + if [ "$(uname -r | grep ipfire)" ]; then exiterror "Cannot build toolchain on ipfire. Please use the download." fi From 71d3bfd4553ca94c6a3e8a25554f66eb899cf4a7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 18 Dec 2011 12:20:29 +0100 Subject: [PATCH 08/12] core54: fix build on arm. --- .../rootfiles/core/54/filelists/armv5tel/intelnet-modules | 6 ++++++ .../rootfiles/core/54/filelists/{ => i586}/intelnet-modules | 0 2 files changed, 6 insertions(+) create mode 100644 config/rootfiles/core/54/filelists/armv5tel/intelnet-modules rename config/rootfiles/core/54/filelists/{ => i586}/intelnet-modules (100%) diff --git a/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules b/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules new file mode 100644 index 000000000..83d1e8b2a --- /dev/null +++ b/config/rootfiles/core/54/filelists/armv5tel/intelnet-modules @@ -0,0 +1,6 @@ +lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-kirkwood/kernel/drivers/net/igb/igb.ko +lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000/e1000.ko +lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/e1000e/e1000e.ko +lib/modules/2.6.32.45-ipfire-versatile/kernel/drivers/net/igb/igb.ko diff --git a/config/rootfiles/core/54/filelists/intelnet-modules b/config/rootfiles/core/54/filelists/i586/intelnet-modules similarity index 100% rename from config/rootfiles/core/54/filelists/intelnet-modules rename to config/rootfiles/core/54/filelists/i586/intelnet-modules From ad768ac98b8b7445460f9402cc217e4fc7d79fbc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 18 Dec 2011 13:30:26 +0100 Subject: [PATCH 09/12] squid: update to 3.1.18. enabled polish and russian error messages. --- config/rootfiles/common/squid | 150 +++++++++++++++++----------------- lfs/squid | 4 +- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index 461a2a2bd..2c37c171c 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -390,7 +390,7 @@ usr/lib/squid/errors/de/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/el/ERR_URN_RESOLVE #usr/lib/squid/errors/el/ERR_WRITE_ERROR #usr/lib/squid/errors/el/ERR_ZERO_SIZE_OBJECT -usr/lib/squid/errors/en +#usr/lib/squid/errors/en #usr/lib/squid/errors/en-au #usr/lib/squid/errors/en-bz #usr/lib/squid/errors/en-ca @@ -1134,43 +1134,43 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/oc/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pl #usr/lib/squid/errors/pl-pl -#usr/lib/squid/errors/pl/ERR_ACCESS_DENIED -#usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED -#usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED -#usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD -#usr/lib/squid/errors/pl/ERR_CONNECT_FAIL -#usr/lib/squid/errors/pl/ERR_DIR_LISTING -#usr/lib/squid/errors/pl/ERR_DNS_FAIL -#usr/lib/squid/errors/pl/ERR_ESI -#usr/lib/squid/errors/pl/ERR_FORWARDING_DENIED -#usr/lib/squid/errors/pl/ERR_FTP_DISABLED -#usr/lib/squid/errors/pl/ERR_FTP_FAILURE -#usr/lib/squid/errors/pl/ERR_FTP_FORBIDDEN -#usr/lib/squid/errors/pl/ERR_FTP_NOT_FOUND -#usr/lib/squid/errors/pl/ERR_FTP_PUT_CREATED -#usr/lib/squid/errors/pl/ERR_FTP_PUT_ERROR -#usr/lib/squid/errors/pl/ERR_FTP_PUT_MODIFIED -#usr/lib/squid/errors/pl/ERR_FTP_UNAVAILABLE -#usr/lib/squid/errors/pl/ERR_GATEWAY_FAILURE -#usr/lib/squid/errors/pl/ERR_ICAP_FAILURE -#usr/lib/squid/errors/pl/ERR_INVALID_REQ -#usr/lib/squid/errors/pl/ERR_INVALID_RESP -#usr/lib/squid/errors/pl/ERR_INVALID_URL -#usr/lib/squid/errors/pl/ERR_LIFETIME_EXP -#usr/lib/squid/errors/pl/ERR_NO_RELAY -#usr/lib/squid/errors/pl/ERR_ONLY_IF_CACHED_MISS -#usr/lib/squid/errors/pl/ERR_PRECONDITION_FAILED -#usr/lib/squid/errors/pl/ERR_READ_ERROR -#usr/lib/squid/errors/pl/ERR_READ_TIMEOUT -#usr/lib/squid/errors/pl/ERR_SECURE_CONNECT_FAIL -#usr/lib/squid/errors/pl/ERR_SHUTTING_DOWN -#usr/lib/squid/errors/pl/ERR_SOCKET_FAILURE -#usr/lib/squid/errors/pl/ERR_TOO_BIG -#usr/lib/squid/errors/pl/ERR_UNSUP_HTTPVERSION -#usr/lib/squid/errors/pl/ERR_UNSUP_REQ -#usr/lib/squid/errors/pl/ERR_URN_RESOLVE -#usr/lib/squid/errors/pl/ERR_WRITE_ERROR -#usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors/pl/ERR_ACCESS_DENIED +usr/lib/squid/errors/pl/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors/pl/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors/pl/ERR_CANNOT_FORWARD +usr/lib/squid/errors/pl/ERR_CONNECT_FAIL +usr/lib/squid/errors/pl/ERR_DIR_LISTING +usr/lib/squid/errors/pl/ERR_DNS_FAIL +usr/lib/squid/errors/pl/ERR_ESI +usr/lib/squid/errors/pl/ERR_FORWARDING_DENIED +usr/lib/squid/errors/pl/ERR_FTP_DISABLED +usr/lib/squid/errors/pl/ERR_FTP_FAILURE +usr/lib/squid/errors/pl/ERR_FTP_FORBIDDEN +usr/lib/squid/errors/pl/ERR_FTP_NOT_FOUND +usr/lib/squid/errors/pl/ERR_FTP_PUT_CREATED +usr/lib/squid/errors/pl/ERR_FTP_PUT_ERROR +usr/lib/squid/errors/pl/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors/pl/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/pl/ERR_GATEWAY_FAILURE +usr/lib/squid/errors/pl/ERR_ICAP_FAILURE +usr/lib/squid/errors/pl/ERR_INVALID_REQ +usr/lib/squid/errors/pl/ERR_INVALID_RESP +usr/lib/squid/errors/pl/ERR_INVALID_URL +usr/lib/squid/errors/pl/ERR_LIFETIME_EXP +usr/lib/squid/errors/pl/ERR_NO_RELAY +usr/lib/squid/errors/pl/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors/pl/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/pl/ERR_READ_ERROR +usr/lib/squid/errors/pl/ERR_READ_TIMEOUT +usr/lib/squid/errors/pl/ERR_SECURE_CONNECT_FAIL +usr/lib/squid/errors/pl/ERR_SHUTTING_DOWN +usr/lib/squid/errors/pl/ERR_SOCKET_FAILURE +usr/lib/squid/errors/pl/ERR_TOO_BIG +usr/lib/squid/errors/pl/ERR_UNSUP_HTTPVERSION +usr/lib/squid/errors/pl/ERR_UNSUP_REQ +usr/lib/squid/errors/pl/ERR_URN_RESOLVE +usr/lib/squid/errors/pl/ERR_WRITE_ERROR +usr/lib/squid/errors/pl/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/pt #usr/lib/squid/errors/pt-br #usr/lib/squid/errors/pt-br/ERR_ACCESS_DENIED @@ -1290,43 +1290,43 @@ usr/lib/squid/errors/fr/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ro/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/ru #usr/lib/squid/errors/ru-ru -#usr/lib/squid/errors/ru/ERR_ACCESS_DENIED -#usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED -#usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED -#usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD -#usr/lib/squid/errors/ru/ERR_CONNECT_FAIL -#usr/lib/squid/errors/ru/ERR_DIR_LISTING -#usr/lib/squid/errors/ru/ERR_DNS_FAIL -#usr/lib/squid/errors/ru/ERR_ESI -#usr/lib/squid/errors/ru/ERR_FORWARDING_DENIED -#usr/lib/squid/errors/ru/ERR_FTP_DISABLED -#usr/lib/squid/errors/ru/ERR_FTP_FAILURE -#usr/lib/squid/errors/ru/ERR_FTP_FORBIDDEN -#usr/lib/squid/errors/ru/ERR_FTP_NOT_FOUND -#usr/lib/squid/errors/ru/ERR_FTP_PUT_CREATED -#usr/lib/squid/errors/ru/ERR_FTP_PUT_ERROR -#usr/lib/squid/errors/ru/ERR_FTP_PUT_MODIFIED -#usr/lib/squid/errors/ru/ERR_FTP_UNAVAILABLE -#usr/lib/squid/errors/ru/ERR_GATEWAY_FAILURE -#usr/lib/squid/errors/ru/ERR_ICAP_FAILURE -#usr/lib/squid/errors/ru/ERR_INVALID_REQ -#usr/lib/squid/errors/ru/ERR_INVALID_RESP -#usr/lib/squid/errors/ru/ERR_INVALID_URL -#usr/lib/squid/errors/ru/ERR_LIFETIME_EXP -#usr/lib/squid/errors/ru/ERR_NO_RELAY -#usr/lib/squid/errors/ru/ERR_ONLY_IF_CACHED_MISS -#usr/lib/squid/errors/ru/ERR_PRECONDITION_FAILED -#usr/lib/squid/errors/ru/ERR_READ_ERROR -#usr/lib/squid/errors/ru/ERR_READ_TIMEOUT -#usr/lib/squid/errors/ru/ERR_SECURE_CONNECT_FAIL -#usr/lib/squid/errors/ru/ERR_SHUTTING_DOWN -#usr/lib/squid/errors/ru/ERR_SOCKET_FAILURE -#usr/lib/squid/errors/ru/ERR_TOO_BIG -#usr/lib/squid/errors/ru/ERR_UNSUP_HTTPVERSION -#usr/lib/squid/errors/ru/ERR_UNSUP_REQ -#usr/lib/squid/errors/ru/ERR_URN_RESOLVE -#usr/lib/squid/errors/ru/ERR_WRITE_ERROR -#usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors/ru/ERR_ACCESS_DENIED +usr/lib/squid/errors/ru/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors/ru/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors/ru/ERR_CANNOT_FORWARD +usr/lib/squid/errors/ru/ERR_CONNECT_FAIL +usr/lib/squid/errors/ru/ERR_DIR_LISTING +usr/lib/squid/errors/ru/ERR_DNS_FAIL +usr/lib/squid/errors/ru/ERR_ESI +usr/lib/squid/errors/ru/ERR_FORWARDING_DENIED +usr/lib/squid/errors/ru/ERR_FTP_DISABLED +usr/lib/squid/errors/ru/ERR_FTP_FAILURE +usr/lib/squid/errors/ru/ERR_FTP_FORBIDDEN +usr/lib/squid/errors/ru/ERR_FTP_NOT_FOUND +usr/lib/squid/errors/ru/ERR_FTP_PUT_CREATED +usr/lib/squid/errors/ru/ERR_FTP_PUT_ERROR +usr/lib/squid/errors/ru/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors/ru/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors/ru/ERR_GATEWAY_FAILURE +usr/lib/squid/errors/ru/ERR_ICAP_FAILURE +usr/lib/squid/errors/ru/ERR_INVALID_REQ +usr/lib/squid/errors/ru/ERR_INVALID_RESP +usr/lib/squid/errors/ru/ERR_INVALID_URL +usr/lib/squid/errors/ru/ERR_LIFETIME_EXP +usr/lib/squid/errors/ru/ERR_NO_RELAY +usr/lib/squid/errors/ru/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors/ru/ERR_PRECONDITION_FAILED +usr/lib/squid/errors/ru/ERR_READ_ERROR +usr/lib/squid/errors/ru/ERR_READ_TIMEOUT +usr/lib/squid/errors/ru/ERR_SECURE_CONNECT_FAIL +usr/lib/squid/errors/ru/ERR_SHUTTING_DOWN +usr/lib/squid/errors/ru/ERR_SOCKET_FAILURE +usr/lib/squid/errors/ru/ERR_TOO_BIG +usr/lib/squid/errors/ru/ERR_UNSUP_HTTPVERSION +usr/lib/squid/errors/ru/ERR_UNSUP_REQ +usr/lib/squid/errors/ru/ERR_URN_RESOLVE +usr/lib/squid/errors/ru/ERR_WRITE_ERROR +usr/lib/squid/errors/ru/ERR_ZERO_SIZE_OBJECT #usr/lib/squid/errors/sk #usr/lib/squid/errors/sk-sk #usr/lib/squid/errors/sk/ERR_ACCESS_DENIED diff --git a/lfs/squid b/lfs/squid index 6b71f0dae..610154b3b 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.1.16 +VER = 3.1.18 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 675aef4411d41f5b55b15a29ad6e5261 +$(DL_FILE)_MD5 = b53f8fb6e22551c2a7376292df5b6ec7 install : $(TARGET) From cac9daa61b7d8522c55dff5faefd54aeb1c47c32 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 27 Dec 2011 11:05:02 +0100 Subject: [PATCH 10/12] initrd: fix build on i586. --- config/rootfiles/installer/glibc | 2 +- config/rootfiles/installer/util-linux | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 332cc5e86466c0ac5248ee20ba721c3b4f4267c1 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Thu, 22 Dec 2011 23:07:42 +0100 Subject: [PATCH 11/12] credits.cgi: Update credits. * Splitt development team into active and inactive members. * Remove useless tasks from members. * Update mail adresses. --- html/cgi-bin/credits.cgi | 55 ++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 25 deletions(-) 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.
From ef9d89aa4e15ba8df328dd01039509cc81aa3410 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 27 Dec 2011 11:09:04 +0100 Subject: [PATCH 12/12] core54: add credits.cgi. --- config/rootfiles/core/54/filelists/files | 1 + 1 file changed, 1 insertion(+) 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