[csw-devel] SF.net SVN: gar:[15046] csw/mgar/pkg/libevent2/trunk

[dmichelsen at users.sourceforge.net]

Revision: 15046
          http://gar.svn.sourceforge.net/gar/?rev=15046&view=rev
Author:   dmichelsen
Date:     2011-07-12 09:27:58 +0000 (Tue, 12 Jul 2011)

Log Message:
-----------
libevent2: Update according to bug report

Modified Paths:
--------------
    csw/mgar/pkg/libevent2/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/libevent2/trunk/files/0001-Fix-wrong-check-of-sockaddr.patch

Modified: csw/mgar/pkg/libevent2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libevent2/trunk/Makefile	2011-07-12 00:08:47 UTC (rev 15045)
+++ csw/mgar/pkg/libevent2/trunk/Makefile	2011-07-12 09:27:58 UTC (rev 15046)
@@ -14,10 +14,6 @@
 DISTNAME = $(NAME)-$(VERSION)-stable
 DISTFILES += $(DISTNAME).tar.gz
 
-# Use this patch until bug is fixed:
-#   http://sourceforge.net/tracker/?func=detail&aid=3361614&group_id=50884&atid=461322
-PATCHFILES += 0001-Fix-wrong-check-of-sockaddr.patch
-
 VENDOR_URL = http://www.monkey.org/~provos/libevent/
 LICENSE = LICENSE
 
@@ -39,6 +35,11 @@
 LD_OPTIONS =
 EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
 
+# Pass incudes via CFLAGS until this is fixed:
+#   http://sourceforge.net/tracker/?func=detail&aid=3361614&group_id=50884&atid=461322
+CPPFLAGS =
+EXTRA_CFLAGS += $(INCLUDE_FLAGS)
+
 BUILD64 = 1
 
 TEST_TARGET = verify

Deleted: csw/mgar/pkg/libevent2/trunk/files/0001-Fix-wrong-check-of-sockaddr.patch
===================================================================
--- csw/mgar/pkg/libevent2/trunk/files/0001-Fix-wrong-check-of-sockaddr.patch	2011-07-12 00:08:47 UTC (rev 15045)
+++ csw/mgar/pkg/libevent2/trunk/files/0001-Fix-wrong-check-of-sockaddr.patch	2011-07-12 09:27:58 UTC (rev 15046)
@@ -1,25 +0,0 @@
-From 866fdd0d769e1a6c2187b9bdc94c475e8094b42c Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Sun, 10 Jul 2011 10:40:38 +0200
-Subject: [PATCH] Fix wrong check of sockaddr
-
----
- util-internal.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/util-internal.h b/util-internal.h
-index fe9ff35..eb22946 100644
---- a/util-internal.h
-+++ b/util-internal.h
-@@ -207,7 +207,7 @@ long _evutil_weakrand(void);
- #define EVUTIL_FAILURE_CHECK(cond) EVUTIL_UNLIKELY(cond)
- #endif
- 
--#ifndef _EVENT_HAVE_STRUCT_SOCKADDR_STORAGE
-+#if 0
- /* Replacement for sockaddr storage that we can use internally on platforms
-  * that lack it.  It is not space-efficient, but neither is sockaddr_storage.
-  */
--- 
-1.7.6
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.