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

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

Browse Source
This commit is contained in:
Michael Tremer
2008-09-22 22:16:31 +00:00
parent e561bef700 a23731d1a8
commit bc2ab12381
11 changed files with 499 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

784
config/kernel/kernel.config.i586
View File

File diff suppressed because it is too large Load Diff

2
config/rootfiles/updater/update.sh
View File

@@ -26,7 +26,7 @@
#
OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
NEWVERSION="2.3"
KVER="2.6.25.17"
KVER="2.6.23.17"
ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
# Nur den letzten Parameter verwenden

10
doc/packages-list.txt
View File

@@ -172,8 +172,9 @@
* libwww-perl-5.803
* libxml2-2.6.26
* libxslt-1.1.17
* linux-2.6.25.17
* linux-2.6.23.17
* linux-atm-2.4.1
* linux-fusion-7.0.1
* linux-libc-headers-2.6.12.0
* linuxigd-0.95
* lm_sensors-3.0.2
@@ -222,8 +223,9 @@
* openmailadmin-1.0.0
* openssh-4.7p1
* openssl-0.9.8g
* openswan-2.4.12
* openswan-2.4.12-kmod
* openswan-2.6.16
* openswan-2.6.16-kmod
* openvpn-2.0.9
* pam_mysql-0.7RC1
* patch-2.5.4
@@ -241,6 +243,8 @@
* procps-3.2.6
* psmisc-22.2
* qemu-0.9.1
* r8168-8.005.00
* r8169-6.005.00
* readline-5.1
* reiser4progs-1.0.5
* reiserfsprogs-3.6.19
@@ -263,7 +267,7 @@
* snort-2.6.1.4
* sox-12.18.1
* spandsp-0.0.4pre15
* squashfs3.2-r2
* squashfs3.4
* squid-2.7.STABLE4
* squidGuard-1.3
* squidclamav-3.5

25
lfs/linux
View File

@@ -25,7 +25,7 @@
include Config
PATCHLEVEL = .17
VER = 2.6.25.17
VER = 2.6.23.17
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -50,22 +50,19 @@ objects =$(DL_FILE) \
mISDN-1_1_8.tar.gz \
squashfs3.4.tar.gz \
netfilter-layer7-v2.20.tar.gz \
patch-2.6.16-nath323-1.3.bz2 \
reiser4-for-2.6.25.patch.bz2
patch-2.6.16-nath323-1.3.bz2
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
netfilter-layer7-v2.20.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.20.tar.gz
patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz
mISDN-1_1_8.tar.gz = $(URL_IPFIRE)/mISDN-1_1_8.tar.gz
reiser4-for-2.6.25.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.25.patch.bz2
$(DL_FILE)_MD5 = 30618bff93fd4fd048e20a9a6aab8e5d
$(DL_FILE)_MD5 = a0300a393ac91ce9c64bf31522b45e2e
netfilter-layer7-v2.20.tar.gz_MD5 = 525a821c973b730c8feaf9eedb57d1e4
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
mISDN-1_1_8.tar.gz_MD5 = 29c55ffe0b35668a41eaed3b1c3ddfe2
reiser4-for-2.6.25.patch.bz2_MD5 = 4294bbcb39e5ee859b94b09ff4fb1e0c
install : $(TARGET)
@@ -97,6 +94,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ln -s linux-$(VER) /usr/src/linux
# Security fix for CIFS & Netfilter SNMP
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.20.21-additional_check_on_BER_decoding.patch
# Add devolo MicroLink ADSL Fun USB ID's to ueagle-atm
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.23-ueagle-atm-devolo_usb_id.patch
# Fix crash on Twinhead H12Y notebooks
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-h12y-mmio-quirks.patch
@@ -104,12 +107,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch
# Reiser4
cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.25.patch.bz2 | patch -Np1
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.23.patch
# SquashFS
cd $(DIR_SRC) && rm -rf squashfs*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.4.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.4/kernel-patches/linux-2.6.26/squashfs3.4-patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.4/kernel-patches/linux-2.6.23/squashfs3.4-patch
# ip_conntrack permissions from 440 to 444
# cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch
@@ -117,11 +120,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Layer7-patch
cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.20
cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.20.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.20/kernel-2.6.25-layer7-2.20.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.20/for_older_kernels/kernel-2.6.22-2.6.24-layer7-2.18.patch
# Linux Intermediate Queueing Device
ifeq "$(XEN)" ""
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25-imq5.diff
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.23-imq.diff
endif
# mISDN

2
lfs/mkinitcpio
View File

@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio
sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata filesystems"|g' /etc/mkinitcpio.conf
sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3"|g' /etc/mkinitcpio.conf
sed -i 's|ide-cd|ide-cd_mod|g' /lib/initcpio/install/ide
# sed -i 's|ide-cd|ide-cd_mod|g' /lib/initcpio/install/ide
@rm -rf $(DIR_APP)
@$(POSTBUILD)

20
lfs/openswan
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.6.16
VER = 2.4.12
THISAPP = openswan-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = ef0ea8f9082df70c993a035904d538c7
$(DL_FILE)_MD5 = 0bca0cc205d2d83eff64a7cea825ce7a
install : $(TARGET)
@@ -87,10 +87,10 @@ else
-e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
-e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
cd $(DIR_APP) && sed -i 's/-Werror//' lib/libdns/Makefile
cd $(DIR_APP) && sed -i 's/-Werror//' lib/libisc/Makefile
cd $(DIR_APP) && sed -i 's/-Werror//' lib/liblwres/Makefile
cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program
# cd $(DIR_APP) && sed -i 's/-Werror//' lib/libdns/Makefile
# cd $(DIR_APP) && sed -i 's/-Werror//' lib/libisc/Makefile
# cd $(DIR_APP) && sed -i 's/-Werror//' lib/liblwres/Makefile
# cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program
cd $(DIR_APP) && make programs
cd $(DIR_APP) && make install
@@ -109,10 +109,10 @@ else
ln -sf $(CONFIG_ROOT)/certs /etc/ipsec.d/certs
ln -sf $(CONFIG_ROOT)/crls /etc/ipsec.d/crls
cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-startklips-1.patch
cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-updown.klips-1.patch
# cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown_x509-1.patch
cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.6.16-clear-1.patch
cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.12-startklips-1.patch
cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown-1.patch
cd /usr/lib/ipsec && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-updown_x509-1.patch
cd /etc/ipsec.d/policies && patch -Np0 < $(DIR_SRC)/src/patches/openswan-2.4.9-clear-1.patch
endif
#@rm -rf $(DIR_APP)
@$(POSTBUILD)

92
lfs/r8168 Normal file
View File

@@ -0,0 +1,92 @@
###############################################################################
# #
# 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 = 8.005.00
THISAPP = r8168-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(SMP)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-smp
else
TARGET = $(DIR_INFO)/$(THISAPP)
endif
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = bde8dc54fbe271cd2a6954484e0af44f
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
$(PAK)
###############################################################################
# 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 jxf $(DIR_DL)/$(DL_FILE)
ifeq "$(SMP)" "1"
cd $(DIR_APP) && make clean
cd $(DIR_APP)/src && make -C /lib/modules/$(KVER)-ipfire-smp/build/ SUBDIRS=$(DIR_APP)/src modules
cd $(DIR_APP)/src && install -m 644 r8168.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/net
else
cd $(DIR_APP) && make clean
cd $(DIR_APP)/src && make -C /lib/modules/$(KVER)-ipfire/build/ SUBDIRS=$(DIR_APP)/src modules
cd $(DIR_APP)/src && install -m 644 r8168.ko /lib/modules/$(KVER)-ipfire/kernel/drivers/net
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

93
lfs/r8169 Normal file
View File

@@ -0,0 +1,93 @@
###############################################################################
# #
# 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 = 6.005.00
THISAPP = r8169-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(SMP)" "1"
TARGET = $(DIR_INFO)/$(THISAPP)-smp
else
TARGET = $(DIR_INFO)/$(THISAPP)
endif
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0004219943751f90ea996843257a00cb
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
$(PAK)
###############################################################################
# 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 jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -N -p1 < $(DIR_SRC)/src/patches/r8169-dlink_linksys.patch
ifeq "$(SMP)" "1"
cd $(DIR_APP) && make clean
cd $(DIR_APP)/src && make -C /lib/modules/$(KVER)-ipfire-smp/build/ SUBDIRS=$(DIR_APP)/src modules
cd $(DIR_APP)/src && install -m 644 r8169.ko /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/net
else
cd $(DIR_APP) && make clean
cd $(DIR_APP)/src && make -C /lib/modules/$(KVER)-ipfire/build/ SUBDIRS=$(DIR_APP)/src modules
cd $(DIR_APP)/src && install -m 644 r8169.ko /lib/modules/$(KVER)-ipfire/kernel/drivers/net
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

4
lfs/squashfstools
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.2-r2
VER = 3.4
THISAPP = squashfs$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = bf360b92eba9e6d5610196ce2e02fcd1
$(DL_FILE)_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
install : $(TARGET)

7
make.sh
View File

@@ -344,9 +344,11 @@ buildipfire() {
# ipfiremake sane KMOD=1 SMP=1
# ipfiremake openswan KMOD=1 SMP=1
ipfiremake linux
# ipfiremake linux-fusion
ipfiremake linux-fusion
ipfiremake ipp2p
ipfiremake atl2
ipfiremake r8168
ipfiremake r8169
ipfiremake kqemu
ipfiremake v4l-dvb
ipfiremake madwifi
@@ -755,8 +757,9 @@ build)
buildpackages
beautify build_stage "Checking Logfiles for new Files"
cd ..
tools/checknewlog.pl
beautify build_end
;;
shell)

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

@@ -104,8 +104,8 @@ int main(int argc, char *argv[])
}
mysystem("/sbin/modprobe ide-generic");
// mysystem("/sbin/modprobe generic");
mysystem("/sbin/modprobe ide-cd_mod");
mysystem("/sbin/modprobe generic");
mysystem("/sbin/modprobe ide-cd");
mysystem("/sbin/modprobe ide-disk");
mysystem("/sbin/modprobe uhci-hcd");
mysystem("/sbin/modprobe ohci-hcd");