From 0f4edf70c6d274d15dc2d1849b9932fd89e1e9e9 Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Mon, 4 Oct 2021 19:30:03 -0400 Subject: [PATCH] lighttpd: update to 1.4.60 remove dependency on libev; lighttpd has used epoll on Linux for a long time --- srcpkgs/lighttpd/patches/020-decls.patch | 34 +++++++++++++++++++ srcpkgs/lighttpd/patches/020-meson-zstd.patch | 29 ---------------- srcpkgs/lighttpd/template | 12 +++---- 3 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 srcpkgs/lighttpd/patches/020-decls.patch delete mode 100644 srcpkgs/lighttpd/patches/020-meson-zstd.patch diff --git a/srcpkgs/lighttpd/patches/020-decls.patch b/srcpkgs/lighttpd/patches/020-decls.patch new file mode 100644 index 000000000000..c1d15cfb8737 --- /dev/null +++ b/srcpkgs/lighttpd/patches/020-decls.patch @@ -0,0 +1,34 @@ +From cf4dfbe15ef8ead3a7eda974af7d804d447f00db Mon Sep 17 00:00:00 2001 +From: Glenn Strauss +Date: Mon, 4 Oct 2021 09:51:22 -0400 +Subject: [PATCH] [core] define __BEGIN_DECLS, __END_DECLS if needed + +--- + src/first.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +--- a/src/first.h ++++ b/src/first.h +@@ -39,6 +39,22 @@ + #include + #include + ++#ifndef __BEGIN_DECLS ++#ifdef __cplusplus ++#define __BEGIN_DECLS extern "C" { ++#else ++#define __BEGIN_DECLS ++#endif ++#endif ++ ++#ifndef __END_DECLS ++#ifdef __cplusplus ++#define __END_DECLS } ++#else ++#define __END_DECLS ++#endif ++#endif ++ + #if defined HAVE_STDINT_H + # include + #elif defined HAVE_INTTYPES_H diff --git a/srcpkgs/lighttpd/patches/020-meson-zstd.patch b/srcpkgs/lighttpd/patches/020-meson-zstd.patch deleted file mode 100644 index 647bf7f98b56..000000000000 --- a/srcpkgs/lighttpd/patches/020-meson-zstd.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a737572aa4b7a50fd9ac3f54245e40fd5cd2609d Mon Sep 17 00:00:00 2001 -From: Glenn Strauss -Date: Wed, 3 Feb 2021 00:35:34 -0500 -Subject: [PATCH] [meson] add with_zstd to meson_options.txt - -Signed-off-by: Glenn Strauss ---- - meson_options.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git meson_options.txt meson_options.txt -index 51bea44d..f6687159 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -148,6 +148,11 @@ option('with_zlib', - value: true, - description: 'with deflate-support for mod_deflate [default: on]', - ) -+option('with_zstd', -+ type: 'boolean', -+ value: false, -+ description: 'with zstd-support for mod_deflate [default: off]', -+) - - option('build_extra_warnings', - type: 'boolean', --- -2.29.2 - diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template index 4891e13d3d63..18e5fced85a3 100644 --- a/srcpkgs/lighttpd/template +++ b/srcpkgs/lighttpd/template @@ -1,18 +1,18 @@ # Template file for 'lighttpd' pkgname=lighttpd -version=1.4.59 -revision=2 +version=1.4.60 +revision=1 build_style=meson configure_args="-Dwith_brotli=false -Dwith_bzip=false -Dwith_fam=false -Dwith_gdbm=true - -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true + -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=false -Dwith_libunwind=false -Dwith_lua=true -Dwith_memcached=true -Dwith_mysql=false -Dwith_openssl=true -Dwith_pcre=true -Dwith_pgsql=false -Dwith_sasl=false -Dwith_webdav_props=true -Dwith_webdav_locks=true - -Dwith_xattr=true -Dwith_zlib=true -Dwith_zstd=false + -Dwith_xattr=true -Dwith_zlib=true -Dwith_zstd=false -Dwith_dbi=false -Dmoduledir=lib/lighttpd/modules" hostmakedepends="pkg-config" -makedepends="gdbm-devel libev-devel libmemcached-devel +makedepends="gdbm-devel libmemcached-devel libxml2-devel lua53-devel mit-krb5-devel pcre-devel sqlite-devel" checkdepends="perl" short_desc="Secure, fast, compliant and very flexible web-server" @@ -20,7 +20,7 @@ maintainer="Enno Boland " license="BSD-3-Clause" homepage="https://lighttpd.net" distfiles="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${version}.tar.xz" -checksum=fb953db273daef08edb6e202556cae8a3d07eed6081c96bd9903db957d1084d5 +checksum=4bb1dd859e541a3131e5be101557d2e1195b4129d3a849a3a6fbd21fe1c946f0 conf_files="/etc/lighttpd/lighttpd.conf" system_accounts="_lighttpd"