Follow core/gnupg

3 files changed, 90 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 87953cebe2b7..b9e5a582645a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,33 @@
 pkgbase = gnupg-git
-	pkgdesc = GNU Privacy Guard 2 - a PGP replacement tool. Development version. Do not use in production environments. Test new ECC algorithm by using --expert with --gen-key
-	pkgver = 2.1.0beta3+220+g82c25e6
+	pkgdesc = Complete and free implementation of the OpenPGP standard - development
+	pkgver = 2.2.0+12+g9f5e50e7c
 	pkgrel = 1
 	url = http://www.gnupg.org/
 	install = gnupg-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL
+	checkdepends = openssh
 	makedepends = git
-	makedepends = ghostscript
-	makedepends = transfig
-	makedepends = automake-1.11
-	depends = libldap
-	depends = curl
-	depends = bzip2
-	depends = zlib
-	depends = libksba>=1.2
-	depends = libgpg-error>=1.1
-	depends = libgcrypt>=1.5
-	depends = pth
-	depends = libusb-compat
-	depends = libassuan-git
+	makedepends = libldap
+	makedepends = libusb-compat
 	depends = npth-git
-	depends = texinfo
-	depends = readline
+	depends = libgpg-error-git
+	depends = libgcrypt-git
+	depends = libksba
+	depends = libassuan-git
 	depends = pinentry
-	provides = gnupg=2.1.0beta3+220+g82c25e6
+	depends = bzip2
+	depends = readline
+	depends = gnutls
+	depends = sqlite
+	optdepends = libldap: gpg2keys_ldap
+	optdepends = libusb-compat: scdaemon
+	provides = gnupg=2.2.0+12+g9f5e50e7c
 	provides = dirmngr
 	conflicts = gnupg2
 	conflicts = gnupg
 	conflicts = dirmngr
-	replaces = gnupg2
-	replaces = gnupg
-	replaces = dirmngr
 	source = git://git.gnupg.org/gnupg.git
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 2476f75acada..43b2f83810d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,23 @@
 # GnuPG2 GIT version
-# Maintainer: alphazo@gmail.com
-# Based on official package maintained by Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Lex Black <autumn-wind at web dot de>
+# Contributor: alphazo@gmail.com
+# Based on official package
 # Cleanup from @holos
 
 _gitname=gnupg
 pkgname=gnupg-git
-pkgver=2.1.0+beta834+21+g688a903
+pkgver=2.2.0+12+g9f5e50e7c
 pkgrel=1
-pkgdesc="GNU Privacy Guard 2 - a PGP replacement tool. Development version. Do not use in production environments. Test new ECC algorithms by using \"gpg --full-gen-key --expert\""
-arch=('i686' 'x86_64')
-depends=('libldap' 'curl' 'bzip2' 'zlib' 'libksba>=1.2' 'libgpg-error-git' 'libgcrypt-git'
-         'pth' 'libusb-compat' 'libassuan-git' 'npth-git' 'texinfo' 'readline' 'pinentry')
-license=('GPL')
+pkgdesc='Complete and free implementation of the OpenPGP standard - development'
 url="http://www.gnupg.org/"
-makedepends=('git' 'ghostscript' 'transfig' 'automake-1.11')
+license=('GPL')
+arch=('i686' 'x86_64')
+optdepends=('libldap: gpg2keys_ldap'
+            'libusb-compat: scdaemon')
+makedepends=('git' 'libldap' 'libusb-compat')
+checkdepends=('openssh')
+depends=('npth-git' 'libgpg-error-git' 'libgcrypt-git' 'libksba' 'libassuan-git'
+         'pinentry' 'bzip2' 'readline' 'gnutls' 'sqlite')
 provides=("gnupg=${pkgver}" 'dirmngr')
 conflicts=('gnupg2' 'gnupg' 'dirmngr')
 install=${pkgname}.install
@@ -21,29 +25,42 @@ source=("git://git.gnupg.org/gnupg.git")
 sha1sums=('SKIP')
 
 pkgver() {
-  cd "$_gitname"
+	cd "$_gitname"
+	git describe --tags | sed 's/gnupg-//;s/-/+/g'
+}
 
-  git describe --tags | sed 's/gnupg-//;s/-/+/g'
+prepare() {
+	cd "${_gitname}"
+    ./autogen.sh
+	sed '/noinst_SCRIPTS = gpg-zip/c sbin_SCRIPTS += gpg-zip' -i tools/Makefile.in
 }
 
 build() {
-  cd "$_gitname"
-
-  AUTOMAKE_SUFFIX="-1.11" ./autogen.sh --force
+	cd "${_gitname}"
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--sbindir=/usr/bin \
+		--libexecdir=/usr/lib/gnupg \
+		--enable-maintainer-mode \
+		--enable-symcryptrun \
 
-  ./configure \
-    --enable-maintainer-mode \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/gnupg
+	make
+}
 
-  make
+check() {
+	cd "${_gitname}"
+	make check
 }
 
 package() {
-  cd "$_gitname"
+	cd "${_gitname}"
+	make DESTDIR="${pkgdir}" install
+	ln -s gpg "${pkgdir}"/usr/bin/gpg2
+	ln -s gpgv "${pkgdir}"/usr/bin/gpgv2
 
-  make DESTDIR=${pkgdir} install
-  ln -s gpg2 "$pkgdir/usr/bin/gpg"
+	cd doc/examples/systemd-user
+	for i in *.*; do
+		install -Dm644 "$i" "${pkgdir}/usr/lib/systemd/user/$i"
+	done
 }
-
-# vim: ft=sh syn=sh et sw=2
diff --git a/gnupg-git.install b/gnupg-git.install
index 9f3cfc6a441e..b3032247f442 100644
--- a/gnupg-git.install
+++ b/gnupg-git.install
@@ -1,21 +1,41 @@
-info_dir=/usr/share/info
-info_files=(gnupg.info gnupg.info-1 gnupg.info-2)
+_global_units() {
+	_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() {
-    [ -x usr/bin/install-info ] || return 0
-    for f in ${info_files[@]}; do
-      usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null
-    done
+	# See FS#42798 and FS#47371
+	dirmngr </dev/null &>/dev/null
+
+	# Let systemd supervise daemons by default
+	_global_units enable
 }
 
 post_upgrade() {
-  post_install $1
-}
+	if (( $(vercmp $2 2.1.13-1) < 0 )); then
+		echo "==> Please kill running gpg-agent and dirmngr processes before using this release."
+	fi
 
-pre_remove() {
-   [ -x usr/bin/install-info ] || return 0
-   for f in ${info_files[@]}; do
-     usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null
-   done
+	if (( $(vercmp $2 2.1.21-3) < 0 )); then
+		_global_units enable
+	fi
 }
 
+pre_remove() {
+	_global_units disable
+}
\ No newline at end of file