Created attachment 260118 [details] patch to upgrade net/libiscsi to 1.20.1 Please find attached a patch to upgrade net/libiscsi to 1.20.1. I do not currently use this but made some efforts to get it to compile on i386 and amd64. On amd64, emulators/qemu also builds with the ISCSI option enabled. I am not sure about the libthr search I added to configure.ac, if there is a more proper way to do this please let me know. -- Martin
(In reply to Martin Birgmeier from comment #0) > I am not sure about the libthr search I added to configure.ac, if there is a more proper way to do this please let me know. Maybe "LDFLAGS+=-lthr" in net/libiscsi/Makefile?
(In reply to Vladimir Druzenko from comment #1) The libthr change is necessery and it works. What I meant to say is that I am not sure that my hacking of configure.ac adheres to the "rules", whatever they may be. But the port itself seems to be o.k., and it also allows emulators/qemu to compile with options ISCSI, which was my initial reason for creating it. However, since I am not using qemu anymore, I cannot say whether the latter is indeed working. -- Martin
Not so important, but better to regenerate patches with "make patch && make makepatch".
I split the patch-getthreadid patch into two (patch-include_iscsi-multithreading.h and patch-lib_multithreading.c) and regenerated all patches. Also we must bump all consumers (emulators/qemu and emulators/qemu8) because the soname is bumped.
Created attachment 260183 [details] v1
Comment on attachment 260183 [details] v1 Hi Vladimir, Thank you for your work, this is fine for me. Regarding PORTVERSION vs. DISTVERSION: from the description in Mk/bsd.port.mk I had the impression that the former is preferred - would you want to change it? -- Martin
Comment on attachment 260183 [details] v1 Is putting the "X" in maintainer-approval correct? - I want to express that I approve the patch. -- Martin
(In reply to Martin Birgmeier from comment #6) AFAIU, DISTVERSION is preferred, and PORTVERSION used only if DISTVERSION can't correct parse complex version with letters: https://docs.freebsd.org/en/books/porters-handbook/book/#makefile-versions (In reply to Martin Birgmeier from comment #7) Set sign + near patch.
Comment on attachment 260183 [details] v1 Set '+' sign for patch maintainer-approval.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=c27c323aa8ffa3631106b295ab4d3262c3ba9329 commit c27c323aa8ffa3631106b295ab4d3262c3ba9329 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2025-05-06 17:36:33 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-05-06 17:36:33 +0000 emulators/qemu{,8}: Bump consumers of the net/libiscsi because the soname is bumped in last update PR: 286546 emulators/qemu/Makefile | 1 + emulators/qemu8/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=9289343def2dc178c035dbd203c14e81e7e3ca1c commit 9289343def2dc178c035dbd203c14e81e7e3ca1c Author: Martin Birgmeier <d8zNeCFG@aon.at> AuthorDate: 2025-05-06 17:24:42 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-05-06 17:35:37 +0000 net/libiscsi: Update 1.20.0.240205 => 1.20.1 Commit log: https://github.com/sahlberg/libiscsi/compare/1.20.1...1.20.2 - Add libthr search to configure.ac. - Add STRIP_CMD as suggested by poudriere testport. - Refresh patches. - Bump consumers (emulators/qemu and emulators/qemu8) in next commmit because the soname is bumped. PR: 286546 Co-authored-by: vvd net/libiscsi/Makefile | 5 ++--- net/libiscsi/distinfo | 6 ++--- net/libiscsi/files/patch-configure.ac | 26 ++++++++++++++++++++-- .../patch-include_iscsi-multithreading.h (new) | 12 ++++++++++ .../files/patch-lib_multithreading.c (new) | 11 +++++++++ net/libiscsi/files/patch-lib_socket.c | 10 ++++----- net/libiscsi/files/patch-utils_iscsi-discard.c | 2 +- net/libiscsi/pkg-plist | 4 ++-- 8 files changed, 60 insertions(+), 16 deletions(-)
Thanks.
1.20.2 released: https://github.com/sahlberg/libiscsi/compare/1.20.1...1.20.2 With only one commit: > Apple: use mutexes instead of spinlocks on apple > Apple do not support spinlocks so we must remap to the much slower > mutexes instead if we think we are compiling for apple.
Thank you Vladimir. If 1.20.2 contains nothing for FreeBSD, how do I convince portscout not to send notification mails? -- Martin
(In reply to Martin Birgmeier from comment #14) Update port or add to Makefile something like this: PORTSCOUT= skipv:1.20.2
(In reply to Vladimir Druzenko from comment #15) Looking at the diff we should really skip this version. Could you please do it? Above the portscout instruction to add to the Makefile, also add a reason: # 1.20.2 only affects environments defining __APPLE__ PORTSCOUT= skipv:1.20.2 -- Martin
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=553a4db06718026a9945713e49c7788c561277fd commit 553a4db06718026a9945713e49c7788c561277fd Author: Martin Birgmeier <d8zNeCFG@aon.at> AuthorDate: 2025-05-06 20:09:21 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-05-06 20:34:02 +0000 net/libiscsi: Add PORTSCOUT skip version 1.20.2 - only affects __APPLE__ PR: 286546 net/libiscsi/Makefile | 3 +++ 1 file changed, 3 insertions(+)
(In reply to commit-hook from comment #17) Thank you! -- Martin