? aircrack-ng-1.5.2.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/aircrack-ng/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 4 Sep 2018 12:46:20 -0000 1.21
+++ Makefile 29 Jan 2019 15:26:08 -0000
@@ -1,32 +1,58 @@
# $OpenBSD: Makefile,v 1.21 2018/09/04 12:46:20 espie Exp $
COMMENT= 802.11 WEP and WPA-PSK keys cracking program
-DISTNAME= aircrack-ng-1.1
-REVISION= 15
+DISTNAME= aircrack-ng-1.5.2
CATEGORIES= security
-HOMEPAGE= http://www.aircrack-ng.org/
+HOMEPAGE= https://www.aircrack-ng.org/
MAINTAINER= Benoit Lecocq <benoit@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= c pthread crypto ssl z
+WANTLIB+= c pthread crypto z pcre
+WANTLIB+= ${COMPILER_LIBCXX} m sqlite3
-MASTER_SITES= http://download.aircrack-ng.org/
+MASTER_SITES= https://download.aircrack-ng.org/
-WANTLIB += sqlite3
-LIB_DEPENDS= databases/sqlite3
+BUILD_DEPENDS= devel/libtool \
+ devel/shtool \
+ devel/pkgconf
+LIB_DEPENDS= databases/sqlite3 \
+ devel/pcre
+
+RUN_DEPENDS+= net/arp-scan,-mac>=20190128
USE_GMAKE= Yes
+USE_LIBTOOL= Yes
+LIBTOOL_FLAGS= --tag=disable-static
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.16
+CONFIGURE_STYLE= gnu
+
MAKE_ENV+= SQLITE=true UNSTABLE=true
MAKE_FLAGS+= CC=${CC}
-NO_TEST= Yes
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+PKG_ARGS+= -Dx86=1
+.else
+PKG_ARGS+= -Dx86=0
+.endif
+.if ${MACHINE_ARCH} == "arm"
+PKG_ARGS+= -Darm=1
+.else
+PKG_ARGS+= -Darm=0
+.endif
+.if ${MACHINE_ARCH} == "powerpc"
+PKG_ARGS+= -Dppc=1
+.else
+PKG_ARGS+= -Dppc=0
+.endif
+
-post-extract:
- perl -i -pe 's/\r\n/\n/' ${WRKSRC}/src/osdep/byteorder.h
+do-gen:
+ cd ${WRKSRC} && ${AUTOCONF_ENV} autoreconf -i
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/airodump-ng.h
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/aircrack-ng/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 1 Jul 2014 12:15:10 -0000 1.3
+++ distinfo 29 Jan 2019 15:26:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (aircrack-ng-1.1.tar.gz) = sTa1SbfSonUcIXkxAAdepDso3pr0wZaVCLuVvMkiJK0=
-SIZE (aircrack-ng-1.1.tar.gz) = 1453272
+SHA256 (aircrack-ng-1.5.2.tar.gz) = nlkv52WARiIOCsCm0FxAJpA/MHeySIk+AFbMvk7ogkE=
+SIZE (aircrack-ng-1.5.2.tar.gz) = 7138360
Index: patches/patch-common_mak
===================================================================
RCS file: patches/patch-common_mak
diff -N patches/patch-common_mak
--- patches/patch-common_mak 6 May 2009 20:39:29 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
---- common.mak.orig Thu Mar 26 22:01:02 2009
-+++ common.mak Wed Apr 15 18:36:48 2009
-@@ -31,16 +31,16 @@ COMMON_CFLAGS += -DCYGWIN
- endif
-
- ifeq ($(SQLITE), true)
-- COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE
-+ COMMON_CFLAGS += -I${LOCALBASE}/include -DHAVE_SQLITE
- else
- ifeq ($(sqlite), true)
-- COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE
-+ COMMON_CFLAGS += -I${LOCALBASE}/include -DHAVE_SQLITE
- else
- ifeq ($(SQLITE), TRUE)
-- COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE
-+ COMMON_CFLAGS += -I${LOCALBASE}/include -DHAVE_SQLITE
- else
- ifeq ($(sqlite), TRUE)
-- COMMON_CFLAGS += -I/usr/local/include -DHAVE_SQLITE
-+ COMMON_CFLAGS += -I${LOCALBASE}/include -DHAVE_SQLITE
- endif
- endif
- endif
-@@ -70,7 +70,7 @@ OPTFLAGS = -D_FILE_OFFSET_BITS=64
- CFLAGS ?= -g -W -Wall -Werror -O3
- CFLAGS += $(OPTFLAGS) $(REVFLAGS) $(COMMON_CFLAGS)
-
--prefix = /usr/local
-+prefix = ${LOCALBASE}
- bindir = $(prefix)/bin
- sbindir = $(prefix)/sbin
- mandir = $(prefix)/man/man1
Index: patches/patch-manpages_airodump-ng_1
===================================================================
RCS file: patches/patch-manpages_airodump-ng_1
diff -N patches/patch-manpages_airodump-ng_1
--- patches/patch-manpages_airodump-ng_1 17 Feb 2015 19:47:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-manpages_airodump-ng_1,v 1.1 2015/02/17 19:47:01 naddy Exp $
---- manpages/airodump-ng.1.orig Sat Apr 24 22:06:16 2010
-+++ manpages/airodump-ng.1 Tue Feb 17 19:32:19 2015
-@@ -55,7 +55,7 @@ Active Scanning Simulation (send probe requests and pa
- .TP
- .I --output-format <formats>
- Define the formats to use (separated by a comma). Possible values are: pcap, ivs, csv, gps, kismet, netxml. The default values are: pcap, csv, kismet, kismet-newcore.
--'pcap' is for recording a capture in pcap format, 'ivs' is for ivs format (it is a shortcut for --ivs). 'csv' will create an airodump-ng CSV file, 'kismet' will create a kismet csv file and 'kismet-newcore' will create the kismet netxml file. 'gps' is a shortcut for --gps.
-+\&'pcap' is for recording a capture in pcap format, 'ivs' is for ivs format (it is a shortcut for --ivs). 'csv' will create an airodump-ng CSV file, 'kismet' will create a kismet csv file and 'kismet-newcore' will create the kismet netxml file. 'gps' is a shortcut for --gps.
- .br
- Theses values can be combined with the exception of ivs and pcap.
- .PP
Index: patches/patch-src_Makefile
===================================================================
RCS file: patches/patch-src_Makefile
diff -N patches/patch-src_Makefile
--- patches/patch-src_Makefile 19 Aug 2012 13:30:04 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
---- src/Makefile.orig Sat Feb 13 23:32:28 2010
-+++ src/Makefile Tue May 31 19:45:28 2011
-@@ -99,16 +99,16 @@ LIBOSD = $(OSD)/lib$(OSD).a
- LIBSSL = -lssl -lcrypto $(LDFLAGS)
- LIBSQL =
- ifeq ($(SQLITE), true)
-- LIBSQL = -L/usr/local/lib -lsqlite3
-+ LIBSQL = -L${LOCALBASE}/lib -lsqlite3
- else
- ifeq ($(sqlite), true)
-- LIBSQL = -L/usr/local/lib -lsqlite3
-+ LIBSQL = -L${LOCALBASE}/lib -lsqlite3
- else
- ifeq ($(SQLITE), TRUE)
-- LIBSQL = -L/usr/local/lib -lsqlite3
-+ LIBSQL = -L${LOCALBASE}/lib -lsqlite3
- else
- ifeq ($(sqlite), TRUE)
-- LIBSQL = -L/usr/local/lib -lsqlite3
-+ LIBSQL = -L${LOCALBASE}/lib -lsqlite3
- endif
- endif
- endif
Index: patches/patch-src_Makefile_am
===================================================================
RCS file: patches/patch-src_Makefile_am
diff -N patches/patch-src_Makefile_am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_Makefile_am 29 Jan 2019 15:26:08 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+our base libtool fails finding libaircrack-util
+
+
+Index: src/Makefile.am
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -205,7 +205,7 @@ ivstools_LDADD = $(COMMON_LDADD) $(LIBAC_LIBS) $(LIBAI
+
+ kstats_SOURCES = kstats.c
+ kstats_CFLAGS = $(LIBAC_CFLAGS) $(PTHREAD_CFLAGS)
+-kstats_LDADD = $(COMMON_LDADD) $(LIBAC_LIBS)
++kstats_LDADD = $(COMMON_LDADD) $(LIBAC_LIBS) $(LIBAIRCRACK_UTIL_LIBS)
+
+ wesside_ng_SOURCES = $(SRC_WS) $(LIBAIRCRACK_OSDEP) $(LIBAIRCRACK_UTIL)
+ wesside_ng_CFLAGS = $(COMMON_CFLAGS) $(LIBNL_CFLAGS)
Index: patches/patch-src_aircrack-ng_c
===================================================================
RCS file: patches/patch-src_aircrack-ng_c
diff -N patches/patch-src_aircrack-ng_c
--- patches/patch-src_aircrack-ng_c 3 Jun 2018 16:39:53 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-src_aircrack-ng_c,v 1.3 2018/06/03 16:39:53 tb Exp $
-Index: src/aircrack-ng.c
---- src/aircrack-ng.c.orig
-+++ src/aircrack-ng.c
-@@ -411,7 +411,7 @@ void eof_wait( int *eof_notified )
- }
-
-
--inline int wpa_send_passphrase(char *key, struct WPA_data* data, int lock)
-+static inline int wpa_send_passphrase(char *key, struct WPA_data* data, int lock)
- {
- pthread_mutex_lock(&data->mutex);
-
-@@ -439,7 +439,7 @@ inline int wpa_send_passphrase(char *key, struct WPA_d
- }
-
-
--inline int wpa_receive_passphrase(char *key, struct WPA_data* data)
-+static inline int wpa_receive_passphrase(char *key, struct WPA_data* data)
- {
- pthread_mutex_lock(&data->mutex);
-
-@@ -3852,7 +3852,7 @@ int crack_wpa_thread( void *arg )
- int i, j, len, slen;
- int nparallel = 1;
-
--#if defined(__i386__) || defined(__x86_64__)
-+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__PIC__)
- // Check for SSE2, with SSE2 the algorithm works with 4 keys
- if (shasse2_cpuid()>=2)
- nparallel = 4;
-@@ -4626,7 +4626,7 @@ int main( int argc, char *argv[] )
-
- case 'u' :
- printf("Nb CPU detected: %d ", cpu_count);
--#if defined(__i386__) || defined(__x86_64__)
-+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__PIC__)
- unused = shasse2_cpuid();
-
- if (unused == 1) {
Index: patches/patch-src_aircrack-ng_h
===================================================================
RCS file: patches/patch-src_aircrack-ng_h
diff -N patches/patch-src_aircrack-ng_h
--- patches/patch-src_aircrack-ng_h 6 May 2009 20:39:29 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- src/aircrack-ng.h.orig Wed Mar 4 15:14:46 2009
-+++ src/aircrack-ng.h Wed Mar 4 15:15:43 2009
-@@ -3,6 +3,8 @@
-
- #include <stdint.h>
- #include <stdio.h>
-+#include <pthread.h>
-+
- #include "aircrack-ptw-lib.h"
-
- #define SUCCESS 0
Index: patches/patch-src_airodump-ng_h
===================================================================
RCS file: patches/patch-src_airodump-ng_h
diff -N patches/patch-src_airodump-ng_h
--- patches/patch-src_airodump-ng_h 21 May 2011 11:19:24 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_airodump-ng_h,v 1.1 2011/05/21 11:19:24 fgsch Exp $
---- src/airodump-ng.h.orig Sun May 8 22:39:39 2011
-+++ src/airodump-ng.h Sun May 8 22:42:37 2011
-@@ -111,7 +111,7 @@ static uchar ZERO[32] =
- "\x00\x00\x00\x00\x00\x00\x00\x00"
- "\x00\x00\x00\x00\x00\x00\x00\x00";
-
--#define OUI_PATH "/usr/local/etc/aircrack-ng/airodump-ng-oui.txt"
-+#define OUI_PATH "${PREFIX}/share/aircrack-ng/airodump-ng-oui.txt"
- #define MIN_RAM_SIZE_LOAD_OUI_RAM 32768
-
- int read_pkts=0;
Index: patches/patch-src_common_c
===================================================================
RCS file: patches/patch-src_common_c
diff -N patches/patch-src_common_c
--- patches/patch-src_common_c 21 May 2011 11:19:24 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-$OpenBSD: patch-src_common_c,v 1.1 2011/05/21 11:19:24 fgsch Exp $
---- src/common.c.orig Mon May 9 09:14:48 2011
-+++ src/common.c Mon May 9 09:33:03 2011
-@@ -31,6 +31,7 @@
- #define isHex(c) (hexToInt(c) != -1)
- #define HEX_BASE 16
-
-+#if !defined(__OpenBSD__)
- int get_ram_size(void) {
- FILE *fp;
- char str[256];
-@@ -52,6 +53,20 @@ int get_ram_size(void) {
- fclose(fp);
- return ret;
- }
-+#else
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+
-+int get_ram_size(void) {
-+ int mib[2] = { CTL_HW, HW_PHYSMEM };
-+ unsigned int physmem;
-+ size_t len = sizeof(physmem);
-+
-+ if (sysctl(mib, 2, &physmem, &len, NULL, 0) < 0)
-+ return -1;
-+ return (physmem / 1024);
-+}
-+#endif
-
- /* Return the version number */
- char * getVersion(char * progname, int maj, int min, int submin, int svnrev, int beta, int rc)
Index: patches/patch-src_common_h
===================================================================
RCS file: patches/patch-src_common_h
diff -N patches/patch-src_common_h
--- patches/patch-src_common_h 20 Aug 2012 11:50:59 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_common_h,v 1.2 2012/08/20 11:50:59 pascal Exp $
---- src/common.h.orig Mon Jul 23 18:27:36 2012
-+++ src/common.h Mon Jul 23 18:27:57 2012
-@@ -30,7 +30,7 @@
- #define CPUID_SSE2_AVAILABLE 2
- #define CPUID_NOTHING_AVAILABLE 0
-
--#if defined(__i386__) || defined(__x86_64__)
-+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__PIC__)
- #define CPUID() shasse2_cpuid()
- #else
- #define CPUID() CPUID_NOTHING_AVAILABLE
Index: patches/patch-src_osdep_Makefile
===================================================================
RCS file: patches/patch-src_osdep_Makefile
diff -N patches/patch-src_osdep_Makefile
--- patches/patch-src_osdep_Makefile 21 May 2011 11:19:24 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_osdep_Makefile,v 1.2 2011/05/21 11:19:24 fgsch Exp $
---- src/osdep/Makefile.orig Wed Jan 6 22:02:09 2010
-+++ src/osdep/Makefile Sun May 1 08:03:24 2011
-@@ -12,7 +12,7 @@ OBJS = osdep.o $(OBJS_NET)
- #AIRPCAP_DIR = airpcap
- OBJS_APCAP = airpcap.o
-
--OBJS_OBSD = $(OBJS) openbsd.o openbsd_tap.o
-+OBJS_OBSD = $(OBJS) openbsd.o openbsd_tap.o common.o
- OBJS_NBSD = $(OBJS) netbsd.o netbsd_tap.o
- OBJS_FBSD = $(OBJS) freebsd.o freebsd_tap.o
- OBJS_LINUX = $(OBJS) linux.o linux_tap.o radiotap/radiotap-parser.o common.o
Index: patches/patch-src_osdep_byteorder_h
===================================================================
RCS file: patches/patch-src_osdep_byteorder_h
diff -N patches/patch-src_osdep_byteorder_h
--- patches/patch-src_osdep_byteorder_h 1 May 2015 17:40:58 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-$OpenBSD: patch-src_osdep_byteorder_h,v 1.3 2015/05/01 17:40:58 ajacoutot Exp $
---- src/osdep/byteorder.h.orig Wed Aug 24 21:36:30 2011
-+++ src/osdep/byteorder.h Wed Aug 24 21:55:32 2011
-@@ -167,7 +167,7 @@
- * Solaris
- * -------
- */
-- #if defined(__sparc__)
-+ #if defined(__sun) && defined(__SVR4)
- #include <sys/byteorder.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -210,6 +210,19 @@
- // FreeBSD
- #ifdef __FreeBSD__
- #include <machine/endian.h>
-+ #endif
-+
-+ #ifdef __OpenBSD__
-+ #include <endian.h>
-+
-+ #define __cpu_to_be64(x) htobe64(x)
-+ #define __cpu_to_be32(x) htobe32(x)
-+ #define __be64_to_cpu(x) betoh64(x)
-+ #define __be32_to_cpu(x) betoh32(x)
-+ #define __le32_to_cpu(x) letoh32(x)
-+ #define __le16_to_cpu(x) letoh16(x)
-+
-+ #define AIRCRACK_NG_BYTE_ORDER_DEFINED
- #endif
-
- // XXX: Is there anything to include on OpenBSD/NetBSD/DragonFlyBSD/...?
Index: patches/patch-src_osdep_openbsd_c
===================================================================
RCS file: patches/patch-src_osdep_openbsd_c
diff -N patches/patch-src_osdep_openbsd_c
--- patches/patch-src_osdep_openbsd_c 10 Sep 2016 13:03:43 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,65 +0,0 @@
-$OpenBSD: patch-src_osdep_openbsd_c,v 1.5 2016/09/10 13:03:43 ajacoutot Exp $
---- src/osdep/openbsd.c.orig Tue Feb 26 19:12:19 2008
-+++ src/osdep/openbsd.c Sat Sep 10 12:18:30 2016
-@@ -19,26 +19,26 @@
- */
- #include <sys/types.h>
- #include <sys/endian.h>
--#include <errno.h>
--#include <fcntl.h>
--#include <sys/param.h>
- #include <sys/sysctl.h>
--#include <net/bpf.h>
-+#include <sys/select.h> /* fd_set */
- #include <sys/socket.h>
-+#include <sys/timeout.h>
-+#include <sys/ioctl.h>
-+#include <net/bpf.h>
- #include <net/if.h>
- #include <net/if_media.h>
--#include <sys/ioctl.h>
- #include <net/if_dl.h>
-+#include <net/if_var.h>
- #include <net80211/ieee80211.h>
--#include <net80211/ieee80211_crypto.h>
- #include <net80211/ieee80211_ioctl.h>
- #include <net80211/ieee80211_radiotap.h>
--#include <net80211/ieee80211_proto.h>
-+
-+#include <errno.h>
-+#include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
--#include <sys/uio.h>
- #include <assert.h>
- #include <ifaddrs.h>
-
-@@ -273,7 +273,7 @@ static int obsd_write(struct wif *wi, unsigned char *h
- if (rc == -1)
- return rc;
-
-- return 0;
-+ return rc;
- }
-
- static void do_free(struct wif *wi)
-@@ -303,7 +303,7 @@ static int do_obsd_open(struct wif *wi, char *iface)
- int s;
- unsigned int flags;
- struct ifmediareq ifmr;
-- int *mwords;
-+ uint64_t *mwords;
- struct priv_obsd *po = wi_priv(wi);
- unsigned int size=sizeof(po->po_buf);
-
-@@ -339,7 +339,7 @@ static int do_obsd_open(struct wif *wi, char *iface)
-
- assert(ifmr.ifm_count != 0);
-
-- mwords = (int *)malloc(ifmr.ifm_count * sizeof(int));
-+ mwords = (uint64_t *)malloc(ifmr.ifm_count * sizeof(uint64_t));
- if (!mwords)
- goto close_sock;
- ifmr.ifm_ulist = mwords;
Index: patches/patch-src_sha1-sse2_S
===================================================================
RCS file: patches/patch-src_sha1-sse2_S
diff -N patches/patch-src_sha1-sse2_S
--- patches/patch-src_sha1-sse2_S 21 Dec 2012 17:10:39 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_sha1-sse2_S,v 1.3 2012/12/21 17:10:39 landry Exp $
-chunk 2 needed on hppa, otherwise fails with
-sha1-sse2.S:469: Error: unknown pseudo-op: `.note.gnu'
---- src/sha1-sse2.S.orig Thu Jan 21 18:01:28 2010
-+++ src/sha1-sse2.S Fri Dec 21 10:02:29 2012
-@@ -13,7 +13,7 @@
- #define MANGLE(x) x
- #endif
-
--#if defined(__i386__) || defined(__x86_64__)
-+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__PIC__)
-
- .globl shasse2_init;
- .globl shasse2_ends;
-@@ -466,5 +466,5 @@ cpuid_exit:
-
-
- #ifdef __ELF__
--.section .note.GNU-stack,"",%progbits
-+ .section .note.GNU-stack,"",%progbits
- #endif
Index: patches/patch-src_sha1-sse2_h
===================================================================
RCS file: patches/patch-src_sha1-sse2_h
diff -N patches/patch-src_sha1-sse2_h
--- patches/patch-src_sha1-sse2_h 20 Aug 2012 11:50:59 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_sha1-sse2_h,v 1.2 2012/08/20 11:50:59 pascal Exp $
---- src/sha1-sse2.h.orig Mon Jul 23 18:26:45 2012
-+++ src/sha1-sse2.h Mon Jul 23 18:28:41 2012
-@@ -15,7 +15,7 @@
- #include "crypto.h"
-
-
--#if defined(__i386__) || defined(__x86_64__)
-+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__PIC__)
-
- void show_result(char* key, uchar* pmk)
- {
Index: pkg/PFRAG.arm
===================================================================
RCS file: pkg/PFRAG.arm
diff -N pkg/PFRAG.arm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.arm 29 Jan 2019 15:26:08 -0000
@@ -0,0 +1,4 @@
+@comment $OpenBSD$
+lib/libaircrack-crypto-arm-neon-1.3.0.so
+lib/libaircrack-crypto-arm-neon.la
+lib/libaircrack-crypto-arm-neon.so
Index: pkg/PFRAG.ppc
===================================================================
RCS file: pkg/PFRAG.ppc
diff -N pkg/PFRAG.ppc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.ppc 29 Jan 2019 15:26:08 -0000
@@ -0,0 +1,7 @@
+@comment $OpenBSD$
+lib/libaircrack-crypto-ppc-power8-1.3.0.so
+lib/libaircrack-crypto-ppc-power8.la
+lib/libaircrack-crypto-ppc-power8.so
+lib/libaircrack-crypto-ppc-altivec-1.3.0.so
+lib/libaircrack-crypto-ppc-altivec.la
+lib/libaircrack-crypto-ppc-altivec.so
Index: pkg/PFRAG.x86
===================================================================
RCS file: pkg/PFRAG.x86
diff -N pkg/PFRAG.x86
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.x86 29 Jan 2019 15:26:08 -0000
@@ -0,0 +1,10 @@
+@comment $OpenBSD$
+lib/libaircrack-crypto-x86-avx-1.3.0.so
+lib/libaircrack-crypto-x86-avx.la
+lib/libaircrack-crypto-x86-avx.so
+lib/libaircrack-crypto-x86-avx2-1.3.0.so
+lib/libaircrack-crypto-x86-avx2.la
+lib/libaircrack-crypto-x86-avx2.so
+lib/libaircrack-crypto-x86-sse2-1.3.0.so
+lib/libaircrack-crypto-x86-sse2.la
+lib/libaircrack-crypto-x86-sse2.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/aircrack-ng/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 4 Sep 2018 12:46:20 -0000 1.3
+++ pkg/PLIST 29 Jan 2019 15:26:08 -0000
@@ -3,41 +3,43 @@
@bin bin/airdecap-ng
@bin bin/airdecloak-ng
@bin bin/airolib-ng
-@bin bin/buddy-ng
@bin bin/ivstools
@bin bin/kstats
@bin bin/makeivs-ng
@bin bin/packetforge-ng
-@man man/man1/airbase-ng.1
+@bin bin/wpaclean
+lib/libaircrack-crypto-1.3.0.so
+%%x86%%
+%%ppc%%
+%%arm%%
+lib/libaircrack-crypto.la
+lib/libaircrack-crypto.so
+lib/libaircrack-osdep-1.3.0.so
+lib/libaircrack-osdep.la
+lib/libaircrack-osdep.so
@man man/man1/aircrack-ng.1
@man man/man1/airdecap-ng.1
@man man/man1/airdecloak-ng.1
@comment man/man1/airdriver-ng.1
-@man man/man1/aireplay-ng.1
@comment man/man1/airmon-ng.1
-@man man/man1/airodump-ng.1
@man man/man1/airolib-ng.1
-@man man/man1/airserv-ng.1
@comment man/man1/airtun-ng.1
-@man man/man1/buddy-ng.1
-@man man/man1/easside-ng.1
+@man man/man1/besside-ng-crawler.1
@man man/man1/ivstools.1
@man man/man1/kstats.1
@man man/man1/makeivs-ng.1
@man man/man1/packetforge-ng.1
-@man man/man1/tkiptun-ng.1
-@man man/man1/wesside-ng.1
+@man man/man1/wpaclean.1
+@man man/man8/airbase-ng.8
+@man man/man8/aireplay-ng.8
+@man man/man8/airodump-ng-oui-update.8
+@man man/man8/airodump-ng.8
+@man man/man8/airserv-ng.8
+@comment man/man8/airtun-ng.8
@bin sbin/airbase-ng
@comment sbin/airdriver-ng
@bin sbin/aireplay-ng
@comment sbin/airmon-ng
@bin sbin/airodump-ng
-@comment sbin/airodump-ng-oui-update
@bin sbin/airserv-ng
@comment sbin/airtun-ng
-@bin sbin/easside-ng
-@bin sbin/tkiptun-ng
-@bin sbin/wesside-ng
-@extraunexec rm -rf %D/share/aircrack-ng/*
-@sample share/aircrack-ng/
-share/doc/pkg-readmes/${PKGSTEM}
Index: pkg/README
===================================================================
RCS file: pkg/README
diff -N pkg/README
--- pkg/README 4 Sep 2018 12:46:20 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: README,v 1.4 2018/09/04 12:46:20 espie Exp $
-
-+-----------------------------------------------------------------------
-| Running ${PKGSTEM} on OpenBSD
-+-----------------------------------------------------------------------
-
-Post-installation steps
-=======================
-The kismet format output from airodump-ng(1) can optionally include
-the device manufacturer. To enable this, type
-
- $ ftp -o - http://standards-oui.ieee.org/oui/oui.txt | grep \(hex\) | \
- doas tee ${TRUEPREFIX}/share/aircrack-ng/airodump-ng-oui.txt > /dev/null
Hi,
I think I addressed all the comments/concerns:
* homepage and mastersite HTTPS
* run autoreconfig in do-gen: stage
* fix to use base libtool (had to patch Makefile.am to explicitly add library our base libtool did
not find)
* don't install airtun-ng manpage
* added LIBTOOL_FLAGS to disable static libs
* the libaircrack-crypto* libraries are loaded via dlopen, however there seem to be some
of them arch-dependent I only tested building on amd64 and i386, so didn't spotted it
* Added PFRAG.ARCH for x86, ppc and arm
* added RUN_DEPENDS to mac-vendors package, and point airodump-ng to that OUI file,
therefore the README is obsolete, so deleted it
* I haven't seen anything to put the crypto libraries into a subdirectory
In src/aircrack-util/crypto_engine_loader.c there is this:
if (simd_features & SIMD_SUPPORTS_AVX512F)
{
strncat(buffer, "-x86-avx512", buffer_remaining);
}
else if (simd_features & SIMD_SUPPORTS_AVX2)
{
strncat(buffer, "-x86-avx2", buffer_remaining);
}
else if (simd_features & SIMD_SUPPORTS_AVX)
{
strncat(buffer, "-x86-avx", buffer_remaining);
}
else if (simd_features & SIMD_SUPPORTS_SSE2)
{
strncat(buffer, "-x86-sse2", buffer_remaining);
}
else if (simd_features & SIMD_SUPPORTS_ASIMD)
{
strncat(buffer, "-arm-neon", buffer_remaining);
}
else if (simd_features & SIMD_SUPPORTS_NEON)
{
strncat(buffer, "-arm-neon", buffer_remaining);
}
else if (simd_features & SIMD_SUPPORTS_POWER8)
{
strncat(buffer, "-ppc-power8", buffer_remaining);
}
else if (simd_features & SIMD_SUPPORTS_ALTIVEC)
{
strncat(buffer, "-ppc-altivec", buffer_remaining);
}
So I guess the arm crypto libs only built on arm, and ppc-* libs only build
on macppc. Don't know if the arm- one would also be created on aarch64?
I don't have a working macppc anymore, and don't have any arm type
device around to test there, so tests on other platforms and with other
devices (I only tested with rum(4)) welcome.
updated version attached.
cheers,
Sebastian
No comments:
Post a Comment