[update] net/ocserv 0.12.3 -> 0.12.4

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[update] net/ocserv 0.12.3 -> 0.12.4

Björn Ketelaars
Enclosed diff brings ocserv to 0.12.4, which is a bug fix release. From
[0]:
- Added support for radius access-challenge (multifactor)
  authentication.
- Fixed race condition when connect-script and disconnect-script are
  set, which could potentially cause a crash (#208).
- Perform quicker cleanup of sessions which their user explicitly
  disconnected (#210).

Changes to the port:
- PERMIT_PACKAGE_CDROM -> PERMIT_PACKAGE;
- Instead of feeding specific files to sed to modify bash's path use
  find. The list of tests, which require bash grows every release.

Testing:
- 'make test' runs successfully on amd64;
- Run tested for a couple of days, no regressions found.

OK?

[0] http://lists.infradead.org/pipermail/openconnect-devel/2019-July/005378.html]


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ocserv/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile 14 Mar 2019 04:20:18 -0000 1.36
+++ Makefile 6 Jul 2019 09:46:20 -0000
@@ -2,7 +2,7 @@
 
 COMMENT= server implementing the AnyConnect SSL VPN protocol
 
-DISTNAME= ocserv-0.12.3
+DISTNAME= ocserv-0.12.4
 EXTRACT_SUFX= .tar.xz
 
 CATEGORIES= net
@@ -12,7 +12,7 @@ HOMEPAGE= https://ocserv.gitlab.io/www/
 MAINTAINER= Bjorn Ketelaars <[hidden email]>
 
 # GPLv2+
-PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE= Yes
 
 WANTLIB+= c curses ev gnutls lz4 m nettle oath pam protobuf-c
 WANTLIB+= radcli readline talloc
@@ -44,10 +44,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/
 AUTOCONF_VERSION= 2.69
 
 post-extract:
- sed -i 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
-    ${WRKSRC}/tests/test-{iroute,append-routes,user-config} \
-    ${WRKSRC}/tests/haproxy-connect \
-    ${WRKSRC}/tests/multiple-routes
+ find ${WRKSRC}/tests -type f -exec \
+    sed -i 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' {} +
  sed -i 's,/usr/sbin/openconnect,${LOCALBASE}/sbin/openconnect,' \
     ${WRKSRC}/tests/common.sh
  sed -i 's,/etc/ocserv,${SYSCONFDIR}/ocserv,' \
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ocserv/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo 14 Mar 2019 04:20:18 -0000 1.26
+++ distinfo 6 Jul 2019 09:46:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (ocserv-0.12.3.tar.xz) = Qvj0Wdrm+Ihi1AmJl9j1Zo2XQ57Hi+7eOYX2/yTZHt0=
-SIZE (ocserv-0.12.3.tar.xz) = 683632
+SHA256 (ocserv-0.12.4.tar.xz) = BcAe/6inwvAiYW/LYrreTfUap/ADUkhnHaEoGdYssYU=
+SIZE (ocserv-0.12.4.tar.xz) = 763540

Reply | Threaded
Open this post in threaded view
|

Re: [update] net/ocserv 0.12.3 -> 0.12.4

Stuart Henderson
On 2019/07/06 11:55, Björn Ketelaars wrote:

> Enclosed diff brings ocserv to 0.12.4, which is a bug fix release. From
> [0]:
> - Added support for radius access-challenge (multifactor)
>   authentication.
> - Fixed race condition when connect-script and disconnect-script are
>   set, which could potentially cause a crash (#208).
> - Perform quicker cleanup of sessions which their user explicitly
>   disconnected (#210).
>
> Changes to the port:
> - PERMIT_PACKAGE_CDROM -> PERMIT_PACKAGE;
> - Instead of feeding specific files to sed to modify bash's path use
>   find. The list of tests, which require bash grows every release.
>
> Testing:
> - 'make test' runs successfully on amd64;
> - Run tested for a couple of days, no regressions found.
>
> OK?

OK, or maybe it's worth restricting to only executable files?

        find ${WRKSRC}/tests -type f -perm -+x [...]

> [0] http://lists.infradead.org/pipermail/openconnect-devel/2019-July/005378.html]
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/ocserv/Makefile,v
> retrieving revision 1.36
> diff -u -p -r1.36 Makefile
> --- Makefile 14 Mar 2019 04:20:18 -0000 1.36
> +++ Makefile 6 Jul 2019 09:46:20 -0000
> @@ -2,7 +2,7 @@
>  
>  COMMENT= server implementing the AnyConnect SSL VPN protocol
>  
> -DISTNAME= ocserv-0.12.3
> +DISTNAME= ocserv-0.12.4
>  EXTRACT_SUFX= .tar.xz
>  
>  CATEGORIES= net
> @@ -12,7 +12,7 @@ HOMEPAGE= https://ocserv.gitlab.io/www/
>  MAINTAINER= Bjorn Ketelaars <[hidden email]>
>  
>  # GPLv2+
> -PERMIT_PACKAGE_CDROM= Yes
> +PERMIT_PACKAGE= Yes
>  
>  WANTLIB+= c curses ev gnutls lz4 m nettle oath pam protobuf-c
>  WANTLIB+= radcli readline talloc
> @@ -44,10 +44,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/
>  AUTOCONF_VERSION= 2.69
>  
>  post-extract:
> - sed -i 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
> -    ${WRKSRC}/tests/test-{iroute,append-routes,user-config} \
> -    ${WRKSRC}/tests/haproxy-connect \
> -    ${WRKSRC}/tests/multiple-routes
> + find ${WRKSRC}/tests -type f -exec \
> +    sed -i 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' {} +
>   sed -i 's,/usr/sbin/openconnect,${LOCALBASE}/sbin/openconnect,' \
>      ${WRKSRC}/tests/common.sh
>   sed -i 's,/etc/ocserv,${SYSCONFDIR}/ocserv,' \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/net/ocserv/distinfo,v
> retrieving revision 1.26
> diff -u -p -r1.26 distinfo
> --- distinfo 14 Mar 2019 04:20:18 -0000 1.26
> +++ distinfo 6 Jul 2019 09:46:20 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (ocserv-0.12.3.tar.xz) = Qvj0Wdrm+Ihi1AmJl9j1Zo2XQ57Hi+7eOYX2/yTZHt0=
> -SIZE (ocserv-0.12.3.tar.xz) = 683632
> +SHA256 (ocserv-0.12.4.tar.xz) = BcAe/6inwvAiYW/LYrreTfUap/ADUkhnHaEoGdYssYU=
> +SIZE (ocserv-0.12.4.tar.xz) = 763540
>