Hey All;
Here's a quick patch to update to bring libpcap 0.9.4 up to libpcap-0.9.8 .
The only wrinkle is that libpcap-0.9.8 as distributed by tcpdump.org has
a rejected patch file in it "gencode.c.rej" . Thus the Build/Prepare strips
it out if it's there.
Signed-off-by:Darren Lissimore <darren @ byresecurity.com>
patch generated via svn diff from rev 10934
Darren
------------------------------------------------------------------------------
D. Lissimore Office: 250-390-1333
Byres Security PGP Key available upon request
------------------------------------------------------------------------------
Index: package/libpcap/patches/102-alt-ether.patch
===================================================================
--- package/libpcap/patches/102-alt-ether.patch (revision 10933)
+++ package/libpcap/patches/102-alt-ether.patch (working copy)
@@ -21,8 +21,8 @@
W ([0-9A-Fa-f][0-9A-Fa-f]?[0-9A-Fa-f]?[0-9A-Fa-f]?)
+X [0-9A-Fa-f]
- %a 16000
- %o 19000
+ %a 18400
+ %o 21500
@@ -306,7 +307,7 @@
{N} { yylval.i = stoi((char *)yytext); return NUM; }
({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N}) {
Index: package/libpcap/patches/100-shared-lib.patch
===================================================================
--- package/libpcap/patches/100-shared-lib.patch (revision 10933)
+++ package/libpcap/patches/100-shared-lib.patch (working copy)
@@ -7,8 +7,8 @@
VPATH = @srcdir@
+# some defines for shared library compilation
-+MAJ=0.9
-+MIN=4
++MAJ:=0.9
++MIN:=4
+VERSION=$(MAJ).$(MIN)
+LIBNAME=pcap
+LIBRARY=lib$(LIBNAME).a
Index: package/libpcap/Makefile
===================================================================
--- package/libpcap/Makefile (revision 10933)
+++ package/libpcap/Makefile (working copy)
@@ -8,13 +8,16 @@
include $(TOPDIR)/rules.mk
+MAJ=0.9
+MIN=8
+
PKG_NAME:=libpcap
-PKG_VERSION:=0.9.4
+PKG_VERSION:=$(MAJ).$(MIN)
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.tcpdump.org/release/
-PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974
+PKG_MD5SUM:=5208f24d0328ee7c20b52c43eaa9aa0e
include $(INCLUDE_DIR)/package.mk
@@ -38,10 +41,19 @@
--with-build-cc="$(HOSTCC)" \
--with-pcap=linux
+define Build/Prepare
+ gunzip $(TOPDIR)/dl/$(PKG_SOURCE)
+#Remoove the dam .rej file if it's there otherwise carry on
+ tar --delete --file=$(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION).tar
"libpcap-0.9.8/./gencode.c.rej" || true
+ gzip $(TOPDIR)/dl/$(PKG_NAME)-$(PKG_VERSION).tar
+ $(call Build/Prepare/Default)
+endef
+
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \
DESTDIR="$(PKG_INSTALL_DIR)" \
+ MAJ=$(MAJ) MIN=$(MIN) \
all install
endef
_______________________________________________
openwrt-devel mailing list
[email protected]
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
