From owner-svn-ports-all@FreeBSD.ORG Tue Apr 1 17:34:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF3C47E8; Tue, 1 Apr 2014 17:34:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AF3AB2BB; Tue, 1 Apr 2014 17:34:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s31HYbwF094498; Tue, 1 Apr 2014 17:34:37 GMT (envelope-from lme@svn.freebsd.org) Received: (from lme@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s31HYaXV094489; Tue, 1 Apr 2014 17:34:36 GMT (envelope-from lme@svn.freebsd.org) Message-Id: <201404011734.s31HYaXV094489@svn.freebsd.org> From: Lars Engels Date: Tue, 1 Apr 2014 17:34:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349865 - in head/net-mgmt/aircrack-ng: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Apr 2014 17:34:37 -0000 Author: lme Date: Tue Apr 1 17:34:36 2014 New Revision: 349865 URL: http://svnweb.freebsd.org/changeset/ports/349865 QAT: https://qat.redports.org/buildarchive/r349865/ Log: - Unbreak on big-endian architectures [1] - Use correct DISTVERSION [1] - Style improvements [1] - Update to 1.2-beta3 Submitted by: danfe [1] Added: head/net-mgmt/aircrack-ng/files/patch-src_crypto.h (contents, props changed) head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h (contents, props changed) head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c (contents, props changed) Modified: head/net-mgmt/aircrack-ng/Makefile head/net-mgmt/aircrack-ng/distinfo head/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h Modified: head/net-mgmt/aircrack-ng/Makefile ============================================================================== --- head/net-mgmt/aircrack-ng/Makefile Tue Apr 1 17:28:32 2014 (r349864) +++ head/net-mgmt/aircrack-ng/Makefile Tue Apr 1 17:34:36 2014 (r349865) @@ -2,22 +2,20 @@ # $FreeBSD$ PORTNAME= aircrack-ng -DISTVERSION= 1.2b2 -PORTREVISION= 2 +DISTVERSION= 1.2-beta3 CATEGORIES= net-mgmt security MASTER_SITES= http://download.aircrack-ng.org/ \ http://bsd-geek.de/FreeBSD/distfiles/ -DISTNAME= ${PORTNAME}-${DISTVERSION:C/b/-beta/} MAINTAINER= lme@FreeBSD.org -COMMENT= An 802.11 WEP and WPA-PSK keys cracking program +COMMENT= 802.11 WEP and WPA-PSK keys cracking program LICENSE= GPLv2 BSD3CLAUSE APACHE20 LICENSE_COMB= dual USES= gmake dos2unix DOS2UNIX_FILES= src/osdep/byteorder.h -MAKE_ARGS+= unstable=true prefix=${PREFIX} +MAKE_ARGS= unstable=true libnl=false prefix=${PREFIX} USE_OPENSSL= yes SUB_FILES= pkg-message @@ -38,13 +36,6 @@ MAKE_ARGS+= SQLITE=true BIN_FILES+= airolib-ng .endif -.if ${ARCH} == "powerpc" -BROKEN= Does not compile on powerpc -.endif -.if ${ARCH} == "sparc64" && ${OSVERSION} > 900000 -BROKEN= Does not compile on sparc64-9 -.endif - post-patch: @${REINPLACE_CMD} \ -e 's|-I/usr/local|-I${LOCALBASE}|' \ @@ -62,12 +53,9 @@ post-patch: @${REINPLACE_CMD} \ -e 's|-lpthread|${PTHREAD_LIBS}|' \ ${WRKSRC}/src/Makefile + post-install: -.for f in ${BIN_FILES} - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$f -.endfor -.for f in ${SBIN_FILES} - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/$f -.endfor + @${STRIP_CMD} ${BIN_FILES:S,^,${STAGEDIR}${PREFIX}/bin/,} \ + ${SBIN_FILES:S,^,${STAGEDIR}${PREFIX}/sbin/,} .include Modified: head/net-mgmt/aircrack-ng/distinfo ============================================================================== --- head/net-mgmt/aircrack-ng/distinfo Tue Apr 1 17:28:32 2014 (r349864) +++ head/net-mgmt/aircrack-ng/distinfo Tue Apr 1 17:34:36 2014 (r349865) @@ -1,2 +1,2 @@ -SHA256 (aircrack-ng-1.2-beta2.tar.gz) = ef7181f15462767249fde88219a503f27a7aee6f98b38e7e7d33a7b32880fbde -SIZE (aircrack-ng-1.2-beta2.tar.gz) = 3447205 +SHA256 (aircrack-ng-1.2-beta3.tar.gz) = 2d22ae13360d466ffff1699cb1300ce5f807ffe9762314bb60ee49d9d2efe98d +SIZE (aircrack-ng-1.2-beta3.tar.gz) = 2053021 Added: head/net-mgmt/aircrack-ng/files/patch-src_crypto.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/aircrack-ng/files/patch-src_crypto.h Tue Apr 1 17:34:36 2014 (r349865) @@ -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 + #ifndef uint8 + #define uint8 unsigned char + #endif Modified: head/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h ============================================================================== --- head/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h Tue Apr 1 17:28:32 2014 (r349864) +++ head/net-mgmt/aircrack-ng/files/patch-src_osdep_byteorder.h Tue Apr 1 17:34:36 2014 (r349865) @@ -9,3 +9,14 @@ #include #include #include +@@ -223,7 +223,9 @@ + + // FreeBSD + #ifdef __FreeBSD__ +- #include ++ #undef ushort ++ #undef uint ++ #include + #endif + + // XXX: Is there anything to include on OpenBSD/NetBSD/DragonFlyBSD/...? Added: head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_platform.h Tue Apr 1 17:34:36 2014 (r349865) @@ -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 ++#include + + #define le16_to_cpu le16toh + #define le32_to_cpu le32toh Added: head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/aircrack-ng/files/patch-src_osdep_radiotap_radiotap.c Tue Apr 1 17:34:36 2014 (r349865) @@ -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[] = {