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

[Antonio Rojas]

    Date: Tuesday, December 22, 2015 @ 23:28:42
  Author: arojas
Revision: 154305

Don't export SSH_ASKPASS (FS#47288)

Added:
  openssh-askpass/trunk/openssh-askpass.install
Modified:
  openssh-askpass/trunk/PKGBUILD
Deleted:
  openssh-askpass/trunk/openssh-askpass.sh

-------------------------+
 PKGBUILD                |   11 ++++-------
 openssh-askpass.install |    5 +++++
 openssh-askpass.sh      |    1 -
 3 files changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-22 21:56:50 UTC (rev 154304)
+++ PKGBUILD	2015-12-22 22:28:42 UTC (rev 154305)
@@ -4,7 +4,7 @@
 
 pkgname=openssh-askpass
 pkgver=2.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc='A plasma-like passphrase dialog for ssh'
 arch=('i686' 'x86_64')
 url='http://hugo.pereira.free.fr/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=0'
@@ -12,9 +12,8 @@
 depends=('openssh' 'qt4' 'xcb-util-keysyms')
 makedepends=('cmake')
 provides=('x11-ssh-askpass')
-conflicts=('x11-ssh-askpass')
-source=("http://hugo.pereira.free.fr/software/tgz/$pkgname-$pkgver.tar.gz"
-        "$pkgname.sh")
+source=("http://hugo.pereira.free.fr/software/tgz/$pkgname-$pkgver.tar.gz")
+install=$pkgname.install
          
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -29,8 +28,6 @@
 package() {
   cd "$srcdir/$pkgname-$pkgver/build"
   make DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
 }
 
-md5sums=('b5abdeef5f09256545f8643aca111426'
-         'baec3f0499b851aca6705968fa9e0df7')
+md5sums=('b5abdeef5f09256545f8643aca111426')

Added: openssh-askpass.install
===================================================================
--- openssh-askpass.install	                        (rev 0)
+++ openssh-askpass.install	2015-12-22 22:28:42 UTC (rev 154305)
@@ -0,0 +1,5 @@
+post_upgrade() {
+  if [[ $(vercmp 2.0.3-3 "$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
+}

Deleted: openssh-askpass.sh
===================================================================
--- openssh-askpass.sh	2015-12-22 21:56:50 UTC (rev 154304)
+++ openssh-askpass.sh	2015-12-22 22:28:42 UTC (rev 154305)
@@ -1 +0,0 @@
-export SSH_ASKPASS=/usr/bin/qt4-ssh-askpass