- patches and other stuff for bind

Changed files:
    bind-fds.patch -> 1.1
    bind-glibc21.patch -> 1.1
    bind-host.patch -> 1.1
    bind-nonlist.patch -> 1.1
    bind-pselect.patch -> 1.2
    named.init -> 1.1

diff --git a/bind-fds.patch b/bind-fds.patch
new file mode 100644 (file)
index 0000000..54a3404
--- /dev/null
+++ b/bind-fds.patch
@@ -0,0 +1,43 @@
+--- bind-8.1.2/src/lib/isc/eventlib.c~ Fri Mar 20 18:26:24 1998
++++ bind-8.1.2/src/lib/isc/eventlib.c  Wed Jan  6 17:44:03 1999
+@@ -290,9 +290,9 @@
+                       evPrintf(ctx, 4,
+                               "pselect(%d, 0x%lx, 0x%lx, 0x%lx, %d.%09ld)\n",
+                                ctx->fdMax+1,
+-                               (u_long)ctx->rdLast.fds_bits[0],
+-                               (u_long)ctx->wrLast.fds_bits[0],
+-                               (u_long)ctx->exLast.fds_bits[0],
++                               __FDS_BITS(&ctx->rdLast)[0],
++                               __FDS_BITS(&ctx->wrLast)[0],
++                               __FDS_BITS(&ctx->exLast)[0],
+                                tp ? tp->tv_sec : -1,
+                                tp ? tp->tv_nsec : -1);
+ 
+--- bind-8.1.2/src/lib/isc/ev_files.c~ Thu Feb  5 20:53:52 1998
++++ bind-8.1.2/src/lib/isc/ev_files.c  Wed Jan  6 17:46:18 1999
+@@ -139,9 +139,9 @@
+       evPrintf(ctx, 5,
+               "evSelectFD(fd %d, mask 0x%x): new masks: 0x%lx 0x%lx 0x%lx\n",
+                fd, eventmask,
+-               (u_long)ctx->rdNext.fds_bits[0],
+-               (u_long)ctx->wrNext.fds_bits[0],
+-               (u_long)ctx->exNext.fds_bits[0]);
++               __FDS_BITS(&ctx->rdNext)[0],
++               __FDS_BITS(&ctx->wrNext)[0],
++               __FDS_BITS(&ctx->exNext)[0]);
+ 
+       return (0);
+ }
+@@ -250,9 +250,9 @@
+       evPrintf(ctx, 5,
+             "evDeselectFD(fd %d, mask 0x%x): new masks: 0x%lx 0x%lx 0x%lx\n",
+                del->fd, eventmask,
+-               (u_long)ctx->rdNext.fds_bits[0],
+-               (u_long)ctx->wrNext.fds_bits[0],
+-               (u_long)ctx->exNext.fds_bits[0]);
++               __FDS_BITS(&ctx->rdNext)[0],
++               __FDS_BITS(&ctx->wrNext)[0],
++               __FDS_BITS(&ctx->exNext)[0]);
+ 
+       /* Couldn't free it before now since we were using fields out of it. */
+       FREE(del);

diff --git a/bind-glibc21.patch b/bind-glibc21.patch
new file mode 100644 (file)
index 0000000..161ec35
--- /dev/null
+++ b/bind-glibc21.patch
@@ -0,0 +1,27 @@
+--- bind-8.2/src/port/linux/include/port_after.h~      Sat Feb 27 02:04:21 1999
++++ bind-8.2/src/port/linux/include/port_after.h       Tue Mar 16 19:30:14 1999
+@@ -63,24 +63,4 @@
+ #define PF_INET6      AF_INET6
+ #endif
+ 
+-#ifndef HAS_INET6_STRUCTS
+-/* Replace with structure from later rev of O/S if known. */
+-struct in6_addr {
+-      u_int8_t        s6_addr[16];
+-};
+-
+-/* Replace with structure from later rev of O/S if known. */
+-struct sockaddr_in6 {
+-#ifdef        HAVE_SA_LEN
+-      u_int8_t        sin6_len;       /* length of this struct */
+-      u_int8_t        sin6_family;    /* AF_INET6 */
+-#else
+-      u_int16_t       sin6_family;    /* AF_INET6 */
+-#endif
+-      u_int16_t       sin6_port;      /* transport layer port # */
+-      u_int32_t       sin6_flowinfo;  /* IPv6 flow information */
+-      struct in6_addr sin6_addr;      /* IPv6 address */
+-      u_int32_t       sin6_scope_id;  /* set of interfaces for a scope */
+-};
+-#endif        /* HAS_INET6_STRUCTS */
+ #endif /* ! PORT_AFTER_H */

diff --git a/bind-host.patch b/bind-host.patch
new file mode 100644 (file)
index 0000000..f4de8e5
--- /dev/null
+++ b/bind-host.patch
@@ -0,0 +1,10 @@
+--- bind-8.2/src/bin/host/host.c.host  Mon Jan 11 16:15:38 1999
++++ bind-8.2/src/bin/host/host.c       Wed Mar 31 10:51:54 1999
+@@ -1310,6 +1310,7 @@
+ 
+               amtToRead = len;
+               cp = buf.qb2;
++              if (amtToRead > NS_PACKETSZ) amtToRead=NS_PACKETSZ;
+               while (amtToRead > 0 &&
+                      (numRead = read(sockFD, cp, amtToRead)) > 0) {
+                       cp += numRead;

diff --git a/bind-nonlist.patch b/bind-nonlist.patch
new file mode 100644 (file)
index 0000000..6a791bc
--- /dev/null
+++ b/bind-nonlist.patch
@@ -0,0 +1,15 @@
+--- src/bin/named/ns_udp.c.nonlist     Wed Jun 10 03:54:37 1998
++++ src/bin/named/ns_udp.c     Wed Jun 10 03:57:14 1998
+@@ -34,7 +34,11 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <netdb.h>
+-#include <nlist.h>
++
++#if defined(CHECK_UDP_SUM) || defined(FIX_UDP_SUM)
++#include <libelf/nlist.h>
++#endif
++
+ #include <resolv.h>
+ #include <stdio.h>
+ #include <syslog.h>

diff --git a/bind-pselect.patch b/bind-pselect.patch
index cb3c133c1e1d4c39b61032682dc8a2cc4853ee40..43ab757eec7ae41d0d160c97db3144d3f171e41b 100644 (file)
--- a/bind-pselect.patch
+++ b/bind-pselect.patch
@@ -13,22 +13,3 @@
  #ifdef NEED_PSELECT
  static int            pselect(int, void *, void *, void *, struct timespec*);
  #endif
-@@ -297,11 +301,17 @@
-                                tp ? tp->tv_nsec : -1);
- 
-                       /* XXX should predict system's earliness and adjust. */
-+#if ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1))
-+                      x = pselect(ctx->fdMax+1,
-+                                  &ctx->rdLast, &ctx->wrLast, &ctx->exLast,
-+                                  tp, NULL);
-+                      pselect_errno = errno;
-+#else
-                       x = pselect(ctx->fdMax+1,
-                                   &ctx->rdLast, &ctx->wrLast, &ctx->exLast,
-                                   tp);
-                       pselect_errno = errno;
--
-+#endif /* glibc-2.1 */
-                       evPrintf(ctx, 4, "select() returns %d (err: %s)\n",
-                                x, (x == -1) ? strerror(errno) : "none");
- 

diff --git a/named.init b/named.init
new file mode 100644 (file)
index 0000000..eee1685
--- /dev/null
+++ b/named.init
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+# named           This shell script takes care of starting and stopping
+#                 named (BIND DNS server).
+#
+# chkconfig: 345 55 45
+# description: named (BIND) is a Domain Name Server (DNS) \
+# that is used to resolve host names to IP addresses.
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Source networking configuration.
+. /etc/sysconfig/network
+
+# Check that networking is up.
+[ "${NETWORKING}" = "no" ] && exit 0
+
+[ -f /usr/sbin/named ] || exit 0
+
+[ -f /etc/named.conf ] || exit 0
+
+[ -f /etc/sysconfig/named ] && . /etc/sysconfig/named
+       
+# See how we were called.
+case "$1" in
+  start)
+        show Starting named
+        daemon $NICELEVEL named
+        touch /var/lock/subsys/named
+        ;;
+  stop)
+        show Stopping named
+        killproc named
+        rm -f /var/lock/subsys/named
+        ;;
+  status)
+       status named
+       ;;
+  restart)
+       $0 stop
+       $0 start
+       ;;
+  *)
+        echo "Usage: $0 {start|stop|status|restart}"
+        exit 1
+esac
+
+exit 0