Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/sslh/
Date: Fri, 23 Feb 2018 08:07:25
Message-Id: 1519373225.9f3d207b6beb0a786cb988ab0065b22b045f643a.kensington@gentoo
1 commit: 9f3d207b6beb0a786cb988ab0065b22b045f643a
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 23 08:03:01 2018 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 23 08:07:05 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f3d207b
7
8 net-misc/sslh: remove 1.19 and 1.19b
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 net-misc/sslh/Manifest | 2 --
13 net-misc/sslh/sslh-1.19.ebuild | 76 -----------------------------------------
14 net-misc/sslh/sslh-1.19b.ebuild | 76 -----------------------------------------
15 3 files changed, 154 deletions(-)
16
17 diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
18 index 69d0148f80c..cd307555d73 100644
19 --- a/net-misc/sslh/Manifest
20 +++ b/net-misc/sslh/Manifest
21 @@ -1,4 +1,2 @@
22 DIST sslh-v1.18.tar.gz 53170 BLAKE2B 8d26bdc9950b9017279b36699821b756ea0507949edca90758cd4149aac56fd1a12e0192009ce2154af09818a6aa009fd2009f88d89dae8f76525d7aacc4a830 SHA512 3f0f61c340b689fb30015d5c73d6c29398b5c6a115ae9089d0b3c0230e99c90049df03133e4b0c3668fbfe995ed40cd3543c5764171c57e632e75bd5c3548fea
23 -DIST sslh-v1.19.tar.gz 57352 BLAKE2B 004084ac726c2b0a12add00da017934aa46420370bdf0e56c19443aff0a25f232324f0140cae7a09b15e885d73fae498b8c51b4c7a3f4da219bddf4abb99b412 SHA512 851a9e89098baeeb8279298b1a04527fde80e5efb4bb64006e165479ff2d7ba24b5621a99754ff906fca8c167fc1fd0bcd4b80860c999f5b9cafa408769aa18c
24 -DIST sslh-v1.19b.tar.gz 57369 BLAKE2B e970a6c92975b716e95a231a83c61970620f40d732e84ec318d98c3fa78fd6c06bc7de91745c6ccbe37a2cd96559c07f939b3affae03c3fcb3c9f785d62ba268 SHA512 a78f94234f8ccef6ad0dcd299b25f2ecc9b4b2c1acf110bbf3203a63259b69cc3cbc21314799aaa26e60c3420c03be3335ba4d4bc01dc595068506066a60b98e
25 DIST sslh-v1.19c.tar.gz 57418 BLAKE2B 97af9d8f79c54f1ba11476a142c762c69a16b6fdd48ead167c56c217a556183e3fda777f217c09d3bf6a5705d5cf491b68c282b626f70d42512d147d98b6f87c SHA512 14529f1fc1488b10e660fa85f5d8bb642a0e119a15ca44d492793153447c9414ade5a1925fbbedd19c5d26662aa1bafd9743ab5ca11324632269110406fa8ce9
26
27 diff --git a/net-misc/sslh/sslh-1.19.ebuild b/net-misc/sslh/sslh-1.19.ebuild
28 deleted file mode 100644
29 index 3c1ac5f9f7f..00000000000
30 --- a/net-misc/sslh/sslh-1.19.ebuild
31 +++ /dev/null
32 @@ -1,76 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI="6"
37 -
38 -inherit flag-o-matic systemd toolchain-funcs
39 -
40 -DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
41 -HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
42 -if [[ ${PV} == "9999" ]] ; then
43 - EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
44 - inherit git-r3
45 -else
46 - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
47 - MY_P="${PN}-v${PV}"
48 - SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
49 - S=${WORKDIR}/${MY_P}
50 -fi
51 -
52 -LICENSE="GPL-2"
53 -SLOT="0"
54 -IUSE="caps pcre systemd tcpd"
55 -
56 -RDEPEND="caps? ( sys-libs/libcap )
57 - systemd? ( sys-apps/systemd:= )
58 - tcpd? ( sys-apps/tcp-wrappers )
59 - >=dev-libs/libconfig-1.5"
60 -DEPEND="${RDEPEND}
61 - dev-lang/perl
62 - pcre? ( dev-libs/libpcre:= )"
63 -
64 -RESTRICT="test"
65 -
66 -src_prepare() {
67 - default
68 - sed -i \
69 - -e '/MAN/s:| gzip -9 - >:>:' \
70 - -e '/MAN=sslh.8.gz/s:.gz::' \
71 - Makefile || die
72 -}
73 -
74 -src_compile() {
75 - # On older versions of GCC, the default gnu89 variant
76 - # will reject within-for-loop initializers, bug #595426
77 - # Furthermore, we need to use the gnu variant (gnu99) instead
78 - # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
79 - # to be defined.
80 - append-cflags -std=gnu99
81 -
82 - emake \
83 - CC="$(tc-getCC)" \
84 - USELIBPCRE=$(usev pcre) \
85 - USELIBCAP=$(usev caps) \
86 - USELIBWRAP=$(usev tcpd) \
87 - USESYSTEMD=$(usev systemd)
88 -}
89 -
90 -src_install() {
91 - dosbin sslh-{fork,select}
92 - dosym sslh-fork /usr/sbin/sslh
93 -
94 - doman ${PN}.8
95 -
96 - dodoc ChangeLog README.md
97 -
98 - newinitd "${FILESDIR}"/sslh.init.d-3 sslh
99 - newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
100 -
101 - if use systemd; then
102 - # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
103 - sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
104 - systemd_newunit scripts/systemd.sslh.service sslh.service
105 - exeinto /usr/lib/systemd/system-generators/
106 - doexe systemd-sslh-generator
107 - fi
108 -}
109
110 diff --git a/net-misc/sslh/sslh-1.19b.ebuild b/net-misc/sslh/sslh-1.19b.ebuild
111 deleted file mode 100644
112 index 3c1ac5f9f7f..00000000000
113 --- a/net-misc/sslh/sslh-1.19b.ebuild
114 +++ /dev/null
115 @@ -1,76 +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 -inherit flag-o-matic systemd toolchain-funcs
122 -
123 -DESCRIPTION="Port multiplexer - accept both HTTPS and SSH connections on the same port"
124 -HOMEPAGE="http://www.rutschle.net/tech/sslh.shtml"
125 -if [[ ${PV} == "9999" ]] ; then
126 - EGIT_REPO_URI="https://github.com/yrutschle/sslh.git"
127 - inherit git-r3
128 -else
129 - KEYWORDS="~amd64 ~arm ~m68k ~mips ~s390 ~sh ~x86"
130 - MY_P="${PN}-v${PV}"
131 - SRC_URI="http://www.rutschle.net/tech/${PN}/${MY_P}.tar.gz"
132 - S=${WORKDIR}/${MY_P}
133 -fi
134 -
135 -LICENSE="GPL-2"
136 -SLOT="0"
137 -IUSE="caps pcre systemd tcpd"
138 -
139 -RDEPEND="caps? ( sys-libs/libcap )
140 - systemd? ( sys-apps/systemd:= )
141 - tcpd? ( sys-apps/tcp-wrappers )
142 - >=dev-libs/libconfig-1.5"
143 -DEPEND="${RDEPEND}
144 - dev-lang/perl
145 - pcre? ( dev-libs/libpcre:= )"
146 -
147 -RESTRICT="test"
148 -
149 -src_prepare() {
150 - default
151 - sed -i \
152 - -e '/MAN/s:| gzip -9 - >:>:' \
153 - -e '/MAN=sslh.8.gz/s:.gz::' \
154 - Makefile || die
155 -}
156 -
157 -src_compile() {
158 - # On older versions of GCC, the default gnu89 variant
159 - # will reject within-for-loop initializers, bug #595426
160 - # Furthermore, we need to use the gnu variant (gnu99) instead
161 - # of the ISO (c99) variant, as we want the __USE_XOPEN2K macro
162 - # to be defined.
163 - append-cflags -std=gnu99
164 -
165 - emake \
166 - CC="$(tc-getCC)" \
167 - USELIBPCRE=$(usev pcre) \
168 - USELIBCAP=$(usev caps) \
169 - USELIBWRAP=$(usev tcpd) \
170 - USESYSTEMD=$(usev systemd)
171 -}
172 -
173 -src_install() {
174 - dosbin sslh-{fork,select}
175 - dosym sslh-fork /usr/sbin/sslh
176 -
177 - doman ${PN}.8
178 -
179 - dodoc ChangeLog README.md
180 -
181 - newinitd "${FILESDIR}"/sslh.init.d-3 sslh
182 - newconfd "${FILESDIR}"/sslh.conf.d-2 sslh
183 -
184 - if use systemd; then
185 - # Gentoo puts the binaries in /usr/sbin, but upstream puts them in /usr/bin
186 - sed -i -e 's~/usr/bin/~/usr/sbin/~g' scripts/systemd.sslh.service || die
187 - systemd_newunit scripts/systemd.sslh.service sslh.service
188 - exeinto /usr/lib/systemd/system-generators/
189 - doexe systemd-sslh-generator
190 - fi
191 -}