Bug 275604 - benchmarks/netperfmeter: Update to new release 1.9.6
Summary: benchmarks/netperfmeter: Update to new release 1.9.6
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Many People
Assignee: Fernando Apesteguía
URL: https://www.nntb.no/~dreibh/netperfme...
Keywords: needs-qa
Depends on:
Blocks:
 
Reported: 2023-12-07 12:08 UTC by Thomas Dreibholz
Modified: 2024-02-12 07:31 UTC (History)
1 user (show)

See Also:


Attachments
The diff file (1.79 KB, patch)
2023-12-07 12:08 UTC, Thomas Dreibholz
no flags Details | Diff
The diff file (1.75 KB, patch)
2023-12-18 09:24 UTC, Thomas Dreibholz
no flags Details | Diff
The diff file (1.36 KB, patch)
2023-12-18 12:25 UTC, Thomas Dreibholz
no flags Details | Diff
The diff file (1.36 KB, patch)
2023-12-19 08:50 UTC, Thomas Dreibholz
no flags Details | Diff
The diff file (1.92 KB, patch)
2024-02-10 12:05 UTC, Thomas Dreibholz
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas Dreibholz 2023-12-07 12:08:10 UTC
Created attachment 246862 [details]
The diff file

The latest upstream version of netperfmeter is 1.9.5.
Therefore, the port benchmarks/netperfmeter needs an update.

Fix: The updated diff file netperfmeter-1.9.5.diff is attached.
Comment 1 Bugzilla Automation freebsd_committer freebsd_triage 2023-12-07 12:08:10 UTC
Maintainer informed via mail
Comment 2 Fernando Apesteguía freebsd_committer freebsd_triage 2023-12-09 13:05:18 UTC
Please, see comment in bug #275600
Comment 3 Thomas Dreibholz 2023-12-18 09:24:07 UTC
Created attachment 247120 [details]
The diff file
Comment 4 Thomas Dreibholz 2023-12-18 09:24:19 UTC
Fixed.
Comment 5 Thomas Dreibholz 2023-12-18 12:25:32 UTC
Created attachment 247131 [details]
The diff file
Comment 6 Fernando Apesteguía freebsd_committer freebsd_triage 2023-12-18 13:05:01 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.


Thanks!
Comment 7 Fernando Apesteguía freebsd_committer freebsd_triage 2023-12-18 19:11:50 UTC
benchmarks/netperfmeter$ make patch


===>  License GPLv3+ accepted by the user
===>   netperfmeter-1.9.6 depends on file: /usr/local/sbin/pkg - found
=> netperfmeter-1.9.6.tar.xz doesn't seem to exist in /data/fernape_data/FreeBSD-repos/ports/distfiles/.
=> Attempting to fetch https://www.nntb.no/~dreibh/netperfmeter/download/netperfmeter-1.9.6.tar.xz
netperfmeter-1.9.6.tar.xz                              276 kB 1141 kBps    00s
===> Fetching all distfiles required by netperfmeter-1.9.6 for building
===>  Extracting for netperfmeter-1.9.6
=> SHA256 Checksum OK for netperfmeter-1.9.6.tar.xz.
===>  Patching for netperfmeter-1.9.6
===>  Applying FreeBSD patches for netperfmeter-1.9.6 from /data/fernape_data/FreeBSD-repos/ports/benchmarks/netperfmeter/files
1 out of 2 hunks failed--saving rejects to src/tools.cc.rej
===>  FAILED Applying FreeBSD patch-src_tools.cc
===> FAILED to apply cleanly FreeBSD patch(es)  patch-src_tools.cc
*** Error code 1
Comment 8 Thomas Dreibholz 2023-12-19 08:50:11 UTC
Created attachment 247156 [details]
The diff file
Comment 9 Thomas Dreibholz 2023-12-19 08:54:05 UTC
The full changelog is directly in the tarball (ChangeLog file). So, I just added the project homepage in the URL field.
Comment 10 Fernando Apesteguía freebsd_committer freebsd_triage 2023-12-19 16:56:54 UTC
$ patch -p4 < ~/Downloads/netperfmeter-1.9.6.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -uN -x *~ -X exclude.list /usr/ports/benchmarks/netperfmeter/Makefile ./Makefile
|--- /usr/ports/benchmarks/netperfmeter/Makefile        2022-09-07 23:06:12.000000000 +0200
|+++ ./Makefile 2023-12-18 13:19:40.098007000 +0100
--------------------------
Patching file Makefile using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -uN -x *~ -X exclude.list /usr/ports/benchmarks/netperfmeter/distinfo ./distinfo
|--- /usr/ports/benchmarks/netperfmeter/distinfo        2021-04-20 09:28:19.000000000 +0200
|+++ ./distinfo 2023-12-18 13:19:40.098326000 +0100
--------------------------
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm...  Ignoring the trailing garbage.
done
fernape@beastie:~/FreeBSD-repos/ports/benchmarks/netperfmeter$ make patch
===>  Patching for netperfmeter-1.9.6
===>  Applying FreeBSD patches for netperfmeter-1.9.6 from /data/fernape_data/FreeBSD-repos/ports/benchmarks/netperfmeter/files
2 out of 2 hunks failed--saving rejects to src/tools.cc.rej
===>  FAILED Applying FreeBSD patch-src_tools.cc
===> FAILED to apply cleanly FreeBSD patch(es)  patch-src_tools.cc
*** Error code 1

Stop.
make: stopped in /data/fernape_data/FreeBSD-repos/ports/benchmarks/netperfmeter


Please, read https://docs.freebsd.org/en/books/porters-handbook/slow-porting/#slow-patch and *ensure* that the patch applies and that the port builds. Poudriere is a great tool for that (https://docs.freebsd.org/en/books/porters-handbook/testing/)
Comment 11 Thomas Dreibholz 2024-02-10 12:05:08 UTC
Created attachment 248304 [details]
The diff file

The updated diff should fix the issues.
Comment 12 Thomas Dreibholz 2024-02-10 12:06:29 UTC
Changed status back to "In Progress".
Comment 13 Fernando Apesteguía freebsd_committer freebsd_triage 2024-02-10 19:42:08 UTC
Q/A: PORTREVISION should be removed


Thanks!
Comment 14 Fernando Apesteguía freebsd_committer freebsd_triage 2024-02-12 07:31:09 UTC
Committed,

Thanks!
Comment 15 commit-hook freebsd_committer freebsd_triage 2024-02-12 07:31:49 UTC
A commit in branch main references this bug:

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

commit ccdfba723f9fe2bf62368b8ef565ab2ed50fd2cc
Author:     Thomas Dreibholz <thomas.dreibholz@gmail.com>
AuthorDate: 2024-02-10 19:42:23 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2024-02-12 07:30:42 +0000

    benchmarks/netperfmeter: Update to new release 1.9.6

    ChangeLog: https://www.nntb.no/~dreibh/netperfmeter/

    PR:             275604
    Reported by:    thomas.dreibholz@gmail.com

 benchmarks/netperfmeter/Makefile                   |  3 +--
 benchmarks/netperfmeter/distinfo                   |  6 +++---
 .../netperfmeter/files/patch-src_tools.cc (gone)   | 25 ----------------------
 3 files changed, 4 insertions(+), 30 deletions(-)