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 EF8C5138359 for ; Sun, 9 Aug 2020 19:16:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19B77E08AD; Sun, 9 Aug 2020 19:16:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 F01BBE08AD for ; Sun, 9 Aug 2020 19:16:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 C66F834F367 for ; Sun, 9 Aug 2020 19:16:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C9882CC for ; Sun, 9 Aug 2020 19:16:23 +0000 (UTC) From: "Steve Arnold" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Steve Arnold" Message-ID: <1597000521.4ad773667769976017f40ad88c556c50a7a42158.nerdboy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/stunnel/, net-misc/stunnel/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/stunnel/files/stunnel-r1 net-misc/stunnel/stunnel-5.56-r1.ebuild X-VCS-Directories: net-misc/stunnel/ net-misc/stunnel/files/ X-VCS-Committer: nerdboy X-VCS-Committer-Name: Steve Arnold X-VCS-Revision: 4ad773667769976017f40ad88c556c50a7a42158 X-VCS-Branch: master Date: Sun, 9 Aug 2020 19:16:23 +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: 1e8c164c-6a2f-4303-9042-f0c9ae6cdbf6 X-Archives-Hash: 8ee7a3fff59e112e90fa9f0f27d55a10 commit: 4ad773667769976017f40ad88c556c50a7a42158 Author: Stephen Arnold gentoo org> AuthorDate: Sun Aug 9 19:15:21 2020 +0000 Commit: Steve Arnold gentoo org> CommitDate: Sun Aug 9 19:15:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ad77366 net-misc/stunnel: update r1 init script, add ~arm64 to 5.56-r1 * adds --exec to stop args and einfo for symlink Closes: https://bugs.gentoo.org/736332 Package-Manager: Portage-2.3.67, Repoman-2.3.17 Signed-off-by: Steve Arnold gentoo.org> net-misc/stunnel/files/stunnel-r1 | 5 +++-- net-misc/stunnel/stunnel-5.56-r1.ebuild | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/net-misc/stunnel/files/stunnel-r1 b/net-misc/stunnel/files/stunnel-r1 index a73527ed57e..11530eabe72 100644 --- a/net-misc/stunnel/files/stunnel-r1 +++ b/net-misc/stunnel/files/stunnel-r1 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 extra_started_commands="reload" @@ -38,7 +38,8 @@ start() { stop() { get_config || return 1 ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --pidfile ${PIDFILE} + start-stop-daemon --stop --quiet --exec /usr/bin/stunnel \ + --pidfile ${PIDFILE} eend $? "Failed to stop ${SVCNAME}" } diff --git a/net-misc/stunnel/stunnel-5.56-r1.ebuild b/net-misc/stunnel/stunnel-5.56-r1.ebuild index 10f5581fa01..a6540f0fb4a 100644 --- a/net-misc/stunnel/stunnel-5.56-r1.ebuild +++ b/net-misc/stunnel/stunnel-5.56-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="ipv6 selinux stunnel3 tcpd" DEPEND="dev-libs/openssl:0= @@ -85,5 +85,7 @@ pkg_postinst() { einfo "If you want to run multiple instances of stunnel, create a new config" einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change " - einfo "\'pid= \' with a unique filename." + einfo "\'pid= \' with a unique filename. For openrc make a symlink from the" + einfo "stunnel init script to \'stunnel.name\' and use that to start|stop" + einfo "your custom instance" }