From 210fbd2e0beebdc7af0b112087646db018276a15 Mon Sep 17 00:00:00 2001 From: Krul Ceter Date: Sun, 5 Feb 2023 07:52:23 +0300 Subject: [PATCH] openvpn: update to 2.6.0. * lz4 now is a build dependency because upstream dropped compat-lz4 (OpenVPN@openvpn/24596b258aa3a9c0bd79e7e7bd4753c48a435408). * systemd integration is not enabled by default. --- srcpkgs/openvpn/files/openvpn/run | 4 ++++ srcpkgs/openvpn/template | 23 ++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/openvpn/files/openvpn/run diff --git a/srcpkgs/openvpn/files/openvpn/run b/srcpkgs/openvpn/files/openvpn/run new file mode 100644 index 000000000000..405c89b41c34 --- /dev/null +++ b/srcpkgs/openvpn/files/openvpn/run @@ -0,0 +1,4 @@ +#!/bin/sh + +[ -r conf ] && . ./conf +exec openvpn --user _openvpn --group _openvpn ${OPTS:- --config /etc/openvpn/server.conf} 2>&1 diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template index 44e51a3da094..4d62ba2a8d06 100644 --- a/srcpkgs/openvpn/template +++ b/srcpkgs/openvpn/template @@ -1,32 +1,37 @@ # Template file for 'openvpn' pkgname=openvpn -version=2.5.7 +version=2.6.0 revision=1 build_style=gnu-configure -configure_args="$(vopt_enable pkcs11) --disable-systemd +configure_args="$(vopt_enable pkcs11) $(vopt_if mbedtls --with-crypto-library=mbedtls)" +make_check_args="V=1" hostmakedepends="pkg-config" makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel - $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel" + $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel libcap-ng-devel + liblz4-devel" +checkdepends="iproute2" short_desc="Easy-to-use, robust, and highly configurable VPN" maintainer="Orphaned " license="GPL-2.0-only" homepage="https://www.openvpn.net" changelog="https://raw.githubusercontent.com/OpenVPN/openvpn/release/${version%.*}/Changes.rst" -distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar.xz" -checksum=313bca7e996a4f59ef9940dd87c6c4b9168064db9be6cabebd37cd65f13759ed - +distfiles="https://build.openvpn.net/downloads/releases/openvpn-${version}.tar.gz" +checksum=ebec933263c9850ef6f7ce125e2f22214be60b1cbb8ccff18892643fe083ae8f +system_accounts="_openvpn" +system_groups="_openvpn" build_options="mbedtls pkcs11" build_options_default="pkcs11" desc_option_mbedtls="Build with mbedtls support" desc_option_pkcs11="Enable support for PKCS#11" vopt_conflict mbedtls pkcs11 - -make_check=ci-skip +# CI does not allow to create dummy network interfaces for testing? +#make_check=ci-skip post_install() { + vsv openvpn vmkdir usr/share/examples/${pkgname} cp -r sample/sample-config-files/* ${DESTDIR}/usr/share/examples/${pkgname} - rm -rf ${DESTDIR}/usr/include + rm -r ${DESTDIR}/usr/include }