From 2f8db31405fac68eea6f7257d58529243815033b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 30 Apr 2018 21:33:31 +0100 Subject: gentoo resync : 30.04.2018 --- www-servers/lighttpd/Manifest | 7 +- www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild | 219 +++++++++++++++++++++++++ www-servers/lighttpd/lighttpd-1.4.45.ebuild | 4 +- www-servers/lighttpd/lighttpd-1.4.49.ebuild | 8 +- www-servers/lighttpd/lighttpd-9999.ebuild | 4 +- 5 files changed, 231 insertions(+), 11 deletions(-) create mode 100644 www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild (limited to 'www-servers/lighttpd') diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest index 86a0662f188f..b52cd257cc91 100644 --- a/www-servers/lighttpd/Manifest +++ b/www-servers/lighttpd/Manifest @@ -10,7 +10,8 @@ AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469a AUX lighttpd.tmpfiles.conf 44 BLAKE2B 00550d523dc350184ef0d681e9e8da5ad1909dd6226698c79d88c7cab7d35c8e20a0c308b5342f94872442aeac240e202ea6055f4666759f9ec853debac18730 SHA512 795448ad726ebfe7688236a23cb21bf06bbf8edd7e243924e3d1c21d33fffba1e04501734b189eb2081f6737b74af7c978eed802fb5e540dcc5c5aea69544936 DIST lighttpd-1.4.45.tar.xz 660432 BLAKE2B 31ea3209b8efad32c3811d39b1c1a682d9f2d79a2ecd7d90c413ad066b6a7d5f84df9b3af2ffb2d49a701856ac496626f2a744b25f1dc4fe1c3b9af586fc437f SHA512 d030674a8c55aab12d32ac75f8df2628ba2332a5263c8bd2dd4f39342530080edc6ba2a6fee749c1301d601ab766a265d3c630b04d38bb26bba3cf045935573d DIST lighttpd-1.4.49.tar.xz 710964 BLAKE2B 112ceb36b45f51c7d5526caba27d2b2aa57ec9d14751e1334472c9079c25317c5e37faf884788c84d61fa6cfa2efedc0b4ec02e32308beb6a0b6be28eea44fbd SHA512 de766da68b4cacfb6c322210eafe819b6423334272e9fae4688c2282a66a2e55aaf580c5fdbf02676ed6f7b32d13f2f28cefd22518f77127055ec336ec5d6784 -EBUILD lighttpd-1.4.45.ebuild 6066 BLAKE2B cc04f7982f6c36337232f432c9212b1451eece9415db135f26716826db4e3262e1ab16d256d811a2157db82a3c2f9477e9194917946b33e606cbf5eff34d7ad7 SHA512 caf64046a76554ee3f5953bc0f4b3ba590c88702b0df34287b7937dfe726eb3daf06afcb07a84df5a8ab6f9e1058d5b29f9eb07bc4e6b9778420285882385ee4 -EBUILD lighttpd-1.4.49.ebuild 6469 BLAKE2B 610f88ad7914bd026e9e44a112da45427be7c7dd2c42034eae39d0bd7a93b1d5ae78bd9fb24e2753c77839adfdc2f409eb9eb51bd65b09c42292c0bd4b2c256f SHA512 477022cd24b93328901ccbfa87610cada519899287eab46b1c7970606fa400834a51c291fa02fd603312c8fa4d6658e0da70129f94332812d804499638384daa -EBUILD lighttpd-9999.ebuild 6097 BLAKE2B 909ce4816861ff7fce4e9cd1fdd69005148a718d0d2c034096384ead8ab4c54be90e7cd97db5031d4deb52ce102cf2dbe2c8f38d6b26c2748254ad1002c7b68e SHA512 f1898fb6b9b9331d206119bd3ca0cec00d8cce4836dda65829d7d82c79ba4a38b8a55cd5e08dedd1780a29f78e0deb7ecbb546826a182202fa1c009a3a794bc9 +EBUILD lighttpd-1.4.45-r1.ebuild 6093 BLAKE2B 427d34a215d4c740e209c1f559dde12995f50a611cde0bb4d3cb91f2de44ba6abe87938c392627dcc79e1d2129949b33d4189349f1ae9f0f4ee0b7cb08e6dda3 SHA512 0d010af52425208f566aa8b350d5f98acf5957603afe256497089643995a541b494ec19a9e848fd983511af9ab40f6b453b529e92902a0c210dfb44f88ee475f +EBUILD lighttpd-1.4.45.ebuild 6068 BLAKE2B 9d935a8d3390d25046db4781463d1ada7978c3d9e47398cd8add1e7aa7539298b104a6a3747f03ac17e7c7942224d428e308889bc964458cbafa82be0581a8f7 SHA512 bded6eb001f02f5e2a7454c05705b3e402cc5c65201b7feb644fb8cc7afc6cd46b72336bc07cb4a19d19a32895e8e3ec7d3af90eff7fad246c778400c3585eec +EBUILD lighttpd-1.4.49.ebuild 6473 BLAKE2B e7d6350f1da2cfe4057fb20eb738e8229e82dbdc63e7948c2ef24bd9a6cb060fd643c8ecdefb87c94f478f2714b929aac49ea06ea880929fd14fc3c6a4e0adbb SHA512 863efd3675de773aaf1443023c686e4bbc75de21cd1caf7caf1b4b5be823f71eca8068c421878288519a22a2ca63cad59463b19ab02bcef8a14175efca63539b +EBUILD lighttpd-9999.ebuild 6098 BLAKE2B ff6c9b9052d8efb3d2fa1be0f0ba86b2827ff18dc74a223be6eac386924c94591ec44166107e84351f70aaed026c13fdb37dc2b292e5604b047bf1a208bf992f SHA512 72fddb3ae987eae5ac08db230f6240d1a9d2e781dabe9e3fb2dea26aba104258705626c02901fb2ae1d5ca7186ec711bb19f4a173bdaa8ff3720ff9ae18baadf MISC metadata.xml 1162 BLAKE2B 1c22a68843890ac45b6a9f446ea8494f0768c13d20c77daf512988f18e764921c6f098afdf8a5bde09a3d8600153f30e1232c28f73188c49e83b02777be0150a SHA512 b796cfcd6c4f0340db88f24acd2cc3c11315b35e37f2bd0aea0b8608ad8ce67f8df7a64658628527179db65324ff8a8db441d5991309f70a13c855ab58afcea4 diff --git a/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild b/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild new file mode 100644 index 000000000000..492f35263c47 --- /dev/null +++ b/www-servers/lighttpd/lighttpd-1.4.45-r1.ebuild @@ -0,0 +1,219 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools readme.gentoo-r1 systemd user + +DESCRIPTION="Lightweight high-performance web server" +HOMEPAGE="https://www.lighttpd.net/" +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 ~sh sparc x86 ~x86-fbsd" +IUSE="bzip2 doc fam gdbm ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php rrdtool selinux ssl test webdav xattr zlib" + +REQUIRED_USE="kerberos? ( ssl !libressl )" + +CDEPEND=" + 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:= ) + memcached? ( dev-libs/libmemcached ) + mysql? ( >=virtual/mysql-4.0 ) + pcre? ( >=dev-libs/libpcre-3.1 ) + php? ( dev-lang/php:*[cgi] ) + rrdtool? ( net-analyzer/rrdtool ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) + libressl? ( dev-libs/libressl:= ) + ) + webdav? ( + dev-libs/libxml2 + >=dev-db/sqlite-3 + sys-fs/e2fsprogs + ) + xattr? ( kernel_linux? ( sys-apps/attr ) ) + zlib? ( >=sys-libs/zlib-1.1 )" + +DEPEND="${CDEPEND} + virtual/pkgconfig + doc? ( dev-python/docutils ) + test? ( + virtual/perl-Test-Harness + dev-libs/fcgi + )" + +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-apache ) +" + +# 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}.* || die + + # 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 + if use mmap; then + ewarn "You have enabled the mmap option. This option may allow" + ewarn "local users to trigger SIGBUG crashes. Use this option" + ewarn "with EXTRA care." + fi + enewgroup lighttpd + enewuser lighttpd -1 -1 /var/www/localhost/htdocs lighttpd + + DOC_CONTENTS="IPv6 migration guide:\n + http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config" +} + +src_prepare() { + default + #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_enable mmap) \ + $(use_with bzip2) \ + $(use_with fam) \ + $(use_with gdbm) \ + $(use_with kerberos krb5) \ + $(use_with ldap) \ + $(use_with libev) \ + $(use_with lua) \ + $(use_with memcached) \ + $(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 + + if use doc ; then + einfo "Building HTML documentation" + cd doc || die + emake html + 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() { + default + + find "${D}" -name '*.la' -delete || die + + # init script stuff + newinitd "${FILESDIR}"/lighttpd.initd lighttpd + newconfd "${FILESDIR}"/lighttpd.confd lighttpd + use fam && has_version app-admin/fam && \ + { sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; } + + # 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 + + # 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 ipv6 && readme.gentoo_create_doc + + use doc && dodoc -r doc + + docinto txt + dodoc doc/outdated/*.txt + + # logrotate + insinto /etc/logrotate.d + newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd + + 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.* || die + + use minimal && remove_non_essential + + systemd_dounit "${FILESDIR}/${PN}.service" + systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" +} + +pkg_postinst () { + use ipv6 && readme.gentoo_print_elog + + 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.45.ebuild b/www-servers/lighttpd/lighttpd-1.4.45.ebuild index ad8fafed3d28..c0c1fb534991 100644 --- a/www-servers/lighttpd/lighttpd-1.4.45.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.45.ebuild @@ -5,8 +5,8 @@ EAPI="6" inherit autotools eutils readme.gentoo-r1 user systemd DESCRIPTION="Lightweight high-performance web server" -HOMEPAGE="http://www.lighttpd.net/" -SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz" +HOMEPAGE="https://www.lighttpd.net/" +SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz" LICENSE="BSD GPL-2" SLOT="0" diff --git a/www-servers/lighttpd/lighttpd-1.4.49.ebuild b/www-servers/lighttpd/lighttpd-1.4.49.ebuild index a8b1cc10cf28..902e56f4bb6f 100644 --- a/www-servers/lighttpd/lighttpd-1.4.49.ebuild +++ b/www-servers/lighttpd/lighttpd-1.4.49.ebuild @@ -6,8 +6,8 @@ EAPI=6 inherit autotools flag-o-matic readme.gentoo-r1 systemd user DESCRIPTION="Lightweight high-performance web server" -HOMEPAGE="http://www.lighttpd.net/" -SRC_URI="http://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz" +HOMEPAGE="https://www.lighttpd.net/" +SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz" LICENSE="BSD GPL-2" SLOT="0" @@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x8 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 )" + webdav? ( sqlite )" CDEPEND=" bzip2? ( app-arch/bzip2 ) @@ -32,7 +32,7 @@ CDEPEND=" php? ( dev-lang/php:*[cgi] ) postgres? ( dev-db/postgresql:* ) rrdtool? ( net-analyzer/rrdtool ) - sasl? ( dev-libs/cyrus-sasl ) + sasl? ( dev-libs/cyrus-sasl ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7:0=[kerberos?] ) libressl? ( dev-libs/libressl:= ) diff --git a/www-servers/lighttpd/lighttpd-9999.ebuild b/www-servers/lighttpd/lighttpd-9999.ebuild index 889032d8b589..c567f487647d 100644 --- a/www-servers/lighttpd/lighttpd-9999.ebuild +++ b/www-servers/lighttpd/lighttpd-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" inherit autotools eutils readme.gentoo-r1 user systemd git-r3 DESCRIPTION="Lightweight high-performance web server" -HOMEPAGE="http://www.lighttpd.net/" +HOMEPAGE="https://www.lighttpd.net/" EGIT_REPO_URI="https://git.lighttpd.net/lighttpd1.4.git git+ssh://git@lighttpd.net/lighttpd/lighttpd1.4.git git://git.lighttpd.net/lighttpd/lighttpd1.4.git" LICENSE="BSD GPL-2" -- cgit v1.2.3