Diff lighttpd-1.4.55-r101 with a lighttpd-1.4.58-r1

/usr/portage/www-servers/lighttpd/lighttpd-1.4.58-r1.ebuild 2021-07-31 02:40:00.000000000 +0300
3 3

  
4 4
EAPI=7
5 5

  
6
LUA_COMPAT=( lua5-{1..3} )
6
LUA_COMPAT=( lua5-{1..4} )
7 7

  
8
inherit autotools flag-o-matic lua-single readme.gentoo-r1 systemd toolchain-funcs tmpfiles
8
inherit autotools flag-o-matic lua-single readme.gentoo-r1 systemd tmpfiles toolchain-funcs
9 9

  
10 10
DESCRIPTION="Lightweight high-performance web server"
11 11
HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
......
14 14
LICENSE="BSD GPL-2"
15 15
SLOT="0"
16 16
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
17
IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
17
IUSE="brotli bzip2 dbi doc gdbm gnutls ipv6 kerberos ldap libev lua maxminddb minimal mbedtls mmap memcached mysql nss pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
18 18
RESTRICT="!test? ( test )"
19 19

  
20
REQUIRED_USE="kerberos? ( ssl )
21
	lua? ( ${LUA_REQUIRED_USE} )
22
	webdav? ( sqlite )"
20
REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
21
	mysql? ( dbi )
22
	postgres? ( dbi )
23
	sqlite? ( dbi )
24
	webdav? ( sqlite )
25
"
23 26

  
24
BDEPEND="dev-libs/libgamin
25
	virtual/pkgconfig"
27
BDEPEND="virtual/pkgconfig"
26 28

  
27 29
COMMON_DEPEND="
28 30
	virtual/libcrypt:=
29
	bzip2?    ( app-arch/bzip2 )
30
	dbi?	( dev-db/libdbi )
31
	fam?    ( virtual/fam )
32
	gdbm?   ( sys-libs/gdbm:= )
33
	geoip?	( dev-libs/geoip )
34
	ldap?   ( >=net-nds/openldap-2.1.26 )
35
	libev?  ( >=dev-libs/libev-4.01 )
36
	lua?    ( ${LUA_DEPS} )
37
	memcached? ( dev-libs/libmemcached )
38
	mysql?  ( dev-db/mysql-connector-c:= )
39
	pcre?   ( >=dev-libs/libpcre-3.1:= )
40
	php?      ( dev-lang/php:*[cgi] )
41
	postgres? ( dev-db/postgresql:* )
42
	rrdtool?  ( net-analyzer/rrdtool )
43
	sasl?     ( dev-libs/cyrus-sasl )
44
	ssl? (
45
		>=dev-libs/openssl-0.9.7:0=
31
	brotli? ( app-arch/brotli )
32
	bzip2? ( app-arch/bzip2 )
33
	dbi? (
34
		dev-db/libdbi
35
		mysql? ( dev-db/libdbi-drivers[mysql] )
36
		postgres? ( dev-db/libdbi-drivers[postgres] )
37
		sqlite? ( dev-db/libdbi-drivers[sqlite] )
46 38
	)
47
	sqlite?	( dev-db/sqlite:3 )
39
	gdbm? ( sys-libs/gdbm:= )
40
	gnutls? ( net-libs/gnutls:= )
41
	kerberos? ( virtual/krb5 )
42
	ldap? ( >=net-nds/openldap-2.1.26 )
43
	libev? ( >=dev-libs/libev-4.01 )
44
	lua? ( ${LUA_DEPS} )
45
	maxminddb? ( dev-libs/libmaxminddb:= )
46
	mbedtls? ( net-libs/mbedtls:= )
47
	memcached? ( dev-libs/libmemcached )
48
	nss? ( dev-libs/nss )
49
	pcre? ( >=dev-libs/libpcre-3.1:= )
50
	php? ( dev-lang/php:*[cgi] )
51
	rrdtool? ( net-analyzer/rrdtool )
52
	sasl? ( dev-libs/cyrus-sasl )
53
	ssl? ( >=dev-libs/openssl-0.9.7:0= )
48 54
	webdav? (
49 55
		dev-libs/libxml2
50 56
		sys-fs/e2fsprogs
......
72 78
	# enable php/mod_fastcgi settings
73 79
	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
74 80

  
75
	# enable stat() caching
76
	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
77

  
78 81
	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
79 82
	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
80 83
}
......
88 91

  
89 92
	# non-essential modules
90 93
	rm -f \
91
		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* || die
94
		${libdir}/mod_{evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* || die
92 95

  
93 96
	# allow users to keep some based on USE flags
94 97
	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
95 98
	use webdav  || rm -f ${libdir}/mod_webdav.*
96
	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
97 99
	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
98 100
	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
99
	use zlib    || rm -f ${libdir}/mod_compress.*
101
	use zlib || use bzip2 || use brotli || rm -f ${libdir}/mod_deflate.*
100 102
}
101 103

  
102 104
pkg_setup() {
......
119 121
src_prepare() {
120 122
	default
121 123
	use memcached && append-ldflags -pthread
122
	#dev-python/docutils installs rst2html.py not rst2html
124
	# dev-python/docutils installs rst2html.py not rst2html
123 125
	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
124 126
		die "sed doc/Makefile.am failed"
125 127
	eautoreconf
......
140 142
		--enable-lfs \
141 143
		$(use_enable ipv6) \
142 144
		$(use_enable mmap) \
145
		$(use_with brotli) \
143 146
		$(use_with bzip2) \
144 147
		$(use_with dbi) \
145
		$(use_with fam) \
146 148
		$(use_with gdbm) \
147
		$(use_with geoip ) \
149
		$(use_with gnutls ) \
148 150
		$(use_with kerberos krb5) \
149 151
		$(use_with ldap) \
150 152
		$(use_with libev) \
151 153
		$(use_with lua lua ${ELUA}) \
154
		$(use_with maxminddb) \
155
		$(use_with mbedtls) \
152 156
		$(use_with memcached) \
153
		$(use_with mysql) \
157
		$(use_with nss) \
154 158
		$(use_with pcre) \
155
		$(use_with postgres pgsql) \
156 159
		$(use_with sasl) \
157 160
		$(use_with ssl openssl) \
158
		$(use_with sqlite) \
159 161
		$(use_with webdav webdav-props) \
160 162
		$(use_with webdav webdav-locks) \
161 163
		$(use_with xattr attr) \
......
188 190
	# init script stuff
189 191
	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
190 192
	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
191
	use fam && has_version app-admin/fam && \
192
		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
193 193

  
194 194
	# configs
195 195
	insinto /etc/lighttpd
......
219 219
	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
220 220
	fperms 0750 /var/l{ib,og}/lighttpd
221 221

  
222
	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
222
	# spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
223 223
	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* || die
224 224

  
225 225
	use minimal && remove_non_essential
226 226

  
227 227
	systemd_dounit "${FILESDIR}/${PN}.service"
228
	dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf"
228
	newtmpfiles "${FILESDIR}/${PN}.tmpfiles.conf" "${PN}.conf"
229 229
}
230 230

  
231 231
pkg_postinst() {
232
	tmpfiles_process ${PN}.tmpfiles.conf
232
	tmpfiles_process ${PN}.conf
233 233

  
234 234
	use ipv6 && readme.gentoo_print_elog
235 235

  
......
240 240
	fi
241 241

  
242 242
	if [[ -f ${ROOT}/etc/lighttpd.conf ]] ; then
243
		elog
243 244
		elog "Gentoo has a customized configuration,"
244
		elog "which is now located in /etc/lighttpd.  Please migrate your"
245
		elog "which is now located in /etc/lighttpd. Please migrate your"
245 246
		elog "existing configuration."
246 247
	fi
248

  
249
	if use brotli || use bzip2 || use zlib; then
250
		elog
251
		elog "Remember to clean your cache directory when using"
252
		elog "output compression!"
253
		elog "https://redmine.lighttpd.net/projects/lighttpd/wiki/Docs_ModDeflate"
254
	fi
255

  
256
	if use mysql; then
257
		elog
258
		elog "Note that upstream has moved away from using mysql directly"
259
		elog "via mod_mysql and is now accessing it through mod_dbi. You"
260
		elog "may need to update your configuration"
261
	fi
262

  
263
	elog
264
	elog "Upstream has deprecated a number of features. They are not missing"
265
	elog "but have been migrated to other mechanisms. Please see upstream"
266
	elog "changelog for details."
267
	elog "https://www.lighttpd.net/2020/12/17/1.4.57/"
247 268
}
Thank you!