[arch-commits] Commit in vpnc/trunk (PKGBUILD)

[Levente Polyak]

    Date: Tuesday, February 12, 2019 @ 00:56:58
  Author: anthraxx
Revision: 346022

upgpkg: vpnc 1:0.5.3.r454.r67-1 (switched to active upstream)

Modified:
  vpnc/trunk/PKGBUILD

----------+
 PKGBUILD |   77 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 42 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-11 22:08:37 UTC (rev 346021)
+++ PKGBUILD	2019-02-12 00:56:58 UTC (rev 346022)
@@ -1,54 +1,61 @@
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Dave Reisner <dreisner at archlinux.org>
 # Contributor: Thomas Baechler <thomas at archlinux.org>
 
 pkgname=vpnc
-_svnrev=550
-pkgver=0.5.3.svn${_svnrev}
-pkgrel=3
-pkgdesc="VPN client for cisco3000 VPN Concentrators"
-url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
+_vpnc_commit=1d6fcf79bfb41c0cd720249fb19b140682df2a13
+_vpncscripts_commit=07c3518dd6b8dc424e9c3650a62bed994a4dcbe1
+pkgver=0.5.3.r454.r67
+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=('subversion' 'git')
+makedepends=('git')
 optdepends=('openresolv: Let vpnc manage resolv.conf')
-arch=('x86_64')
-source=("vpnc::svn+http://svn.unix-ag.uni-kl.de/vpnc/trunk#revision=${_svnrev}"
-        "vpnc-scripts::git://git.infradead.org/users/dwmw2/vpnc-scripts.git#commit=df5808b"
-        'vpnc.conf'
-        'vpnc at .service')
 backup=('etc/vpnc/default.conf')
-md5sums=('SKIP'
-         'SKIP'
-         'a3f4e0cc682f437e310a1c86ae198e45'
-         '09cfded435c43dd2adb5a8863bd74cfc')
+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 vpnc
-#  _vpncver=$(cat VERSION)
-#  _svnrev=$(svn info | awk '/^Revision:/ { print $2 }')
-#  echo ${_vpncver}.svn${_svnrev}
-#}
+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 -i 's|^#OPENSSL|OPENSSL|g' vpnc/Makefile
-
+  sed 's|^#OPENSSL|OPENSSL|g' -i Makefile
   # fix resolvconf location for community/openresolv
-  sed -i 's|/sbin/resolvconf|/usr&|g' vpnc-scripts/vpnc-script
+  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() {
-  cd vpnc
-  make
+  make -C ${pkgname}
 }
 
+check() {
+  make -C ${pkgname} test
+}
+
 package() {
-  cd vpnc
+  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}"
+}
 
-  make DESTDIR="$pkgdir" PREFIX=/usr SBINDIR=/usr/bin install
-
-  install -Dm644 "$srcdir"/vpnc.conf "$pkgdir"/etc/vpnc/default.conf
-  install -Dm755 "$srcdir"/vpnc-scripts/vpnc-script "$pkgdir"/etc/vpnc/vpnc-script
-
-  install -Dm644 "$srcdir"/vpnc at .service "$pkgdir"/usr/lib/systemd/system/vpnc at .service
-}
+# vim: ts=2 sw=2 et: