commit: 1e4544ef2186690c5418d2eb158670a35f5e751c Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sat Nov 17 02:06:35 2018 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sat Nov 17 02:07:32 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4544ef
net-misc/sslh: remove 1.18-r2 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org> net-misc/sslh/Manifest | 1 - .../sslh/files/sslh-1.18-systemd-generator.patch | 26 --------- net-misc/sslh/files/sslh-1.18-version-deps.patch | 15 ----- net-misc/sslh/files/sslh.init.d-2 | 20 ------- net-misc/sslh/sslh-1.18-r2.ebuild | 68 ---------------------- 5 files changed, 130 deletions(-) diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest index cd307555d73..3d060fb02b2 100644 --- a/net-misc/sslh/Manifest +++ b/net-misc/sslh/Manifest @@ -1,2 +1 @@ -DIST sslh-v1.18.tar.gz 53170 BLAKE2B 8d26bdc9950b9017279b36699821b756ea0507949edca90758cd4149aac56fd1a12e0192009ce2154af09818a6aa009fd2009f88d89dae8f76525d7aacc4a830 SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea DIST sslh-v1.19c.tar.gz 57418 BLAKE2B 97af9d8f79c54f1ba11476a142c762c69a16b6fdd48ead167c56c217a556183e3fda777f217c09d3bf6a5705d5cf491b68c282b626f70d42512d147d98b6f87c SHA512 14529f1fc1488b10e660fa85f5d8bb642a0e119a15ca44d492793153447c9414ade5a1925fbbedd19c5d26662aa1bafd9743ab5ca11324632269110406fa8ce9 diff --git a/net-misc/sslh/files/sslh-1.18-systemd-generator.patch b/net-misc/sslh/files/sslh-1.18-systemd-generator.patch deleted file mode 100644 index 476de2a4c1e..00000000000 --- a/net-misc/sslh/files/sslh-1.18-systemd-generator.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://patch-diff.githubusercontent.com/raw/yrutschle/sslh/pull/98 ---- a/Makefile -+++ b/Makefile -@@ -27,6 +27,8 @@ CFLAGS ?=-Wall -g $(CFLAGS_COV) - LIBS= - OBJS=common.o sslh-main.o probe.o tls.o - -+CONDITIONAL_TARGETS= -+ - ifneq ($(strip $(USELIBWRAP)),) - LIBS:=$(LIBS) -lwrap - CPPFLAGS+=-DLIBWRAP -@@ -54,10 +56,11 @@ endif - ifneq ($(strip $(USESYSTEMD)),) - LIBS:=$(LIBS) -lsystemd - CPPFLAGS+=-DSYSTEMD -+ CONDITIONAL_TARGETS+=systemd-sslh-generator - endif - - --all: sslh $(MAN) echosrv -+all: sslh $(MAN) echosrv $(CONDITIONAL_TARGETS) - - .c.o: *.h - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - diff --git a/net-misc/sslh/files/sslh-1.18-version-deps.patch b/net-misc/sslh/files/sslh-1.18-version-deps.patch deleted file mode 100644 index c6108ffb1e9..00000000000 --- a/net-misc/sslh/files/sslh-1.18-version-deps.patch +++ /dev/null @@ -1,15 +0,0 @@ -Make sure the files using version.h depend on it being generated first. - -Gentoo-bug: 594586 - ---- a/Makefile -+++ b/Makefile -@@ -59,7 +59,7 @@ - - all: sslh $(MAN) echosrv - --.c.o: *.h -+%.o: %.c *.h version.h - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - - version.h: diff --git a/net-misc/sslh/files/sslh.init.d-2 b/net-misc/sslh/files/sslh.init.d-2 deleted file mode 100644 index 7e4b2cb578a..00000000000 --- a/net-misc/sslh/files/sslh.init.d-2 +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start \ - --pidfile /var/run/${SVCNAME}.pid \ - --exec /usr/sbin/sslh -- \ - ${DAEMON_OPTS} \ - --pidfile /var/run/${SVCNAME}.pid - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --retry 20 \ - --pidfile /var/run/${SVCNAME}.pid - eend $? -} diff --git a/net-misc/sslh/sslh-1.18-r2.ebuild b/net-misc/sslh/sslh-1.18-r2.ebuild deleted file mode 100644 index afc382f87c0..00000000000 --- a/net-misc/sslh/sslh-1.18-r2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}-v${PV}" -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"; -SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86" -IUSE="caps systemd tcpd" - -RDEPEND="caps? ( sys-libs/libcap ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( sys-apps/tcp-wrappers ) - >=dev-libs/libconfig-1.5" -DEPEND="${RDEPEND} - dev-lang/perl" - -RESTRICT="test" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}/${PN}-1.18-version-deps.patch" - "${FILESDIR}/${PN}-1.18-systemd-generator.patch" -) - -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 - - gunzip ${PN}.8.gz - doman ${PN}.8 - - dodoc ChangeLog README.md - - newinitd "${FILESDIR}"/sslh.init.d-2 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 -}
