git » ksshaskpass.git » commit af10416

Don't export SSH_ASKPASS (FS#47288)

author Antonio Rojas
2015-12-22 22:11:30 UTC
committer Antonio Rojas
2015-12-22 22:11:30 UTC
parent f8156c43d1e54398d4b7ddd1830cc1153c46c762

Don't export SSH_ASKPASS (FS#47288)

PKGBUILD +5 -9
ksshaskpass.sh +0 -1

diff --git a/PKGBUILD b/PKGBUILD
index 4c73d54..ce2a643 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,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')
@@ -12,13 +12,12 @@ arch=('i686' 'x86_64')
 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
@@ -36,7 +35,4 @@ build() {
 package() {
   cd build
   make DESTDIR="$pkgdir" install
-
-  install -Dm755 "$srcdir"/ksshaskpass.sh \
-    "${pkgdir}"/etc/profile.d/ksshaskpass.sh
 }
diff --git a/ksshaskpass.sh b/ksshaskpass.sh
deleted file mode 100644
index 6e67d01..0000000
--- a/ksshaskpass.sh
+++ /dev/null
@@ -1 +0,0 @@
-test -f /usr/bin/ksshaskpass && export SSH_ASKPASS="/usr/bin/ksshaskpass"