Created attachment 238459 [details] security/maia patch diff for version 1.0.4_11 This update includes a patch to fix upstream code that breaks UTF-8 identification and/or conversion. Also, there is previous patch cleanup that should clear up a lot of path issues for FBSD installations.
Hello, files/* include hard paths like /usr/local/etc, /usr/local/share, etc. Should this paths be replaced by global vars, PREFIX, ETCDIR, etc and be preprocessed in Makefile to adapt to other systems that not share same paths?
Created attachment 238476 [details] security/maia patch to remove upstream code that breaks non-UTF scans. Oh, my goodness. Yes! Thank you for pointing that out. This is actually what is already being done (from the Makefile) so I was wondering why the patch looked so strange. I keep forgetting "make patch" runs files/* and Makefile patches. DOH! Uploaded a replacement patch that looks MUCH more like I expected it to. Thanks again!
--- ====> Running Q/A tests (stage-qa) Warning: Symlink '/usr/local/www/maia/libs/Smarty' pointing to '/usr/local/share/smarty3-' which does not exist in the stage directory or in localbase --- This is caused by: --- do-install: ${LN} -s ${PREFIX}/share/smarty3-${PHP_FLAVOR} ${STAGEDIR}${WWWDIR}/libs/Smarty --- because WEBHOST option (that uses php) is off by default. Should this be a problem since we have a broken link with no php?
Created attachment 238477 [details] security/maia Upstream code change and WEBHOST copy/symlink fix. Thank you for pointing that out as I hadn't noticed that. It would not cause any problems as the webhost option wasn't selected so the Smarty symlink wouldn't be needed anyway. However, I don't like warnings (or to ignore them) so I've updated the do-install in the Makefile to include an if-endif for those web files that would only be needed if the webhost option is selected. I've attached a new patch to (hopefully) take care of this correctly.
(In reply to ek from comment #4) In this case we will need a plist adjustment for %%WWWDIR%% list maybe by using %%WEBHOST%%%%WWWDIR%%? Error: Missing: @dir %%WWWDIR%%/...
Created attachment 238482 [details] security/maia Upstream code change and WEBHOST Smarty symlink fix.
(In reply to Nuno Teixeira from comment #5) You're correct. I've uploaded a new patch to only skip the symlinking if the WEBHOST option is not selected and also edited the pkg-plist to include the %%WEBHOST%% prefix for the Smarty symlink listed. I've just tested with both WEBHOST selected and not selected and I no longer see any warnings or errors.
(In reply to ek from comment #7) Fixed. Thanks
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=8aa12b7bb4ba0282b310958b9897d95bc1c3e5db commit 8aa12b7bb4ba0282b310958b9897d95bc1c3e5db Author: EK <ek@purplehat.org> AuthorDate: 2022-12-01 23:44:43 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2022-12-01 23:49:08 +0000 security/maia: Update to patch upstream code for UTF-8 - This update includes a patch to fix upstream code that breaks UTF-8 identification and/or conversion. - Fix WEBHOST option symlink. PR: 268087 MFH: 2022Q4 (bug fixes) security/maia/Makefile | 4 +++- security/maia/files/patch-maiad (new) | 12 ++++++++++++ security/maia/pkg-plist | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-)
A commit in branch 2022Q4 references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c49b434dbdbf0e5546334f7f806e499f8c33195 commit 5c49b434dbdbf0e5546334f7f806e499f8c33195 Author: EK <ek@purplehat.org> AuthorDate: 2022-12-01 23:44:43 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2022-12-01 23:52:44 +0000 security/maia: Update to patch upstream code for UTF-8 - This update includes a patch to fix upstream code that breaks UTF-8 identification and/or conversion. - Fix WEBHOST option symlink. PR: 268087 MFH: 2022Q4 (bug fixes) (cherry picked from commit 8aa12b7bb4ba0282b310958b9897d95bc1c3e5db) security/maia/Makefile | 4 +++- security/maia/files/patch-maiad (new) | 12 ++++++++++++ security/maia/pkg-plist | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-)
Committed, thanks!