Updated kernel to 2.6.25.17

Updated klibc to 1.5.14
Updated iptables to 1.4.1.1
removed r8138,r3139,arptables
disabled ipp2p
testing patch openswan interpret unspec address as ipv4
This commit is contained in:
Arne Fitzenreiter
2008-09-13 20:48:59 +02:00
parent 8a1d5ea461
commit 9c534116cc
17 changed files with 744 additions and 789 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,59 +1,59 @@
lib/iptables
#lib/iptables/libipt_CLASSIFY.so
#lib/iptables/libipt_CONNMARK.so
#lib/iptables/libipt_DNAT.so
#lib/iptables/libipt_DSCP.so
#lib/iptables/libipt_ECN.so
#lib/iptables/libipt_LOG.so
#lib/iptables/libipt_MARK.so
#lib/iptables/libipt_MASQUERADE.so
#lib/iptables/libipt_MIRROR.so
#lib/iptables/libipt_NETMAP.so
#lib/iptables/libipt_NFQUEUE.so
#lib/iptables/libipt_NOTRACK.so
#lib/iptables/libipt_REDIRECT.so
#lib/iptables/libipt_REJECT.so
#lib/iptables/libipt_SAME.so
#lib/iptables/libipt_SNAT.so
#lib/iptables/libipt_TARPIT.so
#lib/iptables/libipt_TCPMSS.so
#lib/iptables/libipt_TOS.so
#lib/iptables/libipt_TRACE.so
#lib/iptables/libipt_TTL.so
#lib/iptables/libipt_ULOG.so
#lib/iptables/libipt_addrtype.so
#lib/iptables/libipt_ah.so
#lib/iptables/libipt_comment.so
#lib/iptables/libipt_connlimit.so
#lib/iptables/libipt_connmark.so
#lib/iptables/libipt_conntrack.so
#lib/iptables/libipt_dscp.so
#lib/iptables/libipt_ecn.so
#lib/iptables/libipt_esp.so
#lib/iptables/libipt_hashlimit.so
#lib/iptables/libipt_helper.so
#lib/iptables/libipt_icmp.so
#lib/iptables/libipt_iprange.so
#lib/iptables/libipt_length.so
#lib/iptables/libipt_limit.so
#lib/iptables/libipt_mac.so
#lib/iptables/libipt_mark.so
#lib/iptables/libipt_multiport.so
#lib/iptables/libipt_owner.so
#lib/iptables/libipt_physdev.so
#lib/iptables/libipt_pkttype.so
#lib/iptables/libipt_policy.so
#lib/iptables/libipt_realm.so
#lib/iptables/libipt_rpc.so
#lib/iptables/libipt_sctp.so
#lib/iptables/libipt_standard.so
#lib/iptables/libipt_state.so
#lib/iptables/libipt_tcp.so
#lib/iptables/libipt_tcpmss.so
#lib/iptables/libipt_tos.so
#lib/iptables/libipt_ttl.so
#lib/iptables/libipt_udp.so
#lib/iptables/libipt_unclean.so
lib/xtables
#lib/xtables/libipt_CLASSIFY.so
#lib/xtables/libipt_CONNMARK.so
#lib/xtables/libipt_DNAT.so
#lib/xtables/libipt_DSCP.so
#lib/xtables/libipt_ECN.so
#lib/xtables/libipt_LOG.so
#lib/xtables/libipt_MARK.so
#lib/xtables/libipt_MASQUERADE.so
#lib/xtables/libipt_MIRROR.so
#lib/xtables/libipt_NETMAP.so
#lib/xtables/libipt_NFQUEUE.so
#lib/xtables/libipt_NOTRACK.so
#lib/xtables/libipt_REDIRECT.so
#lib/xtables/libipt_REJECT.so
#lib/xtables/libipt_SAME.so
#lib/xtables/libipt_SNAT.so
#lib/xtables/libipt_TARPIT.so
#lib/xtables/libipt_TCPMSS.so
#lib/xtables/libipt_TOS.so
#lib/xtables/libipt_TRACE.so
#lib/xtables/libipt_TTL.so
#lib/xtables/libipt_ULOG.so
#lib/xtables/libipt_addrtype.so
#lib/xtables/libipt_ah.so
#lib/xtables/libipt_comment.so
#lib/xtables/libipt_connlimit.so
#lib/xtables/libipt_connmark.so
#lib/xtables/libipt_conntrack.so
#lib/xtables/libipt_dscp.so
#lib/xtables/libipt_ecn.so
#lib/xtables/libipt_esp.so
#lib/xtables/libipt_hashlimit.so
#lib/xtables/libipt_helper.so
#lib/xtables/libipt_icmp.so
#lib/xtables/libipt_iprange.so
#lib/xtables/libipt_length.so
#lib/xtables/libipt_limit.so
#lib/xtables/libipt_mac.so
#lib/xtables/libipt_mark.so
#lib/xtables/libipt_multiport.so
#lib/xtables/libipt_owner.so
#lib/xtables/libipt_physdev.so
#lib/xtables/libipt_pkttype.so
#lib/xtables/libipt_policy.so
#lib/xtables/libipt_realm.so
#lib/xtables/libipt_rpc.so
#lib/xtables/libipt_sctp.so
#lib/xtables/libipt_standard.so
#lib/xtables/libipt_state.so
#lib/xtables/libipt_tcp.so
#lib/xtables/libipt_tcpmss.so
#lib/xtables/libipt_tos.so
#lib/xtables/libipt_ttl.so
#lib/xtables/libipt_udp.so
#lib/xtables/libipt_unclean.so
sbin/iptables
#sbin/iptables-restore
#sbin/iptables-save

View File

@@ -1,4 +1,4 @@
lib/klibc-OAjdpFbBkEGH4SoDC_yBoygNI8g.so
lib/klibc-ZO-RpWWd1KanShWf2YpByFrlJSI.so
usr/bin/klcc
#usr/lib/klibc
#usr/lib/klibc/bin
@@ -11,7 +11,7 @@ usr/lib/klibc/bin/fstype
usr/lib/klibc/bin/gunzip
usr/lib/klibc/bin/gzip
usr/lib/klibc/bin/halt
usr/lib/klibc/bin/insmod
#usr/lib/klibc/bin/insmod
usr/lib/klibc/bin/ipconfig
usr/lib/klibc/bin/kill
usr/lib/klibc/bin/kinit
@@ -1566,7 +1566,7 @@ usr/lib/klibc/bin/zcat
#usr/lib/klibc/lib
#usr/lib/klibc/lib/crt0.o
#usr/lib/klibc/lib/interp.o
usr/lib/klibc/lib/klibc-OAjdpFbBkEGH4SoDC_yBoygNI8g.so
usr/lib/klibc/lib/klibc-ZO-RpWWd1KanShWf2YpByFrlJSI.so
#usr/lib/klibc/lib/libc.a
usr/lib/klibc/lib/libc.so
#usr/man/man1/klcc.1

View File

@@ -1,5 +0,0 @@
#etc/rc.d/init.d/arptables
#usr/local/man/man8/arptables.8
usr/local/sbin/arptables
usr/local/sbin/arptables-restore
usr/local/sbin/arptables-save

View File

@@ -0,0 +1 @@
../../common/klibc

View File

@@ -38,7 +38,6 @@
* apcupsd-3.14.4
* applejuice-0.30
* arping-2.05
* arptables-v0.0.3-3
* as86-0.16.17
* asterisk-1.4.18
* atl2-2.0.4
@@ -134,15 +133,14 @@
* ipaddr-1.2
* ipfireseeder-1.00
* ipp2p-0.8.2
* ipp2p-0.8.2-iptables
* iproute2-2.6.16-060323
* iptables-1.3.8
* iptables-1.4.1.1
* iptstate-2.1
* iputils-ss020927
* java-1.5.0_06-for-ipfire
* jpegsrc.v6b
* kbd-1.12
* klibc-1.5
* klibc-1.5.14
* kqemu-1.3.0pre11
* kudzu-1.2.64
* l7-protocols-2007-10-10
@@ -172,9 +170,8 @@
* libwww-perl-5.803
* libxml2-2.6.26
* libxslt-1.1.17
* linux-2.6.23.17
* linux-2.6.25.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
@@ -241,8 +238,6 @@
* 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

View File

@@ -1,83 +0,0 @@
###############################################################################
# #
# 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 = 0.0.3-3
THISAPP = arptables-v$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = arptables
PAK_VER = 1
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 3f4a8b62920a46d746ab892be7de088f
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 zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -24,7 +24,7 @@
include Config
VER = 1.3.8
VER = 1.4.1.1
THISAPP = iptables-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -36,19 +36,19 @@ TARGET = $(DIR_INFO)/$(THISAPP)
# Top-level Rules
###############################################################################
objects = $(DL_FILE) \
netfilter-layer7-v2.18.tar.gz \
libnfnetlink-0.0.25.tar.bz2 \
libnetfilter_queue-0.0.13.tar.bz2
netfilter-layer7-v2.20.tar.gz \
libnfnetlink-0.0.39.tar.bz2 \
libnetfilter_queue-0.0.16.tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
netfilter-layer7-v2.18.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.18.tar.gz
libnfnetlink-0.0.25.tar.bz2 = $(URL_IPFIRE)/libnfnetlink-0.0.25.tar.bz2
libnetfilter_queue-0.0.13.tar.bz2 = $(URL_IPFIRE)/libnetfilter_queue-0.0.13.tar.bz2
netfilter-layer7-v2.20.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.20.tar.gz
libnfnetlink-0.0.39.tar.bz2 = $(URL_IPFIRE)/libnfnetlink-0.0.39.tar.bz2
libnetfilter_queue-0.0.16.tar.bz2 = $(URL_IPFIRE)/libnetfilter_queue-0.0.16.tar.bz2
$(DL_FILE)_MD5 = 0a9209f928002e5eee9cdff8fef4d4b3
netfilter-layer7-v2.18.tar.gz_MD5 = 8d2e2c00f5c20e8c0852998035aeffd2
libnfnetlink-0.0.25.tar.bz2_MD5 = fc915a2e66d282e524af6ef939042d7d
libnetfilter_queue-0.0.13.tar.bz2_MD5 = 660cbfd3dc8c10bf9b1803cd2b688256
$(DL_FILE)_MD5 = 723fa88d8a0915e184f99e03e9bf06cb
netfilter-layer7-v2.20.tar.gz_MD5 = 525a821c973b730c8feaf9eedb57d1e4
libnfnetlink-0.0.39.tar.bz2_MD5 = 348fed8c1edbe5b873ffc7b192140093
libnetfilter_queue-0.0.16.tar.bz2_MD5 = b36664e6cd39edbfe46b416a86118add
install : $(TARGET)
@@ -77,32 +77,40 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.25 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.13
@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.39 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.16
@cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.18.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.18/iptables-1.3-for-kernel-2.6.20forward-layer7-2.18.patch
cd $(DIR_SRC) && tar zxf $(DIR_DL)/netfilter-layer7-v2.20.tar.gz
cd $(DIR_APP) && cp -vf $(DIR_SRC)/netfilter-layer7-v2.20/iptables-1.4.1.1-for-kernel-2.6.20forward/* \
./extensions/
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.3.6-imq.diff
chmod +x $(DIR_APP)/extensions/.IMQ-test* $(DIR_APP)/extensions/.layer7-test*
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.1-imq.diff
chmod +x $(DIR_APP)/extensions/.IMQ-test*
# hack to disable IPv6 compilation as the configuration variable does not work when ip6.h is present
cd $(DIR_APP) && sed -i -e 's/DO_IPV6:=1/DO_IPV6:=0/' Makefile
cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man KERNEL_DIR=/usr/src/linux LIBDIR=/lib $(MAKETUNING)
cd $(DIR_APP) && make BINDIR=/sbin MANDIR=/usr/share/man KERNEL_DIR=/usr/src/linux LIBDIR=/lib install install-devel
# cd $(DIR_APP) && sed -i -e 's/DO_IPV6:=1/DO_IPV6:=0/' Makefile
cd $(DIR_APP) && ./configure --prefix=/usr --with-ksource=/usr/src/linux \
--libdir=/lib --includedir=/usr/include --enable-libipq \
--libexecdir=/lib --bindir=/sbin \
--sbindir=/sbin --mandir=/usr/share/man
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && cp -fva include/* /usr/include
-mkdir /usr/include/libiptc
cd $(DIR_APP) && cp -vf include/libiptc/{libiptc.h,ipt_kernel_headers.h} \
/usr/include/libiptc
cd $(DIR_APP) && cp -vf libiptc/{*.o,*.a} \
/lib
cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.25.tar.bz2
cd $(DIR_SRC)/libnfnetlink-0.0.25 && ./configure --prefix=/usr
cd $(DIR_SRC)/libnfnetlink-0.0.25 && make
cd $(DIR_SRC)/libnfnetlink-0.0.25 && make install
cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-0.0.39.tar.bz2
cd $(DIR_SRC)/libnfnetlink-0.0.39 && ./configure --prefix=/usr
cd $(DIR_SRC)/libnfnetlink-0.0.39 && make
cd $(DIR_SRC)/libnfnetlink-0.0.39 && make install
cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.13.tar.bz2
cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && ./configure --prefix=/usr
cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && make
cd $(DIR_SRC)/libnetfilter_queue-0.0.13 && make install
@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.25 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.13
cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnetfilter_queue-0.0.16.tar.bz2
cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && ./configure --prefix=/usr
cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make
cd $(DIR_SRC)/libnetfilter_queue-0.0.16 && make install
@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.39 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.16
@$(POSTBUILD)

View File

@@ -24,10 +24,10 @@
include Config
VER = 1.5
VER = 1.5.14
THISAPP = klibc-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -42,7 +42,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
klibc-extras-2.2.tar.gz = $(DL_FROM)/klibc-extras-2.2.tar.gz
$(DL_FILE)_MD5 = d55ce89c0656a7d6896ec0b2af07b5dc
$(DL_FILE)_MD5 = 030d978a7f16800e8ccae12d6fb5e7ba
klibc-extras-2.2.tar.gz_MD5 = 7e5042978531048c369f59ca1a13055b
install : $(TARGET)
@@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/klibc* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) && \
@rm -rf $(DIR_APP) $(DIR_SRC)/klibc* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) && \
tar zxf $(DIR_DL)/klibc-extras-2.2.tar.gz
cd $(DIR_APP) && ln -fs ../linux linux
cd $(DIR_SRC)/klibc-extras && sed -i "s|^INSTALL = .*|INSTALL = /usr/bin/install -c -m 755|g" Makefile

View File

@@ -25,7 +25,7 @@
include Config
PATCHLEVEL = .17
VER = 2.6.23.17
VER = 2.6.25.17
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -48,21 +48,24 @@ endif
###############################################################################
objects =$(DL_FILE) \
mISDN-1_1_8.tar.gz \
squashfs3.3.tgz \
netfilter-layer7-v2.18.tar.gz \
patch-2.6.16-nath323-1.3.bz2
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
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
netfilter-layer7-v2.18.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.18.tar.gz
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.3.tgz = $(URL_IPFIRE)/squashfs3.3.tgz
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 = a0300a393ac91ce9c64bf31522b45e2e
netfilter-layer7-v2.18.tar.gz_MD5 = 8d2e2c00f5c20e8c0852998035aeffd2
$(DL_FILE)_MD5 = 30618bff93fd4fd048e20a9a6aab8e5d
netfilter-layer7-v2.20.tar.gz_MD5 = 525a821c973b730c8feaf9eedb57d1e4
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
squashfs3.3.tgz_MD5 = 95c40fca0d886893631b5de14a0af25b
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)
@@ -94,11 +97,8 @@ $(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
# 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
@@ -107,24 +107,24 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/reiser4-for-2.6.23.patch
cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/reiser4-for-2.6.25.patch.bz2 | patch -Np1
# 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
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
# 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)/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
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
# Linux Intermediate Queueing Device
ifeq "$(XEN)" ""
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.23-imq.diff
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25-imq5.diff
endif
# mISDN
@@ -173,4 +173,3 @@ endif
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/mISDN-* $(DIR_SRC)/netfilter-layer7-*
@$(POSTBUILD)

View File

@@ -74,5 +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
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -78,6 +78,7 @@ $(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) && patch -p1 < $(DIR_SRC)/src/patches/openswan-2.6.16-sa_fam_unspec.patch
ifeq "$(KMOD)" "1"
cd $(DIR_APP) && make KERNELSRC=/usr/src/linux module
cd $(DIR_APP) && make minstall

View File

@@ -1,92 +0,0 @@
###############################################################################
# #
# 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)

View File

@@ -1,93 +0,0 @@
###############################################################################
# #
# 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)

View File

@@ -336,8 +336,6 @@ buildipfire() {
# ipfiremake linux SMP=1
# ipfiremake linux-fusion SMP=1
# ipfiremake ipp2p SMP=1
# ipfiremake r8169 SMP=1
# ipfiremake r8168 SMP=1
# ipfiremake atl2 SMP=1
# ipfiremake kqemu SMP=1
# ipfiremake v4l-dvb SMP=1
@@ -346,10 +344,8 @@ buildipfire() {
# ipfiremake sane KMOD=1 SMP=1
# ipfiremake openswan KMOD=1 SMP=1
ipfiremake linux
ipfiremake linux-fusion
# ipfiremake linux-fusion
ipfiremake ipp2p
ipfiremake r8169
ipfiremake r8168
ipfiremake atl2
ipfiremake kqemu
ipfiremake v4l-dvb
@@ -420,7 +416,7 @@ buildipfire() {
ipfiremake whatmask
ipfiremake iptables
ipfiremake libupnp
ipfiremake ipp2p IPT=1
# ipfiremake ipp2p IPT=1
ipfiremake linux-igd
ipfiremake ipaddr
ipfiremake iptstate
@@ -564,7 +560,6 @@ buildipfire() {
ipfiremake tunctl
ipfiremake nagios
ipfiremake ebtables
ipfiremake arptables
ipfiremake fontconfig
ipfiremake freefont
ipfiremake directfb

View File

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

View File

@@ -0,0 +1,11 @@
diff -Naur openswan-2.6.16.org/linux/net/ipsec/pfkey_v2_build.c openswan-2.6.16/linux/net/ipsec/pfkey_v2_build.c
--- openswan-2.6.16.org/linux/net/ipsec/pfkey_v2_build.c 2008-08-18 19:07:48.000000000 +0200
+++ openswan-2.6.16/linux/net/ipsec/pfkey_v2_build.c 2008-09-13 15:38:43.000000000 +0200
@@ -442,6 +442,7 @@
}
switch(address->sa_family) {
+ case AF_UNSPEC:
case AF_INET:
DEBUGGING(PF_KEY_DEBUG_BUILD,
"pfkey_address_build: "