Module Name: src
Committed By: christos
Date: Tue Feb 11 17:48:31 UTC 2025
Modified Files:
src/external/bsd/blocklist: Makefile.inc
src/external/bsd/blocklist/bin: blocklistctl.c blocklistd.c conf.c
internal.c run.c state.c support.c
src/external/bsd/blocklist/lib: blocklist.c
src/external/bsd/blocklist/port: fparseln.c pidfile.c popenve.c
sockaddr_snprintf.c strlcat.c strlcpy.c strtoi.c
src/external/bsd/blocklist/test: cltest.c
Log Message:
sys/cdefs.h portability (Hans Rosenfeld)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/blocklist/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/blocklist/bin/blocklistctl.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/blocklist/bin/blocklistd.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/blocklist/bin/conf.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/blocklist/bin/internal.c \
src/external/bsd/blocklist/bin/state.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/blocklist/bin/run.c \
src/external/bsd/blocklist/bin/support.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/blocklist/lib/blocklist.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/blocklist/port/fparseln.c \
src/external/bsd/blocklist/port/pidfile.c \
src/external/bsd/blocklist/port/popenve.c \
src/external/bsd/blocklist/port/sockaddr_snprintf.c \
src/external/bsd/blocklist/port/strlcat.c \
src/external/bsd/blocklist/port/strlcpy.c \
src/external/bsd/blocklist/port/strtoi.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/blocklist/test/cltest.c
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/blocklist/Makefile.inc
diff -u src/external/bsd/blocklist/Makefile.inc:1.2 src/external/bsd/blocklist/Makefile.inc:1.3
--- src/external/bsd/blocklist/Makefile.inc:1.2 Sun Jun 14 22:29:44 2020
+++ src/external/bsd/blocklist/Makefile.inc Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2020/06/15 02:29:44 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2025/02/11 17:48:30 christos Exp $
WARNS=6
.if !defined(LIB)
@@ -7,4 +7,5 @@ DPADD+= ${LIBBLOCKLIST}
.endif
CPPFLAGS+= -I${.CURDIR}/../include
CPPFLAGS+=-DHAVE_STRUCT_SOCKADDR_SA_LEN -DHAVE_UTIL_H -DHAVE_DB_H
+CPPFLAGS+=-DHAVE_SYS_CDEFS_H
Index: src/external/bsd/blocklist/bin/blocklistctl.c
diff -u src/external/bsd/blocklist/bin/blocklistctl.c:1.3 src/external/bsd/blocklist/bin/blocklistctl.c:1.4
--- src/external/bsd/blocklist/bin/blocklistctl.c:1.3 Thu Feb 6 20:35:38 2025
+++ src/external/bsd/blocklist/bin/blocklistctl.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: blocklistctl.c,v 1.3 2025/02/07 01:35:38 kre Exp $ */
+/* $NetBSD: blocklistctl.c,v 1.4 2025/02/11 17:48:30 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,8 +32,10 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
-__RCSID("$NetBSD: blocklistctl.c,v 1.3 2025/02/07 01:35:38 kre Exp $");
+#endif
+__RCSID("$NetBSD: blocklistctl.c,v 1.4 2025/02/11 17:48:30 christos Exp $");
#include <stdio.h>
#include <time.h>
Index: src/external/bsd/blocklist/bin/blocklistd.c
diff -u src/external/bsd/blocklist/bin/blocklistd.c:1.7 src/external/bsd/blocklist/bin/blocklistd.c:1.8
--- src/external/bsd/blocklist/bin/blocklistd.c:1.7 Wed Feb 5 15:14:30 2025
+++ src/external/bsd/blocklist/bin/blocklistd.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: blocklistd.c,v 1.7 2025/02/05 20:14:30 christos Exp $ */
+/* $NetBSD: blocklistd.c,v 1.8 2025/02/11 17:48:30 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -31,8 +31,11 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
-__RCSID("$NetBSD: blocklistd.c,v 1.7 2025/02/05 20:14:30 christos Exp $");
+#endif
+__RCSID("$NetBSD: blocklistd.c,v 1.8 2025/02/11 17:48:30 christos Exp $");
#include <sys/types.h>
#include <sys/socket.h>
Index: src/external/bsd/blocklist/bin/conf.c
diff -u src/external/bsd/blocklist/bin/conf.c:1.9 src/external/bsd/blocklist/bin/conf.c:1.10
--- src/external/bsd/blocklist/bin/conf.c:1.9 Thu Feb 6 18:01:57 2025
+++ src/external/bsd/blocklist/bin/conf.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.9 2025/02/06 23:01:57 kre Exp $ */
+/* $NetBSD: conf.c,v 1.10 2025/02/11 17:48:30 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,8 +32,10 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
-__RCSID("$NetBSD: conf.c,v 1.9 2025/02/06 23:01:57 kre Exp $");
+#endif
+__RCSID("$NetBSD: conf.c,v 1.10 2025/02/11 17:48:30 christos Exp $");
#include <stdio.h>
#ifdef HAVE_LIBUTIL_H
Index: src/external/bsd/blocklist/bin/internal.c
diff -u src/external/bsd/blocklist/bin/internal.c:1.1.1.1 src/external/bsd/blocklist/bin/internal.c:1.2
--- src/external/bsd/blocklist/bin/internal.c:1.1.1.1 Sun Jun 14 21:52:53 2020
+++ src/external/bsd/blocklist/bin/internal.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: internal.c,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $ */
+/* $NetBSD: internal.c,v 1.2 2025/02/11 17:48:30 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,8 +32,10 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
-__RCSID("$NetBSD: internal.c,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $");
+#endif
+__RCSID("$NetBSD: internal.c,v 1.2 2025/02/11 17:48:30 christos Exp $");
#include <stdio.h>
#include <syslog.h>
Index: src/external/bsd/blocklist/bin/state.c
diff -u src/external/bsd/blocklist/bin/state.c:1.1.1.1 src/external/bsd/blocklist/bin/state.c:1.2
--- src/external/bsd/blocklist/bin/state.c:1.1.1.1 Sun Jun 14 21:52:53 2020
+++ src/external/bsd/blocklist/bin/state.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: state.c,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $ */
+/* $NetBSD: state.c,v 1.2 2025/02/11 17:48:30 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,8 +32,10 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
-__RCSID("$NetBSD: state.c,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $");
+#endif
+__RCSID("$NetBSD: state.c,v 1.2 2025/02/11 17:48:30 christos Exp $");
#include <sys/types.h>
#include <sys/socket.h>
Index: src/external/bsd/blocklist/bin/run.c
diff -u src/external/bsd/blocklist/bin/run.c:1.2 src/external/bsd/blocklist/bin/run.c:1.3
--- src/external/bsd/blocklist/bin/run.c:1.2 Wed Feb 5 15:09:33 2025
+++ src/external/bsd/blocklist/bin/run.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: run.c,v 1.2 2025/02/05 20:09:33 christos Exp $ */
+/* $NetBSD: run.c,v 1.3 2025/02/11 17:48:30 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,8 +32,10 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
-__RCSID("$NetBSD: run.c,v 1.2 2025/02/05 20:09:33 christos Exp $");
+#endif
+__RCSID("$NetBSD: run.c,v 1.3 2025/02/11 17:48:30 christos Exp $");
#include <stdio.h>
#ifdef HAVE_LIBUTIL_H
Index: src/external/bsd/blocklist/bin/support.c
diff -u src/external/bsd/blocklist/bin/support.c:1.2 src/external/bsd/blocklist/bin/support.c:1.3
--- src/external/bsd/blocklist/bin/support.c:1.2 Fri Aug 2 13:11:55 2024
+++ src/external/bsd/blocklist/bin/support.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: support.c,v 1.2 2024/08/02 17:11:55 christos Exp $ */
+/* $NetBSD: support.c,v 1.3 2025/02/11 17:48:30 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,8 +32,10 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
-__RCSID("$NetBSD: support.c,v 1.2 2024/08/02 17:11:55 christos Exp $");
+#endif
+__RCSID("$NetBSD: support.c,v 1.3 2025/02/11 17:48:30 christos Exp $");
#include <time.h>
#include <string.h>
Index: src/external/bsd/blocklist/lib/blocklist.c
diff -u src/external/bsd/blocklist/lib/blocklist.c:1.3 src/external/bsd/blocklist/lib/blocklist.c:1.4
--- src/external/bsd/blocklist/lib/blocklist.c:1.3 Fri Aug 2 13:11:56 2024
+++ src/external/bsd/blocklist/lib/blocklist.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: blocklist.c,v 1.3 2024/08/02 17:11:56 christos Exp $ */
+/* $NetBSD: blocklist.c,v 1.4 2025/02/11 17:48:30 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,8 +32,10 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
-__RCSID("$NetBSD: blocklist.c,v 1.3 2024/08/02 17:11:56 christos Exp $");
+#endif
+__RCSID("$NetBSD: blocklist.c,v 1.4 2025/02/11 17:48:30 christos Exp $");
#include <stdio.h>
#include <bl.h>
Index: src/external/bsd/blocklist/port/fparseln.c
diff -u src/external/bsd/blocklist/port/fparseln.c:1.1.1.1 src/external/bsd/blocklist/port/fparseln.c:1.2
--- src/external/bsd/blocklist/port/fparseln.c:1.1.1.1 Sun Jun 14 21:52:54 2020
+++ src/external/bsd/blocklist/port/fparseln.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: fparseln.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $ */
+/* $NetBSD: fparseln.c,v 1.2 2025/02/11 17:48:30 christos Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -27,9 +27,11 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
+#endif
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fparseln.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $");
+__RCSID("$NetBSD: fparseln.c,v 1.2 2025/02/11 17:48:30 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <assert.h>
Index: src/external/bsd/blocklist/port/pidfile.c
diff -u src/external/bsd/blocklist/port/pidfile.c:1.1.1.1 src/external/bsd/blocklist/port/pidfile.c:1.2
--- src/external/bsd/blocklist/port/pidfile.c:1.1.1.1 Sun Jun 14 21:52:54 2020
+++ src/external/bsd/blocklist/port/pidfile.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: pidfile.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $ */
+/* $NetBSD: pidfile.c,v 1.2 2025/02/11 17:48:30 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -32,9 +32,11 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
+#endif
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: pidfile.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $");
+__RCSID("$NetBSD: pidfile.c,v 1.2 2025/02/11 17:48:30 christos Exp $");
#endif
#include <sys/param.h>
Index: src/external/bsd/blocklist/port/popenve.c
diff -u src/external/bsd/blocklist/port/popenve.c:1.1.1.1 src/external/bsd/blocklist/port/popenve.c:1.2
--- src/external/bsd/blocklist/port/popenve.c:1.1.1.1 Sun Jun 14 21:52:54 2020
+++ src/external/bsd/blocklist/port/popenve.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: popenve.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $ */
+/* $NetBSD: popenve.c,v 1.2 2025/02/11 17:48:30 christos Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -36,12 +36,14 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
+#endif
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)popen.c 8.3 (Berkeley) 5/3/95";
#else
-__RCSID("$NetBSD: popenve.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $");
+__RCSID("$NetBSD: popenve.c,v 1.2 2025/02/11 17:48:30 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
Index: src/external/bsd/blocklist/port/sockaddr_snprintf.c
diff -u src/external/bsd/blocklist/port/sockaddr_snprintf.c:1.1.1.1 src/external/bsd/blocklist/port/sockaddr_snprintf.c:1.2
--- src/external/bsd/blocklist/port/sockaddr_snprintf.c:1.1.1.1 Sun Jun 14 21:52:54 2020
+++ src/external/bsd/blocklist/port/sockaddr_snprintf.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: sockaddr_snprintf.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $ */
+/* $NetBSD: sockaddr_snprintf.c,v 1.2 2025/02/11 17:48:30 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -32,9 +32,11 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
+#endif
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $");
+__RCSID("$NetBSD: sockaddr_snprintf.c,v 1.2 2025/02/11 17:48:30 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
Index: src/external/bsd/blocklist/port/strlcat.c
diff -u src/external/bsd/blocklist/port/strlcat.c:1.1.1.1 src/external/bsd/blocklist/port/strlcat.c:1.2
--- src/external/bsd/blocklist/port/strlcat.c:1.1.1.1 Sun Jun 14 21:52:54 2020
+++ src/external/bsd/blocklist/port/strlcat.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: strlcat.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $ */
+/* $NetBSD: strlcat.c,v 1.2 2025/02/11 17:48:30 christos Exp $ */
/* $OpenBSD: strlcat.c,v 1.10 2003/04/12 21:56:39 millert Exp $ */
/*
@@ -22,9 +22,12 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
+#endif
+
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strlcat.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $");
+__RCSID("$NetBSD: strlcat.c,v 1.2 2025/02/11 17:48:30 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#ifdef _LIBC
Index: src/external/bsd/blocklist/port/strlcpy.c
diff -u src/external/bsd/blocklist/port/strlcpy.c:1.1.1.1 src/external/bsd/blocklist/port/strlcpy.c:1.2
--- src/external/bsd/blocklist/port/strlcpy.c:1.1.1.1 Sun Jun 14 21:52:54 2020
+++ src/external/bsd/blocklist/port/strlcpy.c Tue Feb 11 12:48:30 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: strlcpy.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $ */
+/* $NetBSD: strlcpy.c,v 1.2 2025/02/11 17:48:30 christos Exp $ */
/* $OpenBSD: strlcpy.c,v 1.7 2003/04/12 21:56:39 millert Exp $ */
/*
@@ -22,9 +22,12 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
+#endif
+
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strlcpy.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $");
+__RCSID("$NetBSD: strlcpy.c,v 1.2 2025/02/11 17:48:30 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#ifdef _LIBC
Index: src/external/bsd/blocklist/port/strtoi.c
diff -u src/external/bsd/blocklist/port/strtoi.c:1.1.1.1 src/external/bsd/blocklist/port/strtoi.c:1.2
--- src/external/bsd/blocklist/port/strtoi.c:1.1.1.1 Sun Jun 14 21:52:54 2020
+++ src/external/bsd/blocklist/port/strtoi.c Tue Feb 11 12:48:31 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: strtoi.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $ */
+/* $NetBSD: strtoi.c,v 1.2 2025/02/11 17:48:31 christos Exp $ */
/*-
* Copyright (c) 2005 The DragonFly Project. All rights reserved.
@@ -33,8 +33,10 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
-__RCSID("$NetBSD: strtoi.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $");
+#endif
+__RCSID("$NetBSD: strtoi.c,v 1.2 2025/02/11 17:48:31 christos Exp $");
#if defined(_KERNEL)
#include <sys/param.h>
Index: src/external/bsd/blocklist/test/cltest.c
diff -u src/external/bsd/blocklist/test/cltest.c:1.1.1.1 src/external/bsd/blocklist/test/cltest.c:1.2
--- src/external/bsd/blocklist/test/cltest.c:1.1.1.1 Sun Jun 14 21:52:54 2020
+++ src/external/bsd/blocklist/test/cltest.c Tue Feb 11 12:48:31 2025
@@ -1,4 +1,4 @@
-/* $NetBSD: cltest.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $ */
+/* $NetBSD: cltest.c,v 1.2 2025/02/11 17:48:31 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -32,8 +32,10 @@
#include "config.h"
#endif
+#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
-__RCSID("$NetBSD: cltest.c,v 1.1.1.1 2020/06/15 01:52:54 christos Exp $");
+#endif
+__RCSID("$NetBSD: cltest.c,v 1.2 2025/02/11 17:48:31 christos Exp $");
#include <sys/types.h>
#include <sys/socket.h>
