Bug #168865, improved init.d script for s-s-d handling and other bits.
authorRobin H. Johnson <robbat2@gentoo.org>
Sun, 1 Apr 2007 22:55:08 +0000 (22:55 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Sun, 1 Apr 2007 22:55:08 +0000 (22:55 +0000)
Package-Manager: portage-2.1.2.2

www-servers/lighttpd/ChangeLog
www-servers/lighttpd/Manifest
www-servers/lighttpd/files/digest-lighttpd-1.4.13-r2 [new file with mode: 0644]
www-servers/lighttpd/files/lighttpd.initd-1.4.13-r2 [new file with mode: 0644]
www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild [new file with mode: 0644]

index d57bb32486507730b0d889e71e5472f38065c02d..06ef95137c99e9b4ffb4e00a1cb81982817bc1ec 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/lighttpd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.104 2007/03/26 09:30:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.105 2007/04/01 22:55:08 robbat2 Exp $
+
+*lighttpd-1.4.13-r2 (01 Apr 2007)
+
+  01 Apr 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +files/lighttpd.initd-1.4.13-r2, +lighttpd-1.4.13-r2.ebuild:
+  Bug #168865, improved init.d script for s-s-d handling and other bits.
 
   26 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   lighttpd-1.4.13-r1.ebuild:
index 285808c9b53d8b7c989c376413718733d635e38d..187726bd669b975b5be41e5fce8934774c8ab18e 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.4.11/01_all_r1046.mod_compress.c-fixes.diff 5992 RMD160 1288d18449115f4a99307cb9a68786d34f867e36 SHA1 8785f13c4020493eb13842c9f09da109f862d8e4 SHA256 20818c8cca47ad3ab405ec3841d0077e3b478bf3115828e920b6c9486e6d3479
 MD5 1b3bebe51407cf5a2f406a53465d9901 files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff 5992
 RMD160 1288d18449115f4a99307cb9a68786d34f867e36 files/1.4.11/01_all_r1046.mod_compress.c-fixes.diff 5992
@@ -85,6 +82,10 @@ AUX lighttpd.initd-1.4.13-r1 1641 RMD160 b038e21964d92a1c3bd9d99b676c0d25b76087f
 MD5 5afc28fbed9597270f6eab8ef153b859 files/lighttpd.initd-1.4.13-r1 1641
 RMD160 b038e21964d92a1c3bd9d99b676c0d25b76087f0 files/lighttpd.initd-1.4.13-r1 1641
 SHA256 3eeaef628418745207ad4bb77dfbc378ff31f52dbc5413d19647303d5ad27d71 files/lighttpd.initd-1.4.13-r1 1641
+AUX lighttpd.initd-1.4.13-r2 1461 RMD160 823c7f1d85c69d928f38128ad1b2e231cc891e2f SHA1 ec1b4ca7e3c40dbd643e2c3a021df05727879c2c SHA256 be684fee10ef15b557d3f48df38341477729c2153b923b457ee7394e818bcfe9
+MD5 dfe1a77b1129e6297e5bf0b83b30b220 files/lighttpd.initd-1.4.13-r2 1461
+RMD160 823c7f1d85c69d928f38128ad1b2e231cc891e2f files/lighttpd.initd-1.4.13-r2 1461
+SHA256 be684fee10ef15b557d3f48df38341477729c2153b923b457ee7394e818bcfe9 files/lighttpd.initd-1.4.13-r2 1461
 AUX lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c SHA1 24e1b048d7be5520ca5ef8ce31b55df13cc8d72b SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c
 MD5 ad091c9157134890499f26d170352c9f files/lighttpd.logrotate 487
 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c files/lighttpd.logrotate 487
@@ -112,14 +113,18 @@ EBUILD lighttpd-1.4.13-r1.ebuild 5519 RMD160 41f3035361744de598c73caa5b651b96371
 MD5 9e1b896e9aa7148fd91551c04a7ab5dd lighttpd-1.4.13-r1.ebuild 5519
 RMD160 41f3035361744de598c73caa5b651b96371d5d9a lighttpd-1.4.13-r1.ebuild 5519
 SHA256 27ed9087e0564da202922dfcbe603608203a73d9ccac81dcf7bdc4d06555c56f lighttpd-1.4.13-r1.ebuild 5519
+EBUILD lighttpd-1.4.13-r2.ebuild 5526 RMD160 cc8557dd1bfa7cc0fc1e12e7855505476e5bea5e SHA1 7f66f0a5eb7f1aa9756f1a4aa70611c75e43c45e SHA256 853f6f64c7ab7fdcecdd6c772ee80bbac8ffa75f632b154231d1f72097a6c4fa
+MD5 3bd8730a59271792a6b700f13c93e92b lighttpd-1.4.13-r2.ebuild 5526
+RMD160 cc8557dd1bfa7cc0fc1e12e7855505476e5bea5e lighttpd-1.4.13-r2.ebuild 5526
+SHA256 853f6f64c7ab7fdcecdd6c772ee80bbac8ffa75f632b154231d1f72097a6c4fa lighttpd-1.4.13-r2.ebuild 5526
 EBUILD lighttpd-1.4.13.ebuild 5431 RMD160 f56cd0ddad8c2e0ca84c74b5bf6fcf38309199a0 SHA1 9b04912b6d61737bff174931d7a0ba8b9ef8ec9b SHA256 3a62f76a2720f7b1ccc3557d79df36df292bff85e9dc03da6a44d94015f09ad5
 MD5 cca2c68140d653460de5c5895f3b6d6e lighttpd-1.4.13.ebuild 5431
 RMD160 f56cd0ddad8c2e0ca84c74b5bf6fcf38309199a0 lighttpd-1.4.13.ebuild 5431
 SHA256 3a62f76a2720f7b1ccc3557d79df36df292bff85e9dc03da6a44d94015f09ad5 lighttpd-1.4.13.ebuild 5431
-MISC ChangeLog 27654 RMD160 8030283cee92e6f3ce4b5c5a4ceac1de854cadb2 SHA1 b731281a99ba2bae8121d16a8d2fc4dce7f51c01 SHA256 2949e2ae6eea1163bbe8f11c96dc33773d0f6523c0b6372d355b0a55923ad33f
-MD5 de850ae62875c4f331533b8a4b291408 ChangeLog 27654
-RMD160 8030283cee92e6f3ce4b5c5a4ceac1de854cadb2 ChangeLog 27654
-SHA256 2949e2ae6eea1163bbe8f11c96dc33773d0f6523c0b6372d355b0a55923ad33f ChangeLog 27654
+MISC ChangeLog 27881 RMD160 b52c5f97f3444a816d308cc85825000969b78b09 SHA1 ea7d200454c1d13e34151505b2eead2b21d320e2 SHA256 6d83656e30aa81b1b1151c219e2ea4a262cb455aeef17809e8a6ccc6d90017c8
+MD5 a8399820670547540e0d08ad539dd2cd ChangeLog 27881
+RMD160 b52c5f97f3444a816d308cc85825000969b78b09 ChangeLog 27881
+SHA256 6d83656e30aa81b1b1151c219e2ea4a262cb455aeef17809e8a6ccc6d90017c8 ChangeLog 27881
 MISC metadata.xml 725 RMD160 942b90492becc1225186b0478602bb9ac6088c9c SHA1 8ae4638a407cecddf817faa9cad20bd1d101159f SHA256 7350e23261ffc007430bdf3b742a4f7e05c6604eefb0d054c2c17bb1c41255a1
 MD5 c3ffab01bc3147d23b84129ce17df343 metadata.xml 725
 RMD160 942b90492becc1225186b0478602bb9ac6088c9c metadata.xml 725
@@ -136,10 +141,6 @@ SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/di
 MD5 c125c79044d8e508cc765d805eeed9b5 files/digest-lighttpd-1.4.13-r1 247
 RMD160 988b066988cbca78884400d666744793d2bc6e15 files/digest-lighttpd-1.4.13-r1 247
 SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/digest-lighttpd-1.4.13-r1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGB5LUNQqtfCuFneMRApNNAJ455yVf9TaM/lJGXp0xb+WJr4xUMACdFHsl
-1eHZP+762bgbUxWHf3liFRE=
-=9Eq5
------END PGP SIGNATURE-----
+MD5 c125c79044d8e508cc765d805eeed9b5 files/digest-lighttpd-1.4.13-r2 247
+RMD160 988b066988cbca78884400d666744793d2bc6e15 files/digest-lighttpd-1.4.13-r2 247
+SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/digest-lighttpd-1.4.13-r2 247
diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r2 b/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r2
new file mode 100644 (file)
index 0000000..7a885e9
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 d775d6478391b95d841a1018c8db0b95 lighttpd-1.4.13.tar.gz 797813
+RMD160 4e67e42dc3692d50c044561cc903de7b906f260c lighttpd-1.4.13.tar.gz 797813
+SHA256 62d5997fdb41afa9400adcdb040d04a1f5fa950045df96e3e3f593e8f0de5739 lighttpd-1.4.13.tar.gz 797813
diff --git a/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r2 b/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r2
new file mode 100644 (file)
index 0000000..606c283
--- /dev/null
@@ -0,0 +1,68 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r2,v 1.1 2007/04/01 22:55:08 robbat2 Exp $
+
+opts="reload graceful"
+
+depend() {
+       need net
+       use mysql logger spawn-fcgi ldap slapd
+       after famd
+       after sshd
+}
+
+checkconfig() {
+       if [ ! -f "${LIGHTTPD_CONF}" ] ; then
+               ewarn "${LIGHTTPD_CONF} does not exist."
+               return 1
+       fi
+
+       /usr/sbin/lighttpd -t -f ${LIGHTTPD_CONF} >/dev/null
+}
+                       
+start() {
+       checkconfig || return 1
+
+       ebegin "Starting lighttpd"
+       start-stop-daemon --start --quiet \
+               --background --pidfile "${LIGHTTPD_PID}" \
+               --exec /usr/sbin/lighttpd -- -f "${LIGHTTPD_CONF}"
+       eend $?
+}
+
+stop() {
+       local rv=0
+       ebegin "Stopping lighttpd"
+       start-stop-daemon --stop --quiet --pidfile "${LIGHTTPD_PID}"
+       eend $?
+}
+
+reload() {
+       if ! service_started "${SVCNAME}" ; then
+               eerror "${SVCNAME} isn't running"
+               return 1
+       fi
+       checkconfig || return 1
+
+       ebegin "Re-opening lighttpd log files"
+       start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \
+               --signal HUP
+       eend $?
+}
+
+graceful() {
+       if ! service_started "${SVCNAME}" ; then
+               eerror "${SVCNAME} isn't running"
+               return 1
+       fi
+       checkconfig || return 1
+
+       ebegin "Gracefully stopping lighttpd"
+       start-stop-daemon --stop --oknodo --quiet --pidfile "${LIGHTTPD_PID}" \
+               --signal INT
+       if eend $? ; then
+               rm -f "${LIGHTTPD_PID}"
+               start
+       fi
+}
diff --git a/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild
new file mode 100644 (file)
index 0000000..6f3c95c
--- /dev/null
@@ -0,0 +1,206 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild,v 1.1 2007/04/01 22:55:08 robbat2 Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+inherit eutils autotools depend.php
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="http://www.lighttpd.net/"
+SRC_URI="http://www.lighttpd.net/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="bzip2 doc fam fastcgi gdbm ipv6 ldap lua minimal memcache mysql pcre php rrdtool ssl test webdav xattr"
+
+RDEPEND=">=sys-libs/zlib-1.1
+       bzip2?    ( app-arch/bzip2 )
+       fam?      ( virtual/fam )
+       gdbm?     ( sys-libs/gdbm )
+       ldap?     ( >=net-nds/openldap-2.1.26 )
+       lua?      ( >=dev-lang/lua-5.1 )
+       memcache? ( dev-libs/libmemcache )
+       mysql?    ( >=virtual/mysql-4.0 )
+       pcre?     ( >=dev-libs/libpcre-3.1 )
+       php?      (
+               virtual/httpd-php
+               !net-www/spawn-fcgi
+       )
+       rrdtool? ( net-analyzer/rrdtool )
+       ssl?    ( >=dev-libs/openssl-0.9.7 )
+       webdav? (
+               dev-libs/libxml2
+               >=dev-db/sqlite-3
+               sys-fs/e2fsprogs
+       )
+       xattr? ( kernel_linux? ( sys-apps/attr ) )"
+
+DEPEND="${RDEPEND}
+       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="/etc/lighttpd/lighttpd.conf"
+
+       # enable php/mod_fastcgi settings
+       use php && \
+               dosed 's|#.*\(include.*fastcgi.*$\)|\1|' ${config}
+
+       # enable stat() caching
+       use fam && \
+               dosed 's|#\(.*stat-cache.*$\)|\1|' ${config}
+}
+
+# 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.*
+
+       if ! use fastcgi ; then
+               rm -f ${libdir}/mod_fastcgi.* ${D}/usr/bin/spawn-fcgi \
+                       ${D}/usr/share/man/man1/spawn-fcgi.*
+       fi
+}
+
+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."
+               ebeep 5
+       fi
+
+       use php && require_php_with_use cgi
+
+       enewgroup lighttpd
+       enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd
+}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+
+       EPATCH_SUFFIX="diff" EPATCH_OPTS="-p1 -l" epatch ${FILESDIR}/${PV} || die "Patching failed!"
+
+       eautoreconf || die
+
+       # dev-python/docutils installs rst2html.py not rst2html
+       sed -i -e 's|\(rst2html\)|\1.py|g' doc/Makefile.in || \
+               die "sed doc/Makefile.in failed"
+
+       # fix typo
+       sed -i -e 's|\(output_content\)_\(type\)|\1\2|' doc/cml.txt || \
+               die "sed doc/cml.txt failed"
+}
+
+src_compile() {
+       econf --libdir=/usr/$(get_libdir)/${PN} \
+               --enable-lfs \
+               $(use_enable ipv6) \
+               $(use_with bzip2) \
+               $(use_with fam) \
+               $(use_with gdbm) \
+               $(use_with lua) \
+               $(use_with ldap) \
+               $(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) \
+               || die "econf failed"
+
+       emake || die "emake failed"
+
+       if use doc ; then
+               einfo "Building HTML documentation"
+               cd doc
+               emake html || die "failed to build HTML documentation"
+       fi
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "make install failed"
+
+       # init script stuff
+       newinitd ${FILESDIR}/lighttpd.initd-1.4.13-r2 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
+
+       if use php || use fastcgi ; then
+               newinitd ${FILESDIR}/spawn-fcgi.initd spawn-fcgi || die
+               newconfd ${FILESDIR}/spawn-fcgi.confd spawn-fcgi || die
+       fi
+
+       # configs
+       insinto /etc/lighttpd
+       doins ${FILESDIR}/conf/*.conf
+
+       # update lighttpd.conf directives based on conditionals
+       update_config
+
+       # docs
+       dodoc AUTHORS README NEWS ChangeLog doc/*.sh
+       newdoc doc/lighttpd.conf lighttpd.conf.distrib
+
+       use doc && dohtml -r doc/*
+
+       docinto txt
+       dodoc doc/*.txt
+
+       # 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
+
+       use minimal && remove_non_essential
+}
+
+pkg_postinst () {
+       echo
+       if [[ -f ${ROOT}etc/conf.d/spawn-fcgi.conf ]] ; then
+               einfo "spawn-fcgi is now included with lighttpd"
+               einfo "spawn-fcgi's init script configuration is now located"
+               einfo "at /etc/conf.d/spawn-fcgi."
+               echo
+       fi
+
+       if [[ -f ${ROOT}etc/lighttpd.conf ]] ; then
+               ewarn "As of lighttpd-1.4.1, Gentoo has a customized configuration,"
+               ewarn "which is now located in /etc/lighttpd.  Please migrate your"
+               ewarn "existing configuration."
+               ebeep 5
+       fi
+
+       if use fam ; then
+               einfo "Remember to re-emerge lighttpd should you switch from"
+               einfo "app-admin/famd to app-admin/gamin or vice versa."
+       fi
+       echo
+}