8 files changed, 169 insertions, 58 deletions

diff --git a/net-mgmt/aircrack-ng/Makefile b/net-mgmt/aircrack-ng/Makefile
index c0ab5d18a60e..54d339b69d66 100644
--- a/net-mgmt/aircrack-ng/Makefile
+++ b/net-mgmt/aircrack-ng/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	aircrack-ng
+# New ports collection makefile for:	Aircrack-ng
 # Date created:				2006-05-25
 # Whom:					Lars Engels <lars.engels@0x20.net>
 #
@@ -6,60 +6,54 @@
 #
 
 PORTNAME=	aircrack-ng
-PORTVERSION=	0.9.3
-CATEGORIES=	net-mgmt
+DISTVERSION=	1.0-rc1
+CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://download.aircrack-ng.org/ \
 		http://bsd-geek.de/FreeBSD/distfiles/
 
 MAINTAINER=	lme@FreeBSD.org
-COMMENT=	Aircrack-ng is the next generation of aircrack with new features
-
-ALL_TARGET=	aircrack-ng airdecap-ng packetforge-ng ivstools kstats makeivs \
-		airodump-ng airtun-ng
-PLIST_FILES=	bin/aircrack-ng bin/airdecap-ng bin/packetforge-ng bin/ivstools \
-		bin/kstats bin/makeivs sbin/airodump-ng sbin/airtun-ng
+COMMENT=	An 802.11 WEP and WPA-PSK keys cracking program
 
+USE_GMAKE=	yes
+USE_OPENSSL=	yes
 SUB_FILES=	pkg-message
 
-MAN1=		aircrack-ng.1 airdecap-ng.1 packetforge-ng.1 ivstools.1 \
-		makeivs.1 airodump-ng.1 airtun-ng.1 kstats.1
-.include <bsd.port.pre.mk>
+MAN1=		aircrack-ng.1 airdriver-ng.1 airdecap-ng.1 aireplay-ng.1 \
+		airodump-ng.1 airolib-ng.1 airmon-ng.1 airsev-ng.1 \
+		airtun-ng.1 buddy-ng.1 easside-ng.1 ivstools.1 kstats.1 \
+		makeivs-ng.1 packetforge-ng.1 wesside-ng.1
 
-.if ${OSVERSION} < 600000
-BROKEN=		does not compile
-.endif
+OPTIONS=	SQLITE	"Use SQLite for storing pre-computed key tables" off
+
+.include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700000
-ALL_TARGET+=	aireplay-ng
-PLIST_FILES+=	sbin/aireplay-ng
-MAN1+=		aireplay-ng.1
+.if defined(WITH_SQLITE)
+USE_SQLITE=	yes
+MAKE_ARGS+=	SQLITE=true
+PLIST_SUB+=	SQLITE=""
+.else
+PLIST_SUB+=	SQLITE="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|/usr/local|${PREFIX}|g' \
-		-e 's|-lpthread|${PTHREAD_LIBS}|g;' \
-		-e '/^CC/d;' \
+		-e 's|= /usr/local|= ${PREFIX}|' \
+		-e 's|-I/usr/local|-I${LOCALBASE}|' \
+		-e 's|^CC[[:blank:]]*|&?|' \
+		-e 's|^RANLIB[[:blank:]]*|&?|' \
+		-e 's|^AR[[:blank:]]*|&?|' \
+			${WRKSRC}/common.mak
+# Do not install scripts (Linux-specific)
+	@${REINPLACE_CMD} \
+		-e '/$$(SCRIPTS)/d' \
 			${WRKSRC}/Makefile
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/aircrack-ng ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/airdecap-ng ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/packetforge-ng ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/ivstools ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/kstats ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/makeivs ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/airodump-ng ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/airtun-ng ${PREFIX}/sbin
-.if ${OSVERSION} >= 700000
-	${INSTALL_PROGRAM} ${WRKSRC}/aireplay-ng ${PREFIX}/sbin
-.endif
-
-.for manpage in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/manpages/${manpage} ${PREFIX}/man/man1
-.endfor
+	@${REINPLACE_CMD} \
+		-e 's|-lpthread|${PTHREAD_LIBS}|' \
+			${WRKSRC}/src/Makefile
 
 post-install:
-	${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/aircrack-ng/distinfo b/net-mgmt/aircrack-ng/distinfo
index b655233f2091..ea12b295d689 100644
--- a/net-mgmt/aircrack-ng/distinfo
+++ b/net-mgmt/aircrack-ng/distinfo
@@ -1,3 +1,3 @@
-MD5 (aircrack-ng-0.9.3.tar.gz) = f37fdb000d8bad77da6a0a43bc2ef67a
-SHA256 (aircrack-ng-0.9.3.tar.gz) = 71bca53eae0261d5bdd72e4363f43f5a6e40b2375dc4852a4029a061c789da58
-SIZE (aircrack-ng-0.9.3.tar.gz) = 1031441
+MD5 (aircrack-ng-1.0-rc1.tar.gz) = 113f0be4a2454f5c73cec25412b20f64
+SHA256 (aircrack-ng-1.0-rc1.tar.gz) = 220a72aaf00ffb80095c6968a4f9f1399507d483fa08a7f4248c101c60a469f3
+SIZE (aircrack-ng-1.0-rc1.tar.gz) = 1208442
diff --git a/net-mgmt/aircrack-ng/files/patch-src_airserv-ng.c b/net-mgmt/aircrack-ng/files/patch-src_airserv-ng.c
new file mode 100644
index 000000000000..6d96537449cd
--- /dev/null
+++ b/net-mgmt/aircrack-ng/files/patch-src_airserv-ng.c
@@ -0,0 +1,18 @@
+--- src/airserv-ng.c.orig	2008-06-10 02:55:09.000000000 +0700
++++ src/airserv-ng.c	2008-08-11 13:39:46.000000000 +0700
+@@ -37,6 +37,15 @@
+ 
+ #ifdef __MACH__
+ #include <libkern/OSByteOrder.h>
++#elif defined(__FreeBSD__)
++#include <machine/endian.h>
++#if BYTE_ORDER == BIG_ENDIAN
++# define __cpu_to_be32(x)	(x)
++# define __cpu_to_be64(x)	(x)
++#elif BYTE_ORDER == LITTLE_ENDIAN
++# define __cpu_to_be32(x)	__bswap32(x)
++# define __cpu_to_be64(x)	__bswap64(x)
++#endif
+ #else
+ #include <asm/byteorder.h>
+ #endif /* __MACH__ */
diff --git a/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c b/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c
new file mode 100644
index 000000000000..c8be15f6e9a8
--- /dev/null
+++ b/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c
@@ -0,0 +1,65 @@
+--- src/osdep/freebsd.c.orig	2008-06-10 02:55:09.000000000 +0700
++++ src/osdep/freebsd.c	2008-08-11 20:01:53.000000000 +0700
+@@ -53,7 +53,9 @@
+ 	unsigned char			pf_buf[4096];
+ 	unsigned char			*pf_next;
+ 	int				pf_totlen;
++#if __FreeBSD_version > 700018
+         struct ieee80211_bpf_params	pf_txparams;
++#endif
+ 
+ 	/* setchan */
+ 	int				pf_s;
+@@ -280,13 +282,16 @@
+ static int fbsd_write(struct wif *wi, unsigned char *h80211, int len,
+ 		      struct tx_info *ti)
+ {
++#if __FreeBSD_version > 700018
+         struct iovec iov[2];
++#endif
+ 	struct priv_fbsd *pf = wi_priv(wi);
+ 	int rc;
+ 
+ 	/* XXX make use of ti */
+ 	if (ti) {}
+ 
++#if __FreeBSD_version > 700018
+ 	iov[0].iov_base = &pf->pf_txparams;
+ 	iov[0].iov_len = pf->pf_txparams.ibp_len;
+ 
+@@ -294,12 +299,19 @@
+         iov[1].iov_len = len;
+ 
+ 	rc = writev(pf->pf_fd, iov, 2);
++#else
++	rc = write(pf->pf_fd, h80211, len);
++#endif
+ 	if (rc == -1)
+ 		return rc;
++#if __FreeBSD_version > 700018
+ 	if (rc < (int) iov[0].iov_len)
+ 		return 0;
+ 
+ 	return rc - iov[0].iov_len;
++#else
++	return 0;
++#endif
+ }
+ 
+ static int fbsd_set_channel(struct wif *wi, int chan)
+@@ -542,6 +554,7 @@
+ 	/* setup private state */
+ 	pf = wi_priv(wi);
+ 	pf->pf_fd = fd;
++#if __FreeBSD_version > 700018
+         pf->pf_txparams.ibp_vers = IEEE80211_BPF_VERSION;
+ 	pf->pf_txparams.ibp_len = sizeof(struct ieee80211_bpf_params) - 6;
+ 	pf->pf_txparams.ibp_rate1 = 2;         /* 1 MB/s XXX */
+@@ -549,6 +562,7 @@
+ 	pf->pf_txparams.ibp_flags = IEEE80211_BPF_NOACK;
+ 	pf->pf_txparams.ibp_power = 100;       /* nominal max */
+ 	pf->pf_txparams.ibp_pri = WME_AC_VO;   /* high priority */
++#endif
+ 
+ 	return wi;
+ }
diff --git a/net-mgmt/aircrack-ng/files/patch-src_osdep_network.c b/net-mgmt/aircrack-ng/files/patch-src_osdep_network.c
new file mode 100644
index 000000000000..6b89aa1cc639
--- /dev/null
+++ b/net-mgmt/aircrack-ng/files/patch-src_osdep_network.c
@@ -0,0 +1,18 @@
+--- src/osdep/network.c.orig	2008-06-10 02:55:09.000000000 +0700
++++ src/osdep/network.c	2008-08-11 13:29:42.000000000 +0700
+@@ -32,6 +32,15 @@
+ 
+ #ifdef __MACH__ 
+ #include <libkern/OSByteOrder.h>
++#elif defined(__FreeBSD__)
++#include <machine/endian.h>
++#if BYTE_ORDER == BIG_ENDIAN
++# define __be32_to_cpu(x)	(x)
++# define __be64_to_cpu(x)	(x)
++#elif BYTE_ORDER == LITTLE_ENDIAN
++# define __be32_to_cpu(x)	__bswap32(x)
++# define __be64_to_cpu(x)	__bswap64(x)
++#endif
+ #else
+ #include <asm/byteorder.h>
+ #endif /* __MACH__ */
diff --git a/net-mgmt/aircrack-ng/files/pkg-message.in b/net-mgmt/aircrack-ng/files/pkg-message.in
index db5f384772ca..8385164f3c6b 100644
--- a/net-mgmt/aircrack-ng/files/pkg-message.in
+++ b/net-mgmt/aircrack-ng/files/pkg-message.in
@@ -1,11 +1,13 @@
-===============================================================================
+==============================================================================
 
-In contrast to Linux it is not necessary to use airmon-ng to enable the monitor
-mode of your wireless card. So do not care about what the manpages say about
-airmon-ng. airodump-ng sets monitor mode automatically.
-To return from monitor mode use:
-ifconfig ${INTERFACE} -mediaopt monitor
+Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor
+mode of your wireless card.  So do not care about what the manpages say about
+airmon-ng, airodump-ng sets monitor mode automatically.
 
-For aireplay-ng you need FreeBSD >= 7.0
+To return from monitor mode, issue the following command:
 
-===============================================================================
+	ifconfig ${INTERFACE} -mediaopt monitor
+
+For aireplay-ng you need FreeBSD >= 7.0.
+
+==============================================================================
diff --git a/net-mgmt/aircrack-ng/pkg-descr b/net-mgmt/aircrack-ng/pkg-descr
index 2ff78d410dbe..86dfe5b3b959 100644
--- a/net-mgmt/aircrack-ng/pkg-descr
+++ b/net-mgmt/aircrack-ng/pkg-descr
@@ -1,9 +1,8 @@
-aircrack is an 802.11 WEP and WPA-PSK keys cracking program that can 
-recover this keys once enough encrypted packets have been captured. 
-It implements the standard FMS attack along with some optimizations 
-like KoreK attacks, thus making the attack much faster compared to 
-other WEP cracking tools. In fact aircrack is a set of tools for 
+Aircrack-ng is an 802.11 WEP and WPA-PSK keys cracking program that can
+recover keys once enough data packets have been captured.  It implements the
+standard FMS attack along with some optimizations like KoreK attacks, as
+well as the all-new PTW attack, thus making the attack much faster compared
+to other WEP cracking tools.  In fact, Aircrack-ng is a set of tools for
 auditing wireless networks.
 
-Author:	Thomas d'Otreppe
-WWW:	http://www.aircrack-ng.org/doku.php
+WWW: http://www.aircrack-ng.org/
diff --git a/net-mgmt/aircrack-ng/pkg-plist b/net-mgmt/aircrack-ng/pkg-plist
new file mode 100644
index 000000000000..6eed26cd360e
--- /dev/null
+++ b/net-mgmt/aircrack-ng/pkg-plist
@@ -0,0 +1,15 @@
+bin/aircrack-ng
+bin/airdecap-ng
+%%SQLITE%%bin/airolib-ng
+bin/buddy-ng
+bin/ivstools
+bin/kstats
+bin/makeivs-ng
+bin/packetforge-ng
+sbin/airbase-ng
+sbin/aireplay-ng
+sbin/airodump-ng
+sbin/airserv-ng
+sbin/airtun-ng
+sbin/easside-ng
+sbin/wesside-ng