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

[Levente Polyak]

    Date: Sunday, March 21, 2021 @ 12:51:27
  Author: anthraxx
Revision: 410423

upgpkg: pinentry 1.1.1-1: use preexec hook in /etc/pinentry for configuration

Added:
  pinentry/trunk/preexec
Modified:
  pinentry/trunk/PKGBUILD
  pinentry/trunk/pinentry

----------+
 PKGBUILD |   71 ++++++++++++++++++++++++++++++++++++-------------------------
 pinentry |   10 +++++++-
 preexec  |    5 ++++
 3 files changed, 56 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-21 12:32:05 UTC (rev 410422)
+++ PKGBUILD	2021-03-21 12:51:27 UTC (rev 410423)
@@ -1,45 +1,58 @@
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
 
 pkgname=pinentry
-pkgver=1.1.0
-pkgrel=5
+pkgver=1.1.1
+pkgrel=1
 pkgdesc='Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol'
 url='https://gnupg.org/related_software/pinentry/'
 arch=('x86_64')
 license=('GPL')
-depends=('ncurses' 'libcap' 'libassuan' 'libsecret')
+depends=(
+  'glibc' 'ncurses' 'libcap' 'libassuan' 'libsecret' 'glib2'
+  libsecret-1.so libcap.so libncursesw.so libassuan.so libglib-2.0.so)
 makedepends=('gtk2' 'qt5-base' 'gcr')
-optdepends=('gtk2: gtk2 backend'
-            'qt5-base: qt backend'
-            'gcr: gnome3 backend')
-validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6')
+optdepends=(
+  'gtk2: gtk2 backend'
+  'qt5-base: qt backend'
+  'gcr: gnome3 backend'
+)
+backup=('etc/pinentry/preexec')
 source=("https://www.gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
-        'pinentry')
-sha256sums=('68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570'
+        'pinentry'
+        'preexec')
+sha256sums=('cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f'
             'SKIP'
-            '4f51d67c8cf92f2bb535e07d2ba7dc8972535dae077c678102a34fb87f3b3a9c')
+            'af7c27139b20a7f1b9a227f3663abb21bb2b954523352b7844da27db1b0c1c86'
+            'f428f08d77f1f7830eadb8435af282a833fc13d8b623b122eefd9d3b628bef90')
+validpgpkeys=(
+  'D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
+  '6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist signing 2020)
+)
 
-backup=('usr/bin/pinentry')
-
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure \
-		--prefix=/usr \
-		--enable-pinentry-tty \
-		--enable-pinentry-curses \
-		--enable-fallback-curses \
-		--enable-pinentry-emacs \
-		--enable-pinentry-gtk2 \
-		--enable-pinentry-gnome3 \
-		--enable-pinentry-qt \
-		--enable-libsecret \
+  cd "${pkgname}-${pkgver}"
+  ./configure \
+    --prefix=/usr \
+    --enable-pinentry-tty \
+    --enable-pinentry-curses \
+    --enable-fallback-curses \
+    --enable-pinentry-emacs \
+    --enable-pinentry-gtk2 \
+    --enable-pinentry-gnome3 \
+    --enable-pinentry-qt \
+    --enable-libsecret \
 
-	make
+  make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install ../pinentry "${pkgdir}/usr/bin/pinentry"
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm 755 ../pinentry -t "${pkgdir}/usr/bin"
+  install -Dm 755 ../preexec -t "${pkgdir}/etc/pinentry"
 }
+
+# vim: ts=2 sw=2 et:

Modified: pinentry
===================================================================
--- pinentry	2021-03-21 12:32:05 UTC (rev 410422)
+++ pinentry	2021-03-21 12:51:27 UTC (rev 410423)
@@ -1,6 +1,14 @@
 #!/bin/sh
 
+# user-defined pre-exec hook
+test -r "${XDG_CONFIG_HOME:-$HOME/.config}"/pinentry/preexec &&
+    . "${XDG_CONFIG_HOME:-$HOME/.config}"/pinentry/preexec
+
+# site-defined pre-exec hook
+test -r /etc/pinentry/preexec &&
+    . /etc/pinentry/preexec
+
 test -e /usr/lib/libgtk-x11-2.0.so.0 &&
-exec /usr/bin/pinentry-gtk-2  "$@"
+    exec /usr/bin/pinentry-gtk-2 "$@"
 
 exec /usr/bin/pinentry-curses "$@"

Added: preexec
===================================================================
--- preexec	                        (rev 0)
+++ preexec	2021-03-21 12:51:27 UTC (rev 410423)
@@ -0,0 +1,5 @@
+#!/hint/sh
+
+# Define additional functionality for pinentry. For example
+#test -e /usr/lib/libgcr-base-3.so.1 && exec /usr/bin/pinentry-gnome3 "$@"
+#test -e /usr/lib/libQt5Widgets.so.5 && exec /usr/bin/pinentry-qt     "$@"


Property changes on: pinentry/trunk/preexec
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property