openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File ntp-config.patch of Package ntp

diff -N -ur ntp-stable-4.2.0a-20050816-loconly//Makefile.am ntp-config//Makefile.am
--- ntp-stable-4.2.0a-20050816-loconly//Makefile.am	2007-01-30 12:02:36.000000000 +0100
+++ ntp-config//Makefile.am	2008-10-08 11:54:16.000000000 +0200
@@ -16,7 +16,6 @@
 	libntp		\
 	libparse	\
 	ntpd		\
-	ntpdate		\
 	ntpdc		\
 	ntpq		\
 	parseutil	\
@@ -36,7 +35,6 @@
 	libopts		\
 	libparse	\
 	ntpd		\
-	ntpdate		\
 	ntpdc		\
 	ntpq		\
 	parseutil	\
diff -N -ur ntp-stable-4.2.0a-20050816-loconly//Makefile.in ntp-config//Makefile.in
--- ntp-stable-4.2.0a-20050816-loconly//Makefile.in	2008-08-17 11:09:05.000000000 +0200
+++ ntp-config//Makefile.in	2008-10-08 11:54:32.000000000 +0200
@@ -214,7 +214,7 @@
 ACLOCAL_AMFLAGS = -I m4 -I libopts/m4
 NULL = 
 SUBDIRS = $(am__append_1) scripts include ElectricFence @ARLIB_DIR@ \
-	libntp libparse ntpd ntpdate ntpdc ntpq parseutil adjtimed \
+	libntp libparse ntpd ntpdc ntpq parseutil adjtimed \
 	clockstuff kernel sntp util $(NULL)
 DIST_SUBDIRS = \
 	scripts		\
@@ -225,7 +225,6 @@
 	libopts		\
 	libparse	\
 	ntpd		\
-	ntpdate		\
 	ntpdc		\
 	ntpq		\
 	parseutil	\
diff -N -ur ntp-stable-4.2.0a-20050816-loconly//ntpd/Makefile.am ntp-config//ntpd/Makefile.am
--- ntp-stable-4.2.0a-20050816-loconly//ntpd/Makefile.am	2008-03-22 12:03:20.000000000 +0100
+++ ntp-config//ntpd/Makefile.am	2008-09-25 17:24:47.000000000 +0200
@@ -1,7 +1,5 @@
 AUTOMAKE_OPTIONS= ../util/ansi2knr
 
-bindir=	${exec_prefix}/${BINSUBDIR}
-
 bin_PROGRAMS=	ntpd @MAKE_NTPDSIM@
 
 noinst_LIBRARIES=	libntpd.a
diff -N -ur ntp-stable-4.2.0a-20050816-loconly//ntpdc/Makefile.am ntp-config//ntpdc/Makefile.am
--- ntp-stable-4.2.0a-20050816-loconly//ntpdc/Makefile.am	2008-03-22 12:03:23.000000000 +0100
+++ ntp-config//ntpdc/Makefile.am	2008-09-25 17:24:47.000000000 +0200
@@ -1,6 +1,5 @@
 AUTOMAKE_OPTIONS=	../util/ansi2knr
 
-bindir=		${exec_prefix}/${BINSUBDIR}
 bin_PROGRAMS=	ntpdc
 EXTRA_PROGRAMS=	ntpdc-layout
 EXTRA_DATA=	check-layout
diff -N -ur ntp-stable-4.2.0a-20050816-loconly//sntp/Makefile.am ntp-config//sntp/Makefile.am
--- ntp-stable-4.2.0a-20050816-loconly//sntp/Makefile.am	2008-08-10 13:02:42.000000000 +0200
+++ ntp-config//sntp/Makefile.am	2008-09-25 17:24:47.000000000 +0200
@@ -10,7 +10,6 @@
 
 NULL=
 
-bindir=	${exec_prefix}/${BINSUBDIR}
 bin_PROGRAMS=	sntp
 #run_ag=         cd $(srcdir) && autogen --writable -L $(top_srcdir)/include
 run_ag=         cd $(srcdir) && autogen --writable
--- ntp-4.2.4p5-orig/ntpd/ntp_io.c	2008-05-20 09:06:14.000000000 +0200
+++ ntp-4.2.4p5/ntpd/ntp_io.c	2008-10-09 20:07:25.000000000 +0200
@@ -16,6 +16,7 @@
 #include "ntp_request.h"
 #include "ntp.h"
 #include "ntp_unixtime.h"
+#include "ntpd-opts.h"
 
 /* Don't include ISC's version of IPv6 variables and structures */
 #define ISC_IPV6_H 1
@@ -3014,6 +3015,10 @@
 	fds = activefds;
 	tvzero.tv_sec = tvzero.tv_usec = 0;
 
+	if (HAVE_OPT( QUIT ))
+	{
+		tvzero.tv_usec = 60000;
+	}
 	n = select(maxactivefd+1, &fds, (fd_set *)0, (fd_set *)0, &tvzero);
 
 	/*
--- ntp-4.2.4p5-orig/ntpd/ntp_intres.c	2008-08-10 13:02:43.000000000 +0200
+++ ntp-4.2.4p5/ntpd/ntp_intres.c	2008-10-09 22:12:58.000000000 +0200
@@ -31,6 +31,7 @@
 #include "ntp_request.h"
 #include "ntp_stdlib.h"
 #include "ntp_syslog.h"
+#include "ntpd-opts.h"
 
 #include <stdio.h>
 #include <ctype.h>
@@ -675,7 +675,7 @@
 	 * doesn't fool us.  Note the socket is nonblocking.
 	 */
 	tvout.tv_sec =  0;
-	tvout.tv_usec = 0;
+	tvout.tv_usec = HAVE_OPT( QUIT ) ? 600 : 0 ;
 	FD_ZERO(&fdset);
 	FD_SET(sockfd, &fdset);
 	while (select(sockfd + 1, &fdset, (fd_set *)0, (fd_set *)0, &tvout) >
--- ntp-4.2.4p5-orig/ntpd/ntpd.c	2008-08-17 10:47:31.000000000 +0200
+++ ntp-4.2.4p5/ntpd/ntpd.c	2008-10-09 22:36:16.000000000 +0200
@@ -1031,8 +1031,11 @@
 						(fd_set *)0, &t1);
 			}
 #  else
+			struct timeval t1; struct timeval *t1p = NULL;
+			t1.tv_sec = 0; t1.tv_usec = HAVE_OPT( QUIT ) ? 60000 : 0 ;
+			if( HAVE_OPT( QUIT ) )  t1p = &t1; 
 			nfound = select(maxactivefd+1, &rdfdes, (fd_set *)0,
-					(fd_set *)0, (struct timeval *)0);
+					(fd_set *)0, t1p);
 #  endif /* VMS */
 			if (nfound > 0)
 			{

Places

File ntp-config.patch of Package ntp

Places