X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcapi4k-utils;h=b82c156e03c9066094e4d33e2276b5bad891413e;hp=3fca1a20b458f2d063d3fae26cb6b12914e7e3fa;hb=d22294fa7e70fa6eb907239ba00c2a0c7ae1863d;hpb=cd1a2927226c734d96478e12bb768256fb64a06a

diff --git a/lfs/capi4k-utils b/lfs/capi4k-utils
index 3fca1a20b..b82c156e0 100644
--- a/lfs/capi4k-utils
+++ b/lfs/capi4k-utils
@@ -1,28 +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 <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: capi4k-utils,v 1.6.2.11 2005/03/15 17:46:33 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,11 +24,11 @@
 
 include Config
 
-VER        = 2004-10-06
+VER        = 2005-07-18
 
 THISAPP    = capi4k-utils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.in-berlin.de/pub/capi4linux/OLD
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/capi4k-utils
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 54992ff362ca44629fdf59773a6864cd
+$(DL_FILE)_MD5 = c745759b6b3d64e19763727176648cdf
 
 install : $(TARGET)
 
@@ -78,17 +70,20 @@ $(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 -Np1 < $(DIR_SRC)/src/patches/capi4k-utils-2004-10-06_ppp-2.4.3.patch
-	cd $(DIR_APP)/avmb1 && ./configure
-	cd $(DIR_APP)/avmb1 && make
-	cd $(DIR_APP)/avmb1 && make install
+	cd $(DIR_APP)/capiinit && sed -i -e 's/-O2/$(CFLAGS)/' configure
 	cd $(DIR_APP)/capiinit && ./configure
-	cd $(DIR_APP)/capiinit && make
+	cd $(DIR_APP)/capiinit && make $(MAKETUNING)
 	cd $(DIR_APP)/capiinit && make install
+	cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux\/capi.h>/include <linux\/types.h>\n#include <linux\/capi.h>/' capidyn.c
+	cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux\/capi.h>/include <linux\/types.h>\n#include <linux\/capi.h>/' capi20.c
+	cd $(DIR_APP)/capi20 && sed -i "/include/a #include <stddef.h>" capi20.h
+	cd $(DIR_APP)/capi20 && sed -i -e 's/-O2/$(CFLAGS)/' configure
 	cd $(DIR_APP)/capi20 && SED=sed ./configure
-	cd $(DIR_APP)/capi20 && SED=sed make
+	cd $(DIR_APP)/capi20 && SED=sed make $(MAKETUNING)
 	cd $(DIR_APP)/capi20 && make install
-	PPPVER=`grep --max-count=1 VER $(DIR_SRC)/lfs/ppp | awk '{ print $$3 }'` && \
-		 cd $(DIR_APP)/pppdcapiplugin && PPPVERSIONS="$$PPPVER" make && PPPVERSIONS="$$PPPVER" make install
+	cd $(DIR_APP)/capiinfo && sed -i -e 's/-O2/$(CFLAGS)/' configure
+	cd $(DIR_APP)/capiinfo && ./configure
+	cd $(DIR_APP)/capiinfo && make $(MAKETUNING)
+	cd $(DIR_APP)/capiinfo && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)