From 5f966716569ad0b133ae40662d3f5817e09fa313 Mon Sep 17 00:00:00 2001 From: Francois Perrad <fperrad@gmail.com> Date: Fri, 8 Jul 2022 07:50:06 +0200 Subject: [PATCH] package/lighttpd: bump to version 1.4.65 remove upstream patch Signed-off-by: Francois Perrad <francois.perrad@gadz.org> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- ...uild-meson-fix-typo-in-variable-name.patch | 25 ------------------- package/lighttpd/lighttpd.hash | 4 +-- package/lighttpd/lighttpd.mk | 2 +- 3 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch diff --git a/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch b/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch deleted file mode 100644 index d338979d46..0000000000 --- a/package/lighttpd/0002-build-meson-fix-typo-in-variable-name.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 876a1e1b2cc21282a0df5245004197cdffe1d380 Mon Sep 17 00:00:00 2001 -From: Glenn Strauss <gstrauss@gluelogic.com> -Date: Thu, 20 Jan 2022 07:04:51 -0500 -Subject: [PATCH] [build] meson: fix typo in variable name - -[Retrieved from: -https://github.com/lighttpd/lighttpd1.4/commit/876a1e1b2cc21282a0df5245004197cdffe1d380] -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> ---- - src/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/meson.build b/src/meson.build -index 4ee163468..b35c1037f 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -266,7 +266,7 @@ endif - libbrotli = [] - if get_option('with_brotli') - libbrotli = [ compiler.find_library('brotlienc') ] -- if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotlienc, prefix: '#include <brotli/encode.h>') -+ if compiler.has_function('BrotliEncoderCreateInstance', args: defs, dependencies: libbrotli, prefix: '#include <brotli/encode.h>') - conf_data.set('HAVE_BROTLI_ENCODE_H', true) - conf_data.set('HAVE_BROTLI', true) - else diff --git a/package/lighttpd/lighttpd.hash b/package/lighttpd/lighttpd.hash index ce026b9b4a..0b4310aa72 100644 --- a/package/lighttpd/lighttpd.hash +++ b/package/lighttpd/lighttpd.hash @@ -1,4 +1,4 @@ -# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.64.sha512sum -sha512 8e2ad0830ff80fcebf0c33600caafb5ab4e9ff6b5073c12572f88a44fdfe85f777fa8b22b2fc2964fecbeb556997ad660867dcee80efb224d63329c8b18ea936 lighttpd-1.4.64.tar.xz +# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.65.sha512sum +sha512 e9ecb3e99dd5cd0efbf98cfc937f0cfcfafe712ab0e6c11f9cdee936c508820cd8de06ef03d2f888dab19a842eebae342a83818e601dd21094f154832acb69ec lighttpd-1.4.65.tar.xz # Locally calculated sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 595c59cb37..bedb9c8f33 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -5,7 +5,7 @@ ################################################################################ LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).64 +LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).65 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x LIGHTTPD_LICENSE = BSD-3-Clause