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

[dmichelsen at users.sourceforge.net]

Revision: 19991
          http://gar.svn.sourceforge.net/gar/?rev=19991&view=rev
Author:   dmichelsen
Date:     2013-01-01 19:08:09 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
libevent2/trunk: Update to 2.0.21

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

Removed Paths:
-------------
    csw/mgar/pkg/libevent2/trunk/files/0001-Do-not-return-value-in-void-function.patch

Modified: csw/mgar/pkg/libevent2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libevent2/trunk/Makefile	2013-01-01 17:43:52 UTC (rev 19990)
+++ csw/mgar/pkg/libevent2/trunk/Makefile	2013-01-01 19:08:09 UTC (rev 19991)
@@ -1,5 +1,5 @@
 NAME = libevent
-VERSION = 2.0.16
+VERSION = 2.0.21
 GARTYPE = v2
 
 DESCRIPTION = Event notification library
@@ -14,14 +14,10 @@
 DISTNAME = $(NAME)-$(VERSION)-stable
 DISTFILES += $(DISTNAME).tar.gz
 
-# This is the same fix as reported in
-#   http://sourceforge.net/tracker/?func=detail&aid=3452589&group_id=50884&atid=461322
-PATCHFILES += 0001-Do-not-return-value-in-void-function.patch
-
 VENDOR_URL = http://www.monkey.org/~provos/libevent/
 LICENSE = LICENSE
 
-BUILD_DEP_PKGS += CSWossldevel
+BUILD_DEP_PKGS += CSWlibssl-dev
 
 PACKAGES += CSWlibevent2-0-5
 SPKG_DESC_CSWlibevent2-0-5 = Event notification library 2.0, libevent-2.0.so.5
@@ -38,7 +34,7 @@
 PACKAGES += CSWlibevent-openssl2-0-5
 SPKG_DESC_CSWlibevent-openssl2-0-5 = Event notification library 2.0, libevent_openssl-2.0.so.5
 PKGFILES_CSWlibevent-openssl2-0-5 = $(call pkgfiles_lib,libevent_openssl-2.0.so.5)
-RUNTIME_DEP_PKGS_CSWlibevent-openssl2-0-5 += CSWosslrt
+RUNTIME_DEP_PKGS_CSWlibevent-openssl2-0-5 += CSWlibssl1-0-0
 
 PACKAGES += CSWlibevent-pthreads2-0-5
 SPKG_DESC_CSWlibevent-pthreads2-0-5 = Event notification library 2.0, libevent_pthreads-2.0.so.5
@@ -54,25 +50,19 @@
 RUNTIME_DEP_PKGS_CSWlibevent-dev += CSWpython
 OBSOLETED_BY_CSWlibevent-dev += CSWlibevent-devel
 
+REINPLACEMENTS += bash
+REINPLACE_MATCH_bash = \#!/bin/sh
+REINPLACE_WITH_bash = \#!/bin/bash
+REINPLACE_FILES_bash += test/test.sh
+
 # We don't need it and if defined the test breaks
 NOISALIST = 1
 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_LIBS_ONLY = 1
 
 TEST_TARGET = verify
 
-# This is a unified package with all libraries in there
-CHECKPKG_OVERRIDES_CSWlibevent2-0-5 += shared-lib-pkgname-mismatch
-
 include gar/category.mk
 
-post-extract-modulated:
-	-test -f $(WORKSRC)/test/test.sh && perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh
-	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/libevent2/trunk/checksums
===================================================================
--- csw/mgar/pkg/libevent2/trunk/checksums	2013-01-01 17:43:52 UTC (rev 19990)
+++ csw/mgar/pkg/libevent2/trunk/checksums	2013-01-01 19:08:09 UTC (rev 19991)
@@ -1 +1 @@
-899efcffccdb3d5111419df76e7dc8df  libevent-2.0.16-stable.tar.gz
+b2405cc9ebf264aa47ff615d9de527a2  libevent-2.0.21-stable.tar.gz

Deleted: csw/mgar/pkg/libevent2/trunk/files/0001-Do-not-return-value-in-void-function.patch
===================================================================
--- csw/mgar/pkg/libevent2/trunk/files/0001-Do-not-return-value-in-void-function.patch	2013-01-01 17:43:52 UTC (rev 19990)
+++ csw/mgar/pkg/libevent2/trunk/files/0001-Do-not-return-value-in-void-function.patch	2013-01-01 19:08:09 UTC (rev 19991)
@@ -1,26 +0,0 @@
-From 5cb574becae82337673dbd093176ed87b0de4be1 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Thu, 19 Jan 2012 16:18:24 +0100
-Subject: [PATCH] Do not return value in void function
-
----
- test/regress_dns.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/test/regress_dns.c b/test/regress_dns.c
-index b2ca47c..24eb6b7 100644
---- a/test/regress_dns.c
-+++ b/test/regress_dns.c
-@@ -1665,7 +1665,8 @@ static void
- cnt_free(void *ptr)
- {
- 	allocated_chunks -= 1;
--	return free(ptr);
-+	free(ptr);
-+        return;
- }
- 
- struct testleak_env_t {
--- 
-1.7.8.3
-

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