Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / lfs / libpcap

diff --git a/lfs/libpcap b/lfs/libpcap
index f32fe41ed20b9ae6624ad5927fd9f885c2b54ee2..c6fdc2ef042608183390fec78e364e1012b09039 100644 (file)
--- a/lfs/libpcap
+++ b/lfs/libpcap
@@ -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: libpcap,v 1.5.2.5 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,11 +24,11 @@
 
 include Config
 
-VER        = 0.8.3
+VER        = 1.0.0
 
 THISAPP    = libpcap-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.tcpdump.org/release
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 56a9d4615d8354fcfe8cff8c8443c77b
+$(DL_FILE)_MD5 = 9ad1358c5dec48456405eac197a46d3d
 
 install : $(TARGET)
 
@@ -78,11 +70,15 @@ $(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/libpcap-0.8.3-shared.patch
-       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/libpcap-0.8.3-ppp.patch
+#      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpcap-0.8.3-shared.patch
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
-       cd $(DIR_APP) && make 
+       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make shared
        cd $(DIR_APP) && make install
-       cd $(DIR_APP) && cp -f pcap-int.h /usr/include
+       cd $(DIR_APP) && make install-shared-so
+       ln -svf libpcap.so.1.0.0 /usr/lib/libpcap.so.1.0
+       ln -svf libpcap.so.1.0 /usr/lib/libpcap.so.1
+       ln -svf libpcap.so.1 /usr/lib/libpcap.so        
+       cd $(DIR_APP) && cp -vf pcap-int.h /usr/include
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)