Bug 282394 - www/angie*: Update to 1.7.0
Summary: www/angie*: Update to 1.7.0
Status: In Progress
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL: https://github.com/webserver-llc/angi...
Keywords:
Depends on:
Blocks:
 
Reported: 2024-10-28 22:10 UTC by Jason Tubnor
Modified: 2024-12-02 13:05 UTC (History)
5 users (show)

See Also:
vvd: maintainer-feedback-
vvd: merge-quarterly?


Attachments
Update of core Angie port (6.49 KB, patch)
2024-10-30 04:06 UTC, Jason Tubnor
no flags Details | Diff
Update of modules that have changed since last update (12.81 KB, patch)
2024-10-30 04:07 UTC, Jason Tubnor
no flags Details | Diff
Combined patch for angie and module uplift (14.19 KB, patch)
2024-10-31 03:42 UTC, Jason Tubnor
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Jason Tubnor 2024-10-28 22:10:16 UTC
Angie 1.7.0 was released on 20240920. Could the maintainer uplift the port when possible please?
Comment 1 Vladimir Druzenko freebsd_committer freebsd_triage 2024-10-29 16:01:56 UTC
You can speed this up if you prepare a patch.
Comment 2 Jason Tubnor 2024-10-30 04:06:02 UTC
Created attachment 254631 [details]
Update of core Angie port

This is the core www/angie port. Updated modules to follow.
Comment 3 Jason Tubnor 2024-10-30 04:07:15 UTC
Created attachment 254632 [details]
Update of modules that have changed since last update

Update of www/angie-modules-* and main www/angie distfile
Comment 4 Vladimir Druzenko freebsd_committer freebsd_triage 2024-10-30 11:10:04 UTC
I think better merge patches - look at www/angie/distinfo: in one patch you remove all modules and in another you add back all modules.

Waiting maintainer approval or timeout 2 weeks.

Can you please post link to changelog?
Comment 5 Jason Tubnor 2024-10-31 03:42:42 UTC
Created attachment 254785 [details]
Combined patch for angie and module uplift

This resolves the distinfo issue that was split between the previous two patches.
Comment 6 Jason Tubnor 2024-10-31 05:13:25 UTC
Full release history from the existing 1.3.2 version (23 Nov 2023) to 1.7.0 (20 Sep 2024) - 9 releases - can be found here:

https://github.com/webserver-llc/angie/releases

Besides new features it also includes numerous bug and CVE fixes.
Comment 7 Vladimir Druzenko freebsd_committer freebsd_triage 2024-10-31 10:46:15 UTC
(In reply to Jason Tubnor from comment #6)
ok.

There is older PR with update to 1.4.1: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277516
Comment 8 Jason Tubnor 2024-10-31 21:35:56 UTC
I didn't get that error in my build and package of 1.7.0 and associated modules.

I did update the www/angie-module-lua/Makefile RUN_DEPENDS to move from lua-resty-core==0.1.28 to >=0.1.29

RUN_DEPENDS=    angie-module-ndk==${PKGVERSION}:www/angie-module-ndk \
                lua-resty-core>=0.1.29:www/lua-resty-core

FWIW, the patch files did need updating in that module to ensure they applied correctly.
Comment 9 Jason Tubnor 2024-11-15 03:17:01 UTC
No input from maintainer after 2 week timeout. Could someone from ports action this now please? I'm happy to become maintainer if required. Thanks.
Comment 10 Vladimir Druzenko freebsd_committer freebsd_triage 2024-11-17 00:11:44 UTC
> No input from maintainer after 2 week timeout. Could someone from ports action this now please?
Yes, maintainer timeout.

> I'm happy to become maintainer if required. Thanks.
Look like maintainer Oleg A. Mamontov is active: https://cgit.freebsd.org/ports/log/www/angie
Maybe he is busy now or at vacations.

I'll commit, but without change maintainership now.
Comment 11 Vladimir Druzenko freebsd_committer freebsd_triage 2024-11-17 00:15:19 UTC
I see multiple CVEs was fixed (https://github.com/webserver-llc/angie/releases) - merge-quarterly?
Comment 12 Vladimir Druzenko freebsd_committer freebsd_triage 2024-11-17 00:43:08 UTC
=======================<phase: stage          >============================
===== env: DEVELOPER_MODE=yes STRICT_DEPENDS=yes USER=nobody UID=65534 GID=65534
===>  Staging for angie-module-njs-1.7.0
===>   angie-module-njs-1.7.0 depends on package: angie==1.7.0 - found
===>   Generating temporary packing list
/bin/mkdir -p /wrkdirs/usr/ports/www/angie-module-njs/work/stage/usr/local/share/doc/angie-module-njs
/bin/mkdir -p /wrkdirs/usr/ports/www/angie-module-njs/work/stage/usr/local/libexec/angie
install  -s -m 0644 /wrkdirs/usr/ports/www/angie-module-njs/work/angie-1.7.0/objs/ngx_http_js_module.so /wrkdirs/usr/ports/www/angie-module-njs/work/stage/usr/local/libexec/angie
install  -s -m 0644 /wrkdirs/usr/ports/www/angie-module-njs/work/angie-1.7.0/objs/ngx_stream_js_module.so /wrkdirs/usr/ports/www/angie-module-njs/work/stage/usr/local/libexec/angie
install  -m 444 /wrkdirs/usr/ports/www/angie-module-njs/work/njs-0.8.7/CHANGES /wrkdirs/usr/ports/www/angie-module-njs/work/stage/usr/local/share/doc/angie-module-njs
install  -m 444 /wrkdirs/usr/ports/www/angie-module-njs/work/njs-0.8.7/README /wrkdirs/usr/ports/www/angie-module-njs/work/stage/usr/local/share/doc/angie-module-njs
install: /wrkdirs/usr/ports/www/angie-module-njs/work/njs-0.8.7/README: No such file or directory
*** Error code 71

Stop.
make: stopped in /usr/ports/www/angie-module-njs
build of www/angie-module-njs | angie-module-njs-1.7.0 ended at Sun Nov 17 03:42:11 MSK 2024
build time: 00:00:27
!!! build failure encountered !!!
[00:00:34] Error: Build failed in phase: stage
[00:00:34] Logs: /vm3/poudriere/data/logs/bulk/141amd64-main/2024-11-17_03h41m38s
[00:00:34] Cleaning up
[00:00:34] Unmounting file systems
Comment 13 Vladimir Druzenko freebsd_committer freebsd_triage 2024-11-17 01:01:12 UTC
1. www/angie-module-njs/Makefile:
-.for i in CHANGES README
+.for i in CHANGES README.md SECURITY.md SUPPORT.md

www/angie-module-njs/pkg-plist:
-%%DOCSDIR%%/README
+%%DOCSDIR%%/README.md
+%%DOCSDIR%%/SECURITY.md
+%%DOCSDIR%%/SUPPORT.md

2. Warning: you need USE_GNOME+=libxml2
Warning: you might not need LIB_DEPENDS on libedit.so.0
www/angie-module-njs/Makefile:
-USES=           libedit
+USES=           gnome
+USE_GNOME=      libxml2

3. I tested build in poudriere 14.1 amd64 all angie* modules:
for P in angie-module-auth-jwt angie-module-auth-spnego angie-module-brotli angie-module-cache-purge angie-module-dav-ext angie-module-echo angie-module-enhanced-memcached angie-module-eval angie-module-geoip2 angie-module-headers-more angie-module-image-filter angie-module-jwt angie-module-keyval angie-module-lua angie-module-ndk angie-module-njs angie-module-perl angie-module-postgres angie-module-redis2 angie-module-rtmp angie-module-set-misc angie-module-subs angie-module-testcookie angie-module-upload angie-module-vod angie-module-xslt; do poudriere testport -j 141amd64 -p main -o www/$P; done

I found one build error and during fix it found several thing must be fixed too - check 1. and 2.
Please check every updated module for changes like I found in www/angie-module-njs: new/removed docs, new/removed required libs and etc.
Comment 14 Jason Tubnor 2024-11-17 05:22:00 UTC
I built against HEAD and didn't come across these issues. I also built each module and only came across one issue with angie-module-lua.

Note: I didn't use poudriere to do the build, I followed the standard documentation.

I'll revisit the concerns mentioned and also build against 14.1.

Yes, quarterly will need to be uplifted because of the security concerns.