Date: Sun, 13 Sep 2015 14:31:55 +0000 (UTC) From: Lars Engels <lme@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396828 - in head/net-mgmt/aircrack-ng: . files Message-ID: <201509131431.t8DEVtIN097345@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lme Date: Sun Sep 13 14:31:54 2015 New Revision: 396828 URL: https://svnweb.freebsd.org/changeset/ports/396828 Log: - Drop "#if __FreeBSD_version > 700018" from src/osdep/freebsd.c (since this file doesn't have <sys/param.h> included, this version was used everywhere). - Remove pkg-message (says about addition of virtual access points (VAP) in FreeBSD 8). - Switch to options helpers. - Add CFLAGS=-I${LOCALBASE}/include for sqlite.h. - Sort USES. - Regenerate patches with "make makepatch". - Bump PORTREVISION. PR: 202952 Submitted by: Andriy Voskoboinyk (s3erios@gmail.com) Deleted: head/net-mgmt/aircrack-ng/files/pkg-message.in Modified: head/net-mgmt/aircrack-ng/Makefile head/net-mgmt/aircrack-ng/files/patch-src_crypto.h head/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h head/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c Modified: head/net-mgmt/aircrack-ng/Makefile ============================================================================== --- head/net-mgmt/aircrack-ng/Makefile Sun Sep 13 14:31:04 2015 (r396827) +++ head/net-mgmt/aircrack-ng/Makefile Sun Sep 13 14:31:54 2015 (r396828) @@ -3,6 +3,7 @@ PORTNAME= aircrack-ng DISTVERSION= 1.2-rc1 +PORTREVISION= 1 CATEGORIES= net-mgmt security MASTER_SITES= http://download.aircrack-ng.org/ \ http://bsd-geek.de/FreeBSD/distfiles/ @@ -13,13 +14,12 @@ COMMENT= 802.11 WEP and WPA-PSK keys cra LICENSE= GPLv2 BSD3CLAUSE APACHE20 LICENSE_COMB= dual -USES= cpe gmake dos2unix +USES= cpe dos2unix gmake CPE_VERSION= ${DISTVERSION:C/-.*//} CPE_UPDATE= ${DISTVERSION:C/^[^-]*$//:C/.*-//} DOS2UNIX_FILES= src/osdep/byteorder.h MAKE_ARGS= unstable=true libnl=false prefix=${PREFIX} USE_OPENSSL= yes -SUB_FILES= pkg-message BIN_FILES= airdecloak-ng buddy-ng aircrack-ng airdecap-ng ivstools \ makeivs-ng packetforge-ng wpaclean kstats @@ -29,14 +29,10 @@ SBIN_FILES= airtun-ng besside-ng airbase OPTIONS_DEFINE= SQLITE OPTIONS_SUB= yes SQLITE_DESC= Use SQLite for storing pre-computed key tables - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes -MAKE_ARGS+= SQLITE=true -BIN_FILES+= airolib-ng -.endif +SQLITE_USE= SQLITE=yes +SQLITE_MAKE_ARGS= SQLITE=true +SQLITE_CFLAGS= -I${LOCALBASE}/include +SQLITE_VARS= BIN_FILES+=airolib-ng post-patch: @${REINPLACE_CMD} \ Modified: head/net-mgmt/aircrack-ng/files/patch-src_crypto.h ============================================================================== --- head/net-mgmt/aircrack-ng/files/patch-src_crypto.h Sun Sep 13 14:31:04 2015 (r396827) +++ head/net-mgmt/aircrack-ng/files/patch-src_crypto.h Sun Sep 13 14:31:54 2015 (r396828) @@ -1,5 +1,5 @@ ---- src/crypto.h.orig 2014-07-12 04:24:03.000000000 +0200 -+++ src/crypto.h 2014-11-02 21:23:28.529312627 +0100 +--- src/crypto.h.orig 2014-07-12 02:24:03 UTC ++++ src/crypto.h @@ -34,6 +34,7 @@ #ifndef _CRYPTO_H Modified: head/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h ============================================================================== --- head/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h Sun Sep 13 14:31:04 2015 (r396827) +++ head/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h Sun Sep 13 14:31:54 2015 (r396828) @@ -1,5 +1,5 @@ ---- 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 +--- src/osdep/byteorder.h.orig 2015-09-07 17:11:56 UTC ++++ src/osdep/byteorder.h @@ -181,7 +181,7 @@ * Solaris * ------- Modified: head/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c ============================================================================== --- head/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c Sun Sep 13 14:31:04 2015 (r396827) +++ head/net-mgmt/aircrack-ng/files/patch-src_osdep_freebsd.c Sun Sep 13 14:31:54 2015 (r396828) @@ -1,53 +1,6 @@ ---- 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, +--- src/osdep/freebsd.c.orig 2011-09-24 22:05:54 UTC ++++ src/osdep/freebsd.c +@@ -389,7 +389,7 @@ static int do_fbsd_open(struct wif *wi, memset(&ifr, 0, sizeof(ifr)); strcpy(ifr.ifr_name, iface); @@ -56,7 +9,7 @@ if (ioctl(s, SIOCSIFMEDIA, &ifr) == -1) goto close_sock; -@@ -510,6 +522,39 @@ static int fbsd_set_mac(struct wif *wi, +@@ -510,6 +510,39 @@ static int fbsd_set_mac(struct wif *wi, return ioctl(priv->pf_s, SIOCSIFLLADDR, ifr); } @@ -96,7 +49,7 @@ static struct wif *fbsd_open(char *iface) { struct wif *wi; -@@ -530,7 +575,9 @@ static struct wif *fbsd_open(char *iface +@@ -530,7 +563,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; @@ -107,11 +60,8 @@ /* 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); +@@ -544,6 +579,8 @@ static struct wif *fbsd_open(char *iface 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 */ @@ -119,9 +69,3 @@ 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; - } Modified: head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h ============================================================================== --- head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h Sun Sep 13 14:31:04 2015 (r396827) +++ head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h Sun Sep 13 14:31:54 2015 (r396828) @@ -1,5 +1,5 @@ ---- 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 +--- src/osdep/radiotap/platform.h.orig 2014-03-22 20:26:59 UTC ++++ src/osdep/radiotap/platform.h @@ -3,7 +3,7 @@ #ifndef _BSD_SOURCE #define _BSD_SOURCE Modified: head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c ============================================================================== --- head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c Sun Sep 13 14:31:04 2015 (r396827) +++ head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c Sun Sep 13 14:31:54 2015 (r396828) @@ -1,5 +1,5 @@ ---- 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 +--- src/osdep/radiotap/radiotap.c.orig 2014-03-31 01:39:15 UTC ++++ src/osdep/radiotap/radiotap.c @@ -19,6 +19,16 @@ #include "../byteorder.h" #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509131431.t8DEVtIN097345>