Bug 267666

Summary: news/nzbhydra2: Update to 4.7.2
Product: Ports & Packages Reporter: Marcel Bischoff <marcel>
Component: Individual Port(s)Assignee: Ronald Klop <ronald>
Status: Closed FIXED    
Severity: Affects Only Me CC: daniel, ronald
Priority: --- Flags: bugzilla: maintainer-feedback? (daniel)
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
Patch
none
Patch for v4.7.2
none
Updated patch ronald: maintainer-approval? (daniel)

Description Marcel Bischoff 2022-11-09 11:13:01 UTC 
Changelog: https://github.com/theotherp/nzbhydra2/blob/master/changelog.md

Builds successfully and runs stable on my local server.
Comment 1 Marcel Bischoff 2022-11-09 11:13:38 UTC 
Created attachment 237975 [details]
Patch
Comment 2 Marcel Bischoff 2022-12-01 09:56:48 UTC 
Created attachment 238470 [details]
Patch for v4.7.2
Comment 3 Marcel Bischoff 2022-12-01 10:02:54 UTC 
Since the last maintainer update to this port has been April 2022 and he hasn't reacted in almost one month regarding my last patch, I offer to take maintainership. I don't want to step on any toes, just ensure timely updates.
Comment 4 Ronald Klop freebsd_committer freebsd_triage 2022-12-01 10:58:09 UTC 
Hi Marcel,

You patch does not apply cleanly.

patch -C < /tmp/attachment.cgi\?id\=238470 
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|From 1cee0674864fc1792200a33bae77495fb62eb6ec Mon Sep 17 00:00:00 2001
|From: Marcel Bischoff <marcel@herrbischoff.com>
|Date: Thu, 1 Dec 2022 10:42:26 +0100
|Subject: [PATCH] news/nzbhydra2: Update to 4.7.2
|
|---
| news/nzbhydra2/Makefile | 2 +-
| news/nzbhydra2/distinfo | 6 +++---
| 2 files changed, 4 insertions(+), 4 deletions(-)
|
|diff --git a/news/nzbhydra2/Makefile b/news/nzbhydra2/Makefile
|index b9e0e6b4b..0b1bc3e82 100644
|--- a/news/nzbhydra2/Makefile
|+++ b/news/nzbhydra2/Makefile
--------------------------
Patching file news/nzbhydra2/Makefile using Plan A...
patch: **** malformed patch at line 21: diff --git a/news/nzbhydra2/distinfo b/news/nzbhydra2/distinfo


I can easily fix that by inserting a newline on the CATEGORY line.
After that it gives a warning:
Hmm...  Ignoring the trailing garbage.
done

I will start my build test in the meantime but you might take a look into how you generate the patches to make future work easier.
Comment 5 Ronald Klop freebsd_committer freebsd_triage 2022-12-01 11:11:27 UTC 
Your patch also changes tabs to spaces. Can you provide a new patch and make sure it applies cleanly?
Comment 6 Marcel Bischoff 2022-12-01 11:15:21 UTC 
Sorry for that. I generated it with `git format-patch`. Will look into the source of the issue.
Comment 7 Marcel Bischoff 2022-12-01 11:34:53 UTC 
Created attachment 238472 [details]
Updated patch
Comment 8 Marcel Bischoff 2022-12-01 11:36:05 UTC 
I have tried applying the updated patch to a fresh clone of the ports repo and, at least for me, it applies cleanly.
Comment 9 Ronald Klop freebsd_committer freebsd_triage 2022-12-08 10:00:53 UTC 
Patch is up for review D37632.
Comment 10 commit-hook freebsd_committer freebsd_triage 2022-12-15 08:37:05 UTC 
A commit in branch main references this bug:

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

commit 57b24ef5db1faaccab5f09eb1f2c27978d000faa
Author:     Marcel Bischoff <marcel@herrbischoff.com>
AuthorDate: 2022-12-08 09:55:22 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2022-12-15 08:35:59 +0000

    news/nzbhydra2: update to 4.7.2

    Summary:
    * maintainer timeout on 15-dec-2022
    * builds fine on aarch64

    PR:     267666
    Approved by: rene (mentor)
    Differential Revision: https://reviews.freebsd.org/D37632

 news/nzbhydra2/Makefile | 4 ++--
 news/nzbhydra2/distinfo | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
Comment 11 Ronald Klop freebsd_committer freebsd_triage 2022-12-15 10:50:29 UTC 
Committed. Thanks for the patch.