diff options
Diffstat (limited to 'user/lighttpd')
| -rw-r--r-- | user/lighttpd/APKBUILD | 25 | ||||
| -rw-r--r-- | user/lighttpd/char-signedness.patch | 46 | ||||
| -rw-r--r-- | user/lighttpd/lighttpd.conf | 3 |
3 files changed, 12 insertions, 62 deletions
diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD index 356bce93e..85d4047e0 100644 --- a/user/lighttpd/APKBUILD +++ b/user/lighttpd/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lighttpd -pkgver=1.4.48 +pkgver=1.4.49 pkgrel=0 pkgdesc="A secure, fast, compliant and very flexible web-server" url="http://www.lighttpd.net/" arch="all" -license="custom" +license="BSD-3-Clause" install="$pkgname.pre-install $pkgname.pre-upgrade" pkgusers="lighttpd" pkggroups="lighttpd" -makedepends="flex pcre-dev openssl-dev zlib-dev bzip2-dev lua5.2-dev - automake autoconf openldap-dev libxml2-dev sqlite-dev libev-dev - gamin-dev attr-dev" +makedepends="attr-dev bzip2-dev flex gamin-dev libev-dev libxml2-dev + openldap-dev openssl-dev pcre-dev sqlite-dev zlib-dev" subpackages="$pkgname-doc $pkgname-dbg $pkgname-mod_auth $pkgname-openrc $pkgname-mod_webdav" source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.tar.xz @@ -24,8 +23,7 @@ source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.ta mod_cgi.conf mod_fastcgi.conf mod_fastcgi_fpm.conf - char-signedness.patch" -builddir="$srcdir/$pkgname-$pkgver" + " build() { cd "$builddir" @@ -39,7 +37,6 @@ build() { --libdir=/usr/lib/lighttpd \ --without-mysql \ --with-attr \ - --without-kerberos5 \ --with-fam \ --with-webdav-props \ --with-webdav-locks \ @@ -47,8 +44,7 @@ build() { --with-bzip2 \ --with-ldap \ --with-openssl \ - --with-libev \ - --with-lua + --with-libev make } @@ -104,13 +100,12 @@ mod_webdav() { _mv_mod mod_webdav } -sha512sums="361dbf07b280aa7345f3026cce6d12d0aeaa3bb535b5a5b2a894a568395f46a9c7ce723dfd1948225117495f3e63ec207b72d5e4b680da7cd56419e23cf8bae4 lighttpd-1.4.48.tar.xz +sha512sums="de766da68b4cacfb6c322210eafe819b6423334272e9fae4688c2282a66a2e55aaf580c5fdbf02676ed6f7b32d13f2f28cefd22518f77127055ec336ec5d6784 lighttpd-1.4.49.tar.xz f2f3c5c7731550237fd75a8de66275f427eaf897cffff7ac7ef44178328ad8fad6c4ec6654759bfc665cbaf7991ddcdf0aaa916831c8b6aa440192d57b242038 lighttpd.initd 9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291 lighttpd.confd 0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16 lighttpd.logrotate -b0fd7500ea7f7f7f9fbf04bb66eb06050cfed57bdc1730900b4c559598176442e4504395f1d406e037e7cffeaa1451d40a6cad408570f7f7e1dd6cc26c968912 lighttpd.conf +e56ee836fa815c98c711f9381a8552ca94e1841aee5ddeee83631c385ccc556e966331499f4784982385f7ed4177062d3349705fd24de2ec5f1544ab1cc424de lighttpd.conf a3f2f5763885d7e4f510491b24164e34aaf62bb02daa12991575dc64335c12668355af5bb8d6ce191eb4e9cce95324b1f7c9ba61b323b4e7b50a1e03e021afcf mime-types.conf 27cc638d8068dcf47bd9db44943d1db6c6f4e8e6abd6b42af7cea004b1c093440068541d98c68f8bea70b956713adaf8ed59a4b642dea826ee8620a05f8cfde5 mod_cgi.conf 1d15b84c03fb648a0e67ab5c5411b85478b4454c44bc2959cc96d1700eeadd7ff429520a5f1550db6527267646622dccd3d47d3fd1258869fccaf5c22d4ad4b2 mod_fastcgi.conf -f9efc4b70d825600f5356c30e57d0b6cac11c01739337f7192c09c2cfd96cb76c8328b11d818ea4c2addc1a6d253975b84700106ae75854d55d0df73e220bd2b mod_fastcgi_fpm.conf -ce35c1d65d7b4fedd1fcfadd8a5e906d5efa8dcda318a4fa69958b708c2df329f708591f43b12adaaac4da6a2913d0cc8f9745e636e7f2016c1075bcd52c6bb2 char-signedness.patch" +f9efc4b70d825600f5356c30e57d0b6cac11c01739337f7192c09c2cfd96cb76c8328b11d818ea4c2addc1a6d253975b84700106ae75854d55d0df73e220bd2b mod_fastcgi_fpm.conf" diff --git a/user/lighttpd/char-signedness.patch b/user/lighttpd/char-signedness.patch deleted file mode 100644 index 43f7f5faf..000000000 --- a/user/lighttpd/char-signedness.patch +++ /dev/null @@ -1,46 +0,0 @@ - -Added by gstrauss 16 days ago - - ID d4083effab0f9bf76528d5c47198b17e7471ed13 - Parent 0c95ed37 - Child 37f9b60d - -[core] fix base64 decode when char is unsigned (fixes #2848) - -thx, codehero - -x-ref: -"buffer_append_base64_decode() broken on compilers where char is assumed unsigned" -https://redmine.lighttpd.net/issues/2848 - -diff --git a/src/base64.c b/src/base64.c -index f39dbaa2..3034181a 100644 ---- a/src/base64.c -+++ b/src/base64.c -@@ -11,7 +11,7 @@ - - /* BASE64_STANDARD: "A-Z a-z 0-9 + /" maps to 0-63, pad with "=" */ - static const char base64_standard_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; --static const char base64_standard_reverse_table[] = { -+static const signed char base64_standard_reverse_table[] = { - /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ - -1, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, /* 0x00 - 0x0F */ - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, /* 0x10 - 0x1F */ -@@ -25,7 +25,7 @@ static const char base64_standard_reverse_table[] = { - - /* BASE64_URL: "A-Z a-z 0-9 - _" maps to 0-63, pad with "." */ - static const char base64_url_table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_."; --static const char base64_url_reverse_table[] = { -+static const signed char base64_url_reverse_table[] = { - /* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ - -1, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, /* 0x00 - 0x0F */ - -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, /* 0x10 - 0x1F */ -@@ -42,7 +42,7 @@ unsigned char* buffer_append_base64_decode(buffer *out, const char* in, size_t i - size_t out_pos = 0; /* current output character (position) that is decoded. can contain partial result */ - unsigned int group = 0; /* how many base64 digits in the current group were decoded already. each group has up to 4 digits */ - size_t i; -- const char *base64_reverse_table; -+ const signed char *base64_reverse_table; - - switch (charset) { - case BASE64_STANDARD: diff --git a/user/lighttpd/lighttpd.conf b/user/lighttpd/lighttpd.conf index cfec00065..afb57fb17 100644 --- a/user/lighttpd/lighttpd.conf +++ b/user/lighttpd/lighttpd.conf @@ -32,7 +32,8 @@ server.modules = ( # "mod_secdownload", # "mod_rrdtool", # "mod_webdav", - "mod_accesslog" + "mod_accesslog", +# "mod_openssl" # You need this if you want TLS! ) |