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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 45A46158041 for ; Wed, 13 Mar 2024 21:05:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C92BE29D1; Wed, 13 Mar 2024 21:05:47 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52486E29D1 for ; Wed, 13 Mar 2024 21:05:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D380335DC0 for ; Wed, 13 Mar 2024 21:05:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B76813DE for ; Wed, 13 Mar 2024 21:05:45 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1710363941.842a4c971269f100e28fb23b199e9ff6b7708a1b.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/sslh/Manifest net-misc/sslh/metadata.xml net-misc/sslh/sslh-2.1.0.ebuild net-misc/sslh/sslh-9999.ebuild X-VCS-Directories: net-misc/sslh/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 842a4c971269f100e28fb23b199e9ff6b7708a1b X-VCS-Branch: master Date: Wed, 13 Mar 2024 21:05:45 +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: 56765736-c7fd-42dc-8d0e-80169e9b3a75 X-Archives-Hash: b55f0e801fc64f3efbde3d5c16de7a54 commit: 842a4c971269f100e28fb23b199e9ff6b7708a1b Author: Craig Andrews gentoo org> AuthorDate: Wed Mar 13 21:05:10 2024 +0000 Commit: Craig Andrews gentoo org> CommitDate: Wed Mar 13 21:05:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=842a4c97 net-misc/sslh: add 2.1.0 Signed-off-by: Craig Andrews gentoo.org> net-misc/sslh/Manifest | 1 + net-misc/sslh/metadata.xml | 3 +++ .../sslh/{sslh-9999.ebuild => sslh-2.1.0.ebuild} | 20 ++++++++++++++------ net-misc/sslh/sslh-9999.ebuild | 20 ++++++++++++++------ 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest index a531724b8ac9..1e47e5b91c25 100644 --- a/net-misc/sslh/Manifest +++ b/net-misc/sslh/Manifest @@ -1 +1,2 @@ DIST sslh-1.22c.tar.gz 146954 BLAKE2B 1870623634b625bb98787be27444403555262f8a9782573c9ed116e65df9e4518c062ef2e2a40fe7bb550f811518ccc2149a23c36deef6c156911b4c42e27473 SHA512 f13560fbe74b5b08e9b360985d6afd27f2c7e157d220919162e354f3711b90f43bb81f9bda341fb21fef2651acd488f52e9a04dc2da28861540f579e7ca798c4 +DIST sslh-2.1.0.tar.gz 212289 BLAKE2B e85e330e1769cca54deb0dec601402c3d7d578722a2f5addd3ce3d178663d85a5dad9a1fa2e06e11758333f59b96e5cbf4886147ad1497de1f0fcfbe7b71fde2 SHA512 3fe2590c858132c536ce4142097b0c22d37a60f473a2247d2f2fdff5b4f511e1cffb57d8dc5ebddd36ab2a566ac0674172c4e96867b4c738d9ca463aa02ea11d diff --git a/net-misc/sslh/metadata.xml b/net-misc/sslh/metadata.xml index 80b7211a3ce1..5b1919ad8dd6 100644 --- a/net-misc/sslh/metadata.xml +++ b/net-misc/sslh/metadata.xml @@ -5,6 +5,9 @@ candrews@gentoo.org Craig Andrews + + Support event loops via dev-libs/libev + yrutschle/sslh cpe:/a:sslh_project:sslh diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-2.1.0.ebuild similarity index 84% copy from net-misc/sslh/sslh-9999.ebuild copy to net-misc/sslh/sslh-2.1.0.ebuild index d00e3490d2df..1a3dc9b9f8e3 100644 --- a/net-misc/sslh/sslh-9999.ebuild +++ b/net-misc/sslh/sslh-2.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,19 +11,21 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" + KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86" SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" S=${WORKDIR}/${P} fi LICENSE="GPL-2" SLOT="0" -IUSE="caps systemd tcpd" +IUSE="caps libev systemd tcpd" RDEPEND="caps? ( sys-libs/libcap ) dev-libs/libpcre2:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) + dev-libs/libconfig:= + libev? ( dev-libs/libev ) >=dev-libs/libconfig-1.5:=" DEPEND="${RDEPEND} dev-lang/perl" @@ -31,11 +33,11 @@ DEPEND="${RDEPEND} RESTRICT="test" src_prepare() { - default sed -i \ -e '/MAN/s:| gzip -9 - >:>:' \ -e '/MAN=sslh.8.gz/s:.gz::' \ - Makefile || die + Makefile.in || die + default } src_compile() { @@ -51,13 +53,19 @@ src_compile() { emake \ CC="$(tc-getCC)" \ USELIBCAP=$(usev caps) \ + USELIBEV=$(usev libev) \ USELIBWRAP=$(usev tcpd) \ USESYSTEMD=$(usev systemd) } src_install() { dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh + if use libev; then + dosbin sslh-ev + dosym sslh-fork /usr/sbin/sslh + else + dosym sslh-fork /usr/sbin/sslh + fi doman ${PN}.8 diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild index d00e3490d2df..1a3dc9b9f8e3 100644 --- a/net-misc/sslh/sslh-9999.ebuild +++ b/net-misc/sslh/sslh-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,19 +11,21 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~x86" + KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 x86" SRC_URI="https://github.com/yrutschle/sslh/archive/v${PV}.tar.gz -> ${P}.tar.gz" S=${WORKDIR}/${P} fi LICENSE="GPL-2" SLOT="0" -IUSE="caps systemd tcpd" +IUSE="caps libev systemd tcpd" RDEPEND="caps? ( sys-libs/libcap ) dev-libs/libpcre2:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) + dev-libs/libconfig:= + libev? ( dev-libs/libev ) >=dev-libs/libconfig-1.5:=" DEPEND="${RDEPEND} dev-lang/perl" @@ -31,11 +33,11 @@ DEPEND="${RDEPEND} RESTRICT="test" src_prepare() { - default sed -i \ -e '/MAN/s:| gzip -9 - >:>:' \ -e '/MAN=sslh.8.gz/s:.gz::' \ - Makefile || die + Makefile.in || die + default } src_compile() { @@ -51,13 +53,19 @@ src_compile() { emake \ CC="$(tc-getCC)" \ USELIBCAP=$(usev caps) \ + USELIBEV=$(usev libev) \ USELIBWRAP=$(usev tcpd) \ USESYSTEMD=$(usev systemd) } src_install() { dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh + if use libev; then + dosbin sslh-ev + dosym sslh-fork /usr/sbin/sslh + else + dosym sslh-fork /usr/sbin/sslh + fi doman ${PN}.8