Attachment 199570 Details for Bug 233229 – temorary patch

[patch] temorary patch

unbound-1.8.1_1.diff (text/plain), 4.18 KB, created by Jaap Akkerhuis on 2018-11-26 14:41:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jaap Akkerhuis

Created: 2018-11-26 14:41:48 UTC

Size: 4.18 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 484404)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	unbound
> PORTVERSION=	1.8.1
>+PORTREVISION=	1
> CATEGORIES=	dns
> MASTER_SITES=	https://www.nlnetlabs.nl/downloads/unbound/ \
> 		https://distfiles.crux.guru/
>Index: files/patch-daemon_worker.c
>===================================================================
>--- files/patch-daemon_worker.c	(nonexistent)
>+++ files/patch-daemon_worker.c	(working copy)
>@@ -0,0 +1,19 @@
>+--- daemon/worker.c.orig	2018-11-22 15:35:31 UTC
>++++ daemon/worker.c
>+@@ -1802,8 +1802,6 @@ worker_init(struct worker* worker, struc
>+ 	alloc_set_id_cleanup(&worker->alloc, &worker_alloc_cleanup, worker);
>+ 	worker->env = *worker->daemon->env;
>+ 	comm_base_timept(worker->base, &worker->env.now, &worker->env.now_tv);
>+-	if(worker->thread_num == 0)
>+-		log_set_time(worker->env.now);
>+ 	worker->env.worker = worker;
>+ 	worker->env.worker_base = worker->base;
>+ 	worker->env.send_query = &worker_send_query;
>+@@ -1909,7 +1907,6 @@ worker_delete(struct worker* worker)
>+ 	comm_timer_delete(worker->env.probe_timer);
>+ 	free(worker->ports);
>+ 	if(worker->thread_num == 0) {
>+-		log_set_time(NULL);
>+ #ifdef UB_ON_WINDOWS
>+ 		wsvc_desetup_worker(worker);
>+ #endif /* UB_ON_WINDOWS */
>
>Property changes on: files/patch-daemon_worker.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-util_log.c
>===================================================================
>--- files/patch-util_log.c	(nonexistent)
>+++ files/patch-util_log.c	(working copy)
>@@ -0,0 +1,34 @@
>+--- util/log.c.orig	2018-11-22 15:37:33 UTC
>++++ util/log.c
>+@@ -78,8 +78,6 @@ static const char* ident="unbound";
>+ /** are we using syslog(3) to log to */
>+ static int logging_to_syslog = 0;
>+ #endif /* HAVE_SYSLOG_H */
>+-/** time to print in log, if NULL, use time(2) */
>+-static time_t* log_now = NULL;
>+ /** print time in UTC or in secondsfrom1970 */
>+ static int log_time_asc = 0;
>+ 
>+@@ -181,11 +179,6 @@ void log_ident_set(const char* id)
>+ 	ident = id;
>+ }
>+ 
>+-void log_set_time(time_t* t)
>+-{
>+-	log_now = t;
>+-}
>+-
>+ void log_set_time_asc(int use_asc)
>+ {
>+ 	log_time_asc = use_asc;
>+@@ -255,9 +248,7 @@ log_vmsg(int pri, const char* type,
>+ 		lock_quick_unlock(&log_lock);
>+ 		return;
>+ 	}
>+-	if(log_now)
>+-		now = (time_t)*log_now;
>+-	else	now = (time_t)time(NULL);
>++	now = (time_t)time(NULL);
>+ #if defined(HAVE_STRFTIME) && defined(HAVE_LOCALTIME_R) 
>+ 	if(log_time_asc && strftime(tmbuf, sizeof(tmbuf), "%b %d %H:%M:%S",
>+ 		localtime_r(&now, &tm))%(sizeof(tmbuf)) != 0) {
>
>Property changes on: files/patch-util_log.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-util_log.h
>===================================================================
>--- files/patch-util_log.h	(nonexistent)
>+++ files/patch-util_log.h	(working copy)
>@@ -0,0 +1,16 @@
>+--- util/log.h.orig	2018-11-22 15:40:08 UTC
>++++ util/log.h
>+@@ -113,13 +113,6 @@ int log_thread_get(void);
>+ void log_ident_set(const char* id);
>+ 
>+ /**
>+- * Set the time value to print in log entries.
>+- * @param t: the point is copied and used to find the time.
>+- * 	if NULL, time(2) is used.
>+- */
>+-void log_set_time(time_t* t);
>+-
>+-/**
>+  * Set if the time value is printed ascii or decimal in log entries.
>+  * @param use_asc: if true, ascii is printed, otherwise decimal.
>+  *	If the conversion fails or you have no time functions, 
>
>Property changes on: files/patch-util_log.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 233229: 199570