Hi, This is an update to net/yersinia- 0.8.2 plus -fno-common fixes from https://github.com/tomac/yersinia/pull/66
- new home at github - bug fixes only very lightly tested. Index: Makefile =================================================================== RCS file: /cvs/OpenBSD/ports/net/yersinia/Makefile,v retrieving revision 1.11 diff -u -p -u -r1.11 Makefile --- Makefile 12 Jul 2019 20:48:52 -0000 1.11 +++ Makefile 1 Mar 2021 17:54:03 -0000 @@ -2,30 +2,29 @@ COMMENT = framework for analysis of layer 2 network protocols -DISTNAME = yersinia-0.7.3 -REVISION = 0 -CATEGORIES = net security +GH_ACCOUNT = tomac +GH_PROJECT = yersinia +GH_TAGNAME = v0.8.2 -HOMEPAGE = http://www.yersinia.net/ +CATEGORIES = net security MAINTAINER = Steven Mestdagh <ste...@openbsd.org> # GPL v2 PERMIT_PACKAGE = Yes -MASTER_SITES = http://www.yersinia.net/download/ - WANTLIB = c curses panel pcap pthread lib/libnet-1.1/net=11 LIB_DEPENDS = net/libnet/1.1 -CONFIGURE_STYLE = gnu +AUTOCONF_VERSION = 2.69 +AUTOMAKE_VERSION = 1.12 +CONFIGURE_STYLE = autoreconf CONFIGURE_ARGS = --disable-gtk \ --with-libnet-includes=${LOCALBASE}/include/libnet-1.1 CONFIGURE_ENV = LDFLAGS="-L${LOCALBASE}/lib" \ LIBNET_CONFIG=${LOCALBASE}/bin/libnet-config-1.1 \ CPPFLAGS="${CPPFLAGS} -DLBL_ALIGN" -WRKDIST = ${WRKDIR} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/yersinia Index: distinfo =================================================================== RCS file: /cvs/OpenBSD/ports/net/yersinia/distinfo,v retrieving revision 1.3 diff -u -p -u -r1.3 distinfo --- distinfo 26 Jul 2015 19:19:33 -0000 1.3 +++ distinfo 1 Mar 2021 17:04:48 -0000 @@ -1,2 +1,2 @@ -SHA256 (yersinia-0.7.3.tar.gz) = BCq8RmxbRwuXB54ASbQCmoy7ddWDz7+3VvynbkYNQLQ= -SIZE (yersinia-0.7.3.tar.gz) = 378124 +SHA256 (yersinia-0.8.2.tar.gz) = lk9Sjb/9kEN2q3mG5psehjlZHJKeLzkYasnr8tO8dh8= +SIZE (yersinia-0.8.2.tar.gz) = 387889 Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 26 Jul 2015 19:19:33 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-configure,v 1.3 2015/07/26 19:19:33 steven Exp $ ---- configure.orig Mon Sep 9 14:33:01 2013 -+++ configure Sun Jul 19 16:52:17 2015 -@@ -3809,7 +3809,7 @@ fi - - - if test -n "$GCC"; then -- CFLAGS="-O3 -Wall -g" -+ CFLAGS="$CFLAGS -Wall -g" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ouch!! Only gcc is supported..." >&5 - $as_echo "$as_me: WARNING: Ouch!! Only gcc is supported..." >&2;} -@@ -4747,7 +4747,7 @@ else - - LIBNET_INCLUDE="-I$libnet_dir" - LIBNET_LINK="-L`dirname $libnet_dir`/lib" -- LIBNET_CONFIG="$libnet_config_dir/libnet-config" -+# LIBNET_CONFIG="$libnet_config_dir/libnet-config" - - - Index: patches/patch-configure_in =================================================================== RCS file: patches/patch-configure_in diff -N patches/patch-configure_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-configure_in 1 Mar 2021 17:23:24 -0000 @@ -0,0 +1,32 @@ +$OpenBSD$ + +Index: configure.in +--- configure.in.orig ++++ configure.in +@@ -14,7 +14,7 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + + AC_PROG_CC + if test -n "$GCC"; then +- CFLAGS="-O3 -Wall -g -D_DEFAULT_SOURCE" ++ CFLAGS="$CFLAGS -Wall -g -D_DEFAULT_SOURCE" + else + AC_MSG_WARN(Ouch!! Only gcc is supported...) + AC_MSG_ERROR(...you're on your own.) +@@ -56,7 +56,7 @@ AC_ARG_WITH(pcap-includes, + + pcap_dir="" + for dir in $PCAP_DIR ; do +- if test -d $dir -a -r "$dir/pcap-bpf.h" ; then ++ if test -d $dir -a -r "$dir/pcap.h" ; then + if test -n "$pcap_dir" -a "$pcap_dir" != "$dir"; then + echo + echo; echo more than one set found in: +@@ -189,7 +189,7 @@ else + dnl libnet headers are usually in /usr/include/libnet, so we need a .. + LIBNET_INCLUDE="-I$libnet_dir" + LIBNET_LINK="-L`dirname $libnet_dir`/lib" +- LIBNET_CONFIG="$libnet_config_dir/libnet-config" ++# LIBNET_CONFIG="$libnet_config_dir/libnet-config" + + AC_SUBST(LIBNET_INCLUDE) + AC_SUBST(LIBNET_LINK) 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 1 Mar 2021 17:27:57 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/Makefile.am +--- src/Makefile.am.orig ++++ src/Makefile.am +@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = no-dependencies + + DEFS = `$(LIBNET_CONFIG) --defines` @DEFS@ + +-INCLUDES = ++INCLUDES = -I${srcdir} + + LIBS = @LIBS@ -lpcap -lnet + Index: patches/patch-src_attack_c =================================================================== RCS file: /cvs/OpenBSD/ports/net/yersinia/patches/patch-src_attack_c,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-src_attack_c --- patches/patch-src_attack_c 26 Oct 2010 10:44:53 -0000 1.1 +++ patches/patch-src_attack_c 1 Mar 2021 17:16:34 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-src_attack_c,v 1.1 2010/10/26 10:44:53 steven Exp $ ---- src/attack.c.orig Tue Oct 26 12:04:42 2010 -+++ src/attack.c Tue Oct 26 12:13:45 2010 -@@ -248,8 +248,12 @@ attacks->attack_th.id); +Index: src/attack.c +--- src/attack.c.orig ++++ src/attack.c +@@ -262,8 +262,12 @@ attacks->attack_th.id); void attack_gen_mac(u_int8_t *mac) { Index: patches/patch-src_interfaces_c =================================================================== RCS file: /cvs/OpenBSD/ports/net/yersinia/patches/patch-src_interfaces_c,v retrieving revision 1.2 diff -u -p -u -r1.2 patch-src_interfaces_c --- patches/patch-src_interfaces_c 26 Jul 2015 19:19:33 -0000 1.2 +++ patches/patch-src_interfaces_c 1 Mar 2021 17:35:58 -0000 @@ -1,7 +1,20 @@ $OpenBSD: patch-src_interfaces_c,v 1.2 2015/07/26 19:19:33 steven Exp $ ---- src/interfaces.c.orig Mon Sep 9 14:33:01 2013 -+++ src/interfaces.c Sun Jul 19 19:27:50 2015 -@@ -221,13 +221,12 @@ interfaces_init_data_libnet( struct interface_data *in + +Index: src/interfaces.c +--- src/interfaces.c.orig ++++ src/interfaces.c +@@ -102,9 +102,9 @@ + + #include "interfaces.h" + ++list_t *interfaces; + + +- + //////////////////////////////////////////////////////////////////////////////////////////////////// + + +@@ -218,13 +218,12 @@ interfaces_init_data_libnet( struct interface_data *in if ( ( libnet_hnd = libnet_init( LIBNET_LINK, interface->ifname, errbuflibnet ) ) ) { etheraddr = libnet_get_hwaddr( libnet_hnd ); @@ -16,7 +29,7 @@ $OpenBSD: patch-src_interfaces_c,v 1.2 2 write_log( 0," %s MAC = %02x%02x.%02x%02x.%02x%02x\n", interface->ifname, etheraddr->ether_addr_octet[0], etheraddr->ether_addr_octet[1], -@@ -286,7 +285,9 @@ interfaces_init( THREAD *pcap_th ) +@@ -283,7 +282,9 @@ interfaces_init( THREAD *pcap_th ) while( index ) { Index: patches/patch-src_interfaces_h =================================================================== RCS file: /cvs/OpenBSD/ports/net/yersinia/patches/patch-src_interfaces_h,v retrieving revision 1.1 diff -u -p -u -r1.1 patch-src_interfaces_h --- patches/patch-src_interfaces_h 26 Jul 2015 19:19:33 -0000 1.1 +++ patches/patch-src_interfaces_h 1 Mar 2021 17:35:33 -0000 @@ -1,12 +1,14 @@ -$OpenBSD: patch-src_interfaces_h,v 1.1 2015/07/26 19:19:33 steven Exp $ ---- src/interfaces.h.orig Sun Jul 19 20:31:52 2015 -+++ src/interfaces.h Sun Jul 19 20:32:51 2015 -@@ -51,7 +51,7 @@ +$OpenBSD$ + +Index: src/interfaces.h +--- src/interfaces.h.orig ++++ src/interfaces.h +@@ -67,7 +67,7 @@ - #define PROMISC 1 - #define TIMEOUT 500 --#define FILTER "stp || (udp and (port 1985 or port 68 or port 67)) || (ether host 01:00:0c:cc:cc:cc and ether[20:2] = 0x2000) || (ether host 01:00:0c:cc:cc:cc and ether[20:2] = 0x2004) || (ether host 01:00:0c:cc:cc:cc and ether[20:2] = 0x2003) || arp || vlan || (ether[14]=0xaa and ether[15]=0xaa and ether[0]=0x01 and ether[1]=0x00 and ether[2]=0x0c and ether[3]=0x00 and ether[4]=0x00) || (ether[0]=0x01 and ether[1]=0x80 and ether[2]=0xc2 and ether[12:2] = 0x888e) || mpls" -+#define FILTER "stp || (udp and (port 1985 or port 68 or port 67)) || (ether host 01:00:0c:cc:cc:cc and ether[20:2] = 0x2000) || (ether host 01:00:0c:cc:cc:cc and ether[20:2] = 0x2004) || (ether host 01:00:0c:cc:cc:cc and ether[20:2] = 0x2003) || arp || vlan || (ether[14]=0xaa and ether[15]=0xaa and ether[0]=0x01 and ether[1]=0x00 and ether[2]=0x0c and ether[3]=0x00 and ether[4]=0x00) || (ether[0]=0x01 and ether[1]=0x80 and ether[2]=0xc2 and ether[12:2] = 0x888e)" + #define NO_TIMEOUT 0 - /* Fields for recognizing packets */ - #define F_ETHERTYPE 1 +-list_t *interfaces; ++extern list_t *interfaces; + + struct interface_data { + int8_t up; /* is it active? */ Index: patches/patch-src_ncurses-callbacks_h =================================================================== RCS file: patches/patch-src_ncurses-callbacks_h diff -N patches/patch-src_ncurses-callbacks_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_ncurses-callbacks_h 1 Mar 2021 17:35:33 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Index: src/ncurses-callbacks.h +--- src/ncurses-callbacks.h.orig ++++ src/ncurses-callbacks.h +@@ -77,8 +77,8 @@ + #define CAN_RESIZE 1 + #endif + +-u_int8_t pointer[MAX_PROTOCOLS]; +-WINDOW *info_window; ++extern u_int8_t pointer[MAX_PROTOCOLS]; ++extern WINDOW *info_window; + + void ncurses_c_refresh_mwindow(u_int8_t, WINDOW *, u_int8_t, struct term_node *); + void ncurses_c_refresh_bwindow(u_int8_t, WINDOW *, struct term_node *); Index: patches/patch-src_ncurses-interface_c =================================================================== RCS file: patches/patch-src_ncurses-interface_c diff -N patches/patch-src_ncurses-interface_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_ncurses-interface_c 1 Mar 2021 17:35:33 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/ncurses-interface.c +--- src/ncurses-interface.c.orig ++++ src/ncurses-interface.c +@@ -92,6 +92,8 @@ + #include "ncurses-interface.h" + #include "ncurses-callbacks.h" + ++u_int8_t pointer[MAX_PROTOCOLS]; ++WINDOW *info_window; + + /* + * Ncurses init Index: patches/patch-src_ncurses-interface_h =================================================================== RCS file: patches/patch-src_ncurses-interface_h diff -N patches/patch-src_ncurses-interface_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_ncurses-interface_h 1 Mar 2021 17:35:33 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Index: src/ncurses-interface.h +--- src/ncurses-interface.h.orig ++++ src/ncurses-interface.h +@@ -80,8 +80,8 @@ + #define CAN_RESIZE 1 + #endif + +-u_int8_t pointer[MAX_PROTOCOLS]; +-WINDOW *info_window; ++extern u_int8_t pointer[MAX_PROTOCOLS]; ++extern WINDOW *info_window; + + int8_t ncurses_i_init(WINDOW *[], PANEL *[], struct term_node *); + void ncurses_i_add_node(void); Index: patches/patch-src_protocols_c =================================================================== RCS file: patches/patch-src_protocols_c diff -N patches/patch-src_protocols_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_protocols_c 1 Mar 2021 17:35:33 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/protocols.c +--- src/protocols.c.orig ++++ src/protocols.c +@@ -61,6 +61,8 @@ + + #include "protocols.h" + ++struct protocol_def protocols[MAX_PROTOCOLS]; ++ + void + protocol_init(void) + { Index: patches/patch-src_protocols_h =================================================================== RCS file: /cvs/OpenBSD/ports/net/yersinia/patches/patch-src_protocols_h,v retrieving revision 1.1.1.1 diff -u -p -u -r1.1.1.1 patch-src_protocols_h --- patches/patch-src_protocols_h 25 Oct 2010 23:12:02 -0000 1.1.1.1 +++ patches/patch-src_protocols_h 1 Mar 2021 17:35:37 -0000 @@ -1,7 +1,9 @@ $OpenBSD: patch-src_protocols_h,v 1.1.1.1 2010/10/25 23:12:02 steven Exp $ ---- src/protocols.h.orig Sun Jul 16 14:37:31 2006 -+++ src/protocols.h Thu Apr 24 23:46:12 2008 -@@ -26,6 +26,7 @@ + +Index: src/protocols.h +--- src/protocols.h.orig ++++ src/protocols.h +@@ -24,6 +24,7 @@ #define __PROTOCOLS_H__ #include <pcap.h> @@ -9,3 +11,12 @@ $OpenBSD: patch-src_protocols_h,v 1.1.1. #include <net/if.h> #ifdef SOLARIS +@@ -207,7 +208,7 @@ struct protocol_def { + end_t end; + }; + +-struct protocol_def protocols[MAX_PROTOCOLS]; ++extern struct protocol_def protocols[MAX_PROTOCOLS]; + + void protocol_init(void); + int8_t protocol_register(u_int8_t, const char *, const char *, const char *, -- Matthieu Herrb
