merge in a simplified version of Bjorn Ketelaars tests diffs

net/ocserv/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2016/03/19 20:03:46 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2016/03/19 20:24:32 sthen Exp $
 
 COMMENT=	server implementing the AnyConnect SSL VPN protocol
 
@@ -28,6 +28,9 @@ LIB_DEPENDS=	archivers/lz4 \
 		security/gnutls \
 		security/oath-toolkit \
 		security/openpam
+TEST_DEPENDS=	net/openconnect \
+		shells/bash \
+		sysutils/coreutils
 
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.69
@@ -42,14 +45,13 @@ CONFIGURE_ARGS=	--enable-local-libopts \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-# most tests are known to fail on OpenBSD anyway, but let's patch the
-# obvious issues.
 post-extract:
-	sed -i 's,/usr/local/bin/bash,${LOCALBASE}/bin/bash,' \
-	    ${WRKSRC}/tests/test-iroute
-	sed -i 's,/usr/local/sbin/openconnect,${LOCALBASE}/sbin/openconnect,' \
+	sed -i 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
+	    ${WRKSRC}/tests/test-{iroute,append-routes,user-config}
+	sed -i 's,/usr/sbin/openconnect,${LOCALBASE}/sbin/openconnect,' \
 	    ${WRKSRC}/tests/common.sh
-	sed -i 's,/etc/ocserv,${SYSCONFDIR}/ocserv,' ${WRKSRC}/src/ocpasswd/ocpasswd.c
+	sed -i 's,/etc/ocserv,${SYSCONFDIR}/ocserv,' \
+	    ${WRKSRC}/src/ocpasswd/ocpasswd.c
 	cd ${WRKSRC}; \
 	    sed -i 's,/usr/bin/ocserv-fw,${SYSCONFDIR}/ocserv/ocserv-fw,g' \
 	    src/ocserv-args.def src/main-user.c doc/ocserv.8 doc/sample.config
@@ -63,4 +65,11 @@ post-install:
 	    ${WRKSRC}/doc/sample.config \
 	    ${PREFIX}/share/examples/ocserv/sample.config
 
+pre-test:
+	ln -fs ${LOCALBASE}/bin/gtimeout ${WRKDIR}/bin/timeout
+
+post-test:
+	@[ `id -u` == 0 ] || printf \
+	 "\n*** NOTE: ocserv has loopback tests which require root ***\n\n"
+
 .include <bsd.port.mk>

net/ocserv/patches/patch-tests_common_sh

@@ -1,12 +1,17 @@
-$OpenBSD: patch-tests_common_sh,v 1.2 2016/02/25 10:22:01 sthen Exp $
---- tests/common.sh.orig	Thu Feb 25 10:17:04 2016
-+++ tests/common.sh	Thu Feb 25 10:17:04 2016
-@@ -39,7 +39,7 @@ else
- 	OPENCONNECT="eval LD_PRELOAD=libsocket_wrapper.so /usr/sbin/openconnect"
+$OpenBSD: patch-tests_common_sh,v 1.3 2016/03/19 20:24:32 sthen Exp $
+--- tests/common.sh.orig	Sat Mar 19 20:11:15 2016
++++ tests/common.sh	Sat Mar 19 20:11:43 2016
+@@ -30,13 +30,6 @@ if test -z "$NO_NEED_ROOT";then
+ 	if [ $? != 0 ];then
+ 		exit 77
+ 	fi
+-else
+-	SOCKDIR=${srcdir}/sockwrap.$$.tmp
+-	mkdir -p $SOCKDIR
+-	export SOCKET_WRAPPER_DIR=$SOCKDIR
+-	export SOCKET_WRAPPER_DEFAULT_IFACE=2
+-	ADDRESS=127.0.0.$SOCKET_WRAPPER_DEFAULT_IFACE
+-	OPENCONNECT="eval LD_PRELOAD=libsocket_wrapper.so /usr/local/sbin/openconnect"
  fi
  
--if ! test -x /usr/sbin/openconnect;then
-+if ! test -x /usr/local/sbin/openconnect;then
- 	echo "You need openconnect to run this test"
- 	exit 77
- fi
+ if ! test -x /usr/local/sbin/openconnect;then

net/ocserv/patches/patch-tests_test-iroute

@@ -1,9 +0,0 @@
-$OpenBSD: patch-tests_test-iroute,v 1.1.1.1 2015/03/26 02:07:59 sthen Exp $
---- tests/test-iroute.orig	Thu Mar 26 01:54:19 2015
-+++ tests/test-iroute	Thu Mar 26 01:52:33 2015
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
- #
- # Copyright (C) 2013 Nikos Mavrogiannopoulos
- #

net/ocserv/patches/patch-tests_test1_passwd

@@ -0,0 +1,18 @@
+$OpenBSD: patch-tests_test1_passwd,v 1.1 2016/03/19 20:24:32 sthen Exp $
+--- tests/test1.passwd.orig	Sat Mar 19 20:13:13 2016
++++ tests/test1.passwd	Sat Mar 19 20:13:34 2016
+@@ -1,7 +1,7 @@
+-test:tost,group1, group2 , group3:$5$i6SNmLDCgBNjyJ7q$SZ4bVJb7I/DLgXo3txHBVohRFBjOtdbxGQZp.DOnrA.
+-sp@c/al:*:$5$kDNrlGibUoktiQ0n$mE/ys1XehvvoWQiSqAfB.Aw1WbAYayMV/ZYTX/6IlkC
+-test2:*:$5$QB3iB31ID49rW6kr$wSvbsDTzUPw51hqWTgvac9LyJ6HLv2HYyxh2Ud4v.x1
+-test3:*:$5$d24yO9edrMd5ISka$/77d6DRK4fhdbTAecc4V8mmnQXSOU4Qn4zZQhOVaEqC
+-test4:*:$5$5Hzjz2RPxM70vXiH$lCAFmGx77MNcauzf30.HJlKWm8dwVNiut.nyZyQRndC
+-test5:*:$5$nvA.6.RBPqZg16K2$WAEXw7MJaSUj/Nwosu54JfqxMDlkZnrG.0/rsxl276C
+-empty:*:$5$tScKhdO1ZcJ0GmmQ$rw095k.ThqbeQ60N06efHnAOibV/GoW5cRZKyHr8jd2
++test:tost,group1, group2 , group3:$2b$08$qKGFp2FTpVipEM7l/D8zPe521FWFInaDm2PKdVtsZM4a.I5FYyZV.
++sp@c/al:*:$2b$08$Ed85hGxnOCi4GMCXpt61oeZ7Bd/hRElooeklJ2aPoyvxUFSK7gp8S
++test2:*:$2b$08$al3CDMh.0F6ao3QO0OfzwefhCvkkyILRYPp1cM1IOYwqicmB17AsG
++test3:*:$2b$08$dNPAuuiX5XvyspUEkfU3Nu9.EzvdNQx0tse2Xdkz9mY9J6R3TEsSe
++test4:*:$2b$08$ke7XBTm5uSybWnDAfanujee2uiNQqE2sAahftS21r15jr7S45vHF.
++test5:*:$2b$08$XBZ6EzdfZeDKwCAKEhW1gOuk8KCHTP8H1DGV9jAbs5puoa1IwC8tS
++empty:*:$2b$08$zEZ353QW.QSDhZ28DCLzM.Wqg6QKEfODnvWIfOluoijAn8vI/37qK