CVS commit: pkgsrc/devel

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 15 Feb 2017 17:34:37 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Feb 15 17:34:37 UTC 2017

Modified Files:
        pkgsrc/devel/libevent: Makefile Makefile.common PLIST buildlink3.mk
            distinfo
        pkgsrc/devel/libevent/patches: patch-Makefile.in patch-evutil__rand.c
        pkgsrc/devel/py-libevent-rpcgen: Makefile
Removed Files:
        pkgsrc/devel/libevent/patches: patch-Makefile.am

Log Message:
Libevent 2.1.8-stable, it contains openssl fixes for resetting fd and using
bufferevent_openssl_filter_new(). vagrant fixes, some build fixes, increased
timeout for some tests (to reduce number of failures due to timing issues),
date in RFC1123 format and running tests in parallel.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/libevent/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libevent/Makefile.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/libevent/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/libevent/buildlink3.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/devel/libevent/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/devel/libevent/patches/patch-Makefile.am
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libevent/patches/patch-Makefile.in
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libevent/patches/patch-evutil__rand.c
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-libevent-rpcgen/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libevent/Makefile
diff -u pkgsrc/devel/libevent/Makefile:1.50 pkgsrc/devel/libevent/Makefile:1.51
--- pkgsrc/devel/libevent/Makefile:1.50 Sat Mar  5 11:27:45 2016
+++ pkgsrc/devel/libevent/Makefile      Wed Feb 15 17:34:37 2017
@@ -1,26 +1,22 @@
-# $NetBSD: Makefile,v 1.50 2016/03/05 11:27:45 jperkin Exp $
+# $NetBSD: Makefile,v 1.51 2017/02/15 17:34:37 adam Exp $
 
-PKGREVISION= 1
 .include "../../devel/libevent/Makefile.common"
 
-PKGNAME=       libevent-${LIBEVENT_VERSION}
-CATEGORIES=    devel
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://libevent.org/
+PKGNAME=       ${DISTNAME:S/-stable//}
 COMMENT=       Asynchronous event notification library
-LICENSE=       modified-bsd
 
 CONFLICTS+=    libev<3.9nb1
 
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
+PKGCONFIG_OVERRIDE+=   libevent_core.pc.in
+PKGCONFIG_OVERRIDE+=   libevent_extra.pc.in
 PKGCONFIG_OVERRIDE+=   libevent_openssl.pc.in
 PKGCONFIG_OVERRIDE+=   libevent_pthreads.pc.in
 PKGCONFIG_OVERRIDE+=   libevent.pc.in
 TEST_TARGET=           verify
 
-LIBS.SunOS+=   -lnsl -lresolv
+LIBS.SunOS+=           -lnsl -lresolv
 CPPFLAGS.SunOS+=       -D__EXTENSIONS__
 
 # XXX helps build, but needs more testing

Index: pkgsrc/devel/libevent/Makefile.common
diff -u pkgsrc/devel/libevent/Makefile.common:1.2 pkgsrc/devel/libevent/Makefile.common:1.3
--- pkgsrc/devel/libevent/Makefile.common:1.2   Wed Feb  4 08:04:34 2015
+++ pkgsrc/devel/libevent/Makefile.common       Wed Feb 15 17:34:37 2017
@@ -1,9 +1,18 @@
-# $NetBSD: Makefile.common,v 1.2 2015/02/04 08:04:34 spz Exp $
-
+# $NetBSD: Makefile.common,v 1.3 2017/02/15 17:34:37 adam Exp $
+#
 # used by devel/libevent/Makefile
 # used by devel/py-libevent-rpcgen/Makefile
 
-LIBEVENT_VERSION=      2.0.22
+DISTNAME=      libevent-2.1.8-stable
+CATEGORIES=    devel
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=libevent/}
+
+MAINTAINER?=   pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://libevent.org/
+LICENSE=       modified-bsd
+
+GITHUB_PROJECT=        libevent
+GITHUB_RELEASE=        release-${PKGVERSION_NOREV}-stable
 
-DISTNAME=              libevent-${LIBEVENT_VERSION}-stable
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=levent/}
+DISTINFO_FILE= ${.CURDIR}/../../devel/libevent/distinfo
+PATCHDIR=      ${.CURDIR}/../../devel/libevent/patches

Index: pkgsrc/devel/libevent/PLIST
diff -u pkgsrc/devel/libevent/PLIST:1.7 pkgsrc/devel/libevent/PLIST:1.8
--- pkgsrc/devel/libevent/PLIST:1.7     Fri May 10 01:22:27 2013
+++ pkgsrc/devel/libevent/PLIST Wed Feb 15 17:34:37 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2013/05/10 01:22:27 riastradh Exp $
+@comment $NetBSD: PLIST,v 1.8 2017/02/15 17:34:37 adam Exp $
 include/evdns.h
 include/event.h
 include/event2/buffer.h
@@ -26,6 +26,7 @@ include/event2/tag.h
 include/event2/tag_compat.h
 include/event2/thread.h
 include/event2/util.h
+include/event2/visibility.h
 include/evhttp.h
 include/evrpc.h
 include/evutil.h
@@ -35,5 +36,7 @@ lib/libevent_extra.la
 lib/libevent_openssl.la
 lib/libevent_pthreads.la
 lib/pkgconfig/libevent.pc
+lib/pkgconfig/libevent_core.pc
+lib/pkgconfig/libevent_extra.pc
 lib/pkgconfig/libevent_openssl.pc
 lib/pkgconfig/libevent_pthreads.pc

Index: pkgsrc/devel/libevent/buildlink3.mk
diff -u pkgsrc/devel/libevent/buildlink3.mk:1.23 pkgsrc/devel/libevent/buildlink3.mk:1.24
--- pkgsrc/devel/libevent/buildlink3.mk:1.23    Sat Mar  5 11:27:45 2016
+++ pkgsrc/devel/libevent/buildlink3.mk Wed Feb 15 17:34:37 2017
@@ -1,14 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.23 2016/03/05 11:27:45 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2017/02/15 17:34:37 adam Exp $
 
 BUILDLINK_TREE+=       libevent
 
 .if !defined(LIBEVENT_BUILDLINK3_MK)
 LIBEVENT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libevent+=libevent>=0.6
-BUILDLINK_ABI_DEPENDS.libevent+=libevent>=2.0.10
-BUILDLINK_ABI_DEPENDS.libevent?=       libevent>=2.0.22nb1
-BUILDLINK_PKGSRCDIR.libevent?= ../../devel/libevent
+BUILDLINK_API_DEPENDS.libevent+=       libevent>=0.6
+BUILDLINK_ABI_DEPENDS.libevent+=       libevent>=2.0.22nb1
+BUILDLINK_PKGSRCDIR.libevent?=         ../../devel/libevent
 
 .include "../../security/openssl/buildlink3.mk"
 .endif # LIBEVENT_BUILDLINK3_MK

Index: pkgsrc/devel/libevent/distinfo
diff -u pkgsrc/devel/libevent/distinfo:1.32 pkgsrc/devel/libevent/distinfo:1.33
--- pkgsrc/devel/libevent/distinfo:1.32 Tue Nov  3 03:27:40 2015
+++ pkgsrc/devel/libevent/distinfo      Wed Feb 15 17:34:37 2017
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.32 2015/11/03 03:27:40 agc Exp $
+$NetBSD: distinfo,v 1.33 2017/02/15 17:34:37 adam Exp $
 
-SHA1 (libevent-2.0.22-stable.tar.gz) = a586882bc93a208318c70fc7077ed8fca9862864
-RMD160 (libevent-2.0.22-stable.tar.gz) = 6a7e8e3ebcfd2227fa807a604b5c773c90c8b8cc
-SHA512 (libevent-2.0.22-stable.tar.gz) = 990637f12e890bfa7f86c194c8b112701436e92b60afb829194879efb85d558b986261e6508fe29bde73981feada874438e2d442cec8ea5730c889954f9bc907
-Size (libevent-2.0.22-stable.tar.gz) = 854987 bytes
-SHA1 (patch-Makefile.am) = 4bada3e2ddb6cff34edf92abbe22e5d9a64b8ee8
-SHA1 (patch-Makefile.in) = 8fcd6f893c3c967599fa4f528953e449e85ac8f0
-SHA1 (patch-evutil__rand.c) = e8e0bbccd27ccbb7a9cf077352a8c56a35e87b47
+SHA1 (libevent-2.1.8-stable.tar.gz) = 2a1b8bb7a262d3fd0ed6a080a20991a6eed675ec
+RMD160 (libevent-2.1.8-stable.tar.gz) = 6c7ce8cb51279f9b6b8d8897192db6a2da3d6797
+SHA512 (libevent-2.1.8-stable.tar.gz) = a2fd3dd111e73634e4aeb1b29d06e420b15c024d7b47778883b5f8a4ff320b5057a8164c6d50b53bd196c79d572ce2639fe6265e03a93304b09c22b41e4c2a17
+Size (libevent-2.1.8-stable.tar.gz) = 1026485 bytes
+SHA1 (patch-Makefile.in) = 09c7524eb8657e1f76232db97273806a8c900219
+SHA1 (patch-evutil__rand.c) = 28f7e540e85d1e13f7ca71b2dff22eafb1a804b1

Index: pkgsrc/devel/libevent/patches/patch-Makefile.in
diff -u pkgsrc/devel/libevent/patches/patch-Makefile.in:1.2 pkgsrc/devel/libevent/patches/patch-Makefile.in:1.3
--- pkgsrc/devel/libevent/patches/patch-Makefile.in:1.2 Tue Oct 13 14:21:13 2015
+++ pkgsrc/devel/libevent/patches/patch-Makefile.in     Wed Feb 15 17:34:37 2017
@@ -1,24 +1,15 @@
-$NetBSD: patch-Makefile.in,v 1.2 2015/10/13 14:21:13 jperkin Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2017/02/15 17:34:37 adam Exp $
 
 Don't install event_rpcgen.py.
 
---- Makefile.in.orig   2015-01-05 14:31:14.000000000 +0000
+--- Makefile.in.orig   2017-01-29 18:41:28.000000000 +0000
 +++ Makefile.in
-@@ -210,7 +210,7 @@ libevent_pthreads_la_LINK = $(LIBTOOL) -
- @INSTALL_LIBEVENT_FALSE@@PTHREADS_TRUE@am_libevent_pthreads_la_rpath =
- @INSTALL_LIBEVENT_TRUE@@PTHREADS_TRUE@am_libevent_pthreads_la_rpath =  \
- @INSTALL_LIBEVENT_TRUE@@PTHREADS_TRUE@        -rpath $(libdir)
--am__dist_bin_SCRIPTS_DIST = event_rpcgen.py
-+am__dist_bin_SCRIPTS_DIST = 
- SCRIPTS = $(dist_bin_SCRIPTS)
- DEFAULT_INCLUDES = -I.@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -511,7 +511,7 @@ VERSION_INFO = 6:9:1
+@@ -1003,7 +1003,7 @@ VERSION_INFO = 6:2:0
  # nice and rare.  For the next couple of years, though, 'struct event'
  # is user-visible, and so we can pretty much guarantee that release
  # series won't be binary-compatible.
 -@INSTALL_LIBEVENT_TRUE@dist_bin_SCRIPTS = event_rpcgen.py
-+@INSTALL_LIBEVENT_TRUE@dist_bin_SCRIPTS = 
++@INSTALL_LIBEVENT_TRUE@dist_bin_SCRIPTS =
  pkgconfigdir = $(libdir)/pkgconfig
- LIBEVENT_PKGCONFIG = libevent.pc $(am__append_2) $(am__append_4)
- 
+ LIBEVENT_PKGCONFIG = libevent.pc libevent_core.pc libevent_extra.pc \
+       $(am__append_2) $(am__append_4)

Index: pkgsrc/devel/libevent/patches/patch-evutil__rand.c
diff -u pkgsrc/devel/libevent/patches/patch-evutil__rand.c:1.1 pkgsrc/devel/libevent/patches/patch-evutil__rand.c:1.2
--- pkgsrc/devel/libevent/patches/patch-evutil__rand.c:1.1      Tue Oct 13 14:21:13 2015
+++ pkgsrc/devel/libevent/patches/patch-evutil__rand.c  Wed Feb 15 17:34:37 2017
@@ -1,11 +1,11 @@
-$NetBSD: patch-evutil__rand.c,v 1.1 2015/10/13 14:21:13 jperkin Exp $
+$NetBSD: patch-evutil__rand.c,v 1.2 2017/02/15 17:34:37 adam Exp $
 
 Native illumos arc4random(3C) imported the latest OpenBSD API which
 does not have arc4random_addrandom().
 
 --- evutil_rand.c.orig 2013-11-01 18:18:57.000000000 +0000
 +++ evutil_rand.c
-@@ -174,7 +174,9 @@ evutil_secure_rng_get_bytes(void *buf, s
+@@ -195,7 +195,9 @@ evutil_secure_rng_get_bytes(void *buf, s
  void
  evutil_secure_rng_add_bytes(const char *buf, size_t n)
  {

Index: pkgsrc/devel/py-libevent-rpcgen/Makefile
diff -u pkgsrc/devel/py-libevent-rpcgen/Makefile:1.4 pkgsrc/devel/py-libevent-rpcgen/Makefile:1.5
--- pkgsrc/devel/py-libevent-rpcgen/Makefile:1.4        Fri May 10 04:13:51 2013
+++ pkgsrc/devel/py-libevent-rpcgen/Makefile    Wed Feb 15 17:34:37 2017
@@ -1,21 +1,18 @@
-# $NetBSD: Makefile,v 1.4 2013/05/10 04:13:51 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2017/02/15 17:34:37 adam Exp $
 
 .include "../../devel/libevent/Makefile.common"
 
-PKGNAME=       py-libevent-rpcgen-${LIBEVENT_VERSION}
-CATEGORIES=    devel
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://libevent.org/
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/libevent/libevent-rpcgen/:S/-stable//}
 COMMENT=       Python libevent rpcgen script
-LICENSE=       modified-bsd
+
+NO_BUILD=              yes
+INSTALLATION_DIRS+=    bin
 
 REPLACE_PYTHON=                event_rpcgen.py
 
-INSTALLATION_DIRS+=    bin
+PYTHON_VERSIONS_ACCEPTED=      27
 
 do-configure:
-do-build:
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/event_rpcgen.py ${DESTDIR}${PREFIX}/bin

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel/py-libevent-rpcgen
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/devel/py-libevent-rpcgen
Indexes:

Home | Main Index | Thread Index | Old Index