Use default values for the parameters set in conf.d (#176548).

Package-Manager: portage-2.1.2.2

5 files changed, 30 insertions, 24 deletions

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 49a86beb02df..41ed63846758 100644
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/dante
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.36 2007/04/22 00:21:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.37 2007/05/02 19:25:15 mrness Exp $
+
+*dante-1.1.19-r1 (02 May 2007)
+
+  02 May 2007; Alin Năstac <mrness@gentoo.org> files/dante-sockd-init,
+  -dante-1.1.19.ebuild, +dante-1.1.19-r1.ebuild:
+  Use default values for the parameters set in conf.d (#176548).
 
   22 Apr 2007; Alin Năstac <mrness@gentoo.org> dante-1.1.18.ebuild,
   dante-1.1.19.ebuild:
diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 8114d10bd8d9..1f6f5120223c 100644
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -13,10 +13,10 @@ AUX dante-sockd-conf 463 RMD160 037abbc191675c690c7219ffdec738405d1ea669 SHA1 5f
 MD5 eb2041b3f61750335f8702515cb20b7c files/dante-sockd-conf 463
 RMD160 037abbc191675c690c7219ffdec738405d1ea669 files/dante-sockd-conf 463
 SHA256 b22c8261148fcb96cfd8942baa85633a790826a444920f7d87fc23d2dcf18a74 files/dante-sockd-conf 463
-AUX dante-sockd-init 1648 RMD160 6e4471055e95e397c50d9c1b06d83d4d622a6f6c SHA1 28b4da742c78919a42c43fbfe6205df0ea8096ac SHA256 590218f56b0aef0ee04334362d835bb00b8311e646965f6f426409f4e154d9d3
-MD5 e83585fe2c94dacd28e2c2a00e23186d files/dante-sockd-init 1648
-RMD160 6e4471055e95e397c50d9c1b06d83d4d622a6f6c files/dante-sockd-init 1648
-SHA256 590218f56b0aef0ee04334362d835bb00b8311e646965f6f426409f4e154d9d3 files/dante-sockd-init 1648
+AUX dante-sockd-init 1657 RMD160 7de3590d4a1f5e0e586c041cf533755fe0cc4eb4 SHA1 3eb5302906aa7f3e8a4ff787d6774d9615264b43 SHA256 dd86b5bef46c8fa2a80f5093f43d97c1d48c861c309cd62f3ae792d3c76a2f7a
+MD5 8eaa9f5bf3e62ac1182eacae60e9eea6 files/dante-sockd-init 1657
+RMD160 7de3590d4a1f5e0e586c041cf533755fe0cc4eb4 files/dante-sockd-init 1657
+SHA256 dd86b5bef46c8fa2a80f5093f43d97c1d48c861c309cd62f3ae792d3c76a2f7a files/dante-sockd-init 1657
 AUX sockd.conf 7031 RMD160 3ed9c0523eade831f01f867f8fea1889c2f429b6 SHA1 ef6f69870af7167d8b5c73577c0de5a41501d653 SHA256 3ea0e08ee7e5b018d1df1b83af92fb6051fb44a486e0822e28775d104bfcfee7
 MD5 aa0bc92f8670b91aaf92f1e89b7e06c7 files/sockd.conf 7031
 RMD160 3ed9c0523eade831f01f867f8fea1889c2f429b6 files/sockd.conf 7031
@@ -39,14 +39,14 @@ EBUILD dante-1.1.18.ebuild 2233 RMD160 db85f14491a81889448a6b48c8af9470a92b50d3
 MD5 0be1773da343fadff4da46a5580ffdbf dante-1.1.18.ebuild 2233
 RMD160 db85f14491a81889448a6b48c8af9470a92b50d3 dante-1.1.18.ebuild 2233
 SHA256 9f30dbfb7381acd8942c06f661a46bd81f09addaf9d5f137bda3dab69235a4a8 dante-1.1.18.ebuild 2233
-EBUILD dante-1.1.19.ebuild 2295 RMD160 d7374ad90a559d1e9807b3c76f9efc68a781d2fe SHA1 bb5a972f949ec7cbab2c506dcdd8125baa1c1218 SHA256 80c2c6bea5c7645a72589411368ad305e8e6a6854c0dcae8e5b369093d5258fa
-MD5 f8ad21bdc1dd9d98aa1340dcbf801075 dante-1.1.19.ebuild 2295
-RMD160 d7374ad90a559d1e9807b3c76f9efc68a781d2fe dante-1.1.19.ebuild 2295
-SHA256 80c2c6bea5c7645a72589411368ad305e8e6a6854c0dcae8e5b369093d5258fa dante-1.1.19.ebuild 2295
-MISC ChangeLog 11964 RMD160 5825775f68ca36d8bf280afe256e9998160b73f4 SHA1 8c9c5265b557204f7f37f7e93507889666575c78 SHA256 d30d97f7f61323bca504eec18dcfe1b8eec8e24ddd369d588401a7dd1a87fadb
-MD5 4f242b9cca49ec3bff7d14a1fddb1f8a ChangeLog 11964
-RMD160 5825775f68ca36d8bf280afe256e9998160b73f4 ChangeLog 11964
-SHA256 d30d97f7f61323bca504eec18dcfe1b8eec8e24ddd369d588401a7dd1a87fadb ChangeLog 11964
+EBUILD dante-1.1.19-r1.ebuild 2297 RMD160 60c73db9c7b1f100fda5c464fccca94d2ec7b34f SHA1 5bcacff01de1bcee933900569ae852b858777c97 SHA256 33db064dfe9d20086797adfdbef30369bbaac7aa63f0285de4a47f6bda931b32
+MD5 b704466d228897d0aadd933fefdeb27f dante-1.1.19-r1.ebuild 2297
+RMD160 60c73db9c7b1f100fda5c464fccca94d2ec7b34f dante-1.1.19-r1.ebuild 2297
+SHA256 33db064dfe9d20086797adfdbef30369bbaac7aa63f0285de4a47f6bda931b32 dante-1.1.19-r1.ebuild 2297
+MISC ChangeLog 12183 RMD160 8369af7e412f9a766c7f7b1ae1f31b6f73fb8a70 SHA1 b5b6461e696cee202da35c85e33dd254a1db7238 SHA256 9874a686d4eeccfbcd7fd4d3d69db6237732c4dc14e7e5314cdefe33b4e15a21
+MD5 467fc298d3f8f0dc5e94a011ded8af99 ChangeLog 12183
+RMD160 8369af7e412f9a766c7f7b1ae1f31b6f73fb8a70 ChangeLog 12183
+SHA256 9874a686d4eeccfbcd7fd4d3d69db6237732c4dc14e7e5314cdefe33b4e15a21 ChangeLog 12183
 MISC metadata.xml 246 RMD160 bf022485cb8a0289c3151fc974670fd86687d6be SHA1 c68b5b8a31dc103b0e7e8503671910b8bbe419d8 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add
 MD5 19688263fcbda666eeb085869012f86a metadata.xml 246
 RMD160 bf022485cb8a0289c3151fc974670fd86687d6be metadata.xml 246
@@ -54,13 +54,13 @@ SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add metadata
 MD5 bc6ea49149bf211159ef3702d9bf21b7 files/digest-dante-1.1.18 238
 RMD160 ce758e133abec1a6a4f1a18a19ef6f5e0d6135d0 files/digest-dante-1.1.18 238
 SHA256 d7365356ff5fb7dad1c5461c95f0ed2a84c896acde00e45f81080fd657bccb59 files/digest-dante-1.1.18 238
-MD5 7064a4204057e47c9d0d8c0cd909eed6 files/digest-dante-1.1.19 238
-RMD160 68891ef21950c956e5632a093758169bf3e37675 files/digest-dante-1.1.19 238
-SHA256 193ec5e5ad96aa44cbaef288db8d58b1953c1b6140a7d45ff60aa26dc14ccb23 files/digest-dante-1.1.19 238
+MD5 7064a4204057e47c9d0d8c0cd909eed6 files/digest-dante-1.1.19-r1 238
+RMD160 68891ef21950c956e5632a093758169bf3e37675 files/digest-dante-1.1.19-r1 238
+SHA256 193ec5e5ad96aa44cbaef288db8d58b1953c1b6140a7d45ff60aa26dc14ccb23 files/digest-dante-1.1.19-r1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGKqqaJnxX6mF440QRAtpYAJ0fBqTJXAFTphnmcoLfKAvEM+HtIACgujnT
-Qk9EwvHPK4iuIDu87x2zVqI=
-=73Qg
+iD8DBQFGOOWmJnxX6mF440QRAsqyAKDyUtALJA8xt+nlQdTL1vlIYk3M3QCg5/kU
+lh8lnyBiyX6syf02fyoVooM=
+=ALiY
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/dante/dante-1.1.19.ebuild b/net-proxy/dante/dante-1.1.19-r1.ebuild
index 915c6f545542..47955adf4970 100644
--- a/net-proxy/dante/dante-1.1.19.ebuild
+++ b/net-proxy/dante/dante-1.1.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.19.ebuild,v 1.11 2007/04/22 00:21:40 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/dante-1.1.19-r1.ebuild,v 1.1 2007/05/02 19:25:15 mrness Exp $
 
 inherit fixheadtails eutils
 
diff --git a/net-proxy/dante/files/dante-sockd-init b/net-proxy/dante/files/dante-sockd-init
index f24eb76cc23f..6753856fc052 100644
--- a/net-proxy/dante/files/dante-sockd-init
+++ b/net-proxy/dante/files/dante-sockd-init
@@ -1,12 +1,12 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.3 2005/12/24 16:51:23 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.4 2007/05/02 19:25:15 mrness Exp $
 
 SOCKD_OPT="-D"
-[ "${SOCKD_FORKDEPTH}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}"
-[ "${SOCKD_DEBUG}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -d"
-[ "${SOCKD_DISABLE_KEEPALIVE}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -n"
+[ "${SOCKD_FORKDEPTH:-1}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}"
+[ "${SOCKD_DEBUG:-0}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -d"
+[ "${SOCKD_DISABLE_KEEPALIVE:-0}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -n"
 PIDFILE=/var/run/sockd.pid
 
 depend() {
diff --git a/net-proxy/dante/files/digest-dante-1.1.19 b/net-proxy/dante/files/digest-dante-1.1.19-r1
index 0b5e34c982ad..0b5e34c982ad 100644
--- a/net-proxy/dante/files/digest-dante-1.1.19
+++ b/net-proxy/dante/files/digest-dante-1.1.19-r1