diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-02-08 08:21:05 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-09 09:57:24 +0000 |
commit | 7573d38c01099add660dc98acd20bfaa2c6caae2 (patch) | |
tree | a07aa6f74dbe385ab4ac89aae459d2c55de3c198 /meta/recipes-extended/lighttpd | |
parent | eef933b7de28edcc07d06c678d17fb30faea1035 (diff) | |
download | poky-7573d38c01099add660dc98acd20bfaa2c6caae2.tar.gz |
lighttpd: upgrade 1.4.67 -> 1.4.68
Rename options where appropriate. pcre option supports pcre2 now, so convert to that.
(From OE-Core rev: 7da38c6bdce5692b1c0b24c7d7694123b5329588)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/lighttpd')
-rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch | 23 | ||||
-rw-r--r-- | meta/recipes-extended/lighttpd/lighttpd_1.4.68.bb (renamed from meta/recipes-extended/lighttpd/lighttpd_1.4.67.bb) | 23 |
2 files changed, 35 insertions, 11 deletions
diff --git a/meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch b/meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch new file mode 100644 index 0000000000..6aa843b75d --- /dev/null +++ b/meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | From d809433d6d900e899f796606b11bdc6a73413ac5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Glenn Strauss <gstrauss@gluelogic.com> | ||
3 | Date: Tue, 3 Jan 2023 17:50:16 -0500 | ||
4 | Subject: [PATCH] [meson] remove t/test_mod_evasive.c | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/lighttpd/lighttpd1.4/commit/d809433d6d900e899f796606b11bdc6a73413ac5] | ||
7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
8 | --- | ||
9 | src/meson.build | 1 - | ||
10 | 1 file changed, 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/meson.build b/src/meson.build | ||
13 | index ff472c320..77089fc3c 100644 | ||
14 | --- a/src/meson.build | ||
15 | +++ b/src/meson.build | ||
16 | @@ -721,7 +721,6 @@ test('test_mod', executable('test_mod', | ||
17 | 't/test_mod.c', | ||
18 | 't/test_mod_access.c', | ||
19 | 't/test_mod_alias.c', | ||
20 | - 't/test_mod_evasive.c', | ||
21 | 't/test_mod_evhost.c', | ||
22 | 't/test_mod_indexfile.c', | ||
23 | 't/test_mod_simple_vhost.c', | ||
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.67.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.68.bb index 838881f238..a9163f8492 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.67.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.68.bb | |||
@@ -17,9 +17,10 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t | |||
17 | file://index.html.lighttpd \ | 17 | file://index.html.lighttpd \ |
18 | file://lighttpd.conf \ | 18 | file://lighttpd.conf \ |
19 | file://lighttpd \ | 19 | file://lighttpd \ |
20 | file://fix-missing-test.patch \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | SRC_URI[sha256sum] = "7e04d767f51a8d824b32e2483ef2950982920d427d1272ef4667f49d6f89f358" | 23 | SRC_URI[sha256sum] = "e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384" |
23 | 24 | ||
24 | DEPENDS = "virtual/crypt" | 25 | DEPENDS = "virtual/crypt" |
25 | 26 | ||
@@ -27,19 +28,19 @@ PACKAGECONFIG ??= "openssl pcre zlib \ | |||
27 | ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ | 28 | ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ |
28 | " | 29 | " |
29 | 30 | ||
30 | PACKAGECONFIG[libev] = "-Dwith_libev=true,-Dwith_libev=false,libev" | 31 | PACKAGECONFIG[libev] = "-Dwith_libev=enabled,-Dwith_libev=disabled,libev" |
31 | PACKAGECONFIG[mysql] = "-Dwith_mysql=true,-Dwith_mysql=false,mariadb" | 32 | PACKAGECONFIG[mysql] = "-Dwith_mysql=enabled,-Dwith_mysql=disabled,mariadb" |
32 | PACKAGECONFIG[ldap] = "-Dwith_ldap=true,-Dwith_ldap=false,openldap" | 33 | PACKAGECONFIG[ldap] = "-Dwith_ldap=enabled,-Dwith_ldap=disabled,openldap" |
33 | PACKAGECONFIG[attr] = "-Dwith_xattr=true,-Dwith_xattr=false,attr" | 34 | PACKAGECONFIG[attr] = "-Dwith_xattr=true,-Dwith_xattr=false,attr" |
34 | PACKAGECONFIG[openssl] = "-Dwith_openssl=true,-Dwith_openssl=false,openssl" | 35 | PACKAGECONFIG[openssl] = "-Dwith_openssl=true,-Dwith_openssl=false,openssl" |
35 | PACKAGECONFIG[krb5] = "-Dwith_krb5=true,-Dwith_krb5=false,krb5" | 36 | PACKAGECONFIG[krb5] = "-Dwith_krb5=enabled,-Dwith_krb5=disabled,krb5" |
36 | PACKAGECONFIG[pcre] = "-Dwith_pcre=true,-Dwith_pcre=false,libpcre" | 37 | PACKAGECONFIG[pcre] = "-Dwith_pcre=pcre2,-Dwith_pcre=disabled,libpcre2" |
37 | PACKAGECONFIG[zlib] = "-Dwith_zlib=true,-Dwith_zlib=false,zlib" | 38 | PACKAGECONFIG[zlib] = "-Dwith_zlib=enabled,-Dwith_zlib=disabled,zlib" |
38 | PACKAGECONFIG[bzip2] = "-Dwith_bzip=true,-Dwith_bzip=false,bzip2" | 39 | PACKAGECONFIG[bzip2] = "-Dwith_bzip=enabled,-Dwith_bzip=disabled,bzip2" |
39 | PACKAGECONFIG[webdav-props] = "-Dwith_webdav_props=true,-Dwith_webdav_props=false,libxml2 sqlite3" | 40 | PACKAGECONFIG[webdav-props] = "-Dwith_webdav_props=enabled,-Dwith_webdav_props=disabled,libxml2 sqlite3" |
40 | PACKAGECONFIG[webdav-locks] = "-Dwith_webdav_locks=true,-Dwith_webdav_locks=false,util-linux" | 41 | PACKAGECONFIG[webdav-locks] = "-Dwith_webdav_locks=enabled,-Dwith_webdav_locks=disabled,util-linux" |
41 | PACKAGECONFIG[lua] = "-Dwith_lua=true,-Dwith_lua=false,lua" | 42 | PACKAGECONFIG[lua] = "-Dwith_lua=true,-Dwith_lua=false,lua" |
42 | PACKAGECONFIG[zstd] = "-Dwith_zstd=true,-Dwith_zstd=false,zstd" | 43 | PACKAGECONFIG[zstd] = "-Dwith_zstd=enabled,-Dwith_zstd=disabled,zstd" |
43 | 44 | ||
44 | inherit meson pkgconfig update-rc.d gettext systemd | 45 | inherit meson pkgconfig update-rc.d gettext systemd |
45 | 46 | ||