X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Flinux;h=55c994b52cd8b0ea993e7957d49744d26895b162;hp=39e309d8b8abbb462d2a4344a62808bbf0b604cb;hb=70df830214c97a68fcb7e89ae0d7df58c35590be;hpb=642b2e7f84350987b91e631cf16383ae5270d538 diff --git a/lfs/linux b/lfs/linux index 39e309d8b8..55c994b52c 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 = .50 -VER = 2.6.16.50 +PATCHLEVEL = .53 +VER = 2.6.16.53 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -49,13 +47,13 @@ endif # Top-level Rules ############################################################################### objects =$(DL_FILE) \ - mISDN-1_1_3.tar.gz \ + mISDN-1_1_5.tar.gz \ squashfs3.2-r2.tar.gz \ iptables-1.3.5.tar.bz2 \ patch-o-matic-ng-20061210.tar.bz2 \ netfilter-layer7-v2.9.tar.gz \ patch-2.6.16-nath323-1.3.bz2 \ - openswan-2.4.8.tar.gz + openswan-2.4.9.tar.gz $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) patch-o-matic-ng-20061210.tar.bz2 = $(URL_IPFIRE)/patch-o-matic-ng-20061210.tar.bz2 @@ -63,18 +61,17 @@ iptables-1.3.5.tar.bz2 = $(URL_IPFIRE)/iptables-1.3.5.tar.bz2 netfilter-layer7-v2.9.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.9.tar.gz patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 squashfs3.2-r2.tar.gz = $(URL_IPFIRE)/squashfs3.2-r2.tar.gz -mISDN-1_1_3.tar.gz = $(URL_IPFIRE)/mISDN-1_1_3.tar.gz -openswan-2.4.8.tar.gz = $(URL_IPFIRE)/openswan-2.4.8.tar.gz +mISDN-1_1_5.tar.gz = $(URL_IPFIRE)/mISDN-1_1_5.tar.gz +openswan-2.4.9.tar.gz = $(URL_IPFIRE)/openswan-2.4.9.tar.gz -$(DL_FILE)_MD5 = cc2106c6188675187d636aa518b04958 -linux-2.6.16.33.tar.bz2_MD5 = 22f56e3a5e7524b2bbde2696152b5ad7 +$(DL_FILE)_MD5 = 5c6e965d9121ba0d3f3c747e519de402 patch-o-matic-ng-20061210.tar.bz2_MD5 = 76edac76301b45f89e467b41c8cf4393 iptables-1.3.5.tar.bz2_MD5 = 00fb916fa8040ca992a5ace56d905ea5 netfilter-layer7-v2.9.tar.gz_MD5 = ebf9043a5352ebe6dbd721989ef83dee patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 squashfs3.2-r2.tar.gz_MD5 = bf360b92eba9e6d5610196ce2e02fcd1 -mISDN-1_1_3.tar.gz_MD5 = d29bcf48f16fc8a9b9f3552d111b308d -openswan-2.4.8.tar.gz_MD5 = 918cc56ccf8e5d14cd2047e47450b34a +mISDN-1_1_5.tar.gz_MD5 = 93b1cff7817b82638a0475c2b7b7f1b6 +openswan-2.4.9.tar.gz_MD5 = 845f12d80d443cfa1a52f2b53b987bee install : $(TARGET) @@ -111,9 +108,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Openswan 2 cd $(DIR_SRC) && rm -rf openswan-* - cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.8.tar.gz - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.8.kernel-2.6-klips.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.8.kernel-2.6-natt.patch + cd $(DIR_SRC) && tar xfz $(DIR_DL)/openswan-2.4.9.tar.gz + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.9.kernel-2.6-klips.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openswan-2.4.9.kernel-2.6-natt.patch cd $(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc @@ -158,8 +155,10 @@ endif # mISDN cd $(DIR_SRC) && rm -rf mISDN-* - cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_3.tar.gz - cd $(DIR_SRC)/mISDN-1_1_3 && yes 'yes' | ./std2kern -k /usr/src/linux + cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_5.tar.gz + cd $(DIR_SRC)/mISDN-1_1_5 && yes 'yes' | ./std2kern -k /usr/src/linux + + cd $(DIR_APP)/drivers/isdn/hardware/mISDN && patch -Np0 < $(DIR_SRC)/src/patches/mISDN-avmfritz.patch ifeq "$(SMP)" "" # Only do this once on the non-SMP pass @@ -198,9 +197,6 @@ else cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install endif - # remove symlinked pcmcia directory - -rm -rf /lib/modules/$(VER)-ipfire{,-smp}/pcmcia - ifeq "$(SMP)" "" # Only do this once on the non-SMP pass cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/