[arch-commits] Commit in vpnc/repos/extra-x86_64 (7 files)
Levente Polyak
anthraxx at archlinux.org
Wed Aug 21 21:12:25 UTC 2019
Date: Wednesday, August 21, 2019 @ 21:12:24
Author: anthraxx
Revision: 360538
archrelease: copy trunk to extra-x86_64
Added:
vpnc/repos/extra-x86_64/PKGBUILD
(from rev 360537, vpnc/trunk/PKGBUILD)
vpnc/repos/extra-x86_64/vpnc-systemd-resolved.patch
(from rev 360537, vpnc/trunk/vpnc-systemd-resolved.patch)
vpnc/repos/extra-x86_64/vpnc.conf
(from rev 360537, vpnc/trunk/vpnc.conf)
vpnc/repos/extra-x86_64/vpnc at .service
(from rev 360537, vpnc/trunk/vpnc at .service)
Deleted:
vpnc/repos/extra-x86_64/PKGBUILD
vpnc/repos/extra-x86_64/vpnc.conf
vpnc/repos/extra-x86_64/vpnc at .service
-----------------------------+
PKGBUILD | 127 +++++++++++++++++++++---------------------
vpnc-systemd-resolved.patch | 38 ++++++++++++
vpnc.conf | 34 +++++------
vpnc at .service | 22 +++----
4 files changed, 133 insertions(+), 88 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-08-21 21:12:11 UTC (rev 360537)
+++ PKGBUILD 2019-08-21 21:12:24 UTC (rev 360538)
@@ -1,61 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Contributor: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Thomas Baechler <thomas at archlinux.org>
-
-pkgname=vpnc
-_vpnc_commit=6ad8c2c03b0ba5c47dcca8ece4415e19575e3ef3
-_vpncscripts_commit=33b5d8198b5f375418379e483031d3ec9019225d
-pkgver=0.5.3.r460.r73
-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')
-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.conf
- vpnc at .service)
-sha512sums=('SKIP'
- 'SKIP'
- 'ac70712192c01ff638a9badc5cff7105bee5c4fed5d3a3b728e9597661952d156041c82fe1e544e2bab602d193d4105d3689c79c46d964623f6ce38dd89f0ea7'
- '3acb21ed11c7658915d38d8b6a9df9716eadfd85d3c4895045bbaaabfa217bd40cb21d08086c4196bb06153ad0be80b1dde4ef6b516f3840e26ee19874a75058')
-
-pkgver() {
- cd ${pkgname}
- printf "%s.r%s.r%s" "$(cat VERSION)" \
- "$(git -C ../vpnc rev-list --count HEAD)" \
- "$(git -C ../vpnc-scripts rev-list --count HEAD)"
-}
-
-prepare() {
- cd ${pkgname}
- # Build hybrid support
- sed 's|^#OPENSSL|OPENSSL|g' -i Makefile
- # fix resolvconf location for community/openresolv
- sed 's|/sbin/resolvconf|/usr/bin/resolvconf|g' -i ../vpnc-scripts/vpnc-script
- ln -sf ../../vpnc-scripts/vpnc-script src
- ln -sf ../../vpnc.conf src
-}
-
-build() {
- make -C ${pkgname}
-}
-
-check() {
- make -C ${pkgname} test
-}
-
-package() {
- cd ${pkgname}
- make DESTDIR="${pkgdir}" PREFIX=/usr SBINDIR=/usr/bin install
- install -Dm 644 ../vpnc at .service -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}"
-}
-
-# vim: ts=2 sw=2 et:
Copied: vpnc/repos/extra-x86_64/PKGBUILD (from rev 360537, vpnc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-08-21 21:12:24 UTC (rev 360538)
@@ -0,0 +1,66 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Thomas Baechler <thomas at archlinux.org>
+
+pkgname=vpnc
+_vpnc_commit=101208be5b74039ea70b9e007ce0d6c9fbe44d82
+_vpncscripts_commit=c84fb8e5a523a647a01a1229a9104db934e19f00
+pkgver=0.5.3.r462.r78
+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')
+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.conf
+ vpnc at .service
+ vpnc-systemd-resolved.patch)
+sha512sums=('SKIP'
+ 'SKIP'
+ 'ac70712192c01ff638a9badc5cff7105bee5c4fed5d3a3b728e9597661952d156041c82fe1e544e2bab602d193d4105d3689c79c46d964623f6ce38dd89f0ea7'
+ 'cafcab676986c1a2e49441f01d61997f1c6b54bbb68661b9af007d4816f8e76eee6b7ac2dfab55b55965fa407e8331c663cf11aa79384c30b0c9049c1477b791'
+ '3383783a0e4848ccff2247c5c7c99bcfeb3f7a7756d000fdb4627a73c82dd7ac8106183160d07dc77339df70efc4819ea89327e9da1d7c885d675d1dc84d4df1')
+
+pkgver() {
+ cd ${pkgname}
+ printf "%s.r%s.r%s" "$(cat 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}
+ # Build hybrid support
+ sed 's|^#OPENSSL|OPENSSL|g' -i Makefile
+ # fix resolvconf location for community/openresolv
+ sed 's|/sbin/resolvconf|/usr/bin/resolvconf|g' -i ../vpnc-scripts/vpnc-script
+ ln -sf ../../vpnc-scripts/vpnc-script src
+ ln -sf ../../vpnc.conf src
+}
+
+build() {
+ make -C ${pkgname}
+}
+
+check() {
+ make -C ${pkgname} test
+}
+
+package() {
+ cd ${pkgname}
+ make DESTDIR="${pkgdir}" PREFIX=/usr SBINDIR=/usr/bin install
+ install -Dm 644 ../vpnc at .service -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}"
+}
+
+# vim: ts=2 sw=2 et:
Copied: vpnc/repos/extra-x86_64/vpnc-systemd-resolved.patch (from rev 360537, vpnc/trunk/vpnc-systemd-resolved.patch)
===================================================================
--- vpnc-systemd-resolved.patch (rev 0)
+++ vpnc-systemd-resolved.patch 2019-08-21 21:12:24 UTC (rev 360538)
@@ -0,0 +1,38 @@
+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
Deleted: vpnc.conf
===================================================================
--- vpnc.conf 2019-08-21 21:12:11 UTC (rev 360537)
+++ vpnc.conf 2019-08-21 21:12:24 UTC (rev 360538)
@@ -1,17 +0,0 @@
-# example vpnc configuration file
-# see vpnc --long-help for details
-
-#Interface name tun0
-#IKE DH Group dh2
-#Perfect Forward Secrecy nopfs
-
-# You may replace this script with something better
-#Script /etc/vpnc/vpnc-script
-# Enable this option for NAT traversal
-#UDP Encapsulate
-
-#IPSec gateway my.gateway.com
-#IPSec ID someid
-#IPSec secret somesecret
-#Xauth username myusername
-#Xauth password mypassword
Copied: vpnc/repos/extra-x86_64/vpnc.conf (from rev 360537, vpnc/trunk/vpnc.conf)
===================================================================
--- vpnc.conf (rev 0)
+++ vpnc.conf 2019-08-21 21:12:24 UTC (rev 360538)
@@ -0,0 +1,17 @@
+# example vpnc configuration file
+# see vpnc --long-help for details
+
+#Interface name tun0
+#IKE DH Group dh2
+#Perfect Forward Secrecy nopfs
+
+# You may replace this script with something better
+#Script /etc/vpnc/vpnc-script
+# Enable this option for NAT traversal
+#UDP Encapsulate
+
+#IPSec gateway my.gateway.com
+#IPSec ID someid
+#IPSec secret somesecret
+#Xauth username myusername
+#Xauth password mypassword
Deleted: vpnc at .service
===================================================================
--- vpnc at .service 2019-08-21 21:12:11 UTC (rev 360537)
+++ vpnc at .service 2019-08-21 21:12:24 UTC (rev 360538)
@@ -1,10 +0,0 @@
-[Unit]
-Description=VPNC connection to %i
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/vpnc --pid-file=/run/vpnc@%i.pid /etc/vpnc/%i.conf
-PIDFile=/run/vpnc@%i.pid
-
-[Install]
-WantedBy=multi-user.target
Copied: vpnc/repos/extra-x86_64/vpnc at .service (from rev 360537, vpnc/trunk/vpnc at .service)
===================================================================
--- vpnc at .service (rev 0)
+++ vpnc at .service 2019-08-21 21:12:24 UTC (rev 360538)
@@ -0,0 +1,12 @@
+[Unit]
+Description=VPNC connection to %i
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/vpnc --pid-file=/run/vpnc@%i.pid /etc/vpnc/%i.conf
+PIDFile=/run/vpnc@%i.pid
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list