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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

7 files changed, 67 insertions, 50 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/Manifest b/net-misc/rwhoisd/Manifest
index e2e97504eb1e..4e1745004e0e 100644
--- a/net-misc/rwhoisd/Manifest
+++ b/net-misc/rwhoisd/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX rwhoisd 284 SHA256 929f479426a03c84a51648c99af2d8622efee155995c6abb458ae9236f0b0051 SHA512 85565d4c7500b74bcd5957c7d4cf163c34dcc3b0551e339b1066b421942fb607c2ff59d8cb6fbae35fcf77881a42b56c0300e6483778046206bf6c19ce197fa5 WHIRLPOOL 7a77407ca6bfebaf0819351ad027bcf69d9019dc616d9e0ccbe29e4fcfb6176c9f51a644538256a41885c4a7f5fc095f22298c0204f1e1c02f19231e71883737
-AUX rwhoisd-destdir-1.5.9.5.patch 1228 SHA256 27e595f10f2d9c3587f7f52d9b34a5e537ade41ee5f9ffaf27aa1a75aa13f5a4 SHA512 3e377e65ee272fc33c9c54c4e4ceebbe434ab2547ddcf70b4e0f1af1185bd0e6b37e7c39166236557f0490a1df77889982b0661e7fee607cbe50584dc89e06fd WHIRLPOOL 2def53441941f5007c7eae8acd43f8a41a63467c330b33f6d29596c932eff71b0cbf437de6ff7482255de517e4c736a0e070e0c0926b37250612f1da4321252c
-AUX rwhoisd-destdir.patch 926 SHA256 2e427ba47e70f0000c725504a5c125c65190d71572a3e8aecfa4d8ccadeacc0a SHA512 54d04a5b57299e8898f638feaf9c9185428ae62d572ae431860fd4e7e363ea7ca85dcc04b8c8be3701a6782ba43509432e65f70c7e49b3ce56ba1be7788058b5 WHIRLPOOL c55388df28c40ab29ff6fa6c69e5591bdc04540df583f37e5b28ab79563d090a82973181354d0ec66e8e3ad35c405e61f12a15589d9196353c0bbe80dc76aebb
-AUX rwhoisd.conf 220 SHA256 a7f7ae7d9ee401a05931896126fde2006b759524e3b8391f0fa2ab5641877586 SHA512 0653fcff24c1127af3366d18984763c32b200013bc066e1d7646be9fe87516ac76d4689fa0e60324f6f7e6d3191c911c5c71f51c2feb740d1a1da54d51f03887 WHIRLPOOL eeae668d9993fc805104cde762030666bed7320630858d541db3b3e4e710bba8d43bb99bf07fd94fc3e2a39ca16325136d414f801f6b8fbb662d7c3bd4fc9635
-DIST rwhoisd-1.5.9.5.tar.gz 491600 SHA256 832da8faff58070fcc8685c67375dcced3b6bb225ffbe3542dd6052add61cf92
+AUX rwhoisd 279 SHA256 694becb43a2f80ecad10905bde59878f4c0b591e71d612516488cb39206022b5 SHA512 7dc3dacdb0840a3c248750c4431a274f85ac37974a5cc5bd0f11002549275ac356c0ac4959caaa2e019d89df2a28daf8c5ba3286fd1c1ec68824d4f00b24bfec WHIRLPOOL 6650fa139313b977283808244a9ea7d3a31b91635ce2a7dda09d052fe8e7345e8797b56e0c34780a5accd47a2d9585be45cbd1d91c9e02e50537dfc7bde62380
+AUX rwhoisd-destdir-1.5.9.5.patch 1007 SHA256 402dcf51c2735f3f2dc956373c939154cce7b9955cf3e4c36bbaacc0bf5e7c8f SHA512 9fc08f639cd087c1cbbc3139eb648fc4afed1c8aa299fcec867c3938a773e8c0ca9b1be40acdc61026ded1f012df9eea2bb713ec1207464f1cd66d215c2fa221 WHIRLPOOL 7508fbba3d72486d0a859f7ade65132184d7972106c412ea8be46821458bad87889e938fe16ae44c711ec6a76c55321d6df372f01314901a0d75aff049970069
+AUX rwhoisd.conf 154 SHA256 977db3d945ba6862b4161256a0cd2bce92f181246e3945d64f8e44a78de8b974 SHA512 882d93ddf72f6a909ab6a33a6f5026e35f52ae025a9e4653cc0449c4b0ab1b2fda5799e1b44b19c620eb98337270a7a1c1eb9cff66af49832adf9726f4713bb8 WHIRLPOOL 4150fb3a5e357540ca3f1be4cc876287a5b9b9d08be31cd785d2d6edf2f6bb4fdab2b0c5b79a5a775cb335b49d422c0c7df54d01503371ccc7cfad997789c69f
+DIST rwhoisd-1.5.9.5.tar.gz 491600 SHA256 832da8faff58070fcc8685c67375dcced3b6bb225ffbe3542dd6052add61cf92 SHA512 d9227cd700cb14e0c83003c7a8dff43f859eba58390f4ba74b03c58fe629bcc9e8a39f2aaf7ce9b55aa4f17f43fc54fed9ba05a29bcbe1df5fc1340202d7b04c WHIRLPOOL ba6f7741462468d8f9e933c69f576c2204ede70b0315486df1885afa2a45755c32b7e4170df7792c2aa6516f51c39eb01495ba8cec453f676265817fff8cecb2
 EBUILD rwhoisd-1.5.9.5-r1.ebuild 1005 SHA256 d46a6e2e1b079fa4252978ca02c23c35584ecd7d199a62e338a570dbd5c25643 SHA512 db5ca71b683b02f01183d65b9746436f538c2b6bb2a22c80821ac598eb58b5a415b157fa7794ec6545d27d7066831e2631dd46dbfb657950c930e6c2c69f0775 WHIRLPOOL 994f73273b29e773b25f84cc091476e9fe6c62a0aede4c74d749cec05df525dcfdbd816460940007600875b9c8db9253342946222dd82baacd10a96deb4deae5
-MISC ChangeLog 905 SHA256 612a9f6edb2f882b3e01980c4d3dcde24e9a91aba46446d247a5b95de7eee3e6 SHA512 bb18d7bf3a7717c969bfcc5597ca9ff9939218e4bbcd5f31957bce5747b345abe5144d3e21e309eab71e473b84ae215654cddf2d4d3cf8319c8972257d9fb767 WHIRLPOOL 8b4e6e33dd00f2cae9131f2cf77b56a43fd1210ab5710a219b1c02709cf21c6a6e91b17782fe1005db07ef11f4bc49664055cb02f7c567e4817d6ca417e52c40
+EBUILD rwhoisd-1.5.9.5-r2.ebuild 895 SHA256 020cb7e710e12d2dc45b3757de1031aeee1699730247543795e371c66d722ea4 SHA512 b996c067048db43eae89a93017307ee422655b77ccf9583a52f9e8330061f2108253d61035fd85bcf0ca06b5158138892d43bee33bb34176c6db7d444a7853bf WHIRLPOOL ca5ac128da50fa6d320d449d64b170776cd2cf63891c9f59c1f7d1ad2e3b6008c655f94f8d987df1aac87ceac3798f49aa0d4d28aac6360f496b3eae875e72eb
+MISC ChangeLog 1213 SHA256 4fbf101a8d249186bd88c994b8b299b175e32e579e6ac18677461be3f7eff210 SHA512 5b0c9895f5c0b89aca3af92cea3a060c761e5b71621ef3a4436394b7e0c6b3ed6a00c653dc8fd641e4f8884f796bc111597b657bfdbc84a2c19e0841bc980a08 WHIRLPOOL 95e9d4c6d8ee18b220fcfac01925f065942597c3760c25a23ff8aea59cf1e81656aa447ee55a14b379b5b6c20f906af73ced522a804bc94d54416daf1033874b
 MISC metadata.xml 271 SHA256 38c79ec042d579f757dc51cef7089fd4185a00e5122f4e3fc06494111ff62b13 SHA512 dfa640f16d8359cbfa4f8390d777e8eb6aeb00158c066c352e859870119e0738a014d77f8dc55ef39750c5dfe73ecaa9208c4e8ff53799165b73b2a7dbb019c3 WHIRLPOOL 0d93e23ea4688148ed62f4f4f13116c372f6b202c6843eec369499b6a89793d45410744a761809f4e59e5db36962957240688e068ae32bb225b9921dac01409c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRYxI8ACgkQCaWpQKGI+9SzagCdHz8kgXiMDYkL5HNwedvvAbJ+
-2EkAn099qR8qiZ5SjQKAx+KTR3ElMXzM
-=qw4h
+iEYEAREIAAYFAlRfPWEACgkQVWmRsqeSphNPKACfX8T7tUlpiLgsBN8FHl8JW5P+
+wxkAn3sj8CimDwtJhRD7NDRAT9LL8vik
+=paym
 -----END PGP SIGNATURE-----
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."
+}