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

[Jan Steffens]

    Date: Friday, June 9, 2017 @ 08:54:33
  Author: heftig
Revision: 298461

2.1.21-3: Fix install w/o systemd; add openssh to avoid a test skip

Modified:
  gnupg/trunk/PKGBUILD
  gnupg/trunk/install

----------+
 PKGBUILD |    3 ++-
 install  |   20 ++++++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-09 08:01:06 UTC (rev 298460)
+++ PKGBUILD	2017-06-09 08:54:33 UTC (rev 298461)
@@ -6,7 +6,7 @@
 
 pkgname=gnupg
 pkgver=2.1.21
-pkgrel=2
+pkgrel=3
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
@@ -14,6 +14,7 @@
 optdepends=('libldap: gpg2keys_ldap'
             'libusb-compat: scdaemon')
 makedepends=('libldap' 'libusb-compat')
+checkdepends=('openssh')
 depends=('npth' 'libgpg-error' 'libgcrypt' 'libksba' 'libassuan'
          'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
 validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'

Modified: install
===================================================================
--- install	2017-06-09 08:01:06 UTC (rev 298460)
+++ install	2017-06-09 08:54:33 UTC (rev 298461)
@@ -1,5 +1,21 @@
 _global_units() {
-	systemctl --global $1 dirmngr.socket gpg-agent.socket gpg-agent-{browser,extra,ssh}.socket
+	_units=(dirmngr.socket gpg-agent.socket gpg-agent-{browser,extra,ssh}.socket)
+	_dir=/etc/systemd/user/sockets.target.wants
+
+	case $1 in
+		enable)
+			mkdir -p $_dir
+			for _u in "${_units[@]}"; do
+				ln -sf /usr/lib/systemd/user/$_u $_dir/$_u
+			done
+			;;
+		disable)
+			for _u in "${_units[@]}"; do
+				rm -f $_dir/$_u
+			done
+			rmdir -p --ignore-fail-on-non-empty $_dir
+			;;
+	esac
 }
 
 post_install() {
@@ -15,7 +31,7 @@
 		echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
 	fi
 
-	if (( $(vercmp $2 2.1.21-2) < 0 )); then
+	if (( $(vercmp $2 2.1.21-3) < 0 )); then
 		_global_units enable
 	fi
 }