9 files changed, 50 insertions, 370 deletions
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 62bc528ec556..bd0efbeb952a 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,4 +1 @@
-DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
-DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091 SHA512 c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
-DIST conserver-8.2.5.tar.gz 434260 BLAKE2B f057a99db8e2f39f644ac8c55dc75372e74a9736c403ceaee8b70af6418ebec881f0c00d0ed4e0825c5f00900c70e0cf5c340637f5f16d19875448c58172ffb3 SHA512 76a1d75307faabeb04b65c5cd5fb1bb7df22e0ff25769f94a86a4b9134da262e6523ba207c8da1ec5b67299498c807ec92279a10846c0b3f23c9effa4ee01c1e
 DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434 SHA512 3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283
diff --git a/app-admin/conserver/conserver-8.2.3.ebuild b/app-admin/conserver/conserver-8.2.3.ebuild
deleted file mode 100644
index e2c44ccb1145..000000000000
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 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/.
-
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
-}
-
-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.4.ebuild b/app-admin/conserver/conserver-8.2.4.ebuild
deleted file mode 100644
index 018a794f081b..000000000000
--- a/app-admin/conserver/conserver-8.2.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 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.md 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/.
-
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
-}
-
-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.5.ebuild b/app-admin/conserver/conserver-8.2.6-r3.ebuild
index 8ecd6b02a530..844eb0e88ff3 100644
--- a/app-admin/conserver/conserver-8.2.5.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,20 +11,19 @@ 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:= )
+DEPEND="net-libs/libnsl:=
+	virtual/libcrypt:=
+	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= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	pam? ( sys-libs/pam )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
@@ -33,6 +32,10 @@ RDEPEND="${DEPEND}
 
 DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial contrib/maketestcerts)
 
+PATCHES=(
+	"${FILESDIR}/${PN}-8.2.6-autoconf-2.70.patch" #750230
+)
+
 src_prepare() {
 	default
 	sed -e '/^INSTALL_PROGRAM/s:-s::' \
@@ -79,7 +82,9 @@ src_install() {
 	docinto examples
 	dodoc -r conserver.cf/samples/.
 
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	if use pam; then
+		newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	fi
 }
 
 src_test() {
diff --git a/app-admin/conserver/conserver-8.2.6.ebuild b/app-admin/conserver/conserver-8.2.6.ebuild
deleted file mode 100644
index 8ecd6b02a530..000000000000
--- a/app-admin/conserver/conserver-8.2.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.md conserver/Sun-serial contrib/maketestcerts)
-
-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/.
-
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
-}
-
-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/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
-
diff --git a/app-admin/conserver/files/8.2.4-libressl.patch b/app-admin/conserver/files/8.2.4-libressl.patch
deleted file mode 100644
index 9151d697e756..000000000000
--- a/app-admin/conserver/files/8.2.4-libressl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d3ffe500c934573115e313ac01b8fab5cb4d2e9f Mon Sep 17 00:00:00 2001
-From: Stuart Henderson <stu@spacehopper.org>
-Date: Wed, 27 Mar 2019 23:29:31 +0000
-Subject: [PATCH] fix TLS with LibreSSL, it doesn't have :@SECLEVEL=0
-
----
- conserver/cutil.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/conserver/cutil.h b/conserver/cutil.h
-index d21abc5..db4df7f 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>
diff --git a/app-admin/conserver/files/conserver-8.2.6-autoconf-2.70.patch b/app-admin/conserver/files/conserver-8.2.6-autoconf-2.70.patch
new file mode 100644
index 000000000000..057809ffa44b
--- /dev/null
+++ b/app-admin/conserver/files/conserver-8.2.6-autoconf-2.70.patch
@@ -0,0 +1,32 @@
+From ce3b4f1d000c75ace2be2be83a0cc0df84ff6983 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 12 Jan 2021 18:18:23 +0100
+Subject: [PATCH] configure.ac: autoconf-2.70 fix
+
+Gentoo-bug: https://bugs.gentoo.org/750230
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ee2bc8a..26541f3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,11 +30,11 @@ AH_TEMPLATE([TRUST_UDS_CRED], [Defined if we trust credentials from UDS client])
+ 
+ dnl ### Normal initialization. ######################################
+ AC_INIT([conserver],m4_esyscmd_s([./gen-version number]))
+-AC_PREREQ(2.59)
++AC_PREREQ(2.69)
+ AC_CONFIG_SRCDIR([conserver/main.c])
+ AC_CONFIG_HEADER(config.h)
+ 
+-AC_DEFINE_UNQUOTED(CONFIGINVOCATION, "$0 $@")
++AC_DEFINE_UNQUOTED(CONFIGINVOCATION, "$0 $*")
+ 
+ dnl ### Set some option defaults. ###################################
+ if test -z "$CFLAGS"; then
+-- 
+2.30.0
+
diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
index 3b1ff77779ce..f239675c0bab 100644
--- a/app-admin/conserver/metadata.xml
+++ b/app-admin/conserver/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>dan@danweeks.net</email>
 		<name>Dan Weeks</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -27,6 +23,6 @@
 		of the equipment from home or wherever.
 	</longdescription>
 	<use>
-		<flag name="freeipmi">Compile in FreeIPMI support via sys-libs/freeipmi</flag>
+		<flag name="freeipmi">Compile in FreeIPMI support via <pkg>sys-libs/freeipmi</pkg></flag>
 	</use>
 </pkgmetadata>