[Midnightbsd-cvs] src: lib/bind: Fix some issues with Bind9 and the upcoming gcc update.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Nov 20 05:58:28 EST 2007


Log Message:
-----------
Fix some issues with Bind9 and the upcoming gcc update.

Modified Files:
--------------
    src/lib/bind:
        config.h (r1.2 -> r1.3)
    src/lib/bind/dns/dns:
        enumclass.h (r1.2 -> r1.3)
        enumtype.h (r1.2 -> r1.3)
        rdatastruct.h (r1.3 -> r1.4)

-------------- next part --------------
Index: config.h
===================================================================
RCS file: /home/cvs/src/lib/bind/config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/bind/config.h -L lib/bind/config.h -u -r1.2 -r1.3
--- lib/bind/config.h
+++ lib/bind/config.h
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/lib/bind/config.h,v 1.2.2.2.4.1 2006/12/13 09:52:30 dougb Exp $ */
+
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
 /*
@@ -157,9 +159,6 @@
 /* Define if libcrypto has DH_generate_parameters */
 #define HAVE_DH_GENERATE_PARAMETERS 1
 
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
 /* Define if libcrypto has DSA_generate_parameters */
 #define HAVE_DSA_GENERATE_PARAMETERS 1
 
Index: rdatastruct.h
===================================================================
RCS file: /home/cvs/src/lib/bind/dns/dns/rdatastruct.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -L lib/bind/dns/dns/rdatastruct.h -L lib/bind/dns/dns/rdatastruct.h -u -r1.3 -r1.4
--- lib/bind/dns/dns/rdatastruct.h
+++ lib/bind/dns/dns/rdatastruct.h
@@ -1,5 +1,7 @@
+/* $FreeBSD: src/lib/bind/dns/dns/rdatastruct.h,v 1.2.8.1 2006/12/13 09:52:30 dougb Exp $ */
+
 /*
- * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -1709,22 +1711,6 @@
 #endif /* GENERIC_DLV_32769_H */
 /*
  * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2001  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
Index: enumclass.h
===================================================================
RCS file: /home/cvs/src/lib/bind/dns/dns/enumclass.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/bind/dns/dns/enumclass.h -L lib/bind/dns/dns/enumclass.h -u -r1.2 -r1.3
--- lib/bind/dns/dns/enumclass.h
+++ lib/bind/dns/dns/enumclass.h
@@ -1,5 +1,7 @@
+/* $FreeBSD: src/lib/bind/dns/dns/enumclass.h,v 1.2.8.1 2006/12/13 09:52:30 dougb Exp $ */
+
 /*
- * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
Index: enumtype.h
===================================================================
RCS file: /home/cvs/src/lib/bind/dns/dns/enumtype.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/bind/dns/dns/enumtype.h -L lib/bind/dns/dns/enumtype.h -u -r1.2 -r1.3
--- lib/bind/dns/dns/enumtype.h
+++ lib/bind/dns/dns/enumtype.h
@@ -1,5 +1,7 @@
+/* $FreeBSD: src/lib/bind/dns/dns/enumtype.h,v 1.2.8.1 2006/12/13 09:52:30 dougb Exp $ */
+
 /*
- * Copyright (C) 2004-2007 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003 Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -74,7 +76,6 @@
 	dns_rdatatype_tkey = 249,
 	dns_rdatatype_tsig = 250,
 	dns_rdatatype_dlv = 32769,
-	dns_rdatatype_dlv = 65323,
 	dns_rdatatype_ixfr = 251,
 	dns_rdatatype_axfr = 252,
 	dns_rdatatype_mailb = 253,
@@ -130,7 +131,6 @@
 #define dns_rdatatype_tkey	((dns_rdatatype_t)dns_rdatatype_tkey)
 #define dns_rdatatype_tsig	((dns_rdatatype_t)dns_rdatatype_tsig)
 #define dns_rdatatype_dlv	((dns_rdatatype_t)dns_rdatatype_dlv)
-#define dns_rdatatype_dlv	((dns_rdatatype_t)dns_rdatatype_dlv)
 #define dns_rdatatype_ixfr	((dns_rdatatype_t)dns_rdatatype_ixfr)
 #define dns_rdatatype_axfr	((dns_rdatatype_t)dns_rdatatype_axfr)
 #define dns_rdatatype_mailb	((dns_rdatatype_t)dns_rdatatype_mailb)


More information about the Midnightbsd-cvs mailing list