version bump, also fixes bug #274250

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 80 insertions, 2 deletions

diff --git a/app-admin/sysrqd/ChangeLog b/app-admin/sysrqd/ChangeLog
index c4611415e1ea..bbb76a10102b 100644
--- a/app-admin/sysrqd/ChangeLog
+++ b/app-admin/sysrqd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/sysrqd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysrqd/ChangeLog,v 1.4 2009/10/28 04:18:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysrqd/ChangeLog,v 1.5 2009/11/16 10:00:26 wschlich Exp $
+
+*sysrqd-12 (16 Nov 2009)
+
+  16 Nov 2009; Wolfram Schlich <wschlich@gentoo.org>
+  +files/sysrqd-12-config.patch, +sysrqd-12.ebuild:
+  version bump, also fixes bug #274250
 
   28 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> sysrqd-9.ebuild:
   Keyword for ~amd64.
diff --git a/app-admin/sysrqd/Manifest b/app-admin/sysrqd/Manifest
index d2b051e52957..1adee6e89965 100644
--- a/app-admin/sysrqd/Manifest
+++ b/app-admin/sysrqd/Manifest
@@ -1,6 +1,9 @@
+AUX sysrqd-12-config.patch 494 RMD160 9b48a582ad6e7ce61f135022cf51a88c1e522a67 SHA1 c878d777c184d57c5661e070672040a1b03eb587 SHA256 5dd233f8063a7c0dee1f488bcb4e9c3f5a4e989a36cbd7f6d620f376dbe48f34
 AUX sysrqd-9-config.patch 561 RMD160 dda44448863418331a2e6aaa4a480e8e92513c59 SHA1 ef9aa8754533000cbb7da19cfd80e038f9f4e777 SHA256 01ebb5cbfccb2ef1adda37f3416e88b10d01a9ed864facabb31b5fd2a95ce28f
 AUX sysrqd.init 810 RMD160 6407d00ee03b25bed81a68705dbb0c38ee00580d SHA1 302a74a74f30a0b3d095dee63582c00aa0b488ee SHA256 66f1b163eee66641d2d06e3c4b3e7fb7ae7b33f3e8beb64c2d20506146757d9b
+DIST sysrqd-12.tar.gz 4555 RMD160 8632333866642fa11681b97e36e2fdd2ab2f1827 SHA1 6be8278224e7e76f637ddf16c5f6810bba45a45d SHA256 216ae638280d4357ddc3e397d6191f2ca3343419a5754931a0109a0b3e35aa40
 DIST sysrqd-9.tar.gz 4188 RMD160 efad126dd4a3e64df077bedb9dedac0189a983af SHA1 55b1067e856ee4dd058ee721bc85907e740ff9eb SHA256 836723b6001a33e3b5684dca20ba7734732c337d21ba3b6a481a0304642e81e4
+EBUILD sysrqd-12.ebuild 1462 RMD160 4e4cab9887bb20ef174b2a3e6b15345b91a7fa01 SHA1 4b541d9b6e95a8820616a746df74befbea6f7f8b SHA256 58ea513fd79c058b3e8edd085e99dd8d454620c850d05e33c84aacf9452a710b
 EBUILD sysrqd-9.ebuild 1440 RMD160 df00cf26874c69c7ac556be5aefd1ab73fe0456f SHA1 50002c6e0288534922bf58a8666251ceebad9c72 SHA256 785fa90fbb005862737f0d4891d9b3bfa67f9e982a9655a2f8a1e206d44200b2
-MISC ChangeLog 865 RMD160 05d8cc14319be75cf7769d3ca6827d465e9d46b6 SHA1 59a2d4fd1e99f8172ed22bbe84e6811148bed6da SHA256 d4509e9b012ee523ad6a6c1002b69cc5159160081a403c219acd8f974a50b86b
+MISC ChangeLog 1037 RMD160 fedadd03edd453f5ab75fab292f3cb19489d9642 SHA1 fc68e6634f9d6a81a54808d4eba1d264f83c781c SHA256 1444574e33f038150cd95e0b2de1d37a83bfd74dbc4ea164f12a47d7fc0dbf6a
 MISC metadata.xml 538 RMD160 920d790ec42de53798cdc10a55ddeecb0635e85c SHA1 33fcfe1e3791ab26f364fea629c6ec42324277d9 SHA256 d03810a1941a72ff902f282a8fa76065ad9b13b0213ac3e52cb9eb64be2df105
diff --git a/app-admin/sysrqd/files/sysrqd-12-config.patch b/app-admin/sysrqd/files/sysrqd-12-config.patch
new file mode 100644
index 000000000000..ce463814d1e3
--- /dev/null
+++ b/app-admin/sysrqd/files/sysrqd-12-config.patch
@@ -0,0 +1,13 @@
+--- sysrqd.c.orig	2009-11-05 14:58:21.644471772 +0100
++++ sysrqd.c	2009-11-05 14:58:43.276472005 +0100
+@@ -40,8 +40,8 @@
+ #define BIND_MAX_LEN 16
+ #define PROMPT "sysrq> "
+ #define SYSRQ_TRIGGER_PATH "/proc/sysrq-trigger"
+-#define AUTH_FILE "/etc/sysrqd.secret"
+-#define BINDIP_FILE "/etc/sysrqd.bind"
++#define AUTH_FILE "/etc/sysrqd/sysrqd.secret"
++#define BINDIP_FILE "/etc/sysrqd/sysrqd.bind"
+ #define PID_FILE "/var/run/sysrqd.pid"
+ #define SYSRQD_PRIO -19
+ #define SYSRQD_LISTEN_PORT 4094
diff --git a/app-admin/sysrqd/sysrqd-12.ebuild b/app-admin/sysrqd/sysrqd-12.ebuild
new file mode 100644
index 000000000000..8e0881ad8b4b
--- /dev/null
+++ b/app-admin/sysrqd/sysrqd-12.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysrqd/sysrqd-12.ebuild,v 1.1 2009/11/16 10:00:26 wschlich Exp $
+
+inherit eutils toolchain-funcs
+
+IUSE=""
+DESCRIPTION="daemon providing access to the kernel sysrq functions via network"
+HOMEPAGE="http://julien.danjou.info/sysrqd.html"
+SRC_URI="http://julien.danjou.info/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-config.patch"
+}
+
+src_compile() {
+	$(tc-getCC) ${CFLAGS} -o sysrqd sysrqd.c
+}
+
+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
+	echo ${secret} > sysrqd.secret
+
+	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
+
+	dodoc README ChangeLog
+}
+
+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
+}