[arch-commits] Commit in seahorse/trunk (3 files)

[Antonio Rojas]

    Date: Tuesday, December 22, 2015 @ 23:22:18
  Author: arojas
Revision: 257201

Don't export SSH_ASKPASS (FS#47288)

Modified:
  seahorse/trunk/PKGBUILD
  seahorse/trunk/seahorse.install
Deleted:
  seahorse/trunk/seahorse-ssh-askpass.sh

-------------------------+
 PKGBUILD                |   10 +++-------
 seahorse-ssh-askpass.sh |    3 ---
 seahorse.install        |    3 +++
 3 files changed, 6 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-22 22:17:05 UTC (rev 257200)
+++ PKGBUILD	2015-12-22 22:22:18 UTC (rev 257201)
@@ -5,7 +5,7 @@
 
 pkgname=seahorse
 pkgver=3.18.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
 license=(GPL)
@@ -17,10 +17,8 @@
 options=('!emptydirs')
 groups=(gnome-extra)
 install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-        seahorse-ssh-askpass.sh)
-sha256sums=('530c889a01c4cad25df4c9ab58ab95d24747875789bc6116bef529d60fc1b667'
-            '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('530c889a01c4cad25df4c9ab58ab95d24747875789bc6116bef529d60fc1b667')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -33,6 +31,4 @@
 package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \
-    "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh"
 }

Deleted: seahorse-ssh-askpass.sh
===================================================================
--- seahorse-ssh-askpass.sh	2015-12-22 22:17:05 UTC (rev 257200)
+++ seahorse-ssh-askpass.sh	2015-12-22 22:22:18 UTC (rev 257201)
@@ -1,3 +0,0 @@
-if [ -z "$SSH_ASKPASS" ] && [ -n "$DISPLAY" ]; then
-  export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass
-fi

Modified: seahorse.install
===================================================================
--- seahorse.install	2015-12-22 22:17:05 UTC (rev 257200)
+++ seahorse.install	2015-12-22 22:22:18 UTC (rev 257201)
@@ -6,6 +6,9 @@
 
 post_upgrade() {
   post_install
+  if [[ $(vercmp 3.18.0-2 "$2") -eq 1 ]]; then
+    echo "The SSH_ASKPASS environment variable is not exported by default anymore. Set it in /etc/profile to revert to the previous behavior"
+  fi
 }
 
 post_remove() {