[Midnightbsd-cvs] mports [16737] trunk/net-mgmt/aircrack-ng: aircrack-ng 1.2-beta3
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 30 20:25:37 EDT 2014
Revision: 16737
http://svnweb.midnightbsd.org/mports/?rev=16737
Author: laffer1
Date: 2014-08-30 20:25:37 -0400 (Sat, 30 Aug 2014)
Log Message:
-----------
aircrack-ng 1.2-beta3
Modified Paths:
--------------
trunk/net-mgmt/aircrack-ng/Makefile
trunk/net-mgmt/aircrack-ng/distinfo
Added Paths:
-----------
trunk/net-mgmt/aircrack-ng/files/patch-src_crypto.h
trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h
trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c
trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h
trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c
Modified: trunk/net-mgmt/aircrack-ng/Makefile
===================================================================
--- trunk/net-mgmt/aircrack-ng/Makefile 2014-08-31 00:19:35 UTC (rev 16736)
+++ trunk/net-mgmt/aircrack-ng/Makefile 2014-08-31 00:25:37 UTC (rev 16737)
@@ -1,34 +1,31 @@
# $MidnightBSD$
PORTNAME= aircrack-ng
-DISTVERSION= 1.1
+DISTVERSION= 1.2-beta3
+PORTREVISION= 1
CATEGORIES= net-mgmt security
MASTER_SITES= http://download.aircrack-ng.org/ \
http://bsd-geek.de/FreeBSD/distfiles/
-MAINTAINER= ports at MidnightBSD.org
-COMMENT= An 802.11 WEP and WPA-PSK keys cracking program
+MAINTAINER= lme at FreeBSD.org
+COMMENT= 802.11 WEP and WPA-PSK keys cracking program
-LICENSE= gpl2
+LICENSE= gpl2 bsd3 apache2
+LICENSE_COMB= dual
-USE_GMAKE= yes
-MAKE_ARGS+= UNSTABLE=true # build some extra tools
+USES= gmake dos2unix
+DOS2UNIX_FILES= src/osdep/byteorder.h
+MAKE_ARGS= unstable=true libnl=false prefix=${PREFIX}
USE_OPENSSL= yes
SUB_FILES= pkg-message
-MAN1= airbase-ng.1 aircrack-ng.1 airdecap-ng.1 airdecloak-ng.1 \
- aireplay-ng.1 airodump-ng.1 airserv-ng.1 airtun-ng.1 \
- buddy-ng.1 easside-ng.1 ivstools.1 kstats.1 makeivs-ng.1 \
- packetforge-ng.1 tkiptun-ng.1 wesside-ng.1
+BIN_FILES= airdecloak-ng buddy-ng aircrack-ng airdecap-ng ivstools \
+ makeivs-ng packetforge-ng wpaclean kstats
+SBIN_FILES= airtun-ng besside-ng airbase-ng easside-ng airodump-ng \
+ aireplay-ng wesside-ng airserv-ng tkiptun-ng
-PLIST_FILES= bin/aircrack-ng bin/airdecap-ng bin/airdecloak-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/tkiptun-ng sbin/wesside-ng
-
OPTIONS_DEFINE= SQLITE
+OPTIONS_SUB= yes
SQLITE_DESC= Use SQLite for storing pre-computed key tables
.include <bsd.mport.options.mk>
@@ -36,20 +33,14 @@
.if ${PORT_OPTIONS:MSQLITE}
USE_SQLITE= yes
MAKE_ARGS+= SQLITE=true
-MAN1+= airolib-ng.1
-PLIST_FILES+= bin/airolib-ng
+BIN_FILES+= airolib-ng
.endif
-.if ${ARCH} == "sparc64" && ${OSVERSION} > 900000
-BROKEN= Does not compile on sparc64-9
-.endif
-
post-patch:
@${REINPLACE_CMD} \
- -e 's|= /usr/local|= ${PREFIX}|' \
-e 's|-I/usr/local|-I${LOCALBASE}|' \
+ -e 's|share/\(man/man[1-9]\)|\1|' \
-e 's|^CC[[:blank:]]*|&?|' \
- -e 's|^RANLIB[[:blank:]]*|&?|' \
-e 's|^AR[[:blank:]]*|&?|' \
${WRKSRC}/common.mak
# Do not install scripts (Linux-specific) and their manpages
@@ -63,4 +54,8 @@
-e 's|-lpthread|${PTHREAD_LIBS}|' \
${WRKSRC}/src/Makefile
+post-install:
+ @${STRIP_CMD} ${BIN_FILES:S,^,${PREFIX}/bin/,} \
+ ${SBIN_FILES:S,^,${PREFIX}/sbin/,}
+
.include <bsd.port.mk>
Modified: trunk/net-mgmt/aircrack-ng/distinfo
===================================================================
--- trunk/net-mgmt/aircrack-ng/distinfo 2014-08-31 00:19:35 UTC (rev 16736)
+++ trunk/net-mgmt/aircrack-ng/distinfo 2014-08-31 00:25:37 UTC (rev 16737)
@@ -1,2 +1,2 @@
-SHA256 (aircrack-ng-1.1.tar.gz) = b136b549b7d2a2751c21793100075ea43b28de9af4c1969508bb95bcc92224ad
-SIZE (aircrack-ng-1.1.tar.gz) = 1453272
+SHA256 (aircrack-ng-1.2-beta3.tar.gz) = 2d22ae13360d466ffff1699cb1300ce5f807ffe9762314bb60ee49d9d2efe98d
+SIZE (aircrack-ng-1.2-beta3.tar.gz) = 2053021
Added: trunk/net-mgmt/aircrack-ng/files/patch-src_crypto.h
===================================================================
--- trunk/net-mgmt/aircrack-ng/files/patch-src_crypto.h (rev 0)
+++ trunk/net-mgmt/aircrack-ng/files/patch-src_crypto.h 2014-08-31 00:25:37 UTC (rev 16737)
@@ -0,0 +1,10 @@
+--- src/crypto.h.orig 2014-04-01 19:15:06.228646731 +0200
++++ src/crypto.h 2014-04-01 19:16:22.960640528 +0200
+@@ -35,6 +35,7 @@
+ #ifndef _CRYPTO_H
+ #define _CRYPTO_H
+
++#include <sys/types.h>
+ #ifndef uint8
+ #define uint8 unsigned char
+ #endif
Added: trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h
===================================================================
--- trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h (rev 0)
+++ trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h 2014-08-31 00:25:37 UTC (rev 16737)
@@ -0,0 +1,22 @@
+--- src/osdep/byteorder.h.orig 2013-03-04 18:32:55.000000000 +0100
++++ src/osdep/byteorder.h 2013-09-29 13:48:25.382520852 +0200
+@@ -181,7 +181,7 @@
+ * Solaris
+ * -------
+ */
+- #if defined(__sparc__) && defined(__sun__)
++ #if defined(__sparc__) && defined(__SVR4) && defined(__sun__)
+ #include <sys/byteorder.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -223,7 +223,9 @@
+
+ // FreeBSD
+ #ifdef __FreeBSD__
+- #include <machine/endian.h>
++ #undef ushort
++ #undef uint
++ #include <sys/types.h>
+ #endif
+
+ // XXX: Is there anything to include on OpenBSD/NetBSD/DragonFlyBSD/...?
Added: trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c
===================================================================
--- trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c (rev 0)
+++ trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c 2014-08-31 00:25:37 UTC (rev 16737)
@@ -0,0 +1,127 @@
+--- src/osdep/freebsd.c.orig 2011-09-25 00:05:54.000000000 +0200
++++ src/osdep/freebsd.c 2013-12-20 17:15:28.184126473 +0100
+@@ -53,7 +53,9 @@ struct priv_fbsd {
+ 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_read(struct wif *wi, uns
+ 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 @@ static int fbsd_write(struct wif *wi, un
+ 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)
+@@ -389,7 +401,7 @@ static int do_fbsd_open(struct wif *wi,
+
+ memset(&ifr, 0, sizeof(ifr));
+ strcpy(ifr.ifr_name, iface);
+- ifr.ifr_media = ifmr.ifm_current | IFM_IEEE80211_MONITOR;
++ ifr.ifr_media = ifmr.ifm_current;
+ if (ioctl(s, SIOCSIFMEDIA, &ifr) == -1)
+ goto close_sock;
+
+@@ -510,6 +522,39 @@ static int fbsd_set_mac(struct wif *wi,
+ return ioctl(priv->pf_s, SIOCSIFLLADDR, ifr);
+ }
+
++static int fbsd_set_mtu(struct wif *wi, int mtu)
++{
++ struct priv_fbsd *priv = wi_priv(wi);
++ struct ifreq *ifr = &priv->pf_ifr;
++
++ memset(ifr, 0, sizeof(struct ifreq));
++
++ strncpy(ifr->ifr_name, wi_get_ifname(wi), sizeof(ifr->ifr_name));
++ ifr->ifr_mtu = mtu;
++
++ if(ioctl(priv->pf_s, SIOCSIFMTU, ifr) < 0)
++ return -1;
++
++ return 0;
++}
++
++static int fbsd_get_mtu(struct wif *wi)
++{
++ struct priv_fbsd *priv = wi_priv(wi);
++ struct ifreq ifr;
++
++ memset(&ifr, 0, sizeof(struct ifreq));
++
++ ifr.ifr_addr.sa_family = AF_INET;
++
++ strncpy(ifr.ifr_name, wi_get_ifname(wi), sizeof(ifr.ifr_name));
++
++ if(ioctl(priv->pf_s, SIOCGIFMTU, (caddr_t)&ifr) < 0)
++ return -1;
++
++ return ifr.ifr_mtu;
++}
++
+ static struct wif *fbsd_open(char *iface)
+ {
+ struct wif *wi;
+@@ -530,7 +575,9 @@ static struct wif *fbsd_open(char *iface
+ wi->wi_set_mac = fbsd_set_mac;
+ wi->wi_get_rate = fbsd_get_rate;
+ wi->wi_set_rate = fbsd_set_rate;
+- wi->wi_get_monitor = fbsd_get_monitor;
++ wi->wi_get_monitor = fbsd_get_monitor;
++ wi->wi_get_mtu = fbsd_get_mtu;
++ wi->wi_set_mtu = fbsd_set_mtu;
+
+ /* setup iface */
+ fd = do_fbsd_open(wi, iface);
+@@ -542,13 +589,17 @@ static struct wif *fbsd_open(char *iface
+ /* 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_rate0 = 2; /* 1 MB/s XXX */
++ pf->pf_txparams.ibp_try0 = 1; /* no retransmits */
+ pf->pf_txparams.ibp_rate1 = 2; /* 1 MB/s XXX */
+ pf->pf_txparams.ibp_try1 = 1; /* no retransmits */
+ 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;
+ }
Added: trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h
===================================================================
--- trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h (rev 0)
+++ trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h 2014-08-31 00:25:37 UTC (rev 16737)
@@ -0,0 +1,11 @@
+--- src/osdep/radiotap/platform.h.orig 2014-04-01 19:18:03.439632822 +0200
++++ src/osdep/radiotap/platform.h 2014-04-01 19:18:19.900626663 +0200
+@@ -3,7 +3,7 @@
+ #ifndef _BSD_SOURCE
+ #define _BSD_SOURCE
+ #endif
+-#include <endian.h>
++#include <machine/endian.h>
+
+ #define le16_to_cpu le16toh
+ #define le32_to_cpu le32toh
Added: trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c
===================================================================
--- trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c (rev 0)
+++ trunk/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c 2014-08-31 00:25:37 UTC (rev 16737)
@@ -0,0 +1,19 @@
+--- src/osdep/radiotap/radiotap.c.orig 2014-04-01 19:20:56.379623336 +0200
++++ src/osdep/radiotap/radiotap.c 2014-04-01 19:22:54.880614337 +0200
+@@ -19,6 +19,16 @@
+ #include "../byteorder.h"
+ #endif
+
++#ifdef _BSD_SOURCE
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++#define le16toh(x) (x)
++#define le32toh(x) (x)
++#else
++#define le32toh(x) bswap_32 (x)
++#endif
++#endif
++
++
+ /* function prototypes and related defs are in radiotap_iter.h */
+
+ static const struct radiotap_align_size rtap_namespace_sizes[] = {
More information about the Midnightbsd-cvs
mailing list