X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Flibpcap%2Fpatches%2F102-alt-ether.patch;h=e9cc15ff36a6d84fa98d38989c7eee179e5e39aa;hb=39b8ede1e7d866cd1d82ef1babc53d2eacdb5a26;hp=347265d6e913a0ac4d9ab1779652a3de538f721c;hpb=a8f632da6583439bddf8b41341f2d4f51ae884bb;p=openwrt-10.03%2F.git

diff --git a/package/libpcap/patches/102-alt-ether.patch b/package/libpcap/patches/102-alt-ether.patch
index 347265d6e..e9cc15ff3 100644
--- a/package/libpcap/patches/102-alt-ether.patch
+++ b/package/libpcap/patches/102-alt-ether.patch
@@ -1,6 +1,5 @@
-diff -urN libpcap-0.9.4.orig/nametoaddr.c libpcap-0.9.4/nametoaddr.c
---- libpcap-0.9.4.orig/nametoaddr.c	2005-04-20 13:13:51.000000000 +0200
-+++ libpcap-0.9.4/nametoaddr.c	2006-02-05 16:58:46.000000000 +0100
+--- a/nametoaddr.c
++++ b/nametoaddr.c
 @@ -410,7 +410,7 @@
  	e = ep = (u_char *)malloc(6);
  
@@ -10,18 +9,17 @@ diff -urN libpcap-0.9.4.orig/nametoaddr.c libpcap-0.9.4/nametoaddr.c
  			s += 1;
  		d = xdtoi(*s++);
  		if (isxdigit((unsigned char)*s)) {
-diff -urN libpcap-0.9.4.orig/scanner.l libpcap-0.9.4/scanner.l
---- libpcap-0.9.4.orig/scanner.l	2005-09-05 11:08:07.000000000 +0200
-+++ libpcap-0.9.4/scanner.l	2006-02-05 17:00:13.000000000 +0100
+--- a/scanner.l
++++ b/scanner.l
 @@ -80,6 +80,7 @@
  N		([0-9]+|(0X|0x)[0-9A-Fa-f]+)
  B		([0-9A-Fa-f][0-9A-Fa-f]?)
  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
-@@ -306,7 +307,7 @@
+ %a 18400
+ %o 21500
+@@ -310,7 +311,7 @@
  {N}			{ yylval.i = stoi((char *)yytext); return NUM; }
  ({N}\.{N})|({N}\.{N}\.{N})|({N}\.{N}\.{N}\.{N})	{
  			yylval.s = sdup((char *)yytext); return HID; }
@@ -30,7 +28,7 @@ diff -urN libpcap-0.9.4.orig/scanner.l libpcap-0.9.4/scanner.l
  			  return EID; }
  {V6}			{
  #ifdef INET6
-@@ -324,6 +325,7 @@
+@@ -328,6 +329,7 @@
  #endif /*INET6*/
  			}
  {B}:+({B}:+)+		{ bpf_error("bogus ethernet address %s", yytext); }