Bug 268008 - mail/courier: update to 1.1.11
Summary: mail/courier: update to 1.1.11
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: Juraj Lutter
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-11-27 05:23 UTC by Chris
Modified: 2023-09-16 13:26 UTC (History)
6 users (show)

See Also:
bsd: maintainer-feedback+


Attachments
patch (46.36 KB, patch)
2022-11-27 05:23 UTC, Chris
no flags Details | Diff
patch (46.79 KB, patch)
2022-11-27 06:04 UTC, Chris
no flags Details | Diff
Update to Courier 1.1.11 (96.98 KB, patch)
2023-06-13 10:25 UTC, bsd
bsd: maintainer-approval+
Details | Diff
Fixed patch for update to Courier 1.1.11 (107.84 KB, patch)
2023-06-13 19:49 UTC, bsd
no flags Details | Diff
Patch for upgrading mail/courier to 1.1.11 (hopefully final) (98.53 KB, patch)
2023-09-01 19:45 UTC, bsd
bsd: maintainer-approval+
Details | Diff
Fix build when OPTION DOC is on (1.68 KB, patch)
2023-09-14 09:38 UTC, bsd
bsd: maintainer-approval+
Details | Diff
Additional fix (plist issues when DOC OPTION is on) (2.00 KB, patch)
2023-09-15 11:26 UTC, bsd
bsd: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Chris 2022-11-27 05:23:05 UTC
Created attachment 238357 [details]
patch

Update from old 0.6x release to a newer one
Comment 1 Chris 2022-11-27 06:04:25 UTC
Created attachment 238358 [details]
patch

remove the indication of the old RTFM and just say to read the docs
Comment 2 bsd 2022-11-27 06:26:06 UTC
Thanks for patch, I'll review it.

There are, however, two issues here, from a briew look - removing GPG option, making gnupg dependency unconditional, and added unconditional wget dependency. Both are solvable, for the unconditional dependency on gnupg, I am using some hack I need to polish a bit, for wget dependency I have not yet written patch :)
Comment 3 Chris 2022-11-27 07:25:17 UTC
Nice only two.
Comment 4 Chris 2022-11-27 17:23:18 UTC
wget is a check deep in configure same with gpg there is no real easy way to --with-gpg --with-wget or --without-wget-check

however wget is a build dep I havent seen any issues with removing it after.

I have not tried to just yank out all the wget stuff and add a patch for it, I know the gpg stuff has issues when you play with it.
Comment 5 bsd 2022-11-28 07:13:29 UTC
(In reply to Chris from comment #4)
Well, way to keep option for exclude gnupg is a bit hackish, but works. I need some time to clean things up.
As for wget dependency, it is a bit lighter (only one package vs. several in case of gnupg), fetch from base could be used instead. I need to test and verify patch works as intended.
Comment 6 Chris 2022-11-28 07:17:17 UTC
Thgere is a patch to add in piddir, im sure something similar can be used to remove wget or gpg but looking at configure it wants both and even check for /usr/bin/gpg* and /usr/bin/wget. but due to these being build options I didn't see an issue as a simple pkg autoremove would remove them.
Comment 7 Robert Clausecker freebsd_committer freebsd_triage 2023-04-16 14:39:32 UTC
Any progress on this one?
Comment 8 Rene Ladan freebsd_committer freebsd_triage 2023-06-01 19:11:42 UTC
Note that this port expired today, but I left it in the Ports Tree for now.

@fuz do you want to take this PR?
Comment 9 Robert Clausecker freebsd_committer freebsd_triage 2023-06-01 22:26:17 UTC
@rene Maintainer has unfortunately not given final approval.

Dear submitter, would you like us to proceed with committing this one despite the lack of approval? If yes, would you be interested in taking over maintainership over this port?  From our side, there is no problem with removing the GPG option and adding a wget dependency.
Comment 10 bsd 2023-06-02 04:34:18 UTC
(In reply to Robert Clausecker from comment #9)
Sorry for being unresponsive for some time.
To the subject, just yesterday, new release was announced, 1.3.0. Incidentally, I just prepared build and test environment for it, so, hopefully, not long from now, I'll have ported this version.
Comment 11 bsd 2023-06-02 04:36:12 UTC
(In reply to bsd from comment #10)
... and now I am reading announcement for 1.3.1 version...
Comment 12 Robert Clausecker freebsd_committer freebsd_triage 2023-06-02 09:40:21 UTC
(In reply to bsd from comment #11)

Cool!  Just add your patch to this bug report once you are ready.
Comment 13 bsd 2023-06-03 05:57:50 UTC
Now there is a 1.3.2 version, I am encountering some problems in build. (There are  patches and patches and more patches there.) Investigation continues.
Comment 14 Robert Clausecker freebsd_committer freebsd_triage 2023-06-03 08:26:16 UTC
(In reply to bsd from comment #13)

To reduce the amount of pain for future updates, check if you can get some of your patches upstreamed.
Comment 15 bsd 2023-06-03 08:44:51 UTC
(In reply to Robert Clausecker from comment #14)
I'll plan to do so. Port growth over time is not so nice...
Comment 16 Muhammad Moinur Rahman freebsd_committer freebsd_triage 2023-06-04 14:01:11 UTC
I will actually advice on committing something that works rather than upgrading to recent versions. So if you have an earlier version of patches that works let it be in the tree as because this has been long failing to build.
Comment 17 bsd 2023-06-05 19:22:16 UTC
(In reply to Muhammad Moinur Rahman from comment #16)
At the moment, I have 1.1.4 version built and running for some years. Let me prepare a patch for this first, as this is really verified working. I'll continue with upgrade later.
Comment 18 bsd 2023-06-09 11:20:01 UTC
Update locally to 1.1.11 seems to build and install OK, I am going to compare my result with patch provided in PR and test functionality. Stay tuned :)
Comment 19 bsd 2023-06-13 10:25:14 UTC
Created attachment 242760 [details]
Update to Courier 1.1.11

This is build, install and run tested version.

For basic test, just enabling desired daemons as described in pkg message is enough (creating some mailbox is out of scope of this port - some authdaemon needs to be installed as well).
Comment 20 bsd 2023-06-13 10:26:37 UTC
Comment on attachment 238358 [details]
patch

Superseded by newer patch
Comment 21 bsd 2023-06-13 19:49:13 UTC
Created attachment 242767 [details]
Fixed patch for update to Courier 1.1.11

Some files seems to be lost in previous patch...
Comment 22 Juraj Lutter freebsd_committer freebsd_triage 2023-06-13 20:47:12 UTC
Also pkg-plist needs adjustments.
Comment 23 Juraj Lutter freebsd_committer freebsd_triage 2023-07-29 18:03:09 UTC
Milan Obuch <bsd@dino.sk> already received a patch with (not only) fixed plist.
Comment 24 bsd 2023-07-30 10:09:53 UTC
(In reply to Juraj Lutter from comment #23)
Patch under (build and run)test...
Comment 25 Muhammad Moinur Rahman freebsd_committer freebsd_triage 2023-09-01 06:19:43 UTC
(In reply to bsd from comment #24)
If you no longer want to maintain or have enough time to contribute please let others fix it. It has been more than a month since your last comment. This port has been marked BROKEN for a long time.

otis@ do you have a test build for this and does this patch work for you? If yes please commit with portmgr (blanket) otherwise I will remove it in next week.
Comment 26 bsd 2023-09-01 06:38:11 UTC
(In reply to Muhammad Moinur Rahman from comment #25)
Run test is sometimes not as easy as one thinks... Anyway, no big problems were found, yet. Some things in fixed plist are unnecessary, cleanup seems to be done now.
Comment 27 Robert Clausecker freebsd_committer freebsd_triage 2023-09-01 10:10:15 UTC
(In reply to bsd from comment #26)

Dude, how thorough is your build and run testing to take multiple months?  The objective is to ensure that there is nothing horribly wrong with the package, not to find every last bug that could have crept in.  If an issue is found later, an update can always be pushed.  But denying all users the new version because you are not sure enough yet that it is good is kind of a crap move.
Comment 28 bsd 2023-09-01 19:45:23 UTC
Created attachment 244564 [details]
Patch for upgrading mail/courier to 1.1.11 (hopefully final)
Comment 29 commit-hook freebsd_committer freebsd_triage 2023-09-11 14:37:11 UTC
A commit in branch main references this bug:

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

commit 48398ec51f1bf338df18168ac520eb4729b88b09
Author:     Milan Obuch <bsd@dino.sk>
AuthorDate: 2023-09-11 14:35:09 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2023-09-11 14:36:26 +0000

    mail/courier: Update to 1.1.11

    - Update to 1.1.11
    - Clean up Makefile a bit
    - Move chown/chmod into pkg-plist

    PR:             268008

 mail/courier/Makefile                              | 194 +++---
 mail/courier/Makefile.doc                          |  36 +-
 mail/courier/Makefile.own (gone)                   |  67 --
 mail/courier/distinfo                              |   5 +-
 mail/courier/files/courier.in                      |  20 +-
 .../files/extra-patch-maildrop__maildir.C (gone)   |  33 -
 mail/courier/files/extra-patch-webmail__folder.c   |  82 +--
 .../extra-patch-webmail__images__sqwebmail.css     |  15 +-
 mail/courier/files/extra-patch-webmail__maildir.c  |   4 +-
 mail/courier/files/extra-patch-webmail__maildir.h  |   9 +-
 mail/courier/files/extra-patch-webmail__msg2html.c |   4 +-
 .../files/patch-courier__cmlmfetch.C (gone)        |  11 -
 mail/courier/files/patch-courier__configure        |  61 +-
 .../files/patch-courier__doc__Makefile.in (gone)   |  71 --
 .../files/patch-courier__imapd-ssl.rc.in (new)     |  11 +
 .../courier/files/patch-courier__imapd.rc.in (new) |  11 +
 .../files/patch-courier__libs__Makefile.in (new)   |  13 +
 .../patch-courier__module.esmtp__configure (new)   |  44 ++
 .../patch-courier__module.esmtp__mkesmtpdcert.in   |  27 +-
 mail/courier/files/patch-courier__perms.sh.in      |  52 +-
 .../files/patch-courier__pop3d-ssl.in (new)        |  11 +
 mail/courier/files/patch-courier__pop3d.in (new)   |  11 +
 mail/courier/files/patch-courier__submit2.C (gone) |  11 -
 mail/courier/files/patch-courier__webmlmd.H (gone) |  11 -
 mail/courier/files/patch-courier__webmlmd.rc.in    |  13 +-
 .../files/patch-imap__mkimapdcert.in (gone)        |  11 -
 .../files/patch-imap__mkpop3dcert.in (gone)        |  11 -
 .../courier/files/patch-liblock__locktest.c (gone) |  81 ---
 .../files/patch-libs__imap__mkdhparams.in (new)    |  11 +
 .../files/patch-libs__imap__mkimapdcert.in (new)   |  20 +
 .../files/patch-libs__imap__mkpop3dcert.in (new)   |  20 +
 .../files/patch-tcpd__libcouriertls.c (gone)       |  18 -
 mail/courier/files/pkg-message.in                  |  27 +
 mail/courier/pkg-plist                             | 732 ++++++++++-----------
 34 files changed, 778 insertions(+), 980 deletions(-)
Comment 30 Juraj Lutter freebsd_committer freebsd_triage 2023-09-11 14:40:20 UTC
Committed, thanks.
Comment 31 bsd 2023-09-14 09:38:58 UTC
Created attachment 244830 [details]
Fix build when OPTION DOC is on

Package builders discovered this bug, which somehow slipped final tests :(
Comment 32 bsd 2023-09-15 11:26:10 UTC
Created attachment 244878 [details]
Additional fix (plist issues when DOC OPTION is on)

Sorry, due to lack of time for testing this slipped over :( Hopefully that's all for this PR...
Comment 33 commit-hook freebsd_committer freebsd_triage 2023-09-16 13:26:40 UTC
A commit in branch main references this bug:

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

commit 7b5e821e28099f24b30411d0eedb957eb46d02c7
Author:     Milan Obuch <bsd@dino.sk>
AuthorDate: 2023-09-16 13:24:13 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2023-09-16 13:25:25 +0000

    mail/courier: Fix pkg-plist with DOCS on

    Fix some files renamed in or missing from pkg-plist with DOCS on.

    PR:             268008

 mail/courier/pkg-plist | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)