From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sysrqd/files/, app-admin/sysrqd/
Date: Fri, 29 Dec 2017 17:02:40 +0000 (UTC) [thread overview]
Message-ID: <1514566928.5bf20fefbeacbc4b9418b4bd6a93f6f14d60903d.soap@gentoo> (raw)
commit: 5bf20fefbeacbc4b9418b4bd6a93f6f14d60903d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 16:23:46 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 17:02:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf20fef
app-admin/sysrqd: Port to EAPI 6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../sysrqd/files/sysrqd-14-fix-build-system.patch | 21 +++++++++++++
app-admin/sysrqd/files/sysrqd-config.patch | 4 +--
app-admin/sysrqd/metadata.xml | 19 ++++++------
app-admin/sysrqd/sysrqd-14.ebuild | 34 +++++++++++-----------
4 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch b/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch
new file mode 100644
index 00000000000..2668c3c0c49
--- /dev/null
+++ b/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,15 +5,15 @@
+ -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
++CPPFLAGS += -DSYSRQD_VERSION="\"$(VERSION)\""
+
+ SBINDIR=$(DESTDIR)/usr/sbin
+ #MANDIR=$(DESTDIR)/usr/share/man/man1
+ INSTALL = install
+ #MAN=sysrqd.1
+
+-$(BIN): $(O)
+- $(CC) $(LDFLAGS) -o $(BIN) $(O)
++all: $(BIN)
+
+ install: $(BIN)
+ $(INSTALL) -d -m 755 $(SBINDIR)
diff --git a/app-admin/sysrqd/files/sysrqd-config.patch b/app-admin/sysrqd/files/sysrqd-config.patch
index ce463814d1e..56c6afb6080 100644
--- a/app-admin/sysrqd/files/sysrqd-config.patch
+++ b/app-admin/sysrqd/files/sysrqd-config.patch
@@ -1,5 +1,5 @@
---- sysrqd.c.orig 2009-11-05 14:58:21.644471772 +0100
-+++ sysrqd.c 2009-11-05 14:58:43.276472005 +0100
+--- a/sysrqd.c
++++ b/sysrqd.c
@@ -40,8 +40,8 @@
#define BIND_MAX_LEN 16
#define PROMPT "sysrq> "
diff --git a/app-admin/sysrqd/metadata.xml b/app-admin/sysrqd/metadata.xml
index b86ebd13ff3..97a6a018180 100644
--- a/app-admin/sysrqd/metadata.xml
+++ b/app-admin/sysrqd/metadata.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>wschlich@gentoo.org</email>
- <name>Wolfram Schlich</name>
- <description>Primary maintainer</description>
-</maintainer>
-<longdescription>
-sysrqd is a small daemon intended to manage Linux Sysrq over network.
-Its philosophy is to be very responsive under heavy load and try to
-be somehow reliable. Authentication is made by clear password.
-</longdescription>
+ <maintainer type="person">
+ <email>wschlich@gentoo.org</email>
+ <name>Wolfram Schlich</name>
+ </maintainer>
+ <longdescription>
+ sysrqd is a small daemon intended to manage Linux Sysrq over network.
+ Its philosophy is to be very responsive under heavy load and try to
+ be somehow reliable. Authentication is made by clear password.
+ </longdescription>
</pkgmetadata>
diff --git a/app-admin/sysrqd/sysrqd-14.ebuild b/app-admin/sysrqd/sysrqd-14.ebuild
index 3475122a580..249bbce77e1 100644
--- a/app-admin/sysrqd/sysrqd-14.ebuild
+++ b/app-admin/sysrqd/sysrqd-14.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
-IUSE=""
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"
SRC_URI="https://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${P}.tar.gz"
+
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~x86 ~amd64"
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${PN}-config.patch"
-}
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-config.patch
+ "${FILESDIR}"/${PN}-14-fix-build-system.patch
+)
-src_compile() {
- $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o sysrqd sysrqd.c
+src_configure() {
+ tc-export CC
}
src_install() {
@@ -31,8 +31,8 @@ src_install() {
local bindip='127.0.0.1' secret
declare -i secret
let secret=${RANDOM}*${RANDOM}*${RANDOM}*${RANDOM}
- echo ${bindip} > sysrqd.bind
- echo ${secret} > sysrqd.secret
+ echo ${bindip} > sysrqd.bind || die
+ echo ${secret} > sysrqd.secret || die
diropts -m 0700 -o root -g root
dodir /etc/sysrqd
@@ -41,7 +41,7 @@ src_install() {
doins sysrqd.bind
doins sysrqd.secret
- dodoc README ChangeLog
+ einstalldocs
}
pkg_postinst() {
reply other threads:[~2017-12-29 17:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1514566928.5bf20fefbeacbc4b9418b4bd6a93f6f14d60903d.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox