1 |
commit: 1e4544ef2186690c5418d2eb158670a35f5e751c |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 17 02:06:35 2018 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 17 02:07:32 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4544ef |
7 |
|
8 |
net-misc/sslh: remove 1.18-r2 |
9 |
|
10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
11 |
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org> |
12 |
|
13 |
net-misc/sslh/Manifest | 1 - |
14 |
.../sslh/files/sslh-1.18-systemd-generator.patch | 26 --------- |
15 |
net-misc/sslh/files/sslh-1.18-version-deps.patch | 15 ----- |
16 |
net-misc/sslh/files/sslh.init.d-2 | 20 ------- |
17 |
net-misc/sslh/sslh-1.18-r2.ebuild | 68 ---------------------- |
18 |
5 files changed, 130 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest |
21 |
index cd307555d73..3d060fb02b2 100644 |
22 |
--- a/net-misc/sslh/Manifest |
23 |
+++ b/net-misc/sslh/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST sslh-v1.18.tar.gz 53170 BLAKE2B 8d26bdc9950b9017279b36699821b756ea0507949edca90758cd4149aac56fd1a12e0192009ce2154af09818a6aa009fd2009f88d89dae8f76525d7aacc4a830 SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea |
26 |
DIST sslh-v1.19c.tar.gz 57418 BLAKE2B 97af9d8f79c54f1ba11476a142c762c69a16b6fdd48ead167c56c217a556183e3fda777f217c09d3bf6a5705d5cf491b68c282b626f70d42512d147d98b6f87c SHA512 14529f1fc1488b10e660fa85f5d8bb642a0e119a15ca44d492793153447c9414ade5a1925fbbedd19c5d26662aa1bafd9743ab5ca11324632269110406fa8ce9 |
27 |
|
28 |
diff --git a/net-misc/sslh/files/sslh-1.18-systemd-generator.patch b/net-misc/sslh/files/sslh-1.18-systemd-generator.patch |
29 |
deleted file mode 100644 |
30 |
index 476de2a4c1e..00000000000 |
31 |
--- a/net-misc/sslh/files/sslh-1.18-systemd-generator.patch |
32 |
+++ /dev/null |
33 |
@@ -1,26 +0,0 @@ |
34 |
-https://patch-diff.githubusercontent.com/raw/yrutschle/sslh/pull/98 |
35 |
---- a/Makefile |
36 |
-+++ b/Makefile |
37 |
-@@ -27,6 +27,8 @@ CFLAGS ?=-Wall -g $(CFLAGS_COV) |
38 |
- LIBS= |
39 |
- OBJS=common.o sslh-main.o probe.o tls.o |
40 |
- |
41 |
-+CONDITIONAL_TARGETS= |
42 |
-+ |
43 |
- ifneq ($(strip $(USELIBWRAP)),) |
44 |
- LIBS:=$(LIBS) -lwrap |
45 |
- CPPFLAGS+=-DLIBWRAP |
46 |
-@@ -54,10 +56,11 @@ endif |
47 |
- ifneq ($(strip $(USESYSTEMD)),) |
48 |
- LIBS:=$(LIBS) -lsystemd |
49 |
- CPPFLAGS+=-DSYSTEMD |
50 |
-+ CONDITIONAL_TARGETS+=systemd-sslh-generator |
51 |
- endif |
52 |
- |
53 |
- |
54 |
--all: sslh $(MAN) echosrv |
55 |
-+all: sslh $(MAN) echosrv $(CONDITIONAL_TARGETS) |
56 |
- |
57 |
- .c.o: *.h |
58 |
- $(CC) $(CFLAGS) $(CPPFLAGS) -c $< |
59 |
- |
60 |
|
61 |
diff --git a/net-misc/sslh/files/sslh-1.18-version-deps.patch b/net-misc/sslh/files/sslh-1.18-version-deps.patch |
62 |
deleted file mode 100644 |
63 |
index c6108ffb1e9..00000000000 |
64 |
--- a/net-misc/sslh/files/sslh-1.18-version-deps.patch |
65 |
+++ /dev/null |
66 |
@@ -1,15 +0,0 @@ |
67 |
-Make sure the files using version.h depend on it being generated first. |
68 |
- |
69 |
-Gentoo-bug: 594586 |
70 |
- |
71 |
---- a/Makefile |
72 |
-+++ b/Makefile |
73 |
-@@ -59,7 +59,7 @@ |
74 |
- |
75 |
- all: sslh $(MAN) echosrv |
76 |
- |
77 |
--.c.o: *.h |
78 |
-+%.o: %.c *.h version.h |
79 |
- $(CC) $(CFLAGS) $(CPPFLAGS) -c $< |
80 |
- |
81 |
- version.h: |
82 |
|
83 |
diff --git a/net-misc/sslh/files/sslh.init.d-2 b/net-misc/sslh/files/sslh.init.d-2 |
84 |
deleted file mode 100644 |
85 |
index 7e4b2cb578a..00000000000 |
86 |
--- a/net-misc/sslh/files/sslh.init.d-2 |
87 |
+++ /dev/null |
88 |
@@ -1,20 +0,0 @@ |
89 |
-#!/sbin/openrc-run |
90 |
-# Copyright 1999-2012 Gentoo Foundation |
91 |
-# Distributed under the terms of the GNU General Public License v2 |
92 |
- |
93 |
-start() { |
94 |
- ebegin "Starting ${SVCNAME}" |
95 |
- start-stop-daemon --start \ |
96 |
- --pidfile /var/run/${SVCNAME}.pid \ |
97 |
- --exec /usr/sbin/sslh -- \ |
98 |
- ${DAEMON_OPTS} \ |
99 |
- --pidfile /var/run/${SVCNAME}.pid |
100 |
- eend $? |
101 |
-} |
102 |
- |
103 |
-stop() { |
104 |
- ebegin "Stopping ${SVCNAME}" |
105 |
- start-stop-daemon --stop --quiet --retry 20 \ |
106 |
- --pidfile /var/run/${SVCNAME}.pid |
107 |
- eend $? |
108 |
-} |
109 |
|
110 |
diff --git a/net-misc/sslh/sslh-1.18-r2.ebuild b/net-misc/sslh/sslh-1.18-r2.ebuild |
111 |
deleted file mode 100644 |
112 |
index afc382f87c0..00000000000 |
113 |
--- a/net-misc/sslh/sslh-1.18-r2.ebuild |
114 |
+++ /dev/null |
115 |
@@ -1,68 +0,0 @@ |
116 |
-# Copyright 1999-2018 Gentoo Foundation |
117 |
-# Distributed under the terms of the GNU General Public License v2 |
118 |
- |
119 |
-EAPI=6 |
120 |
- |
121 |
-MY_P="${PN}-v${PV}" |
122 |
-inherit flag-o-matic systemd toolchain-funcs |
123 |
- |
124 |
-DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port" |
125 |
-HOMEPAGE="https://www.rutschle.net/tech/sslh/README.html" |
126 |
-SRC_URI="https://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz" |
127 |
- |
128 |
-LICENSE="GPL-2" |
129 |
-SLOT="0" |
130 |
-KEYWORDS="amd64 ~arm ~m68k ~mips ~s390 ~sh x86" |
131 |
-IUSE="caps systemd tcpd" |
132 |
- |
133 |
-RDEPEND="caps? ( sys-libs/libcap ) |
134 |
- systemd? ( sys-apps/systemd:= ) |
135 |
- tcpd? ( sys-apps/tcp-wrappers ) |
136 |
- >=dev-libs/libconfig-1.5" |
137 |
-DEPEND="${RDEPEND} |
138 |
- dev-lang/perl" |
139 |
- |
140 |
-RESTRICT="test" |
141 |
- |
142 |
-S=${WORKDIR}/${MY_P} |
143 |
- |
144 |
-PATCHES=( |
145 |
- "${FILESDIR}/${PN}-1.18-version-deps.patch" |
146 |
- "${FILESDIR}/${PN}-1.18-systemd-generator.patch" |
147 |
-) |
148 |
- |
149 |
-src_compile() { |
150 |
- # On older versions of GCC, the default gnu89 variant |
151 |
- # will reject within-for-loop initializers, bug #595426 |
152 |
- # Furthermore, we need to use the gnu variant (gnu99) instead |
153 |
- # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro |
154 |
- # to be defined. |
155 |
- append-cflags -std=gnu99 |
156 |
- |
157 |
- emake \ |
158 |
- CC="$(tc-getCC)" \ |
159 |
- USELIBCAP=$(usev caps) \ |
160 |
- USELIBWRAP=$(usev tcpd) \ |
161 |
- USESYSTEMD=$(usev systemd) |
162 |
-} |
163 |
- |
164 |
-src_install() { |
165 |
- dosbin sslh-{fork,select} |
166 |
- dosym sslh-fork /usr/sbin/sslh |
167 |
- |
168 |
- gunzip ${PN}.8.gz |
169 |
- doman ${PN}.8 |
170 |
- |
171 |
- dodoc ChangeLog README.md |
172 |
- |
173 |
- newinitd "${FILESDIR}"/sslh.init.d-2 sslh |
174 |
- newconfd "${FILESDIR}"/sslh.conf.d-2 sslh |
175 |
- |
176 |
- if use systemd; then |
177 |
- # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin |
178 |
- sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die |
179 |
- systemd_newunit scripts/systemd.sslh.service sslh.service |
180 |
- exeinto /usr/lib/systemd/system-generators/ |
181 |
- doexe systemd-sslh-generator |
182 |
- fi |
183 |
-} |