Re: update request: net/mlvpn

2020-03-30 Thread Laurent Coustet

Le 28/03/2020 à 12:44, Solene Rapenne a écrit :

In kdump output

  18793 mlvpnGIO   fd 2 wrote 62 bytes
"2020-03-28T12:34:22 \^[[1;34m[INFO]\^[[0m em0 bind to 192.168.1.9
"
  18793 mlvpnRET   write 62/0x3e
  18793 mlvpnPSIG  SIGSEGV SIG_DFL code SEGV_MAPERR<1> addr=0x161473675b 
trapno=6
  18793 mlvpnNAMI  "/var/crash/mlvpn.core"


I've fixed this issue with mlvpn 2.3.5.

I cannot reproduce the pledge problem for now, will try later..

--
Laurent



Re: update request: net/mlvpn

2020-03-28 Thread Solene Rapenne
On Sat, Mar 28, 2020 at 06:49:09PM +0100, Solene Rapenne wrote:
> On Sat, Mar 28, 2020 at 12:44:07PM +0100, Solene Rapenne wrote:
> > On Thu, Feb 20, 2020 at 11:48:01PM +0100, 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
> > 
> > thank you for your update :)
> > 
> > on -current I still can't run it (didn't try on 6.6 as a client). with
> > ktrace I found it was producing a .core file in /var/crash which may
> > help finding what the issue is.
> > 
> > here is my client config
> > 
> > [general]
> > statuscommand = "/etc/mlvpn/mlvpn_updown.sh"
> > loglevel = 5
> > mode = "client"
> > mtu = 1442
> > tuntap = "tun"
> > interface_name = "tun0"
> > timeout = 30
> > 
> > password = "XX"
> > cleartext_data = 0
> > 
> > [iwm0]
> > bindhost = "0.0.0.0"
> > remotehost = "XXX"
> > remoteport = 5081
> > bindfib = 1
> > 
> > [em0]
> > bindhost = "192.168.1.9"
> > remotehost = "XXX"
> > remoteport = 5080
> > bindfib = 0
> > 
> > When I run it
> > 
> > solene# mlvpn -c mlvpn.conf  --debug -v -u _mlvpn
> > 2020-03-28T12:41:24 [ DBG] absolute maximum mtu: 1444
> > 2020-03-28T12:41:24 [INFO/config] new password set
> > 2020-03-28T12:41:24 [INFO/config] em0 tunnel added
> > 2020-03-28T12:41:24 [INFO] created interface `tun0'
> > 2020-03-28T12:41:24 [INFO] em0 bind to 192.168.1.9
> > solene#
> > 
> > 
> > In kdump output
> > 
> >  18793 mlvpnGIO   fd 2 wrote 62 bytes
> >"2020-03-28T12:34:22 \^[[1;34m[INFO]\^[[0m em0 bind to 192.168.1.9
> >"
> >  18793 mlvpnRET   write 62/0x3e
> >  18793 mlvpnPSIG  SIGSEGV SIG_DFL code SEGV_MAPERR<1> addr=0x161473675b 
> > trapno=6
> >  18793 mlvpnNAMI  "/var/crash/mlvpn.core"
> >  26746 mlvpnRET   read 0
> >  26746 mlvpnCALL  close(3)
> >  26746 mlvpnRET   close 0
> >  26746 mlvpnCALL  kbind(0x7f7d6158,24,0x5f32ced114736743)
> >  26746 mlvpnRET   kbind 0
> >  26746 mlvpnCALL  exit(1)
> > 
> > 
> > in egdb
> > 
> > solene# egdb mlvpn /var/crash/mlvpn.core
> > GNU gdb (GDB) 7.12.1
> > Copyright (C) 2017 Free Software Foundation, Inc.
> > License GPLv3+: GNU GPL version 3 or later 
> > 
> > This is free software: you are free to change and redistribute it.
> > There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
> > and "show warranty" for details.
> > This GDB was configured as "x86_64-unknown-openbsd6.6".
> > Type "show configuration" for configuration details.
> > For bug reporting instructions, please see:
> > .
> > Find the GDB manual and other documentation resources online at:
> > .
> > For help, type "help".
> > Type "apropos word" to search for commands related to "word"...
> > Reading symbols from mlvpn...(no debugging symbols found)...done.
> > [New process 365785]
> > Core was generated by `mlvpn'.
> > Program terminated with signal SIGSEGV, Segmentation fault.
> > #0  0x15e641410250 in ?? ()
> > (gdb) bt
> > #0  0x15e641410250 in ?? ()
> > #1  0x15e64140e655 in ?? ()
> > #2  0x15e92822b10f in ev_invoke_pending (loop=0x15e928234350 
> > ) at ev.c:3372
> > #3  0x15e92822c004 in ev_run (loop=0x15e928234350 
> > , flags=) at ev.c:3775
> > #4  0x15e64140f52b in ?? ()
> > #5  0x15e64140613b in ?? ()
> > #6  0x in ?? ()
> > 
> > 
> > I installed debug-mlvpn and devel-libev but the egdb output is still ??, I'm
> > stuck here, I don't understand how to get informations from egdb :/
> > 
> 
> I've made some progress. Building mlvpn without pledge feature stopped
> triggering a pledge error.
> 
> And not defining bindhost for an interface on the client will default to
> "any" in the code and then the client can connect to server and exchange
> some data
> 
> 2020-03-28T18:46:05 [INFO/protocol] dsl1 new connection -> 
> XX:15559
> 2020-03-28T18:46:05 [ DBG/net] < dsl1 recv 46 bytes (type=0, seq=0, reorder=1)
> 2020-03-28T18:46:05 [ DBG/protocol] dsl1 sending 'OK'
> 2020-03-28T18:46:05 [INFO/protocol] dsl1 authenticated
> 2020-03-28T18:46:05 [ DBG/net] > dsl1 sent 46 bytes (size=2, type=1, seq=0, 
> reorder=1)
> 2020-03-28T18:46:05 [INFO/protocol] 4g new connection -> X:9963
> 2020-03-28T18:46:05 [ DBG/net] < 4g recv 46 bytes (type=0, seq=0, reorder=1)
> 

Re: update request: net/mlvpn

2020-03-28 Thread Solene Rapenne
On Sat, Mar 28, 2020 at 12:44:07PM +0100, Solene Rapenne wrote:
> On Thu, Feb 20, 2020 at 11:48:01PM +0100, 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
> 
> thank you for your update :)
> 
> on -current I still can't run it (didn't try on 6.6 as a client). with
> ktrace I found it was producing a .core file in /var/crash which may
> help finding what the issue is.
> 
> here is my client config
> 
> [general]
> statuscommand = "/etc/mlvpn/mlvpn_updown.sh"
> loglevel = 5
> mode = "client"
> mtu = 1442
> tuntap = "tun"
> interface_name = "tun0"
> timeout = 30
> 
> password = "XX"
> cleartext_data = 0
> 
> [iwm0]
> bindhost = "0.0.0.0"
> remotehost = "XXX"
> remoteport = 5081
> bindfib = 1
> 
> [em0]
> bindhost = "192.168.1.9"
> remotehost = "XXX"
> remoteport = 5080
> bindfib = 0
> 
> When I run it
> 
> solene# mlvpn -c mlvpn.conf  --debug -v -u _mlvpn
> 2020-03-28T12:41:24 [ DBG] absolute maximum mtu: 1444
> 2020-03-28T12:41:24 [INFO/config] new password set
> 2020-03-28T12:41:24 [INFO/config] em0 tunnel added
> 2020-03-28T12:41:24 [INFO] created interface `tun0'
> 2020-03-28T12:41:24 [INFO] em0 bind to 192.168.1.9
> solene#
> 
> 
> In kdump output
> 
>  18793 mlvpnGIO   fd 2 wrote 62 bytes
>"2020-03-28T12:34:22 \^[[1;34m[INFO]\^[[0m em0 bind to 192.168.1.9
>"
>  18793 mlvpnRET   write 62/0x3e
>  18793 mlvpnPSIG  SIGSEGV SIG_DFL code SEGV_MAPERR<1> addr=0x161473675b 
> trapno=6
>  18793 mlvpnNAMI  "/var/crash/mlvpn.core"
>  26746 mlvpnRET   read 0
>  26746 mlvpnCALL  close(3)
>  26746 mlvpnRET   close 0
>  26746 mlvpnCALL  kbind(0x7f7d6158,24,0x5f32ced114736743)
>  26746 mlvpnRET   kbind 0
>  26746 mlvpnCALL  exit(1)
> 
> 
> in egdb
> 
> solene# egdb mlvpn /var/crash/mlvpn.core
> GNU gdb (GDB) 7.12.1
> Copyright (C) 2017 Free Software Foundation, Inc.
> License GPLv3+: GNU GPL version 3 or later 
> This is free software: you are free to change and redistribute it.
> There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
> and "show warranty" for details.
> This GDB was configured as "x86_64-unknown-openbsd6.6".
> Type "show configuration" for configuration details.
> For bug reporting instructions, please see:
> .
> Find the GDB manual and other documentation resources online at:
> .
> For help, type "help".
> Type "apropos word" to search for commands related to "word"...
> Reading symbols from mlvpn...(no debugging symbols found)...done.
> [New process 365785]
> Core was generated by `mlvpn'.
> Program terminated with signal SIGSEGV, Segmentation fault.
> #0  0x15e641410250 in ?? ()
> (gdb) bt
> #0  0x15e641410250 in ?? ()
> #1  0x15e64140e655 in ?? ()
> #2  0x15e92822b10f in ev_invoke_pending (loop=0x15e928234350 
> ) at ev.c:3372
> #3  0x15e92822c004 in ev_run (loop=0x15e928234350 , 
> flags=) at ev.c:3775
> #4  0x15e64140f52b in ?? ()
> #5  0x15e64140613b in ?? ()
> #6  0x in ?? ()
> 
> 
> I installed debug-mlvpn and devel-libev but the egdb output is still ??, I'm
> stuck here, I don't understand how to get informations from egdb :/
> 

I've made some progress. Building mlvpn without pledge feature stopped
triggering a pledge error.

And not defining bindhost for an interface on the client will default to
"any" in the code and then the client can connect to server and exchange
some data

2020-03-28T18:46:05 [INFO/protocol] dsl1 new connection -> XX:15559
2020-03-28T18:46:05 [ DBG/net] < dsl1 recv 46 bytes (type=0, seq=0, reorder=1)
2020-03-28T18:46:05 [ DBG/protocol] dsl1 sending 'OK'
2020-03-28T18:46:05 [INFO/protocol] dsl1 authenticated
2020-03-28T18:46:05 [ DBG/net] > dsl1 sent 46 bytes (size=2, type=1, seq=0, 
reorder=1)
2020-03-28T18:46:05 [INFO/protocol] 4g new connection -> X:9963
2020-03-28T18:46:05 [ DBG/net] < 4g recv 46 bytes (type=0, seq=0, reorder=1)
2020-03-28T18:46:05 [ DBG/protocol] 4g sending 'OK'
2020-03-28T18:46:05 [INFO/protocol] 4g authenticated
2020-03-28T18:46:05 [ DBG/net] > 4g sent 46 bytes (size=2, type=1, seq=0, 
reorder=1)
2020-03-28T18:46:06 [ DBG/reorder] adjusting reordering drain timeout to 180ms
2020-03-28T18:46:07 [ DBG/net] < dsl1 recv 44 bytes (type=2, seq=0, 

Re: update request: net/mlvpn

2020-03-28 Thread Stuart Henderson
On 2020/03/28 17:12, Stuart Henderson wrote:
> On 2020/03/28 12:44, Solene Rapenne wrote:
> > Reading symbols from mlvpn...(no debugging symbols found)...done.
> 
> This indicates that you are using an old binary that doesn't have the debug
> information included. After adding DEBUG_PACKAGES to the port, you need to
> rebuild/reinstall the main package, not just install the new debug package,
> because DEBUG_PACKAGES changes the main package too (to add information to
> the binary showing gdb where to find the debug info).
> 

...or you can just rebuild with DEBUG=-g as usual and not use DEBUG_PACKAGES.



Re: update request: net/mlvpn

2020-03-28 Thread Stuart Henderson
On 2020/03/28 12:44, Solene Rapenne wrote:
> Reading symbols from mlvpn...(no debugging symbols found)...done.

This indicates that you are using an old binary that doesn't have the debug
information included. After adding DEBUG_PACKAGES to the port, you need to
rebuild/reinstall the main package, not just install the new debug package,
because DEBUG_PACKAGES changes the main package too (to add information to
the binary showing gdb where to find the debug info).



Re: update request: net/mlvpn

2020-03-28 Thread Solene Rapenne
On Thu, Feb 20, 2020 at 11:48:01PM +0100, 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

thank you for your update :)

on -current I still can't run it (didn't try on 6.6 as a client). with
ktrace I found it was producing a .core file in /var/crash which may
help finding what the issue is.

here is my client config

[general]
statuscommand = "/etc/mlvpn/mlvpn_updown.sh"
loglevel = 5
mode = "client"
mtu = 1442
tuntap = "tun"
interface_name = "tun0"
timeout = 30

password = "XX"
cleartext_data = 0

[iwm0]
bindhost = "0.0.0.0"
remotehost = "XXX"
remoteport = 5081
bindfib = 1

[em0]
bindhost = "192.168.1.9"
remotehost = "XXX"
remoteport = 5080
bindfib = 0

When I run it

solene# mlvpn -c mlvpn.conf  --debug -v -u _mlvpn
2020-03-28T12:41:24 [ DBG] absolute maximum mtu: 1444
2020-03-28T12:41:24 [INFO/config] new password set
2020-03-28T12:41:24 [INFO/config] em0 tunnel added
2020-03-28T12:41:24 [INFO] created interface `tun0'
2020-03-28T12:41:24 [INFO] em0 bind to 192.168.1.9
solene#


In kdump output

 18793 mlvpnGIO   fd 2 wrote 62 bytes
   "2020-03-28T12:34:22 \^[[1;34m[INFO]\^[[0m em0 bind to 192.168.1.9
   "
 18793 mlvpnRET   write 62/0x3e
 18793 mlvpnPSIG  SIGSEGV SIG_DFL code SEGV_MAPERR<1> addr=0x161473675b 
trapno=6
 18793 mlvpnNAMI  "/var/crash/mlvpn.core"
 26746 mlvpnRET   read 0
 26746 mlvpnCALL  close(3)
 26746 mlvpnRET   close 0
 26746 mlvpnCALL  kbind(0x7f7d6158,24,0x5f32ced114736743)
 26746 mlvpnRET   kbind 0
 26746 mlvpnCALL  exit(1)


in egdb

solene# egdb mlvpn /var/crash/mlvpn.core
GNU gdb (GDB) 7.12.1
Copyright (C) 2017 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
and "show warranty" for details.
This GDB was configured as "x86_64-unknown-openbsd6.6".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
.
Find the GDB manual and other documentation resources online at:
.
For help, type "help".
Type "apropos word" to search for commands related to "word"...
Reading symbols from mlvpn...(no debugging symbols found)...done.
[New process 365785]
Core was generated by `mlvpn'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0  0x15e641410250 in ?? ()
(gdb) bt
#0  0x15e641410250 in ?? ()
#1  0x15e64140e655 in ?? ()
#2  0x15e92822b10f in ev_invoke_pending (loop=0x15e928234350 
) at ev.c:3372
#3  0x15e92822c004 in ev_run (loop=0x15e928234350 , 
flags=) at ev.c:3775
#4  0x15e64140f52b in ?? ()
#5  0x15e64140613b in ?? ()
#6  0x in ?? ()


I installed debug-mlvpn and devel-libev but the egdb output is still ??, I'm
stuck here, I don't understand how to get informations from egdb :/



Re: update request: net/mlvpn

2020-02-21 Thread ed

On 21.02.2020 01:33, Stuart Henderson wrote:

I've reworked this stuff now you provide proper tar.gz files rather
than the github auto-generated ones (thanks :-)


Oh yes, that's better indeed.

You are right for --disable-filters, sorry for the mistake.

Thank you,

--
Laurent Coustet



Re: update request: net/mlvpn

2020-02-20 Thread Stuart Henderson
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 -  1.8
> +++ Makefile  20 Feb 2020 22:47:07 -
> @@ -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
--- Makefile12 Jul 2019 20:48:32 -  1.8
+++ Makefile21 Feb 2020 00:28:22 -
@@ -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
--- distinfo24 Oct 2015 08:32:14 -  1.2
+++ distinfo21 Feb 2020 00:28:22 -
@@ -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 -  1.1.1.1
+++ pkg/PLIST   21 Feb 2020 00:28:22 -
@@ -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



update request: net/mlvpn

2020-02-20 Thread Laurent Coustet

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 -	1.8
+++ Makefile	20 Feb 2020 22:47:07 -
@@ -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
@@ -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
 
 AUTOCONF_VERSION =	2.69
-AUTOMAKE_VERSION =	1.14
+AUTOMAKE_VERSION =	1.16
 AUTORECONF =		./autogen.sh
 
 post-patch:
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 -	1.2
+++ distinfo	20 Feb 2020 22:47:07 -
@@ -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) = cXmPLE9B5FCaLv1SmYaQGM9k0ZpnJjM7JQuFo2f5xYU=
+SIZE (mlvpn-2.3.4.tar.gz) = 88270
cvs server: Diffing pkg