From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59696138335 for ; Sun, 22 Dec 2019 18:58:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7CBCFE0AD5; Sun, 22 Dec 2019 18:58:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F035E0AD5 for ; Sun, 22 Dec 2019 18:58:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B516534DA84 for ; Sun, 22 Dec 2019 18:58:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4420B12EC4 for ; Sun, 22 Dec 2019 18:58:22 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1577041078.d82536728651a74bb9e3db51040aeded8824df89.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/ksshaskpass/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild X-VCS-Directories: kde-plasma/ksshaskpass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d82536728651a74bb9e3db51040aeded8824df89 X-VCS-Branch: master Date: Sun, 22 Dec 2019 18:58:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 844b356e-c92f-491f-a4c7-a9b841df05fd X-Archives-Hash: adec9c98eaacc10ccb05c5b54ae3f39a commit: d82536728651a74bb9e3db51040aeded8824df89 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 22 13:45:11 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 22 18:57:58 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8253672 kde-plasma/ksshaskpass: Add old script migration, update postinst Follow-up to bdb0f5267d00191069c4bf88b98fe759441a2a2b and 77aa9069fe3cc4680c446a3d9ecd2f5f695f171d. Bug: https://bugs.gentoo.org/688366 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild | 50 ++++++++++++++++++------ 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild index 4709b97d614..1d96ba90764 100644 --- a/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild +++ b/kde-plasma/ksshaskpass/ksshaskpass-5.17.4.ebuild @@ -10,20 +10,43 @@ inherit ecm kde.org DESCRIPTION="KDE implementation of ssh-askpass with Kwallet integration" HOMEPAGE="https://cgit.kde.org/ksshaskpass.git" + LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="" DEPEND=" + >=dev-qt/qtwidgets-${QTMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kwallet-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 " RDEPEND="${DEPEND}" +pkg_setup() { + ecm_pkg_setup + + local srcfile=/etc/plasma/startup/05-ksshaskpass.sh + local newfile=/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh + if [[ -f "${EROOT}"${srcfile} ]]; then + local md5=$(md5sum "${EROOT}"${srcfile}) + if [[ ${md5%% *} != 615ae8f5b0090ff7f51d0edee7885d55 ]]; then + elog "Existing modified "${EPREFIX}"${srcfile} detected." + elog "Copying to "${EPREFIX}"${newfile}..." + cp -v "${EROOT}"${srcfile} "${T}"/ || die + fi + fi +} + +src_prepare() { + ecm_src_prepare + if [[ ! -f "${T}"/05-ksshaskpass.sh ]]; then + cp "${FILESDIR}"/05-ksshaskpass.sh "${T}"/ || die + fi +} + src_install() { ecm_src_install @@ -34,17 +57,22 @@ src_install() { pkg_postinst() { ecm_pkg_postinst + elog "In order to have ssh-agent start with Plasma 5," + elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh" + elog "and uncomment the lines enabling ssh-agent." + elog + elog "If you do so, do not forget to uncomment the respective" + elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" + elog "to properly kill the agent when the session ends." + elog elog "${PN} has been installed as your default askpass application" elog "for Plasma 5 sessions." elog "If that's not desired, select the one you want to use in" - elog - elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh (ATTN: Path moved!)" - elog - elog "In order to have ssh-agent start with Plasma 5, do the following:" - elog " * Copy the necessary files to your home directory:" - elog " - cp /etc/plasma/startup/10-agent-startup.sh ~/.config/plasma-workspace/env/" - elog " - cp /etc/plasma/shutdown/10-agent-shutdown.sh ~/.config/plasma-workspace/shutdown/" - elog " * Edit 10-agent-startup.sh and uncomment the lines enabling ssh-agent." - elog " * In 10-agent-shutdown.sh uncomment the respective lines to properly kill" - elog " the agent when the session ends." + elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh" + + # Clean up pre-5.17.4 script + if [[ -e "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh ]]; then + rm "${EROOT}"/etc/plasma/startup/05-ksshaskpass.sh || die + elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/05-ksshaskpass.sh" + fi }