From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1BE11138AE9 for ; Fri, 29 Dec 2017 17:02:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B423E0FB6; Fri, 29 Dec 2017 17:02:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EB80CE0FB6 for ; Fri, 29 Dec 2017 17:02:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 26F44341640 for ; Fri, 29 Dec 2017 17:02:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 803C2AFCF for ; Fri, 29 Dec 2017 17:02:40 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1514566928.5bf20fefbeacbc4b9418b4bd6a93f6f14d60903d.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sysrqd/files/, app-admin/sysrqd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch app-admin/sysrqd/files/sysrqd-config.patch app-admin/sysrqd/metadata.xml app-admin/sysrqd/sysrqd-14.ebuild X-VCS-Directories: app-admin/sysrqd/files/ app-admin/sysrqd/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 5bf20fefbeacbc4b9418b4bd6a93f6f14d60903d X-VCS-Branch: master Date: Fri, 29 Dec 2017 17:02:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 28113453-171a-432b-b6c0-7e32b408964c X-Archives-Hash: 5317185a741d41db18d859814b918897 commit: 5bf20fefbeacbc4b9418b4bd6a93f6f14d60903d Author: David Seifert gentoo org> AuthorDate: Fri Dec 29 16:23:46 2017 +0000 Commit: David Seifert gentoo 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 @@ - - wschlich@gentoo.org - Wolfram Schlich - Primary maintainer - - -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. - + + wschlich@gentoo.org + Wolfram Schlich + + + 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. + 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() {