summaryrefslogtreecommitdiff
path: root/www-servers/lighttpd
diff options
context:
space:
mode:
Diffstat (limited to 'www-servers/lighttpd')
-rw-r--r--www-servers/lighttpd/Manifest15
-rw-r--r--www-servers/lighttpd/files/conf/lighttpd.conf2
-rw-r--r--www-servers/lighttpd/files/conf/mod_fastcgi.conf2
-rw-r--r--www-servers/lighttpd/files/lighttpd.logrotate16
-rw-r--r--www-servers/lighttpd/files/lighttpd.tmpfiles.conf2
-rw-r--r--www-servers/lighttpd/lighttpd-1.4.53.ebuild2
-rw-r--r--www-servers/lighttpd/lighttpd-1.4.54.ebuild (renamed from www-servers/lighttpd/lighttpd-1.4.51.ebuild)18
-rw-r--r--www-servers/lighttpd/lighttpd-9999.ebuild6
8 files changed, 24 insertions, 39 deletions
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 0035c3ee6d96..c2cf821ca112 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -1,16 +1,15 @@
-AUX conf/lighttpd.conf 8261 BLAKE2B ba8233dba6251ef82647468bf327018ddcba5e2df7c32de57cdea505252f98175ed6af97d529aecb2ed392ce238dff25d3ff4940167fbbdca4984af7cd4fd615 SHA512 a1b336b34dddc3fdb3da3e9a03e054c32334f88ec06d73a3f649a4fe4d5f240704e638b9083177d0ed844cab3129d2760578fddb9f618607c3b8a1e339ae114c
+AUX conf/lighttpd.conf 8257 BLAKE2B 82090a8c467e3738d1e7bb3a55310040145ab6a0ee7dc0ab45abd9ad657cfacec895727eb34799f3552d0c1c11a6dfbf6fe7cc1fd6e17b610284b7194e02aed0 SHA512 0bfa3d44c28f6893362b4c428d7bdce2a560ba155e349af9ee293510341fee03d484f95e9d967afb87f0a61aa11dd33ef9c633e206146c0af791f2690aed9852
AUX conf/mime-types.conf 3313 BLAKE2B 48b38dbe04939be3fd85ac139146cbc6f266be842f77618d110e8e3565ae1a68d27e9ee82adf800ba1077fc3481d388e4f091ffce7bf5042e5d37ab54baaad5f SHA512 2535c9458f556a7f1a37461b543ff34869ab714438a3e53d13809bb46f0d6f4efa2da1407411678f54a64f6f9bdb32d5c3a7daf76903ef512c6d3b021719ebe7
AUX conf/mod_cgi.conf 749 BLAKE2B dd565d6052d74aea3489f3a011a5913fcbd331b57ca02e71496eecff7c303cd56e8e43cd5a9b33c27463304a2f2218fc7451cb5754200c9ef48eb4104b820547 SHA512 e611b3ed232af4fb8e9b8821a29fbc32acb0a3431c701e5a64afc192abc288cf90582fbbf79085de9426be23d8d42d90da66e6993ab7cf89943ae23d59d681a1
-AUX conf/mod_fastcgi.conf 553 BLAKE2B 314326e002a25ff8f9becb9868ea54c857f2e671c99d5d9a13aeea13054b61406cf702d9500e1a71664b3d40ee9964b5fd32247bee377c4ff64af551148570c6 SHA512 e2796181ae9f7c55a48b690835f8f84aaab2c5c100846fc8ac5126b9a1351ef1a2ab30f26da2e16afa197bddf555c299a82a5cc133350212e171ac555765a08d
+AUX conf/mod_fastcgi.conf 549 BLAKE2B 7bd525db1ace97a826bc4fcc11fc230f16839005da8988b21f54e5d43763a7df82b0d3b2cd5f410074cd87b2c8dbaab91042563bb7878ca0bedc076eafdc5906 SHA512 a9245394cbde327f997932546e2c6ee755da9365ce3a3d4662d2042971a9ec0a5fc36f9cdd7c032d35a6c0c3d02471b4b9b394b2cd349291c4a9827ca06cea4f
AUX lighttpd.confd 240 BLAKE2B 8383c102f9e3a373909f26cda9f73d1edf81ef9dae42a48593f6d6f61c1b1060cc324bb773d402307d54c6cca520ddada8016dc5b3f0922ddf75d24934bfc7c4 SHA512 dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416
AUX lighttpd.initd 1957 BLAKE2B df5ba8a820d9a75657e6bb3225f86b961d15f11f4b05278c44ffb1840386be5e8dd2c74e4c053ab4c5f10e5987ebac2e9b8e1489436e5ab337a2f96ca403610c SHA512 d5fc03ded923d2aeea19fefdf658ed793114867dd0b50be6836d767108c98fb7de56011f00ea63220c4b198cff45d98fdc8a649efae90673536e03f786219485
-AUX lighttpd.logrotate 366 BLAKE2B 518eb5d54c6aa0cbc40cf8b2b5db7c7828ac1a300e892bed722d061c291051611bd408e3e7c69ebb032e6007a7df62ad3fd51f4ceff360459bc69b089a9bbe1e SHA512 d28b491423d7cf6b2f5d82191da7e816c73c36e2db469f543f4c09b6e60fce4f0931af49ffc4965e3f5906e22ea6439248dce0d3f4727022df9b6fb5e8a0b92a
AUX lighttpd.logrotate-r1 385 BLAKE2B c41e4b7892d3cb8cd7306eb7fa93b4a03452786acc7a3078464cf2cb7eec982f626201cc0d0aea7dd7de81cacf603f6d064c8ec6f8dcff09f78dfd48b656aa93 SHA512 8cae2d3acb2f4d9a9043e492c4b15024f85f92d93616d5e92e08d51e2295fde6160c750be08244703f999208c4b43ecfb9a2fcb8e223e52992551a0668302ffe
AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469ab074469ba0b670f56b147c8088ad9211f97a4f314fe4eaebac89cd9cddee34edbf3652b7ea0712c94 SHA512 fbcd7dbf9c6b97284465af133a7cd1f711978ef4318a749ff7d366b053265fac94a1d76f074f56722c382179631d38ed8a07ac2c2fc4b712a93acab2f3609c0f
-AUX lighttpd.tmpfiles.conf 44 BLAKE2B 00550d523dc350184ef0d681e9e8da5ad1909dd6226698c79d88c7cab7d35c8e20a0c308b5342f94872442aeac240e202ea6055f4666759f9ec853debac18730 SHA512 795448ad726ebfe7688236a23cb21bf06bbf8edd7e243924e3d1c21d33fffba1e04501734b189eb2081f6737b74af7c978eed802fb5e540dcc5c5aea69544936
-DIST lighttpd-1.4.51.tar.xz 723268 BLAKE2B 524874a5cc29b3fad23b1d2d623bcaf5b781556d7f11848047bc02fb4793480acfc5b5eb6f60304be9472a8b42c87e8c23baf85352bc9479ea156c4a03990bad SHA512 ee4f150c30322dae50760b99cddd0bd935195ee21e042809fa8d303425d12081c23c00d8ea8fcd3d023b6b414a46b9b953edc4ed25400fe39f10487f0956561f
+AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe
DIST lighttpd-1.4.53.tar.xz 732160 BLAKE2B 75848ab259226fc77b232dfb365c6c656e4605055fb5beba1aea60f54f01cb76c3260ca97e59110dc3dd3d1ba7cb3f2fad646f91f37baee69a8cdbaefcf125a4 SHA512 bf5ea1c9f6f664c9ddcdf33ddba5b2bff760960d03c29a2181e73e3aceb45b523bb90003d0e0bc565334751830e6027cd7be2e92d030cde90813511957c9ea76
-EBUILD lighttpd-1.4.51.ebuild 6296 BLAKE2B ab1f50593c428124a4de77d7c1c487129e7e7653eb0256c63c35a62ab0615515ec3517bbbb257e485a5b77a6d6b4ef84082ae3e6e2f228cf610f6f4ac19c97b8 SHA512 38d9e63c64af8fde307c713d65af732eefe5da1103d48101c27b3476dd7a1c61719c778c467974218687b0be2a38bb7115d13687cf901a0e22fabf8def1ee59c
-EBUILD lighttpd-1.4.53.ebuild 6355 BLAKE2B b7ca748e2512744dc94def22301f0a28121142a671e6aee120b9d33eaeaa367a0e4021e050d1515dbbc6abf4446e844f033f54587c4cf35a1c80de7f2f10ef09 SHA512 791747f51b6f353f271b84301444cc2dbb5e11551c9be0f09d260895efc7d679fd8ede7c027e78b1122a7eadbea28a866bdbcab696ccd2b84a43226fc28f90b8
-EBUILD lighttpd-9999.ebuild 5950 BLAKE2B f32cb4e5ddf22af2b698aaf17fb33f16862d13e28025984d0468e769af84acff9f2981e69526c139d9192964d57b8b95200edcfb756725855481fc31fbbf73be SHA512 50d096574b0f05c207eca9c18b7b70324c923bbbafe7d42c56770cae8eea3793f46e39c1a9be497fd35dba4844c83a8342c38afcfa4aa4c60ea7f0eb72856e69
+DIST lighttpd-1.4.54.tar.xz 763248 BLAKE2B 0425dde326dc514a55790256ab7f3e6c704417fe2ac01c49d109d5f463fb41605140c0773dc3988bd27e1dbee316c5fc96231c9c8699ec40db3acf2c54ec077d SHA512 aa180a2751711a77b9da91a6a285c967d2c183ccbabe3e9064aea74e44629c3b0227ac98c7d720c8d4d223ce4b31e8b221b05b928adc917b199ab1015fcdba37
+EBUILD lighttpd-1.4.53.ebuild 6346 BLAKE2B 31af41f0566951cfcf3efac674fd6fc17f927c37603db09ddacaa4abb999cbefb69c33f02c0f40c7fbbc0e44dff31deb492117dbe52bc53ac92308c0d82233a1 SHA512 1071b5d82fa8413cb5bd73082ae3d4c5355f50415a94495b5e9444fdfdb47b4d17551e80fe17bb0c90d902d42f91fd92f9ee3961f2a4642c511bb59697e75ef0
+EBUILD lighttpd-1.4.54.ebuild 6348 BLAKE2B 02c7e0e845a5626b32cae9e7dc43dff4051c711a665c7bd765500e29e378464ae31d41e01b63030987547dd5594bdcbbadab141428873dd6530728a2299bc638 SHA512 b778924c381ccb066ed1e6ee96b9a444867deac3c1b885136e181c9f93264565a25107ea19b40ba71c89daffdcd057ec4c4f9209be918792b11e45322b494e1f
+EBUILD lighttpd-9999.ebuild 5923 BLAKE2B a8823f34c9957b8bbfbb186c4c0b4141ddaccd35190b761d4fa93ade49bbf716a2b00ff8d8df9f67a827fe8510e468a7b236bbcd06c24353c7f8536ebcc2a1ea SHA512 eee403e0af8bbd58d0ffb443524b4811992464387fc28ec54d63eb1476b2103dcc48eb23b0d77b4966d60828e3bbbecf99b27a449ef47030e6901085ffc4ce99
MISC metadata.xml 1054 BLAKE2B caf21b255e5eb1fc5300edf62d928b933540613492333abd65dc2c0ae89f5a22c18467ff4ab90b2b0582b4f1eff9bad21eeca91bca9c034377280c9ec022b1f9 SHA512 a773d9b8da2f118b148943c4f78662f26aaea5def18abc37ba39bb539fb31449beb04b8e9f1a09ce893ae07aaea2e2fabb42bcba47c5e9100db1f1ef3bf9ea82
diff --git a/www-servers/lighttpd/files/conf/lighttpd.conf b/www-servers/lighttpd/files/conf/lighttpd.conf
index 763170c6ff0c..2a13a57c1c8d 100644
--- a/www-servers/lighttpd/files/conf/lighttpd.conf
+++ b/www-servers/lighttpd/files/conf/lighttpd.conf
@@ -47,7 +47,7 @@ server.username = "lighttpd"
server.groupname = "lighttpd"
server.document-root = var.basedir + "/htdocs"
-server.pid-file = "/var/run/lighttpd.pid"
+server.pid-file = "/run/lighttpd.pid"
server.errorlog = var.logdir + "/error.log"
# log errors to syslog instead
diff --git a/www-servers/lighttpd/files/conf/mod_fastcgi.conf b/www-servers/lighttpd/files/conf/mod_fastcgi.conf
index b72b1ce604b1..5d5ea51ef252 100644
--- a/www-servers/lighttpd/files/conf/mod_fastcgi.conf
+++ b/www-servers/lighttpd/files/conf/mod_fastcgi.conf
@@ -7,7 +7,7 @@ server.modules += ("mod_fastcgi")
fastcgi.server = ( ".php" =>
( "localhost" =>
(
- "socket" => "/var/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket",
+ "socket" => "/run/lighttpd/lighttpd-fastcgi-php-" + PID + ".socket",
"bin-path" => "/usr/bin/php-cgi"
)
)
diff --git a/www-servers/lighttpd/files/lighttpd.logrotate b/www-servers/lighttpd/files/lighttpd.logrotate
deleted file mode 100644
index 80a8644e2c97..000000000000
--- a/www-servers/lighttpd/files/lighttpd.logrotate
+++ /dev/null
@@ -1,16 +0,0 @@
-# lighttpd logrotate script for Gentoo
-
-/var/log/lighttpd/*.log {
- daily
- missingok
- copytruncate
- rotate 7
- compress
- notifempty
- sharedscripts
- postrotate
- if [ -f /var/run/lighttpd.pid ]; then \
- /etc/init.d/lighttpd reload > /dev/null 2>&1 || true ; \
- fi;
- endscript
-}
diff --git a/www-servers/lighttpd/files/lighttpd.tmpfiles.conf b/www-servers/lighttpd/files/lighttpd.tmpfiles.conf
index 325ab13d839c..4ba7262b6374 100644
--- a/www-servers/lighttpd/files/lighttpd.tmpfiles.conf
+++ b/www-servers/lighttpd/files/lighttpd.tmpfiles.conf
@@ -1 +1 @@
-d /var/run/lighttpd 0750 lighttpd lighttpd - \ No newline at end of file
+d /run/lighttpd 0750 lighttpd lighttpd -
diff --git a/www-servers/lighttpd/lighttpd-1.4.53.ebuild b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
index aab14ef82eb2..ee33f1c375eb 100644
--- a/www-servers/lighttpd/lighttpd-1.4.53.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.53.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
diff --git a/www-servers/lighttpd/lighttpd-1.4.51.ebuild b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
index 7e25904b4332..55fbdba211da 100644
--- a/www-servers/lighttpd/lighttpd-1.4.51.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.54.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,12 +11,15 @@ SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
REQUIRED_USE="kerberos? ( ssl !libressl ) webdav? ( sqlite )"
-CDEPEND="
+BDEPEND="dev-libs/libgamin
+ virtual/pkgconfig"
+
+COMMON_DEPEND="
bzip2? ( app-arch/bzip2 )
dbi? ( dev-db/libdbi )
fam? ( virtual/fam )
@@ -33,7 +36,7 @@ CDEPEND="
rrdtool? ( net-analyzer/rrdtool )
sasl? ( dev-libs/cyrus-sasl )
ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] )
+ !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos(-)?] )
libressl? ( dev-libs/libressl:= )
)
sqlite? ( dev-db/sqlite:3 )
@@ -44,15 +47,14 @@ CDEPEND="
xattr? ( kernel_linux? ( sys-apps/attr ) )
zlib? ( >=sys-libs/zlib-1.1 )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig
+DEPEND="${COMMON_DEPEND}
doc? ( dev-python/docutils )
test? (
virtual/perl-Test-Harness
dev-libs/fcgi
)"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-apache )
"
@@ -135,7 +137,7 @@ src_configure() {
$(use_with postgres pgsql) \
$(use_with sasl) \
$(use_with ssl openssl) \
- $(use_with sqlite sqlite) \
+ $(use_with sqlite) \
$(use_with webdav webdav-props) \
$(use_with webdav webdav-locks) \
$(use_with xattr attr) \
diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild
index 72943866311b..46f8da74bb1b 100644
--- a/www-servers/lighttpd/lighttpd-9999.ebuild
+++ b/www-servers/lighttpd/lighttpd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -151,7 +151,7 @@ src_test() {
}
src_install() {
- emake DESTDIR="${D}" install
+ default
# init script stuff
newinitd "${FILESDIR}"/lighttpd.initd lighttpd
@@ -174,7 +174,7 @@ src_install() {
newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
use ipv6 && readme.gentoo_create_doc
- use doc && dohtml -r doc/*
+ use doc && dodoc -r doc
docinto txt
dodoc doc/outdated/*.txt