Re: tinc: update to 1.1pre17 (second attempt)

On Sun, 03 Jan 2021, Klemens Nanni wrote:

> https://marc.info/?l=openbsd-ports&m=156916051316517&w=2 was my first
> attempt over a year ago to update.
>
> naddy and sthen had provided feedback which made it to the final diff;
> thread/diff and my interest stalled after that, now I have a use case
> for tinc again, so hopefully we can get it in this time.
>
> This is the same diff I sent last time except for TEST_IS_INTERACTIVE
> now being set along with a tiny patch to unbreak building tests.
>
> OK?

Tested in one of my nodes (amd64) that acts as a "bridge" between a
debian10 and a 6.8-stable.
I have it running for a couple of hours without problems.

ok paco.

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/tinc/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 4 Apr 2020 01:18:43 -0000 1.14
> +++ Makefile 3 Jan 2021 02:19:33 -0000
> @@ -1,28 +1,30 @@
> # $OpenBSD: Makefile,v 1.14 2020/04/04 01:18:43 kn Exp $
>
> COMMENT = Virtual Private Network (VPN) daemon
> -DISTNAME = tinc-1.0.36
> +DISTNAME = tinc-1.1pre17
> CATEGORIES = net security
> EPOCH = 0
> -REVISION = 0
>
> HOMEPAGE = https://www.tinc-vpn.org/
>
> # GPLv2+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += c crypto lzo2 z
> +WANTLIB += c crypto curses lzo2 m readline z
>
> 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"
> + LDFLAGS="-L${LOCALBASE}/lib" \
> + tinc_cv_attribute___nonnull__=yes
>
> USE_GMAKE = Yes
> +
> +TEST_IS_INTERACTIVE = XXX spawns tincd processes
>
> post-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tinc
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/net/tinc/distinfo,v
> retrieving revision 1.10
> diff -u -p -r1.10 distinfo
> --- distinfo 2 Sep 2019 20:55:08 -0000 1.10
> +++ distinfo 3 Jan 2021 02:03:03 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (tinc-1.0.36.tar.gz) = QPc7s/rMSA7/4OdxRCpwb/BIjt6npfJQXUzLKqgWMQg=
> -SIZE (tinc-1.0.36.tar.gz) = 500320
> +SHA256 (tinc-1.1pre17.tar.gz) = YbnJ+fOWdoVR85IW7cxBkYxlkJ/9mvBx/rO1+fmsHCc=
> +SIZE (tinc-1.1pre17.tar.gz) = 927313
> Index: patches/patch-test_splice_c
> ===================================================================
> RCS file: patches/patch-test_splice_c
> diff -N patches/patch-test_splice_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-test_splice_c 3 Jan 2021 02:13:55 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +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
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/net/tinc/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 9 Oct 2018 20:32:45 -0000 1.4
> +++ pkg/PLIST 3 Jan 2021 02:03:04 -0000
> @@ -4,7 +4,10 @@
> @rcscript ${RCDIR}/tincd
> @info info/tinc.info
> @man man/man5/tinc.conf.5
> +@comment @man man/man8/tinc-gui.8
> +@man man/man8/tinc.8
> @man man/man8/tincd.8
> +@bin sbin/tinc
> @bin sbin/tincd
> share/examples/tinc/
> share/examples/tinc/hosts/
>

--
Paco Esteban.
0x5818130B8A6DBC03