Erstmal ein Commit:

OpenVPN zurueck auf den Stand des alten gebracht. Wir bevorzugen die stabile Loesung. ISDN4K-Utils kompiliert - Noch kein rootfile vorhanden. Ibod aktualisiert. Snort-Initscript setzt die Berechtigung der PID auf 644. libxslt hinzugefuegt - Benoetigt vom mISDN-Script. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@623 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-27 19:23:24 +02:00 · 2007-06-10 19:10:01 +00:00
parent 541d93f0ec
commit c6c9630eec
35 changed files with 4806 additions and 3657 deletions
--- a/lfs/ibod
+++ b/lfs/ibod
@@ -26,33 +26,55 @@

 include Config

-VER = ipfire
+VER        = 1.4

-THISAPP    = ibod
-DIR_APP    = $(DIR_SRC)/src/$(THISAPP)
+THISAPP    = ibod-$(VER)
+DL_FILE    = $(THISAPP)-src.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

 ###############################################################################
 # Top-level Rules
 ###############################################################################
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 38b45be27c0a82b38380f680fdee0aff

 install : $(TARGET)

-check :
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))

-download :
+download :$(patsubst %,$(DIR_DL)/%,$(objects))

-md5 :
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)

 ###############################################################################
 # Installation Details
 ###############################################################################

-$(TARGET) : 
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	cd $(DIR_APP) && make ibod
-	mkdir -p /etc/ppp
-	cd $(DIR_APP) && install -m 0644 ibod.cf /etc/ppp
+	@-mkdir -p $(DIR_APP)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -C $(DIR_APP)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ibod-config.patch
+	cd $(DIR_APP) && gcc $(CFLAGS) ibod.c -o ibod
+	cd $(DIR_APP) && install -m 0644 ibod.cf /etc/isdn
 	cd $(DIR_APP) && install -m 0755 ibod /usr/sbin
-	cd $(DIR_APP) && rm -f ibod
+	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/isdn4k-utils
+++ b/lfs/isdn4k-utils
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: isdn4k-utils,v 1.8.2.4 2005/02/05 15:38:15 gespinasse Exp $
-#                                                                             #
 ###############################################################################

 ###############################################################################
@@ -32,24 +26,24 @@

 include Config

-VER        = v3.2p1
+VER        = CVS-2006-07-20

-THISAPP    = isdn4k-utils.$(VER)
+THISAPP    = isdn4k-utils-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = ftp://ftp.isdn4linux.de/pub/isdn4linux/utils
-DIR_APP    = $(DIR_SRC)/isdn4k-utils
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+CFLAGS     += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+RPM_OPT_FLAGS = "$(CFLAGS)"

 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects = $(DL_FILE) isdn4k-utils_ippp-filter.diff
+objects = $(DL_FILE)

-$(DL_FILE)                         = $(DL_FROM)/$(DL_FILE)
-isdn4k-utils_ippp-filter.diff      = http://trash.net/~kaber/ippp-filter/isdn4k-utils_ippp-filter.diff
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5                     = d347afa462e46eccfd1284aebae227b6
-isdn4k-utils_ippp-filter.diff_MD5  = b8ff58859b9e379d1f9842d43ce5956e
+$(DL_FILE)_MD5 = 7cde4a61e870bb7e53cd912a3fc30207

 install : $(TARGET)

@@ -79,30 +73,28 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_DL)/isdn4k-utils_ippp-filter.diff
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-v3.2p1-c89.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-v3.2p1-config.patch
-	cd $(DIR_APP) && sed -i 's%-lt 64%-lt 16%' scripts/makedev.sh
-	cd $(DIR_APP)/capi20 && rm -f lt* aclocal.m4 
-	cd $(DIR_APP)/capi20 && aclocal
-	cd $(DIR_APP)/capi20 && libtoolize --force --automake
-	cd $(DIR_APP)/capi20 && automake --add-missing
-	cd $(DIR_APP)/capi20 && autoconf
-	cd $(DIR_APP)/capiinfo && rm -f aclocal.m4
-	cd $(DIR_APP)/capiinfo && aclocal
-	cd $(DIR_APP)/capiinfo && libtoolize --force --automake
-	cd $(DIR_APP)/capiinfo && automake --add-missing
-	cd $(DIR_APP)/capiinfo && autoconf
-	cd $(DIR_APP)/capiinit && rm -f aclocal.m4
-	cd $(DIR_APP)/capiinit && aclocal
-	cd $(DIR_APP)/capiinit && libtoolize --force --automake
-	cd $(DIR_APP)/capiinit && automake --add-missing
-	cd $(DIR_APP)/capiinit && autoconf
-	cd $(DIR_APP)/ipppd && autoconf
-	cd $(DIR_APP)/ipppd && sed -i -e 's/net\/bpf/pcap/' sys-linux.c
-	cd $(DIR_APP)/ipppd && sed -i -e 's/net\/bpf/pcap/' ipppd.h
+	#cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils_ippp-filter.diff
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-CVS-2006-07-20-redhat.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-CVS-2004-11-18-autoconf25x.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-0202131200-true.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/isdn4k-utils-CVS-2006-02-13-cleanup.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-statfs.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-capiinit.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/isdn4k-utils-CVS-2006-07-20-pppd-2.4.4.patch
+
+	cd $(DIR_APP) && for i in */configure; do	\
+		cd `dirname $$i`; \
+		autoreconf --force --install; \
+		cd ..; \
+	done
+	
+	cd $(DIR_APP) && iconv -f iso-8859-1 -t utf-8 < imontty/imontty.8.in > imontty/imontty.8.in_
+	cd $(DIR_APP) && mv imontty/imontty.8.in_ imontty/imontty.8.in
+	
+	cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/isdn4k-utils/config .config
+	cd $(DIR_APP) && sed -e "s,',,g" .config > .config.h
+	
 	cd $(DIR_APP) && make subconfig
-	cd $(DIR_APP)/ipppd && sed -i 's/^IPPP_FILTER.*$$/IPPP_FILTER := 1/' Makefile
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
--- a/lfs/libxslt
+++ b/lfs/libxslt
@@ -0,0 +1,79 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop 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           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop 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 <rod@sunsetsystems.com>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.1.17
+
+THISAPP    = libxslt-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = fde6a7a93c0eb14cba628692fa3a1000
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# 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) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
--- a/lfs/mISDN
+++ b/lfs/mISDN
@@ -74,5 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && make MISDNDIR=/usr/src/linux
 	cd $(DIR_APP) && make install MISDNDIR=/usr/src/linux
+	-mkdir -p /usr/lib/mISDN
+	cd $(DIR_APP) && cp config/*.xsl /usr/lib/mISDN
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -76,12 +76,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		-e 's%^INC_USRLOCAL.*$$%INC_USRLOCAL=/usr%' \
 		-e 's%^USERCOMPILE.*$$%USERCOMPILE=$(CFLAGS)%' \
 		-e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' Makefile.inc
-	cd $(DIR_APP) && sed -i -e 's/CWARNINGS = -Werror/CWARNINGS =/' \
-											lib/liblwres/Makefile
 	cd $(DIR_APP) && make programs
 	cd $(DIR_APP) && make install
-	#mv -f /etc/rc.d/init.d/ipsec /etc/rc.d/
+	
 	-rm -rfv /etc/rc*.d/*ipsec
+	cd $(DIR_SRC) && cp src/initscripts/init.d/ipsec /etc/rc.d/init.d/ipsec
 	rm -f /etc/ipsec.conf /etc/ipsec.secrets
 	ln -sf $(CONFIG_ROOT)/vpn/ipsec.conf /etc/ipsec.conf
 	ln -sf $(CONFIG_ROOT)/vpn/ipsec.secrets /etc/ipsec.secrets