diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-04 22:28:33 +0100 |
commit | a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch) | |
tree | 8c764c1cc0576389ce22abd317bceba71ea5732d /app-admin/conserver | |
parent | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff) |
gentoo resync : 04.05.2021
Diffstat (limited to 'app-admin/conserver')
-rw-r--r-- | app-admin/conserver/Manifest | 5 | ||||
-rw-r--r-- | app-admin/conserver/conserver-8.2.3-r1.ebuild | 100 | ||||
-rw-r--r-- | app-admin/conserver/conserver-8.2.6-r1.ebuild | 9 | ||||
-rw-r--r-- | app-admin/conserver/files/8.2.3-libressl.patch | 31 |
4 files changed, 4 insertions, 141 deletions
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest index c5bdb18a2e83..051fccb336dd 100644 --- a/app-admin/conserver/Manifest +++ b/app-admin/conserver/Manifest @@ -1,10 +1,7 @@ -AUX 8.2.3-libressl.patch 981 BLAKE2B 98e222e3136c0f4cb252333c5f950e71d201eec76d1d2c200c64079ff5dc811bb69814683baf36c290ae50fd02e51c0b9064a8d250f71c209be3a89a4d0f1d6b SHA512 55b209e80cd000bc0cd23c12f0cfe93784f2470c1836305f569d87d676f586eb516e1793b0940f23b2de0d7fe72814f7db3c87f0e5e9d05f254a4bbe707a2e89 AUX conserver-8.2.6-autoconf-2.70.patch 1029 BLAKE2B c95e0837ae67e4f7f8e2244c0078fdb4a4eabd6a35cac90d40d4e0e0b9e1280ebafbcfb3204e9d453c527d150f8dcbdf9a44b14355ed7a9fd997731026f7cada SHA512 28565be004637e6469bd83c696bf4b505be14f9dd9f00c08d6122eea80277499558117e98cd1b8999ecb85fdbd6570a98eb67b167b3a8bb3b26bd7fe8c7b42b4 AUX conserver.confd-r1 133 BLAKE2B 6f3029a06b34458f70ef8370c35c09ea69a4d005aad173070e89fd1ce613b34147ad547c621b6aa98165bfb13ef67f0886667ab52973cfe4f45ea13c1f07a7bf SHA512 34fbe44a28a1a56ce51f9f2cebfc0d1bd20e4c4ea153f7605fb96434001b6bc9c52ba7e770617ed36710bfb7f69cebe7d79b31efbccac6c6a8847cf12a1ed774 AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8babeeb9635f9652d01f06de1fa4309a213b6b2bca77099a17910aa5d6790bccc4e4e8f7f8fc0ba42458 SHA512 f0dcea7fddec5165fb00c452aa0b56c3eaa0919e96e5bf1ff4e80000b01fe80134bc4ee8a584114fcad56c6d5caa467d229b8b54bc8b4145dd2fa76871336c7d AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9 -DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434 SHA512 3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283 -EBUILD conserver-8.2.3-r1.ebuild 2355 BLAKE2B 69a01594a73817f9970ae9292709d98fe28c1a704f67edf43cb595be1b251c85da60e40bb7895cffe47275747c73e4ede9e615f5d88dd32ed0ec120df1922ccb SHA512 1ca942d8044bfa96a4cf559c35f3bea6ed823ecb6f75ab540726cd306730778af3d1ed6be4edd5b7c34c4205a9078a5514fbe94a4a6e23557fc854e935589854 -EBUILD conserver-8.2.6-r1.ebuild 2382 BLAKE2B 0ffad99ee3fc06041600e544ca79d6e475830c2c50768668e507a6e20ca9b9155b4988291607f69a8b5c1b490c1a08fec92561e9cb659de3bb6e6a4d621e075c SHA512 1be3d84c121974754fcb2717cb198fe8849ddfe8406c6a21b8fe625d38e499eaa5b2f186f93770c974a615e3a1de93d678cf8bb0b7a79581a1121bd1cbd13d0d +EBUILD conserver-8.2.6-r1.ebuild 2314 BLAKE2B ab1d3085be3bc6709356f0ec73fe156309ed17aaa0deb6b6188e2cc62ac44eb68e98bed735dfd4902fe1b5e168f2331a9095193af9851c5d7507406cfff170ca SHA512 c2d6216eb4aab36de3590c69f7ddc4e1c20c09bc1808b55e709e82d5d207767862250d09c8296f06781f76b261e36221806a8dc63226b2c454e7c9f5d28810f2 MISC metadata.xml 1408 BLAKE2B 01acca9d16d6bf1f182d0c582f7c69f1c89a697a3b2fe44a589368faa4aa5117c6e7382214464497bc305cc38bab8f860a86460ebfe57d6b4af74bc4f0781b12 SHA512 604c18ac8e93c5d37a465e61f541a29ea6a5143518a153e5a39da820af53d8859e2ef4fe212ddeaad5e2cebed83735e55f61afda12c5cc0bcbf828d1a8238b3d diff --git a/app-admin/conserver/conserver-8.2.3-r1.ebuild b/app-admin/conserver/conserver-8.2.3-r1.ebuild deleted file mode 100644 index 7a587ea09385..000000000000 --- a/app-admin/conserver/conserver-8.2.3-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools pam ssl-cert - -DESCRIPTION="Serial Console Manager" -HOMEPAGE="https://www.conserver.com" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD BSD-with-attribution" -SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86" -IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd" -RESTRICT="!test? ( test )" - -DEPEND="debug? ( dev-libs/dmalloc:= ) - freeipmi? ( sys-libs/freeipmi:= ) - kerberos? ( - virtual/krb5 - net-libs/libgssglue - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - pam? ( sys-libs/pam ) - tcpd? ( sys-apps/tcp-wrappers ) -" -RDEPEND="${DEPEND} - pam? ( sys-auth/pambase )" - -DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts) - -PATCHES=( "${FILESDIR}/${PV}-libressl.patch" ) - -src_prepare() { - default - sed -e '/^INSTALL_PROGRAM/s:-s::' \ - -i {console,conserver,autologin,contrib/chat}/Makefile.in || die - eautoreconf -} - -src_configure() { - local myconf=( - $(use_with debug dmalloc) - $(use_with ipv6) - $(use_with freeipmi) - $(use_with kerberos gssapi) - $(use_with ssl openssl) - $(use_with pam) - $(use_with tcpd libwrap) - --with-cffile=conserver/conserver.cf - --with-logfile=/var/log/conserver.log - --with-master=localhost - --with-pidfile=/run/conserver.pid - --with-port=7782 - --with-pwdfile=conserver/conserver.passwd - ) - econf "${myconf[@]}" -} - -src_install() { - emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install - - keepdir /var/consoles - fowners daemon:daemon /var/consoles - fperms 700 /var/consoles - - newinitd "${FILESDIR}"/conserver.initd-r1 conserver - newconfd "${FILESDIR}"/conserver.confd-r1 conserver - - dodir /etc/conserver - fperms 700 /etc/conserver - insinto /etc/conserver - newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample - newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample - - einstalldocs - docinto examples - dodoc -r conserver.cf/samples/. - - if use pam; then - newpamd "${FILESDIR}"/conserver.pam-pambase conserver - fi -} - -src_test() { - # hangs without -j1 - emake -j1 test -} - -pkg_postinst() { - if use ssl; then - if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then - install_cert /etc/ssl/conserver/conserver - fi - fi -} diff --git a/app-admin/conserver/conserver-8.2.6-r1.ebuild b/app-admin/conserver/conserver-8.2.6-r1.ebuild index 7d0d422f9ba6..34a51420681c 100644 --- a/app-admin/conserver/conserver-8.2.6-r1.ebuild +++ b/app-admin/conserver/conserver-8.2.6-r1.ebuild @@ -11,8 +11,8 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="BSD BSD-with-attribution" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd" +KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86" +IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd" RESTRICT="!test? ( test )" DEPEND="debug? ( dev-libs/dmalloc:= ) @@ -21,10 +21,7 @@ DEPEND="debug? ( dev-libs/dmalloc:= ) virtual/krb5 net-libs/libgssglue ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) + ssl? ( dev-libs/openssl:0= ) pam? ( sys-libs/pam ) tcpd? ( sys-apps/tcp-wrappers ) " diff --git a/app-admin/conserver/files/8.2.3-libressl.patch b/app-admin/conserver/files/8.2.3-libressl.patch deleted file mode 100644 index 8b04acb7b88c..000000000000 --- a/app-admin/conserver/files/8.2.3-libressl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f4d2a4a30f930c58bf87511f7ed1a982eca66ce3 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Thu, 6 Jun 2019 21:30:16 -0700 -Subject: [PATCH] libressl - -backport of https://github.com/conserver/conserver/pull/26 ---- - conserver/cutil.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/conserver/cutil.h b/conserver/cutil.h -index 63aef65..07aa6d4 100644 ---- a/conserver/cutil.h -+++ b/conserver/cutil.h -@@ -12,10 +12,12 @@ - # include <openssl/err.h> - # if OPENSSL_VERSION_NUMBER < 0x10100000L - # define TLS_method SSLv23_method -+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+# if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) - # define CIPHER_SEC0 - # else - # define CIPHER_SEC0 ":@SECLEVEL=0" --# endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ -+# endif/* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */ - #endif - #if HAVE_GSSAPI - # include <gssapi/gssapi.h> --- -2.21.0 - |