webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-01-05 14:59:25 +01:00
parent 72c10e85d3 d49c2573b1
commit 5db5319e40
17 changed files with 72 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/kernel/kernel.config.i586-ipfire
View File

@@ -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

6
config/kernel/kernel.config.i586-ipfire-pae
View File

@@ -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

6
config/kernel/kernel.config.i586-ipfire-xen
View File

@@ -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

3
config/rootfiles/common/coreutils
View File

@@ -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

1
config/rootfiles/core/54/filelists/GeoIP Normal file
View File

@@ -0,0 +1 @@
usr/local/share/GeoIP/GeoIP.dat

1
config/rootfiles/core/54/filelists/files
View File

@@ -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

4
config/rootfiles/core/54/update.sh
View File

@@ -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

2
config/rootfiles/installer/glibc
View File

@@ -1 +1 @@
../common/glibc
../common/i586/glibc

2
config/rootfiles/installer/util-linux
View File

@@ -1 +1 @@
../common/util-linux
../common/i586/util-linux

55
html/cgi-bin/credits.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# Copyright (C) 2011 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 #
@@ -65,30 +65,35 @@ print <<END
<p><b>Development:</b><br />
Project Leader - Michael Tremer
(<a href='mailto:mitch\@ipfire.org'>mitch\@ipfire.org</a>)<br />
Vice Project Leader - Christian Schmidt
(<a href='mailto:maniacikarus\@ipfire.org'>maniacikarus\@ipfire.org</a>)<br />
Maintainer IPFire 2.x - Arne Fitzenreiter
(<a href='mailto:arne\@ipfire.org'>arne\@ipfire.org</a>)<br />
Developer - Stefan Schantl
(<a href='mailto:Stevee\@ipfire.org'>stevee\@ipfire.org</a>)<br />
Developer - Jan Paul T&uuml;cking
(<a href='mailto:earl\@ipfire.org'>earl\@ipfire.org</a>)<br />
Developer & Webmaster - Heiner Schmeling
(<a href='mailto:cm\@ipfire.org'>cm\@ipfire.org</a>)<br />
Developer (Addons) - Peter Pfeiffer
(<a href='mailto:peterman\@ipfire.org'>peterman\@ipfire.org</a>)<br />
Supporter, Wiki-Admin & Sponsor - Ronald Wiesinger
(<a href='mailto:rowie\@ipfire.org'>rowie\@ipfire.org</a>)<br />
Supporter & Wiki-Admin - Silvio Rechenbach
(<a href='mailto:exciter\@ipfire.org'>exciter\@ipfire.org</a>)<br />
Sponsor - Peter Schaelchli
(<a href='mailto:scp\@ipfire.org'>scp\@ipfire.org</a>)<br />
Sponsor - Sven Nierlein
(<a href='mailto:affect\@ipfire.org'>affect\@versatel.de</a>)<br />
Sponsor - Rene Zingel
(<a href='mailto:linuxadmin\@ipfire.org'>linuxadmin\@ipfire.org</a>)<br />
Arne Fitzenreiter
(<a href='mailto:arne.fitzenreiter\@ipfire.org'>arne.fitzenreiter\@ipfire.org</a>) - Maintainer IPFire 2.x <br />
Michael Tremer
(<a href='mailto:michael.tremer\@ipfire.org'>michael.tremer\@ipfire.org</a>) - Project Leader <br />
Christian Schmidt
(<a href='mailto:christian.schmidt\@ipfire.org'>christian.schmidt\@ipfire.org</a>) - Vice Project Leader <br />
Stefan Schantl
(<a href='mailto:stefan.schantl\@ipfire.org'>stefan.schantl\@ipfire.org</a>)<br />
Jan Paul T&uuml;cking
(<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<br />
Heiner Schmeling
(<a href='mailto:heiner.schmeling\@ipfire.org'>heiner.schmeling\@ipfire.org</a>)<br />
Ronald Wiesinger
(<a href='mailto:ronald.wiesinger\@ipfire.org'>ronald.wiesinger\@ipfire.org</a>)<br />
Silvio Rechenbach
(<a href='mailto:silvio.rechenbach\@ipfire.org'>silvio.rechenbach\@ipfire.org</a>)<br />
Dirk Wagner
(<a href='mailto:dirk.wagner\@ipfire.org'>dirk.wagner\@ipfire.org</a>)<br />
Erik Kapfer
(<a href='mailto:erik.kapfer\@ipfire.org'>erik.kapfer\@ipfire.org</a>)<br />
Alfred Haas
(<a href='mailto:alfred.haas\@ipfire.org'>alfred.haas\@ipfire.org</a>)<br />
<p><b>Inactive:</b><br />
Peter Pfeiffer
(<a href='mailto:peter.pfeifer\@ipfire.org'>peter.pfeifer\@ipfire.org</a>)<br />
Peter Sch&auml;lchli
(<a href='mailto:peter.schaelchli\@ipfire.org'>peter.schaelchli\@ipfire.org</a>)<br />
</p>
<p>Some parts of the distribution are left ajar on third-party software, that is licensed under the GPL, too.<br />
There are: Advanced Proxy with URL-Filter and Update-Accelerator, ZERINA, Connection Scheduler, Hddtemp and Wake-on-LAN.<br />

8
lfs/coreutils
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 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 #
@@ -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)

3
lfs/flash-images
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 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 #
@@ -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

15
lfs/nagios_nrpe
View File

@@ -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)

3
lfs/xen-image
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2011 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 #
@@ -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

10
make.sh
View File

@@ -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

3
src/install+setup/install/main.c
View File

@@ -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");

32
src/scripts/uname
View File

@@ -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