diff options
author | Maurice van der Pot <griffon26@gentoo.org> | 2007-07-10 18:25:50 +0000 |
---|---|---|
committer | Maurice van der Pot <griffon26@gentoo.org> | 2007-07-10 18:25:50 +0000 |
commit | c9d2978757cb5b4e88baa5de029c3c3f62d40c04 (patch) | |
tree | d2d3973e71728a40c5c4c2a1b6b2d8170ab6b97e /net-proxy | |
parent | whitespace (diff) | |
download | historical-c9d2978757cb5b4e88baa5de029c3c3f62d40c04.tar.gz historical-c9d2978757cb5b4e88baa5de029c3c3f62d40c04.tar.bz2 historical-c9d2978757cb5b4e88baa5de029c3c3f62d40c04.zip |
Patch http-replicator to ignore SIGHUP as a work-around for bug #177428.
Package-Manager: portage-2.1.3_rc5
Diffstat (limited to 'net-proxy')
-rw-r--r-- | net-proxy/http-replicator/ChangeLog | 10 | ||||
-rw-r--r-- | net-proxy/http-replicator/Manifest | 36 | ||||
-rw-r--r-- | net-proxy/http-replicator/files/http-replicator-3.0-sighup.patch | 20 | ||||
-rwxr-xr-x | net-proxy/http-replicator/files/http-replicator-3.0.init | 7 | ||||
-rw-r--r-- | net-proxy/http-replicator/http-replicator-3.0.ebuild | 5 |
5 files changed, 56 insertions, 22 deletions
diff --git a/net-proxy/http-replicator/ChangeLog b/net-proxy/http-replicator/ChangeLog index 7abc8d3b1a11..a21b7450c026 100644 --- a/net-proxy/http-replicator/ChangeLog +++ b/net-proxy/http-replicator/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-proxy/http-replicator # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/ChangeLog,v 1.14 2007/04/22 00:24:03 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/ChangeLog,v 1.15 2007/07/10 18:25:50 griffon26 Exp $ + + 10 Jul 2007; Maurice van der Pot <griffon26@gentoo.org> + +files/http-replicator-3.0-sighup.patch, files/http-replicator-3.0.init, + http-replicator-3.0.ebuild: + Slight changes to init script as well as a patch to ignore SIGHUP to prevent + the daemon from exiting right away when http-replicator is started at boot + time. This is a work-around for bug #177428 until the next version of + http-replicator, which is a rewrite, is released. 22 Apr 2007; Alin Năstac <mrness@gentoo.org> http-replicator-3.0.ebuild: Use newinitd and newconfd (#174266). diff --git a/net-proxy/http-replicator/Manifest b/net-proxy/http-replicator/Manifest index 4479163cd932..3fc453f14272 100644 --- a/net-proxy/http-replicator/Manifest +++ b/net-proxy/http-replicator/Manifest @@ -13,23 +13,27 @@ AUX http-replicator-3.0-repcacheman-0.33 6225 RMD160 a655250dd747beb6fe5cd3cb58c MD5 20a9fbec924f5e4ade7b3e98009e3560 files/http-replicator-3.0-repcacheman-0.33 6225 RMD160 a655250dd747beb6fe5cd3cb58cb85a924756905 files/http-replicator-3.0-repcacheman-0.33 6225 SHA256 abdce2b0f307c7ae3dad6caee6b7f032696c0ce1fab98cc8f7a952ce4f53293b files/http-replicator-3.0-repcacheman-0.33 6225 +AUX http-replicator-3.0-sighup.patch 998 RMD160 e8ebcc4ae54764f7ea939273a898ede18066ca87 SHA1 dc009dc57ca654c0190b9c726bd2879fb2ed8934 SHA256 71038c1f0e601bdbc20693d4928afdd13366a48786cf068b58711e097bfcce76 +MD5 fad25749aa104d55641b2b0e885e6322 files/http-replicator-3.0-sighup.patch 998 +RMD160 e8ebcc4ae54764f7ea939273a898ede18066ca87 files/http-replicator-3.0-sighup.patch 998 +SHA256 71038c1f0e601bdbc20693d4928afdd13366a48786cf068b58711e097bfcce76 files/http-replicator-3.0-sighup.patch 998 AUX http-replicator-3.0.conf 1703 RMD160 e19f0a09ceee797b0839e69efa9a9c080193786c SHA1 d6643b7ccc4e754193cb5dcd5f3fba38f6b7657d SHA256 7e44944e51b6c3fdde6bdc610e0d09d43a8e27fb41d97c37917a7150f144fad4 MD5 ba1bdb64c5a2a89f25600f0d02104876 files/http-replicator-3.0.conf 1703 RMD160 e19f0a09ceee797b0839e69efa9a9c080193786c files/http-replicator-3.0.conf 1703 SHA256 7e44944e51b6c3fdde6bdc610e0d09d43a8e27fb41d97c37917a7150f144fad4 files/http-replicator-3.0.conf 1703 -AUX http-replicator-3.0.init 778 RMD160 e9a5a4446337e661a9ce617f08e9faf4b2cf28a2 SHA1 6977824475facd443cfe2ba240ec27c5f7daf65d SHA256 30da166d076e3087d03458623b2b4888048e01f8c268464818820debba601cf6 -MD5 b33593510641bdee7731d17d5788d521 files/http-replicator-3.0.init 778 -RMD160 e9a5a4446337e661a9ce617f08e9faf4b2cf28a2 files/http-replicator-3.0.init 778 -SHA256 30da166d076e3087d03458623b2b4888048e01f8c268464818820debba601cf6 files/http-replicator-3.0.init 778 +AUX http-replicator-3.0.init 762 RMD160 03e486936fd711a8cf9bfd629407d9a120e579fd SHA1 4c0ee55a4d3cba72499fe9fbb8a0c92c5c02ba47 SHA256 63e64c4e55b3395619aab3fa3154255d36144af371d4ea0789884148845e2cdb +MD5 2a2f7f4272ef7e8e1bfe171b0c2d7c1f files/http-replicator-3.0.init 762 +RMD160 03e486936fd711a8cf9bfd629407d9a120e579fd files/http-replicator-3.0.init 762 +SHA256 63e64c4e55b3395619aab3fa3154255d36144af371d4ea0789884148845e2cdb files/http-replicator-3.0.init 762 DIST http-replicator_3.0.tar.gz 19481 RMD160 cb26c8e55df3dfbbf20bb08f62f3d0ac89191e68 SHA1 0af80e4de264c80b66c0a616af999da420df771f SHA256 a7499b980531636d349ce2cace14692fed2e747d23ad0c48cbc68b84369e2d98 -EBUILD http-replicator-3.0.ebuild 1860 RMD160 b26630a31c5727d1b1985ec64553ac0ada5c852c SHA1 ef8a90444f52ad8ec4b6bffc9c0695d9e0329558 SHA256 18e130f605e0b43dd03d12559ef28b2b29f00cfc9bf5b619ad7a5a6ea27329fb -MD5 b0ca456bfb459d545a3355f4482e56ce http-replicator-3.0.ebuild 1860 -RMD160 b26630a31c5727d1b1985ec64553ac0ada5c852c http-replicator-3.0.ebuild 1860 -SHA256 18e130f605e0b43dd03d12559ef28b2b29f00cfc9bf5b619ad7a5a6ea27329fb http-replicator-3.0.ebuild 1860 -MISC ChangeLog 2434 RMD160 82aeb651eba1c0fdb7da3b266c30dadc7e664a5a SHA1 7165893bb4ef8d5d56eac00e3e424c6e03097a91 SHA256 433ea6976a706275aa5913d6d59c8bd76dd52a1003171938c9e95482c5a2c212 -MD5 2b4c8690304ca842c1d3a9261e04a1e0 ChangeLog 2434 -RMD160 82aeb651eba1c0fdb7da3b266c30dadc7e664a5a ChangeLog 2434 -SHA256 433ea6976a706275aa5913d6d59c8bd76dd52a1003171938c9e95482c5a2c212 ChangeLog 2434 +EBUILD http-replicator-3.0.ebuild 1934 RMD160 5bcab6349c368ce716a0fa2bac5a95351abc3689 SHA1 ba089cd2ac3aba4989b5775c15ad618c9f6c10f3 SHA256 ddccc53fdb5b54721fc400c51b73015cc003dbf88680c75342ef02429978c0b4 +MD5 64dbcc61014037b1de10b260d4314cf5 http-replicator-3.0.ebuild 1934 +RMD160 5bcab6349c368ce716a0fa2bac5a95351abc3689 http-replicator-3.0.ebuild 1934 +SHA256 ddccc53fdb5b54721fc400c51b73015cc003dbf88680c75342ef02429978c0b4 http-replicator-3.0.ebuild 1934 +MISC ChangeLog 2881 RMD160 3b0065c9ffda336619f2426527bd75b784c1d776 SHA1 9508c390929aed86cabc6ddf5158562c0af88f54 SHA256 8b8b18e1e0bcdf51d341e3f4ecb1507beafa8366c8cd1d106ab88d8aba66d360 +MD5 ff2ca16a07abb3e6ddcc815baf88a5b3 ChangeLog 2881 +RMD160 3b0065c9ffda336619f2426527bd75b784c1d776 ChangeLog 2881 +SHA256 8b8b18e1e0bcdf51d341e3f4ecb1507beafa8366c8cd1d106ab88d8aba66d360 ChangeLog 2881 MISC metadata.xml 227 RMD160 125266cd9f70c3363b95f8cafb269831182e64fd SHA1 c915ed723f874f24c32b96f22778390715e60d77 SHA256 4a4ffece3d4de0d1311ec96e7001a11e40cf3558d0aab7ed5ea0d3a6b29fbb34 MD5 eae37ad8073b8190842199931528eecc metadata.xml 227 RMD160 125266cd9f70c3363b95f8cafb269831182e64fd metadata.xml 227 @@ -38,9 +42,9 @@ MD5 2b88869ff8557ffc40a86e2038eefbcb files/digest-http-replicator-3.0 256 RMD160 6c0895be4847cec1873c855a6fb04ff70b6a8369 files/digest-http-replicator-3.0 256 SHA256 5ae4510802aa59aeea1329df4a82b4ab0370f0ffa9ddabe84f55c51e55e946ce files/digest-http-replicator-3.0 256 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) +Version: GnuPG v2.0.4 (GNU/Linux) -iD8DBQFGKqsoJnxX6mF440QRAq1lAKD+SWJN6OdZrCGpEXxNzqZ19PlZuACbB0Wa -WGeTeSUSKuMW7VDL63dGvNY= -=zh7k +iD8DBQFGk885MGnpIbeahxwRAiMTAJ9/KHlWubi9dNXJpmfqtgNqaFMcjwCgqQhc +q8y8BVvm4XQg+Xz7quJ1eAE= +=8OTc -----END PGP SIGNATURE----- diff --git a/net-proxy/http-replicator/files/http-replicator-3.0-sighup.patch b/net-proxy/http-replicator/files/http-replicator-3.0-sighup.patch new file mode 100644 index 000000000000..11ccca7d70e3 --- /dev/null +++ b/net-proxy/http-replicator/files/http-replicator-3.0-sighup.patch @@ -0,0 +1,20 @@ +--- /usr/bin/http-replicator 2007-07-09 20:09:44.000000000 +0200 ++++ http-replicator 2007-07-09 20:11:48.433913445 +0200 +@@ -5,7 +5,7 @@ + # Because of this the server runs as a single process, multiplexing I/O with its various client and server connections within a single process/thread. + # According to the readme <http://www.nightmare.com/medusa/README.html> this means it is capable of smoother and higher performance than most other servers, while placing a dramatically reduced load on the server machine. + +-import asyncore, socket, os, time, calendar, sys, re, optparse, logging ++import asyncore, socket, os, time, calendar, sys, re, optparse, logging, signal + + # LISTENER + # +@@ -636,6 +636,8 @@ + pidfile.write(str(pid)) # store child's pid + pidfile.close() + return ++ else: ++ signal.signal(signal.SIGHUP, signal.SIG_IGN) + else: + handler = logging.StreamHandler(sys.stdout) # log to stdout + handler.setFormatter(logging.Formatter('%(levelname)s: %(name)s %(message)s')) diff --git a/net-proxy/http-replicator/files/http-replicator-3.0.init b/net-proxy/http-replicator/files/http-replicator-3.0.init index c2a7a33215ca..b9b3718f6305 100755 --- a/net-proxy/http-replicator/files/http-replicator-3.0.init +++ b/net-proxy/http-replicator/files/http-replicator-3.0.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/files/http-replicator-3.0.init,v 1.1 2005/06/02 06:33:24 griffon26 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/files/http-replicator-3.0.init,v 1.2 2007/07/10 18:25:50 griffon26 Exp $ depend() { need net @@ -10,13 +10,12 @@ depend() { start() { ebegin "Starting Http-Replicator" start-stop-daemon --start --pidfile /var/run/http-replicator.pid --name http-replicator \ - --startas /usr/bin/http-replicator -- -s -f --pid /var/run/http-replicator.pid --daemon $DAEMON_OPTS + --exec /usr/bin/http-replicator -- -s -f --pid /var/run/http-replicator.pid --daemon $DAEMON_OPTS eend $? "Failed to start Http-Replicator" } stop() { ebegin "Stopping Http-Replicator" - start-stop-daemon --stop --pidfile /var/run/http-replicator.pid --name http-replicator \ - --signal 2 --oknodo + start-stop-daemon --stop --pidfile /var/run/http-replicator.pid --name http-replicator --signal 2 eend $? "Failed to stop Http-Replicator" } diff --git a/net-proxy/http-replicator/http-replicator-3.0.ebuild b/net-proxy/http-replicator/http-replicator-3.0.ebuild index 5d473d06806c..15cc2b95b71b 100644 --- a/net-proxy/http-replicator/http-replicator-3.0.ebuild +++ b/net-proxy/http-replicator/http-replicator-3.0.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/http-replicator-3.0.ebuild,v 1.16 2007/04/22 00:24:03 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/http-replicator-3.0.ebuild,v 1.17 2007/07/10 18:25:50 griffon26 Exp $ + +inherit eutils DESCRIPTION="Proxy cache for Gentoo packages" HOMEPAGE="http://gertjan.freezope.org/replicator/" @@ -14,6 +16,7 @@ IUSE="" DEPEND=">=dev-lang/python-2.3" src_compile() { + epatch "${FILESDIR}/http-replicator-3.0-sighup.patch" einfo "No compilation necessary" } |