From 12a1ba0af3f0aa0f2be4ec6d73dd7df488e2f756 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 03:38:52 +0000
Subject: auto-import changelog data from bootparamd-0.17-18.src.rpm

Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
- rebuilt
- Add debug patch (which is really there to fix a bug in signal checking)
Thu Jun 10 2004 Dan Walsh <dwalsh@redhat.com> 0.17-16
- Add resolver patch

---

diff --git a/bootparamd-debug.patch b/bootparamd-debug.patch
new file mode 100644
index 0000000..074096a
--- /dev/null
+++ b/bootparamd-debug.patch
@@ -0,0 +1,41 @@
+--- netkit-bootparamd-0.17-pre20000412/configure.sopwith	2004-07-02 16:09:42.000000000 -0400
++++ netkit-bootparamd-0.17-pre20000412/configure	2004-07-02 16:47:08.000000000 -0400
+@@ -160,29 +160,35 @@
+ cat <<EOF >__conftest.c
+ #include <unistd.h>
+ #include <signal.h>
+-int count=0;
++volatile int count=0;
+ void handle(int foo) { count++; }
+ int main() {
++    sigset_t sset;
+     int pid=getpid();
++    sigemptyset(&sset);
++    sigaddset(&sset, SIGINT);
++    sigprocmask(SIG_UNBLOCK, &sset, NULL);
+     signal(SIGINT, handle);
+     kill(pid,SIGINT);
+     kill(pid,SIGINT);
+     kill(pid,SIGINT);
++    sleep(1);
+     if (count!=3) return 1;
+     return 0;
+ }
+ 
+ EOF
++cat __conftest.c
+ if (
+       $CC $CFLAGS  __conftest.c  -o __conftest || exit 1
+       ./__conftest || exit 1
+-   ) >/dev/null 2>&1; then
++   ); then
+     echo 'yes'
+ else
+     if (
+           $CC $CFLAGS -D__USE_BSD_SIGNAL __conftest.c  -o __conftest || exit 1
+           ./__conftest || exit 1
+-       ) >/dev/null 2>&1; then
++       ); then
+         echo '-D__USE_BSD_SIGNAL'
+         CFLAGS="$CFLAGS -D__USE_BSD_SIGNAL"
+     else
diff --git a/bootparamd-resolver.patch b/bootparamd-resolver.patch
new file mode 100644
index 0000000..f40a95a
--- /dev/null
+++ b/bootparamd-resolver.patch
@@ -0,0 +1,54 @@
+diff -dru netkit-bootparamd-0.17-pre20000412/rpc.bootparamd/rpc.bootparamd.c netkit-bootparamd-0.17-pre20000412.patched/rpc.bootparamd/rpc.bootparamd.c
+--- netkit-bootparamd-0.17-pre20000412/rpc.bootparamd/rpc.bootparamd.c	Tue Sep 14 12:01:16 1999
++++ netkit-bootparamd-0.17-pre20000412.patched/rpc.bootparamd/rpc.bootparamd.c	Mon May 10 12:17:06 2004
+@@ -178,6 +178,7 @@
+ {
+     FILE *bpf;
+     char *where;
++    int pass;
+ 
+     int ch, pch, fid_len, res = 0;
+     int match = 0;
+@@ -189,22 +190,26 @@
+ 	exit(1);
+     }
+ 
+-    while (fscanf(bpf, "%s", hostname) >  0  && !match) {
+-	if ( *hostname != '#' ) { /* comment */
+-	    if (!strcmp(hostname, askname)) {
+-		match = 1;
+-	    } 
+-	    else {
+-		he = gethostbyname(hostname);
+-		if (he && !strcmp(he->h_name, askname)) match = 1;
+-	    }
+-	}
+-	/* skip to next entry */
+-	if (match) break;
+-	pch = ch = getc(bpf); 
+-	while ( ! ( ch == '\n' && pch != '\\') && ch != EOF) {
+-	    pch = ch; ch = getc(bpf);
+-	}
++    /* Two passes; avoid unnecessary DNS lookups during the first one.  */
++    for (pass = 0; pass < 2; pass++) {
++	 rewind (bpf);
++	 while (fscanf(bpf, "%s", hostname) >  0  && !match) {
++	      if ( *hostname != '#' ) { /* comment */
++		   if (!strcmp(hostname, askname)) {
++			match = 1;
++		   } 
++		   else if (pass > 0) {
++			he = gethostbyname(hostname);
++			if (he && !strcmp(he->h_name, askname)) match = 1;
++		   }
++	      }
++	      /* skip to next entry */
++	      if (match) break;
++	      pch = ch = getc(bpf); 
++	      while ( ! ( ch == '\n' && pch != '\\') && ch != EOF) {
++		   pch = ch; ch = getc(bpf);
++	      }
++	 }
+     }
+ 
+     /* if match is true we read the rest of the line to get the
diff --git a/bootparamd.spec b/bootparamd.spec
index 56003c0..513dfeb 100644
--- a/bootparamd.spec
+++ b/bootparamd.spec
@@ -3,12 +3,14 @@
 Summary: A server process which provides boot information to diskless clients.
 Name: bootparamd
 Version: 0.17
-Release: 16
+Release: 18
 Copyright: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-bootparamd-%{version}%{_snapshot}.tar.gz
 Source1: bootparamd.init
 Patch: bootparamd-manpage-63567.patch
+Patch1: bootparamd-resolver.patch
+Patch2: bootparamd-debug.patch
 Prereq: /sbin/chkconfig /etc/init.d
 Requires: portmap
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -30,13 +32,10 @@ diskless clients on your network.
 %prep
 %setup -q -n netkit-bootparamd-%{version}%{_snapshot}
 %patch -p1
+%patch1 -p1
+%patch2 -p1 -b .unblocksignals
 
 %build
-%ifarch s390 s390x
-export f_PIE="-fPIE"
-%else
-export f_PIE="-fpie"
-%endif
 sh configure --with-c-compiler=gcc
 perl -pi -e '
     s,^CC=.*$,CC=cc,;
@@ -46,7 +45,12 @@ perl -pi -e '
     s,^SBINDIR=.*$,SBINDIR=%{_sbindir},;
     s,^LDFLAGS=,LDFLAGS=-pie,;
     ' MCONFIG
-make
+%ifarch s390 s390x 
+export f_PIE="-fPIE"
+%else
+export f_PIE="-fpie"
+%endif
+make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
@@ -78,6 +82,13 @@ fi
 %config /etc/rc.d/init.d/bootparamd
 
 %changelog
+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+- Add debug patch (which is really there to fix a bug in signal checking)
+
+* Thu Jun 10 2004 Dan Walsh <dwalsh@redhat.com> 0.17-16
+- Add resolver patch
+
 * Fri May 14 2004 Thomas Woerner <twoerner@redhat.com> 0.17-16
 - compiling PIE