gentoo resync : 16.06.2019

4 files changed, 73 insertions, 5 deletions

diff --git a/app-admin/sysrqd/Manifest b/app-admin/sysrqd/Manifest
index 690a0c0970e8..8c83f281ecca 100644
--- a/app-admin/sysrqd/Manifest
+++ b/app-admin/sysrqd/Manifest
@@ -1,6 +1,9 @@
 AUX sysrqd-14-fix-build-system.patch 615 BLAKE2B 25de1ca0a421ab37737613533fb68819a6f611271b44c7381963476e01ab62a204bf61a1bf5a61100d1199601d7db8f7010cdd1207eeb50dff9768f34b7028fe SHA512 2ecb26c68a4a7382af1c09d81b71544e9621c0425fcd7577be1e4b929b808989d223d128affb0107724423624f3bf550327c92cb9c56676d45f49707ee7d1321
+AUX sysrqd-17-fix-build-system.patch 570 BLAKE2B 06007cdc8783abea99060437db96f9493b9a2c410b44169c5960aa43d7f15231021dbbfdf5140d25c918de7cfcce09dd9e8106fda02c5ecdf8b76c9554d9c91b SHA512 2db00903e2325c4b5da296ceca11b71f61775122371b542a1c0f3d6bc70022ade4337fe237b1c9fe03b8aebc3dc349320e04db006c6fbf601d1dbae676101afa
 AUX sysrqd-config.patch 421 BLAKE2B 9cc04c7c31c39f1015b95aaf5c695a2221b65d2c471506b9f3e836fec43585e7e21d7fa7a01c4cdd7815f9c1ebb10800ca1cfccabd397223eb6b3f700f8cd54d SHA512 5dd351220cbb10a09d6c6f0bae07a37fc678988467a8a1cff2075217a82eb4bbfc6f2155b47b71159e3442f8d25bbff539a3e2a61f91829d6dae7820e647fca8
 AUX sysrqd.init 700 BLAKE2B 2570aeb1b01d098bd8330a9e78c85708013d3ee09318f84a1e5f088ffc2a32077cf6e18bc3413106724d7fe024bea9720f6f20c5a28a5fb5a775a219ed7c95e4 SHA512 9845a09cfa20ee9cd09e61e142cf53aaf482909ce3ec1401743864823a7bd45ced812fb235eef2adb914c3c624e227fa5936b73e1b83d8a3888fb25498980918
 DIST sysrqd-14.tar.gz 4759 BLAKE2B 3ef8b2f5092a899753da487d0a82a71d2d93d0c6a70689b5923fa900f2766de15fa2e416cb667d800dac19499218a0246941b8c52bfe4421af774ccecc62222e SHA512 efad48be3974923ec14d0958e788115c9273bc29b4f03853e6e087f6af872299ea57d42f885be19ff4eeaffa577ecf1c53ea2adb2f84e1487bb2511597b89cb2
-EBUILD sysrqd-14.ebuild 1395 BLAKE2B 4368fe901f94f14e010dfa5e8f4648f13dd93727a521e9db49398cc2704482a1d62e633a8acf5a4633b1903224d5c99357a08cfe25118aea695fc9297d06c1ab SHA512 11080e964bfa37504a653432ea99910ac469c969859f5301ee86b7f80db4a5bd147af3da5b8cf6119473959de2110195978d9d00c3589f8f61d12f4845cc32ae
+DIST sysrqd-17.tar.gz 5232 BLAKE2B 4fd3baf7bce45b43577db7cd4a383161a8d69bd88e041afe20c33d3812235829729c57b748321195c2bccea819827655080199c0167bafad7252ca29b2a3a27c SHA512 fd0e42d2edd5e8548510aa823b2fef6339b2dc1dde1fe387585b9f2611e7d944fa6d73447e3f58a0aa00d45a88459c6e9cbb619428282abf367f62a8270e5d54
+EBUILD sysrqd-14.ebuild 1324 BLAKE2B 4c99879dbe55a6008298f24a3e4adbb2815a16c5c41e7faf2bf0c687bd7674d034862d768f832e5593ef7899f15e50ea97cc302d1b7fa99d5c2edd532b34d204 SHA512 5ff816e851be1fc7f91cbe57c944c0dfbdf41539ff37a229ea5b57f3697a30b7936f3afad1d11590d852a0982f0ef4e9d2e6260521a5183e558451b32d23d674
+EBUILD sysrqd-17.ebuild 1316 BLAKE2B e0f1b6a31fb3418058a6e576b4f9f25855ec55e191dbccc9e49486d4ab52af129f9d71931dbd04566f33876131bd05b85cfbdf9a69c1f8c03dec4c40eee155f0 SHA512 213b573ebeb6e9cadb08e0641fa4c68a0513cc2e0bec9e77124c9972be3edc16745f4133442ec4641cbc527ad16e1d7c8fc703727f669b0aab88458d3bc9f8c3
 MISC metadata.xml 414 BLAKE2B eb2c97371677b4c978e210a3069e30cd453ebaf2249d01e80e52c116bb9dd4243f692cb4e4f384412191e691a67054a390f35143fb8fc403b595f11c3e09dd68 SHA512 e0c64a75f859353dd258c074a2353882ddba2955144297672ada48f29ebd742d4acd7193816aae859f7f7df1d4b23e9bd1176856aa801ee7a0035f8ce2224859
diff --git a/app-admin/sysrqd/files/sysrqd-17-fix-build-system.patch b/app-admin/sysrqd/files/sysrqd-17-fix-build-system.patch
new file mode 100644
index 000000000000..2118b8e682e3
--- /dev/null
+++ b/app-admin/sysrqd/files/sysrqd-17-fix-build-system.patch
@@ -0,0 +1,13 @@
+--- sysrqd-17/Makefile	2019-04-08 15:37:16.000000000 +0200
++++ sysrqd-17-ng/Makefile	2019-05-20 19:55:15.842841704 +0200
+@@ -5,8 +5,9 @@
+         -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wsign-compare \
+         -Wunused -Winit-self -Wpointer-arith -Wredundant-decls \
+         -Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn \
+-        -std=gnu99 -pipe -DSYSRQD_VERSION="\"$(VERSION)\"" -O3
++        -std=gnu99
+ LDFLAGS+=-lcrypt
++CPPFLAGS+=-DSYSRQD_VERSION="\"$(VERSION)\""
+ 
+ SBINDIR=$(DESTDIR)/usr/sbin
+ #MANDIR=$(DESTDIR)/usr/share/man/man1
diff --git a/app-admin/sysrqd/sysrqd-14.ebuild b/app-admin/sysrqd/sysrqd-14.ebuild
index 249bbce77e12..c53bc209cd1d 100644
--- a/app-admin/sysrqd/sysrqd-14.ebuild
+++ b/app-admin/sysrqd/sysrqd-14.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit toolchain-funcs
 
-DESCRIPTION="daemon providing access to the kernel sysrq functions via network"
-HOMEPAGE="http://julien.danjou.info/projects/sysrqd"
-#SRC_URI="http://julien.danjou.info/${PN}/${P}.tar.gz"
+DESCRIPTION="Daemon providing access to the kernel sysrq functions via network"
+HOMEPAGE="https://github.com/jd/sysrqd"
 SRC_URI="https://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-admin/sysrqd/sysrqd-17.ebuild b/app-admin/sysrqd/sysrqd-17.ebuild
new file mode 100644
index 000000000000..541c67095fc1
--- /dev/null
+++ b/app-admin/sysrqd/sysrqd-17.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Daemon providing access to the kernel sysrq functions via network"
+HOMEPAGE="https://github.com/jd/sysrqd"
+SRC_URI="https://github.com/jd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-config.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dosbin sysrqd
+	newinitd "${FILESDIR}/sysrqd.init" sysrqd
+
+	local bindip='127.0.0.1' secret
+	declare -i secret
+	let secret="${RANDOM}*${RANDOM}*${RANDOM}*${RANDOM}"
+	echo "${bindip}" > sysrqd.bind || die
+	echo "${secret}" > sysrqd.secret || die
+
+	diropts -m 0700 -o root -g root
+	dodir /etc/sysrqd
+	insinto /etc/sysrqd
+	insopts -m 0600 -o root -g root
+	doins sysrqd.bind
+	doins sysrqd.secret
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog
+	elog "Be sure to change the initial secret in /etc/sysrqd/sysrqd.secret !"
+	elog "As a security precaution, sysrqd is configured to only listen on"
+	elog "127.0.0.1 by default. Change the content of /etc/sysrqd/sysrqd.bind"
+	elog "to an IPv4 address you want it to listen on or remove the file"
+	elog "to make it listen on any IP address (0.0.0.0)."
+	elog
+}