[arch-commits] Commit in ksshaskpass/trunk (PKGBUILD ksshaskpass.sh)

[Antonio Rojas]

    Date: Tuesday, December 22, 2015 @ 23:11:30
  Author: arojas
Revision: 257197

Don't export SSH_ASKPASS (FS#47288)

Modified:
  ksshaskpass/trunk/PKGBUILD
Deleted:
  ksshaskpass/trunk/ksshaskpass.sh

----------------+
 PKGBUILD       |   14 +++++---------
 ksshaskpass.sh |    1 -
 2 files changed, 5 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-22 20:01:27 UTC (rev 257196)
+++ PKGBUILD	2015-12-22 22:11:30 UTC (rev 257197)
@@ -5,7 +5,7 @@
 
 pkgname=ksshaskpass
 pkgver=5.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc='ssh-add helper that uses kwallet and kpassworddialog'
 url='https://projects.kde.org/projects/kde/workspace/ksshaskpass'
 license=('GPL')
@@ -13,13 +13,12 @@
 depends=('kwallet')
 makedepends=('extra-cmake-modules' 'kdoctools' 'python')
 provides=('x11-ssh-askpass' 'ksshaskpass-frameworks')
-conflicts=('x11-ssh-askpass' 'ksshaskpass-frameworks')
+conflicts=('ksshaskpass-frameworks')
 replaces=('ksshaskpass-frameworks')
 groups=('plasma')
-source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz"
-        "$pkgname.sh")
-md5sums=('01af6e4211c3f32b8c8def2db2db9229'
-         '70396ba019ae05cc91502456f548caff')
+source=("http://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz")
+install=$pkgname.install
+md5sums=('01af6e4211c3f32b8c8def2db2db9229')
 
 prepare() {
   mkdir -p build
@@ -37,7 +36,4 @@
 package() {
   cd build
   make DESTDIR="$pkgdir" install
-
-  install -Dm755 "$srcdir"/ksshaskpass.sh \
-    "${pkgdir}"/etc/profile.d/ksshaskpass.sh
 }

Deleted: ksshaskpass.sh
===================================================================
--- ksshaskpass.sh	2015-12-22 20:01:27 UTC (rev 257196)
+++ ksshaskpass.sh	2015-12-22 22:11:30 UTC (rev 257197)
@@ -1 +0,0 @@
-test -f /usr/bin/ksshaskpass && export SSH_ASKPASS="/usr/bin/ksshaskpass"