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

[Antonio Rojas]

    Date: Tuesday, December 22, 2015 @ 23:16:26
  Author: arojas
Revision: 257199

Don't export SSH_ASKPASS (FS#47288)

Added:
  x11-ssh-askpass/trunk/x11-ssh-askpass.install
Modified:
  x11-ssh-askpass/trunk/PKGBUILD
Deleted:
  x11-ssh-askpass/trunk/profile.d

-------------------------+
 PKGBUILD                |   10 ++++------
 profile.d               |    4 ----
 x11-ssh-askpass.install |    5 +++++
 3 files changed, 9 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-22 22:12:04 UTC (rev 257198)
+++ PKGBUILD	2015-12-22 22:16:26 UTC (rev 257199)
@@ -6,7 +6,7 @@
 
 pkgname=x11-ssh-askpass
 pkgver=1.2.4.1
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight passphrase dialog for SSH'
 url='http://www.jmknoble.net/software/x11-ssh-askpass/'
 license=('custom')
@@ -14,10 +14,9 @@
 depends=('libxt')
 makedepends=('imake')
 #source=("${url}${pkgname}-${pkgver}.tar.gz" # httpd only sends half the bits
-source=("http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz"
-        'profile.d')
-sha1sums=('78c992951685d4dbffb77536f37b83ae2a6eafc7'
-          '28be56290d07e2625bc8e81ae8c7ea741d329c51')
+source=("http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz")
+sha1sums=('78c992951685d4dbffb77536f37b83ae2a6eafc7')
+install=${pkgname}.install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -36,5 +35,4 @@
 	make DESTDIR="${pkgdir}" install install.man
 	install -d "${pkgdir}/usr/share/licenses/${pkgname}"
 	sed '109,174p;d' README > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm755 ../profile.d "${pkgdir}/etc/profile.d/${pkgname}.sh"
 }

Deleted: profile.d
===================================================================
--- profile.d	2015-12-22 22:12:04 UTC (rev 257198)
+++ profile.d	2015-12-22 22:16:26 UTC (rev 257199)
@@ -1,4 +0,0 @@
-if [ -f "/usr/lib/ssh/x11-ssh-askpass" ] ; then
-	SSH_ASKPASS="/usr/lib/ssh/x11-ssh-askpass"
-	export SSH_ASKPASS
-fi

Added: x11-ssh-askpass.install
===================================================================
--- x11-ssh-askpass.install	                        (rev 0)
+++ x11-ssh-askpass.install	2015-12-22 22:16:26 UTC (rev 257199)
@@ -0,0 +1,5 @@
+post_upgrade() {
+  if [[ $(vercmp 1.2.4.1-5 "$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
+}