diff options
author | Erich Eckner <git@eckner.net> | 2024-07-17 22:56:01 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2024-07-17 22:56:12 +0200 |
commit | adb23dead22d7367396aedd900cfa22eb0ecdcd2 (patch) | |
tree | 55b7b3996df22f99f183ec5ee0248816c6e82f39 | |
parent | 97526404d3d7e41616bad7fc2870d95e32842fdd (diff) | |
download | archlinuxewe-adb23dead22d7367396aedd900cfa22eb0ecdcd2.tar.xz |
openvpn3: 20-18 -> 22_dev-1
-rw-r--r-- | openvpn3/PKGBUILD | 86 | ||||
-rw-r--r-- | openvpn3/openvpn3.install | 10 |
2 files changed, 57 insertions, 39 deletions
diff --git a/openvpn3/PKGBUILD b/openvpn3/PKGBUILD index 26f83d84b..6f8a27845 100644 --- a/openvpn3/PKGBUILD +++ b/openvpn3/PKGBUILD @@ -3,75 +3,87 @@ _pkgname=openvpn3-linux pkgname=openvpn3 -pkgver=20 -pkgrel=18 +pkgver=22_dev +pkgrel=1 pkgdesc='OpenVPN 3 Linux client' arch=('i486' 'i686' 'pentium4' 'x86_64' 'aarch64' 'armv7h') -url="https://github.com/OpenVPN/$_pkgname" +url="https://codeberg.org/OpenVPN/$_pkgname" license=('AGPL3') _pinned_dependencies=( 'abseil-cpp=20240116.2' 'gcc-libs=14.1.1+r58+gfc9fb69ad62' + 'gdbuspp=1' + 'glib2=2.80.4' 'glibc>=2.37' - 'libcap-ng.so=0' - 'libcrypto.so=3' - 'libgio-2.0.so=0' - 'libglib-2.0.so=0' - 'libgobject-2.0.so=0' - 'libjsoncpp.so=25' - 'libnl-3.so=200' - 'libnl-genl-3.so=200' - 'libprotobuf.so=27' - 'libssl.so=3' - 'libsystemd.so=0' - 'libuuid.so=1' + 'jsoncpp=1.9.5' + 'libcap-ng=0.8.5' + 'libnl=3.9.0' 'lz4=1:1.9.4' + 'openssl=3.3.1' + 'protobuf=27.2' + 'systemd-libs=256.2' 'tinyxml2=10.0.0' + 'util-linux-libs=2.40.2' ) depends=( - 'glib2>=2.50' 'jsoncpp>=0.10.5' 'libcap-ng>=0.7.5' 'lz4>=1.7.3' 'util-linux-libs>=2.23.2' 'protobuf>=2.4.0' - 'python-dbus' 'python-gobject' 'python-systemd' 'tinyxml2>=2.1.0' 'libnl>=3.2.29' + 'glib2>=2.56' 'jsoncpp>=0.10.5' 'libcap-ng>=0.7.5' 'lz4>=1.8.4' 'util-linux-libs>=2.23.2' 'protobuf>=2.4.0' + 'python-dbus' 'python-gobject' 'python-systemd' 'tinyxml2>=2.1.0' 'libnl>=3.2.29' gdbuspp "${_pinned_dependencies[@]}" ) optdepends=( - 'openssl: OpenSSL version' 'mbedtls: mbed TLS version' 'polkit>=0.105: for systemd-resolved integration' + 'openssl: OpenSSL version' 'mbedtls: mbed TLS version' 'polkit>=0.112: for systemd-resolved integration' 'repkg: Automatically rebuild the package on dependency updates' ) makedepends=( - 'autoconf-archive' 'git' 'python-docutils' 'python-jinja' 'bash' + 'python-docutils' 'python-jinja' 'meson' ) source=( - "git+https://github.com/OpenVPN/$_pkgname.git#tag=v${pkgver}" + "https://swupdate.openvpn.net/community/releases/${_pkgname}-${pkgver}.tar.xz" 'openvpn3.rule' - 'openvpn3.install' 'sysusers-openvpn3.conf' ) sha256sums=( - 'SKIP' + 'ad8f373814bfbefd12f9824d57badef4535f6c1fde68d2c73d7ee14863547cb6' 'ec0b8e28ae77b4b074d3eb8a084626e6dcfc587a07bef5d53fe1c6e160c0fc01' - 'a5879d9e637658f5127e849d17f4050bae1f82fa9b25f05bbbbb531867120e8b' '045e914bb6fff5a082314dfc805bb511c9a80170619fa1e94a07825fa977c90a' ) +install=openvpn3.install + +prepare() { + meson subprojects download --sourcedir="${_pkgname}-${pkgver}" +} build() { - cd "$_pkgname" - ./bootstrap.sh - ./configure \ - --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var \ - --enable-bash-completion --enable-dco - make + arch-meson \ + -Dselinux=disabled \ + -Dselinux_policy=disabled \ + -Dbash-completion=enabled \ + -Dtest_programs=disabled \ + -Dunit_tests=disabled \ + "${_pkgname}-${pkgver}" \ + _builddir + meson compile -C _builddir } check() { - cd "$_pkgname" - - make check + arch-meson \ + -Dselinux=disabled \ + -Dselinux_policy=disabled \ + -Dtest_programs=enabled \ + -Dunit_tests=enabled \ + "${_pkgname}-${pkgver}" \ + _builddir + meson compile -C _builddir + meson test -C _builddir } package() { - cd "$_pkgname" - make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/$_pkgname/src/shell/bash-completion/openvpn3" "$pkgdir/usr/share/bash-completion/completions/openvpn3" - install -Dm644 "../${pkgname}.rule" "$pkgdir/etc/repkg/rules/system/${pkgname}.rule" - install -Dm644 "../sysusers-$pkgname.conf" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + meson install -C _builddir --destdir "$pkgdir" + install -Dm644 "${pkgname}.rule" "$pkgdir/etc/repkg/rules/system/${pkgname}.rule" + install -Dm644 "sysusers-$pkgname.conf" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" +} + +post_install() { + openvpn3-admin init-config --write-configs --force + systemctl reload dbus } diff --git a/openvpn3/openvpn3.install b/openvpn3/openvpn3.install index cd76ebfbd..e44ccc3af 100644 --- a/openvpn3/openvpn3.install +++ b/openvpn3/openvpn3.install @@ -1,4 +1,10 @@ post_install() { - sudo openvpn3-admin init-config --write-configs - sudo systemctl reload dbus + openvpn3-admin init-config --write-configs + systemctl reload dbus +} + +post_upgrade() { + openvpn3-admin init-config --write-configs + systemctl reload dbus + systemctl restart net.openvpn.v3.netcfg.slice } |