diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/poky/meta/recipes-extended/lighttpd | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/poky/meta/recipes-extended/lighttpd')
-rw-r--r-- | external/poky/meta/recipes-extended/lighttpd/lighttpd/fix-http-parseopts.patch | 51 | ||||
-rw-r--r-- | external/poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd | 2 | ||||
-rw-r--r-- | external/poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service | 12 | ||||
-rw-r--r-- | external/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb (renamed from external/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.51.bb) | 23 |
4 files changed, 11 insertions, 77 deletions
diff --git a/external/poky/meta/recipes-extended/lighttpd/lighttpd/fix-http-parseopts.patch b/external/poky/meta/recipes-extended/lighttpd/lighttpd/fix-http-parseopts.patch deleted file mode 100644 index f3a0402c..00000000 --- a/external/poky/meta/recipes-extended/lighttpd/lighttpd/fix-http-parseopts.patch +++ /dev/null @@ -1,51 +0,0 @@ -CVE: CVE-2019-11072 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 32120d5b8b3203fc21ccb9eafb0eaf824bb59354 Mon Sep 17 00:00:00 2001 -From: Glenn Strauss <gstrauss@gluelogic.com> -Date: Wed, 10 Apr 2019 11:28:10 -0400 -Subject: [PATCH] [core] fix abort in http-parseopts (fixes #2945) - -fix abort in server.http-parseopts with url-path-2f-decode enabled - -(thx stze) - -x-ref: - "Security - SIGABRT during GET request handling with url-path-2f-decode enabled" - https://redmine.lighttpd.net/issues/2945 ---- - src/burl.c | 6 ++++-- - src/t/test_burl.c | 2 ++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/burl.c b/src/burl.c -index 51182628..c4b928fd 100644 ---- a/src/burl.c -+++ b/src/burl.c -@@ -252,8 +252,10 @@ static int burl_normalize_2F_to_slash_fix (buffer *b, int qs, int i) - } - } - if (qs >= 0) { -- memmove(s+j, s+qs, blen - qs); -- j += blen - qs; -+ const int qslen = blen - qs; -+ memmove(s+j, s+qs, (size_t)qslen); -+ qs = j; -+ j += qslen; - } - buffer_string_set_length(b, j); - return qs; -diff --git a/src/t/test_burl.c b/src/t/test_burl.c -index 7be9be50..f7a16815 100644 ---- a/src/t/test_burl.c -+++ b/src/t/test_burl.c -@@ -97,6 +97,8 @@ static void test_burl_normalize (void) { - flags |= HTTP_PARSEOPT_URL_NORMALIZE_PATH_2F_DECODE; - run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a/b?c=/"), CONST_STR_LEN("/a/b?c=/")); - run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a/b?c=%2f"), CONST_STR_LEN("/a/b?c=/")); -+ run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("%2f?"), CONST_STR_LEN("/?")); -+ run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/%2f?"), CONST_STR_LEN("//?")); - run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a%2fb"), CONST_STR_LEN("/a/b")); - run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a%2Fb"), CONST_STR_LEN("/a/b")); - run_burl_normalize(psrc, ptmp, flags, __LINE__, CONST_STR_LEN("/a%2fb?c=/"), CONST_STR_LEN("/a/b?c=/")); diff --git a/external/poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd b/external/poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd index bf89a60b..82fbaa52 100644 --- a/external/poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd +++ b/external/poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd @@ -4,7 +4,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/lighttpd NAME=lighttpd DESC="Lighttpd Web Server" -OPTS="-f /etc/lighttpd.conf" +OPTS="-f /etc/lighttpd/lighttpd.conf" case "$1" in start) diff --git a/external/poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service b/external/poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service deleted file mode 100644 index 66a907aa..00000000 --- a/external/poky/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Lightning Fast Webserver With Light System Requirements -After=network.target - -[Service] -ExecStartPre=@SBINDIR@/lighttpd -t -f @SYSCONFDIR@/lighttpd.conf -ExecStart=@SBINDIR@/lighttpd -D -f @SYSCONFDIR@/lighttpd.conf -ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target - diff --git a/external/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.51.bb b/external/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb index 5c828da5..7a255ce2 100644 --- a/external/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.51.bb +++ b/external/poky/meta/recipes-extended/lighttpd/lighttpd_1.4.55.bb @@ -2,7 +2,7 @@ SUMMARY = "Lightweight high-performance web server" HOMEPAGE = "http://www.lighttpd.net/" BUGTRACKER = "http://redmine.lighttpd.net/projects/lighttpd/issues" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" SECTION = "net" @@ -16,13 +16,11 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ - file://lighttpd.service \ file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ - file://fix-http-parseopts.patch \ " -SRC_URI[md5sum] = "6e68c19601af332fa3c5f174245f59bf" -SRC_URI[sha256sum] = "2af9fdb265d1f025bfa634e13770239712ecbd585e4975b8226edf1df74e9c82" +SRC_URI[md5sum] = "be4bda2c28bcbdac6eb941528f6edf03" +SRC_URI[sha256sum] = "6a0b50e9c9d5cc3d9e48592315c25a2d645858f863e1ccd120507a30ce21e927" PACKAGECONFIG ??= "openssl pcre zlib \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \ @@ -41,14 +39,13 @@ PACKAGECONFIG[krb5] = "--with-krb5,--without-krb5,krb5" PACKAGECONFIG[pcre] = "--with-pcre,--without-pcre,libpcre" PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" -PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" PACKAGECONFIG[webdav-props] = "--with-webdav-props,--without-webdav-props,libxml2 sqlite3" PACKAGECONFIG[webdav-locks] = "--with-webdav-locks,--without-webdav-locks,util-linux" PACKAGECONFIG[gdbm] = "--with-gdbm,--without-gdbm,gdbm" PACKAGECONFIG[memcache] = "--with-memcached,--without-memcached,libmemcached" -PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua5.1" +PACKAGECONFIG[lua] = "--with-lua,--without-lua,lua" -EXTRA_OECONF += "--enable-lfs" +EXTRA_OECONF += "--enable-lfs --without-fam" inherit autotools pkgconfig update-rc.d gettext systemd @@ -58,13 +55,13 @@ INITSCRIPT_PARAMS = "defaults 70" SYSTEMD_SERVICE_${PN} = "lighttpd.service" do_install_append() { - install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav + install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' \ -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@BASE_BINDIR@,${base_bindir},g' \ @@ -76,11 +73,11 @@ do_install_append() { FILES_${PN} += "${sysconfdir} /www" -CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf" +CONFFILES_${PN} = "${sysconfdir}/lighttpd/lighttpd.conf" PACKAGES_DYNAMIC += "^lighttpd-module-.*" python populate_packages_prepend () { lighttpd_libdir = d.expand('${libdir}') - do_split_packages(d, lighttpd_libdir, '^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') + do_split_packages(d, lighttpd_libdir, r'^mod_(.*)\.so$', 'lighttpd-module-%s', 'Lighttpd module for %s', extra_depends='') } |