Gentoo Archives: gentoo-commits

From: Quentin Retornaz <gentoo@××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/libressl:master commit in: app-admin/conserver/files/, app-admin/conserver/
Date: Sun, 03 Jul 2022 17:47:34
Message-Id: 1656870415.86bca3439a9206697b5ebb9804765616b2a16726.quentin@gentoo
1 commit: 86bca3439a9206697b5ebb9804765616b2a16726
2 Author: orbea <orbea <AT> riseup <DOT> net>
3 AuthorDate: Sat Jul 2 23:00:00 2022 +0000
4 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
5 CommitDate: Sun Jul 3 17:46:55 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=86bca343
7
8 app-admin/conserver: Remove package
9
10 Works with libressl-3.5.x and conserver-8.2.6-r3::gentoo.
11
12 Signed-off-by: orbea <orbea <AT> riseup.net>
13 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>
14
15 app-admin/conserver/Manifest | 2 -
16 app-admin/conserver/conserver-8.2.3.ebuild | 95 -------------------------
17 app-admin/conserver/conserver-8.2.4.ebuild | 95 -------------------------
18 app-admin/conserver/files/8.2.3-libressl.patch | 31 --------
19 app-admin/conserver/files/8.2.4-libressl.patch | 27 -------
20 app-admin/conserver/files/conserver.confd-r1 | 5 --
21 app-admin/conserver/files/conserver.initd-r1 | 14 ----
22 app-admin/conserver/files/conserver.pam-pambase | 6 --
23 app-admin/conserver/metadata.xml | 32 ---------
24 9 files changed, 307 deletions(-)
25
26 diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
27 deleted file mode 100644
28 index 037203a..0000000
29 --- a/app-admin/conserver/Manifest
30 +++ /dev/null
31 @@ -1,2 +0,0 @@
32 -DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
33 -DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091 SHA512 c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
34
35 diff --git a/app-admin/conserver/conserver-8.2.3.ebuild b/app-admin/conserver/conserver-8.2.3.ebuild
36 deleted file mode 100644
37 index 1cae029..0000000
38 --- a/app-admin/conserver/conserver-8.2.3.ebuild
39 +++ /dev/null
40 @@ -1,95 +0,0 @@
41 -# Copyright 1999-2021 Gentoo Authors
42 -# Distributed under the terms of the GNU General Public License v2
43 -
44 -EAPI=6
45 -
46 -inherit autotools pam ssl-cert
47 -
48 -DESCRIPTION="Serial Console Manager"
49 -HOMEPAGE="https://www.conserver.com"
50 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
51 -
52 -LICENSE="BSD BSD-with-attribution"
53 -SLOT="0"
54 -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
55 -IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
56 -RESTRICT="!test? ( test )"
57 -
58 -DEPEND="debug? ( dev-libs/dmalloc:= )
59 - freeipmi? ( sys-libs/freeipmi:= )
60 - kerberos? (
61 - virtual/krb5
62 - net-libs/libgssglue
63 - )
64 - ssl? ( dev-libs/openssl:0= )
65 - pam? ( sys-libs/pam )
66 - tcpd? ( sys-apps/tcp-wrappers )
67 -"
68 -RDEPEND="${DEPEND}
69 - pam? ( sys-auth/pambase )"
70 -
71 -DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts)
72 -
73 -PATCHES=( "${FILESDIR}/${PV}-libressl.patch" )
74 -
75 -src_prepare() {
76 - default
77 - sed -e '/^INSTALL_PROGRAM/s:-s::' \
78 - -i {console,conserver,autologin,contrib/chat}/Makefile.in || die
79 - eautoreconf
80 -}
81 -
82 -src_configure() {
83 - local myconf=(
84 - $(use_with debug dmalloc)
85 - $(use_with ipv6)
86 - $(use_with freeipmi)
87 - $(use_with kerberos gssapi)
88 - $(use_with ssl openssl)
89 - $(use_with pam)
90 - $(use_with tcpd libwrap)
91 - --with-cffile=conserver/conserver.cf
92 - --with-logfile=/var/log/conserver.log
93 - --with-master=localhost
94 - --with-pidfile=/run/conserver.pid
95 - --with-port=7782
96 - --with-pwdfile=conserver/conserver.passwd
97 - )
98 - econf "${myconf[@]}"
99 -}
100 -
101 -src_install() {
102 - emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
103 -
104 - keepdir /var/consoles
105 - fowners daemon:daemon /var/consoles
106 - fperms 700 /var/consoles
107 -
108 - newinitd "${FILESDIR}"/conserver.initd-r1 conserver
109 - newconfd "${FILESDIR}"/conserver.confd-r1 conserver
110 -
111 - dodir /etc/conserver
112 - fperms 700 /etc/conserver
113 - insinto /etc/conserver
114 - newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
115 - newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
116 -
117 - einstalldocs
118 - docinto examples
119 - dodoc -r conserver.cf/samples/.
120 -
121 - newpamd "${FILESDIR}"/conserver.pam-pambase conserver
122 -}
123 -
124 -src_test() {
125 - # hangs without -j1
126 - emake -j1 test
127 -}
128 -
129 -pkg_postinst() {
130 - if use ssl; then
131 - if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then
132 - install_cert /etc/ssl/conserver/conserver
133 - fi
134 - fi
135 -}
136
137 diff --git a/app-admin/conserver/conserver-8.2.4.ebuild b/app-admin/conserver/conserver-8.2.4.ebuild
138 deleted file mode 100644
139 index b1a0d9c..0000000
140 --- a/app-admin/conserver/conserver-8.2.4.ebuild
141 +++ /dev/null
142 @@ -1,95 +0,0 @@
143 -# Copyright 1999-2021 Gentoo Authors
144 -# Distributed under the terms of the GNU General Public License v2
145 -
146 -EAPI=6
147 -
148 -inherit autotools pam ssl-cert
149 -
150 -DESCRIPTION="Serial Console Manager"
151 -HOMEPAGE="https://www.conserver.com"
152 -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
153 -
154 -LICENSE="BSD BSD-with-attribution"
155 -SLOT="0"
156 -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
157 -IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
158 -RESTRICT="!test? ( test )"
159 -
160 -DEPEND="debug? ( dev-libs/dmalloc:= )
161 - freeipmi? ( sys-libs/freeipmi:= )
162 - kerberos? (
163 - virtual/krb5
164 - net-libs/libgssglue
165 - )
166 - ssl? ( dev-libs/openssl:0= )
167 - pam? ( sys-libs/pam )
168 - tcpd? ( sys-apps/tcp-wrappers )
169 -"
170 -RDEPEND="${DEPEND}
171 - pam? ( sys-auth/pambase )"
172 -
173 -DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial contrib/maketestcerts)
174 -
175 -PATCHES=( "${FILESDIR}/${PV}-libressl.patch" )
176 -
177 -src_prepare() {
178 - default
179 - sed -e '/^INSTALL_PROGRAM/s:-s::' \
180 - -i {console,conserver,autologin,contrib/chat}/Makefile.in || die
181 - eautoreconf
182 -}
183 -
184 -src_configure() {
185 - local myconf=(
186 - $(use_with debug dmalloc)
187 - $(use_with ipv6)
188 - $(use_with freeipmi)
189 - $(use_with kerberos gssapi)
190 - $(use_with ssl openssl)
191 - $(use_with pam)
192 - $(use_with tcpd libwrap)
193 - --with-cffile=conserver/conserver.cf
194 - --with-logfile=/var/log/conserver.log
195 - --with-master=localhost
196 - --with-pidfile=/run/conserver.pid
197 - --with-port=7782
198 - --with-pwdfile=conserver/conserver.passwd
199 - )
200 - econf "${myconf[@]}"
201 -}
202 -
203 -src_install() {
204 - emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
205 -
206 - keepdir /var/consoles
207 - fowners daemon:daemon /var/consoles
208 - fperms 700 /var/consoles
209 -
210 - newinitd "${FILESDIR}"/conserver.initd-r1 conserver
211 - newconfd "${FILESDIR}"/conserver.confd-r1 conserver
212 -
213 - dodir /etc/conserver
214 - fperms 700 /etc/conserver
215 - insinto /etc/conserver
216 - newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
217 - newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
218 -
219 - einstalldocs
220 - docinto examples
221 - dodoc -r conserver.cf/samples/.
222 -
223 - newpamd "${FILESDIR}"/conserver.pam-pambase conserver
224 -}
225 -
226 -src_test() {
227 - # hangs without -j1
228 - emake -j1 test
229 -}
230 -
231 -pkg_postinst() {
232 - if use ssl; then
233 - if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then
234 - install_cert /etc/ssl/conserver/conserver
235 - fi
236 - fi
237 -}
238
239 diff --git a/app-admin/conserver/files/8.2.3-libressl.patch b/app-admin/conserver/files/8.2.3-libressl.patch
240 deleted file mode 100644
241 index 8b04acb..0000000
242 --- a/app-admin/conserver/files/8.2.3-libressl.patch
243 +++ /dev/null
244 @@ -1,31 +0,0 @@
245 -From f4d2a4a30f930c58bf87511f7ed1a982eca66ce3 Mon Sep 17 00:00:00 2001
246 -From: Georgy Yakovlev <gyakovlev@g.o>
247 -Date: Thu, 6 Jun 2019 21:30:16 -0700
248 -Subject: [PATCH] libressl
249 -
250 -backport of https://github.com/conserver/conserver/pull/26
251 ----
252 - conserver/cutil.h | 4 +++-
253 - 1 file changed, 3 insertions(+), 1 deletion(-)
254 -
255 -diff --git a/conserver/cutil.h b/conserver/cutil.h
256 -index 63aef65..07aa6d4 100644
257 ---- a/conserver/cutil.h
258 -+++ b/conserver/cutil.h
259 -@@ -12,10 +12,12 @@
260 - # include <openssl/err.h>
261 - # if OPENSSL_VERSION_NUMBER < 0x10100000L
262 - # define TLS_method SSLv23_method
263 -+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
264 -+# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
265 - # define CIPHER_SEC0
266 - # else
267 - # define CIPHER_SEC0 ":@SECLEVEL=0"
268 --# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
269 -+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
270 - #endif
271 - #if HAVE_GSSAPI
272 - # include <gssapi/gssapi.h>
273 ---
274 -2.21.0
275 -
276
277 diff --git a/app-admin/conserver/files/8.2.4-libressl.patch b/app-admin/conserver/files/8.2.4-libressl.patch
278 deleted file mode 100644
279 index 9151d69..0000000
280 --- a/app-admin/conserver/files/8.2.4-libressl.patch
281 +++ /dev/null
282 @@ -1,27 +0,0 @@
283 -From d3ffe500c934573115e313ac01b8fab5cb4d2e9f Mon Sep 17 00:00:00 2001
284 -From: Stuart Henderson <stu@×××××××××××.org>
285 -Date: Wed, 27 Mar 2019 23:29:31 +0000
286 -Subject: [PATCH] fix TLS with LibreSSL, it doesn't have :@SECLEVEL=0
287 -
288 ----
289 - conserver/cutil.h | 4 +++-
290 - 1 file changed, 3 insertions(+), 1 deletion(-)
291 -
292 -diff --git a/conserver/cutil.h b/conserver/cutil.h
293 -index d21abc5..db4df7f 100644
294 ---- a/conserver/cutil.h
295 -+++ b/conserver/cutil.h
296 -@@ -12,10 +12,12 @@
297 - # include <openssl/err.h>
298 - # if OPENSSL_VERSION_NUMBER < 0x10100000L
299 - # define TLS_method SSLv23_method
300 -+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
301 -+# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
302 - # define CIPHER_SEC0
303 - # else
304 - # define CIPHER_SEC0 ":@SECLEVEL=0"
305 --# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */
306 -+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
307 - #endif
308 - #if HAVE_GSSAPI
309 - # include <gssapi/gssapi.h>
310
311 diff --git a/app-admin/conserver/files/conserver.confd-r1 b/app-admin/conserver/files/conserver.confd-r1
312 deleted file mode 100644
313 index 119ceb0..0000000
314 --- a/app-admin/conserver/files/conserver.confd-r1
315 +++ /dev/null
316 @@ -1,5 +0,0 @@
317 -# Config file for /etc/init.d/conserver
318 -# check CONSERVER(8) for details
319 -
320 -#CONSERVER_LOG="/var/log/conserver.log"
321 -#CONSERVER_OPTS=""
322
323 diff --git a/app-admin/conserver/files/conserver.initd-r1 b/app-admin/conserver/files/conserver.initd-r1
324 deleted file mode 100644
325 index 2618580..0000000
326 --- a/app-admin/conserver/files/conserver.initd-r1
327 +++ /dev/null
328 @@ -1,14 +0,0 @@
329 -#!/sbin/openrc-run
330 -# Copyright 1999-2021 Gentoo Authors
331 -# Distributed under the terms of the GNU General Public License v2
332 -
333 -depend() {
334 - need clock localmount
335 - use net
336 -}
337 -
338 -command="/usr/sbin/conserver"
339 -command_args="-d -L ${CONSERVER_LOG:-/var/log/${RC_SVCNAME}.log} ${CONSERVER_OPTS}"
340 -command_background="true"
341 -pidfile="/run/${RC_SVCNAME}.pid"
342 -required_files="/etc/conserver/${RC_SVCNAME}.cf /etc/conserver/${RC_SVCNAME}.passwd"
343
344 diff --git a/app-admin/conserver/files/conserver.pam-pambase b/app-admin/conserver/files/conserver.pam-pambase
345 deleted file mode 100644
346 index 30025fe..0000000
347 --- a/app-admin/conserver/files/conserver.pam-pambase
348 +++ /dev/null
349 @@ -1,6 +0,0 @@
350 -auth required pam_securetty.so
351 -auth include system-remote-login
352 -
353 -account include system-remote-login
354 -password include system-remote-login
355 -session include system-remote-login
356
357 diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
358 deleted file mode 100644
359 index 3b1ff77..0000000
360 --- a/app-admin/conserver/metadata.xml
361 +++ /dev/null
362 @@ -1,32 +0,0 @@
363 -<?xml version="1.0" encoding="UTF-8"?>
364 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
365 -<pkgmetadata>
366 - <maintainer type="person">
367 - <email>dan@××××××××.net</email>
368 - <name>Dan Weeks</name>
369 - </maintainer>
370 - <maintainer type="person">
371 - <email>gyakovlev@g.o</email>
372 - <name>Georgy Yakovlev</name>
373 - </maintainer>
374 - <maintainer type="project">
375 - <email>proxy-maint@g.o</email>
376 - <name>Proxy Maintainers</name>
377 - </maintainer>
378 - <longdescription>
379 - Conserver is an application that allows multiple users to watch a serial
380 - console at the same time. It can log the data, allows users to take
381 - write-access of a console (one at a time), and has a variety of bells
382 - and whistles to accentuate that basic functionality. The idea is that
383 - conserver will log all your serial traffic so you can go back and review
384 - why something crashed, look at changes (if done on the console), or tie
385 - the console logs into a monitoring system (just watch the logfiles it
386 - creates). With multi-user capabilities you can work on equipment with
387 - others, mentor, train, etc. It also does all that client-server stuff so
388 - that, assuming you have a network connection, you can interact with any
389 - of the equipment from home or wherever.
390 - </longdescription>
391 - <use>
392 - <flag name="freeipmi">Compile in FreeIPMI support via sys-libs/freeipmi</flag>
393 - </use>
394 -</pkgmetadata>