From 536c3711867ec947c1738f2c4b96f22e4863322d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Nov 2018 09:38:27 +0000 Subject: gentoo resync : 18.11.2018 --- net-misc/sslh/Manifest | 7 +-- .../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 ---------------------- net-misc/sslh/sslh-1.19c.ebuild | 4 +- 6 files changed, 3 insertions(+), 137 deletions(-) delete mode 100644 net-misc/sslh/files/sslh-1.18-systemd-generator.patch delete mode 100644 net-misc/sslh/files/sslh-1.18-version-deps.patch delete mode 100644 net-misc/sslh/files/sslh.init.d-2 delete mode 100644 net-misc/sslh/sslh-1.18-r2.ebuild (limited to 'net-misc/sslh') diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest index f6d1a930db46..5cba1b52baab 100644 --- a/net-misc/sslh/Manifest +++ b/net-misc/sslh/Manifest @@ -1,11 +1,6 @@ -AUX sslh-1.18-systemd-generator.patch 603 BLAKE2B 87116f0332cc6d4076c8d6b4b14c89377d18d2e27b977bf864ce6d88d0bdf1576c556e1729f5821f9e101ff2a5538bb05cbd1db3135ab70847233256f240b861 SHA512 71bfc4fe78d7b2b1c6a131533029c1ad9a676989ca9821e1c798109c9f9ce43809ad504aac262a20ed7babd3349485887947f9ccb26cba1803fe3fbd0afe79b9 -AUX sslh-1.18-version-deps.patch 256 BLAKE2B edca1e2490081b845efc08867d5368e52bd72c7414db4fecd8b081e952f558f975cb9d0b1e5b9ca72875cc0abf216a2d0351c40e1e887bc1d983ce3652a9b71b SHA512 2f438df2777cf4811f7d33769a403f90d3cb7fc0b4e9eeeafe0cf2b29f203b3a0a0503729894103c0efde3ac1ff0d9253c7fd4b09627fedd3fefd18b595df87a AUX sslh.conf.d-2 297 BLAKE2B c59d4eb8dfd4c2ed6f3a952cd2764c11aea21c1c62e5a4ffc584500cc29d62867d6852e700eb3e6c339f3456d39bcdff16a476dfdbe5705dea5934460769fa22 SHA512 580114cef9356d66ec1e6c306837d44dc3098e8f3f805eda20c5d8f81f087bf295b25801ee64ee2bc667ce7324f510ff6f4fc7e222d1431ec3d4e82bbcfb160f -AUX sslh.init.d-2 465 BLAKE2B eb34383ade0d3fe778d11d098129f5466df15816ca8eb8eb7c5b2cb8eebee91195b0e3e9f9be4fa5f941f8aacbfbb4d718876a8e8af0c9a13c6dcdf2dc6d104b SHA512 73b38af0142f6d591d71531e03aca3ddf625faa7825a9951dc31112fa1bca5b28f8074a3f9ca565b2cd3995b635cc7818d899ce099d64d2eb97ff9cab2e617ba AUX sslh.init.d-3 273 BLAKE2B 01ba7f4347989a6bcf829139ce3a51e7b14265eaae2e32617933c29c5d195a6a3bbe0674a13d52f02e2c418787ed3976987dc79d9c9045b0c7ca6285aa86fb55 SHA512 1508a137c5bc962e1dfa780334c015fb63701867261fc335920fa1847e2ed2093cd02657fc9d2f633382db15bbfd87bfb65f698f5f76aa777aa947ddf39ca10a -DIST sslh-v1.18.tar.gz 53170 BLAKE2B 8d26bdc9950b9017279b36699821b756ea0507949edca90758cd4149aac56fd1a12e0192009ce2154af09818a6aa009fd2009f88d89dae8f76525d7aacc4a830 SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea DIST sslh-v1.19c.tar.gz 57418 BLAKE2B 97af9d8f79c54f1ba11476a142c762c69a16b6fdd48ead167c56c217a556183e3fda777f217c09d3bf6a5705d5cf491b68c282b626f70d42512d147d98b6f87c SHA512 14529f1fc1488b10e660fa85f5d8bb642a0e119a15ca44d492793153447c9414ade5a1925fbbedd19c5d26662aa1bafd9743ab5ca11324632269110406fa8ce9 -EBUILD sslh-1.18-r2.ebuild 1761 BLAKE2B a112f1d45b4290e4230a0262ab3a44b96139e1cd158bff8900861bdf7dba63d62c50dcf30af9f17b982da87d601a23739d2835138d5cce3ac6b99aa9d7ee19a9 SHA512 5b66c76b78e0f8bcc8ad5d7c1986e0429c06149e6021280bf6094e480cc8730e30c558280c9243c5bbb336560848f38e683c329d11fe80febef2c56fdf5f897b -EBUILD sslh-1.19c.ebuild 1936 BLAKE2B 0f91af8934fecdb8da30340aca3d7bb123507e2ddbcd8e345f46a045ad70d71a4d734e62656f8fed6b3d63bcfdc10aec6a82709178422763d3300024bfa46d99 SHA512 5ffb55731ea00f59011dc64597ed970568bdb58ba4ce7de50964d2c44173ec5500df386411bb13dc3593021b74e99c7519a914e899ea7c64b05ddc2818397f90 +EBUILD sslh-1.19c.ebuild 1931 BLAKE2B 5374fa4e57249b1d5b89b80460e6487f6e5f74bc29d473eaa161c786f467b2cb7474af00fcd28073aa1583a1958966c6ae8b16c9460134f6c22716bae1a039fe SHA512 989d3f47f06fbdae7bf2964dc90e49d2652080bce56a6f2f15ed7bc8e7afc57d109c644655bc71dffe290f1493fe02fa21f2fd48beb44fb41b92cb7fc006a6c5 EBUILD sslh-9999.ebuild 1936 BLAKE2B 0f91af8934fecdb8da30340aca3d7bb123507e2ddbcd8e345f46a045ad70d71a4d734e62656f8fed6b3d63bcfdc10aec6a82709178422763d3300024bfa46d99 SHA512 5ffb55731ea00f59011dc64597ed970568bdb58ba4ce7de50964d2c44173ec5500df386411bb13dc3593021b74e99c7519a914e899ea7c64b05ddc2818397f90 MISC metadata.xml 409 BLAKE2B fefa58b2c38adf947e859893979931726dba91e4b30c6f7ae4e5343fb7e7a513a3b86c88ff6854df60ba92ef169beb4e22c7ad3a01ba69aea582765f13f82509 SHA512 373b7ca5bce7d2b680a7ccfdc4af15514365cf26824487baf2232608a6f29a5d1d338146c7f70841e7b03255527ec16967afc7a3fad3ef6d26fb2ab86fe8a3da 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 476de2a4c1e1..000000000000 --- 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 c6108ffb1e9c..000000000000 --- 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 7e4b2cb578a4..000000000000 --- 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 afc382f87c0e..000000000000 --- 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 -} diff --git a/net-misc/sslh/sslh-1.19c.ebuild b/net-misc/sslh/sslh-1.19c.ebuild index f58bdffe2ceb..c163c7b5f920 100644 --- a/net-misc/sslh/sslh-1.19c.ebuild +++ b/net-misc/sslh/sslh-1.19c.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/yrutschle/sslh.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86" + KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86" MY_P="${PN}-v${PV}" SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz" S=${WORKDIR}/${MY_P} -- cgit v1.2.3