Combined patches from amd64 and bug #73313

7 files changed, 98 insertions, 75 deletions

diff --git a/net-wireless/airtraf/ChangeLog b/net-wireless/airtraf/ChangeLog
index cbf3c621f601..949af4fdcfb9 100644
--- a/net-wireless/airtraf/ChangeLog
+++ b/net-wireless/airtraf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/airtraf
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/ChangeLog,v 1.7 2004/10/28 23:49:27 dragonheart Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/ChangeLog,v 1.8 2005/01/12 09:58:25 dragonheart Exp $
+
+  12 Jan 2005; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
+  -files/airtraf-amd64.patch, +files/airtraf.patch, airtraf-1.1.ebuild:
+  Combined patches from amd64 and bug #73313 to solve bug #73313. Thanks to
+  Peter K. Lee <saint@corenova.com>.
 
 *airtraf-1.1 (29 Oct 2004)
 
diff --git a/net-wireless/airtraf/Manifest b/net-wireless/airtraf/Manifest
index 13e8d87fb188..034cb855d5de 100644
--- a/net-wireless/airtraf/Manifest
+++ b/net-wireless/airtraf/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b7860faee4c1bbc99844f48c18586a8f ChangeLog 874
-MD5 4f6b8e3e1674ac1ff65889ccd4cc7f98 airtraf-1.0.ebuild 1046
-MD5 a3379fb1c95360c11abe5ed7d76b26a4 airtraf-1.1.ebuild 1047
+MD5 d8569f201be650b53c6f537446271b21 ChangeLog 1128
+MD5 fca26c9992e303bc522c26cd71219105 airtraf-1.0.ebuild 1047
+MD5 20caee7487eabf37daa6c83d3bf13a7f airtraf-1.1.ebuild 1015
+MD5 7709ff5e9d567a780263e953728c7c6f metadata.xml 662
+MD5 740088b3171d11034ceca32ba2b02053 files/airtraf.patch 2302
 MD5 92f9aeb2621275bceb1c4707f6530049 files/digest-airtraf-1.0 63
-MD5 7753e78fafa0ea42690623c8e2618b2f files/airtraf-amd64.patch 1485
 MD5 630d7e86dcfce40f96fdf3f3db7a45df files/digest-airtraf-1.1 63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBgYWSmdTrptrqvGERApa3AJ9n4mNag78CAC+du0cOCkG5VOyUfACeODSM
-CGnxrSUopTH5UCY5uJjmbHA=
-=GuvU
+iD8DBQFB5PTImdTrptrqvGERAoblAKCEzk9zxNy6165mWvJI9ax+dwyg6QCgmsjA
+GytJ6Kw5brLgVm4MPBhu3Dw=
+=NoKf
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/airtraf/airtraf-1.0.ebuild b/net-wireless/airtraf/airtraf-1.0.ebuild
index 6d7d668f3684..4b72cd13ff06 100644
--- a/net-wireless/airtraf/airtraf-1.0.ebuild
+++ b/net-wireless/airtraf/airtraf-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.0.ebuild,v 1.9 2004/10/28 23:49:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.0.ebuild,v 1.10 2005/01/12 09:58:25 dragonheart Exp $
 
 inherit eutils  toolchain-funcs
 
diff --git a/net-wireless/airtraf/airtraf-1.1.ebuild b/net-wireless/airtraf/airtraf-1.1.ebuild
index 20758472b809..ffa503219eb5 100644
--- a/net-wireless/airtraf/airtraf-1.1.ebuild
+++ b/net-wireless/airtraf/airtraf-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.1.ebuild,v 1.1 2004/10/28 23:49:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.1.ebuild,v 1.2 2005/01/12 09:58:25 dragonheart Exp $
 
 inherit eutils  toolchain-funcs
 
@@ -19,9 +19,7 @@ DEPEND=">=net-libs/libpcap-0.7.1"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	if use amd64 ; then
-		epatch ${FILESDIR}/${PN}-amd64.patch
-	fi
+	epatch ${FILESDIR}/${PN}.patch
 }
 
 src_compile() {
diff --git a/net-wireless/airtraf/files/airtraf-amd64.patch b/net-wireless/airtraf/files/airtraf-amd64.patch
deleted file mode 100644
index 508db5e8eede..000000000000
--- a/net-wireless/airtraf/files/airtraf-amd64.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ur airtraf-1.0/src/sniffd/autoconfig.c 
-airtraf-1.0-r1/src/sniffd/autoconfig.c
---- airtraf-1.0/src/sniffd/autoconfig.c	2002-11-21 07:13:47.000000000 
-+0100
-+++ airtraf-1.0-r1/src/sniffd/autoconfig.c	2004-09-21 
-22:17:02.641477344 +0200
-@@ -358,7 +358,7 @@
- int check_drv_compat(char * drvname, int * id)
- {
-   int i;
--  for (i=0; (int) compat_drivers[i] != -1; i++){
-+  for (i=0; (long) compat_drivers[i] != -1; i++){
-     if (!strncmp(compat_drivers[i], drvname, DRVNAMSIZ +1)){
-       *id = i;
-       return (1); // just true...
-@@ -490,6 +490,7 @@
- 
-   /* Close the socket. */
-   close(skfd);
-+  return 0;
- }
- 
- /**
-@@ -701,7 +702,7 @@
-       }
-       break;
-     case DRV_PRISM2:
--
-+	break;
- 	
-     }
-   }
-diff -ur airtraf-1.0/src/sniffd/server.c 
-airtraf-1.0-r1/src/sniffd/server.c
---- airtraf-1.0/src/sniffd/server.c	2002-11-21 07:13:47.000000000 
-+0100
-+++ airtraf-1.0-r1/src/sniffd/server.c	2004-09-21 22:19:18.625804584 
-+0200
-@@ -57,7 +57,7 @@
- 
- int process_command(int, char *);
- int issue_get_cmd(int, char *);
--int send_bss_info(int);
-+ssize_t send_bss_info(int);
- int send_ids_info(int);
- 
- /*=============================================================*/
-@@ -143,7 +143,7 @@
-       if (DEBUG) fprintf(stderr,"Error transmitting data\n");
-     }
-   } while (write_len == 0);
--  if (DEBUG) fprintf(stderr,"Data: %d bytes sent\n",length);
-+  if (DEBUG) fprintf(stderr,"Data: %ld bytes sent\n",length);
- }
- 
- /**
-Seulement dans airtraf-1.0-r1/src/sniffd: server.c~
-
diff --git a/net-wireless/airtraf/files/airtraf.patch b/net-wireless/airtraf/files/airtraf.patch
new file mode 100644
index 000000000000..f4acfcd515ac
--- /dev/null
+++ b/net-wireless/airtraf/files/airtraf.patch
@@ -0,0 +1,63 @@
+diff -ru airtraf-1.1.orig/src/sniffd/autoconfig.c airtraf-1.1/src/sniffd/autoconfig.c
+--- airtraf-1.1.orig/src/sniffd/autoconfig.c	2003-01-24 10:11:36.000000000 +0930
++++ airtraf-1.1/src/sniffd/autoconfig.c	2005-01-12 19:23:16.481439336 +0930
+@@ -360,7 +360,7 @@
+ int check_drv_compat(char * drvname, int * id)
+ {
+   int i;
+-  for (i=0; (int) compat_drivers[i] != -1; i++){
++  for (i=0; (long) compat_drivers[i] != -1; i++){
+     if (!strncmp(compat_drivers[i], drvname, DRVNAMSIZ +1)){
+       *id = i;
+       return (1); // just true...
+@@ -525,6 +525,7 @@
+   }
+   /* Close the socket. */
+   close(skfd);
++  return 0;
+ }
+ 
+ /**
+@@ -772,7 +773,7 @@
+       fclose(fh);
+       break;
+     case DRV_PRISM2:
+-      
++      break;
+ 	
+     }
+     /* update flag take off PROMISC */
+Only in airtraf-1.1/src/sniffd: autoconfig.c.orig
+diff -ru airtraf-1.1.orig/src/sniffd/gui_channel_scan.c airtraf-1.1/src/sniffd/gui_channel_scan.c
+--- airtraf-1.1.orig/src/sniffd/gui_channel_scan.c	2003-01-22 13:05:01.000000000 +0930
++++ airtraf-1.1/src/sniffd/gui_channel_scan.c	2005-01-12 19:21:33.135876552 +0930
+@@ -384,7 +384,7 @@
+ 	    if (!beep()) flash();
+ 	    wattrset(statuswin, STDATTR);
+ 	    snprintf(message,100,"Detected new network '%s' (%s) on Channel %02d",
+-		     ((strlen(ap->ssid)==1)&&(!strncmp(" ",ap->ssid,1))) ? "<cloaked>" : ap->ssid,
++		     ((strlen(ap->ssid)==1)&&(!strncmp(" ",(char *)ap->ssid,1))) ? "<cloaked>" : (char *)ap->ssid,
+ 		     hexdump((__u8*)&ap->bssid,6), ap->channel);
+ 	    print_status_msg(statuswin, location, message);
+ 	    ap->status = AP_STATUS_ACTIVE;
+diff -ru airtraf-1.1.orig/src/sniffd/server.c airtraf-1.1/src/sniffd/server.c
+--- airtraf-1.1.orig/src/sniffd/server.c	2003-01-22 13:05:01.000000000 +0930
++++ airtraf-1.1/src/sniffd/server.c	2005-01-12 19:21:33.135876552 +0930
+@@ -57,7 +57,7 @@
+ 
+ int process_command(int, char *);
+ int issue_get_cmd(int, char *);
+-int send_bss_info(int);
++ssize_t send_bss_info(int);
+ int send_ids_info(int);
+ 
+ /*=============================================================*/
+@@ -143,7 +143,7 @@
+       if (DEBUG) fprintf(stderr,"Error transmitting data\n");
+     }
+   } while (write_len == 0);
+-  if (DEBUG) fprintf(stderr,"Data: %d bytes sent\n",length);
++  if (DEBUG) fprintf(stderr,"Data: %ld bytes sent\n",length);
+ }
+ 
+ /**
diff --git a/net-wireless/airtraf/metadata.xml b/net-wireless/airtraf/metadata.xml
new file mode 100644
index 000000000000..0e5eea105b42
--- /dev/null
+++ b/net-wireless/airtraf/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+<maintainer>
+  <email>net-mon@gentoo.org</email>
+    <name>Netmon herd</name>
+</maintainer>
+<longdescription>AirTraf 1.0 is a wireless sniffer that can detect and determine exactly 
+what is being transmitted over 802.11 wireless networks. This open-source program tracks 
+and identifies legitimate and rogue access points, keeps performance statistics on a 
+by-user and by-protocol basis, measures the signal strength of network components, and 
+more. Do you want to capture the sky? </longdescription>
+</pkgmetadata>