See changelog at

  https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn24

If anyone wants to give it a try.  The src/openvpn/openssl_compat.h diff
is being worked on.


Index: Makefile
===================================================================
RCS file: /d/cvs/ports/net/openvpn/Makefile,v
retrieving revision 1.86
diff -u -p -r1.86 Makefile
--- Makefile    26 Oct 2017 08:22:36 -0000      1.86
+++ Makefile    3 Mar 2018 00:34:18 -0000
@@ -2,8 +2,7 @@
 
 COMMENT=       easy-to-use, robust, and highly configurable VPN
 
-DISTNAME=      openvpn-2.4.4
-REVISION=      0
+DISTNAME=      openvpn-2.4.5
 CATEGORIES=    net security
 
 HOMEPAGE=      https://openvpn.net/index.php/open-source/
Index: distinfo
===================================================================
RCS file: /d/cvs/ports/net/openvpn/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo    29 Sep 2017 16:36:23 -0000      1.39
+++ distinfo    3 Mar 2018 00:34:18 -0000
@@ -1,2 +1,2 @@
-SHA256 (openvpn-2.4.4.tar.gz) = GuiD2VIsn6bRieXkqqBYqT7dPQuJfjwmZBB8R4UJn8M=
-SIZE (openvpn-2.4.4.tar.gz) = 1390194
+SHA256 (openvpn-2.4.5.tar.gz) = sVgv9+u7ZxlgSKVokRhWRwFErNQg3oJnAUjL/6oPvzM=
+SIZE (openvpn-2.4.5.tar.gz) = 1430930
Index: patches/patch-configure
===================================================================
RCS file: /d/cvs/ports/net/openvpn/patches/patch-configure,v
retrieving revision 1.18
diff -u -p -r1.18 patch-configure
--- patches/patch-configure     29 Sep 2017 16:36:23 -0000      1.18
+++ patches/patch-configure     3 Mar 2018 00:34:18 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.18 2017/09
 Index: configure
 --- configure.orig
 +++ configure
-@@ -17409,7 +17409,7 @@ else
+@@ -18057,7 +18057,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.8
diff -u -p -r1.8 patch-include_Makefile_in
--- patches/patch-include_Makefile_in   28 Mar 2017 22:16:37 -0000      1.8
+++ patches/patch-include_Makefile_in   3 Mar 2018 00:34:18 -0000
@@ -1,7 +1,8 @@
 $OpenBSD: patch-include_Makefile_in,v 1.8 2017/03/28 22:16:37 jca Exp $
---- include/Makefile.in.orig   Wed Mar 22 16:34:37 2017
-+++ include/Makefile.in        Mon Mar 27 06:01:57 2017
-@@ -325,7 +325,7 @@ host_cpu = @host_cpu@
+Index: include/Makefile.in
+--- include/Makefile.in.orig
++++ include/Makefile.in
+@@ -337,7 +337,7 @@ host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
  htmldir = @htmldir@
Index: patches/patch-src_openvpn_error_c
===================================================================
RCS file: /d/cvs/ports/net/openvpn/patches/patch-src_openvpn_error_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_openvpn_error_c
--- patches/patch-src_openvpn_error_c   5 Nov 2017 01:09:28 -0000       1.3
+++ patches/patch-src_openvpn_error_c   3 Mar 2018 00:34:18 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_openvpn_error_c,v 1.3 2017/11/05 01:09:28 jca Exp $
-
-Correctly print time_t.
-
-  
https://github.com/OpenVPN/openvpn/commit/4ac769fb848619dcb39589af29302d8c2d698258
-
-Index: src/openvpn/error.c
---- src/openvpn/error.c.orig
-+++ src/openvpn/error.c
-@@ -342,8 +342,8 @@ x_msg_va(const unsigned int flags, const char *format,
-                 struct timeval tv;
-                 gettimeofday(&tv, NULL);
- 
--                fprintf(fp, "%lu.%06lu %x %s%s%s%s",
--                        tv.tv_sec,
-+                fprintf(fp, "%lld.%06lu %x %s%s%s%s",
-+                        (long long)tv.tv_sec,
-                         (unsigned long)tv.tv_usec,
-                         flags,
-                         prefix,
Index: patches/patch-src_openvpn_openssl_compat_h
===================================================================
RCS file: patches/patch-src_openvpn_openssl_compat_h
diff -N patches/patch-src_openvpn_openssl_compat_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_openvpn_openssl_compat_h  3 Mar 2018 00:34:18 -0000
@@ -0,0 +1,58 @@
+$OpenBSD$
+
+Index: src/openvpn/openssl_compat.h
+--- src/openvpn/openssl_compat.h.orig
++++ src/openvpn/openssl_compat.h
+@@ -661,7 +661,7 @@ EC_GROUP_order_bits(const EC_GROUP *group)
+ #define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT       RSA_F_RSA_EAY_PRIVATE_ENCRYPT
+ #endif
+ 
+-#ifndef SSL_CTX_get_min_proto_version
++#ifndef SSL_CTRL_GET_MAX_PROTO_VERSION
+ /** Return the min SSL protocol version currently enabled in the context.
+  *  If no valid version >= TLS1.0 is found, return 0. */
+ static inline int
+@@ -682,9 +682,9 @@ SSL_CTX_get_min_proto_version(SSL_CTX *ctx)
+     }
+     return 0;
+ }
+-#endif /* SSL_CTX_get_min_proto_version */
++#endif /*  SSL_CTRL_GET_MAX_PROTO_VERSION */
+ 
+-#ifndef SSL_CTX_get_max_proto_version
++#ifndef SSL_CTRL_GET_MAX_PROTO_VERSION
+ /** Return the max SSL protocol version currently enabled in the context.
+  *  If no valid version >= TLS1.0 is found, return 0. */
+ static inline int
+@@ -709,9 +709,9 @@ SSL_CTX_get_max_proto_version(SSL_CTX *ctx)
+     }
+     return 0;
+ }
+-#endif /* SSL_CTX_get_max_proto_version */
++#endif /* SSL_CTRL_GET_MAX_PROTO_VERSION */
+ 
+-#ifndef SSL_CTX_set_min_proto_version
++#ifndef SSL_CTRL_SET_MAX_PROTO_VERSION
+ /** Mimics SSL_CTX_set_min_proto_version for OpenSSL < 1.1 */
+ static inline int
+ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_ver_min)
+@@ -738,9 +738,9 @@ SSL_CTX_set_min_proto_version(SSL_CTX *ctx, long tls_v
+ 
+     return 1;
+ }
+-#endif /* SSL_CTX_set_min_proto_version */
++#endif /*  SSL_CTRL_SET_MAX_PROTO_VERSION */
+ 
+-#ifndef SSL_CTX_set_max_proto_version
++#ifndef SSL_CTRL_SET_MAX_PROTO_VERSION
+ /** Mimics SSL_CTX_set_max_proto_version for OpenSSL < 1.1 */
+ static inline int
+ SSL_CTX_set_max_proto_version(SSL_CTX *ctx, long tls_ver_max)
+@@ -767,6 +767,6 @@ SSL_CTX_set_max_proto_version(SSL_CTX *ctx, long tls_v
+ 
+     return 1;
+ }
+-#endif /* SSL_CTX_set_max_proto_version */
++#endif /* SSL_CTRL_SET_MAX_PROTO_VERSION */
+ 
+ #endif /* OPENSSL_COMPAT_H_ */
Index: patches/patch-src_openvpn_tun_c
===================================================================
RCS file: /d/cvs/ports/net/openvpn/patches/patch-src_openvpn_tun_c,v
retrieving revision 1.15
diff -u -p -r1.15 patch-src_openvpn_tun_c
--- patches/patch-src_openvpn_tun_c     21 Jun 2017 12:51:09 -0000      1.15
+++ patches/patch-src_openvpn_tun_c     3 Mar 2018 00:34:18 -0000
@@ -5,7 +5,7 @@ $OpenBSD: patch-src_openvpn_tun_c,v 1.15
 Index: src/openvpn/tun.c
 --- src/openvpn/tun.c.orig
 +++ src/openvpn/tun.c
-@@ -1200,7 +1200,7 @@ do_ifconfig(struct tuntap *tt,
+@@ -1202,7 +1202,7 @@ do_ifconfig(struct tuntap *tt,
          if (tun)
          {
              argv_printf(&argv,
@@ -14,7 +14,7 @@ Index: src/openvpn/tun.c
                          IFCONFIG_PATH,
                          actual,
                          ifconfig_local,
-@@ -1212,7 +1212,7 @@ do_ifconfig(struct tuntap *tt,
+@@ -1214,7 +1214,7 @@ do_ifconfig(struct tuntap *tt,
          {
              remote_end = create_arbitrary_remote( tt );
              argv_printf(&argv,
@@ -23,7 +23,7 @@ Index: src/openvpn/tun.c
                          IFCONFIG_PATH,
                          actual,
                          ifconfig_local,
-@@ -1223,8 +1223,13 @@ do_ifconfig(struct tuntap *tt,
+@@ -1225,8 +1225,13 @@ do_ifconfig(struct tuntap *tt,
          }
          else
          {


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to