[gentoo-commits] dev/bircoph:master commit in: net-proxy/polipo/files/, net-proxy/polipo/

[gentoo-commits] dev/bircoph:master commit in: net-proxy/polipo/files/, net-proxy/polipo/

[Andrew Savchenko]

commit:     b42acab2dce70b082161c6647781274f3b60d14e
Author:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Fri Jan  9 00:01:00 2015 +0000
Commit:     Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Fri Jan  9 00:01:00 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=b42acab2

polipo: update crond file to support multiplexing

---
 net-proxy/polipo/Manifest            |  6 +++---
 net-proxy/polipo/files/polipo.crond  | 31 ++++++++++++++++++++++---------
 net-proxy/polipo/polipo-1.1.1.ebuild |  2 +-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/net-proxy/polipo/Manifest b/net-proxy/polipo/Manifest
index 6338cd4..e337767 100644
--- a/net-proxy/polipo/Manifest
+++ b/net-proxy/polipo/Manifest
@@ -1,10 +1,10 @@
 AUX config 167 SHA256 3b600497508790390eb5413cc53ab04bfe8b083324472732b11847acddc91bda SHA512 a92a738016ed6da4fa47d23b2cfdb5296b0c1a818eabcf319550f62e41ba45d6a9103bd7cd956a417cab3b87d18f16227fd9fbadb95dcc267c3983c61d4bdd00 WHIRLPOOL 216fa4587def4639b05a16d7a53fc96f9ef7bd3a4defd9fd4c7e0e38dd0d7265af7563ffcf710a3bc00ffb702262921aec44a38f8cc152ebecce7a6a4fd4801d
 AUX polipo-1.0.4.1-dns-timeout-fix.patch 1014 SHA256 d4b2faab078439179b6e6d836248927d45bf938a831affbaf3743c107c222a1e SHA512 fa53f2e527264b1ffb629dbbddd042896823777500eca4796db8a62d16d3a1d49fde20c2220934ca2d18968a90a576b7b037c355f8cdcf85ec345a2df023d6c1 WHIRLPOOL ee4be33129840834098e62bde44176533838ec20528a1a4132db83f5cb5ae945826aba2840c15fa4946408e10808ee84a301d144871b58a300a8782042d99773
-AUX polipo.crond 234 SHA256 cab7448361658d34593822893688df11d6f02f8b2927dbbbbe84642b335575d0 SHA512 8981382b65b0bc0cc20258a171066ee9535b4aaa0dad6d1e2b44d42a1ca94b90e78e7d6f0319cc9b07c51b88ca293d9968a7fdfd4e00061c56a612804fdc576f WHIRLPOOL 753584b2baaebfadecb3334cfab43dbbf6488e4b0af9af6b87fa890e21525498c48d6f728c4f7bc616c4c3c0410e3d7d6b066b0a48bef786764bc7e88ca6424e
+AUX polipo.crond 640 SHA256 b17f66c5f8eeb26c698f56458c607dbce8b630257c64c497aa8031d6010a68b3 SHA512 36c13e9790210c378968d9c6958be412fd2f1d2739aab560d8df4064fb92cb2b79dbfcb3e674f285b48eb42a3b2c6226862d1d0f9a6ce28e14de5797d62f1354 WHIRLPOOL 89227fd7a033236fd8255ed1161ba5279d660c2beb2887482bb7ca9844a2fa243752ba07e8491f7e3064490542909bbbc4dfcac19f369e8fb5828e495fa8e8ba
 AUX polipo.initd 1304 SHA256 438b8a9cfccf1ea14314f38e6821454b6da9ae20ea12bf311ad9fa89816cd702 SHA512 d77e7599eb20fe6dabf38cea0eedde255e63b45757fea01c1966c748b88e9d6e33ae51a7f50d9cf65cc32733cd58bb190d67006b089943187a5888c111f6d4de WHIRLPOOL f39743c2bbcfbfa33368d3ac4be780d21762e0696a39f088fb70c4a83ebf539c052495ab000a86ad779fa595b6607c24ed07dd0f502b85ae450c1ba6c302c7ed
 AUX polipo.initd-2 1647 SHA256 8cbf2c48b9c6604e27287d5c12de00800242172fc7b4840eeccc72bcd203d04e SHA512 c1bc6a6a858d961437e066b8b24e0b3ab13df078614524bdbde3dc6744767775105a03b6b544c4b6238b2ff21eb599df5701a57ef64beae3c5aa2bc6f29883fe WHIRLPOOL f31428999d32a1a3039cf202d9fdf1c6b32e149ebbfbadb81d1806ea929863780dd91af966c5463f2ef77d3abb2ea4a926fd9541e7e21429775fa7cf7e3e86c6
 DIST polipo-1.1.1.tar.gz 182891 SHA256 a259750793ab79c491d05fcee5a917faf7d9030fb5d15e05b3704e9c9e4ee015 SHA512 7324ca96c19bf9f089146a12dba349ea8cd2669ee02d0599ed6c6116d11eb0e7cef7830d91d16921ba5cdd0ce06e6f831901832326d8118ebe0a565feeec7fb1 WHIRLPOOL 2904a68cc64500dc6207713e255e49eb6d9fb3d73c0ff80c19b71cf1ae6ceee533b625643c7a177924f4d254deae659cdc4137218ae152582da65d0b933f65e3
-EBUILD polipo-1.1.1.ebuild 1496 SHA256 99301431650e53400195ece8817779b4157c8464cf120987fcfbde7b11e2f75f SHA512 48afd734ad58e9aa26c1e6cbb918b971e7df97e9086893fae10aff775f3e39b6bd1a2780d622a193027f357aacc2ca29b6e267b2f726ae5529e8f3b43fe476f7 WHIRLPOOL e1a5beee9980649a5bc4db953b2cff3260dbbb91785817a074863eabf13858c720ec2a986ae7af2a9917af289f41915da7850d1e0df643be05a5e8c01dec4edf
-EBUILD polipo-9999.ebuild 1496 SHA256 99301431650e53400195ece8817779b4157c8464cf120987fcfbde7b11e2f75f SHA512 48afd734ad58e9aa26c1e6cbb918b971e7df97e9086893fae10aff775f3e39b6bd1a2780d622a193027f357aacc2ca29b6e267b2f726ae5529e8f3b43fe476f7 WHIRLPOOL e1a5beee9980649a5bc4db953b2cff3260dbbb91785817a074863eabf13858c720ec2a986ae7af2a9917af289f41915da7850d1e0df643be05a5e8c01dec4edf
+EBUILD polipo-1.1.1.ebuild 1494 SHA256 ca2d8e4d14c47b65b19f2db88f69b2d43a495342f219e7bfc4f4d6d93be031f1 SHA512 e7dbc9a21b72fd7511004b5e4a0dd6f696047bcf4ca0fd8d7e4869e84418e06c39edb36064c6fb99d44ce2c637ab8e118da9c89d4ba2d628dc9ff658f2e053fc WHIRLPOOL fd1eb278c233ecee096f5e136183abd799b00e172f32ac01815303e900037106cf956be244eade3b5771bec04db75d02ee94fdf63f7365d4a308551237d5ae97
+EBUILD polipo-9999.ebuild 1494 SHA256 ca2d8e4d14c47b65b19f2db88f69b2d43a495342f219e7bfc4f4d6d93be031f1 SHA512 e7dbc9a21b72fd7511004b5e4a0dd6f696047bcf4ca0fd8d7e4869e84418e06c39edb36064c6fb99d44ce2c637ab8e118da9c89d4ba2d628dc9ff658f2e053fc WHIRLPOOL fd1eb278c233ecee096f5e136183abd799b00e172f32ac01815303e900037106cf956be244eade3b5771bec04db75d02ee94fdf63f7365d4a308551237d5ae97
 MISC ChangeLog 7025 SHA256 9fd3eebbeebb0fecdac47a5312d2c63ab5c7625a45f9d9fb461a28659a957f59 SHA512 d38e37648d156ed780ed691905406442a1f115fa0bad69ce1aa2d377a466c3601f3169b3e0cd3870d27d630ed6ce2726e1e8a7879fc2577b09d36332d1d5df7d WHIRLPOOL 753b5678632773b9eb57d6bae74e9e94e4138c74349ffdefb9c55a22e5e3c480ce11d3802d92f2e694d38e5536a4f3eed9243fd7495984c3177f45e37e9fed7a
 MISC metadata.xml 336 SHA256 3af44f3e92b59a2e1db07127cb5e9d3dd5ec3dd29a2516961d7f76c431f0c353 SHA512 cdb114c52d849db414b8a67c628fd78283711ea5f0194f81e82085e598b3e40b05362118cf3968e39a6ec0623f9c47c333194b134c9ce84daf4b50e7150017ae WHIRLPOOL 93cf2b3d9af9c97379ef0ca5883d13e5eb5c07cbc6efdbf109bef6fd60bd525c8bb763ca69f6268bea4dd79b22663bc8bb9a3ee600fd81c22a87c3e53c565517

diff --git a/net-proxy/polipo/files/polipo.crond b/net-proxy/polipo/files/polipo.crond
index 2bda2cc..6b2d609 100644
--- a/net-proxy/polipo/files/polipo.crond
+++ b/net-proxy/polipo/files/polipo.crond
@@ -1,9 +1,22 @@
-#!/bin/sh
-
-if /etc/init.d/polipo --quiet status; then
-	#Expire old cached objects
-	kill -USR1 $(cat /var/run/polipo.pid)
-	sleep 1
-	nice -n 15 su -s "/bin/sh" -c "polipo -x" polipo > /dev/null
-	kill -USR2 $(cat /var/run/polipo.pid)
-fi
+#!/bin/bash
+
+# Loop through all init.d instances
+for f in /etc/init.d/polipo*; do
+    # only proceed if daemon is running
+    "${f}" --quiet status || continue
+
+    myname="${f#/etc/init.d/polipo}"
+    conffile="/etc/polipo/config${myname}"
+    pidfile="/var/run/polipo${myname}.pid"
+
+    # check if disk cache is enabled
+    polipo -v -c "${CONFFILE}" |
+        awk '$1 ~ /diskCacheRoot/ { if ($3 == "(none)") exit 1}' ||
+        continue
+
+    # Expire old cached objects
+    kill -USR1 $(cat "${pidfile}")
+    sleep 1
+    nice -n 15 su -s "/bin/sh" -c "polipo -c ${conffile} -x" polipo > /dev/null
+    kill -USR2 $(cat "${pidfile}")
+done

diff --git a/net-proxy/polipo/polipo-1.1.1.ebuild b/net-proxy/polipo/polipo-1.1.1.ebuild
index 5d1a10e..38e84bc 100644
--- a/net-proxy/polipo/polipo-1.1.1.ebuild
+++ b/net-proxy/polipo/polipo-1.1.1.ebuild
@@ -39,7 +39,7 @@ src_install() {
 
 	newinitd "${FILESDIR}/${PN}.initd-2" ${PN}
 	insinto /etc/${PN} ; doins "${FILESDIR}/config"
-	exeinto /etc/cron.daily ; newexe "${FILESDIR}/${PN}.crond" ${PN}.sh
+	exeinto /etc/cron.weekly ; newexe "${FILESDIR}/${PN}.crond" ${PN}
 
 	dodoc CHANGES README
 	dohtml html/*