diff options
Diffstat (limited to 'www-servers/lighttpd')
| -rw-r--r-- | www-servers/lighttpd/Manifest | 18 | ||||
| -rw-r--r-- | www-servers/lighttpd/files/conf/lighttpd.conf-r2 | 297 | ||||
| -rw-r--r-- | www-servers/lighttpd/files/lighttpd-1.4.75-sparc.patch | 74 | ||||
| -rw-r--r-- | www-servers/lighttpd/files/lighttpd.initd-r2 | 76 | ||||
| -rw-r--r-- | www-servers/lighttpd/files/lighttpd.service-r1 | 14 | ||||
| -rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild (renamed from www-servers/lighttpd/lighttpd-1.4.74.ebuild) | 24 | ||||
| -rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.75.ebuild | 6 | ||||
| -rw-r--r-- | www-servers/lighttpd/lighttpd-1.4.76.ebuild (renamed from www-servers/lighttpd/lighttpd-1.4.73.ebuild) | 46 | ||||
| -rw-r--r-- | www-servers/lighttpd/metadata.xml | 3 |
9 files changed, 492 insertions, 66 deletions
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index e852f936f3a3..9cc6903fb952 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -1,19 +1,21 @@ AUX conf/lighttpd.conf-r1 7623 BLAKE2B 51805756814ed7ea8770419fa98009b1ecf6e963c9f1b9d7694ad307fd3c3f6f9c1c167a41b6048910e4cd89af4211b6a8f48382a9adadb10b76ab61f55b6115 SHA512 8985c77d2dc22cca8caf7a484619d2712dd1fa7ecd4a71c19b8c5d09af471c6b42ab0cf131d40d2c61440d4d3053a86285fb90209204d2ba711868513c800722 +AUX conf/lighttpd.conf-r2 7357 BLAKE2B f3dc2253aadc690528e9ec7c423d5f8cff518906b327b2e6095a24215c86a3274c145ec4acbffe27dfbd4e28dd907b815ae73dcb55072888ca385bde316526e1 SHA512 48469113f7a6e5459d1eec3387f3da71125f50895b845cb76e9edb6a2f4f93bbd9b772afc593a055c4e168708b7f0eb534e721c6f26a29465727369a2a71bdf4 AUX conf/mime-types.conf 5802 BLAKE2B 894906c67176dfb98819fe0d61e66905d873ad96907c14684a1b6284796ea69950606c950a72f16ffa9fdd46675ac79050cc39456ae66c91a38a50e1ef5449e9 SHA512 28fb746307daa92ae8077850627097d8ed4f24ad6f1c1963a3397a052add17282292e6f230550fb65d2fef969af0448f2f86e36afb5b15dc92b00fd80821c54a AUX conf/mod_cgi.conf 625 BLAKE2B 9d10f74566edd260a9160a7b3588aa08903603dafe412b73e0a28ce57b3e45c4bbebd0443daeb7e922c66bca66947f79c24eb65256cd5f6011ea2ad140c3f16f SHA512 39cba5cc14be21356c7038a8436a4dd7da80d18e3db2ba0527669f2ce9e9ca1a99a985e931e92cd7ea550f2b79467adc92b0803291f6d55084cca901919ea0da AUX conf/mod_fastcgi.conf 425 BLAKE2B 5c78303b686677bc77a6c9c51f295a023f4854ce351cf41e8984f84f6d8520fee93db4c96b25495bb935ed53d57090e481516c3fd4862401cea174fa2bccc0d2 SHA512 0847a55736dd86f6589086614331a54d1656214ab918638a319b69825ef67bfc8003fa567dc8b82c1c1611d2b4d2771dce4bdd337ecb9b277758a5dcf6c12331 +AUX lighttpd-1.4.75-sparc.patch 2571 BLAKE2B 4f97bc86e54173a91a18e60645da4ab5e65832a6474901ee6bb0b2bba69f1a8d03f25e8dde46067442c51982de7f449bb3f5e7aff81f40994fef9cc161866af2 SHA512 ef71b102459dc2214236dcad022ae3a5f87fe7f199bb5b8aa9b4dec22a3a4a095e0042273956f69875223ca6dc4376b1a56a05289de780543fc5aea7e8308797 AUX lighttpd.confd 240 BLAKE2B 8383c102f9e3a373909f26cda9f73d1edf81ef9dae42a48593f6d6f61c1b1060cc324bb773d402307d54c6cca520ddada8016dc5b3f0922ddf75d24934bfc7c4 SHA512 dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416 AUX lighttpd.initd-r1 1993 BLAKE2B 719a854c4faad43a7d33303afd68950ec5393b63f485cfcbcd89e39b6a4a6eef3fe74a73acdd95dd948f7d3c822d0cca1a7da087c83eb455f50b2402a5ef8acd SHA512 545b923f199a6f3399df3cbd8122e7a5a83bf4128a59bf000690ccba1e6d9bd7ec3bd31aeecf4c7a14b6349ccc99df5ab4e6ff8ef9b3f026efd6ae628c872962 +AUX lighttpd.initd-r2 1949 BLAKE2B aafc91df917057db7cc271fd2b4b2bd5b1ccf3070f11eacf17109e8be13c0061be0c63a822ea235392d41efd772ca27011990e539cfdd1712a1e4a5425c121eb SHA512 4eb6c08fd484f336c4e530ce5efee953d7e538475975852105ea3fb38a4c1705780dca479d0be9239a1f8ad6d0b018b43a00f177f7b0dc19a4fffd03e242ef4f AUX lighttpd.logrotate-r1 385 BLAKE2B c41e4b7892d3cb8cd7306eb7fa93b4a03452786acc7a3078464cf2cb7eec982f626201cc0d0aea7dd7de81cacf603f6d064c8ec6f8dcff09f78dfd48b656aa93 SHA512 8cae2d3acb2f4d9a9043e492c4b15024f85f92d93616d5e92e08d51e2295fde6160c750be08244703f999208c4b43ecfb9a2fcb8e223e52992551a0668302ffe AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469ab074469ba0b670f56b147c8088ad9211f97a4f314fe4eaebac89cd9cddee34edbf3652b7ea0712c94 SHA512 fbcd7dbf9c6b97284465af133a7cd1f711978ef4318a749ff7d366b053265fac94a1d76f074f56722c382179631d38ed8a07ac2c2fc4b712a93acab2f3609c0f +AUX lighttpd.service-r1 349 BLAKE2B 89db06cef70a9c0c875cf9c6a82cdc9b36a1c576f4d3088f7fedb9cae4216295b94d4d610c52190d3651e576126c7c66fa1f1dbaf230216ad50284cc5a38c176 SHA512 315f8b06905642daa8d1d295c282143b97c342170586cc8d42de572b20f313a90701ec4fba3b8320ee8882a355bef53c0581970517181bfcbb0ac3c9c02771a1 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe -DIST lighttpd-1.4.73.tar.xz 1086680 BLAKE2B 2c7e8f9a9445b7986320e28dca82c59003b3438d8d9c5d67d299353f34f4eb4b1dd10c99752548eef9786ae67ee32c7a50b2dcfad2ecc3ca3d17e9e0b8d47f4b SHA512 ee41a72b09614d630174ef832b08c050708f62c0b6299e82b0a5f91a63d62702d31237ae5bb1850f0160b94e36a66af38a2d7abdaa920235265d416d2b0b4015 -DIST lighttpd-1.4.73.tar.xz.asc 833 BLAKE2B e38334feeb0be92126b7289f7724dcf557b0db6edede0de98e5a7d2b6d03a3bbd411c43a0fd18064605a349617b929249617964932a156351eda05c8f3e8ba60 SHA512 aa33ff5e9c489770363a801ec6d34a1520356f1a82d6a36980cef1d68d1677fdf0dfc0934b8082c263038d0442e05eb3a4e763e9a7c9a1846ec0c344138e635e -DIST lighttpd-1.4.74.tar.xz 1098796 BLAKE2B d651132b92b8e4c80e29905af11bf9245be524e715011ecbac68253ebce2342d69076731457775b009eee7e76c268f2cc218e314b2d5c7951e71222bf6c2570d SHA512 96ae90885898ec0a13441f135209a1e7c447b74b1dfbc16e75bdabcba30a4a4dd26878c205feed7f78311bcbc81b54602635cc0a64ea7fb8fe5e081f136fae2d -DIST lighttpd-1.4.74.tar.xz.asc 833 BLAKE2B eb9d1dad82a3e2ebcfc02c15dc8cc0d31f2fab650bc51696f1b474ca5dafb6d1bd02a8022117d9112ce7845ab66e08537cd3821184b967b973ba6ab244fe5a50 SHA512 20befc3f48fcb1729ad7d318c93252e7b5dc2c734bad36f42a8703d2b04782d9e9d4ec90a82cdb646da19a8fa14ef3729b16c259ca0b96c1b0474c82b644f680 DIST lighttpd-1.4.75.tar.xz 1102080 BLAKE2B 3cf89678922e319fa140beb56a95b11eb85ca1b833c9d21195d0ad0b8ea8679c71764558d03eafda0ff3aab994212375b433e56ff54349da739cd7c5384b61ae SHA512 2066ad3e9eeaed4179bd6d3a2becc4ed57d6b00cbdd729a3c0d9a7276ee9c7906c9f1274f4def696d5ef0e662158ea13eb7ecb8e107cac5519ac98a83cf9d7ef DIST lighttpd-1.4.75.tar.xz.asc 833 BLAKE2B c632a3ab7e97c981c0930129a430ee4b3776f34611831c7a8f484de4f2915be31f24df15ee517bcb0271c96c6217429333cbd67bc6f1a4c71936736246d8357c SHA512 791aab9bfb21c3c54b157e4348adbca83fae9186cc3ba27b9f0badc0af6bd74d2e70d6bb565317393b6dafb0e0b5da6e4442c77eac8d9ce597ccdb8b9176f3f9 -EBUILD lighttpd-1.4.73.ebuild 6317 BLAKE2B 3c96615003ccb1be197795c912a217bd00f1fe1885e4ff325782ef9f55767c2ca43d7a88f26096bd4eaa0a949de1d2ac00376a54ac08fc3183caf4be89d02b9a SHA512 5c7f4004f3fbfb8acf60f3d11a651e24c090d6f306c836c2081be7b0336376e3ac12261a21428f41365d4058091af0572b211c9d54bc6b2037ceea8da7d4155e -EBUILD lighttpd-1.4.74.ebuild 5640 BLAKE2B bc8e620e55a45ab72dbffa1409d4c4ddc35347234a21ecb352f2cb3bd823a3d914cb75b6806e51e53a475c8ec5f3d068fc390e1499ab01b8fd725847b8687972 SHA512 88edbafe7cb492ff3ecd615707a3a27ef05744d77ea801e5f785c25bf2ba4389689521f52391c6c77689eb20499bcbb74e187b244fa3326144f1b2a97554323f -EBUILD lighttpd-1.4.75.ebuild 5635 BLAKE2B eade58fb92ecc989ebbd3d338d916123d1aa1e18dd962d62be2d496a9763f4cd933d3985f67d4d3c464c4bfeb330b56ef9fbb3f9d6310022483275ef004f6068 SHA512 77793ea52ecc6e6d5d82ad37c85f6cf74bc5fd95f26e30e463b7127b09419b61b8e9eccfa2cceb9fe164c54153e5b1b6a7eaedfa40bbf7503faa1890250a80af -MISC metadata.xml 1939 BLAKE2B 46f98956773944353d138e6a1c5157675453078faaff227d0f2d2a78951d8284d1c05fce121fb490e46e6f7a5f544b467446814e7ebb71a844be466438fb1bb3 SHA512 e623f0b627fea7dfa5d388fada002ca40de94f1e95222d442ce310ff489b4eb0c0b4afb4e96acd2fa6034b53eed132a142c116b282bdb989cdda8a1c50ef9b13 +DIST lighttpd-1.4.76.tar.xz 847132 BLAKE2B 497e2dd802718dac10fdcd49bc917f44ddc1eebd4fa244a047ffba2a0ac92d89900e6285f385126a29100a5fd024868908fd5028ac1b947ca648305199661976 SHA512 940f00f2d84e3424c389108d09756a0af41db3559474135b6c502deccd08ad051b5184f3f7907436384964d2b05045e27dca463af98c889cee69b0ae6e202782 +DIST lighttpd-1.4.76.tar.xz.asc 833 BLAKE2B b46b3543e694c132d6e49ee239ef2d71718b5257cfc33506208b0b28bb318ffaf04fcf6282e3b54b08eedf4a3ef6da2ef2c4fd84da89316ce02d70b8f9f26faf SHA512 5a9bc460584479212ac2adddbc4dd5d4374cb08f703fdebd60471cee9c93f6cf4c7bf431a183d615aa9d1a25e237b8dd0f4f06e7249d6bb61a341565a29e2bb9 +EBUILD lighttpd-1.4.75-r1.ebuild 5331 BLAKE2B 9bbaf77c6ca099309104e54d3259d24e4c257bec824cea7130f9f928102b4b11cc19bbfb6545153d90fbd228281ec2966a0e0b9f8cfa32de1cd3ae39b7c7999c SHA512 f92527e7d305fa6c078df7ba90246e4a0c5abf83a23ad738d60aae39b6581a6339a301d2e47c6ef2ea0421907765dcdfaf939d7e920e196240a3d45d1a532555 +EBUILD lighttpd-1.4.75.ebuild 5687 BLAKE2B 64288bb588482ae52ee638ec3ef6518d95aeca22b72e0b47340195ff86690c8aedd54d1cff23dc6ce252a9b35f717219f8c192c4d0b499eef11be81eec788e6a SHA512 b05ba9c875e606b1941f47b7b153f6e22064351589ae5ea593b4e6d7d9b9f936da7c8cee9dc93472d2b0d0100b31eb1e08f195ca7309fc9c9cabb0f00cc4658c +EBUILD lighttpd-1.4.76.ebuild 5278 BLAKE2B 4caeab4124bb20f399ed71bbc378ec3c8a3a65b91e289450ddc9b8747ae8a3aa620daa589f657d452268aa783b5f5e7b87163eb42b190700d021c6f25df9f64e SHA512 61eb690d4c6517c8a96e030e8b90ea921d3f90dd2cdfee64b9ca88038108bbe8ed2962a713f2fee845f3d0310456b78a1709fbfa5e2a811d96c891435c052298 +MISC metadata.xml 1745 BLAKE2B f6a7eaffade01e450eb3d0ba03fed393a246fc167b356825e3823ba88fb130a397d5467a85cad2e13f652d67caaa33f97e1604252e104e2d91b916e9c54e7966 SHA512 28a25ec791392c8b53de8af01e1920175fa758f752e3110ffdaa5f9e2c01ca087c1e5c0e11cac7a1cfdcf55dea265e72dd3ea68e2f08f4d1ec14ffc1162fd53b diff --git a/www-servers/lighttpd/files/conf/lighttpd.conf-r2 b/www-servers/lighttpd/files/conf/lighttpd.conf-r2 new file mode 100644 index 000000000000..ca67355ecc5c --- /dev/null +++ b/www-servers/lighttpd/files/conf/lighttpd.conf-r2 @@ -0,0 +1,297 @@ +############################################################################### +# Default lighttpd.conf for Gentoo. +############################################################################### + +# {{{ variables +var.basedir = "/var/www/localhost" +var.logdir = "/var/log/lighttpd" +var.statedir = "/var/lib/lighttpd" +# }}} + +# {{{ modules +# At the very least, mod_access and mod_accesslog should be enabled. +# All other modules should only be loaded if necessary. +# NOTE: the order of modules is important. +server.modules = ( +# "mod_rewrite", +# "mod_redirect", +# "mod_alias", + "mod_access", +# "mod_magnet", +# "mod_auth", +# "mod_status", +# "mod_setenv", +# "mod_proxy", +# "mod_simple_vhost", +# "mod_evhost", +# "mod_userdir", +# "mod_deflate", +# "mod_ssi", +# "mod_expire", +# "mod_rrdtool", +# "mod_webdav", + "mod_accesslog" +) +# }}} + +# {{{ server settings +server.username = "lighttpd" +server.groupname = "lighttpd" + +server.document-root = var.basedir + "/htdocs" +server.pid-file = "/run/lighttpd.pid" + +server.errorlog = var.logdir + "/error.log" +# log errors to syslog instead +# server.errorlog-use-syslog = "enable" + +server.indexfiles = ("index.php", "index.html", + "index.htm", "default.htm") + +# server.tag = "lighttpd" + +# event handler +# see performance.txt +# +# for >= linux-2.6 +# server.event-handler = "epoll" # default on Linux +# for FreeBSD +# server.event-handler = "kqueue" # default on FreeBSD + +# chroot to directory (defaults to no chroot) +# server.chroot = "/" + +# bind to port (defaults to 80) +# server.port = 81 + +# bind to name (defaults to all interfaces) +# server.bind = "grisu.home.kneschke.de" + +# error-handler for status 404 +# server.error-handler-404 = "/error-handler.html" +# server.error-handler-404 = "/error-handler.php" + +# Format: <errorfile-prefix><status-code>.html +# -> ..../status-404.html for 'File not found' +# server.errorfile-prefix = var.basedir + "/error/status-" + +# support for caching stat() calls +# server.stat-cache-engine = "inotify" + +# If lighttpd was build with IPv6 support, and you would like to listen on IPv6, +# uncomment the following: +# server.use-ipv6 = "enable" + +# }}} + +# {{{ mod_staticfile + +# which extensions should not be handled via static-file transfer +# (extensions that are usually handled by mod_cgi, mod_fastcgi, etc). +static-file.exclude-extensions = (".php", ".pl", ".cgi", ".fcgi") +# }}} + +# {{{ mod_accesslog +accesslog.filename = var.logdir + "/access.log" +# }}} + +# {{{ mod_dirlisting +# enable directory listings +# dir-listing.activate = "enable" +# +# don't list hidden files/directories +# dir-listing.hide-dotfiles = "enable" +# +# use a different css for directory listings +# dir-listing.external-css = "/path/to/dir-listing.css" +# +# list of regular expressions. files that match any of the +# specified regular expressions will be excluded from directory +# listings. +# dir-listing.exclude = ("^\.", "~$") +# }}} + +# {{{ mod_access +# see access.txt + +url.access-deny = ("~", ".inc") +# }}} + +# {{{ mod_userdir +# see userdir.txt +# +# userdir.path = "public_html" +# userdir.exclude-user = ("root") +# }}} + +# {{{ mod_ssi +# see ssi.txt +# +# ssi.extension = (".shtml") +# }}} + +# {{{ mod_ssl +# see ssl.txt +# +# ssl.engine = "enable" +# ssl.pemfile = "server.pem" +# }}} + +# {{{ mod_status +# see status.txt +# +# status.status-url = "/server-status" +# status.config-url = "/server-config" +# }}} + +# {{{ mod_simple_vhost +# see simple-vhost.txt +# +# If you want name-based virtual hosting add the next three settings and load +# mod_simple_vhost +# +# document-root = +# virtual-server-root + virtual-server-default-host + virtual-server-docroot +# or +# virtual-server-root + http-host + virtual-server-docroot +# +# simple-vhost.server-root = "/home/weigon/wwwroot/servers/" +# simple-vhost.default-host = "grisu.home.kneschke.de" +# simple-vhost.document-root = "/pages/" +# }}} + +# {{{ mod_deflate +# see compress.txt +# +# deflate.cache-dir = var.statedir + "/cache/compress" +# deflate.mimetypes = ("text/plain", "text/html") +# }}} + +# {{{ mod_proxy +# see proxy.txt +# +# proxy.server = ( ".php" => +# ( "localhost" => +# ( +# "host" => "192.168.0.101", +# "port" => 80 +# ) +# ) +# ) +# }}} + +# {{{ mod_auth +# see authentication.txt +# +# auth.backend = "plain" +# auth.backend.plain.userfile = "lighttpd.user" +# auth.backend.plain.groupfile = "lighttpd.group" + +# auth.backend.ldap.hostname = "localhost" +# auth.backend.ldap.base-dn = "dc=my-domain,dc=com" +# auth.backend.ldap.filter = "(uid=$)" + +# auth.require = ( "/server-status" => +# ( +# "method" => "digest", +# "realm" => "download archiv", +# "require" => "user=jan" +# ), +# "/server-info" => +# ( +# "method" => "digest", +# "realm" => "download archiv", +# "require" => "valid-user" +# ) +# ) +# }}} + +# {{{ mod_rewrite +# see rewrite.txt +# +# url.rewrite = ( +# "^/$" => "/server-status" +# ) +# }}} + +# {{{ mod_redirect +# see redirect.txt +# +# url.redirect = ( +# "^/wishlist/(.+)" => "http://www.123.org/$1" +# ) +# }}} + +# {{{ mod_evhost +# define a pattern for the host url finding +# %% => % sign +# %0 => domain name + tld +# %1 => tld +# %2 => domain name without tld +# %3 => subdomain 1 name +# %4 => subdomain 2 name +# +# evhost.path-pattern = "/home/storage/dev/www/%3/htdocs/" +# }}} + +# {{{ mod_expire +# expire.url = ( +# "/buggy/" => "access 2 hours", +# "/asdhas/" => "access plus 1 seconds 2 minutes" +# ) +# }}} + +# {{{ mod_rrdtool +# see rrdtool.txt +# +# rrdtool.binary = "/usr/bin/rrdtool" +# rrdtool.db-name = var.statedir + "/lighttpd.rrd" +# }}} + +# {{{ mod_setenv +# see setenv.txt +# +# setenv.add-request-header = ( "TRAV_ENV" => "mysql://user@host/db" ) +# setenv.add-response-header = ( "X-Secret-Message" => "42" ) +# }}} + +# {{{ mod_webdav +# see webdav.txt +# +# $HTTP["url"] =~ "^/dav($|/)" { +# webdav.activate = "enable" +# webdav.is-readonly = "enable" +# } +# }}} + +# {{{ extra rules +# +# set Content-Encoding and reset Content-Type for browsers that +# support decompressing on-thy-fly (requires mod_setenv) +# $HTTP["url"] =~ "\.gz$" { +# setenv.add-response-header = ("Content-Encoding" => "x-gzip") +# mimetype.assign = (".gz" => "text/plain") +# } + +# $HTTP["url"] =~ "\.bz2$" { +# setenv.add-response-header = ("Content-Encoding" => "x-bzip2") +# mimetype.assign = (".bz2" => "text/plain") +# } +# +# }}} + +# {{{ debug +# debug.log-request-header = "enable" +# debug.log-response-header = "enable" +# debug.log-request-handling = "enable" +# debug.log-file-not-found = "enable" +# }}} + +# {{{ cgi includes +# uncomment for cgi support +# include "mod_cgi.conf" +# uncomment for php/fastcgi support +# include "mod_fastcgi.conf" +# }}} + +# vim: set ft=conf foldmethod=marker et : diff --git a/www-servers/lighttpd/files/lighttpd-1.4.75-sparc.patch b/www-servers/lighttpd/files/lighttpd-1.4.75-sparc.patch new file mode 100644 index 000000000000..d7bd72973b94 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd-1.4.75-sparc.patch @@ -0,0 +1,74 @@ +https://bugs.gentoo.org/931305 +https://github.com/lighttpd/lighttpd1.4/commit/524614455554163ec78b27b89ff52bbf7fe96958 + +From 524614455554163ec78b27b89ff52bbf7fe96958 Mon Sep 17 00:00:00 2001 +From: Glenn Strauss <gstrauss@gluelogic.com> +Date: Wed, 24 Apr 2024 03:07:37 -0400 +Subject: [PATCH] [core] special value for Linux POLLRDHUP on SPARC (fixes + #3251) + +x-ref: + "[1.4.76] buildroot compile error with bootlin-sparc{64-g,-uc}libc" + https://redmine.lighttpd.net/issues/3251 +--- a/src/fdevent.h ++++ b/src/fdevent.h +@@ -40,6 +40,8 @@ struct fdnode_st { + #if (defined(__sun) && defined(__SVR4)) /* Solaris */ \ + || defined(__FreeBSD__) + #define FDEVENT_RDHUP 0x4000 ++#elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++#define FDEVENT_RDHUP 0x2800 /*(0x2000 EPOLLRDHUP | 0x0800 POLLRDHUP)*/ + #else + #define FDEVENT_RDHUP 0x2000 + #endif +--- a/src/fdevent_impl.c ++++ b/src/fdevent_impl.c +@@ -338,6 +338,11 @@ fdevent_linux_sysepoll_event_set (fdevents *ev, fdnode *fdn, int events) + struct epoll_event ep; + #ifndef EPOLLRDHUP + events &= ~FDEVENT_RDHUP; ++ #elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++ if (events & FDEVENT_RDHUP) { ++ events &= ~FDEVENT_RDHUP; ++ events |= EPOLLRDHUP; ++ } + #endif + ep.events = events | EPOLLERR | EPOLLHUP; + ep.data.ptr = fdn; +@@ -376,7 +381,11 @@ fdevent_linux_sysepoll_init (fdevents *ev) + ck_static_assert(EPOLLERR == FDEVENT_ERR); + ck_static_assert(EPOLLHUP == FDEVENT_HUP); + #ifdef EPOLLRDHUP ++ #if (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++ ck_static_assert(EPOLLRDHUP & FDEVENT_RDHUP); ++ #else + ck_static_assert(EPOLLRDHUP == FDEVENT_RDHUP); ++ #endif + #endif + + ev->type = FDEVENT_HANDLER_LINUX_SYSEPOLL; +@@ -770,6 +779,11 @@ fdevent_poll_event_set (fdevents *ev, fdnode *fdn, int events) + + #ifndef POLLRDHUP + events &= ~FDEVENT_RDHUP; ++ #elif (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++ if (events & FDEVENT_RDHUP) { ++ events &= ~FDEVENT_RDHUP; ++ events |= POLLRDHUP; ++ } + #endif + + if (k >= 0) { +@@ -854,7 +868,11 @@ fdevent_poll_init (fdevents *ev) + ck_static_assert(POLLHUP == FDEVENT_HUP); + ck_static_assert(POLLNVAL == FDEVENT_NVAL); + #ifdef POLLRDHUP ++ #if (defined(__linux__) && (defined(__sparc__) || defined(__sparc))) ++ ck_static_assert(POLLRDHUP & FDEVENT_RDHUP); ++ #else + ck_static_assert(POLLRDHUP == FDEVENT_RDHUP); ++ #endif + #endif + + ev->type = FDEVENT_HANDLER_POLL; + diff --git a/www-servers/lighttpd/files/lighttpd.initd-r2 b/www-servers/lighttpd/files/lighttpd.initd-r2 new file mode 100644 index 000000000000..24539e3e80c7 --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd.initd-r2 @@ -0,0 +1,76 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload graceful" + +LIGHTTPD_PID="$($(which lighttpd) -pf ${LIGHTTPD_CONF} | grep server.pid-file | cut -d '=' -f 2 | tr -d \\\" | tr -d [:space:])" + +depend() { + need net + use mysql logger spawn-fcgi ldap slapd netmount dns + after famd + after sshd +} + +checkconfig() { + if [ ! -f "${LIGHTTPD_CONF}" ] ; then + ewarn "${LIGHTTPD_CONF} does not exist." + return 1 + fi + + if [ -z "${LIGHTTPD_PID}" ] ; then + eerror "server.pid-file variable in ${LIGHTTPD_CONF}" + eerror "is not set. Please set this variable properly" + eerror "and try again" + return 1 + fi + /usr/sbin/lighttpd -tt -f ${LIGHTTPD_CONF} >/dev/null +} + +start() { + checkconfig || return 1 + # Glean lighttpd's credentials from the configuration file + # Fixes bug 454366 + LIGHTTPD_USER="$(awk '/^server.username/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})" + LIGHTTPD_GROUP="$(awk '/^server.groupname/{s=$3};{sub("\"","",s)};END{print s}' ${LIGHTTPD_CONF})" + checkpath -d -q -m 0750 -o "${LIGHTTPD_USER}":"${LIGHTTPD_GROUP}" /run/lighttpd/ + + 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 --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 restarting lighttpd" + start-stop-daemon --quiet --pidfile "${LIGHTTPD_PID}" \ + --signal USR1 + eend $? +} diff --git a/www-servers/lighttpd/files/lighttpd.service-r1 b/www-servers/lighttpd/files/lighttpd.service-r1 new file mode 100644 index 000000000000..2a8f22474eea --- /dev/null +++ b/www-servers/lighttpd/files/lighttpd.service-r1 @@ -0,0 +1,14 @@ +[Unit] +Description=Lighttpd Daemon +After=syslog.target network-online.target + +[Service] +Type=simple +PIDFile=/run/lighttpd.pid +ExecStartPre=/usr/sbin/lighttpd -tt -f /etc/lighttpd/lighttpd.conf +ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf +ExecReload=/bin/kill -USR1 $MAINPID +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/www-servers/lighttpd/lighttpd-1.4.74.ebuild b/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild index 5f2f6de8bf8e..4ff76649b004 100644 --- a/www-servers/lighttpd/lighttpd-1.4.74.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.75-r1.ebuild @@ -49,7 +49,7 @@ COMMON_DEPEND=" unwind? ( sys-libs/libunwind:= ) webdav? ( dev-libs/libxml2 - sys-fs/e2fsprogs + dev-db/sqlite ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) @@ -69,6 +69,10 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-lighttpd ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.4.75-sparc.patch +) + # update certain parts of lighttpd.conf based on conditionals update_config() { local config="${ED}/etc/lighttpd/lighttpd.conf" @@ -96,7 +100,7 @@ pkg_setup() { fi DOC_CONTENTS="IPv6 migration guide:\n - https://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config + https://wiki.lighttpd.net/IPv6-Config " } @@ -120,9 +124,6 @@ src_configure() { $(meson_feature kerberos with_krb5) $(meson_feature ldap with_ldap) - # TODO: revisit (was off in autotools ebuild) - -Dwith_libev=disabled - $(meson_feature unwind with_libunwind) $(meson_use lua with_lua) @@ -160,13 +161,12 @@ src_install() { meson_src_install # Init script stuff - newinitd "${FILESDIR}"/lighttpd.initd-r1 lighttpd + newinitd "${FILESDIR}"/lighttpd.initd-r2 lighttpd newconfd "${FILESDIR}"/lighttpd.confd lighttpd # Configs insinto /etc/lighttpd - newins "${FILESDIR}"/conf/lighttpd.conf-r1 lighttpd.conf - doins "${FILESDIR}"/conf/mime-types.conf + newins "${FILESDIR}"/conf/lighttpd.conf-r2 lighttpd.conf doins "${FILESDIR}"/conf/mod_cgi.conf doins "${FILESDIR}"/conf/mod_fastcgi.conf @@ -191,7 +191,7 @@ src_install() { fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd fperms 0750 /var/l{ib,og}/lighttpd - systemd_dounit "${FILESDIR}"/${PN}.service + systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf } @@ -213,10 +213,4 @@ pkg_postinst() { elog "output compression!" elog "https://wiki.lighttpd.net/Docs_ModDeflate" fi - - elog - elog "Upstream has deprecated a number of features. They are not missing" - elog "but have been migrated to other mechanisms. Please see upstream" - elog "changelog for details." - elog "https://www.lighttpd.net/2022/1/19/1.4.64/" } diff --git a/www-servers/lighttpd/lighttpd-1.4.75.ebuild b/www-servers/lighttpd/lighttpd-1.4.75.ebuild index 4def4402a70a..915cc143c8f8 100644 --- a/www-servers/lighttpd/lighttpd-1.4.75.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.75.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd" RESTRICT="!test? ( test )" @@ -69,6 +69,10 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-lighttpd ) " +PATCHES=( + "${FILESDIR}"/${PN}-1.4.75-sparc.patch +) + # update certain parts of lighttpd.conf based on conditionals update_config() { local config="${ED}/etc/lighttpd/lighttpd.conf" diff --git a/www-servers/lighttpd/lighttpd-1.4.73.ebuild b/www-servers/lighttpd/lighttpd-1.4.76.ebuild index 89558f7caf1e..cc2d85dea515 100644 --- a/www-servers/lighttpd/lighttpd-1.4.73.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.76.ebuild @@ -16,16 +16,12 @@ SRC_URI=" LICENSE="BSD GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls mmap mysql +nettle nss +pcre php postgres rrdtool sasl selinux ssl sqlite test unwind webdav xattr +zlib zstd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="+brotli dbi gnutls kerberos ldap +lua maxminddb mbedtls +nettle nss +pcre php sasl selinux ssl test unwind webdav xattr +zlib zstd" RESTRICT="!test? ( test )" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) - mysql? ( dbi ) - postgres? ( dbi ) - sqlite? ( dbi ) - webdav? ( sqlite ) " # Match the bundled xxhash version for the minimum version @@ -37,9 +33,6 @@ COMMON_DEPEND=" brotli? ( app-arch/brotli:= ) dbi? ( dev-db/libdbi - mysql? ( dev-db/libdbi-drivers[mysql] ) - postgres? ( dev-db/libdbi-drivers[postgres] ) - sqlite? ( dev-db/libdbi-drivers[sqlite] ) ) gnutls? ( net-libs/gnutls ) kerberos? ( virtual/krb5 ) @@ -51,13 +44,12 @@ COMMON_DEPEND=" nss? ( dev-libs/nss ) pcre? ( dev-libs/libpcre2 ) php? ( dev-lang/php:*[cgi] ) - rrdtool? ( net-analyzer/rrdtool ) sasl? ( dev-libs/cyrus-sasl ) ssl? ( >=dev-libs/openssl-0.9.7:= ) unwind? ( sys-libs/libunwind:= ) webdav? ( dev-libs/libxml2 - sys-fs/e2fsprogs + dev-db/sqlite ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) @@ -104,7 +96,7 @@ pkg_setup() { fi DOC_CONTENTS="IPv6 migration guide:\n - https://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config + https://wiki.lighttpd.net/IPv6-Config " } @@ -128,9 +120,6 @@ src_configure() { $(meson_feature kerberos with_krb5) $(meson_feature ldap with_ldap) - # TODO: revisit (was off in autotools ebuild) - -Dwith_libev=disabled - $(meson_feature unwind with_libunwind) $(meson_use lua with_lua) @@ -139,9 +128,6 @@ src_configure() { $(meson_feature maxminddb with_maxminddb) $(meson_use mbedtls with_mbedtls) - # TODO: revisit (was off in autotools ebuild) - -Dwith_mysql=disabled - $(meson_use nettle with_nettle) $(meson_use nss with_nss) @@ -150,15 +136,11 @@ src_configure() { $(meson_use pcre with_pcre2) - # TODO: revisit (was off in autotools ebuild) - -Dwith_pgsql=disabled - $(meson_feature sasl with_sasl) $(meson_use ssl with_openssl) -Dwith_xxhash=enabled $(meson_feature webdav with_webdav_props) - $(meson_feature webdav with_webdav_locks) # Unpackaged in Gentoo -Dwith_wolfssl=false @@ -175,13 +157,12 @@ src_install() { meson_src_install # Init script stuff - newinitd "${FILESDIR}"/lighttpd.initd-r1 lighttpd + newinitd "${FILESDIR}"/lighttpd.initd-r2 lighttpd newconfd "${FILESDIR}"/lighttpd.confd lighttpd # Configs insinto /etc/lighttpd - newins "${FILESDIR}"/conf/lighttpd.conf-r1 lighttpd.conf - doins "${FILESDIR}"/conf/mime-types.conf + newins "${FILESDIR}"/conf/lighttpd.conf-r2 lighttpd.conf doins "${FILESDIR}"/conf/mod_cgi.conf doins "${FILESDIR}"/conf/mod_fastcgi.conf @@ -206,7 +187,7 @@ src_install() { fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd fperms 0750 /var/l{ib,og}/lighttpd - systemd_dounit "${FILESDIR}"/${PN}.service + systemd_newunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf } @@ -228,17 +209,4 @@ pkg_postinst() { elog "output compression!" elog "https://wiki.lighttpd.net/Docs_ModDeflate" fi - - if use mysql ; then - elog - elog "Note that upstream has moved away from using mysql directly" - elog "via mod_mysql and is now accessing it through mod_dbi. You" - elog "may need to update your configuration" - fi - - elog - elog "Upstream has deprecated a number of features. They are not missing" - elog "but have been migrated to other mechanisms. Please see upstream" - elog "changelog for details." - elog "https://www.lighttpd.net/2022/1/19/1.4.64/" } diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml index acdf6d756893..33390f7e2be2 100644 --- a/www-servers/lighttpd/metadata.xml +++ b/www-servers/lighttpd/metadata.xml @@ -18,16 +18,13 @@ <flag name="gnutls">Build module for TLS via <pkg>net-libs/gnutls</pkg></flag> <flag name="maxminddb">Add support for geolocation using <pkg>dev-libs/libmaxminddb</pkg></flag> <flag name="mbedtls">Build module for TLS via <pkg>net-libs/mbedtls</pkg></flag> - <flag name="mmap">Use mmap when sendfile is not available</flag> <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> as crypto backend</flag> <flag name="nss">Build module for TLS via Mozilla's Network Security Services</flag> - <flag name="rrdtool">Enable rrdtool support via mod_rrdtool</flag> <flag name="webdav">Enable webdav properties</flag> <flag name="zlib">Enable output compression via gzip or deflate algorithms from <pkg>sys-libs/zlib</pkg></flag> <flag name="zstd">Enable output compression via Zstandard (<pkg>app-arch/zstd</pkg>) algorithm</flag> </use> <upstream> <remote-id type="github">lighttpd/lighttpd1.4</remote-id> - <remote-id type="github">lighttpd/lighttpd2</remote-id> </upstream> </pkgmetadata> |