update to tinc-1.1pre18

drop SEPARATE_BUILD, it breaks the tests
This commit is contained in:
sthen 2022-03-10 14:31:59 +00:00
parent 02593a73ac
commit bed7f75fc7
5 changed files with 6 additions and 25 deletions

View File

@ -1,7 +1,5 @@
# $OpenBSD: Makefile,v 1.15 2021/01/03 22:53:18 kn Exp $
COMMENT = Virtual Private Network (VPN) daemon
DISTNAME = tinc-1.1pre17
DISTNAME = tinc-1.1pre18
CATEGORIES = net security
EPOCH = 0
@ -16,7 +14,6 @@ MASTER_SITES = https://www.tinc-vpn.org/packages/
LIB_DEPENDS += archivers/lzo2
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \

View File

@ -1,2 +1,2 @@
SHA256 (tinc-1.1pre17.tar.gz) = YbnJ+fOWdoVR85IW7cxBkYxlkJ/9mvBx/rO1+fmsHCc=
SIZE (tinc-1.1pre17.tar.gz) = 927313
SHA256 (tinc-1.1pre18.tar.gz) = J1fdxiz2S0EfVp2y+oXCXshGwNsRACP2vvszaR8HiYY=
SIZE (tinc-1.1pre18.tar.gz) = 732111

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-test_splice_c,v 1.1 2021/01/03 22:53:18 kn Exp $
Include <sys/select.h> to fix
error: use of undeclared identifier 'fd_set'
Index: test/splice.c
--- test/splice.c.orig
+++ test/splice.c
@@ -23,6 +23,7 @@
#include <errno.h>
#include <sys/types.h>
#include <sys/socket.h>
+#include <sys/select.h>
#include <netdb.h>
#ifdef HAVE_MINGW

View File

@ -1,4 +1,3 @@
@comment $OpenBSD: PLIST,v 1.5 2021/01/03 22:53:18 kn Exp $
@newgroup _tinc:759
@newuser _tinc:759:_tinc:daemon:tinc user:/var/empty:/sbin/nologin
@rcscript ${RCDIR}/tincd
@ -9,6 +8,9 @@
@man man/man8/tincd.8
@bin sbin/tinc
@bin sbin/tincd
share/bash-completion/
share/bash-completion/completions/
share/bash-completion/completions/tinc
share/examples/tinc/
share/examples/tinc/hosts/
@mode 750

View File

@ -1,6 +1,4 @@
#!/bin/ksh
#
# $OpenBSD: tincd.rc,v 1.2 2018/01/11 19:27:08 rpe Exp $
daemon="${TRUEPREFIX}/sbin/tincd"
daemon_flags="-U _tinc --chroot --net=example"