From: Robin H. Johnson Date: Tue, 10 Apr 2007 10:34:20 +0000 (+0000) Subject: Bug #174015 - clean up pidfile usage in init script. (No Bug #) - fix LDAP usage... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=519e9acb0442b1d8923f0413c57901fa49c14337;p=gentoo.git Bug #174015 - clean up pidfile usage in init script. (No Bug #) - fix LDAP usage, patch from {dev-zero,cardoe}@gentoo.org. Package-Manager: portage-2.1.2.3 --- diff --git a/www-servers/lighttpd/ChangeLog b/www-servers/lighttpd/ChangeLog index 6a47f79110be..a3164ac762dc 100644 --- a/www-servers/lighttpd/ChangeLog +++ b/www-servers/lighttpd/ChangeLog @@ -1,6 +1,16 @@ # 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.108 2007/04/04 22:45:57 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/ChangeLog,v 1.109 2007/04/10 10:34:20 robbat2 Exp $ + +*lighttpd-1.4.13-r3 (10 Apr 2007) + + 10 Apr 2007; Robin H. Johnson + +files/lighttpd.initd-1.4.13-r3, + +files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff, + lighttpd-1.4.13-r1.ebuild, lighttpd-1.4.13-r2.ebuild, + +lighttpd-1.4.13-r3.ebuild: + Bug #174015 - clean up pidfile usage in init script. (No Bug #) - fix LDAP + usage, patch from {dev-zero,cardoe}@gentoo.org. 04 Apr 2007; Fernando J. Pereda lighttpd-1.4.13-r2.ebuild: diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 054ceb1a79df..7bc4f4f1ef54 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -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 @@ -37,6 +34,10 @@ AUX 1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 RMD160 c23c816fcddbc99 MD5 34d6720749f96327d311661a02886a65 files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 RMD160 c23c816fcddbc99758a0426fc11f70677dbc06e9 files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 SHA256 b37042549247ca2d83581aa3bcd1a5356c37015000711cecafda05aa6d6a15c4 files/1.4.13/03_all_lighttpd-1.4.11-errorlog-pipe.diff 5267 +AUX 1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 RMD160 a10372a6cdfce349c6221f5038f2fda699f5f74e SHA1 12c39cd4ca731509256e271daf4aaac8a62e82c4 SHA256 0a7f3626e23291b3859e953bcc1762117a1585c2717adc065ccbb0ccf2f3577a +MD5 87cf789e1f6866b9ece50a4af418b5b8 files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 +RMD160 a10372a6cdfce349c6221f5038f2fda699f5f74e files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 +SHA256 0a7f3626e23291b3859e953bcc1762117a1585c2717adc065ccbb0ccf2f3577a files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff 502 AUX conf/lighttpd.conf 8182 RMD160 450cf40f4ec517331f8932618a3c492cb566e4f3 SHA1 16922786a79807fa3233d1af105a99582d3486a5 SHA256 c0f6951e00d4e8c928f1799a84976ab8bb536bd59a104c13ca9d1d3661d8cebd MD5 df5b2360ea380d988bf16905ab214286 files/conf/lighttpd.conf 8182 RMD160 450cf40f4ec517331f8932618a3c492cb566e4f3 files/conf/lighttpd.conf 8182 @@ -93,6 +94,10 @@ AUX lighttpd.initd-1.4.13-r2 1461 RMD160 823c7f1d85c69d928f38128ad1b2e231cc891e2 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.initd-1.4.13-r3 1444 RMD160 547b4f38f00dac4ea695767f68a35a6220f5cdea SHA1 7aa79dc2fd4b98203d60da7be17078c1be1cb5bd SHA256 edfd7fbdbef984f4f4d998d42fc3ee104f90b06cf42321b945b67624f269bad1 +MD5 e61848afd0aa10efd184143fd31a142c files/lighttpd.initd-1.4.13-r3 1444 +RMD160 547b4f38f00dac4ea695767f68a35a6220f5cdea files/lighttpd.initd-1.4.13-r3 1444 +SHA256 edfd7fbdbef984f4f4d998d42fc3ee104f90b06cf42321b945b67624f269bad1 files/lighttpd.initd-1.4.13-r3 1444 AUX lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c SHA1 24e1b048d7be5520ca5ef8ce31b55df13cc8d72b SHA256 503ee1cd454e2c0f9a212ef60dc8321893eda06ccf721ecbe94d189a09e0bc6c MD5 ad091c9157134890499f26d170352c9f files/lighttpd.logrotate 487 RMD160 2edb8b4abf75031af0a3b4182efb5b589dfa0d3c files/lighttpd.logrotate 487 @@ -116,22 +121,26 @@ EBUILD lighttpd-1.4.11.ebuild 5434 RMD160 91b98a2e409e22ae721f369f964e4cf4327db2 MD5 a9a01acb4e9c264869cee670434ecec2 lighttpd-1.4.11.ebuild 5434 RMD160 91b98a2e409e22ae721f369f964e4cf4327db2fc lighttpd-1.4.11.ebuild 5434 SHA256 505e545ae8fa4410bffd66f66f8fa1fb328f30a2e9daaf38465f516ae34ff422 lighttpd-1.4.11.ebuild 5434 -EBUILD lighttpd-1.4.13-r1.ebuild 5519 RMD160 41f3035361744de598c73caa5b651b96371d5d9a SHA1 83a71da41d5d4428374db52f7fa1a26ab1d9af0b SHA256 27ed9087e0564da202922dfcbe603608203a73d9ccac81dcf7bdc4d06555c56f -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 5830 RMD160 115d14e847fd2b419e29751a118b3ad669ae4fa3 SHA1 4e3bfd5a1deab968dedbe97c6bf292bb24a4c201 SHA256 e01846363ccd462bfed3537b5f4a35d4dc7cceecf67b665a55e6d1f3832cf987 -MD5 06270e2db61635f46e07492a361db0c0 lighttpd-1.4.13-r2.ebuild 5830 -RMD160 115d14e847fd2b419e29751a118b3ad669ae4fa3 lighttpd-1.4.13-r2.ebuild 5830 -SHA256 e01846363ccd462bfed3537b5f4a35d4dc7cceecf67b665a55e6d1f3832cf987 lighttpd-1.4.13-r2.ebuild 5830 +EBUILD lighttpd-1.4.13-r1.ebuild 5529 RMD160 c6b9411bc4f760c9339f6c7a1062c5c6398be5bb SHA1 35401caaba7e2dd7a1061ff2191884c3ef1c5e8e SHA256 a658d652784c1274caeec7e3ba7194eaff2269552d2ee0d143b4dabeea7ccb59 +MD5 bfce8cb7427ecbd9e6fd2aaf2275096e lighttpd-1.4.13-r1.ebuild 5529 +RMD160 c6b9411bc4f760c9339f6c7a1062c5c6398be5bb lighttpd-1.4.13-r1.ebuild 5529 +SHA256 a658d652784c1274caeec7e3ba7194eaff2269552d2ee0d143b4dabeea7ccb59 lighttpd-1.4.13-r1.ebuild 5529 +EBUILD lighttpd-1.4.13-r2.ebuild 5840 RMD160 7efbd91392baf4fe323483291ab1f559a700f212 SHA1 026891edf0a777b68840aff61ecee29ce74790fd SHA256 c13c3f165da34b18d270db4c0942b9b56d54c4f0a9a1f776bf8e5d823d9c4406 +MD5 31b709fa8daf2e47c26faeb8a816d4ec lighttpd-1.4.13-r2.ebuild 5840 +RMD160 7efbd91392baf4fe323483291ab1f559a700f212 lighttpd-1.4.13-r2.ebuild 5840 +SHA256 c13c3f165da34b18d270db4c0942b9b56d54c4f0a9a1f776bf8e5d823d9c4406 lighttpd-1.4.13-r2.ebuild 5840 +EBUILD lighttpd-1.4.13-r3.ebuild 5840 RMD160 de3d3afd6ead4366dc7e3f692bf8a912e719a377 SHA1 7a16f53a32a0b161d75dbfb12a20ed7f5e0393dc SHA256 0697095ebbde3494ebd96b4a7111ae8eaf04d8a795dca8e1831dc06acf81d21a +MD5 98fe2efabbccda9a812f5b3b053efdaa lighttpd-1.4.13-r3.ebuild 5840 +RMD160 de3d3afd6ead4366dc7e3f692bf8a912e719a377 lighttpd-1.4.13-r3.ebuild 5840 +SHA256 0697095ebbde3494ebd96b4a7111ae8eaf04d8a795dca8e1831dc06acf81d21a lighttpd-1.4.13-r3.ebuild 5840 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 28392 RMD160 e0098db34a5dd58cd1af3a6b9f99963cbd15b21e SHA1 c35a92ece6e021acc3057c44288c64e657a76021 SHA256 3c3631540d54f5d10797f4cdc966527df9d7d86a36eb59c30892c9e4f5dc7f44 -MD5 0029db699951b4fa17a8b8b6896f09bc ChangeLog 28392 -RMD160 e0098db34a5dd58cd1af3a6b9f99963cbd15b21e ChangeLog 28392 -SHA256 3c3631540d54f5d10797f4cdc966527df9d7d86a36eb59c30892c9e4f5dc7f44 ChangeLog 28392 +MISC ChangeLog 28796 RMD160 66092bd3d8f14dafaca0df7a31d5e6e3f1db53d1 SHA1 9e90c6ee5ac838d3d5f3176fef7e3aa46ed54bb5 SHA256 a817428fb4b9a7edf17a414d97d38cbdc0f7909a6731dbf2d095085db5b7d28e +MD5 e6fd6a19e7c53633d8460b05f36f4fd9 ChangeLog 28796 +RMD160 66092bd3d8f14dafaca0df7a31d5e6e3f1db53d1 ChangeLog 28796 +SHA256 a817428fb4b9a7edf17a414d97d38cbdc0f7909a6731dbf2d095085db5b7d28e ChangeLog 28796 MISC metadata.xml 725 RMD160 942b90492becc1225186b0478602bb9ac6088c9c SHA1 8ae4638a407cecddf817faa9cad20bd1d101159f SHA256 7350e23261ffc007430bdf3b742a4f7e05c6604eefb0d054c2c17bb1c41255a1 MD5 c3ffab01bc3147d23b84129ce17df343 metadata.xml 725 RMD160 942b90492becc1225186b0478602bb9ac6088c9c metadata.xml 725 @@ -151,10 +160,6 @@ SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/di 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 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) - -iD8DBQFGFCqzViELBEf1JB0RAsF8AJ9rq4o6czDLHqD5Pj4eBU0Vp/IWgwCfRjpM -n5iW27iMYQLUBG5lJW0jBkM= -=hciw ------END PGP SIGNATURE----- +MD5 c125c79044d8e508cc765d805eeed9b5 files/digest-lighttpd-1.4.13-r3 247 +RMD160 988b066988cbca78884400d666744793d2bc6e15 files/digest-lighttpd-1.4.13-r3 247 +SHA256 2cde60e43bf9a47baa9efa1aaaaae485d6ebd17c45e093e998c83877f1cd1c6e files/digest-lighttpd-1.4.13-r3 247 diff --git a/www-servers/lighttpd/files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff b/www-servers/lighttpd/files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff new file mode 100644 index 000000000000..259ad4b279a5 --- /dev/null +++ b/www-servers/lighttpd/files/1.4.13/04_all_lighttpd-1.4.13-deprecated-ldap-api.diff @@ -0,0 +1,10 @@ +--- lighttpd-1.4.13.old/src/Makefile.am 2006-10-09 12:19:34.000000000 -0400 ++++ lighttpd-1.4.13/src/Makefile.am 2007-03-26 10:10:26.000000000 -0400 +@@ -213,6 +213,7 @@ + mod_auth_la_SOURCES = mod_auth.c http_auth_digest.c http_auth.c + mod_auth_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined + mod_auth_la_LIBADD = $(CRYPT_LIB) $(LDAP_LIB) $(LBER_LIB) $(common_libadd) ++mod_auth_la_CFLAGS = -DLDAP_DEPRECATED + + lib_LTLIBRARIES += mod_rewrite.la + mod_rewrite_la_SOURCES = mod_rewrite.c diff --git a/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r3 b/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r3 new file mode 100644 index 000000000000..7a885e91935a --- /dev/null +++ b/www-servers/lighttpd/files/digest-lighttpd-1.4.13-r3 @@ -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-r3 b/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r3 new file mode 100644 index 000000000000..d5dbf2a5503f --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd.initd-1.4.13-r3 @@ -0,0 +1,67 @@ +#!/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-r3,v 1.1 2007/04/10 10:34:20 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 --exec /usr/sbin/lighttpd \ + --pidfile "${LIGHTTPD_PID}" -- -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-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.13-r1.ebuild index ce1287ebb2f2..a1a816adae6d 100644 --- a/www-servers/lighttpd/lighttpd-1.4.13-r1.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.13-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/www-servers/lighttpd/lighttpd-1.4.13-r1.ebuild,v 1.10 2007/03/26 09:30:54 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.13-r1.ebuild,v 1.11 2007/04/10 10:34:20 robbat2 Exp $ WANT_AUTOCONF=latest WANT_AUTOMAKE=latest @@ -101,7 +101,7 @@ src_unpack() { unpack ${A} cd ${S} - EPATCH_SUFFIX="diff" EPATCH_OPTS="-p1 -l" epatch ${FILESDIR}/${PV} || die "Patching failed!" + EPATCH_SUFFIX="diff" EPATCH_OPTS="-p1 -l -d ${S}" epatch ${FILESDIR}/${PV} || die "Patching failed!" eautoreconf || die diff --git a/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild b/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild index 4b34ae46a7ab..f44dcaf93964 100644 --- a/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.13-r2.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/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild,v 1.3 2007/04/04 22:45:57 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/lighttpd-1.4.13-r2.ebuild,v 1.4 2007/04/10 10:34:20 robbat2 Exp $ WANT_AUTOCONF=latest WANT_AUTOMAKE=latest @@ -101,7 +101,7 @@ src_unpack() { unpack ${A} cd ${S} - EPATCH_SUFFIX="diff" EPATCH_OPTS="-p1 -l" epatch ${FILESDIR}/${PV} || die "Patching failed!" + EPATCH_SUFFIX="diff" EPATCH_OPTS="-p1 -l -d ${S}" epatch ${FILESDIR}/${PV} || die "Patching failed!" eautoreconf || die diff --git a/www-servers/lighttpd/lighttpd-1.4.13-r3.ebuild b/www-servers/lighttpd/lighttpd-1.4.13-r3.ebuild new file mode 100644 index 000000000000..4d774a515113 --- /dev/null +++ b/www-servers/lighttpd/lighttpd-1.4.13-r3.ebuild @@ -0,0 +1,213 @@ +# 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-r3.ebuild,v 1.1 2007/04/10 10:34:20 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="~alpha ~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 -d ${S}" 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-r3 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/lighttpd.conf + doins ${FILESDIR}/conf/mime-types.conf + doins ${FILESDIR}/conf/mod_cgi.conf + newins ${FILESDIR}/conf/mod_fastcgi.conf-1.4.13-r2 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 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 +}