Force revbump in stable tree to fix broken init script per bug #375301

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 28 insertions, 226 deletions

diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog
index 6ece8764e89f..7d1eed94227b 100644
--- a/www-servers/lighttpd/ChangeLog
+++ b/www-servers/lighttpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.259 2011/09/26 17:08:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.260 2011/09/27 00:53:18 hwoarang Exp $
+
+*lighttpd-1.4.29-r3 (27 Sep 2011)
+
+  27 Sep 2011; Markos Chandras <hwoarang@gentoo.org>
+  -lighttpd-1.4.29-r1.ebuild, -lighttpd-1.4.29-r2.ebuild,
+  +lighttpd-1.4.29-r3.ebuild, files/lighttpd.initd:
+  Force revbump in stable tree to fix broken init script per bug #375301
 
   26 Sep 2011; Markos Chandras <hwoarang@gentoo.org> lighttpd-1.4.29-r2.ebuild,
   +files/lighttpd-1.4.29-ssl-no-ecdh.patch:
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 78556f3b64ca..ccf39379b5e6 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -13,7 +13,7 @@ AUX lighttpd-1.4.28-detect-libev.patch 441 RMD160 e65051bd918d784d3333dd0f6cde2c
 AUX lighttpd-1.4.29-mod_uploadprogress.patch 22472 RMD160 595f07b55bbfac3d9fc41888f3e057a9e54bc1eb SHA1 c55e5eb72ebec2f933bdf9e2061fbeb47a72ba11 SHA256 b7b13ae1de4bbe2cf2687686ae4921d4ae2f66fc524703b3c63924b6d888934f
 AUX lighttpd-1.4.29-ssl-no-ecdh.patch 352 RMD160 bc56bda005d2913189634e9712b525380ac56f10 SHA1 4d40845ffe65aaa070a79248cf11cfe1f893242d SHA256 2d01aa866d0c9843b51bf2c9b1f01d495f5febe9a0a7fd39fabf4cb695336d60
 AUX lighttpd.confd 383 RMD160 e7b5d446dcbb55c7855706aa566bf87ab0bad911 SHA1 c300230745dd060dc2b16000270dd33def6df6a7 SHA256 bb6e6721f33e6582a91025f3500e159a599fb856d699e9394093e1018c7925e0
-AUX lighttpd.initd 1613 RMD160 36487d7720533fc67b8d7a0758a8cf2c4d9dd6c7 SHA1 34f007511bdcf71ff52f7bdf80f30faff21265d3 SHA256 1ba2e9008b2788ab39aa1cc84e42d87fad3df493ec4406a7ee16af621415d609
+AUX lighttpd.initd 1599 RMD160 913d21a360cf2e74bfbaabb4ac8568dbbcb58693 SHA1 979c70ce5af081e71741f231c0001731bf7ac122 SHA256 c6142438381506a38f930c2a0a50622cf1c52df4ae80a754c117c8634866c287
 AUX lighttpd.initd-1.4.13-r3 1454 RMD160 287b7b5626559f61b17e113ca00ef0cee6c63962 SHA1 e9a0f6880e03db27082177634d9974bb7f4b3406 SHA256 9dfda47a18f3e7beada18cfec37b39c66d3029b6bde42c538d82cd1292c7616a
 AUX lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c SHA1 24e1b048d7be5520ca5ef8ce31b55df13cc8d72b SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c
 AUX spawn-fcgi.confd 1076 RMD160 9468249fdedc39fa762a569622bae93f8b3481f9 SHA1 81bad945fc016275873e01e5f69838f73b275a3a SHA256 bfa452a849165f921a2febf0b06879db18c4c921f156b1452d06bb821063f768
@@ -31,24 +31,23 @@ EBUILD lighttpd-1.4.26.ebuild 5770 RMD160 163db40627952a781db876216682589e7e4937
 EBUILD lighttpd-1.4.28-r1.ebuild 5739 RMD160 39f13a4f941e4f54f2ce1e15972c7df3327af6f0 SHA1 61b83b7f7f38a7868f552ab8c48905ffdc9dc022 SHA256 9a905d74a2367e00c00708efb099755a9614c6e6b5896726f05f9e405195e50f
 EBUILD lighttpd-1.4.28-r2.ebuild 5724 RMD160 010553db292467d43cfbbd06549f0e13004cc6c6 SHA1 537d4b521740bcface141649dbce3df0048af7cb SHA256 0e19a6c294ea24f88a99a8f1f5425eda89596d60176c7920a3ab0d90efc3c73f
 EBUILD lighttpd-1.4.28.ebuild 5676 RMD160 551c7b19158096b60f350f8db80ac6e61312af42 SHA1 005e0a5ed111b6cda8eb22c9cff9280e4542d3eb SHA256 8fb37b0afc97e260ffda15acc288f8e75418b84cfab9de0a9d62fc1a91f83bac
-EBUILD lighttpd-1.4.29-r1.ebuild 5929 RMD160 26b52584e2efdaf44f570ec15eb1b169bd1935b5 SHA1 b97d318ecdf9e6408c59a5f86383a9dcf7fea2ca SHA256 bc84cd09962cfe20fcc692fa3cca22caf5b163d8165f39fba4867a08999924ae
-EBUILD lighttpd-1.4.29-r2.ebuild 6533 RMD160 480c5d5ec8963cfb4c127a2f54ae7f725f7c1c6b SHA1 0e79a3966088167c30de2057b6c172f5789441a8 SHA256 467646a1f58d92f204d5f8ce4a54cdc8649731dae441415fa65c3773c26fec0c
-MISC ChangeLog 55406 RMD160 9670329d4479c3c2725abd93ca9224810dae38e7 SHA1 98270ad8e66a7894f8688d0984547034120fe96d SHA256 a90c6eaa6db1d581f64f5abca73fc28512e681a93a727319d567e0c20c37ca38
+EBUILD lighttpd-1.4.29-r3.ebuild 6533 RMD160 96ba4629661fd091faf988edcf7257cde87c836e SHA1 83933b913016e23de6f44da474e424d707adab48 SHA256 f436fea8798768011aa452b0c97a631f350a06c9371bca5cf48072d336952946
+MISC ChangeLog 55678 RMD160 f52e6c4373a10ba74ff10925570e41fe5e09db3c SHA1 c6200db5b29d6192d5506bc93f95b83533a70fce SHA256 76a2fe8cc139fa32658901816e34082a76d46317b2ed62f0973310c365d4b0ef
 MISC metadata.xml 1193 RMD160 1fdffaaf6f865686842c2328277899a20c3ff4f1 SHA1 4c92866074579331b95b656e3eed56a5fd698c37 SHA256 bd3dbe66a93023547bd9cc688b51c050a1184d4a18d40f82171c5ca76757424e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOgLFwAAoJEPqDWhW0r/LCWMEQAMKbIzOZNscZfNFp18mDPmit
-qR2EuTYx/PQPzTmsGioXAZXrkc29FQ4tfe6JBabFtmj85owVgAwqqC8dvicfhbsA
-mupU4vA9d+d7QP9gHeVM+Jwk7xW/T+BkaKOgi+/mx/e87jF517bXe3pv6Si+Ux8c
-MyszEmk5eeHQhaW+oXvY0hk6N3kUDqWI6g0Ln1Ws5tDBROM9y5SWQ5VAvgqsST3j
-Lq4cPx7C8CM9nVWdn+ve4ZvjW6gteAbMzD0LFBPd8XFIMCCIFlJY0aSOQ73kxm+H
-M9n3r5LRXjttQrotQfn34+EMKLGgZLk0eM48rQz99d/7k0h42JTfr/JKEzagTUzv
-dGV59piHI1FdVKHA8fIiQ+dFOsMkWYKYELHC0199n4hfZOh8tVTJiAasZNNZMISE
-hzuWfRzXZ/h2+h9gy3krt9XFICgDfe1NwoOqMUSxQriYDWUIRQ0E0ueaevXwwiRO
-/8sPBloqjWBjUacOez7ndDep2/GcEI1TugELGrGJrW0nxZZrhAohGOblEbvYR7Ec
-6f7CBluPgmWbrW3EVd4/UKOTdlkuLtyz5HvVufxQ6YCQznvflwzWu0sNVFRR147o
-/vpCfpBSyq/KPw29qxirZutoH09T3AvjOLFbs3gE4AgAjCU9PvFN1O7QlLgj05Cx
-awxwpzrFTLz7NrhGXl67
-=k0HI
+iQIcBAEBCgAGBQJOgR6CAAoJEPqDWhW0r/LCT0IP/3moFo6H/mMCFXGNwbFIaliB
+sVVXGbHE77Zf3i/qW6jOaNEYP+8Xr92X6d53YGWmY6U6WiBtppAkAM+tinTQi3fe
+GitItwa8MMzyLAUpr1VKwXbbt9mQco8jOUPxR31fGncZFUPNt245g6JMyPlNDmPj
+vHm2wIHCCJqMqYpvaJpxlzUrxdy6ycSzubrFzMVTA4+qfnIMaKN7oO5+tsLVtPTb
+cNVfmY63BkZJ0BZ0EWLKOjUkZ/thz0uhIudCC7lUVu/U9VU5MxK/CtWgijraf6mo
+985k7xPNKPACvLeLcLh84dQOmmpgrH7tPFrUaFATDrzqn+WaXbtVgRAmzlnw0dMp
+CO/es6ZHyAAtERthZSlwXtGkf4KeZHzHlPApnoDDx7onvIpBMjv3xqigmEvSIwl9
+LvzCZR9uvmS5Yv8/9fhAuWEAXlr0MeoEgtsTP0NFxAP/6f8lvwxcmBSxCQhEAaY2
+NgEugTsw+ZCYOqXt08O9Mce+QjRTe5lbQxw+Qbg7nMAc1RtG+zVL/r6F9rdRUJHd
+xd6W3m3GKf1PnpyAWiDqR5/qWTOLzaXhGo7TEhhRw3+TUkp2TF/bfB/3UBNriPZe
+QkQ94xE1P98IJXgLV2gXKSEOT95twNRcTcA2CJuVX8+olkhhYtQ87FKx7EXq4t5R
+jmm+mfp83uY0n2Nnjp8q
+=oSDO
 -----END PGP SIGNATURE-----
diff --git a/www-servers/lighttpd/files/lighttpd.initd b/www-servers/lighttpd/files/lighttpd.initd
index 5d61cbb2589d..908e17619369 100644
--- a/www-servers/lighttpd/files/lighttpd.initd
+++ b/www-servers/lighttpd/files/lighttpd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.18 2011/09/19 17:05:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd,v 1.19 2011/09/27 00:53:18 hwoarang Exp $
 
 opts="reload graceful"
 
@@ -50,7 +50,7 @@ reload() {
 	checkconfig || return 1
 
 	ebegin "Re-opening lighttpd log files"
-	start-stop-daemon --stop --quiet --pidfile "${LIGHTTPD_PID}" \
+	start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \
 		--signal HUP
 	eend $?
 }
@@ -63,7 +63,7 @@ graceful() {
 	checkconfig || return 1
 
 	ebegin "Gracefully stopping lighttpd"
-	start-stop-daemon --stop --quiet --pidfile "${LIGHTTPD_PID}" \
+	start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \
 		--signal INT
 	if eend $? ; then
 		rm -f "${LIGHTTPD_PID}"
diff --git a/www-servers/lighttpd/lighttpd-1.4.29-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.29-r1.ebuild
deleted file mode 100644
index d19108ead77f..000000000000
--- a/www-servers/lighttpd/lighttpd-1.4.29-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29-r1.ebuild,v 1.1 2011/07/04 17:48:20 hwoarang Exp $
-
-EAPI="4"
-
-inherit base autotools eutils depend.php
-
-DESCRIPTION="Lightweight high-performance web server"
-HOMEPAGE="http://www.lighttpd.net/"
-SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr zlib"
-
-REQUIRED_USE="kerberos? ( ssl )"
-
-RDEPEND="
-	bzip2?    ( app-arch/bzip2 )
-	fam?      ( virtual/fam )
-	gdbm?     ( sys-libs/gdbm )
-	ldap?     ( >=net-nds/openldap-2.1.26 )
-	libev?    ( >=dev-libs/libev-4.01 )
-	lua?      ( >=dev-lang/lua-5.1 )
-	memcache? ( dev-libs/libmemcache )
-	mysql?    ( >=virtual/mysql-4.0 )
-	pcre?     ( >=dev-libs/libpcre-3.1 )
-	php?      ( dev-lang/php[cgi] )
-	rrdtool?  ( net-analyzer/rrdtool )
-	ssl?    ( >=dev-libs/openssl-0.9.7[kerberos?] )
-	webdav? (
-		dev-libs/libxml2
-		>=dev-db/sqlite-3
-		sys-fs/e2fsprogs
-	)
-	xattr? ( kernel_linux? ( sys-apps/attr ) )
-	zlib? (	>=sys-libs/zlib-1.1 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc?  ( dev-python/docutils )
-	test? (
-		virtual/perl-Test-Harness
-		dev-libs/fcgi
-	)"
-
-# update certain parts of lighttpd.conf based on conditionals
-update_config() {
-	local config="${D}/etc/lighttpd/lighttpd.conf"
-
-	# enable php/mod_fastcgi settings
-	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
-
-	# enable stat() caching
-	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
-
-	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
-	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
-}
-
-# remove non-essential stuff (for USE=minimal)
-remove_non_essential() {
-	local libdir="${D}/usr/$(get_libdir)/${PN}"
-
-	# text docs
-	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
-
-	# non-essential modules
-	rm -f \
-		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.*
-
-	# allow users to keep some based on USE flags
-	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
-	use webdav  || rm -f ${libdir}/mod_webdav.*
-	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
-	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
-	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
-	use zlib    || rm -f ${libdir}/mod_compress.*
-}
-
-pkg_setup() {
-	if ! use pcre ; then
-		ewarn "It is highly recommended that you build ${PN}"
-		ewarn "with perl regular expressions support via USE=pcre."
-		ewarn "Otherwise you lose support for some core options such"
-		ewarn "as conditionals and modules such as mod_re{write,direct}"
-		ewarn "and mod_ssi."
-	fi
-
-	enewgroup lighttpd
-	enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
-}
-
-src_prepare() {
-	base_src_prepare
-	#dev-python/docutils installs rst2html.py not rst2html
-	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
-		die "sed doc/Makefile.am failed"
-	eautoreconf
-}
-src_configure() {
-	econf --libdir=/usr/$(get_libdir)/${PN} \
-		--enable-lfs \
-		$(use_enable ipv6) \
-		$(use_with bzip2) \
-		$(use_with fam) \
-		$(use_with gdbm) \
-		$(use_with kerberos kerberos5) \
-		$(use_with ldap) \
-		$(use_with libev) \
-		$(use_with lua) \
-		$(use_with memcache) \
-		$(use_with mysql) \
-		$(use_with pcre) \
-		$(use_with ssl openssl) \
-		$(use_with webdav webdav-props) \
-		$(use_with webdav webdav-locks) \
-		$(use_with xattr attr) \
-		$(use_with zlib)
-}
-
-src_compile() {
-	emake || die "emake failed"
-
-	if use doc ; then
-		einfo "Building HTML documentation"
-		cd doc
-		emake html || die "failed to build HTML documentation"
-	fi
-}
-
-src_test() {
-	if [[ ${EUID} -eq 0 ]]; then
-		default_src_test
-	else
-		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# init script stuff
-	newinitd "${FILESDIR}"/lighttpd.initd lighttpd || die
-	newconfd "${FILESDIR}"/lighttpd.confd lighttpd || die
-	use fam && has_version app-admin/fam && \
-		sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd
-
-	# configs
-	insinto /etc/lighttpd
-	doins "${FILESDIR}"/conf/lighttpd.conf
-	doins "${FILESDIR}"/conf/mime-types.conf
-	doins "${FILESDIR}"/conf/mod_cgi.conf
-	doins "${FILESDIR}"/conf/mod_fastcgi.conf
-	# Secure directory for fastcgi sockets
-	keepdir /var/run/lighttpd/
-	fperms 0750 /var/run/lighttpd/
-	fowners lighttpd:lighttpd /var/run/lighttpd/
-
-	# update lighttpd.conf directives based on conditionals
-	update_config
-
-	# docs
-	dodoc AUTHORS README NEWS doc/scripts/*.sh
-	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
-
-	use doc && dohtml -r doc/*
-
-	docinto txt
-	dodoc doc/outdated/*.txt || die
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/lighttpd.logrotate lighttpd || die
-
-	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
-	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
-	fperms 0750 /var/l{ib,og}/lighttpd
-
-	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
-	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.*
-
-	use minimal && remove_non_essential
-}
-
-pkg_postinst () {
-	if use ipv6; then
-		elog "IPv6 migration guide:"
-		elog "http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
-	fi
-	if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
-		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
-		einfo "spawn-fcgi's init script configuration is now located"
-		einfo "at /etc/conf.d/spawn-fcgi."
-	fi
-
-	if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
-		elog "Gentoo has a customized configuration,"
-		elog "which is now located in /etc/lighttpd.  Please migrate your"
-		elog "existing configuration."
-	fi
-}
diff --git a/www-servers/lighttpd/lighttpd-1.4.29-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.29-r3.ebuild
index 5b51771cb09d..aae7d5360015 100644
--- a/www-servers/lighttpd/lighttpd-1.4.29-r2.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.29-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29-r2.ebuild,v 1.4 2011/09/26 17:08:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.29-r3.ebuild,v 1.1 2011/09/27 00:53:18 hwoarang Exp $
 
 EAPI="4"