From 1a7ba844ad2c84ac4ba0d37f510285e778c7ffc4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 27 Jul 2023 16:34:32 +0100 Subject: gentoo auto-resync : 27:07:2023 - 16:34:32 --- net-misc/sslh/Manifest | 4 +- net-misc/sslh/sslh-1.22c-r1.ebuild | 76 ++++++++++++++++++++++++++++++++++++++ net-misc/sslh/sslh-1.22c.ebuild | 74 ------------------------------------- net-misc/sslh/sslh-9999.ebuild | 4 +- 4 files changed, 81 insertions(+), 77 deletions(-) create mode 100644 net-misc/sslh/sslh-1.22c-r1.ebuild delete mode 100644 net-misc/sslh/sslh-1.22c.ebuild (limited to 'net-misc/sslh') diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest index bab72b0744df..e1745cc07004 100644 --- a/net-misc/sslh/Manifest +++ b/net-misc/sslh/Manifest @@ -1,6 +1,6 @@ AUX sslh.conf.d-2 621 BLAKE2B 095522c582be245f1e49018848be738a33eb722cd9be4bd8a0830bbfaa1c2e4018ff480b625349372cc35ec47a1b10069cb5fd6a3c22d7e957e782c888c70b55 SHA512 31d482af0b3626f4b2f669f74a08fa6b6dfc310a40ab332cc3907306bd2fa5321f92e0e76af72c2ea185142f0d485578817e738737917b9c1764079070297e67 AUX sslh.init.d-3 270 BLAKE2B 98cc6c6ccc37a6e8af6d0e84356779e0f304e3d6f45f9fff53c3d1c870ff6b03ac780c04c29e4dce7d6aa3e4cdce365fb54228600e7ce70d9d32691202a5ffb5 SHA512 b919ae318c789ba3e5dd0f5df665a7421be791e89074b07ee00c47b3fe12475562eb5675bbb168c86388902bf50069e0d6f3e804a14666563de07a0a71075ee0 DIST sslh-1.22c.tar.gz 146954 BLAKE2B 1870623634b625bb98787be27444403555262f8a9782573c9ed116e65df9e4518c062ef2e2a40fe7bb550f811518ccc2149a23c36deef6c156911b4c42e27473 SHA512 f13560fbe74b5b08e9b360985d6afd27f2c7e157d220919162e354f3711b90f43bb81f9bda341fb21fef2651acd488f52e9a04dc2da28861540f579e7ca798c4 -EBUILD sslh-1.22c.ebuild 1883 BLAKE2B d9642d252b1ab086f6000727f27143e3d39ca144197459ace911d698e47309a378fa5b0b3e372d094bfdd2fd275e03a9c65d21afb9461f871e38ea022f19f1ad SHA512 9fc86c0302eb76a8c7f8c16ae53e717354da9bfeeb947a7a6a1244960dcfcd11bacb183c39037e9295b6e252e795a017e529193b3cad2014591843f6ec117a46 -EBUILD sslh-9999.ebuild 1885 BLAKE2B 9b1e2a512358f4fa53c2db0f6703a147d647ba3a97034e0213accd3303dccd3474da652af9cf4edb9d5c3c074beada092fbe97d226ad0f015f21445176cf648b SHA512 a9aa19a6abbf360fd7acf25417c26c9f8f235bd2fdfe36f021723e53606d6cca042c80bb7bbec543abf09fdede8541ce8bec35eb708f0b6867a9741f7df7f387 +EBUILD sslh-1.22c-r1.ebuild 1902 BLAKE2B e99872913344bd8ded6857a29d3c9f9e182a17ef52876a1e7b239ffe734bc492ef5eb66dc55d49a6c4affd35cb664a9bddc94fcdbc8a8466c59e0d9bb844e79b SHA512 91e768617210ace3354b3a6a9c4da9a4c5a5e20d6d875556dfbe406a72465d8a4e951e73e5c7711a90bdfb79ae82faa724d808be94af16cf204e3b2a40302973 +EBUILD sslh-9999.ebuild 1904 BLAKE2B c4eec8bb9130f1228c6b17950ba315af9889ac2b256830cdfbc8aa19347a1a6a6592cf8caa935a2d201a959a1775dc05daed031621fc389c7ac3991b7062862d SHA512 eb02974691ff05c6ae81a47e633513a01d2f412e58d42a3d9938da6109d5c2e97870e509850f72a2da051207d7628cd205ec6f8f9f6af1a20d7faa13ac694c50 MISC metadata.xml 442 BLAKE2B b2f7eeef70b4b2f204ff206707e5a63b096e9f29783322e334538ad812f0d8ba8767c9243abf89558c7a7f659b97c6334238be4a004e2671c59cd00e2ec4fa3f SHA512 3235b215629c09bb7ddb96c64a6b3f5fdb848bbc0cf89b585ae4328891d1b8e180ba0ab61a0786007deb074a74b6688c080d51de0eaf38ad1498fa72560429d5 diff --git a/net-misc/sslh/sslh-1.22c-r1.ebuild b/net-misc/sslh/sslh-1.22c-r1.ebuild new file mode 100644 index 000000000000..b228c7d0c9de --- /dev/null +++ b/net-misc/sslh/sslh-1.22c-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic systemd toolchain-funcs + +DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" +HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" + inherit git-r3 +else + 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" + +RDEPEND="caps? ( sys-libs/libcap ) + dev-libs/libpcre2:= + systemd? ( sys-apps/systemd:= ) + tcpd? ( sys-apps/tcp-wrappers ) + >=dev-libs/libconfig-1.5:=" +DEPEND="${RDEPEND} + dev-lang/perl" + +RESTRICT="test" + +src_prepare() { + default + sed -i \ + -e '/MAN/s:| gzip -9 - >:>:' \ + -e '/MAN=sslh.8.gz/s:.gz::' \ + Makefile || die +} + +src_compile() { + append-lfs-flags + + # On older versions of GCC, the default gnu89 variant + # will reject within-for-loop initializers, bug #595426 + # Furthermore, we need to use the gnu variant (gnu99) instead + # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro + # to be defined. + append-cflags -std=gnu99 + + emake \ + CC="$(tc-getCC)" \ + USELIBCAP=$(usev caps) \ + USELIBWRAP=$(usev tcpd) \ + USESYSTEMD=$(usev systemd) +} + +src_install() { + dosbin sslh-{fork,select} + dosym sslh-fork /usr/sbin/sslh + + doman ${PN}.8 + + dodoc ChangeLog README.md + + newinitd "${FILESDIR}"/sslh.init.d-3 sslh + newconfd "${FILESDIR}"/sslh.conf.d-2 sslh + + if use systemd; then + # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin + sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die + systemd_newunit scripts/systemd.sslh.service sslh.service + exeinto /usr/lib/systemd/system-generators/ + doexe systemd-sslh-generator + fi +} diff --git a/net-misc/sslh/sslh-1.22c.ebuild b/net-misc/sslh/sslh-1.22c.ebuild deleted file mode 100644 index e757173655e9..000000000000 --- a/net-misc/sslh/sslh-1.22c.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit flag-o-matic systemd toolchain-funcs - -DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" -HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" - inherit git-r3 -else - 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" - -RDEPEND="caps? ( sys-libs/libcap ) - dev-libs/libpcre2:= - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - >=dev-libs/libconfig-1.5:=" -DEPEND="${RDEPEND} - dev-lang/perl" - -RESTRICT="test" - -src_prepare() { - default - sed -i \ - -e '/MAN/s:| gzip -9 - >:>:' \ - -e '/MAN=sslh.8.gz/s:.gz::' \ - Makefile || die -} - -src_compile() { - # On older versions of GCC, the default gnu89 variant - # will reject within-for-loop initializers, bug #595426 - # Furthermore, we need to use the gnu variant (gnu99) instead - # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro - # to be defined. - append-cflags -std=gnu99 - - emake \ - CC="$(tc-getCC)" \ - USELIBCAP=$(usev caps) \ - USELIBWRAP=$(usev tcpd) \ - USESYSTEMD=$(usev systemd) -} - -src_install() { - dosbin sslh-{fork,select} - dosym sslh-fork /usr/sbin/sslh - - doman ${PN}.8 - - dodoc ChangeLog README.md - - newinitd "${FILESDIR}"/sslh.init.d-3 sslh - newconfd "${FILESDIR}"/sslh.conf.d-2 sslh - - if use systemd; then - # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin - sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die - systemd_newunit scripts/systemd.sslh.service sslh.service - exeinto /usr/lib/systemd/system-generators/ - doexe systemd-sslh-generator - fi -} diff --git a/net-misc/sslh/sslh-9999.ebuild b/net-misc/sslh/sslh-9999.ebuild index 9ecf187a6416..d00e3490d2df 100644 --- a/net-misc/sslh/sslh-9999.ebuild +++ b/net-misc/sslh/sslh-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -39,6 +39,8 @@ src_prepare() { } src_compile() { + append-lfs-flags + # On older versions of GCC, the default gnu89 variant # will reject within-for-loop initializers, bug #595426 # Furthermore, we need to use the gnu variant (gnu99) instead -- cgit v1.2.3