Revision: 25856
http://sourceforge.net/p/gar/code/25856
Author: idogan23
Date: 2016-07-20 14:00:08 +0000 (Wed, 20 Jul 2016)
Log Message:
-----------
Unbound: Bump Version to 1.5.9, including patch for Solaris build bug.
Modified Paths:
--------------
csw/mgar/pkg/unbound/trunk/Makefile
csw/mgar/pkg/unbound/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/unbound/trunk/files/0001-Fix-for-bug-779-https-www.nlnetlabs.nl-bugs-script-s.patch
Modified: csw/mgar/pkg/unbound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unbound/trunk/Makefile 2016-07-20 09:08:54 UTC (rev 25855)
+++ csw/mgar/pkg/unbound/trunk/Makefile 2016-07-20 14:00:08 UTC (rev 25856)
@@ -1,5 +1,5 @@
NAME = unbound
-VERSION = 1.5.3
+VERSION = 1.5.9
GARTYPE = v2
DESCRIPTION = A validating, recursive, and caching DNS resolver
define BLUR
@@ -21,6 +21,7 @@
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
#PATCHFILES += 0001-fix-preprocessing-bug.patch
+PATCHFILES += 0001-Fix-for-bug-779-https-www.nlnetlabs.nl-bugs-script-s.patch
# If the url used to check for software update is different of MASTER_SITES,
then
# uncomment the next line. Otherwise it is set by default to the value of
MASTER_SITES
Modified: csw/mgar/pkg/unbound/trunk/checksums
===================================================================
--- csw/mgar/pkg/unbound/trunk/checksums 2016-07-20 09:08:54 UTC (rev
25855)
+++ csw/mgar/pkg/unbound/trunk/checksums 2016-07-20 14:00:08 UTC (rev
25856)
@@ -1 +1 @@
-1e95fdcbaaf5dc87432d898006a5eb13 unbound-1.5.3.tar.gz
+0cefa62c1690b4db18583db84bff00e3 unbound-1.5.9.tar.gz
Added:
csw/mgar/pkg/unbound/trunk/files/0001-Fix-for-bug-779-https-www.nlnetlabs.nl-bugs-script-s.patch
===================================================================
---
csw/mgar/pkg/unbound/trunk/files/0001-Fix-for-bug-779-https-www.nlnetlabs.nl-bugs-script-s.patch
(rev 0)
+++
csw/mgar/pkg/unbound/trunk/files/0001-Fix-for-bug-779-https-www.nlnetlabs.nl-bugs-script-s.patch
2016-07-20 14:00:08 UTC (rev 25856)
@@ -0,0 +1,90 @@
+From 5851a8d63c3ab0a83d9367a8dc3ac9b8e23ffb9c Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ih...@opencsw.org>
+Date: Wed, 20 Jul 2016 15:35:32 +0200
+Subject: [PATCH] Fix for bug 779
+ https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=779
+
+---
+ util/ub_event.c | 12 ++++--------
+ util/ub_event_pluggable.c | 14 ++++++--------
+ 2 files changed, 10 insertions(+), 16 deletions(-)
+
+diff --git a/util/ub_event.c b/util/ub_event.c
+index af2a18e..ebf9029 100644
+--- a/util/ub_event.c
++++ b/util/ub_event.c
+@@ -132,14 +132,10 @@ static void (*NATIVE_BITS_CB(void (*cb)(int, short,
void*)))(int, short, void*)
+ #define EVFLAG_AUTO 0
+ #endif
+
+-#define AS_EVENT_BASE(x) \
+- (((union {struct ub_event_base* a; struct event_base* b;})x).b)
+-#define AS_UB_EVENT_BASE(x) \
+- (((union {struct event_base* a; struct ub_event_base* b;})x).b)
+-#define AS_EVENT(x) \
+- (((union {struct ub_event* a; struct event* b;})x).b)
+-#define AS_UB_EVENT(x) \
+- (((union {struct event* a; struct ub_event* b;})x).b)
++#define AS_EVENT_BASE(x) ((struct event_base*)x)
++#define AS_UB_EVENT_BASE(x) ((struct ub_event_base*)x)
++#define AS_EVENT(x) ((struct event*)x)
++#define AS_UB_EVENT(x) ((struct ub_event*)x)
+
+ const char* ub_event_get_version()
+ {
+diff --git a/util/ub_event_pluggable.c b/util/ub_event_pluggable.c
+index 5c51755..c30880a 100644
+--- a/util/ub_event_pluggable.c
++++ b/util/ub_event_pluggable.c
+@@ -144,10 +144,8 @@ struct my_event {
+ struct event ev;
+ };
+
+-#define AS_MY_EVENT_BASE(x) \
+- (((union {struct ub_event_base* a; struct my_event_base* b;})x).b)
+-#define AS_MY_EVENT(x) \
+- (((union {struct ub_event* a; struct my_event* b;})x).b)
++#define AS_MY_EVENT_BASE(x) ((struct my_event_base*)x)
++#define AS_MY_EVENT(x) ((struct my_event*)x)
+
+ const char* ub_event_get_version()
+ {
+@@ -597,7 +595,7 @@ ub_event_add(struct ub_event* ev, struct timeval* tv)
+ int
+ ub_event_del(struct ub_event* ev)
+ {
+- if (ev->magic == UB_EVENT_MAGIC) {
++ if (ev && ev->magic == UB_EVENT_MAGIC) {
+ fptr_ok(ev->vmt != &default_event_vmt ||
+ ev->vmt->del == my_event_del);
+ return (*ev->vmt->del)(ev);
+@@ -620,7 +618,7 @@ ub_timer_add(struct ub_event* ev, struct ub_event_base*
base,
+ int
+ ub_timer_del(struct ub_event* ev)
+ {
+- if (ev->magic == UB_EVENT_MAGIC) {
++ if (ev && ev->magic == UB_EVENT_MAGIC) {
+ fptr_ok(ev->vmt != &default_event_vmt ||
+ ev->vmt->del_timer == my_timer_del);
+ return (*ev->vmt->del_timer)(ev);
+@@ -642,7 +640,7 @@ ub_signal_add(struct ub_event* ev, struct timeval* tv)
+ int
+ ub_signal_del(struct ub_event* ev)
+ {
+- if (ev->magic == UB_EVENT_MAGIC) {
++ if (ev && ev->magic == UB_EVENT_MAGIC) {
+ fptr_ok(ev->vmt != &default_event_vmt ||
+ ev->vmt->del_signal == my_signal_del);
+ return (*ev->vmt->del_signal)(ev);
+@@ -653,7 +651,7 @@ ub_signal_del(struct ub_event* ev)
+ void
+ ub_winsock_unregister_wsaevent(struct ub_event* ev)
+ {
+- if (ev->magic == UB_EVENT_MAGIC) {
++ if (ev && ev->magic == UB_EVENT_MAGIC) {
+ fptr_ok(ev->vmt != &default_event_vmt ||
+ ev->vmt->winsock_unregister_wsaevent ==
+ my_winsock_unregister_wsaevent);
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
