Date: Fri, 30 Mar 2001 16:45:22 +0200 (CEST) From: markush@acc.umu.se To: FreeBSD-gnats-submit@freebsd.org Subject: ports/26218: security/skip fix Message-ID: <20010330144522.738BF3834@romy.carbonide.com>
next in thread | raw e-mail | index | archive | help
>Number: 26218
>Category: ports
>Synopsis: port build breaks due to include of osreldate.h in kld
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 30 06:50:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: Markus Holmberg
>Release: FreeBSD 4.3-BETA i386
>Organization:
n/a
>Environment:
System: FreeBSD romy.carbonide.com 4.3-BETA FreeBSD 4.3-BETA #3: Wed Mar 21 08:30:21 CET 2001 mac@romy.carbonide.com:/usr/obj/usr/src/sys/ROMY i386
>Description:
Port build of security/skip breaks due to include of
osreldate.h in kld (it looks like).
>How-To-Repeat:
cd /usr/ports/security/skip && make
[output removed]
/usr/include/osreldate.h:29: #error "osreldate.h must not be used in the kernel, use sys/param.h"
gmake[2]: *** [bin.x86/md5.o] Error 1
[more output removed]
>Fix:
Since sys/param.h is included unconditionally (and __FreeBSD_version
is defined there, and __FreeBSD_version is the only thing osreldate.h
defines), the following patch which removes #include <osreldate.h>
should be sufficient, as far as I can tell. (I hope it isn't a problem
to move up the include of sys/param.h..?)
--- files/patch-bu.orig Wed Aug 9 00:19:19 2000
+++ files/patch-bu Fri Mar 30 16:37:56 2001
@@ -13,27 +12,26 @@
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
-@@ -69,6 +68,12 @@
+@@ -69,6 +68,11 @@
#include <dirent.h>
#endif
-+#include <osreldate.h>
-+
+#if defined(KERNEL) || defined(_KERNEL)
+#include <sys/cdefs.h>
+#endif
+
++#include <sys/param.h>
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/time.h>
-@@ -78,15 +82,20 @@
+@@ -78,15 +82,19 @@
#include <sys/stat.h>
#include <sys/socket.h>
#include <sys/syslog.h>
+-#include <sys/param.h>
+#if defined(KERNEL) || defined(_KERNEL) || __FreeBSD_version < 410000
+#include <sys/socketvar.h>
+#endif
- #include <sys/param.h>
#include <sys/uio.h>
#include <sys/file.h>
#include <sys/sockio.h>
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010330144522.738BF3834>