From: <ow...@us...> - 2012-07-28 12:30:20
|
Revision: 6719 http://ipcop.svn.sourceforge.net/ipcop/?rev=6719&view=rev Author: owes Date: 2012-07-28 12:30:14 +0000 (Sat, 28 Jul 2012) Log Message: ----------- Update libpcap to 1.3.0. Update tcpdump to 4.3.0. Modified Paths: -------------- ipcop/trunk/config/rootfiles/common/libpcap ipcop/trunk/lfs/libpcap ipcop/trunk/lfs/tcpdump ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 ipcop/trunk/updates/2.1.0/information.xml ipcop/trunk/updates/2.1.0/setup Added Paths: ----------- ipcop/trunk/src/patches/libpcap-1.3.0_ppp.patch Removed Paths: ------------- ipcop/trunk/src/patches/libpcap-1.2.1_ppp.patch Modified: ipcop/trunk/config/rootfiles/common/libpcap =================================================================== --- ipcop/trunk/config/rootfiles/common/libpcap 2012-07-28 07:08:06 UTC (rev 6718) +++ ipcop/trunk/config/rootfiles/common/libpcap 2012-07-28 12:30:14 UTC (rev 6719) @@ -14,7 +14,7 @@ #usr/lib/libpcap.a #usr/lib/libpcap.so usr/lib/libpcap.so.1 -usr/lib/libpcap.so.1.2.1 +usr/lib/libpcap.so.1.3.0 #usr/share/man/man1/pcap-config.1 #usr/share/man/man3/pcap.3pcap #usr/share/man/man3/pcap_activate.3pcap Modified: ipcop/trunk/lfs/libpcap =================================================================== --- ipcop/trunk/lfs/libpcap 2012-07-28 07:08:06 UTC (rev 6718) +++ ipcop/trunk/lfs/libpcap 2012-07-28 12:30:14 UTC (rev 6719) @@ -33,7 +33,7 @@ include Config PKG_NAME = libpcap -VER = 1.2.1 +VER = 1.3.0 HOST_ARCH = all OTHER_SRC = yes @@ -53,7 +53,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 06046e0e81efc60566daf1cc96c77d46 +$(DL_FILE)_MD5 = f78455a92622b7a3c05c58b6ad1cec7e install : $(TARGET) @@ -82,7 +82,7 @@ $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(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 Modified: ipcop/trunk/lfs/tcpdump =================================================================== --- ipcop/trunk/lfs/tcpdump 2012-07-28 07:08:06 UTC (rev 6718) +++ ipcop/trunk/lfs/tcpdump 2012-07-28 12:30:14 UTC (rev 6719) @@ -33,7 +33,7 @@ include Config PKG_NAME = tcpdump -VER = 4.2.1 +VER = 4.3.0 HOST_ARCH = all OTHER_SRC = yes @@ -53,7 +53,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c202878c6db054767b52651041b9e60e +$(DL_FILE)_MD5 = a3fe4d30ac85ff5467c889ff46b7e1e8 install : $(TARGET) @@ -82,7 +82,7 @@ $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE) # force ipv6 as autodetection could fail (at least on centos-5.5 2.6.18 kernel) cd $(DIR_APP) && ./configure --prefix=/usr --disable-smb --enable-ipv6 cd $(DIR_APP) && make -j $(PARALLELISM) Deleted: ipcop/trunk/src/patches/libpcap-1.2.1_ppp.patch =================================================================== --- ipcop/trunk/src/patches/libpcap-1.2.1_ppp.patch 2012-07-28 07:08:06 UTC (rev 6718) +++ ipcop/trunk/src/patches/libpcap-1.2.1_ppp.patch 2012-07-28 12:30:14 UTC (rev 6719) @@ -1,12 +0,0 @@ -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), Copied: ipcop/trunk/src/patches/libpcap-1.3.0_ppp.patch (from rev 6717, ipcop/trunk/src/patches/libpcap-1.2.1_ppp.patch) =================================================================== --- ipcop/trunk/src/patches/libpcap-1.3.0_ppp.patch (rev 0) +++ ipcop/trunk/src/patches/libpcap-1.3.0_ppp.patch 2012-07-28 12:30:14 UTC (rev 6719) @@ -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.1.0/ROOTFILES.i486-2.1.0 =================================================================== --- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-28 07:08:06 UTC (rev 6718) +++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-07-28 12:30:14 UTC (rev 6719) @@ -404,6 +404,10 @@ /usr/lib/libnl-genl-3.so.200 /usr/lib/libnl-genl-3.so.200.9.0 ## +## libpcap-1.3.0 +/usr/lib/libpcap.so.1 +/usr/lib/libpcap.so.1.3.0 +## ## libpng-1.5.12 /usr/lib/libpng15.so.15 /usr/lib/libpng15.so.15.12.0 @@ -707,6 +711,9 @@ /usr/lib/squid/errors /usr/lib/squid/errors.ipcop ## +## tcpdump-4.3.0 +/usr/sbin/tcpdump +## ## traceroute-2.018 /usr/sbin/traceroute /usr/sbin/traceroute6 Modified: ipcop/trunk/updates/2.1.0/information.xml =================================================================== --- ipcop/trunk/updates/2.1.0/information.xml 2012-07-28 07:08:06 UTC (rev 6718) +++ ipcop/trunk/updates/2.1.0/information.xml 2012-07-28 12:30:14 UTC (rev 6719) @@ -13,12 +13,12 @@ gmp to 5.0.5, gnupg to 1.4.12, grep to 2.13, gzip to 1.5, iproute2 to 3.4.0, iptables to 1.4.14, iptstate to 2.2.5, iw to 3.4 hdparm to 9.39, kernel to 3.0.38, krb5 to 1.10.2, libffi to 3.0.11, libgd to 2.0.36~rc1, libgcrypt to 1.5.0, libnet to 1.1.6, - libnetfiltercontrack to 1.0.1, libnl to 3.2.11, libpng to 1.5.12, + libnetfiltercontrack to 1.0.1, libnl to 3.2.11, libpcap to 1.3.0, libpng to 1.5.12, libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2 to 2.8.0, logrotate to 3.8.1, lsof to 4.86, net-tools to 1.60-p20120127084908, openldap to 2.4.31, openssh to 6.0, openssl to 1.0.1c, openswan to 2.6.38, pciutils to 3.1.10, pcre to 8.30, pixman to 0.24.4, procps to 3.3.3, psmisc to 22.19, rsyslog to 5.8.12, shadow to 4.1.5.1, sqlite to 3.7.13, squid to 3.1.20, squid-langpack to 20120616, - traceroute to 2.0.18, tzdata to 2012d, + tcpdump to 4.3.0, traceroute to 2.0.18, tzdata to 2012d, usb-modeswitch-data to 20120531, usbutils to 005, util-linux to 2.21.2, wanpipe to 3.5.25, zlib to 1.2.7, several Perl CPAN modules. <br /> <b>Mandatory reboot after upgrade.</b> Modified: ipcop/trunk/updates/2.1.0/setup =================================================================== --- ipcop/trunk/updates/2.1.0/setup 2012-07-28 07:08:06 UTC (rev 6718) +++ ipcop/trunk/updates/2.1.0/setup 2012-07-28 12:30:14 UTC (rev 6719) @@ -146,6 +146,7 @@ /bin/rm -f /usr/lib/libnetfilter_conntrack.so.3.2.0 /bin/rm -f /usr/lib/libnl-3.so.200.5.2 /bin/rm -f /usr/lib/libnl-genl-3.so.200.5.2 +/bin/rm -f /usr/lib/libpcap.so.1.2.1 /bin/rm -f /usr/lib/libpci.so.3.1.9 /bin/rm -f /usr/lib/libpcre.so.0.0.1 /bin/rm -f /usr/lib/libpixman-1.so.0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |