pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ndevd: minor changes and portability fixes.
Module Name: pkgsrc-wip
Committed By: Paolo Vincenzo Olivo <vms%retrobsd.ddns.net@localhost>
Pushed By: vms
Date: Thu Dec 4 21:03:34 2025 +0100
Changeset: 810b7c990980ffee0b8acb26dbed36ff73df32fe
Modified Files:
ndevd/Makefile
ndevd/distinfo
Added Files:
ndevd/patches/patch-Makefile
ndevd/patches/patch-devpubd.8
ndevd/patches/patch-devpubd.c
Log Message:
ndevd: minor changes and portability fixes.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=810b7c990980ffee0b8acb26dbed36ff73df32fe
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ndevd/Makefile | 8 +++++++-
ndevd/distinfo | 3 +++
ndevd/patches/patch-Makefile | 25 +++++++++++++++++++++++++
ndevd/patches/patch-devpubd.8 | 19 +++++++++++++++++++
ndevd/patches/patch-devpubd.c | 25 +++++++++++++++++++++++++
5 files changed, 79 insertions(+), 1 deletion(-)
diffs:
diff --git a/ndevd/Makefile b/ndevd/Makefile
index 735e7054ec..057eb68784 100644
--- a/ndevd/Makefile
+++ b/ndevd/Makefile
@@ -10,6 +10,12 @@ HOMEPAGE= https://github.com/kikadf/ndevd/
COMMENT= NetBSD devpubd + event forwarding to clients
LICENSE= original-bsd
-CFLAGS+= -g -O0
+USE_TOOLS+= sed
+NO_CONFIGURE= yes
+
+MAKE_FLAGS+= PREFIX=${PREFIX} \
+ MANDIR=${PREFIX}/${PKGMANDIR}/man8
+
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ndevd/distinfo b/ndevd/distinfo
index 215bcf21ef..23e52751d1 100644
--- a/ndevd/distinfo
+++ b/ndevd/distinfo
@@ -3,3 +3,6 @@ $NetBSD$
BLAKE2s (ndevd-25.08.20.tar.gz) = cc59b2f1380e8b2ada8c83ff0fbc3004bc21e379f6e17f1536b885628e9d4b3d
SHA512 (ndevd-25.08.20.tar.gz) = 88ab33633593fbcaa67760529df7062d17fc3c865ebf5d322e6bd1b0e8b4e2fab9ff87991de671a01d71096a5508b14ec13d4f51ae1c77c5da2c04b4e5075231
Size (ndevd-25.08.20.tar.gz) = 8298 bytes
+SHA1 (patch-Makefile) = dfdb57ec46ec4833bc3a5b53833ac773836d7e2c
+SHA1 (patch-devpubd.8) = 55e15bfd1cdee43e75e9287ae85125f73f4dff62
+SHA1 (patch-devpubd.c) = a68a7798bcc6d72c442a775e9bb3a75e04bc587a
diff --git a/ndevd/patches/patch-Makefile b/ndevd/patches/patch-Makefile
new file mode 100644
index 0000000000..97ec04f407
--- /dev/null
+++ b/ndevd/patches/patch-Makefile
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Do not override pkgsrc defaults.
+
+--- Makefile.orig 2025-08-19 18:13:10.000000000 +0000
++++ Makefile
+@@ -1,6 +1,6 @@
+-CC= gcc
+-SED= sed
+-INSTALL= install
++CC?= gcc
++SED?= sed
++INSTALL?= install
+ RM= rm -f
+
+ PROG= ndevd
+@@ -15,7 +15,7 @@ CLEANFILES= $(SCRIPT) $(RCSCRIPT)
+ PREFIX?= /usr/pkg
+ BINDIR?= ${PREFIX}/sbin
+ INCLUDEDIR= ${PREFIX}/include
+-MANDIR= ${PREFIX}/man/man8
++MANDIR?= ${PREFIX}/man/man8
+ SCRIPTDIR= ${PREFIX}/libexec
+ HOOKSDIR= ${SCRIPTDIR}/ndevd-hooks
+ RCDIR= ${PREFIX}/share/examples/rc.d
diff --git a/ndevd/patches/patch-devpubd.8 b/ndevd/patches/patch-devpubd.8
new file mode 100644
index 0000000000..560c0a1a5b
--- /dev/null
+++ b/ndevd/patches/patch-devpubd.8
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Fix formatting; replace tabs with spaces.
+
+--- devpubd.8.orig 2025-08-19 18:13:10.000000000 +0000
++++ devpubd.8
+@@ -72,9 +72,9 @@ Additional scripts may be added for othe
+ .Pp
+ Since
+ .Xr drvctl 4
+-allows only one active reader, ndevd multiplexes it, forwarding
+-all events to the connected clients. Clients connect by
+-opening the SOCK_SEQPACKET Unix domain socket at /var/run/ndevd.socket.
++allows only one active reader, ndevd multiplexes it, forwarding all
++events to the connected clients. Clients connect by opening the
++SOCK_SEQPACKET Unix domain socket at /var/run/ndevd.socket.
+ .Sh SEE ALSO
+ .Xr drvctl 8 ,
+ .Xr MAKEDEV 8
diff --git a/ndevd/patches/patch-devpubd.c b/ndevd/patches/patch-devpubd.c
new file mode 100644
index 0000000000..d999f108cd
--- /dev/null
+++ b/ndevd/patches/patch-devpubd.c
@@ -0,0 +1,25 @@
+$NetBSD$
+
+* Fix warning: `noreturn function does return' in devpubd_eventloop().
+* Fix uninitialized variable.
+
+--- devpubd.c.orig 2025-08-19 18:13:10.000000000 +0000
++++ devpubd.c
+@@ -285,14 +285,15 @@ devpubd_eventhandler(const char *event,
+ free(argv);
+ }
+
+-__dead static void
++static void
+ devpubd_eventloop(void)
+ {
+ const char *event, *device[2], *parent;
+ prop_dictionary_t ev;
+- int res, max_fd, rv, a = 0;
++ int res, rv, a = 0;
+ struct timeval tv;
+ fd_set fds;
++ int max_fd = 0;
+ int reported = 0;
+ int reject = 0;
+
Home |
Main Index |
Thread Index |
Old Index