diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
| commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
| tree | 697733f5cb713908dcf378e13fd15a798a906a91 /net-misc/sslh/files | |
| parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) | |
gentoo resync : 18.11.2018
Diffstat (limited to 'net-misc/sslh/files')
| -rw-r--r-- | net-misc/sslh/files/sslh-1.18-systemd-generator.patch | 26 | ||||
| -rw-r--r-- | net-misc/sslh/files/sslh-1.18-version-deps.patch | 15 | ||||
| -rw-r--r-- | net-misc/sslh/files/sslh.init.d-2 | 20 |
3 files changed, 0 insertions, 61 deletions
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 $? -} |