Revision: 26738
http://sourceforge.net/p/gar/code/26738
Author: idogan23
Date: 2021-02-20 11:14:54 +0000 (Sat, 20 Feb 2021)
Log Message:
-----------
Unbound: Remove not needed patches
Modified Paths:
--------------
csw/mgar/pkg/unbound/trunk/Makefile
Removed Paths:
-------------
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-preprocessing-bug.patch
Modified: csw/mgar/pkg/unbound/trunk/Makefile
===================================================================
--- csw/mgar/pkg/unbound/trunk/Makefile 2021-02-20 11:13:57 UTC (rev 26737)
+++ csw/mgar/pkg/unbound/trunk/Makefile 2021-02-20 11:14:54 UTC (rev 26738)
@@ -20,9 +20,6 @@
# We define upstream file regex so we can be notifed of new upstream software
release
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
# UPSTREAM_MASTER_SITES =
Deleted:
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
2021-02-20 11:13:57 UTC (rev 26737)
+++
csw/mgar/pkg/unbound/trunk/files/0001-Fix-for-bug-779-https-www.nlnetlabs.nl-bugs-script-s.patch
2021-02-20 11:14:54 UTC (rev 26738)
@@ -1,90 +0,0 @@
-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
-
Deleted: csw/mgar/pkg/unbound/trunk/files/0001-fix-preprocessing-bug.patch
===================================================================
--- csw/mgar/pkg/unbound/trunk/files/0001-fix-preprocessing-bug.patch
2021-02-20 11:13:57 UTC (rev 26737)
+++ csw/mgar/pkg/unbound/trunk/files/0001-fix-preprocessing-bug.patch
2021-02-20 11:14:54 UTC (rev 26738)
@@ -1,25 +0,0 @@
-From ea9f488d3dfb3397880937cfac66b1168a852ed2 Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <y...@pleiades.fr.eu.org>
-Date: Wed, 17 Apr 2013 23:10:44 +0200
-Subject: [PATCH] fix preprocessing bug
-
----
- util/storage/lookup3.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/util/storage/lookup3.c b/util/storage/lookup3.c
-index 845cc38..a96ca05 100644
---- a/util/storage/lookup3.c
-+++ b/util/storage/lookup3.c
-@@ -75,8 +75,6 @@ hash_set_raninit(uint32_t v)
- */
- #if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
- __BYTE_ORDER == __LITTLE_ENDIAN) || \
-- (defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && \
-- _BYTE_ORDER == _LITTLE_ENDIAN) || \
- (defined(i386) || defined(__i386__) || defined(__i486__) || \
- defined(__i586__) || defined(__i686__) || defined(vax) ||
defined(MIPSEL))
- # define HASH_LITTLE_ENDIAN 1
---
-1.8.1.4
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
