Revision: 6142
http://ipcop.svn.sourceforge.net/ipcop/?rev=6142&view=rev
Author: owes
Date: 2011-11-30 12:41:59 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
Upgrade libpcap to 1.2.0. Readd the patch that allows to use inbound/outbound
in pppd/ipppd 'filter', which we want for non-permanent connections.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/libpcap
ipcop/trunk/lfs/libpcap
ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
ipcop/trunk/updates/2.0.3/information.xml
ipcop/trunk/updates/2.0.3/setup
Added Paths:
-----------
ipcop/trunk/src/patches/libpcap-1.2.0_ppp.patch
Modified: ipcop/trunk/config/rootfiles/common/libpcap
===================================================================
--- ipcop/trunk/config/rootfiles/common/libpcap 2011-11-29 12:54:50 UTC (rev
6141)
+++ ipcop/trunk/config/rootfiles/common/libpcap 2011-11-30 12:41:59 UTC (rev
6142)
@@ -14,7 +14,7 @@
#usr/lib/libpcap.a
usr/lib/libpcap.so
usr/lib/libpcap.so.1
-usr/lib/libpcap.so.1.1.1
+usr/lib/libpcap.so.1.2.0
#usr/share/man/man1/pcap-config.1
#usr/share/man/man3/pcap.3pcap
#usr/share/man/man3/pcap_activate.3pcap
@@ -40,6 +40,7 @@
#usr/share/man/man3/pcap_findalldevs.3pcap
#usr/share/man/man3/pcap_fopen_offline.3pcap
#usr/share/man/man3/pcap_free_datalinks.3pcap
+#usr/share/man/man3/pcap_free_tstamp_types.3pcap
#usr/share/man/man3/pcap_freealldevs.3pcap
#usr/share/man/man3/pcap_freecode.3pcap
#usr/share/man/man3/pcap_get_selectable_fd.3pcap
@@ -49,6 +50,7 @@
#usr/share/man/man3/pcap_is_swapped.3pcap
#usr/share/man/man3/pcap_lib_version.3pcap
#usr/share/man/man3/pcap_list_datalinks.3pcap
+#usr/share/man/man3/pcap_list_tstamp_types.3pcap
#usr/share/man/man3/pcap_lookupdev.3pcap
#usr/share/man/man3/pcap_lookupnet.3pcap
#usr/share/man/man3/pcap_loop.3pcap
@@ -68,6 +70,7 @@
#usr/share/man/man3/pcap_set_rfmon.3pcap
#usr/share/man/man3/pcap_set_snaplen.3pcap
#usr/share/man/man3/pcap_set_timeout.3pcap
+#usr/share/man/man3/pcap_set_tstamp_type.3pcap
#usr/share/man/man3/pcap_setdirection.3pcap
#usr/share/man/man3/pcap_setfilter.3pcap
#usr/share/man/man3/pcap_setnonblock.3pcap
@@ -75,6 +78,8 @@
#usr/share/man/man3/pcap_stats.3pcap
#usr/share/man/man3/pcap_statustostr.3pcap
#usr/share/man/man3/pcap_strerror.3pcap
+#usr/share/man/man3/pcap_tstamp_type_name_to_val.3pcap
+#usr/share/man/man3/pcap_tstamp_type_val_to_name.3pcap
#usr/share/man/man5/pcap-savefile.5
#usr/share/man/man7/pcap-filter.7
#usr/share/man/man7/pcap-linktype.7
Modified: ipcop/trunk/lfs/libpcap
===================================================================
--- ipcop/trunk/lfs/libpcap 2011-11-29 12:54:50 UTC (rev 6141)
+++ ipcop/trunk/lfs/libpcap 2011-11-30 12:41:59 UTC (rev 6142)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = libpcap
-VER = 1.1.1
+VER = 1.2.0
HOST_ARCH = all
OTHER_SRC = yes
@@ -53,7 +53,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1bca27d206970badae248cfa471bbb47
+$(DL_FILE)_MD5 = dfb8aa690b7a29821bfa183025436569
install : $(TARGET)
@@ -83,6 +83,8 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ # Patch to enable using inbound/outbound filter on pppoe, isdn, etc.
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_ppp.patch
cd $(DIR_APP) && ./configure --prefix=/usr --disable-can
# compile static and shared version as Makefile does not support
# to install headers without static lib
Added: ipcop/trunk/src/patches/libpcap-1.2.0_ppp.patch
===================================================================
--- ipcop/trunk/src/patches/libpcap-1.2.0_ppp.patch
(rev 0)
+++ ipcop/trunk/src/patches/libpcap-1.2.0_ppp.patch 2011-11-30 12:41:59 UTC
(rev 6142)
@@ -0,0 +1,12 @@
+fixes: error in active-filter expression
+because inbound/outbound not supported on linktype (pppd, ipppd)
+--- a/gencode.c.old 2004-06-21 19:43:24.611308762 +0100
++++ a/gencode.c 2004-06-21 19:43:34.851140716 +0100
+@@ -7617,6 +7617,7 @@
+ */
+ switch (linktype) {
+ case DLT_SLIP:
++ case DLT_PPP:
+ b0 = gen_relation(BPF_JEQ,
+ gen_load(Q_LINK, gen_loadi(0), 1),
+ gen_loadi(0),
Modified: ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3
===================================================================
--- ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-29 12:54:50 UTC
(rev 6141)
+++ ipcop/trunk/updates/2.0.3/ROOTFILES.i486-2.0.3 2011-11-30 12:41:59 UTC
(rev 6142)
@@ -42,6 +42,11 @@
/usr/share/kbd/consolefonts/viscii10-8x16.psfu.gz
/usr/share/kbd/keymaps/i386/dvorak/dvorak-ru.map.gz
##
+## libpcap-1.2.0
+/usr/lib/libpcap.so
+/usr/lib/libpcap.so.1
+/usr/lib/libpcap.so.1.2.0
+##
## linux-2.6.32-6 (2.6.32.49)
/boot/vmlinuz
/boot/vmlinuz-2.6.32-6
Modified: ipcop/trunk/updates/2.0.3/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.3/information.xml 2011-11-29 12:54:50 UTC (rev
6141)
+++ ipcop/trunk/updates/2.0.3/information.xml 2011-11-30 12:41:59 UTC (rev
6142)
@@ -8,7 +8,7 @@
Fix _builtin___strncat_chk might overflow in
usb-modemswitch-1.2.0.<br />
Language updates.<br />
Upgrade acpid to 2.0.13, bash to 4.2.20, diffutils to 3.2,
- kbd to 1.15.3, kernel to 2.6.32.49,
+ kbd to 1.15.3, kernel to 2.6.32.49, libpcap to 1.2.0,
smartmontools to 5.42, Solos PCI to 1.03.
</description>
<previousversion>2.0.2</previousversion>
Modified: ipcop/trunk/updates/2.0.3/setup
===================================================================
--- ipcop/trunk/updates/2.0.3/setup 2011-11-29 12:54:50 UTC (rev 6141)
+++ ipcop/trunk/updates/2.0.3/setup 2011-11-30 12:41:59 UTC (rev 6142)
@@ -62,7 +62,7 @@
/usr/local/bin/upgrade.sh
# Remove old libraries (version specific)
-# /bin/rm -f .....
+/bin/rm -f /usr/lib/libpcap.so.1.2.0
# For new shared libs. May not always be required, but makes sure we do not
forget
/sbin/ldconfig
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
