libpcap, maj 1.1.1-1

5 files changed, 70 insertions, 53 deletions

diff --git a/base/libpcap/.footprint.i686 b/base/libpcap/.footprint.i686
index 87876ab82..001d32224 100644
--- a/base/libpcap/.footprint.i686
+++ b/base/libpcap/.footprint.i686
@@ -2,20 +2,24 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/pcap-config
 drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/net/
+lrwxrwxrwx	root/root	usr/include/net/bpf.h -> ../pcap-bpf.h
 -rw-r--r--	root/root	usr/include/pcap-bpf.h
 -rw-r--r--	root/root	usr/include/pcap-namedb.h
 -rw-r--r--	root/root	usr/include/pcap.h
 drwxr-xr-x	root/root	usr/include/pcap/
+-rw-r--r--	root/root	usr/include/pcap/bluetooth.h
 -rw-r--r--	root/root	usr/include/pcap/bpf.h
+-rw-r--r--	root/root	usr/include/pcap/ipnet.h
 -rw-r--r--	root/root	usr/include/pcap/namedb.h
 -rw-r--r--	root/root	usr/include/pcap/pcap.h
 -rw-r--r--	root/root	usr/include/pcap/sll.h
 -rw-r--r--	root/root	usr/include/pcap/usb.h
+-rw-r--r--	root/root	usr/include/pcap/vlan.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libpcap.a
-lrwxrwxrwx	root/root	usr/lib/libpcap.so -> libpcap.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libpcap.so.1 -> libpcap.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libpcap.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libpcap.so -> libpcap.so.1
+lrwxrwxrwx	root/root	usr/lib/libpcap.so.1 -> libpcap.so.1.1.1
+-rwxr-xr-x	root/root	usr/lib/libpcap.so.1.1.1
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
@@ -30,43 +34,43 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/pcap_create.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_datalink.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_datalink_name_to_val.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_datalink_val_to_description.3pcap.gz -> pcap_datalink_val_to_name.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_datalink_val_to_name.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_dispatch.3pcap.gz -> pcap_loop.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_datalink_val_to_description.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_datalink_val_to_name.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_dispatch.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_dump.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_dump_close.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_dump_file.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_dump_flush.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_dump_fopen.3pcap.gz -> pcap_dump_open.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_dump_fopen.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_dump_ftell.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_dump_open.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_dump_open.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_file.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_fileno.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_findalldevs.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_fopen_offline.3pcap.gz -> pcap_open_offline.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_fopen_offline.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_free_datalinks.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_freealldevs.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_freecode.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_get_selectable_fd.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_geterr.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_getnonblock.3pcap.gz -> pcap_setnonblock.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_inject.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_geterr.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_getnonblock.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_inject.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_is_swapped.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_lib_version.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_list_datalinks.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_lookupdev.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_lookupnet.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_loop.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_major_version.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_minor_version.3pcap.gz -> pcap_major_version.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_next.3pcap.gz -> pcap_next_ex.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_next_ex.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_loop.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_major_version.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_minor_version.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_next.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_next_ex.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_offline_filter.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_open_dead.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_open_live.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_open_offline.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_perror.3pcap.gz -> pcap_geterr.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_sendpacket.3pcap.gz -> pcap_inject.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_open_offline.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_perror.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_sendpacket.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_set_buffer_size.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_set_datalink.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_set_promisc.3pcap.gz
@@ -75,7 +79,7 @@ lrwxrwxrwx	root/root	usr/share/man/man3/pcap_sendpacket.3pcap.gz -> pcap_inject.
 -rw-r--r--	root/root	usr/share/man/man3/pcap_set_timeout.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_setdirection.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_setfilter.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_setnonblock.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_setnonblock.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_snapshot.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_stats.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_statustostr.3pcap.gz
diff --git a/base/libpcap/.footprint.x86_64 b/base/libpcap/.footprint.x86_64
index 87876ab82..001d32224 100644
--- a/base/libpcap/.footprint.x86_64
+++ b/base/libpcap/.footprint.x86_64
@@ -2,20 +2,24 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/pcap-config
 drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/net/
+lrwxrwxrwx	root/root	usr/include/net/bpf.h -> ../pcap-bpf.h
 -rw-r--r--	root/root	usr/include/pcap-bpf.h
 -rw-r--r--	root/root	usr/include/pcap-namedb.h
 -rw-r--r--	root/root	usr/include/pcap.h
 drwxr-xr-x	root/root	usr/include/pcap/
+-rw-r--r--	root/root	usr/include/pcap/bluetooth.h
 -rw-r--r--	root/root	usr/include/pcap/bpf.h
+-rw-r--r--	root/root	usr/include/pcap/ipnet.h
 -rw-r--r--	root/root	usr/include/pcap/namedb.h
 -rw-r--r--	root/root	usr/include/pcap/pcap.h
 -rw-r--r--	root/root	usr/include/pcap/sll.h
 -rw-r--r--	root/root	usr/include/pcap/usb.h
+-rw-r--r--	root/root	usr/include/pcap/vlan.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libpcap.a
-lrwxrwxrwx	root/root	usr/lib/libpcap.so -> libpcap.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libpcap.so.1 -> libpcap.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libpcap.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libpcap.so -> libpcap.so.1
+lrwxrwxrwx	root/root	usr/lib/libpcap.so.1 -> libpcap.so.1.1.1
+-rwxr-xr-x	root/root	usr/lib/libpcap.so.1.1.1
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
@@ -30,43 +34,43 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/pcap_create.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_datalink.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_datalink_name_to_val.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_datalink_val_to_description.3pcap.gz -> pcap_datalink_val_to_name.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_datalink_val_to_name.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_dispatch.3pcap.gz -> pcap_loop.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_datalink_val_to_description.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_datalink_val_to_name.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_dispatch.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_dump.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_dump_close.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_dump_file.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_dump_flush.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_dump_fopen.3pcap.gz -> pcap_dump_open.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_dump_fopen.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_dump_ftell.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_dump_open.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_dump_open.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_file.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_fileno.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_findalldevs.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_fopen_offline.3pcap.gz -> pcap_open_offline.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_fopen_offline.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_free_datalinks.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_freealldevs.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_freecode.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_get_selectable_fd.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_geterr.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_getnonblock.3pcap.gz -> pcap_setnonblock.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_inject.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_geterr.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_getnonblock.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_inject.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_is_swapped.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_lib_version.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_list_datalinks.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_lookupdev.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_lookupnet.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_loop.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_major_version.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_minor_version.3pcap.gz -> pcap_major_version.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_next.3pcap.gz -> pcap_next_ex.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_next_ex.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_loop.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_major_version.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_minor_version.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_next.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_next_ex.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_offline_filter.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_open_dead.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_open_live.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_open_offline.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_perror.3pcap.gz -> pcap_geterr.3pcap.gz
-lrwxrwxrwx	root/root	usr/share/man/man3/pcap_sendpacket.3pcap.gz -> pcap_inject.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_open_offline.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_perror.3pcap
+-rw-r--r--	root/root	usr/share/man/man3/pcap_sendpacket.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_set_buffer_size.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_set_datalink.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_set_promisc.3pcap.gz
@@ -75,7 +79,7 @@ lrwxrwxrwx	root/root	usr/share/man/man3/pcap_sendpacket.3pcap.gz -> pcap_inject.
 -rw-r--r--	root/root	usr/share/man/man3/pcap_set_timeout.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_setdirection.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_setfilter.3pcap.gz
--rw-r--r--	root/root	usr/share/man/man3/pcap_setnonblock.3pcap.gz
+-rw-r--r--	root/root	usr/share/man/man3/pcap_setnonblock.3pcap
 -rw-r--r--	root/root	usr/share/man/man3/pcap_snapshot.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_stats.3pcap.gz
 -rw-r--r--	root/root	usr/share/man/man3/pcap_statustostr.3pcap.gz
diff --git a/base/libpcap/.md5sum.i686 b/base/libpcap/.md5sum.i686
index c62d941c3..c1b7505fd 100644
--- a/base/libpcap/.md5sum.i686
+++ b/base/libpcap/.md5sum.i686
@@ -1 +1 @@
-9ad1358c5dec48456405eac197a46d3d  libpcap-1.0.0.tar.gz
+1bca27d206970badae248cfa471bbb47  libpcap-1.1.1.tar.gz
diff --git a/base/libpcap/.md5sum.x86_64 b/base/libpcap/.md5sum.x86_64
index c62d941c3..c1b7505fd 100644
--- a/base/libpcap/.md5sum.x86_64
+++ b/base/libpcap/.md5sum.x86_64
@@ -1 +1 @@
-9ad1358c5dec48456405eac197a46d3d  libpcap-1.0.0.tar.gz
+1bca27d206970badae248cfa471bbb47  libpcap-1.1.1.tar.gz
diff --git a/base/libpcap/Pkgfile b/base/libpcap/Pkgfile
index c859ef511..2b6f36f8d 100644
--- a/base/libpcap/Pkgfile
+++ b/base/libpcap/Pkgfile
@@ -4,18 +4,27 @@
 # Packager: thierryn1 at hispeed dot ch
 
 name=libpcap
-version=1.0.0
+version=1.1.1
 release=1
 source=(http://www.tcpdump.org/release/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
-	install -d $PKG/usr/bin
-	sed -i '/ln [^-][^s]/s/ln/ln -s/' Makefile.in
+	install -d -m755 $PKG/usr/bin
+#	sed -i '/ln [^-][^s]/s/ln/ln -s/' Makefile.in
 	./configure --prefix=/usr \
-		--mandir=/usr/share/man 
+		--mandir=/usr/share/man \
+		--enable-ipv6
 	make
-	make DESTDIR=$PKG install install-shared
-	ln -s $name.so.$version $PKG/usr/lib/$name.so.1
-	ln -s $name.so.$version $PKG/usr/lib/$name.so
+	make DESTDIR=$PKG install 
+	rm -rf $PKG/usr/lib/libpcap.a
+
+	# Compatibilité descendante , programme souvent vu comme net/bpf.h
+  	mkdir -p $PKG/usr/include/net
+  	cd $PKG/usr/include/net
+  	ln -s ../pcap-bpf.h bpf.h
+
+# install-shared
+#	ln -s $name.so.$version $PKG/usr/lib/$name.so.1
+#	ln -s $name.so.$version $PKG/usr/lib/$name.so
 }