Merge updates from master

4 files changed, 99 insertions, 3 deletions

diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 9ac7b3d4286b..63941d73e1e3 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -1,3 +1,4 @@
 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
diff --git a/app-admin/conserver/conserver-8.2.4.ebuild b/app-admin/conserver/conserver-8.2.4.ebuild
new file mode 100644
index 000000000000..54eae640841a
--- /dev/null
+++ b/app-admin/conserver/conserver-8.2.4.ebuild
@@ -0,0 +1,95 @@
+# 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.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/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest
index 9249b8049570..8f69b4daab51 100644
--- a/sys-apps/lsd/Manifest
+++ b/sys-apps/lsd/Manifest
@@ -12,8 +12,8 @@ DIST libc-0.2.44.crate 347920 BLAKE2B 04fd82a1aab02a25a1201f6c463c0b30547e69dbca
 DIST libc-0.2.55.crate 400416 BLAKE2B 157b4f9d221f562e37ccfdd662a6777c8c6c45d1d2c9f9ff0f9d4d1bdf1aa66dac9f61a220e5be65fd7bc01273335eed86291e158f64da26bd7b398af26663e2 SHA512 649155c45a098dc043a42a0df19a7a43100f104bda1ce1a3bad9e5070b5a9c3a73f67197e286fb508c9257315b2e1d2a6eb4cba35f909ef0a2b1f61e1a29b196
 DIST lscolors-0.5.0.crate 15937 BLAKE2B 27c9d42fbdfa32ce9f01fc627c2a758544dccd72f2b63f232b4984287f61f5f4dc8788a30ad60ae92ddc374b7b993b577bbc0d11a03c61756af81cc672300fc0 SHA512 97d881cf248dee1a744e6016941abb80579518ede0883e419b6c452215ddc0b2a6336c6c6c254e4f463cfa7f3a648ea56fef1df0ff044daba98c2d03e1731013
 DIST lsd-0.14.0.tar.gz 33646 BLAKE2B b0bc5f8c9ef764e8e2c1a17da144e507ff6181bbde88a002950b47fb1678f4f4790e1cdc9e438c59ebf8e84eb7ef4c7a6308a45c21c75d63b56d0b5078bef987 SHA512 f1c17b63769f7c390a36e2ff99caf6d1da326fefc041a992986f756614a70db5aae4c87a0a33e416a6096d8ce65f0c0cbed50d168a8d0ca6dc2e97f0065593a0
-DIST lsd-0.15.0.crate 37871 BLAKE2B 605189030106fa962c8d32e5a1e2ada79cc21ccdd3fcc6db9cfcffddd1cc92f2f3fcc34159e1c956116be5bdd25084c3d9a94309a1652f505fb1b0a4e20db689 SHA512 d3c588a2958f5ec45706122f237e055d60126a09f4807e7579b282b640791951fe26b7ec8cf1d1a96ecafeaf4d78331d6df34498cbf7bddd841427cac60de522
-DIST lsd-0.15.0.tar.gz 40480 BLAKE2B ffff09564665fa9863a2fe267b0ace6074b2d8731b4fddca6b387df3f2742daa98e04581a9cce0994b7e1d89ef844f0aed91b201fc04ec160b55bc3b68898f43 SHA512 23b5b7fa8c560e8481610716cb99464456217669c1629720ec5d7d93a1b42324184e0c14b46bffe1a7fc602e8e1a5e41609d7481122537979592f67476fb0f42
+DIST lsd-0.15.1.crate 38136 BLAKE2B 6540beb147161fbce2bc59fd97221b961d87a0fe27f23c7b7e168ee80c219854ab1929f4fc92afa2cf70dc82b8ee2c9f7694e9aa9bac91f3c37ccfb981e8e53d SHA512 ab1ba61901c372a39a7e26eda5b53adceb0b357dec998f880d23a8e97c3addc16bf1d6e21cac262f23bec3d4061b3e9f6734d85d856b8e649e8b33805acf094a
+DIST lsd-0.15.1.tar.gz 40728 BLAKE2B 6e3b6c432f23b476bdf53cc0a6bdb353c9c4151e718cb6b848824c9a128c4e34f4c34ab9ff415bc76124e15addcaa989d629ddde009a4599dab146323a7607e8 SHA512 58a280615e72f9dc685e49532d147c17d94be099f80400add15b983d5945d98004a6a636f7f7a76809376dc07cab25f44d716a4b00456db0201c34f935952ed3
 DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
 DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
 DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
diff --git a/sys-apps/lsd/lsd-0.15.0.ebuild b/sys-apps/lsd/lsd-0.15.1.ebuild
index 158c609d51c5..25a04b987bfc 100644
--- a/sys-apps/lsd/lsd-0.15.0.ebuild
+++ b/sys-apps/lsd/lsd-0.15.1.ebuild
@@ -16,7 +16,7 @@ glob-0.2.11
 kernel32-sys-0.2.2
 libc-0.2.55
 lscolors-0.5.0
-lsd-0.15.0
+lsd-0.15.1
 num-integer-0.1.39
 num-traits-0.2.6
 rand-0.4.3