gentoo resync : 08.06.2019

13 files changed, 66 insertions, 430 deletions

diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index c9b95d237550..7f618fba1242 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,18 +1,10 @@
-AUX conserver-8.1.18-dmalloc.patch 2806 BLAKE2B 0ce6a09d90c82a455bb706f755e8485df1d8aec4f7a8cb534ac97d584ccb94715c68568d46496a3a298cd258a5e68219ce3f37cc33a6239d3b533636b53d85bf SHA512 90d3a4bd6fb3a58ece053e4680dab5b24f23c7265e5244f3185b67a143c58ccd2c200c2fccc0a6cec8444ab2895f358138cba05be27119b014187e539dfa78d6
-AUX conserver-8.2.2-ssl-compat.patch 1113 BLAKE2B 93d336f18493b26b77b5855a432071d6a6cd9c32e5029f4fa5135010b8ffa1b4aafb4ab4c7ed38b93318a2682a5300a64ea3ecbfb9fa4f0bd1354899ce4903a0 SHA512 a93dfb89ace14590588ce6c72f5af90a253e98d61d83acf1c38aa43978877d072d6b9e7a7d49d590f010c59a6540e15fa3d70833a0d5499461767e956ad649a0
-AUX conserver-8.2.2-time-argument.patch 754 BLAKE2B 364385cf118601449682dc5c8ac4ac872e9bc2b9d3195164500f70c3fd50f58318eb22b4df8985cfaf58931bc0a84cee7795ab63061cc63969f9a5cde40a76e4 SHA512 06cb6208e3bfb394289f8298e1778fd77882e16c368df137b0bb3593b0326cd1bde5507989e7bf7cddb436a47a16ddfc1bbb64552f767d2a1460411baca55e40
-AUX conserver-prestrip.patch 882 BLAKE2B b5a327827a6a56ead78821e9fa091cabba0b914d94a8cb273b6fc5003e927948483d7a32ad858a7c94f7c7422f1a124fd42b65544b198bea317cd2caf68c96ac SHA512 aeb112f8df0bd97ac3e3b909a42c54d2d16d6d59d39ea10dca9c86d2a6f866ba33c56fca77fb551c706314692469ed668a0158ff04712594192856b363bcb4af
-AUX conserver.confd 170 BLAKE2B f6bc04796726454fec2c24207d3342c72c1789db5aeb39e47928e12d12300a16cec51f82e9447bf4546f732e3f9184724936450a852392671d4725fa3df99985 SHA512 af326d215eb7b6e4bdf68a9fc8b58c42dae9d0b31f653af181097c7cf4ee663bcc7c848f77ef051327e54a18e0202536b524b1b82d36693751f07d2c37f5b071
+AUX 8.2.3-libressl.patch 981 BLAKE2B 98e222e3136c0f4cb252333c5f950e71d201eec76d1d2c200c64079ff5dc811bb69814683baf36c290ae50fd02e51c0b9064a8d250f71c209be3a89a4d0f1d6b SHA512 55b209e80cd000bc0cd23c12f0cfe93784f2470c1836305f569d87d676f586eb516e1793b0940f23b2de0d7fe72814f7db3c87f0e5e9d05f254a4bbe707a2e89
+AUX 8.2.4-libressl.patch 953 BLAKE2B 5c94addace50d827b090403c1e9add383b2bc88892673b4a47fb10c56c5d43dfd78844a8304d78d479ea2398fff8d81c5f2c1a42e5dfad0db978ca3feb04b191 SHA512 5c3a0be93f562971e72e11f4a0f791591668a4f1341910134567f00c38af49b26c9d9e047deac193c36ed81ca1458da92704c68119ecfbbfaee45bf4be0a4e18
 AUX conserver.confd-r1 133 BLAKE2B 6f3029a06b34458f70ef8370c35c09ea69a4d005aad173070e89fd1ce613b34147ad547c621b6aa98165bfb13ef67f0886667ab52973cfe4f45ea13c1f07a7bf SHA512 34fbe44a28a1a56ce51f9f2cebfc0d1bd20e4c4ea153f7605fb96434001b6bc9c52ba7e770617ed36710bfb7f69cebe7d79b31efbccac6c6a8847cf12a1ed774
-AUX conserver.initd 1085 BLAKE2B c3eef5736137d3bf48c8f0b6d135c458fa9e0ebf0dd8254677cc6dc3d313bc2b239229167bec01534aa1f62384f0b3cc7ae7522ddcb0e5651f2a3d660ff4b352 SHA512 22ea8fad24acfd602e135d586880dd3b63c4cfa6da40c20b85b0f9ba591eab7192dbaaf3526b56ef038a95017b7bf810b1e1c4259b4e6cfd8eca4966a8432c12
 AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8babeeb9635f9652d01f06de1fa4309a213b6b2bca77099a17910aa5d6790bccc4e4e8f7f8fc0ba42458 SHA512 f0dcea7fddec5165fb00c452aa0b56c3eaa0919e96e5bf1ff4e80000b01fe80134bc4ee8a584114fcad56c6d5caa467d229b8b54bc8b4145dd2fa76871336c7d
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
-DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f
-DIST conserver-8.2.2.tar.gz 329048 BLAKE2B 0148a5b5b11fcc75a071b9759e129a94f1fe623df35e7549e967d0037ddb378447623070ce43429daf4868308be150f5ba318354e3181d94ccb1199655231373 SHA512 7c59dc59e59e3ee0172b2a52214cd8dd83383168fe0f145870d128b900a012cfa38c2f1ae85769c226d941ca1a764f93ec3bf353da896537ae1be5b6bc17e6c6
 DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
 DIST conserver-8.2.4.tar.gz 432854 BLAKE2B 5b6003609187e629544a7183b32cb7b2ab6c854cabf915271a3a924d18c2c13a1bf01f0524740b35859d83c4cb5cc525b87182c342b0075d5486ba428ed71091 SHA512 c59b9bcf582209f8450a8189c1af536951e15ff3aa97994ea99f9de5c6028237a9fa3ca8ba0f7d63ec33b96e45adf76be755181c4199621debfed9feaf1659ad
-EBUILD conserver-8.1.18-r1.ebuild 2288 BLAKE2B d25a03bd1d6ee27d983c15455bc4f3ae76ca663cba75b353cfef17480f91f49d2d310a038ea9f16334bb75ece843f948a619c0980c1aacd9457bf2a2dfe0f1aa SHA512 4b87330c9eb8c9e731ce56b49afc45ccc04fcbe877d374b51a37b351c582b465946178ac41e50605ef958ffd0c65693b8f21ae0f28a65c462b99332bb6059078
-EBUILD conserver-8.2.2.ebuild 2350 BLAKE2B 6b502331697cffa995ab8e1cdfb03d086b78fa936941051a73dada85eea5de33572a07032d6973a1c7664c5a402345de1e2a06bc31646f987117c85e4d749dd4 SHA512 898c71213ff0b60156bf07ef2541df6d5a17ece9a8145fd080ae1932c59919272d9294e027aea1a051e6aa41acae87cd43c3418fbc5c1653482510a134942684
-EBUILD conserver-8.2.3.ebuild 2254 BLAKE2B 9d814ca1686d8ae19e5061d4a4dab85d35c47392a30233c37ebfa49de4ab8d627e90b9cd1fa8c22ae68ebb5c82f01fcf38a5d592514dbed99ba39df0bd3ff82d SHA512 2517c805ffd48239c2f65d53edda196fc61d7d1439297fe4319a32a2ce769373604657aeed27af17d288c911d0d564a258d7c3e16ffcf68049b7a5c27c754113
-EBUILD conserver-8.2.4.ebuild 2263 BLAKE2B 1aafde63585dce09739d0b06ca2b5c6dc8bfd6c2ea17ca4d7eac178ccc7c69680a29b8382da55ae425d22c5b065969b606ef9933b0c28c67627b3df9d86c533d SHA512 8d302941dc0c687370db246431ea78fa28713730e1d428bd9a5d9e5599383296367f1d4d6dfab5166802af78482c755422e084d8c02f938155e22cdf97683816
+EBUILD conserver-8.2.3.ebuild 2302 BLAKE2B daebfeb728432113b951a44a157456458ffbda3e73b29f577757e31e22e15e40cebf980357a318b854d3aa00f4acdca142a4acd41638841c9c951024aa3333b1 SHA512 1a2e224234208b72961f7675fa9816a2172b3f1ea80dad66e1ffdb62d3deebedacac9bcb98a8ed834266a7bc40cb924b26c303b186dac1fe478599eac5fb99d2
+EBUILD conserver-8.2.4.ebuild 2311 BLAKE2B 30b33e9c0adac2aa6b46bda93703afda74263eedf4c023ddb35bc3e5e155c90c055a72263bbd17c45281d9f72d64bf0af29ad63bbca6448f4c65b42281932d28 SHA512 c08d2a60a879e6f00d0e94a3ebf97427342c06129a17bb4b6ee66b524491cff6fe746d69a80f6dc09a9c9f0bc10e8c3b7d00860af905e87a0a552ab85e6cdb1e
 MISC metadata.xml 1378 BLAKE2B 942f6b9d8fd616f089d0651fbdfc41de96033acf65f127cbfded2fb9c390fd9b86c037a62679ea27b18e4e618bf764d09277350e9fdbaadc914c18a6961618e2 SHA512 6b3e06cfa1013f71eb42c9c073df8c97d2b8fa6b935b637ba29096db88d75bab1bb192695ed4a5dad63d88341a366327f419cb357777c0abb09799c8bcc40970
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
deleted file mode 100644
index 53a8cd7fd301..000000000000
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit ssl-cert eutils pam autotools
-
-DESCRIPTION="Serial Console Manager"
-HOMEPAGE="https://www.conserver.com/"
-SRC_URI="https://www.conserver.com/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86"
-IUSE="kerberos libressl pam ssl tcpd debug"
-
-DEPEND="ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	pam? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-	debug? ( dev-libs/dmalloc )
-	kerberos? (
-		virtual/krb5
-		net-libs/libgssglue
-	)"
-RDEPEND="${DEPEND}
-	pam? ( >=sys-auth/pambase-20080219.1 )"
-
-src_prepare() {
-	# Apply patch to prevent package from stripping binaries
-	epatch "${FILESDIR}"/${PN}-prestrip.patch
-
-	# Apply patch to use custom dmalloc macro
-	epatch "${FILESDIR}"/${P}-dmalloc.patch
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ssl openssl) \
-		$(use_with pam) \
-		$(use_with tcpd libwrap) \
-		$(use_with debug dmalloc) \
-		$(use_with kerberos gssapi) \
-		--with-logfile=/var/log/conserver.log \
-		--with-pidfile=/var/run/conserver.pid \
-		--with-cffile=conserver/conserver.cf \
-		--with-pwdfile=conserver/conserver.passwd \
-		--with-master=localhost \
-		--with-port=7782
-}
-
-src_install() {
-	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
-
-	## create data directory
-	dodir /var/consoles
-	fowners daemon:daemon /var/consoles
-	fperms 700 /var/consoles
-
-	## add startup and sample config
-	newinitd "${FILESDIR}"/conserver.initd conserver
-	newconfd "${FILESDIR}"/conserver.confd 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
-
-	## add docs
-	dohtml conserver.html
-	dodoc CHANGES FAQ PROTOCOL README TODO
-	dodoc conserver/Sun-serial contrib/maketestcerts
-	newdoc conserver.cf/conserver.cf conserver.cf.sample
-
-	# Add pam config
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
-}
-
-pkg_postinst() {
-	# Add certs if SSL use flag is enabled
-	if use ssl && [ ! -f "${ROOT}"/etc/ssl/conserver/conserver.key ]; then
-		install_cert /etc/ssl/conserver/conserver
-	fi
-}
diff --git a/app-admin/conserver/conserver-8.2.2.ebuild b/app-admin/conserver/conserver-8.2.2.ebuild
deleted file mode 100644
index ceb5c721f569..000000000000
--- a/app-admin/conserver/conserver-8.2.2.ebuild
+++ /dev/null
@@ -1,100 +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"
-
-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? ( virtual/pam )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}
-	pam? ( sys-auth/pambase )"
-
-DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts)
-
-PATCHES=(
-	"${FILESDIR}/${P}-time-argument.patch"
-	"${FILESDIR}/${P}-ssl-compat.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.3.ebuild b/app-admin/conserver/conserver-8.2.3.ebuild
index 9a067d23f712..d9a7265bfbad 100644
--- a/app-admin/conserver/conserver-8.2.3.ebuild
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -32,6 +32,8 @@ RDEPEND="${DEPEND}
 
 DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts)
 
+PATCHES=( "${FILESDIR}/${PV}-libressl.patch" )
+
 src_prepare() {
 	default
 	sed -e '/^INSTALL_PROGRAM/s:-s::' \
diff --git a/app-admin/conserver/conserver-8.2.4.ebuild b/app-admin/conserver/conserver-8.2.4.ebuild
index 54eae640841a..6429ff850b3e 100644
--- a/app-admin/conserver/conserver-8.2.4.ebuild
+++ b/app-admin/conserver/conserver-8.2.4.ebuild
@@ -32,6 +32,8 @@ RDEPEND="${DEPEND}
 
 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::' \
diff --git a/app-admin/conserver/files/8.2.3-libressl.patch b/app-admin/conserver/files/8.2.3-libressl.patch
new file mode 100644
index 000000000000..8b04acb7b88c
--- /dev/null
+++ b/app-admin/conserver/files/8.2.3-libressl.patch
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 000000000000..9151d697e756
--- /dev/null
+++ b/app-admin/conserver/files/8.2.4-libressl.patch
@@ -0,0 +1,27 @@
+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.1.18-dmalloc.patch b/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch
deleted file mode 100644
index ff82f74b261c..000000000000
--- a/app-admin/conserver/files/conserver-8.1.18-dmalloc.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- configure.in	2011-08-19 01:11:06.000000000 -0400
-+++ configure.in	2011-08-19 02:06:50.000000000 -0400
-@@ -320,6 +320,8 @@
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
- 
-+AM_WITH_DMALLOC([cons_with_dmalloc="YES"],[cons_with_dmalloc="NO"])
-+
- dnl ### Compiler characteristics. ##################################
- AC_AIX
- AC_C_CONST
-@@ -578,51 +580,6 @@
-     fi]
- )
- 
--cons_with_dmalloc="NO"
--AC_ARG_WITH(dmalloc,
--    AS_HELP_STRING([--with-dmalloc@<:@=PATH@:>@],
--	[Compile in dmalloc support]),
--    [if test "$withval" != "no"; then
--	if test "$withval" != "yes"; then
--	    DMALLOCCPPFLAGS="-I$withval/include"
--	    if test "$use_dash_r" != "yes"; then
--		DMALLOCLDFLAGS="-L$withval/lib"
--	    else
--		DMALLOCLDFLAGS="-L$withval/lib -R$withval/lib"
--	    fi
--	else
--	    DMALLOCCPPFLAGS=""
--	    DMALLOCLDFLAGS=""
--	fi
--
--	oCPPFLAGS="$CPPFLAGS"
--	oLDFLAGS="$LDFLAGS"
--	oLIBS="$LIBS"
--	have_dmalloc=no
--
--	CPPFLAGS="$CPPFLAGS $DMALLOCCPPFLAGS"
--	LDFLAGS="$LDFLAGS $DMALLOCLDFLAGS"
--
--	AC_CHECK_HEADER([dmalloc.h],
--	    [LIBS="$LIBS -ldmalloc"
--	    AC_MSG_CHECKING(for dmalloc libraries -ldmalloc)
--	    AC_TRY_LINK([#include <dmalloc.h>
--		],[dmalloc_debug(0)],
--		[AC_MSG_RESULT(yes)
--		cons_with_dmalloc="YES"
--		AC_DEFINE(HAVE_DMALLOC)
--		have_dmalloc=yes],
--		[AC_MSG_RESULT(no)])],)
--
--	if test $have_dmalloc = no; then
--	    LIBS="$oLIBS"
--	    CPPFLAGS="$oCPPFLAGS"
--	    LDFLAGS="$oLDFLAGS"
--	fi
--    fi]
--)
--
--
- dnl ### Check for needed functions. ################################
- 
- dnl dnl The following basically stollen from the less-358 distribution, but
---- /dev/null		2011-08-07 13:18:05.535976733 -0400
-+++ m4/dmalloc.m4	2011-08-19 03:49:03.755073497 -0400
-@@ -0,0 +1,34 @@
-+## ----------------------------------- ##                   -*- Autoconf -*-
-+## Check if --with-dmalloc was given.  ##
-+## From Franc,ois Pinard               ##
-+## ----------------------------------- ##
-+
-+# Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2010,
-+# 2011 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 7
-+
-+dnl AM_WITH_DMALLOC([ACTION-IF-FOUND],[ACTION-IF-NOT])
-+AC_DEFUN([AM_WITH_DMALLOC],
-+[AC_MSG_CHECKING([if malloc debugging is wanted])
-+AC_ARG_WITH([dmalloc],
-+[AS_HELP_STRING([--with-dmalloc],
-+                [use dmalloc, as in http://www.dmalloc.com])],
-+[if test "$withval" = yes; then
-+  AC_MSG_RESULT([yes])
-+  AC_DEFINE([WITH_DMALLOC], [1],
-+	    [Define if using the dmalloc debugging malloc package])
-+  LIBS="$LIBS -ldmalloc"
-+  LDFLAGS="$LDFLAGS -g"
-+  [$1]
-+else
-+  AC_MSG_RESULT([no])
-+  [$2]
-+fi], [AC_MSG_RESULT([no])])
-+])
-+
-+AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC])
diff --git a/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch b/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch
deleted file mode 100644
index f3054a9a0dac..000000000000
--- a/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/configure.in b/configure.in
-index a060811..00b7f8b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -535,7 +535,7 @@ AC_ARG_WITH(openssl,
- 	    [LIBS="$LIBS -lssl -lcrypto"
- 	    AC_MSG_CHECKING(for openssl libraries -lssl and -lcrypto)
- 	    AC_TRY_LINK([#include <openssl/ssl.h>
--		],[SSL_library_init()],
-+		],[SSL_CTX_new(NULL)],
- 		[AC_MSG_RESULT(yes)
- 		cons_with_openssl="YES"
- 		AC_DEFINE(HAVE_OPENSSL)
-diff --git a/conserver/cutil.c b/conserver/cutil.c
-index af8196c..dcfe333 100644
---- a/conserver/cutil.c
-+++ b/conserver/cutil.c
-@@ -57,7 +57,9 @@ Bye(int status)
- {
-     DestroyDataStructures();
- #if HAVE_OPENSSL
-+# if OPENSSL_VERSION_NUMBER < 0x10100000L
-     ERR_free_strings();
-+# endif
- #endif
-     exit(status);
- }
-diff --git a/conserver/cutil.h b/conserver/cutil.h
-index 899da7a..63aef65 100644
---- a/conserver/cutil.h
-+++ b/conserver/cutil.h
-@@ -7,6 +7,8 @@
- #include <stdarg.h>
- #if HAVE_OPENSSL
- # include <openssl/ssl.h>
-+# include <openssl/bn.h>
-+# include <openssl/dh.h>
- # include <openssl/err.h>
- # if OPENSSL_VERSION_NUMBER < 0x10100000L
- #  define TLS_method SSLv23_method
diff --git a/app-admin/conserver/files/conserver-8.2.2-time-argument.patch b/app-admin/conserver/files/conserver-8.2.2-time-argument.patch
deleted file mode 100644
index 0a42987135b1..000000000000
--- a/app-admin/conserver/files/conserver-8.2.2-time-argument.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 3d9d5509c90524256861dd7cf0b7c0c6fdf5424a Mon Sep 17 00:00:00 2001
-From: Ed Maste <emaste@freebsd.org>
-Date: Wed, 10 Oct 2018 12:56:26 -0400
-Subject: [PATCH] Correct argument type passed to time()
-
----
- conserver/readcfg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/conserver/readcfg.c b/conserver/readcfg.c
-index 949b9bf..d5bb90a 100644
---- a/conserver/readcfg.c
-+++ b/conserver/readcfg.c
-@@ -3116,7 +3116,7 @@ ConsoleAdd(CONSENT *c)
- 	pCEmatch->logfilemax = c->logfilemax;
- 	if (pCEmatch->logfilemax != (off_t) 0 &&
- 	    timers[T_ROLL] == (time_t)0)
--	    timers[T_ROLL] = time((time_t)0);
-+	    timers[T_ROLL] = time((time_t *)0);
- 
- 	SwapStr(&pCEmatch->motd, &c->motd);
- 	SwapStr(&pCEmatch->idlestring, &c->idlestring);
diff --git a/app-admin/conserver/files/conserver-prestrip.patch b/app-admin/conserver/files/conserver-prestrip.patch
deleted file mode 100644
index e67c49da1a66..000000000000
--- a/app-admin/conserver/files/conserver-prestrip.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nuar conserver-8.1.14.orig/conserver/Makefile.in conserver-8.1.14/conserver/Makefile.in
---- conserver-8.1.14.orig/conserver/Makefile.in	2006-10-25 17:41:00.398082243 -0600
-+++ conserver-8.1.14/conserver/Makefile.in	2006-10-25 17:41:27.876759095 -0600
-@@ -13,7 +13,7 @@
- 
- ### Installation programs and flags
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
- LN_S = @LN_S@
- MKDIR = @MKDIR@
- 
-diff -Nuar conserver-8.1.14.orig/console/Makefile.in conserver-8.1.14/console/Makefile.in
---- conserver-8.1.14.orig/console/Makefile.in	2006-10-25 17:41:00.401081662 -0600
-+++ conserver-8.1.14/console/Makefile.in	2006-10-25 17:41:18.188635834 -0600
-@@ -9,7 +9,7 @@
- 
- ### Installation programs and flags
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
- LN_S = @LN_S@
- MKDIR = @MKDIR@
- 
diff --git a/app-admin/conserver/files/conserver.confd b/app-admin/conserver/files/conserver.confd
deleted file mode 100644
index 4544fed4ab36..000000000000
--- a/app-admin/conserver/files/conserver.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-## Config file for /etc/init.d/conserver
-
-CONSERVER_OPTS="-d"
diff --git a/app-admin/conserver/files/conserver.initd b/app-admin/conserver/files/conserver.initd
deleted file mode 100644
index 841892672cc2..000000000000
--- a/app-admin/conserver/files/conserver.initd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need clock
-}
-
-checkconfig() {
-	if [ ! -e /etc/conserver/conserver.cf ] ; then
-		eerror "You need to create /etc/conserver/conserver.cf first."
-		eerror "A sample is placed there to be renamed and ajusted."
-		eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
-		return 1
-	fi
-
-	if [ ! -e /etc/conserver/conserver.passwd ] ; then
-		eerror "You need to create /etc/conserver/conserver.passwd first."
-		eerror "A sample is placed there to be renamed and ajusted."
-		eerror "Read the man page or see /usr/share/doc/conserver-<version>/."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting conserver"
-	start-stop-daemon --start --quiet --pidfile /var/run/conserver.pid --exec \
-		/usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null
-	eend $? "Failed to start conserver"
-}
-
-stop() {
-	ebegin "Stopping conserver"
-	start-stop-daemon --stop --quiet --pidfile /var/run/conserver.pid
-	eend $? "Failed to stop conserver"
-}