Fri Jun 30 00:25:34 2017 UTC ()
Adapt fscd for <sys/user.h> removal from NetBSD 8.99.1


(kamil)
diff -r1.6 -r1.7 pkgsrc/sysutils/fscd/distinfo
diff -r1.1 -r1.2 pkgsrc/sysutils/fscd/patches/patch-fscd_fscd.c
cvs diff -r1.6 -r1.7 pkgsrc/sysutils/fscd/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/fscd/distinfo 2015/11/04 01:32:14 1.6
+++ pkgsrc/sysutils/fscd/distinfo 2017/06/30 00:25:34 1.7
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.6 2015/11/04 01:32:14 agc Exp $ 1$NetBSD: distinfo,v 1.7 2017/06/30 00:25:34 kamil Exp $
2 2
3SHA1 (fscd-1.1.tar.gz) = 8d17ec035fbe7b90aeefdff23042a07a7d65c2c7 3SHA1 (fscd-1.1.tar.gz) = 8d17ec035fbe7b90aeefdff23042a07a7d65c2c7
4RMD160 (fscd-1.1.tar.gz) = 0c9aae223825e5fda61d88007b7abb4c30a61c18 4RMD160 (fscd-1.1.tar.gz) = 0c9aae223825e5fda61d88007b7abb4c30a61c18
5SHA512 (fscd-1.1.tar.gz) = f0a1b29082fbf8f614bc56f7d49e52976a24832f73a4ce734303dfd193bee134a61449062217ba96a19714a52b2862c8014d7876f19212852e28af99d487de93 5SHA512 (fscd-1.1.tar.gz) = f0a1b29082fbf8f614bc56f7d49e52976a24832f73a4ce734303dfd193bee134a61449062217ba96a19714a52b2862c8014d7876f19212852e28af99d487de93
6Size (fscd-1.1.tar.gz) = 16295 bytes 6Size (fscd-1.1.tar.gz) = 16295 bytes
7SHA1 (patch-fscadm_fscadm.c) = ad163550cfe11603f94e633e7f111b19ed56ba5e 7SHA1 (patch-fscadm_fscadm.c) = ad163550cfe11603f94e633e7f111b19ed56ba5e
8SHA1 (patch-fscd_fscd.c) = 1091b8ee612d100287fde6c38a0b3d46e98f5eb9 8SHA1 (patch-fscd_fscd.c) = 2a32cc41192e3e0fcbdfbf439b075e78d8697451
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/fscd/patches/patch-fscd_fscd.c (expand / switch to unified diff)

--- pkgsrc/sysutils/fscd/patches/patch-fscd_fscd.c 2013/09/10 14:43:23 1.1
+++ pkgsrc/sysutils/fscd/patches/patch-fscd_fscd.c 2017/06/30 00:25:34 1.2
@@ -1,15 +1,25 @@ @@ -1,15 +1,25 @@
1$NetBSD: patch-fscd_fscd.c,v 1.1 2013/09/10 14:43:23 joerg Exp $ 1$NetBSD: patch-fscd_fscd.c,v 1.2 2017/06/30 00:25:34 kamil Exp $
2 2
3--- fscd/fscd.c.orig 2012-11-12 00:12:33.000000000 +0000 3--- fscd/fscd.c.orig 2012-11-12 00:12:33.000000000 +0000
4+++ fscd/fscd.c 4+++ fscd/fscd.c
5@@ -1067,6 +1067,10 @@ handle_task(struct fscd_cfg *config, cha 5@@ -45,7 +45,9 @@ __FBSDID("$FreeBSD$");
 6 #include <sys/sysctl.h>
 7 #include <sys/uio.h>
 8 #include <sys/un.h>
 9+#if defined(__FreeBSD__) || defined(__DragonFly__)
 10 #include <sys/user.h>
 11+#endif
 12 #include <sys/time.h>
 13 #include <sys/wait.h>
 14 #include <ctype.h>
 15@@ -1067,6 +1069,10 @@ handle_task(struct fscd_cfg *config, cha
6 print_status(config, sock_fd); 16 print_status(config, sock_fd);
7 pthread_mutex_unlock(&config->service_mtx); 17 pthread_mutex_unlock(&config->service_mtx);
8 return 0; 18 return 0;
9+ } else { 19+ } else {
10+ printlog(LOG_ERR, "received invalid message from client."); 20+ printlog(LOG_ERR, "received invalid message from client.");
11+ pthread_mutex_unlock(&config->service_mtx); 21+ pthread_mutex_unlock(&config->service_mtx);
12+ return -1; 22+ return -1;
13 } 23 }
14 pthread_mutex_unlock(&config->service_mtx); 24 pthread_mutex_unlock(&config->service_mtx);
15  25