[Midnightbsd-cvs] src: bind/bind: update for bind 9.4.3

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Mar 25 15:13:19 EDT 2009


Log Message:
-----------
update for bind 9.4.3

Modified Files:
--------------
    src/lib/bind/bind:
        config.h (r1.3 -> r1.4)
        port_after.h (r1.3 -> r1.4)
        port_before.h (r1.4 -> r1.5)

-------------- next part --------------
Index: port_before.h
===================================================================
RCS file: /home/cvs/src/lib/bind/bind/port_before.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -L lib/bind/bind/port_before.h -L lib/bind/bind/port_before.h -u -r1.4 -r1.5
--- lib/bind/bind/port_before.h
+++ lib/bind/bind/port_before.h
@@ -1,9 +1,13 @@
-/* $FreeBSD: src/lib/bind/bind/port_before.h,v 1.4.2.1 2007/12/07 08:31:23 dougb Exp $ */
+/* $MidnightBSD$ */
 
 #ifndef port_before_h
 #define port_before_h
 #include <config.h>
 
+#ifdef NEED_SUN4PROTOS
+#define _PARAMS(x) x
+#endif
+
 struct group;           /* silence warning */
 struct passwd;          /* silence warning */
 struct timeval;         /* silence warning */
@@ -83,15 +87,22 @@
 #define NGR_R_BAD (0)
 #define NGR_R_COPY buf, buflen
 #define NGR_R_COPY_ARGS NGR_R_ARGS
+#define NGR_R_CONST
 #define NGR_R_END_RESULT(x)  /*empty*/
 #define NGR_R_END_RETURN void
-#undef NGR_R_ENT_ARGS /*empty*/
+#undef NGR_R_END_ARGS /*empty*/
 #define NGR_R_OK 1
 #define NGR_R_RETURN int
+#define NGR_R_SET_CONST const
 #undef NGR_R_SET_RESULT /*empty*/
 #define NGR_R_SET_RETURN void
+#undef NGR_R_SET_ARGS
 
 
+#if !defined(NGR_R_SET_ARGS) && defined(NGR_R_END_ARGS)
+#define NGR_R_SET_ARGS NGR_R_END_ARGS
+#endif
+
 #define PROTO_R_ARGS char *buf, size_t buflen, struct protoent **answerp
 #define PROTO_R_BAD ERANGE
 #define PROTO_R_COPY buf, buflen
Index: port_after.h
===================================================================
RCS file: /home/cvs/src/lib/bind/bind/port_after.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -L lib/bind/bind/port_after.h -L lib/bind/bind/port_after.h -u -r1.3 -r1.4
--- lib/bind/bind/port_after.h
+++ lib/bind/bind/port_after.h
@@ -1,3 +1,5 @@
+/* $MidnightBSD$ */
+
 #ifndef port_after_h
 #define port_after_h
 
@@ -16,12 +18,20 @@
 #include <sys/select.h>
 #endif /* HAVE_SYS_SELECT_H */
 
+#ifdef REENABLE_SEND
+#undef send
+#endif
+
 #undef NEED_PSELECT
 #define HAVE_SA_LEN 1
 #define HAVE_MINIMUM_IFREQ 1
 #undef NEED_DAEMON
 #undef NEED_STRSEP
 #undef NEED_STRERROR
+#ifdef NEED_STRERROR
+const char *isc_strerror(int);
+#define strerror isc_strerror
+#endif
 #define HAS_INET6_STRUCTS 1
 #define HAVE_SIN6_SCOPE_ID 1
 #undef NEED_IN6ADDR_ANY
@@ -30,12 +40,18 @@
 #undef NEED_GETTIMEOFDAY
 #define HAVE_STRNDUP 1
 #undef USE_FIONBIO_IOCTL
-#undef USE_SYSERROR_LIST
 #undef INNETGR_ARGS
 #undef SETNETGRENT_ARGS
 #define USE_IFNAMELINKID 1
 #define PORT_NONBLOCK O_NONBLOCK
 
+#ifndef _POSIX_PATH_MAX
+#define _POSIX_PATH_MAX 255
+#endif
+#ifndef PATH_MAX
+#define PATH_MAX _POSIX_PATH_MAX
+#endif
+
 /*
  * We need to know the IPv6 address family number even on IPv4-only systems.
  * Note that this is NOT a protocol constant, and that if the system has its
@@ -309,16 +325,16 @@
 #endif
 
 #ifdef NEED_SETNETGRENT_R
-#ifdef NGR_R_ENT_ARGS
-NGR_R_SET_RETURN setnetgrent_r(const char *netgroup, NGR_R_ENT_ARGS);
+#ifdef NGR_R_SET_ARGS
+NGR_R_SET_RETURN setnetgrent_r(NGR_R_SET_CONST char *netgroup, NGR_R_SET_ARGS);
 #else
-NGR_R_SET_RETURN setnetgrent_r(const char *netgroup);
+NGR_R_SET_RETURN setnetgrent_r(NGR_R_SET_CONST char *netgroup);
 #endif
 #endif
 
 #ifdef NEED_ENDNETGRENT_R
-#ifdef NGR_R_ENT_ARGS
-NGR_R_END_RETURN endnetgrent_r(NGR_R_ENT_ARGS);
+#ifdef NGR_R_END_ARGS
+NGR_R_END_RETURN endnetgrent_r(NGR_R_END_ARGS);
 #else
 NGR_R_END_RETURN endnetgrent_r(void);
 #endif
@@ -384,10 +400,12 @@
 int isc__gettimeofday(struct timeval *tp, struct timezone *tzp);
 #endif
 
-int getnetgrent(char **machinep, char **userp, char **domainp);
+int getnetgrent(NGR_R_CONST char **machinep, NGR_R_CONST char **userp,
+	        NGR_R_CONST char **domainp);
 
 #ifdef NGR_R_ARGS
-int getnetgrent_r(char **machinep, char **userp, char **domainp, NGR_R_ARGS);
+int getnetgrent_r(NGR_R_CONST char **machinep, NGR_R_CONST char **userp, 
+		  NGR_R_CONST char **domainp, NGR_R_ARGS);
 #endif
 
 #ifdef SETNETGRENT_ARGS
@@ -405,11 +423,87 @@
 	    const char *user, const char *domain);
 #endif
 
-#ifdef NGR_R_ENT_ARGS
+#ifdef NGR_R_SET_ARGS
 NGR_R_SET_RETURN
-setnetgrent_r(const char *netgroup, NGR_R_ENT_ARGS);
+setnetgrent_r(NGR_R_SET_CONST char *netgroup, NGR_R_SET_ARGS);
 #else
 NGR_R_SET_RETURN
-setnetgrent_r(const char *netgroup);
+setnetgrent_r(NGR_R_SET_CONST char *netgroup);
+#endif
+
+#ifdef NEED_STRTOUL
+unsigned long strtoul(const char *, char **, int);
 #endif
+
+#ifdef NEED_SUN4PROTOS
+#include <stdarg.h>
+#ifndef __SIZE_TYPE__
+#define __SIZE_TYPE__ int
+#endif
+struct sockaddr;
+struct iovec;
+struct timeval;
+struct timezone;
+int fprintf(FILE *, const char *, ...);
+int getsockname(int, struct sockaddr *, int *);
+int getpeername(int, struct sockaddr *, int *);
+int socket(int, int, int);
+int connect(int, const struct sockaddr *, int);
+int writev(int, struct iovec *, int);
+int readv(int, struct iovec *, int);
+int send(int, const char *, int, int);
+void bzero(char *, int);
+int recvfrom(int, char *, int, int, struct sockaddr *, int *);
+int syslog(int, const char *, ... );
+int printf(const char *, ...);
+__SIZE_TYPE__ fread(void *, __SIZE_TYPE__, __SIZE_TYPE__, FILE *);
+__SIZE_TYPE__ fwrite(const void *, __SIZE_TYPE__, __SIZE_TYPE__, FILE *);
+int fclose(FILE *);
+int ungetc(int, FILE *);
+int scanf(const char *, ...);
+int sscanf(const char *, const char *, ... );
+int tolower(int);
+int toupper(int);
+int strcasecmp(const char *, const char *);
+int strncasecmp(const char *, const char *, int);
+int select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
+#ifdef gettimeofday
+#undef gettimeofday
+int gettimeofday(struct timeval *, struct timezone *);
+#define gettimeofday isc__gettimeofday
+#else
+int gettimeofday(struct timeval *, struct timezone *);
+#endif
+long strtol(const char*, char **, int);
+int fseek(FILE *, long, int);
+int setsockopt(int, int, int, const char *, int);
+int bind(int, const struct sockaddr *, int);
+void bcopy(char *, char *, int);
+int fputc(char, FILE *);
+int listen(int, int);
+int accept(int, struct sockaddr *, int *);
+int getsockopt(int, int, int, char *, int *);
+int vfprintf(FILE *, const char *, va_list);
+int fflush(FILE *);
+int fgetc(FILE *);
+int fputs(const char *, FILE *);
+int fchown(int, int, int);
+void setbuf(FILE *, char *);
+int gethostname(char *, int);
+int rename(const char *, const char *);
+time_t time(time_t *);
+int fscanf(FILE *, const char *, ...);
+int sscanf(const char *, const char *, ...);
+int ioctl(int, int, caddr_t);
+void perror(const char *);
+
+#if !defined(__USE_FIXED_PROTOTYPES__) && !defined(__cplusplus) && !defined(__STRICT_ANSI__)
+/*
+ * 'gcc -ansi' changes the prototype for vsprintf().
+ * Use this prototype when 'gcc -ansi' is not in effect.
+ */
+char *vsprintf(char *, const char *, va_list);
+#endif
+#endif 
+
 #endif
Index: config.h
===================================================================
RCS file: /home/cvs/src/lib/bind/bind/config.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -L lib/bind/bind/config.h -L lib/bind/bind/config.h -u -r1.3 -r1.4
--- lib/bind/bind/config.h
+++ lib/bind/bind/config.h
@@ -6,6 +6,7 @@
 /* #undef HAVE_STROPTS_H */
 #define HAVE_SYS_TIMERS_H 1
 #define HAVE_SYS_SELECT_H 1
+#define HAVE_MEMORY_H 1
 /* #undef SYS_CDEFS_H */
 /* #undef _POSIX_PTHREAD_SEMANTICS */
 /* #undef POSIX_GETPWUID_R */
@@ -14,14 +15,20 @@
 /* #undef POSIX_GETGRNAM_R */
 #define HAVE_MEMMOVE 1
 #define HAVE_MEMCHR 1
+/* #undef SPRINTF_CHAR */
+/* #undef VSPRINTF_CHAR */
+#define USE_SYSERROR_LIST 1
+/* #undef NEED_STRTOUL */
+/* #undef NEED_SUN4PROTOS */
+/* #undef REENABLE_SEND */
 
 /* #undef NEED_SETGROUPENT */
 /* #undef NEED_GETGROUPLIST */
 
 /* define if prototype for getgrnam_r() is required */
-/* #undef NEED_GETGRNAM_R */
-/* #undef NEED_GETGRGID_R */
-/* #undef NEED_GETGRENT_R */
+/* #undef NEED_GETGRNAM_R  */
+/* #undef NEED_GETGRGID_R  */
+/* #undef NEED_GETGRENT_R  */
 #define NEED_SETGRENT_R 1
 #define NEED_ENDGRENT_R 1
 
@@ -44,7 +51,7 @@
 /* #undef ssize_t */
 /* #undef uintptr_t */
 
-/* Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */
+/* Shut up warnings about sputaux in stdio.h on BSD/OS pre-4.1 */ 
 /* #undef SHUTUP_SPUTAUX */
 #ifdef SHUTUP_SPUTAUX
 struct __sFILE;


More information about the Midnightbsd-cvs mailing list