On 2020/02/20 23:48, Laurent Coustet wrote:
> Hi ports@
>
> I've fixed the last version of net/mlvpn in order to support
> OpenBSD 6.6+.
>
> No major changes, just random fixes and version bump.
>
> Changes:
>
> - Send keepalives every 1s, detect timeouts at 2s (@stapelberg)
> - Fix calculation of loss ration with sequence of tunnel (@flohoff)
> - Fix compiler warning (switch fall through)
> - Fix: ERRMSGSIZ should be greather than PATHMAX
> - Fix: OpenBSD: fix bad usage of TUNSIFINFO: missing type
> - FIX: BSD: tun device name fix. (allow tun10+ to be used)
>
> --
> Laurent Coustet
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/mlvpn/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile 12 Jul 2019 20:48:32 -0000 1.8
> +++ Makefile 20 Feb 2020 22:47:07 -0000
> @@ -2,7 +2,7 @@
>
> COMMENT = link-aggregation VPN software
>
> -V = 2.2.2
> +V = 2.3.4
> DISTNAME = mlvpn-$V
> DISTFILES = ${DISTNAME}{$V}.tar.gz
> WRKDIST = ${WRKDIR}/MLVPN-$V
I've reworked this stuff now you provide proper tar.gz files rather
than the github auto-generated ones (thanks :-)
> @@ -26,9 +26,10 @@ CONFIGURE_STYLE = autoreconf
> CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
> ac_cv_header_valgrind_valgrind_h=no
> +CONFIGURE_ARGS += --without-filters --without-control
That didn't build for me, needs --disable-filters not --without-filters.
Here's my diff (removed some things which aren't needed any more, regenerate
the PLIST on -current).
Updated diff (I haven't tested runtime) :-
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/mlvpn/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 12 Jul 2019 20:48:32 -0000 1.8
+++ Makefile 21 Feb 2020 00:28:22 -0000
@@ -2,38 +2,29 @@
COMMENT = link-aggregation VPN software
-V = 2.2.2
+V = 2.3.4
DISTNAME = mlvpn-$V
-DISTFILES = ${DISTNAME}{$V}.tar.gz
-WRKDIST = ${WRKDIR}/MLVPN-$V
-REVISION = 3
CATEGORIES = net
-HOMEPAGE = http://www.mlvpn.fr/
+HOMEPAGE = https://zehome.github.io/MLVPN/
# BSD
PERMIT_PACKAGE = Yes
WANTLIB += c ev m sodium
-MASTER_SITES = https://github.com/zehome/MLVPN/archive/
+MASTER_SITES = https://github.com/zehome/MLVPN/releases/download/$V/
LIB_DEPENDS = devel/libev \
security/libsodium
-CONFIGURE_STYLE = autoreconf
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS += --disable-control \
+ --disable-filters
CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
ac_cv_header_valgrind_valgrind_h=no
-
-AUTOCONF_VERSION = 2.69
-AUTOMAKE_VERSION = 1.14
-AUTORECONF = ./autogen.sh
-
-post-patch:
- cd ${WRKSRC}; \
- [ -r .tarball-version ] || echo $V > .tarball-version
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mlvpn
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/mlvpn/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 24 Oct 2015 08:32:14 -0000 1.2
+++ distinfo 21 Feb 2020 00:28:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (mlvpn-2.2.2.tar.gz) = +kVbV9jmdlUNAc/lUkjVtZX8qBLM69ql6tJBLEMgVF8=
-SIZE (mlvpn-2.2.2.tar.gz) = 78919
+SHA256 (mlvpn-2.3.4.tar.gz) = /Lomb9Y9HQkWGju7AIT6VX7k5ch27F68SjCp59BHgc4=
+SIZE (mlvpn-2.3.4.tar.gz) = 214706
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/mlvpn/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 23 Oct 2015 09:28:58 -0000 1.1.1.1
+++ pkg/PLIST 21 Feb 2020 00:28:22 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/10/23 09:28:58 sthen Exp $
@newgroup _mlvpn:758
@newuser _mlvpn:758:_mlvpn:daemon:mlvpn user:/var/empty:/sbin/nologin
+@rcscript ${RCDIR}/mlvpn
@man man/man1/mlvpn.1
@man man/man5/mlvpn.conf.5
@bin sbin/mlvpn
@@ -13,10 +14,11 @@ share/doc/mlvpn/README.debug.md
share/doc/mlvpn/README.md
share/doc/mlvpn/mlvpn.default
share/doc/mlvpn/mlvpn.init.d
+share/doc/mlvpn/mlvpn.rc
share/examples/mlvpn/
+@mode 770
@owner root
@group wheel
-@mode 770
@sample ${SYSCONFDIR}/mlvpn/
@mode
share/examples/mlvpn/mlvpn.conf
@@ -26,7 +28,3 @@ share/examples/mlvpn/mlvpn.conf
share/examples/mlvpn/mlvpn_updown.sh
@mode 700
@sample ${SYSCONFDIR}/mlvpn/mlvpn_updown.sh
-@mode
-@owner
-@group
-@rcscript ${RCDIR}/mlvpn
