summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2004-09-22 14:59:28 +0000
committerSimon Stelling <blubb@gentoo.org>2004-09-22 14:59:28 +0000
commit1ce3bcddcd36b590f27946c4ea5178784ba32370 (patch)
tree93a4e38dbfeb49b52178e7ac4b849c3a8ee7237f /net-wireless
parentstable on x86, fixes some nasty rendering bugs in khtml (Manifest recommit) (diff)
downloadgentoo-2-1ce3bcddcd36b590f27946c4ea5178784ba32370.tar.gz
gentoo-2-1ce3bcddcd36b590f27946c4ea5178784ba32370.tar.bz2
gentoo-2-1ce3bcddcd36b590f27946c4ea5178784ba32370.zip
amd64-fix (#64879)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/airtraf/ChangeLog5
-rw-r--r--net-wireless/airtraf/airtraf-1.0.ebuild14
-rw-r--r--net-wireless/airtraf/files/airtraf-amd64.patch58
3 files changed, 74 insertions, 3 deletions
diff --git a/net-wireless/airtraf/ChangeLog b/net-wireless/airtraf/ChangeLog
index bcdf79d140f4..adfa17b958c9 100644
--- a/net-wireless/airtraf/ChangeLog
+++ b/net-wireless/airtraf/ChangeLog
@@ -1,6 +1,9 @@
# 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.5 2004/09/03 15:12:57 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/ChangeLog,v 1.6 2004/09/22 14:59:28 blubb Exp $
+
+ 22 Sep 2004; <blubb@gentoo.org> airtraf-1.0.ebuild:
+ added Aris Adamantiadis' amd64-fix (#64879).
03 Sep 2004; David Holm <dholm@gentoo.org> airtraf-1.0.ebuild:
Added to ~ppc.
diff --git a/net-wireless/airtraf/airtraf-1.0.ebuild b/net-wireless/airtraf/airtraf-1.0.ebuild
index 3c056f20d4f5..3b3ae74bd68b 100644
--- a/net-wireless/airtraf/airtraf-1.0.ebuild
+++ b/net-wireless/airtraf/airtraf-1.0.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2004 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.7 2004/09/03 15:12:57 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/airtraf/airtraf-1.0.ebuild,v 1.8 2004/09/22 14:59:28 blubb Exp $
+
+inherit eutils
DESCRIPTION="AirTraf 802.11b Wireless traffic sniffer"
HOMEPAGE="http://www.elixar.com/"
@@ -10,10 +12,18 @@ IUSE=""
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64"
DEPEND=">=net-libs/libpcap-0.7.1"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ if use amd64 ; then
+ epatch ${FILESDIR}/${PN}-amd64.patch
+ fi
+}
+
src_compile() {
cd ${S}/src
diff --git a/net-wireless/airtraf/files/airtraf-amd64.patch b/net-wireless/airtraf/files/airtraf-amd64.patch
new file mode 100644
index 000000000000..508db5e8eede
--- /dev/null
+++ b/net-wireless/airtraf/files/airtraf-amd64.patch
@@ -0,0 +1,58 @@
+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~
+