Bug 277626 - news/sabnzbd: Update to 4.2.3
Summary: news/sabnzbd: Update to 4.2.3
Status: In Progress
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Zsolt Udvari
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-03-11 10:53 UTC by Nicholas Kirby
Modified: 2024-04-19 02:29 UTC (History)
2 users (show)

See Also:
james: maintainer-feedback+


Attachments
Patch to 4.2.3 (919 bytes, patch)
2024-03-11 10:53 UTC, Nicholas Kirby
no flags Details | Diff
Patch to 4.2.3 - Change Maintainer (1.02 KB, patch)
2024-03-12 16:16 UTC, James French
james: maintainer-approval+
Details | Diff
Patch to 4.2.3 - v2 (2.92 KB, patch)
2024-04-05 03:45 UTC, Nicholas Kirby
nick: maintainer-approval+
Details | Diff
Patch to 4.2.3 - v3 (4.00 KB, patch)
2024-04-06 02:11 UTC, Nicholas Kirby
no flags Details | Diff
Patch to 4.2.3 - v4 (3.53 KB, patch)
2024-04-06 06:31 UTC, Nicholas Kirby
no flags Details | Diff
Patch to 4.2.3 - v5 (3.46 KB, patch)
2024-04-09 02:58 UTC, Nicholas Kirby
no flags Details | Diff
Patch to 4.2.3 - v6 (3.69 KB, patch)
2024-04-19 02:29 UTC, Nicholas Kirby
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Nicholas Kirby 2024-03-11 10:53:16 UTC
Created attachment 249089 [details]
Patch to 4.2.3

Changelog: https://github.com/sabnzbd/sabnzbd/releases/tag/4.2.3
Comment 1 James French 2024-03-12 16:16:34 UTC
Created attachment 249117 [details]
Patch to 4.2.3 - Change Maintainer

Patch looks good to me. Nick has been quick to deliver good patches to keep this port updated after upstream bumps recently. As I don't have quite as much time to keep the port up to date as I did three years ago, I've approached Nick via email about taking over as Maintainer which he is happy to do.

Resubmitting the latest patch with MAINTAINER updated to Nick, thanks for taking it on!
Comment 2 Zsolt Udvari freebsd_committer freebsd_triage 2024-03-31 14:24:31 UTC
Nicholas: please run 'portfmt -D Makefile' (portfmt is part of ports-mgmt/portfmt). Could you please update your patch?
Comment 3 Zsolt Udvari freebsd_committer freebsd_triage 2024-03-31 14:25:50 UTC
(In reply to Zsolt Udvari from comment #2)
And if you add new patch, please use "Obsoletes". Thanks.
Comment 4 Nicholas Kirby 2024-04-05 03:45:44 UTC
Created attachment 249726 [details]
Patch to 4.2.3 - v2

Here you go! Thanks for sharing the portfmt tool with me, I'm fairly new to this.
Comment 5 Zsolt Udvari freebsd_committer freebsd_triage 2024-04-05 18:31:35 UTC
(In reply to Nicholas Kirby from comment #4)
Please share only one patch, against the ports tree. Now there are two patch, one is an update to 4.2.3 and other is cosmetic changes. Could you please merge into one patch?
Thanks!
Comment 6 Nicholas Kirby 2024-04-06 02:11:10 UTC
Created attachment 249750 [details]
Patch to 4.2.3 - v3

Sorry again! How is this?

It's a valuable lesson to me to actually READ it before I submit it.

Thanks again!
Comment 7 Zsolt Udvari freebsd_committer freebsd_triage 2024-04-06 05:25:24 UTC
(In reply to Nicholas Kirby from comment #6)
Something wrong, I can't "git apply":

# fetch -q 'https://bz-attachments.freebsd.org/attachment.cgi?id=249750' -o - | git  apply
error: corrupt patch at line 12

The patch utility says similar error:
# fetch -q 'https://bz-attachments.freebsd.org/attachment.cgi?id=249750' -o - | patch -N
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/news/sabnzbd/Makefile b/news/sabnzbd/Makefile
|index 6eb3eda5c..e4680e881 100644
|--- a/news/sabnzbd/Makefile
|+++ b/news/sabnzbd/Makefile
--------------------------
Patching file news/sabnzbd/Makefile using Plan A...
patch: **** malformed patch at line 12:


Could you please fix it? The "git diff --output sabnzbd.diff" would be fine (maybe as you did?).
Comment 8 Nicholas Kirby 2024-04-06 06:31:48 UTC
Created attachment 249752 [details]
Patch to 4.2.3 - v4

Alright, how is this?

I had to fix a couple of mistakes I made between my ports tree and my poudriere tree but I think this should be good!

Thanks again
Comment 9 Zsolt Udvari freebsd_committer freebsd_triage 2024-04-06 14:33:11 UTC
(In reply to Nicholas Kirby from comment #8)
Same error.
Maybe you should try apply your patch on a clean ports tree (git apply).
Comment 10 Nicholas Kirby 2024-04-09 02:58:50 UTC
Created attachment 249846 [details]
Patch to 4.2.3 - v5

Alright! I'm 99% sure I've got it this time. I made SEVERAL mistakes with previous patches!

- I had a ^M blank space at the end of every line of the previous one that was the result of how I tried to be lazy and copy the raw text to another machine for upload. I've set up a basic file share so I can get the actual tested file from my main machine for upload so it can't be adulterated before upload.
- I was building my patch in my poudriere default ports tree and not my actual ports tree so it would apply to the poudriere one and not the main one with git apply. I'm no longer doing that.

The one I am uploading I have tested applying to my normal ports tree and it works (for me)!

Thank you again for your patience.

P.S. Ha ha ha after all that I filled in this box and didn't actually attach the file. Got a big ol' RED ERROR MESSAGE.
Comment 11 Zsolt Udvari freebsd_committer freebsd_triage 2024-04-09 06:59:46 UTC
(In reply to Nicholas Kirby from comment #10)
Okay, now can apply :)
I'm testing and I'll open a review.
Thanks.
Comment 12 Zsolt Udvari freebsd_committer freebsd_triage 2024-04-09 08:48:08 UTC
Remarks:
- the COPYRIGHT.TXT in PORTDOCS, should be the LICENSE_FILE instead (see https://docs.freebsd.org/en/books/porters-handbook/book/#licenses-license and https://docs.freebsd.org/en/books/porters-handbook/book/#licenses-license_file)
- I can't find BSD2CLAUSE, BSD3CLAUSE, ISCL, PSFL in the source files, maybe should remove them?
- maybe can use msgfmt (part of gettext-tools) to generate *.mo files instead of extracted msgfmt.py
- sabnbzd/utils/pybonjour.py: there is a package, py-pybonjour. Should use it: https://docs.freebsd.org/en/books/porters-handbook/book/#bundled-libs
- sabnbzd/utils/rarfile.py: same as above
- the sabnzbd/utils/systrayiconthread.py has WTFPL license, should include into LICENSES
Comment 13 Nicholas Kirby 2024-04-19 02:29:06 UTC
Created attachment 250075 [details]
Patch to 4.2.3 - v6

Alright, sorry about the delay.

How is this?

I might need some coaching on how to get it to use gettext-tools, as my build log is seeing it as a dependency and installing it. Not sure how it generates the .mo files though.