Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lighttpd: update to lighttpd 1.4.60 release hash #16798

Merged
merged 1 commit into from Oct 4, 2021

Conversation

gstrauss
Copy link
Contributor

@gstrauss gstrauss commented Oct 4, 2021

Maintainer: @flyn-org
Compile tested: i386 OpenWrt master

Description:
lighttpd: update to lighttpd 1.4.60 release hash
also remove patches incorporated upstream into lighttpd 1.4.60

Signed-off-by: Glenn Strauss gstrauss@gluelogic.com

@gstrauss
Copy link
Contributor Author

gstrauss commented Oct 4, 2021

I am not sure why this failed on x86_64 so early in the process (well before lighttpd compilation). Please resubmit the pipeline to see if this is a transient error. Thanks.

make[3]: Entering directory '/home/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/cryptodev-linux-cryptodev-linux-1.12'
make -C /home/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/linux-5.10.70 M=/home/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/cryptodev-linux-cryptodev-linux-1.12 ARCH=x86 CROSS_COMPILE=x86_64-openwrt-linux-musl- modules
make[4]: Entering directory '/home/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/linux-5.10.70'
make[5]: *** No rule to make target '/home/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/cryptodev-linux-cryptodev-linux-1.12/ioctl.o', needed by '/home/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/cryptodev-linux-cryptodev-linux-1.12/cryptodev.o'.  Stop.
make[4]: Leaving directory '/home/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/linux-5.10.70'
make[4]: *** [Makefile:1822: /home/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/cryptodev-linux-cryptodev-linux-1.12] Error 2
make[3]: *** [Makefile:27: build] Error 2
make[3]: Leaving directory '/home/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/cryptodev-linux-cryptodev-linux-1.12'
make[2]: *** [Makefile:61: /home/build/openwrt/build_dir/target-x86_64_musl/linux-x86_64/cryptodev-linux-cryptodev-linux-1.12/.built] Error 2
make[2]: Leaving directory '/home/build/openwrt/feeds/base/package/kernel/cryptodev-linux'
time: package/feeds/base/cryptodev-linux/compile#0.94#0.42#1.30
    ERROR: package/feeds/base/cryptodev-linux failed to build.
make[1]: *** [package/Makefile:116: package/feeds/base/cryptodev-linux/compile] Error 1

also remove patches incorporated upstream into lighttpd 1.4.60

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
@flyn-org
Copy link
Contributor

flyn-org commented Oct 4, 2021

I am happy with this, assuming we can identify the cause of the build error. @neheb, I think I have seen the error @gstrauss encountered above before. Is this a build-system artifact? Really glad to see @gstrauss here---happy to see patches upstreamed so efficiently!

@neheb
Copy link
Contributor

neheb commented Oct 4, 2021

That error is with cryptodev. Please ignore.

@gstrauss
Copy link
Contributor Author

gstrauss commented Oct 4, 2021

@neheb PR is ready for you. Builds pass except for x86_64 cryptodev

@flyn-org should I submit lighttpd-1.4.60 to update the openwrt-21.02 branch? older branches? (of course, doing so after waiting a few weeks for lighttpd 1.4.60 to settle)

If not, may I submit a smaller set of patches backported from lighttpd 1.4.60 to lighttpd 1.4.59 for openwrt-21.02? I put together a short list of useful patches in https://salsa.debian.org/debian/lighttpd/-/merge_requests/36 though that merge request will probably be withdrawn and re-filed against a different Debian branch.

(BTW, openwrt-19.07 has lighttpd 1.4.54 and is missing important fixes in 1.4.55)

@neheb neheb merged commit 07446a7 into openwrt:master Oct 4, 2021
@flyn-org
Copy link
Contributor

flyn-org commented Oct 5, 2021

I would like to see packages of the latest upstream lighttpd version for OpenWrt 19.07 and 21.02 if you are up for it. @neheb, does this sound reasonable? I recall someone once objecting to an update for the non-master OpenWrt versions that was not a security update or bugfix. I would have thought we would want to keep things moving as long as configuration file formats don't change.

@gstrauss
Copy link
Contributor Author

gstrauss commented Oct 5, 2021

lighttpd 1.4.55 is a very safe upgrade from lighttpd 1.4.54, and lighttpd 1.4.55 contains more than a handful of important bugfixes. Upgrading from lighttpd 1.4.54 to lighttpd 1.4.55 is much preferred to pulling 10+ patches to backport to lighttpd 1.4.54. I think we should target lighttpd 1.4.55 to 19.07, and I'll try to put together a PR for 19.07 with lighttpd 1.4.55 in the next few days.

lighttpd 1.4.56 made major changes to mod_openssl, using more modern openssl interfaces, and while these changes fixed some long-standing issues, there were a few reports of (mostly backwards) configurations which broke.

lighttpd 1.4.59 enables HTTP/2 by default, and that might surprise some people running older versions of lighttpd, but 21.02 is already running lighttpd 1.4.59.

lighttpd 1.4.60 improves and tunes HTTP/2 support, and so I highly recommend it as an upgrade for 21.02. However, since lighttpd 1.4.60 was just released, I will hold off on a PR for 21.02 for a few weeks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants