4 files changed, 20 insertions, 68 deletions
diff --git a/net-dns/rbldnsd/ChangeLog b/net-dns/rbldnsd/ChangeLog
index 82d8bbbc2e0d..1af342f0b320 100644
--- a/net-dns/rbldnsd/ChangeLog
+++ b/net-dns/rbldnsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/rbldnsd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/rbldnsd/ChangeLog,v 1.33 2015/06/29 04:56:49 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/rbldnsd/ChangeLog,v 1.34 2015/06/29 05:11:30 mjo Exp $
+
+  29 Jun 2015; Michael Orlitzky <mjo@gentoo.org> -files/confd-0.997,
+  -files/initd-0.997:
+  Remove two now-unused init/conf files.
 
   29 Jun 2015; Michael Orlitzky <mjo@gentoo.org> -rbldnsd-0.997.ebuild,
   -rbldnsd-0.997a.ebuild:
diff --git a/net-dns/rbldnsd/Manifest b/net-dns/rbldnsd/Manifest
index ec379ef62577..1e97589dd4c5 100644
--- a/net-dns/rbldnsd/Manifest
+++ b/net-dns/rbldnsd/Manifest
@@ -2,11 +2,9 @@
 Hash: SHA256
 
 AUX confd 635 SHA256 24ec9e68e2f19e27048b37f5cb502e096de5757bb733807dfddac41ecc304eba SHA512 33208edcce5b91f64fa7b60d3fe6798e97464d839ecf2af4af081080706f623ce9bc16ef62a796e0d1e64e726194974d95868723121e1daa208a9df5e6a53a34 WHIRLPOOL b7f73521c3b76a6d4f4271cbd099296086a61b30b11fc43a14115b2cb9c4c6a2e6414cf604dd4dfaa5936016a78528bfb79e529c18fcdaa332e424ccd2ad7f8a
-AUX confd-0.997 994 SHA256 bf4459b36f9caa59c6b4a39514e1590e81bec21328c2af88a71a85041349eefd SHA512 c11b2a6e2784c691f593bcfd2c0ac0f2559eff7970d200fad4f8560c9a13db0840380d83403d6e779fd5f0a126cdbe8676bba8352a10b13f60660f7602cba01b WHIRLPOOL f50d39a2941fea98e19b1abdf24ff888e63ac007df42770918f31d49c2900f0c101f85ec7645d7dd60e7a7f469ac1e8b83bf60e92afa6d3a5db41641e49d930c
 AUX confd-0.997a 1370 SHA256 dc440295d2a45023a1fdf6f1c16fea7b6c0608082b250b1150dc85278e36fac3 SHA512 5518ceeaf6ae674a301c9b77f8a3654bf6f06c65acdf7107b01f165e92c4cd1c290d89060cc4242ef504e790eca42548cef432cbdbd8e9d05685e25adee234db WHIRLPOOL be2ba3f0bb1ffcb840f2d78ec02e95c8b571430856e0697285ffedc1d7b99ded8034a5e99e7290bd79b99078d5aaad573fd3c58257441c0bc7db8396c4c0215a
 AUX example 495 SHA256 716411e82cbfdcf93278f1b66578329ca5f7f91d2dcda51959fd047f1c0454b8 SHA512 114b1eefea2017802291113951e5d9d0288a4c862b4ec7163b01b190aaac1b9748e7454b038320409ecc3975f76b7584c791507ec53c91fe86a61261d918b25c WHIRLPOOL 8b926cb970a5cebadff2e4d551ebe58b452be3e3f482a4c8590c4acbd3158fe7b69b537eaefa61dae9a3a2f9f5384fd1e99ec9a7895f2b9e465e7449c68223b1
 AUX initd 475 SHA256 e1002cc31ba33061916cfe6caf26ed12b5cca6dd77149ad07304642db9218a62 SHA512 afd0e51f1c189d0e234fd15b617a4374fe858608cf1314230ffc24cac69313e771bb295aaadf37f8e18389a8874dc6c491a35d505d8a30b0c04a863621640384 WHIRLPOOL 971b09cf2dfe685a509f1155101c0eaeea8a55e92d16aebda509604fc9feb42ce2899aaa05a1622568f9dc8e6efd663f828d4e95b9b71d63a0155bbeaa9322f2
-AUX initd-0.997 653 SHA256 78b37dbe49cfe4f981e9cce8898cadd06a1586bfb37dce8176bf811bd4948fc8 SHA512 2e40329682c59741bf11abe798dc9524368a625d0ac593f8c4f57979e403a96e08ac245fec350f9f9ecd45d2f6b7f01b1df2c8b6195df98ebfe3e52889e4b26c WHIRLPOOL 8f4d881ff15ac232ec3674edeb3716e07926cf79888822ac5b56c19ee40640a005fcbc6ec3661b87a5fef194e09bd124aaab61a1628d0d0a2df16d78a4a97ea8
 AUX initd-0.997a 651 SHA256 ed11279a20019798cfe23195571b5a5482c102e0bc356a989e74887a353a64e3 SHA512 b5fff4e9c79a497e71171fd4e7c1cbdd644ac641a9f41b88efdafe9f8e49259090776f571ac9fa64b1468001083b7ada06735e2e1104a15b0dabe3e963146a23 WHIRLPOOL 3616d7ad40dbd9c2de9b6837c41ea39263dd63bafbfd55d72cbb3c015db992755e4a6890f10091ef98e004354df438c40c9679f1909922f554f6ab003c114956
 AUX rbldnsd-0.996b-asneeded.patch 305 SHA256 7eb48018e8d4a2784d3766a48a1ad88a3771ab161f90aa96d62f4b154a170817 SHA512 d5acb0e893469967eae6251e5d0698b89cda3e1753f6b7fb06f9c2e22e2df8fd952b682dfd8a4444db2907a4a62367cd4a706629acca015507163fff8bc518af WHIRLPOOL ae906c72875b08d0605df0fb652fa8dcf48fa3964eb01afb7651020da312215ebcadf055fc6a1db6d157b7905bce495fb8745cc2915a84f9b091b73d412067e0
 AUX rbldnsd-0.997a-format-security-compile-fix.patch 914 SHA256 13d806d81dcae2038e1b8542fc0ed19cdd8b42d6be48ab11ff181a1d9cd551d4 SHA512 fe61d08ca56759cbce9e078576b3efd4e0bfa35108ca3921d9aa02d78d8e5fc8bae4ea4c38cc9695379ea28f058facf70978c8aa5ecc7d53742222a28dcbc166 WHIRLPOOL 8e8c8092725adab1a2b7663e04719b876bded4ca7d0c2b9c8e7d2cf1c550a63f2fffa872230ff545a472df190ae9fe1f8e3ca6728f329c30eaaa679e7cbd95a4
@@ -15,24 +13,24 @@ DIST rbldnsd-0.997a.tar.gz 144771 SHA256 9c17c6bde6995058204a66805444039d31523a7
 DIST rbldnsd_0.996b.tar.gz 113128 SHA256 475afe5be8729a76b7c23e2f3d5ce1c773775140406a58bfb7477fac5a528342 SHA512 ff5060d719becd7b1e08cd86f213830a1232774abce3de56599743c9e44b4e3d59e7f9ace18d2619c967038aad728908091efb2ac1591a5ca6c7aa9f84d3a084 WHIRLPOOL 1016bb55746fe772b44705ad65b9153971cc34a737697e3b5d2a0cd8972341e9ecacf8e9c28285a2729c18181891d38569b3b8e5a72e7b3ab6b175d2f123098b
 EBUILD rbldnsd-0.996b.ebuild 1327 SHA256 ee522dc4b3a6cbc22749f4cf3fd1effc5d8c64447a1d40aa4cf39e969d3b54cd SHA512 a3b0d9ac1c0eb773c820af7a5289184329d6cf1f162395bb1442170251e1ac27c14ac214818fc750ddbfc58c527b0fa7175f282bdc6b07493bde8ed0e3fa21d4 WHIRLPOOL 266e696f3ed2d53d46d8fcca7dca4e49a57e8e6f19f1120fbe7827dfba40a7dfdefd0ae4cd8882e5827b45e79b3ad68465703b69dda20af0509ff5b0ca550a53
 EBUILD rbldnsd-0.997a-r1.ebuild 1668 SHA256 f438efbb44f1c8520dfa145938a5de7ce6741847ccdd40e6e64c5df6c92c1982 SHA512 259afcc15137be333c5a636840348f0796726631e4092903d53e79d375cd3c8867bd0d275d4fa777ad231e83538fd0d2b810a6f9ff479124ca324a9b8d5c78a9 WHIRLPOOL a8c8b2310b13add21827af78cf9961e7c862ead6aee5dcda4b5695085a1bde0737616d39d1592a1569cb7c2e5e2e052dec72eef3d3ec169adf2387dd614ce2c3
-MISC ChangeLog 4763 SHA256 d3d774cfeeb4614892b8bc181143c3ea23ca70f0212d8d25a23b88f30c35959f SHA512 38134c5b8a32e4cf6f29af72ada18281682ea524d1bca4f9b217b3d0b7f61afac22dc6ed92a641cf0edf24d6e8c932a43698561e0eef249410b3b01d0434a1a3 WHIRLPOOL 87b761810f1502c8ddc9504793ffe5a00e8a6385d14ca6ffdd1a6701daef3fd6c3b779b94a672a1fdf44bfb46b31ad19a8197a5d691ee10a15af2ee9b7a08a39
+MISC ChangeLog 4896 SHA256 cfaf6b449418bdeda5467e4d826c57ada06a8e67352554f6eca741e6ec14a1cf SHA512 d709d555c6b729121439f9402f07d6408aa33f21f5bf72b0c3f677fc0986e7334ebd4fdb5192884c5ac886e2e33920b9a44531cb662e168517994b269b9199a4 WHIRLPOOL 9513e3a1d1202362ab51db52e0546ef94a2d74d503f402d4051d80da68902c30ca9289637976cee36a466cd20db88fd39bba30fe40ac6e45cbd03593d17c1470
 MISC metadata.xml 1119 SHA256 8c153c63c1d5cb7712b6643a206a70c4ca43923710777b8b09489b0718ec67ff SHA512 0456e0c642454c6242d7ca30477292612436d15c8d94eb513bfa6e957eb9becf4dac871357e74dd2026abf0ea2e99ec61a1d590fbb162f90dcd718bd0e8a43c6 WHIRLPOOL 5354b24ec62d0ec3259bea6f45a3f45816a2b15002f09f2fe7d768e96c68938ec8b634f7b92530ea2ee965211c075803e04c7f3b38535d59874aaaecc3ecc166
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVkNAVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVkNOFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxNEU5RDcyRDdCMUFGREVGQzBCNDFDMUY2
-RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbPdgP/Rt/dFBPkxfDUL3TG9zBEo3e
-qA1YYVgBhtPPpyHOm4r1njjFijzoDRxHDf+RJ0JtheTz111wqpwtaoFgSfYq/WQC
-UiOGkN2XDgqHzIDN78lmaWjVpxFGxa2J+E749Lj1ta4RSzo2Rj2P4X4/aMNygUHQ
-UraFjeF4OUloWewoeGMUDHCs7LEp2bkP13R6tY1JlN95Md+T069YFf7/5ypcHcoq
-fweGXnb3nBpB/O/GVLiS/xZghLIhTWP4gPiNxbT9Pl5EPCxXlwFvz1/CGHEQW7p3
-vMyczZaKYsHmCt72vKiDGJepqtXxzeRICZHbX2wE4rXmR9KdFAONGSLil7SKkN5S
-QSIdPfJ9o7PbPBCVPgniyGzQ49LJXK3MPjSEDflPH5MUSd9VOIL6PMPpWtwjjnpw
-U2T5JI/mfwjBbY6MXzxBdf47PJnSmNvlxpP+t5p2oW6UYpWHVcbVq4+1BFIRMAjV
-DMQ7+WpJTrRB55lGaV8q6YLlHmAemeX1QLPpYi3Ozp/udlWr7L9Q5wuxmYymq/v1
-wpHWCX6omAMGAXgwpwb+vIpfK9+kYhQu26hfo5CH7UjSHQRlmQLdQtJIOwLDjjnr
-R8M4e7cG70K8Xjf7WKmN97lolUnkOl5lsZInj2ffdOxXWXcBvV3HUGnn9xcKNLke
-TGrlntBgCYbiz43Mabpg
-=I2KT
+RjQ4RDNEQTA1QzJEQURCAAoJEG9I09oFwtrbAxMP/0cTG2BnZvj5g4iINzvUz/Gl
+A/9s6UmLMrAud82trrj7UK8R/kLSVCk29dydmcormVuL/8M2s+H89fJ2rtLA1ORO
+4E84vULlaZZUwQ8aeVJ2UTmfYko0afx4kaErICleR/TpdOfXV32Mjspy05d9JlzV
+N6bfxVGCADmohjMbuKQkRe1c4eWJqanewpghwk+ctRWlDt+FfJJcGaIxdHert6rf
+XliAbDwHQjHlH9q8kTTIlI8rpm+gVmkNAIqzaAb2GqXgTViCqZPvaGwzi+LnH8aO
+hcU8zA1BiaTTKGtXlZxKnNpAm0Y8P/XAWtTf9sBqwZ6L6czrXjdtNnu0Fdn4ZMn6
+3mZC8oSOAXkZESb32BL5NxK41O8X2AExa4JGj4iFkBh3ezRqGFYRSyT51xp7Hcem
+Pvafdozba1Aw5xhxQ+G+OOMRCJW3aJnQhwNjVsGzgg1zBEGjbQ+luZr66T2lxbM4
+8XpBt7A/xq9W2OnWwm+1EklNNKDNQt+ItMlEj3uz+uTiRNqrcG7QIOFWtu4/2vdW
+X4j0FIb3wuXn7xymIE8fz+wb44wSFeO5HByYmdPZS4yx8yH+5Ma9H3x+080N2M0B
+imtW/ob7fYGTSDZ6QdeRH7E5trm2ZfzuGPTNH/Rz1on0wNOqD3pV4ZdJhRUtiMf7
+iAx0JaD+Piw3WRIodJPd
+=YOpj
 -----END PGP SIGNATURE-----
diff --git a/net-dns/rbldnsd/files/confd-0.997 b/net-dns/rbldnsd/files/confd-0.997
deleted file mode 100644
index f20b3acdcf53..000000000000
--- a/net-dns/rbldnsd/files/confd-0.997
+++ /dev/null
@@ -1,21 +0,0 @@
-# The addresses on which to listen, as a bash array. The syntax is
-# "host:port", where the port defaults to 53.
-LISTEN=( "127.0.0.1" "192.168.0.1" )
-
-# A list of RBL zones, as a bash array. For the correct syntax, please
-# see the rbldnsd(8) man page. The following $ZONES will look for
-# files named "badguys.example.com" and "spammers.example.net" (in the
-# appropriate format) under /var/db/rbldnsd, and use those same names
-# for the blacklists contained therein.
-ZONES=( "badguys.example.com:ip4set:badguys.example.com"
-        "spammers.example.net:ip4tset:spammers.example.net" )
-
-# Add any additional options for the rbldnsd daemon below. The -a and
-# -vv below are suggested for performance/security reasons. They are
-# described in the man page.
-#
-# The rootdir (-r) and PID (-p) options are passed automatically, with
-# rootdir set to /var/db/rbldnsd (where you should put your zone
-# files). The daemon will run as the rbldns user, which was created by
-# portage.
-OPTIONS="-a -vv"
diff --git a/net-dns/rbldnsd/files/initd-0.997 b/net-dns/rbldnsd/files/initd-0.997
deleted file mode 100644
index 272b1903a06f..000000000000
--- a/net-dns/rbldnsd/files/initd-0.997
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/rbldnsd/files/initd-0.997,v 1.1 2013/07/08 17:08:52 xmw Exp $
-
-depend() {
-    need net
-}
-
-start() {
-    ebegin "Starting rbldnsd"
-
-    start-stop-daemon --start --quiet --pidfile /run/rbldnsd.pid \
-	--exec /usr/sbin/rbldnsd -- \
-	-r /var/db/rbldnsd \
-	-p /run/rbldnsd.pid \
-	${LISTEN[@]/#/-b} \
-	${OPTIONS} \
-	"${ZONES[@]}"
-
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping rbldnsd"
-    start-stop-daemon --stop --quiet --pidfile /run/rbldnsd.pid \
-	--exec /usr/sbin/rbldnsd
-    eend $?
-}