X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flinux;h=4714db5f8ad200f135aad06f9128e22ab79ef85d;hp=7fcd37cdeac799190bc02234fc8b747db3b9bf40;hb=f110a344a692292955e67061956548607eaf96f5;hpb=71430cf631ea86e59380a78d698edb44092a3734 diff --git a/lfs/linux b/lfs/linux index 7fcd37cdea..4714db5f8a 100644 --- a/lfs/linux +++ b/lfs/linux @@ -1,22 +1,20 @@ ############################################################################### -# This file is part of the IPCop Firewall. # # # -# IPCop is free software; you can redistribute it and/or modify # +# 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 2 of the License, or # +# the Free Software Foundation, either version 3 of the License, or # # (at your option) any later version. # # # -# IPCop is distributed in the hope that it will be useful, # +# 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 IPCop; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Makefiles are based on LFSMake, which is # -# Copyright (C) 2002 Rod Roard # +# along with this program. If not, see . # # # ############################################################################### @@ -26,8 +24,8 @@ include Config -PATCHLEVEL = .1 -VER = 2.6.22.1 +PATCHLEVEL = .17 +VER = 2.6.23.17 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -36,10 +34,6 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -OPENSWAN = openswan-2.4.9 -MISDN = mISDN-1_1_5 -LAYER7 = netfilter-layer7-v2.13 - # Normal build or SMP build. # ifeq "$(SMP)" "1" @@ -53,19 +47,22 @@ endif # Top-level Rules ############################################################################### objects =$(DL_FILE) \ - $(OPENSWAN).tar.gz \ - $(MISDN).tar.gz \ - $(LAYER7).tar.gz - -$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) -$(LAYER7).tar.gz = $(URL_IPFIRE)/$(LAYER7).tar.gz -$(MISDN).tar.gz = $(URL_IPFIRE)/$(MISDN).tar.gz -$(OPENSWAN).tar.gz = $(URL_IPFIRE)/$(OPENSWAN).tar.gz - -$(DL_FILE)_MD5 = 50249e822a2a112d9221129a4a3af374 -$(LAYER7).tar.gz_MD5 = c8097875074405be31e4372682b68d7a -$(MISDN).tar.gz_MD5 = 93b1cff7817b82638a0475c2b7b7f1b6 -$(OPENSWAN).tar.gz_MD5 = 845f12d80d443cfa1a52f2b53b987bee + mISDN-1_1_8.tar.gz \ + squashfs3.3.tgz \ + netfilter-layer7-v2.18.tar.gz \ + patch-2.6.16-nath323-1.3.bz2 + +$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) +netfilter-layer7-v2.18.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.18.tar.gz +patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 +squashfs3.3.tgz = $(URL_IPFIRE)/squashfs3.3.tgz +mISDN-1_1_8.tar.gz = $(URL_IPFIRE)/mISDN-1_1_8.tar.gz + +$(DL_FILE)_MD5 = a0300a393ac91ce9c64bf31522b45e2e +netfilter-layer7-v2.18.tar.gz_MD5 = 8d2e2c00f5c20e8c0852998035aeffd2 +patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 +squashfs3.3.tgz_MD5 = 95c40fca0d886893631b5de14a0af25b +mISDN-1_1_8.tar.gz_MD5 = 29c55ffe0b35668a41eaed3b1c3ddfe2 install : $(TARGET) @@ -94,35 +91,42 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) $(DIR_SRC)/linux && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @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 - # Openswan 2 - cd $(DIR_SRC) && rm -rf openswan-* - cd $(DIR_SRC) && tar xfz $(DIR_DL)/$(OPENSWAN).tar.gz - #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(OPENSWAN).kernel-2.6-natt.patch - #cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(OPENSWAN).kernel-2.6-klips.patch + # 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 - cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc + # Openswan nat-t + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.x.kernel-2.6.23-natt.patch # Reiser4 - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.22-2.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.23.patch - # ip_conntrack permissions from 440 to 444 - #cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch + # SquashFS + cd $(DIR_SRC) && rm -rf squashfs* + cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.3.tgz + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.3/kernel-patches/linux-2.6.23/squashfs3.3-patch + # ip_conntrack permissions from 440 to 444 +# cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch + # Layer7-patch - cd $(DIR_SRC) && rm -rf $(DIR_SRC)/$(LAYER7) - cd $(DIR_SRC) && tar xzf $(DIR_DL)/$(LAYER7).tar.gz - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/$(LAYER7)/kernel-2.6.22-layer7-2.13.patch + cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.18 + cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.18.tar.gz + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/for_older_kernels/kernel-2.6.22-2.6.24-layer7-2.18.patch # Linux Intermediate Queueing Device - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.21-img2.diff +ifeq "$(XEN)" "" + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.23-imq.diff +endif # mISDN cd $(DIR_SRC) && rm -rf mISDN-* - cd $(DIR_SRC) && tar xfz $(DIR_DL)/$(MISDN).tar.gz - cd $(DIR_SRC)/$(MISDN) && yes 'yes' | ./std2kern -k /usr/src/linux + cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_8.tar.gz + cd $(DIR_SRC)/mISDN-1_1_8 && yes 'yes' | ./std2kern -k /usr/src/linux + + cd $(DIR_APP)/drivers/isdn/hardware/mISDN && patch -Np0 < $(DIR_SRC)/src/patches/mISDN-avmfritz.patch # Cleanup kernel source cd $(DIR_APP) && make mrproper @@ -161,5 +165,6 @@ ifeq "$(SMP)" "" cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/ endif - @rm -rf $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-* + @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-* @$(POSTBUILD) +