pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gkrellm: Import a patch from the upstream to fix build on FreeBSD
Module Name: pkgsrc-wip
Committed By: PHO <pho%cielonegro.org@localhost>
Pushed By: pho
Date: Sat Aug 30 15:27:52 2025 +0900
Changeset: b8bfa6f6fa2754f1f782b120688e0ca394334e17
Modified Files:
gkrellm/distinfo
Added Files:
gkrellm/patches/patch-src_sysdeps_freebsd.c
Log Message:
gkrellm: Import a patch from the upstream to fix build on FreeBSD
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b8bfa6f6fa2754f1f782b120688e0ca394334e17
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gkrellm/distinfo | 1 +
gkrellm/patches/patch-src_sysdeps_freebsd.c | 43 +++++++++++++++++++++++++++++
2 files changed, 44 insertions(+)
diffs:
diff --git a/gkrellm/distinfo b/gkrellm/distinfo
index b0d7a8db22..c602ee28f7 100644
--- a/gkrellm/distinfo
+++ b/gkrellm/distinfo
@@ -6,3 +6,4 @@ Size (gkrellm-2.4.0.tar.bz2) = 790070 bytes
SHA1 (patch-gkrellmd.1) = 579f6eac994ec5321645a21a117e621260be8a6c
SHA1 (patch-server_Makefile) = a8194ddd9dc9f58cbacd0615914b53cc2af8a9b0
SHA1 (patch-src_Makefile) = 6bfbcd0d33975671cbd1d60473a00b55a27eba2a
+SHA1 (patch-src_sysdeps_freebsd.c) = 830c55f97cc374148f2e1fbf57e843bccc33ab00
diff --git a/gkrellm/patches/patch-src_sysdeps_freebsd.c b/gkrellm/patches/patch-src_sysdeps_freebsd.c
new file mode 100644
index 0000000000..ddfa017a64
--- /dev/null
+++ b/gkrellm/patches/patch-src_sysdeps_freebsd.c
@@ -0,0 +1,43 @@
+$NetBSD$
+
+Apply FreeBSD patch for newer kernel versions:
+https://git.srcbox.net/gkrellm/gkrellm/commit/6526b753b2ece3331add6c9dd6af09e7899c67bc
+
+--- src/sysdeps/freebsd.c.orig 2025-01-19 16:02:37.000000000 +0000
++++ src/sysdeps/freebsd.c
+@@ -701,9 +701,15 @@ gkrellm_sys_inet_read_tcp_data(void)
+ xig->xig_len > sizeof(struct xinpgen);
+ xig = (struct xinpgen *)((char *)xig + xig->xig_len))
+ {
++#if __FreeBSD_version >= 1200026
++ struct xtcpcb *tp = (struct xtcpcb *)xig;
++ struct xinpcb *inp = &tp->xt_inp;
++ struct xsocket *so = &inp->xi_socket;
++#else
+ struct tcpcb *tp = &((struct xtcpcb *)xig)->xt_tp;
+ struct inpcb *inp = &((struct xtcpcb *)xig)->xt_inp;
+ struct xsocket *so = &((struct xtcpcb *)xig)->xt_socket;
++#endif
+
+ /* Ignore sockets for protocols other than tcp. */
+ if (so->xso_protocol != IPPROTO_TCP)
+@@ -1441,7 +1447,9 @@ get_data(int iodev, u_char command, int interface, u_c
+ struct smbcmd cmd;
+
+ bzero(&cmd, sizeof(cmd));
++#if __FreeBSD_version < 1100070
+ cmd.data.byte_ptr = (char *)&byte;
++#endif
+ cmd.slave = 0x5a;
+ cmd.cmd = command;
+ if (ioctl(iodev, SMB_READB, (caddr_t)&cmd) == -1)
+@@ -1449,6 +1457,9 @@ get_data(int iodev, u_char command, int interface, u_c
+ close(iodev);
+ return FALSE;
+ }
++#if __FreeBSD_version >= 1100070
++ byte = (u_char)cmd.rdata.byte;
++#endif
+ }
+ #endif
+ else
Home |
Main Index |
Thread Index |
Old Index