OpenBSD 2.6

openbsd/include/Makefile

@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.63 1999/03/29 03:07:39 rahnds Exp $
+#	$OpenBSD: Makefile,v 1.75 1999/10/05 22:29:36 beck Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -15,7 +15,7 @@ FILES=	a.out.h ar.h assert.h bitstring.h blf.h bm.h cast.h cpio.h ctype.h \
 	memory.h mpool.h ndbm.h netdb.h netgroup.h nlist.h nl_types.h \
 	olf_abi.h paths.h poll.h pwd.h ranlib.h re_comp.h regex.h resolv.h \
 	rmd160.h search.h setjmp.h sgtty.h sha1.h skipjack.h signal.h stab.h \
-	stddef.h stdio.h stdlib.h string.h strings.h struct.h sysexits.h \
+	stdbool.h stddef.h stdio.h stdlib.h string.h strings.h struct.h sysexits.h \
 	tar.h time.h ttyent.h tzfile.h unistd.h utime.h utmp.h vis.h
 
 .if (${MACHINE_ARCH} != "alpha") && (${MACHINE_ARCH} != "mips") && \
@@ -31,27 +31,27 @@ MFILES+= link.h dlfcn.h
 .endif
 
 DIRS=	arpa protocols rpc rpcsvc
-LDIRS=	dev net netinet netinet6 netccitt netiso netns netipx nfs sys ufs vm ddb \
-	scsi netatalk isofs xfs
+LDIRS=	dev net netinet netinet6 netccitt netiso netns netipx nfs sys ufs vm \
+	ddb scsi netatalk isofs xfs uvm miscfs
 
 # Directories with an includes target
 RDIRS=	../lib/libc_r ../lib/libcom_err ../lib/libcompat ../lib/libcurses \
-        ../lib/libform ../lib/libmenu ../lib/libocurses ../lib/libossaudio \
-	../lib/libpanel ../lib/librpcsvc ../lib/libskey ../lib/libedit \
-	../lib/libpcap ../lib/libutil ../lib/libwrap ../lib/libz \
-	../sys/arch/${MACHINE}
+	../lib/libcurses++ ../lib/libform ../lib/libmenu ../lib/libocurses \
+	../lib/libossaudio ../lib/libpanel ../lib/librpcsvc ../lib/libskey \
+	../lib/libedit ../lib/libpcap ../lib/libutil ../lib/libwrap \
+	../lib/libz ../lib/libkeynote ../sys/arch/${MACHINE}
 
 # Places using Makefile that needs a prerequisite target met before includes
 PRDIRS=
 
 # Directories with an includes target that use Makefile.bsd-wrapper
-WDIRS=	../lib/libssl ../gnu/lib/libg++/libg++ ../gnu/lib/libg++/libio \
-	../gnu/lib/libg++/librx ../gnu/lib/libg++/libstdc++ \
-	../gnu/usr.bin/gcc ../gnu/lib/libgmp
+WDIRS=	../lib/libssl ../gnu/lib/libgmp ../usr.sbin/httpd
+WDIRS+= ../gnu/egcs/libio ../gnu/egcs/libstdc++ ../gnu/egcs/libf2c \
+	../gnu/egcs/libobjc ../gnu/egcs/gcc
 
 # Places using Makefile.bsd-wrapper that needs a prerequisite target met
 # before includes
-PWDIRS=	../lib/libssl
+PWDIRS=	../lib/libssl ../usr.sbin/httpd
 
 NOOBJ=	noobj
 
@@ -88,6 +88,8 @@ includes:
 			${INSTALL} ${INSTALL_COPY} -m 444 $$j ${DESTDIR}/usr/include/$$i/$$j; \
 		done); \
 	done
+	@rm -f ${DESTDIR}/usr/include/openssl
+	@ln -sf ssl ${DESTDIR}/usr/include/openssl
 	@echo installing ${LFILES}
 	@-for i in ${LFILES}; do \
 		rm -f ${DESTDIR}/usr/include/$$i; \
@@ -123,40 +125,36 @@ copies:
 	pax -rw -pa -L \
 	    `find ${LDIRS} -follow -type f -name '*.h' '!' -path \
 	    'netiso/xebec/*' -print` ${DESTDIR}/usr/include
-	rm -rf ${DESTDIR}/usr/include/machine
+	cd ${DESTDIR}/usr/include && rm -rf ${MACHINE} ${MACHINE_ARCH} machine
 	${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \
-		${DESTDIR}/usr/include/machine
+		${DESTDIR}/usr/include/${MACHINE}
 	pax -rw -pa -s "|\.\./sys/arch/${MACHINE}/include||" \
 	    ../sys/arch/${MACHINE}/include/*.h \
-	    ${DESTDIR}/usr/include/machine   
-	rm -rf ${DESTDIR}/usr/include/${MACHINE_ARCH}
+	    ${DESTDIR}/usr/include/${MACHINE}
 	if test ${MACHINE} != ${MACHINE_ARCH} -a \
 	    -d ../sys/arch/${MACHINE_ARCH}/include; then \
 		${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \
     	    	    ${DESTDIR}/usr/include/${MACHINE_ARCH}; \
 		pax -rw -pa -s "|\.\./sys/arch/${MACHINE_ARCH}/include||" \
 		    ../sys/arch/${MACHINE_ARCH}/include/*.h \
 		    ${DESTDIR}/usr/include/${MACHINE_ARCH}; \
-	else \
-		ln -s machine ${DESTDIR}/usr/include/${MACHINE_ARCH}; \
 	fi
+	ln -sf ${MACHINE} ${DESTDIR}/usr/include/machine; \
 
 symlinks:
 	@echo symlinks: ${LDIRS}
 	@for i in ${LDIRS}; do \
 		rm -rf ${DESTDIR}/usr/include/$$i; \
 		ln -s /sys/$$i ${DESTDIR}/usr/include/$$i; \
 	done
-	rm -rf ${DESTDIR}/usr/include/machine
-	ln -s /sys/arch/${MACHINE}/include ${DESTDIR}/usr/include/machine
-	rm -rf ${DESTDIR}/usr/include/${MACHINE_ARCH}
+	cd ${DESTDIR}/usr/include && rm -rf ${MACHINE} ${MACHINE_ARCH} machine
+	ln -s /sys/arch/${MACHINE}/include ${DESTDIR}/usr/include/${MACHINE}
 	if test ${MACHINE} != ${MACHINE_ARCH} -a \
 	    -d ../sys/arch/${MACHINE_ARCH}/include ; then \
 		ln -s /sys/arch/${MACHINE_ARCH}/include \
 		    ${DESTDIR}/usr/include/${MACHINE_ARCH} ; \
-	else \
-		ln -s machine ${DESTDIR}/usr/include/${MACHINE_ARCH} ; \
 	fi
+	ln -sf ${MACHINE} ${DESTDIR}/usr/include/machine ; \
 
 includes: ${SYS_INCLUDE}
 

openbsd/include/dirent.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: dirent.h,v 1.4 1998/11/20 11:18:25 d Exp $	*/
+/*	$OpenBSD: dirent.h,v 1.6 1999/09/17 13:13:46 espie Exp $	*/
 /*	$NetBSD: dirent.h,v 1.9 1995/03/26 20:13:37 jtc Exp $	*/
 
 /*-
@@ -82,8 +82,12 @@ typedef struct _dirdesc {
 #define __DTF_READALL	0x0008	/* everything has been read */
 
 #ifndef NULL
+#ifdef 	__GNUG__
+#define	NULL	__null
+#else
 #define	NULL	0
 #endif
+#endif
 
 #endif /* _POSIX_SOURCE */
 

openbsd/include/fts.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: fts.h,v 1.3 1997/09/21 10:45:34 niklas Exp $	*/
+/*	$OpenBSD: fts.h,v 1.5 1999/10/03 20:39:52 millert Exp $	*/
 /*	$NetBSD: fts.h,v 1.5 1994/12/28 01:41:50 mycroft Exp $	*/
 
 /*

openbsd/include/libgen.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: libgen.h,v 1.3 1998/06/21 22:13:36 millert Exp $	*/
+/*	$OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $	*/
 
 /*
  * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -34,8 +34,8 @@
 
 __BEGIN_DECLS
 
-char	*basename __P((char *));
-char	*dirname __P((char *));
+char	*basename __P((const char *));
+char	*dirname __P((const char *));
 #if 0
 char	*regcmp __P((const char *, ...));
 char	*regex __P((const char *, const char *, ...));

openbsd/include/link.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: link.h,v 1.3 1997/09/21 10:45:40 niklas Exp $	*/
+/*	$OpenBSD: link.h,v 1.4 1999/05/18 15:50:09 espie Exp $	*/
 /*	$NetBSD: link.h,v 1.10 1996/01/09 00:00:11 pk Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 #define _LINK_H_
 
 /*
- * A `Shared Object Descriptor' descibes a shared object that is needed
+ * A `Shared Object Descriptor' describes a shared object that is needed
  * to complete the link edit process of the object containing it.
  * A list of such objects (chained through `sod_next') is pointed at
  * by `sdt_sods' in the section_dispatch_table structure.

openbsd/include/locale.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: locale.h,v 1.2 1997/09/21 10:45:41 niklas Exp $	*/
+/*	$OpenBSD: locale.h,v 1.3 1999/06/11 22:47:48 espie Exp $	*/
 /*	$NetBSD: locale.h,v 1.6 1994/10/26 00:56:02 cgd Exp $	*/
 
 /*
@@ -61,8 +61,12 @@ struct lconv {
 };
 
 #ifndef NULL
+#ifdef 	__GNUG__
+#define NULL	__null
+#else
 #define	NULL	0
 #endif
+#endif
 
 #define	LC_ALL		0
 #define	LC_COLLATE	1

openbsd/include/netdb.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: netdb.h,v 1.4 1997/04/05 20:58:28 millert Exp $	*/
+/*	$OpenBSD: netdb.h,v 1.7 1999/07/03 18:14:51 deraadt Exp $	*/
 
 /*
  * ++Copyright++ 1980, 1983, 1988, 1993
@@ -55,6 +55,15 @@
  * --Copyright--
  */
 
+/*
+ * %%% portions-copyright-cmetz-96
+ * Portions of this software are Copyright 1996-1998 by Craig Metz, All Rights
+ * Reserved. The Inner Net License Version 2 applies to these portions of
+ * the software.
+ * You should have received a copy of the license with this software. If
+ * you didn't get a copy, you may request one from <license@inner.net>.
+ */
+
 /*
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
  *	$From: netdb.h,v 8.7 1996/05/09 05:59:09 vixie Exp $
@@ -128,6 +137,44 @@ struct	protoent {
 #define	NO_DATA		4 /* Valid name, no data record of requested type */
 #define	NO_ADDRESS	NO_DATA		/* no address, look for MX record */
 
+/* Values for getaddrinfo() and getnameinfo() */
+#define AI_PASSIVE	1	/* socket address is intended for bind() */
+#define AI_CANONNAME	2	/* request for canonical name */
+#define AI_NUMERICHOST	4	/* don't ever try nameservice */
+#define AI_EXT		8	/* enable non-portable extensions */
+
+#define NI_NUMERICHOST	1	/* return the host address, not the name */
+#define NI_NUMERICSERV	2	/* return the service address, not the name */
+#define NI_NOFQDN	4	/* return a short name if in the local domain */
+#define NI_NAMEREQD	8	/* fail if either host or service name is unknown */
+#define NI_DGRAM	16	/* look up datagram service instead of stream */
+
+#define NI_MAXHOST	MAXHOSTNAMELEN	/* max host name returned by getnameinfo */
+#define NI_MAXSERV	32	/* max serv. name length returned by getnameinfo */
+
+#define EAI_BADFLAGS	-1	/* invalid value for ai_flags */
+#define EAI_NONAME	-2	/* name or service is not known */
+#define EAI_AGAIN	-3	/* temporary failure in name resolution */
+#define EAI_FAIL	-4	/* non-recoverable failure in name resolution */
+#define EAI_NODATA	-5	/* no address associated with name */
+#define EAI_FAMILY	-6	/* ai_family not supported */
+#define EAI_SOCKTYPE	-7	/* ai_socktype not supported */
+#define EAI_SERVICE	-8	/* service not supported for ai_socktype */
+#define EAI_ADDRFAMILY	-9	/* address family for name not supported */
+#define EAI_MEMORY	-10	/* memory allocation failure */
+#define EAI_SYSTEM	-11	/* system error (code indicated in errno) */
+
+struct addrinfo {
+	int ai_flags;		/* input flags */
+	int ai_family;		/* protocol family for socket */
+	int ai_socktype;	/* socket type */
+	int ai_protocol;	/* protocol for socket */
+	int ai_addrlen;		/* length of socket-address */
+	struct sockaddr *ai_addr; /* socket-address for socket */
+	char *ai_canonname;	/* canonical name for service location (iff req) */
+	struct addrinfo *ai_next; /* pointer to next in list */
+};
+
 __BEGIN_DECLS
 void		endhostent __P((void));
 void		endnetent __P((void));
@@ -153,6 +200,15 @@ void		sethostent __P((int));
 void		setnetent __P((int));
 void		setprotoent __P((int));
 void		setservent __P((int));
+
+int		getaddrinfo __P((const char *name, const char *service,
+		    const struct addrinfo *req, struct addrinfo **pai));
+void		freeaddrinfo __P((struct addrinfo *ai));
+int		getnameinfo __P((const struct sockaddr *sa, size_t addrlen,
+		    char *host, size_t hostlen, char *serv, size_t servlen,
+		    int flags));
+char		*gai_strerror __P((int ecode));
+int		net_addrcmp __P((struct sockaddr *, struct sockaddr *));
 __END_DECLS
 
 /* This is nec'y to make this include file properly replace the sun version. */

openbsd/include/paths.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: paths.h,v 1.15 1999/02/03 04:34:06 angelos Exp $	*/
+/*	$OpenBSD: paths.h,v 1.16 1999/10/04 16:44:01 deraadt Exp $	*/
 /*	$NetBSD: paths.h,v 1.7 1994/10/26 00:56:12 cgd Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
 #define	_PATHS_H_
 
 /* Default search path. */
-#define	_PATH_DEFPATH	"/usr/bin:/bin:/usr/X11R6/bin:/usr/local/bin"
+#define	_PATH_DEFPATH	"/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin:/usr/local/bin"
 /* All standard utilities path. */
 #define	_PATH_STDPATH	"/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin:/usr/local/bin"
 

openbsd/include/pwd.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: pwd.h,v 1.6 1998/07/15 00:50:40 millert Exp $	*/
+/*	$OpenBSD: pwd.h,v 1.8 1999/09/03 18:13:37 deraadt Exp $	*/
 /*	$NetBSD: pwd.h,v 1.9 1996/05/15 21:36:45 jtc Exp $	*/
 
 /*-
@@ -98,6 +98,7 @@ struct passwd	*getpwent __P((void));
 #ifndef _XOPEN_SOURCE
 int		 setpassent __P((int));
 char		*user_from_uid __P((uid_t, int));
+char		*bcrypt_gensalt __P((u_int8_t));
 #endif
 void		 setpwent __P((void));
 void		 endpwent __P((void));

openbsd/include/rmd160.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: rmd160.h,v 1.3 1998/03/23 12:49:28 janjaap Exp $	*/
+/*	$OpenBSD: rmd160.h,v 1.4 1999/08/16 09:59:04 millert Exp $	*/
 
 /********************************************************************\
  *
@@ -37,7 +37,7 @@ typedef struct {
 
 void RMD160Init __P((RMD160_CTX *context));
 void RMD160Transform __P((u_int32_t state[5], const u_int32_t block[16]));
-void RMD160Update __P((RMD160_CTX *context, const u_char *data, u_int nbytes));
+void RMD160Update __P((RMD160_CTX *context, const u_char *data, u_int32_t nbytes));
 void RMD160Final __P((u_char digest[20], RMD160_CTX *context));
 char *RMD160End __P((RMD160_CTX *, char *));
 char *RMD160File __P((char *, char *));

openbsd/include/stdbool.h

@@ -0,0 +1,27 @@
+/* $OpenBSD: stdbool.h,v 1.2 1999/09/24 23:09:09 espie Exp $ */
+
+/*
+ * Written by Marc Espie, September 25, 1999
+ * Public domain.
+ */
+
+#ifndef	_STDBOOL_H_
+#define	_STDBOOL_H_	
+
+/* `_Bool' type must promote to `int' or `unsigned int'. */
+typedef enum {
+	false = 0,
+	true = 1
+} _Bool;
+
+/* And those constants must also be available as macros. */
+#define	false	false
+#define	true	true
+
+/* User visible type `bool' is provided as a macro which may be redefined */
+#define bool _Bool
+
+/* Inform that everything is fine */
+#define __bool_true_false_are_defined 1
+
+#endif /* _STDBOOL_H_ */

openbsd/include/stddef.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: stddef.h,v 1.2 1997/09/21 10:45:52 niklas Exp $	*/
+/*	$OpenBSD: stddef.h,v 1.3 1999/06/11 22:47:48 espie Exp $	*/
 /*	$NetBSD: stddef.h,v 1.4 1994/10/26 00:56:26 cgd Exp $	*/
 
 /*-
@@ -54,8 +54,12 @@ typedef	_BSD_WCHAR_T_	wchar_t;
 #endif
 
 #ifndef	NULL
+#ifdef 	__GNUG__
+#define NULL	__null
+#else
 #define	NULL	0
 #endif
+#endif
 
 #define	offsetof(type, member)	((size_t)(&((type *)0)->member))
 

openbsd/include/stdio.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdio.h,v 1.10 1998/11/20 11:18:26 d Exp $	*/
+/*	$OpenBSD: stdio.h,v 1.11 1999/09/17 13:13:46 espie Exp $	*/
 /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
 
 /*-
@@ -55,8 +55,12 @@ typedef	_BSD_SIZE_T_	size_t;
 #endif
 
 #ifndef NULL
+#ifdef 	__GNUG__
+#define	NULL	__null
+#else
 #define	NULL	0
 #endif
+#endif
 
 /*      
  * This is fairly grotesque, but pure ANSI code must not inspect the

openbsd/include/stdlib.h

@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdlib.h,v 1.9 1999/02/25 21:40:15 millert Exp $	*/
+/*	$OpenBSD: stdlib.h,v 1.10 1999/06/11 22:47:48 espie Exp $	*/
 /*	$NetBSD: stdlib.h,v 1.25 1995/12/27 21:19:08 jtc Exp $	*/
 
 /*-
@@ -73,8 +73,12 @@ typedef struct {
 
 
 #ifndef	NULL
+#ifdef 	__GNUG__
+#define NULL	__null
+#else
 #define	NULL	0
 #endif
+#endif
 
 #define	EXIT_FAILURE	1
 #define	EXIT_SUCCESS	0