Attachment 45327 Details for Bug 69914 – nsd-2.1.2.patch

[patch] nsd-2.1.2.patch

nsd-2.1.2.patch (text/plain), 4.03 KB, created by Olafur Osvaldsson on 2004-08-02 18:10:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olafur Osvaldsson

Created: 2004-08-02 18:10:31 UTC

Size: 4.03 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/dns/nsd/Makefile /home/oli/ports/nsd/Makefile
>--- /usr/ports/dns/nsd/Makefile	Thu Jul 22 07:03:49 2004
>+++ /home/oli/ports/nsd/Makefile	Mon Aug  2 17:04:10 2004
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	nsd
>-PORTVERSION=	2.1.1
>-PORTREVISION=	1
>+PORTVERSION=	2.1.2
> CATEGORIES=	dns ipv6
> MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/	\
> 		ftp://ftp.rhnet.is/pub/nsd/
>diff -ruN --exclude=CVS /usr/ports/dns/nsd/distinfo /home/oli/ports/nsd/distinfo
>--- /usr/ports/dns/nsd/distinfo	Fri Jul  2 22:14:06 2004
>+++ /home/oli/ports/nsd/distinfo	Mon Aug  2 16:54:24 2004
>@@ -1,2 +1,2 @@
>-MD5 (nsd-2.1.1.tar.gz) = 244f04252e5b307402318e256c5f45f3
>-SIZE (nsd-2.1.1.tar.gz) = 215667
>+MD5 (nsd-2.1.2.tar.gz) = dfab5d1d06e6bc880eef3f55b380bb66
>+SIZE (nsd-2.1.2.tar.gz) = 218704
>diff -ruN --exclude=CVS /usr/ports/dns/nsd/files/patch-aa /home/oli/ports/nsd/files/patch-aa
>--- /usr/ports/dns/nsd/files/patch-aa	Thu Jul 22 07:03:50 2004
>+++ /home/oli/ports/nsd/files/patch-aa	Thu Jan  1 00:00:00 1970
>@@ -1,110 +0,0 @@
>-Index: nsd.8
>-===================================================================
>-RCS file: /cvs/nsd/nsd.8,v
>-retrieving revision 1.28
>-retrieving revision 1.28.2.1
>-diff -u -r1.28 -r1.28.2.1
>---- nsd.8	22 Apr 2004 13:23:05 -0000	1.28
>-+++ nsd.8	21 Jul 2004 16:31:50 -0000	1.28.2.1
>-@@ -158,7 +158,7 @@
>- .Ar seconds
>- seconds.
>- This is equal to sending
>--.Em SIGILL
>-+.Em SIGUSR1
>- to the daemon periodically.
>- 
>- .It Fl t Ar chroot
>-@@ -208,7 +208,7 @@
>- Stop answering queries, shutdown, and exit normally.
>- .It Dv SIGHUP
>- Reload the database.
>--.It Dv SIGILL
>-+.It Dv SIGUSR1
>- Dump BIND8-style statistics into the log. Ignored otherwise.
>- .El
>- .\" .Sh IMPLEMENTATION NOTES
>-Index: nsd.c
>-===================================================================
>-RCS file: /cvs/nsd/nsd.c,v
>-retrieving revision 1.105
>-retrieving revision 1.105.2.1
>-diff -u -r1.105 -r1.105.2.1
>---- nsd.c	22 Apr 2004 13:23:06 -0000	1.105
>-+++ nsd.c	21 Jul 2004 16:31:54 -0000	1.105.2.1
>-@@ -218,6 +218,7 @@
>- 			nsd.mode = NSD_QUIT;
>- 			break;
>- 		case SIGILL:
>-+		case SIGUSR1:	/* Dump stats on SIGUSR1.  */
>- 			nsd.mode = NSD_STATS;
>- 			break;
>- 		default:
>-@@ -237,8 +238,17 @@
>- #ifdef BIND8_STATS
>- 		alarm(nsd.st.period);
>- #endif
>--		sig = SIGILL;
>-+		sig = SIGUSR1;
>-+		break;
>- 	case SIGILL:
>-+		/*
>-+		 * For backwards compatibility with BIND 8 and older
>-+		 * versions of NSD.
>-+		 */
>-+		sig = SIGUSR1;
>-+		break;
>-+	case SIGUSR1:
>-+		/* Dump statistics.  */
>- 		break;
>- 	case SIGINT:
>- 		/* Silent shutdown... */
>-@@ -248,6 +258,7 @@
>- 	default:
>- 		nsd.mode = NSD_SHUTDOWN;
>- 		log_msg(LOG_WARNING, "signal %d received, shutting down...", sig);
>-+		sig = SIGTERM;
>- 		break;
>- 	}
>- 
>-@@ -724,6 +735,7 @@
>- 	sigaction(SIGHUP, &action, NULL);
>- 	sigaction(SIGINT, &action, NULL);
>- 	sigaction(SIGILL, &action, NULL);
>-+	sigaction(SIGUSR1, &action, NULL);
>- 	sigaction(SIGALRM, &action, NULL);
>- 	sigaction(SIGCHLD, &action, NULL);
>- 	action.sa_handler = SIG_IGN;
>-Index: nsdc.sh.in
>-===================================================================
>-RCS file: /cvs/nsd/nsdc.sh.in,v
>-retrieving revision 1.30
>-retrieving revision 1.30.2.1
>-diff -u -r1.30 -r1.30.2.1
>---- nsdc.sh.in	22 Apr 2004 13:39:47 -0000	1.30
>-+++ nsdc.sh.in	21 Jul 2004 16:31:56 -0000	1.30.2.1
>-@@ -89,7 +89,7 @@
>- 	signal "TERM"
>- 	;;
>- stats)
>--	signal "ILL"
>-+	signal "USR1"
>- 	;;
>- reload)
>- 	signal "HUP"
>-Index: server.c
>-===================================================================
>-RCS file: /cvs/nsd/server.c,v
>-retrieving revision 1.123
>-retrieving revision 1.123.2.1
>-diff -u -r1.123 -r1.123.2.1
>---- server.c	12 May 2004 14:45:35 -0000	1.123
>-+++ server.c	21 Jul 2004 16:32:00 -0000	1.123.2.1
>-@@ -623,6 +623,7 @@
>- 	sigemptyset(&block_sigmask);
>- 	sigaddset(&block_sigmask, SIGHUP);
>- 	sigaddset(&block_sigmask, SIGILL);
>-+	sigaddset(&block_sigmask, SIGUSR1);
>- 	sigaddset(&block_sigmask, SIGINT);
>- 	sigaddset(&block_sigmask, SIGTERM);
>- 	sigprocmask(SIG_BLOCK, &block_sigmask, &default_sigmask);
>Binary files /usr/ports/dns/nsd/nsd-2.1.2.tbz and /home/oli/ports/nsd/nsd-2.1.2.tbz differ

Actions: View | Diff

Attachments on bug 69914: 45327