From 208417ead78c81d14036881b3dfa81c2688ce352 Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Fri, 14 Apr 2017 01:31:18 +0200 Subject: [PATCH] gnome-ssh-askpass: update to 7.5p1 Change URL from ftp to https Add vlicense() Add alternatives lxqt-openssh-askpass Make virt-manager work by these changes --- srcpkgs/gnome-ssh-askpass/template | 15 ++++++++++----- srcpkgs/lxqt-openssh-askpass/template | 6 +++++- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gnome-ssh-askpass/template b/srcpkgs/gnome-ssh-askpass/template index 9ecb44e9f80..3191e040398 100644 --- a/srcpkgs/gnome-ssh-askpass/template +++ b/srcpkgs/gnome-ssh-askpass/template @@ -1,6 +1,6 @@ # Template file for 'gnome-ssh-askpass' pkgname=gnome-ssh-askpass -version=7.2p2 +version=7.5p1 revision=1 wrksrc="openssh-${version}" hostmakedepends="pkg-config" @@ -9,14 +9,19 @@ short_desc="GTK SSH passphrase grabber (from OpenSSH)" maintainer="Christian Neukirchen " license="BSD" homepage="http://www.openssh.org" -distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$version.tar.gz" -checksum=a72781d1a043876a224ff1b0032daa4094d87565a68528759c1c2cab5482548c +distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-$version.tar.gz" +checksum=9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0 + +alternatives=" + ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/gnome-ssh-askpass +" do_build() { cd contrib - ${CC} ${CFLAGS} $(pkg-config --cflags gtk+-2.0) gnome-ssh-askpass2.c -o gnome-ssh-askpass $(pkg-config --libs gtk+-2.0) ${LDFLAGS} -lX11 + ${CC} ${CFLAGS} $(pkg-config --cflags gtk+-2.0) ${pkgname}2.c -o ${pkgname} $(pkg-config --libs gtk+-2.0) ${LDFLAGS} -lX11 } do_install() { - vbin contrib/gnome-ssh-askpass + vbin contrib/${pkgname} + vlicense LICENCE } diff --git a/srcpkgs/lxqt-openssh-askpass/template b/srcpkgs/lxqt-openssh-askpass/template index bab97237448..af7660fda98 100644 --- a/srcpkgs/lxqt-openssh-askpass/template +++ b/srcpkgs/lxqt-openssh-askpass/template @@ -1,7 +1,7 @@ # Template file for 'lxqt-openssh-askpass' pkgname=lxqt-openssh-askpass version=0.11.1 -revision=1 +revision=2 build_style=cmake configure_args="-DPULL_TRANSLATIONS=0" hostmakedepends="pkg-config qt5-host-tools liblxqt-devel" @@ -13,3 +13,7 @@ license="LGPL-2.1" homepage="http://lxqt.org/" distfiles="https://github.com/lxde/lxqt-openssh-askpass/releases/download/${version}/lxqt-openssh-askpass-${version}.tar.xz" checksum=52c29549bc1ecaf3e3843e08460f1ec8f1a62bc423a46034b8189fee01803eb9 + +alternatives=" + ssh-askpass:/usr/libexec/ssh-askpass:/usr/bin/lxqt-openssh-askpass +"