Updated version of the beta1 diff I sent earlier, for those who care.
I did not receive feedback so far but it works fine for my client-only
setup, so I'll probably commit this when the release is out.
Index: Makefile
===================================================================
RCS file: /d/cvs/ports/net/openvpn/Makefile,v
retrieving revision 1.101
diff -u -p -r1.101 Makefile
--- Makefile 17 May 2020 08:53:27 -0000 1.101
+++ Makefile 4 Oct 2020 21:07:54 -0000
@@ -2,8 +2,8 @@
COMMENT= easy-to-use, robust, and highly configurable VPN
-DISTNAME= openvpn-2.4.9
-REVISION= 0
+DISTNAME= openvpn-2.5_rc2
+PKGNAME= openvpn-2.5rc2
CATEGORIES= net security
@@ -18,14 +18,18 @@ WANTLIB += c lz4 lzo2
MASTER_SITES= https://swupdate.openvpn.org/community/releases/
+BUILD_DEPENDS= textproc/py-docutils,python3
LIB_DEPENDS= archivers/lzo2 \
archivers/lz4
+TEST_DEPENDS= devel/cmocka
-SEPARATE_BUILD= Yes
+#SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
+ RST2HTML="${LOCALBASE}/bin/rst2html-3" \
+ RST2MAN="${LOCALBASE}/bin/rst2man-3"
DEBUG_PACKAGES= ${BUILD_PACKAGES}
Index: distinfo
===================================================================
RCS file: /d/cvs/ports/net/openvpn/distinfo,v
retrieving revision 1.44
diff -u -p -r1.44 distinfo
--- distinfo 21 Apr 2020 23:43:55 -0000 1.44
+++ distinfo 4 Oct 2020 21:08:12 -0000
@@ -1,2 +1,2 @@
-SHA256 (openvpn-2.4.9.tar.gz) = RrJo74jmfKbeLp8ZlD655ayFROVfXB869ncpjQPmS24=
-SIZE (openvpn-2.4.9.tar.gz) = 1455736
+SHA256 (openvpn-2.5_rc2.tar.gz) = yUHlNgqNsMkHD1V4KG7H9IIqeeuJKHUtkdRCXiGtnxk=
+SIZE (openvpn-2.5_rc2.tar.gz) = 1799431
Index: patches/patch-configure
===================================================================
RCS file: /d/cvs/ports/net/openvpn/patches/patch-configure,v
retrieving revision 1.22
diff -u -p -r1.22 patch-configure
--- patches/patch-configure 21 Apr 2020 23:43:55 -0000 1.22
+++ patches/patch-configure 23 Aug 2020 11:04:42 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.22 2020/04
Index: configure
--- configure.orig
+++ configure
-@@ -18146,7 +18146,7 @@ else
+@@ -18249,7 +18249,7 @@ else
fi
Index: patches/patch-include_Makefile_in
===================================================================
RCS file: /d/cvs/ports/net/openvpn/patches/patch-include_Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-include_Makefile_in
--- patches/patch-include_Makefile_in 21 Apr 2020 23:43:55 -0000 1.11
+++ patches/patch-include_Makefile_in 23 Aug 2020 11:04:42 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-include_Makefile_in,v 1.
Index: include/Makefile.in
--- include/Makefile.in.orig
+++ include/Makefile.in
-@@ -336,7 +336,7 @@ host_cpu = @host_cpu@
+@@ -339,7 +339,7 @@ host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
Index: patches/patch-sample_sample-config-files_static-home_conf
===================================================================
RCS file: patches/patch-sample_sample-config-files_static-home_conf
diff -N patches/patch-sample_sample-config-files_static-home_conf
--- patches/patch-sample_sample-config-files_static-home_conf 29 Nov 2016 09:22:02 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-sample_sample-config-files_static-home_conf,v 1.2 2016/11/29 09:22:02 jca Exp $
---- sample/sample-config-files/static-home.conf.orig Thu Nov 3 09:49:49 2016
-+++ sample/sample-config-files/static-home.conf Fri Nov 18 17:49:59 2016
-@@ -40,10 +40,10 @@ cipher AES-256-CBC
- ; port 1194
-
- # Downgrade UID and GID to
--# "nobody" after initialization
-+# "_openvpn" after initialization
- # for extra security.
--; user nobody
--; group nobody
-+user _openvpn
-+group _openvpn
-
- # If you built OpenVPN with
- # LZO compression, uncomment
Index: patches/patch-sample_sample-config-files_static-office_conf
===================================================================
RCS file: patches/patch-sample_sample-config-files_static-office_conf
diff -N patches/patch-sample_sample-config-files_static-office_conf
--- patches/patch-sample_sample-config-files_static-office_conf 29 Nov 2016 09:22:02 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-sample_sample-config-files_static-office_conf,v 1.2 2016/11/29 09:22:02 jca Exp $
---- sample/sample-config-files/static-office.conf.orig Thu Nov 3 09:49:49 2016
-+++ sample/sample-config-files/static-office.conf Fri Nov 18 17:49:59 2016
-@@ -37,10 +37,10 @@ cipher AES-256-CBC
- ; port 1194
-
- # Downgrade UID and GID to
--# "nobody" after initialization
-+# "_openvpn" after initialization
- # for extra security.
--; user nobody
--; group nobody
-+user _openvpn
-+group _openvpn
-
- # If you built OpenVPN with
- # LZO compression, uncomment
Index: patches/patch-sample_sample-config-files_tls-home_conf
===================================================================
RCS file: /d/cvs/ports/net/openvpn/patches/patch-sample_sample-config-files_tls-home_conf,v
retrieving revision 1.1
diff -u -p -r1.1 patch-sample_sample-config-files_tls-home_conf
--- patches/patch-sample_sample-config-files_tls-home_conf 20 Apr 2013 16:22:55 -0000 1.1
+++ patches/patch-sample_sample-config-files_tls-home_conf 23 Aug 2020 11:04:42 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-sample_sample-config-files_tls-home_conf,v 1.1 2013/04/20 16:22:55 sthen Exp $
---- sample/sample-config-files/tls-home.conf.orig Mon Sep 10 17:01:08 2012
-+++ sample/sample-config-files/tls-home.conf Thu Mar 7 14:02:35 2013
-@@ -48,10 +48,10 @@ key home.key
+Index: sample/sample-config-files/tls-home.conf
+--- sample/sample-config-files/tls-home.conf.orig
++++ sample/sample-config-files/tls-home.conf
+@@ -48,10 +48,10 @@ cipher AES-256-GCM
; port 1194
# Downgrade UID and GID to
Index: patches/patch-sample_sample-config-files_tls-office_conf
===================================================================
RCS file: /d/cvs/ports/net/openvpn/patches/patch-sample_sample-config-files_tls-office_conf,v
retrieving revision 1.1
diff -u -p -r1.1 patch-sample_sample-config-files_tls-office_conf
--- patches/patch-sample_sample-config-files_tls-office_conf 20 Apr 2013 16:22:55 -0000 1.1
+++ patches/patch-sample_sample-config-files_tls-office_conf 23 Aug 2020 11:04:42 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-sample_sample-config-files_tls-office_conf,v 1.1 2013/04/20 16:22:55 sthen Exp $
---- sample/sample-config-files/tls-office.conf.orig Mon Sep 10 17:01:08 2012
-+++ sample/sample-config-files/tls-office.conf Thu Mar 7 14:02:35 2013
-@@ -48,10 +48,10 @@ key office.key
+Index: sample/sample-config-files/tls-office.conf
+--- sample/sample-config-files/tls-office.conf.orig
++++ sample/sample-config-files/tls-office.conf
+@@ -51,10 +51,10 @@ cipher AES-256-GCM
; port 1194
# Downgrade UID and GID to
Index: patches/patch-src_openvpn_route_c
===================================================================
RCS file: /d/cvs/ports/net/openvpn/patches/patch-src_openvpn_route_c,v
retrieving revision 1.13
diff -u -p -r1.13 patch-src_openvpn_route_c
--- patches/patch-src_openvpn_route_c 5 Apr 2019 06:56:00 -0000 1.13
+++ patches/patch-src_openvpn_route_c 4 Oct 2020 21:12:37 -0000
@@ -7,7 +7,7 @@ $OpenBSD: patch-src_openvpn_route_c,v 1.
Index: src/openvpn/route.c
--- src/openvpn/route.c.orig
+++ src/openvpn/route.c
-@@ -1781,12 +1781,17 @@ add_route(struct route_ipv4 *r,
+@@ -1804,12 +1804,17 @@ add_route(struct route_ipv4 *r,
}
No comments:
Post a Comment