Bug 262606 - security/maia: update to 1.0.4_9 (48df5fb) and cleanup port
Summary: security/maia: update to 1.0.4_9 (48df5fb) and cleanup port
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-03-17 01:30 UTC by ek
Modified: 2022-04-27 06:52 UTC (History)
1 user (show)

See Also:
fernape: merge-quarterly+


Attachments
security/maia 1.0.4_9 update .diff file. (14.91 KB, patch)
2022-03-17 01:30 UTC, ek
ek: maintainer-approval+
Details | Diff
security/maia patch to 1.0.4_9 (24.00 KB, patch)
2022-03-17 22:53 UTC, ek
no flags Details | Diff
Updated patch for Maia-Mailguard version 1.0.4_9 (25.67 KB, patch)
2022-04-04 17:25 UTC, ek
ek: maintainer-approval+
Details | Diff
security/maia Poudriere build log (51.87 KB, text/plain)
2022-04-18 13:43 UTC, ek
ek: maintainer-approval+
Details
Updated security/maia patch for version 1.0.4_9 (23.43 KB, patch)
2022-04-19 02:48 UTC, ek
ek: maintainer-approval+
Details | Diff
security/maia Update to 1.0.4_9 (13.91 KB, patch)
2022-04-25 18:53 UTC, ek
ek: maintainer-approval+
Details | Diff
Latest security/maia Poudriere build log. (55.57 KB, text/plain)
2022-04-25 18:54 UTC, ek
ek: maintainer-approval+
Details

Note You need to log in before you can comment on or make changes to this bug.
Description ek 2022-03-17 01:30:07 UTC
Created attachment 232492 [details]
security/maia 1.0.4_9 update .diff file.

Updated version of Maia-Mailguard to 1.0.4_9.
Cleaned up Makefile to fix some issues with duplicate dependencies.
Removed REINPLACE_CMD's and replaced them with patches for static changes.
Comment 1 Fernando Apesteguía freebsd_committer freebsd_triage 2022-03-17 08:16:44 UTC
^Triage: Simplifying title

^Triage: If there is a changelog or release notes URL available for this version, please add it to the URL field.

^Triage: Maintainer-feedback flag (+) not required unless requested (?) first

Thanks!
Comment 2 ek 2022-03-17 18:47:52 UTC
No changelog URL but referencing the commit log provides the below info.

- Fix code obtaining content-encoding from content-type header.
- Fix encoding error for two languages. (MySQL)
Comment 3 ek 2022-03-17 22:53:07 UTC
Created attachment 232536 [details]
security/maia patch to 1.0.4_9

Scratch that last patch. It had a bad patch file (patch-maiad) in files/. All fixed.
Comment 4 ek 2022-04-04 17:25:53 UTC
Created attachment 232938 [details]
Updated patch for Maia-Mailguard version 1.0.4_9

Another patch to fix the Makefile which wasn't applying cleanly (old repo data maybe?)
Comment 5 ek 2022-04-18 13:43:20 UTC
Created attachment 233301 [details]
security/maia Poudriere build log

Maia-Mailguard 1.0.4_9 Poudriere build log attached.
Comment 6 ek 2022-04-19 02:48:31 UTC
Created attachment 233318 [details]
Updated security/maia patch for version 1.0.4_9

Had more testers point out a bad (extra) patch on the ${LOCALBASE}/sbin/maiad executable. After much testing in the community, this appears to be stable.
Comment 7 Fernando Apesteguía freebsd_committer freebsd_triage 2022-04-22 06:54:59 UTC
Reported by portlint

Q/A:  Makefile: [141]: use a tab (not space) after a variable name
 Makefile: [142]: use a tab (not space) after a variable name
 Makefile: [146]: use a tab (not space) after a variable name
 Makefile: [151]: use a tab (not space) after a variable name
 Makefile: [152]: use a tab (not space) after a variable name
 Makefile: [157]: use a tab (not space) after a variable name
 Makefile: [171]: whitespace before end of line.
 Makefile: [181]: use a tab (not space) after a variable name
 Makefile: [182]: use a tab (not space) after a variable name

Would you have a look?

Thanks!
Comment 8 ek 2022-04-25 18:53:58 UTC
Created attachment 233486 [details]
security/maia Update to 1.0.4_9

Cleaned up for Portlint. Also found a double-patch issue. Looks like "make makepatch" was run after "make patch" maybe? Not sure but it's cleaned up now, too.
Comment 9 ek 2022-04-25 18:54:35 UTC
Created attachment 233487 [details]
Latest security/maia Poudriere build log.
Comment 10 ek 2022-04-25 18:55:48 UTC
Thanks for the heads up, Fernando. I believe this update should be ready to go now. Please let me know if you see any other issues.
Comment 11 commit-hook freebsd_committer freebsd_triage 2022-04-27 06:50:40 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e15fe24d5de09ddaeb63d1f437d7ba776b0c049d

commit e15fe24d5de09ddaeb63d1f437d7ba776b0c049d
Author:     Fernando Apesteguía <fernape@FreeBSD.org>
AuthorDate: 2022-04-26 05:44:19 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-04-27 06:47:42 +0000

    security/maia: update to 1.0.4_9 (48df5fb)

     * Fix code obtaining content-encoding from content-type header.
     * Fix encoding error for two languages. (MySQL)

    While here, do some clean up.

    PR:     262606
    Reported by:    ek@purplehat.org (maintainer)
    MFH:    2022Q2 (bugfix release)

 security/maia/Makefile                             | 66 ++++++++++------------
 security/maia/distinfo                             |  6 +-
 security/maia/files/patch-maia.conf.dist (new)     | 11 ++++
 security/maia/files/patch-maiad.conf.dist (new)    | 49 ++++++++++++++++
 .../maia/files/patch-scripts_configtest.pl (new)   |  8 +++
 .../maia/files/patch-scripts_detectvba.pl (new)    |  8 +++
 .../patch-scripts_expire-quarantine-cache.pl (new) |  8 +++
 .../files/patch-scripts_load-sa-rules.pl (new)     |  8 +++
 .../maia/files/patch-scripts_maiadbtool.pl (new)   |  8 +++
 .../patch-scripts_process-quarantine.pl (new)      |  8 +++
 security/maia/files/patch-scripts_resend.pl (new)  |  8 +++
 .../patch-scripts_send-quarantine-digests.pl (new) |  8 +++
 ...atch-scripts_send-quarantine-reminders.pl (new) |  8 +++
 .../files/patch-scripts_stats-snapshot.pl (new)    |  8 +++
 14 files changed, 174 insertions(+), 38 deletions(-)
Comment 12 commit-hook freebsd_committer freebsd_triage 2022-04-27 06:51:42 UTC
A commit in branch 2022Q2 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=feec2feca9b0f724bde9f94822d55b62b696aefd

commit feec2feca9b0f724bde9f94822d55b62b696aefd
Author:     Fernando Apesteguía <fernape@FreeBSD.org>
AuthorDate: 2022-04-26 05:44:19 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-04-27 06:49:07 +0000

    security/maia: update to 1.0.4_9 (48df5fb)

     * Fix code obtaining content-encoding from content-type header.
     * Fix encoding error for two languages. (MySQL)

    While here, do some clean up.

    PR:     262606
    Reported by:    ek@purplehat.org (maintainer)
    MFH:    2022Q2 (bugfix release)

    (cherry picked from commit e15fe24d5de09ddaeb63d1f437d7ba776b0c049d)

 security/maia/Makefile                             | 66 ++++++++++------------
 security/maia/distinfo                             |  6 +-
 security/maia/files/patch-maia.conf.dist (new)     | 11 ++++
 security/maia/files/patch-maiad.conf.dist (new)    | 49 ++++++++++++++++
 .../maia/files/patch-scripts_configtest.pl (new)   |  8 +++
 .../maia/files/patch-scripts_detectvba.pl (new)    |  8 +++
 .../patch-scripts_expire-quarantine-cache.pl (new) |  8 +++
 .../files/patch-scripts_load-sa-rules.pl (new)     |  8 +++
 .../maia/files/patch-scripts_maiadbtool.pl (new)   |  8 +++
 .../patch-scripts_process-quarantine.pl (new)      |  8 +++
 security/maia/files/patch-scripts_resend.pl (new)  |  8 +++
 .../patch-scripts_send-quarantine-digests.pl (new) |  8 +++
 ...atch-scripts_send-quarantine-reminders.pl (new) |  8 +++
 .../files/patch-scripts_stats-snapshot.pl (new)    |  8 +++
 14 files changed, 174 insertions(+), 38 deletions(-)
Comment 13 Fernando Apesteguía freebsd_committer freebsd_triage 2022-04-27 06:52:12 UTC
Committed and merged to 2022Q2.

Thanks!