Date: Tuesday, July 20, 2021 @ 18:08:24 Author: anthraxx Revision: 420203
upgpkg: vpnc 1:0.5.3.r496.r153-1 Modified: vpnc/trunk/PKGBUILD Deleted: vpnc/trunk/vpnc-systemd-resolved.patch -----------------------------+ PKGBUILD | 27 +++++++++++---------------- vpnc-systemd-resolved.patch | 38 -------------------------------------- 2 files changed, 11 insertions(+), 54 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-07-20 17:35:08 UTC (rev 420202) +++ PKGBUILD 2021-07-20 18:08:24 UTC (rev 420203) @@ -3,43 +3,38 @@ # Contributor: Thomas Baechler <[email protected]> pkgname=vpnc -_vpnc_commit=1bd238527af94123788bcc529bde085d6be7227e -_vpncscripts_commit=c0122e891f7e033f35f047dad963702199d5cb9e -pkgver=0.5.3.r468.r81 -pkgrel=2 +_vpnc_commit=43780cecd7a61668002f73b6f8b9f9ba61af74ad +_vpncscripts_commit=8fff06090ed193c4a7285e9a10b42e6679e8ecf3 +pkgver=0.5.3.r496.r153 +pkgrel=1 epoch=1 pkgdesc='VPN client for cisco3000 VPN Concentrators' url='https://github.com/streambinder/vpnc' arch=('x86_64') license=('GPL') -depends=('libgcrypt' 'openssl' 'iproute2') +depends=('libgcrypt' 'openssl' 'iproute2' 'which') optdepends=('perl: for pcf2vpnc') makedepends=('git') optdepends=('openresolv: Let vpnc manage resolv.conf') backup=('etc/vpnc/default.conf') source=("vpnc::git+https://github.com/streambinder/vpnc#commit=${_vpnc_commit}"; - "vpnc-scripts::git://git.infradead.org/users/dwmw2/vpnc-scripts.git#commit=${_vpncscripts_commit}" + "vpnc-scripts::git+https://gitlab.com/openconnect/vpnc-scripts.git#commit=${_vpncscripts_commit}"; vpnc.conf - [email protected] - vpnc-systemd-resolved.patch) + [email protected]) sha512sums=('SKIP' 'SKIP' 'ac70712192c01ff638a9badc5cff7105bee5c4fed5d3a3b728e9597661952d156041c82fe1e544e2bab602d193d4105d3689c79c46d964623f6ce38dd89f0ea7' - 'cafcab676986c1a2e49441f01d61997f1c6b54bbb68661b9af007d4816f8e76eee6b7ac2dfab55b55965fa407e8331c663cf11aa79384c30b0c9049c1477b791' - '3383783a0e4848ccff2247c5c7c99bcfeb3f7a7756d000fdb4627a73c82dd7ac8106183160d07dc77339df70efc4819ea89327e9da1d7c885d675d1dc84d4df1') + 'cafcab676986c1a2e49441f01d61997f1c6b54bbb68661b9af007d4816f8e76eee6b7ac2dfab55b55965fa407e8331c663cf11aa79384c30b0c9049c1477b791') pkgver() { cd ${pkgname} - printf "%s.r%s.r%s" "$(cat VERSION)" \ + printf "%s.r%s.r%s" "$(grep '^VERSION' Makefile|sed 's|VERSION := ||')" \ "$(git -C ../vpnc rev-list --count HEAD)" \ "$(git -C ../vpnc-scripts rev-list --count HEAD)" } prepare() { - cd vpnc-scripts - patch -Np1 < ../vpnc-systemd-resolved.patch - - cd ../${pkgname} + cd ${pkgname} # Build hybrid support sed 's|^#OPENSSL|OPENSSL|g' -i Makefile # fix resolvconf location for community/openresolv @@ -61,7 +56,7 @@ make DESTDIR="${pkgdir}" PREFIX=/usr SBINDIR=/usr/bin install install -Dm 644 ../[email protected] -t "${pkgdir}/usr/lib/systemd/system" install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" - install -Dm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}" + install -Dm 644 .github/README.md -t "${pkgdir}/usr/share/doc/${pkgname}" } # vim: ts=2 sw=2 et: Deleted: vpnc-systemd-resolved.patch =================================================================== --- vpnc-systemd-resolved.patch 2021-07-20 17:35:08 UTC (rev 420202) +++ vpnc-systemd-resolved.patch 2021-07-20 18:08:24 UTC (rev 420203) @@ -1,38 +0,0 @@ -Use systemd-resolve to check if resolved is running - -resolved may be included in nsswitch.conf even though systemd-resolved -is not running. E.g. Arch Linux includes resolved in nsswitch.conf by -default, but systemd-resolved is not enabled by default, which causes -this script to fail updating dns. - -This patch uses the systemd-resolve command, which is included with -systemd, to check if systemd-resolved is actually running. ---- - vpnc-script | 3 +-- - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/vpnc-script b/vpnc-script -index 6a55546..b00dbb9 100755 ---- a/vpnc-script -+++ b/vpnc-script -@@ -117,19 +117,12 @@ - ifconfig_syntax_ptpv6="" - fi - --grep ^hosts /etc/nsswitch.conf 2>/dev/null|grep resolve >/dev/null 2>&1 --if [ $? = 0 ];then -- RESOLVEDENABLED=1 --else -- RESOLVEDENABLED=0 --fi -- - if [ -r /etc/openwrt_release ] && [ -n "$OPENWRT_INTERFACE" ]; then - . /etc/functions.sh - include /lib/network - MODIFYRESOLVCONF=modify_resolvconf_openwrt - RESTORERESOLVCONF=restore_resolvconf_openwrt --elif [ -x /usr/bin/busctl ] && [ ${RESOLVEDENABLED} = 1 ]; then # For systemd-resolved (version 229 and above) -+elif [ -x /usr/bin/busctl ] && grep -qs '^hosts.*resolve' /etc/nsswitch.conf && systemd-resolve --status >/dev/null 2>&1; then # For systemd-resolved (version 229 and above) - MODIFYRESOLVCONF=modify_resolved_manager - RESTORERESOLVCONF=restore_resolved_manager - elif [ -x /sbin/resolvconf ]; then # Optional tool on Debian, Ubuntu, Gentoo and FreeBSD
