gentoo resync : 19.03.2019

9 files changed, 195 insertions, 39 deletions

diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index ee5901f90d69..e630c1c2776c 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,9 +1,14 @@
 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 conserver.initd 1055 BLAKE2B a515ff3c81c1e66b53f49d28db082d2a9eb3cd69a60f73bf7a1405a242801f145fe788935a63212a8990135cae3537369ee36c39503d859a96c90d1fec678215 SHA512 4bd10a1cd95707d6ebde6774ed88ef69552ed1b823baac4942958f9ecc2c5185f45d08d9a4707ad31320645c80e13a34b5fecbfb6eac9f282c2c422820986ac6
-AUX conserver.initd-r1 1088 BLAKE2B 2ab26bafddf29f24488b147c2a90dca6e482361af96fc008df0029581a0308f380db36b7985ac8fdfc1884e0eeb897d3e84fed9ed3341e2b9ba35c9393850200 SHA512 332e59313f066a8e313f65b0f04c4a7f464cb77f9ac2b3ab5beb24b5fee393d9036b9f80a1c9cc0f6ba43a5c3519801aea6d61f96bed861d5caa3130ab4ff1e3
+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
-EBUILD conserver-8.1.18-r1.ebuild 2294 BLAKE2B ed919fd5d042acb254861e7caa29becfa4637bf9077a791d5828e5c873f4479ce398ef8da72316d4059f63ae3c2b75550e78c8f778b8a20fbb1924bd5f033fff SHA512 ffbadfef4f779a87d0e6631be8e9bdad909176076713502d053f4acd538358281a20bdd94ea74d45d4311b3ae5e580114ea13114cff8a6835e488a03b620143b
-MISC metadata.xml 1170 BLAKE2B cb2e515dc5e79cd5bea66d737f507c4a65be82b46968fa3f07ead05d5467756ca3a3f6b348ff50fe21c20dada080b1ddf2f2b24d703752b0266259d74d3c3327 SHA512 8b8babc1d68eadb8e5ffac32145fd28fe5c372cb87ad9d12c6266e17aef59511c7e20db0a97958e6da7120d9f7555ad708197395263c301eac222c1f7718eed1
+DIST conserver-8.2.2.tar.gz 329048 BLAKE2B 0148a5b5b11fcc75a071b9759e129a94f1fe623df35e7549e967d0037ddb378447623070ce43429daf4868308be150f5ba318354e3181d94ccb1199655231373 SHA512 7c59dc59e59e3ee0172b2a52214cd8dd83383168fe0f145870d128b900a012cfa38c2f1ae85769c226d941ca1a764f93ec3bf353da896537ae1be5b6bc17e6c6
+EBUILD conserver-8.1.18-r1.ebuild 2288 BLAKE2B d25a03bd1d6ee27d983c15455bc4f3ae76ca663cba75b353cfef17480f91f49d2d310a038ea9f16334bb75ece843f948a619c0980c1aacd9457bf2a2dfe0f1aa SHA512 4b87330c9eb8c9e731ce56b49afc45ccc04fcbe877d374b51a37b351c582b465946178ac41e50605ef958ffd0c65693b8f21ae0f28a65c462b99332bb6059078
+EBUILD conserver-8.2.2.ebuild 2350 BLAKE2B 6b502331697cffa995ab8e1cdfb03d086b78fa936941051a73dada85eea5de33572a07032d6973a1c7664c5a402345de1e2a06bc31646f987117c85e4d749dd4 SHA512 898c71213ff0b60156bf07ef2541df6d5a17ece9a8145fd080ae1932c59919272d9294e027aea1a051e6aa41acae87cd43c3418fbc5c1653482510a134942684
+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
index 0ab9102d365a..53a8cd7fd301 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -62,7 +62,7 @@ src_install() {
 	fperms 700 /var/consoles
 
 	## add startup and sample config
-	newinitd "${FILESDIR}"/conserver.initd-r1 conserver
+	newinitd "${FILESDIR}"/conserver.initd conserver
 	newconfd "${FILESDIR}"/conserver.confd conserver
 
 	dodir /etc/conserver
diff --git a/app-admin/conserver/conserver-8.2.2.ebuild b/app-admin/conserver/conserver-8.2.2.ebuild
new file mode 100644
index 000000000000..ceb5c721f569
--- /dev/null
+++ b/app-admin/conserver/conserver-8.2.2.ebuild
@@ -0,0 +1,100 @@
+# 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/files/conserver-8.2.2-ssl-compat.patch b/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch
new file mode 100644
index 000000000000..f3054a9a0dac
--- /dev/null
+++ b/app-admin/conserver/files/conserver-8.2.2-ssl-compat.patch
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 000000000000..0a42987135b1
--- /dev/null
+++ b/app-admin/conserver/files/conserver-8.2.2-time-argument.patch
@@ -0,0 +1,22 @@
+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.confd-r1 b/app-admin/conserver/files/conserver.confd-r1
new file mode 100644
index 000000000000..119ceb060063
--- /dev/null
+++ b/app-admin/conserver/files/conserver.confd-r1
@@ -0,0 +1,5 @@
+# Config file for /etc/init.d/conserver
+# check CONSERVER(8) for details
+
+#CONSERVER_LOG="/var/log/conserver.log"
+#CONSERVER_OPTS=""
diff --git a/app-admin/conserver/files/conserver.initd b/app-admin/conserver/files/conserver.initd
index 0c0771c72c6b..841892672cc2 100644
--- a/app-admin/conserver/files/conserver.initd
+++ b/app-admin/conserver/files/conserver.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -25,7 +25,7 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting conserver"
-	start-stop-daemon --start --quiet --exec \
+	start-stop-daemon --start --quiet --pidfile /var/run/conserver.pid --exec \
 		/usr/sbin/conserver -- ${CONSERVER_OPTS} 1>/dev/null
 	eend $? "Failed to start conserver"
 }
diff --git a/app-admin/conserver/files/conserver.initd-r1 b/app-admin/conserver/files/conserver.initd-r1
index 907b1b711705..839aae6825df 100644
--- a/app-admin/conserver/files/conserver.initd-r1
+++ b/app-admin/conserver/files/conserver.initd-r1
@@ -1,37 +1,14 @@
 #!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
-	need clock
+	need clock localmount
+	use net
 }
 
-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"
-}
+command="/usr/sbin/conserver"
+command_args="-d -L ${CONSERVER_LOG:-/var/log/${RC_SVCNAME}.log} ${CONSERVER_OPTS}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+required_files="/etc/conserver/${RC_SVCNAME}.cf /etc/conserver/${RC_SVCNAME}.passwd"
diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
index 06b3d82363fe..3b1ff77779ce 100644
--- a/app-admin/conserver/metadata.xml
+++ b/app-admin/conserver/metadata.xml
@@ -5,6 +5,10 @@
 		<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">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
@@ -22,4 +26,7 @@
 		that, assuming you have a network connection, you can interact with any
 		of the equipment from home or wherever.
 	</longdescription>
+	<use>
+		<flag name="freeipmi">Compile in FreeIPMI support via sys-libs/freeipmi</flag>
+	</use>
 </pkgmetadata>