Separate s-s-d arguments from rwhoisd arguments by Joshua Coombs (bug #501924). Various.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 58 insertions, 41 deletions

diff --git a/net-misc/rwhoisd/ChangeLog b/net-misc/rwhoisd/ChangeLog
index 3807c5cfed2f..2a2d6a7527a6 100644
--- a/net-misc/rwhoisd/ChangeLog
+++ b/net-misc/rwhoisd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/rwhoisd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rwhoisd/ChangeLog,v 1.4 2014/11/04 12:20:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rwhoisd/ChangeLog,v 1.5 2014/11/09 10:09:35 jer Exp $
+
+*rwhoisd-1.5.9.5-r2 (09 Nov 2014)
+
+  09 Nov 2014; Jeroen Roovers <jer@gentoo.org> +rwhoisd-1.5.9.5-r2.ebuild,
+  files/rwhoisd-destdir-1.5.9.5.patch, files/rwhoisd, files/rwhoisd.conf,
+  -files/rwhoisd-destdir.patch:
+  Separate s-s-d arguments from rwhoisd arguments by Joshua Coombs (bug
+  #501924). Various.
 
   04 Nov 2014; Pacho Ramos <pacho@gentoo.org> -rwhoisd-1.5.9.5.ebuild,
   metadata.xml:
diff --git a/net-misc/rwhoisd/files/rwhoisd b/net-misc/rwhoisd/files/rwhoisd
index 9c3b6bd05222..8e02214c8d07 100644
--- a/net-misc/rwhoisd/files/rwhoisd
+++ b/net-misc/rwhoisd/files/rwhoisd
@@ -2,17 +2,16 @@
 
 depend() {
 	use logger
-	need net
 }
 
 start() {
 	ebegin "Starting rwhoisd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/rwhoisd ${RWHOISD_OPTS}
+	start-stop-daemon --start --quiet --exec /usr/sbin/rwhoisd -- ${RWHOISD_OPTS}
 	eend $?
 }
 
 stop() {
-	ebegin "Stopping tftpd"
+	ebegin "Stopping rwhoisd"
 	start-stop-daemon --stop --quiet --exec /usr/sbin/rwhoisd
 	eend $?
 }
diff --git a/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch b/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch
index 38d3b0ce5ad0..6cd6b28f2e51 100644
--- a/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch
+++ b/net-misc/rwhoisd/files/rwhoisd-destdir-1.5.9.5.patch
@@ -1,5 +1,5 @@
---- tools/rwhois_repack/Makefile.in.orig	2009-10-16 11:30:40.000000000 -0700
-+++ tools/rwhois_repack/Makefile.in		2009-10-16 11:31:20.000000000 -0700
+--- a/tools/rwhois_repack/Makefile.in
++++ b/tools/rwhois_repack/Makefile.in
 @@ -52,9 +52,9 @@
  # procedural
  
@@ -14,8 +14,8 @@
  uninstall:
 	$(RM) $(bindir)/rwhois_repack
 
---- sample.data/Makefile.in.orig	2009-10-16 11:37:54.000000000 -0700
-+++ sample.data/Makefile.in		2009-10-16 11:38:22.000000000 -0700
+--- a/sample.data/Makefile.in
++++ b/sample.data/Makefile.in
 @@ -10,7 +10,7 @@
  prefix      = @prefix@
  exec_prefix = @exec_prefix@
@@ -26,8 +26,8 @@
  srcdir	    = @srcdir@
  VPATH       = @srcdir@
 
---- sample.data/Makefile.in.orig	2009-10-21 14:27:42.000000000 -0700
-+++ sample.data/Makefile.in	2009-10-21 14:33:00.000000000 -0700
+--- a/sample.data/Makefile.in
++++ b/sample.data/Makefile.in
 @@ -17,7 +17,7 @@
  
  DESTDIR =
diff --git a/net-misc/rwhoisd/files/rwhoisd-destdir.patch b/net-misc/rwhoisd/files/rwhoisd-destdir.patch
deleted file mode 100644
index 54369048de35..000000000000
--- a/net-misc/rwhoisd/files/rwhoisd-destdir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- tools/rwhois_repack/Makefile.in.orig	2009-10-16 11:30:40.000000000 -0700
-+++ tools/rwhois_repack/Makefile.in		2009-10-16 11:31:20.000000000 -0700
-@@ -52,9 +52,9 @@
- # procedural
- 
- install:
--	if [ ! -d $(exec_prefix) ]; then mkdir $(exec_prefix); fi
--	if [ ! -d $(bindir) ]; then mkdir $(bindir); fi
--	$(INSTALL) rwhois_repack $(bindir)
-+	if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir $(DESTDIR)$(exec_prefix); fi
-+	if [ ! -d $(DESTDIR)$(bindir) ]; then mkdir $(DESTDIR)$(bindir); fi
-+	$(INSTALL) rwhois_repack $(DESTDIR)$(bindir)
- 
- uninstall:
-	$(RM) $(bindir)/rwhois_repack
-
---- sample.data/Makefile.in.orig	2009-10-16 11:37:54.000000000 -0700
-+++ sample.data/Makefile.in		2009-10-16 11:38:22.000000000 -0700
-@@ -10,7 +10,7 @@
- prefix      = @prefix@
- exec_prefix = @exec_prefix@
- bindir      = $(exec_prefix)/bin
--etcdir      = $(exec_prefix)/etc
-+etcdir      = /etc
- 
- srcdir	    = @srcdir@
- VPATH       = @srcdir@
diff --git a/net-misc/rwhoisd/files/rwhoisd.conf b/net-misc/rwhoisd/files/rwhoisd.conf
index 4715be3d632f..eb32d26d55ed 100644
--- a/net-misc/rwhoisd/files/rwhoisd.conf
+++ b/net-misc/rwhoisd/files/rwhoisd.conf
@@ -1,8 +1,7 @@
-#$Header: /var/cvsroot/gentoo-x86/net-misc/rwhoisd/files/rwhoisd.conf,v 1.1 2009/10/16 20:16:37 kingtaco Exp $
+# configuration file for /etc/init.d/rwhoisd
+
 OPTS="-c /etc/rwhoisd/rwhoisd.conf"
 
-#Pass any additional options to rwhoisd here.
+# Pass any additional options to rwhoisd here.
 
 RWHOISD_OPTS="${OPTS}"
-
-
diff --git a/net-misc/rwhoisd/rwhoisd-1.5.9.5-r2.ebuild b/net-misc/rwhoisd/rwhoisd-1.5.9.5-r2.ebuild
new file mode 100644
index 000000000000..370ec6740859
--- /dev/null
+++ b/net-misc/rwhoisd/rwhoisd-1.5.9.5-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rwhoisd/rwhoisd-1.5.9.5-r2.ebuild,v 1.1 2014/11/09 10:09:35 jer Exp $
+
+EAPI=5
+inherit eutils user
+
+DESCRIPTION="ARIN rwhois daemon"
+HOMEPAGE="http://projects.arin.net/rwhois/"
+SRC_URI="http://projects.arin.net/rwhois/ftp/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+pkg_setup() {
+	enewgroup rwhoisd
+	enewuser rwhoisd -1 -1 /var/rwhoisd rwhoisd
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/rwhoisd-destdir-${PV}.patch
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install () {
+	emake -j1 install DESTDIR="${D}"
+	doinitd "${FILESDIR}"/rwhoisd
+	newconfd "${FILESDIR}"/rwhoisd.conf rwhoisd
+}
+
+pkg_postinst () {
+	einfo "Please make sure to set the userid in rwhoisd.conf to rwhoisd."
+	einfo "It is highly inadvisable to run rwhoisd as root."
+}