Module Name:    src
Committed By:   christos
Date:           Mon Apr  4 15:52:56 UTC 2016

Modified Files:
        src/external/bsd/blacklist/bin: blacklistctl.c blacklistd.c conf.c
            internal.h run.c state.c support.c support.h

Log Message:
FreeBSD patches from Kurt Lidl.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/blacklist/bin/blacklistctl.c
cvs rdiff -u -r1.33 -r1.34 src/external/bsd/blacklist/bin/blacklistd.c
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/blacklist/bin/conf.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/blacklist/bin/internal.h \
    src/external/bsd/blacklist/bin/run.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/blacklist/bin/state.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/blacklist/bin/support.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/blacklist/bin/support.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/blacklist/bin/blacklistctl.c
diff -u src/external/bsd/blacklist/bin/blacklistctl.c:1.19 src/external/bsd/blacklist/bin/blacklistctl.c:1.20
--- src/external/bsd/blacklist/bin/blacklistctl.c:1.19	Wed Nov  4 11:21:52 2015
+++ src/external/bsd/blacklist/bin/blacklistctl.c	Mon Apr  4 11:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: blacklistctl.c,v 1.19 2015/11/04 16:21:52 christos Exp $	*/
+/*	$NetBSD: blacklistctl.c,v 1.20 2016/04/04 15:52:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -33,10 +33,13 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: blacklistctl.c,v 1.19 2015/11/04 16:21:52 christos Exp $");
+__RCSID("$NetBSD: blacklistctl.c,v 1.20 2016/04/04 15:52:56 christos Exp $");
 
 #include <stdio.h>
 #include <time.h>
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
 #ifdef HAVE_UTIL_H
 #include <util.h>
 #endif

Index: src/external/bsd/blacklist/bin/blacklistd.c
diff -u src/external/bsd/blacklist/bin/blacklistd.c:1.33 src/external/bsd/blacklist/bin/blacklistd.c:1.34
--- src/external/bsd/blacklist/bin/blacklistd.c:1.33	Sat Jun 20 21:13:21 2015
+++ src/external/bsd/blacklist/bin/blacklistd.c	Mon Apr  4 11:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: blacklistd.c,v 1.33 2015/06/21 01:13:21 christos Exp $	*/
+/*	$NetBSD: blacklistd.c,v 1.34 2016/04/04 15:52:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,12 +32,15 @@
 #include "config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: blacklistd.c,v 1.33 2015/06/21 01:13:21 christos Exp $");
+__RCSID("$NetBSD: blacklistd.c,v 1.34 2016/04/04 15:52:56 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
 
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
 #ifdef HAVE_UTIL_H
 #include <util.h>
 #endif

Index: src/external/bsd/blacklist/bin/conf.c
diff -u src/external/bsd/blacklist/bin/conf.c:1.23 src/external/bsd/blacklist/bin/conf.c:1.24
--- src/external/bsd/blacklist/bin/conf.c:1.23	Wed Jun  3 11:11:40 2015
+++ src/external/bsd/blacklist/bin/conf.c	Mon Apr  4 11:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.23 2015/06/03 15:11:40 christos Exp $	*/
+/*	$NetBSD: conf.c,v 1.24 2016/04/04 15:52:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -33,9 +33,15 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: conf.c,v 1.23 2015/06/03 15:11:40 christos Exp $");
+__RCSID("$NetBSD: conf.c,v 1.24 2016/04/04 15:52:56 christos Exp $");
 
 #include <stdio.h>
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
+#ifdef HAVE_UTIL_H
+#include <util.h>
+#endif
 #include <string.h>
 #include <ctype.h>
 #include <inttypes.h>
@@ -43,9 +49,6 @@ __RCSID("$NetBSD: conf.c,v 1.23 2015/06/
 #include <pwd.h>
 #include <syslog.h>
 #include <errno.h>
-#ifdef HAVE_UTIL_H
-#include <util.h>
-#endif
 #include <stdlib.h>
 #include <limits.h>
 #include <ifaddrs.h>
@@ -495,8 +498,8 @@ out:
 	if (debug > 1) {
 		char b1[256], b2[256];
 		len <<= 2;
-		hexdump(b1, sizeof(b1), "a1", v1, len);
-		hexdump(b2, sizeof(b2), "a2", v2, len);
+		blhexdump(b1, sizeof(b1), "a1", v1, len);
+		blhexdump(b2, sizeof(b2), "a2", v2, len);
 		(*lfun)(LOG_DEBUG, "%s: %s != %s [0x%x]", __func__,
 		    b1, b2, omask);
 	}

Index: src/external/bsd/blacklist/bin/internal.h
diff -u src/external/bsd/blacklist/bin/internal.h:1.13 src/external/bsd/blacklist/bin/internal.h:1.14
--- src/external/bsd/blacklist/bin/internal.h:1.13	Wed Oct 14 12:01:29 2015
+++ src/external/bsd/blacklist/bin/internal.h	Mon Apr  4 11:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: internal.h,v 1.13 2015/10/14 16:01:29 christos Exp $	*/
+/*	$NetBSD: internal.h,v 1.14 2016/04/04 15:52:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@ extern struct ifaddrs *ifas;
 #define __syslog__ __printf__
 #endif
 
-void (*lfun)(int, const char *, ...)
+extern void (*lfun)(int, const char *, ...)
     __attribute__((__format__(__syslog__, 2, 3)));
 
 #endif /* _INTERNAL_H */
Index: src/external/bsd/blacklist/bin/run.c
diff -u src/external/bsd/blacklist/bin/run.c:1.13 src/external/bsd/blacklist/bin/run.c:1.14
--- src/external/bsd/blacklist/bin/run.c:1.13	Tue Jun  2 10:02:10 2015
+++ src/external/bsd/blacklist/bin/run.c	Mon Apr  4 11:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: run.c,v 1.13 2015/06/02 14:02:10 christos Exp $	*/
+/*	$NetBSD: run.c,v 1.14 2016/04/04 15:52:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -33,9 +33,12 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: run.c,v 1.13 2015/06/02 14:02:10 christos Exp $");
+__RCSID("$NetBSD: run.c,v 1.14 2016/04/04 15:52:56 christos Exp $");
 
 #include <stdio.h>
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
 #ifdef HAVE_UTIL_H
 #include <util.h>
 #endif
@@ -46,10 +49,12 @@ __RCSID("$NetBSD: run.c,v 1.13 2015/06/0
 #include <syslog.h>
 #include <string.h>
 #include <netinet/in.h>
+#include <net/if.h>
 
 #include "run.h"
 #include "conf.h"
 #include "internal.h"
+#include "support.h"
 
 extern char **environ;
 

Index: src/external/bsd/blacklist/bin/state.c
diff -u src/external/bsd/blacklist/bin/state.c:1.17 src/external/bsd/blacklist/bin/state.c:1.18
--- src/external/bsd/blacklist/bin/state.c:1.17	Tue Jun  2 10:02:10 2015
+++ src/external/bsd/blacklist/bin/state.c	Mon Apr  4 11:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: state.c,v 1.17 2015/06/02 14:02:10 christos Exp $	*/
+/*	$NetBSD: state.c,v 1.18 2016/04/04 15:52:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: state.c,v 1.17 2015/06/02 14:02:10 christos Exp $");
+__RCSID("$NetBSD: state.c,v 1.18 2016/04/04 15:52:56 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -103,7 +103,7 @@ static void
 dumpkey(const struct conf *k)
 {
 	char buf[10240];
-	hexdump(buf, sizeof(buf), __func__, k, sizeof(*k));
+	blhexdump(buf, sizeof(buf), __func__, k, sizeof(*k));
 	(*lfun)(LOG_DEBUG, "%s", buf);
 	(*lfun)(LOG_DEBUG, "%s: %s", __func__,
 	    conf_print(buf, sizeof(buf), "", "", k));

Index: src/external/bsd/blacklist/bin/support.c
diff -u src/external/bsd/blacklist/bin/support.c:1.7 src/external/bsd/blacklist/bin/support.c:1.8
--- src/external/bsd/blacklist/bin/support.c:1.7	Tue Jun  2 10:02:10 2015
+++ src/external/bsd/blacklist/bin/support.c	Mon Apr  4 11:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: support.c,v 1.7 2015/06/02 14:02:10 christos Exp $	*/
+/*	$NetBSD: support.c,v 1.8 2016/04/04 15:52:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: support.c,v 1.7 2015/06/02 14:02:10 christos Exp $");
+__RCSID("$NetBSD: support.c,v 1.8 2016/04/04 15:52:56 christos Exp $");
 
 #include <time.h>
 #include <string.h>
@@ -133,7 +133,7 @@ fmtydhms(char *b, size_t l, time_t t)
 }
 
 ssize_t
-hexdump(char *buf, size_t len, const char *str, const void *b, size_t l)
+blhexdump(char *buf, size_t len, const char *str, const void *b, size_t l)
 {
 	size_t z, cz;
 	int r;

Index: src/external/bsd/blacklist/bin/support.h
diff -u src/external/bsd/blacklist/bin/support.h:1.6 src/external/bsd/blacklist/bin/support.h:1.7
--- src/external/bsd/blacklist/bin/support.h:1.6	Tue Jun  2 10:02:10 2015
+++ src/external/bsd/blacklist/bin/support.h	Mon Apr  4 11:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: support.h,v 1.6 2015/06/02 14:02:10 christos Exp $	*/
+/*	$NetBSD: support.h,v 1.7 2016/04/04 15:52:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@ void vdlog(int, const char *, va_list)
     __attribute__((__format__(__printf__, 2, 0)));
 void dlog(int, const char *, ...)
     __attribute__((__format__(__printf__, 2, 3)));
-ssize_t hexdump(char *, size_t, const char *, const void *, size_t);
+ssize_t blhexdump(char *, size_t, const char *, const void *, size_t);
 __END_DECLS
 
 #endif /* _SUPPORT_H */

Reply via email to