[Midnightbsd-cvs] mports [19502] trunk/devel: remove old libevent.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Jun 21 11:22:25 EDT 2015


Revision: 19502
          http://svnweb.midnightbsd.org/mports/?rev=19502
Author:   laffer1
Date:     2015-06-21 11:22:25 -0400 (Sun, 21 Jun 2015)
Log Message:
-----------
remove old libevent. it is out of date and insecure. update libevent2 to 2.0.22 which includes a security patch

Modified Paths:
--------------
    trunk/devel/Makefile
    trunk/devel/libevent2/Makefile
    trunk/devel/libevent2/distinfo
    trunk/devel/libevent2/pkg-descr
    trunk/devel/libevent2/pkg-plist

Removed Paths:
-------------
    trunk/devel/libevent/
    trunk/devel/libevent2/files/

Modified: trunk/devel/Makefile
===================================================================
--- trunk/devel/Makefile	2015-06-21 15:18:35 UTC (rev 19501)
+++ trunk/devel/Makefile	2015-06-21 15:22:25 UTC (rev 19502)
@@ -140,7 +140,6 @@
 SUBDIR += libdbusmenu-qt
 SUBDIR += libdlna
 SUBDIR += libev
-SUBDIR += libevent
 SUBDIR += libevent2
 SUBDIR += libexecinfo
 SUBDIR += libffi

Modified: trunk/devel/libevent2/Makefile
===================================================================
--- trunk/devel/libevent2/Makefile	2015-06-21 15:18:35 UTC (rev 19501)
+++ trunk/devel/libevent2/Makefile	2015-06-21 15:22:25 UTC (rev 19502)
@@ -1,11 +1,11 @@
 # $MidnightBSD$
 
 PORTNAME=	libevent2
-PORTVERSION=	2.0.21
+PORTVERSION=	2.0.22
+DISTVERSIONPREFIX=	release-
+DISTVERSIONSUFFIX=	-stable
 PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://cloud.github.com/downloads/libevent/libevent/
-DISTNAME=	${PORTNAME:S/2//}-${DISTVERSION}-stable
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	API for executing callback functions on events or timeouts
@@ -13,40 +13,34 @@
 LICENSE=	bsd3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	${GH_PROJECT}
+GH_PROJECT=	${PORTNAME:S/2$//}
+WRKSRC=		${WRKDIR}/libevent-release-${PORTVERSION}-stable
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
-USE_LDCONFIG=	${PREFIX}/lib/event2
+USES=		autoreconf libtool pathfix
+PATHFIX_MAKEFILEIN=Makefile.am
+USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	OPENSSL THREADS
 OPTIONS_DEFAULT=	OPENSSL THREADS
+OPTIONS_SUB=	yes
+INSTALL_TARGET=	install-strip
 
-CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/event2
+OPENSSL_USE=	openssl=yes
+OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
+OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
+OPENSSL_CONFIGURE_ENABLE=	openssl
 
-.include <bsd.mport.options.mk>
+THREADS_CONFIGURE_ENABLE=	thread-support
 
-.if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=	yes
-CPPFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB}
-PLIST_SUB+=		OPENSSL=""
-.else
-CONFIGURE_ARGS+=	--disable-openssl
-PLIST_SUB+=		OPENSSL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTHREADS}
-PLIST_SUB+=		THREADS=""
-.else
-CONFIGURE_ARGS+=	--disable-thread-support
-PLIST_SUB+=		THREADS="@comment "
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -E \
-		-e "s,^pkgconfigdir =.*,pkgconfigdir = \$$(prefix)/libdata/pkgconfig,g" \
-		${WRKSRC}/Makefile.in
+	${ECHO_CMD} 'AC_CONFIG_MACRO_DIR([m4])' >>${WRKSRC}/configure.in
+# error: using '$(top_srcdir)' in TESTS is currently broken
+	${REINPLACE_CMD} 's/^TESTS.*top_srcdir/#&/' ${WRKSRC}/test/Makefile.am
 
-post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/event_rpcgen.py ${PREFIX}/bin/event2_rpcgen.py
+regression-test: build
+	@(${SH} ${WRKSRC}/test/regress)
 
 .include <bsd.port.mk>

Modified: trunk/devel/libevent2/distinfo
===================================================================
--- trunk/devel/libevent2/distinfo	2015-06-21 15:18:35 UTC (rev 19501)
+++ trunk/devel/libevent2/distinfo	2015-06-21 15:22:25 UTC (rev 19502)
@@ -1,2 +1,2 @@
-SHA256 (libevent-2.0.21-stable.tar.gz) = 22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5
-SIZE (libevent-2.0.21-stable.tar.gz) = 850772
+SHA256 (libevent2-release-2.0.22-stable_GH0.tar.gz) = ab89639b0819befb1d8b293d52047c6955f8d1c9150c2b22a0e6247930eb9128
+SIZE (libevent2-release-2.0.22-stable_GH0.tar.gz) = 512657

Modified: trunk/devel/libevent2/pkg-descr
===================================================================
--- trunk/devel/libevent2/pkg-descr	2015-06-21 15:18:35 UTC (rev 19501)
+++ trunk/devel/libevent2/pkg-descr	2015-06-21 15:22:25 UTC (rev 19502)
@@ -15,4 +15,4 @@
 scalable event notification mechanism available on an operating system.
 Libevent can also be used for multi-threaded applications.
 
-WWW: http://www.monkey.org/~provos/libevent/
+WWW: http://libevent.org/

Modified: trunk/devel/libevent2/pkg-plist
===================================================================
--- trunk/devel/libevent2/pkg-plist	2015-06-21 15:18:35 UTC (rev 19501)
+++ trunk/devel/libevent2/pkg-plist	2015-06-21 15:22:25 UTC (rev 19502)
@@ -1,62 +1,54 @@
-bin/event2_rpcgen.py
-include/event2/compat/evdns.h
-include/event2/compat/event.h
-include/event2/compat/evhttp.h
-include/event2/compat/evrpc.h
-include/event2/compat/evutil.h
-include/event2/keyvalq_struct.h
-include/event2/util.h
+bin/event_rpcgen.py
+include/evdns.h
+include/event.h
+include/event2/buffer.h
+include/event2/buffer_compat.h
+include/event2/bufferevent.h
+include/event2/bufferevent_compat.h
+include/event2/bufferevent_ssl.h
+include/event2/bufferevent_struct.h
+include/event2/dns.h
+include/event2/dns_compat.h
+include/event2/dns_struct.h
 include/event2/event-config.h
 include/event2/event.h
-include/event2/http_struct.h
-include/event2/dns_compat.h
-include/event2/thread.h
-include/event2/rpc_struct.h
-include/event2/tag_compat.h
-include/event2/bufferevent_compat.h
-include/event2/rpc.h
-include/event2/bufferevent.h
+include/event2/event_compat.h
 include/event2/event_struct.h
-include/event2/tag.h
-include/event2/listener.h
-include/event2/bufferevent_ssl.h
 include/event2/http.h
-include/event2/buffer_compat.h
 include/event2/http_compat.h
-include/event2/dns.h
-include/event2/buffer.h
+include/event2/http_struct.h
+include/event2/keyvalq_struct.h
+include/event2/listener.h
+include/event2/rpc.h
 include/event2/rpc_compat.h
-include/event2/dns_struct.h
-include/event2/event_compat.h
-include/event2/bufferevent_struct.h
-lib/event2/libevent-2.0.so
-lib/event2/libevent-2.0.so.6
-lib/event2/libevent_core-2.0.so
-lib/event2/libevent_core-2.0.so.6
-lib/event2/libevent_core.a
-lib/event2/libevent_core.la
-lib/event2/libevent_core.so
-lib/event2/libevent_extra-2.0.so
-lib/event2/libevent_extra-2.0.so.6
-lib/event2/libevent_extra.a
-lib/event2/libevent_extra.la
-lib/event2/libevent_extra.so
-%%THREADS%%lib/event2/libevent_pthreads-2.0.so
-%%THREADS%%lib/event2/libevent_pthreads-2.0.so.6
-%%THREADS%%lib/event2/libevent_pthreads.a
-%%THREADS%%lib/event2/libevent_pthreads.la
-%%THREADS%%lib/event2/libevent_pthreads.so
-%%OPENSSL%%lib/event2/libevent_openssl-2.0.so
-%%OPENSSL%%lib/event2/libevent_openssl-2.0.so.6
-%%OPENSSL%%lib/event2/libevent_openssl.a
-%%OPENSSL%%lib/event2/libevent_openssl.la
-%%OPENSSL%%lib/event2/libevent_openssl.so
-lib/event2/libevent.a
-lib/event2/libevent.la
-lib/event2/libevent.so
+include/event2/rpc_struct.h
+include/event2/tag.h
+include/event2/tag_compat.h
+include/event2/thread.h
+include/event2/util.h
+include/evhttp.h
+include/evrpc.h
+include/evutil.h
+lib/libevent-2.0.so.5
+lib/libevent-2.0.so.5.1.10
+lib/libevent.a
+lib/libevent.so
+lib/libevent_core-2.0.so.5
+lib/libevent_core-2.0.so.5.1.10
+lib/libevent_core.a
+lib/libevent_core.so
+lib/libevent_extra-2.0.so.5
+lib/libevent_extra-2.0.so.5.1.10
+lib/libevent_extra.a
+lib/libevent_extra.so
+%%OPENSSL%%lib/libevent_openssl-2.0.so.5
+%%OPENSSL%%lib/libevent_openssl-2.0.so.5.1.10
+%%OPENSSL%%lib/libevent_openssl.a
+%%OPENSSL%%lib/libevent_openssl.so
+%%THREADS%%lib/libevent_pthreads-2.0.so.5
+%%THREADS%%lib/libevent_pthreads-2.0.so.5.1.10
+%%THREADS%%lib/libevent_pthreads.a
+%%THREADS%%lib/libevent_pthreads.so
 libdata/pkgconfig/libevent.pc
+%%OPENSSL%%libdata/pkgconfig/libevent_openssl.pc
 %%THREADS%%libdata/pkgconfig/libevent_pthreads.pc
-%%OPENSSL%%libdata/pkgconfig/libevent_openssl.pc
- at dirrm lib/event2
- at dirrm include/event2/compat
- at dirrm include/event2



More information about the Midnightbsd-cvs mailing list