From owner-svn-ports-branches@freebsd.org Tue Jul 5 18:24:51 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 60FFBB20152; Tue, 5 Jul 2016 18:24:51 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 38B471968; Tue, 5 Jul 2016 18:24:51 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u65IOohu090777; Tue, 5 Jul 2016 18:24:50 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u65IOoAg090773; Tue, 5 Jul 2016 18:24:50 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201607051824.u65IOoAg090773@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Tue, 5 Jul 2016 18:24:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418100 - in branches/2016Q3/net: asterisk asterisk11 asterisk13 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2016 18:24:51 -0000 Author: madpilot Date: Tue Jul 5 18:24:49 2016 New Revision: 418100 URL: https://svnweb.freebsd.org/changeset/ports/418100 Log: MFH: r418081 - Convert to USES=ssl, reflow USES line - Add missing USES libedit (asterisk13 only) - Fix DAHDI dependencies - Fix permissions for /var/spool/asterisk/voicemail files [1] Reported by: Tony Power [1] (via email) Approved by: ports-secteam (junovitch) Modified: branches/2016Q3/net/asterisk/Makefile branches/2016Q3/net/asterisk11/Makefile branches/2016Q3/net/asterisk13/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/net/asterisk/Makefile ============================================================================== --- branches/2016Q3/net/asterisk/Makefile Tue Jul 5 17:59:18 2016 (r418099) +++ branches/2016Q3/net/asterisk/Makefile Tue Jul 5 18:24:49 2016 (r418100) @@ -3,7 +3,7 @@ PORTNAME= asterisk PORTVERSION= 1.8.32.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ @@ -25,11 +25,10 @@ EXPIRATION_DATE= 2016-04-30 ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 -USES= alias bison cpe gmake shebangfix +USES= alias bison cpe gmake shebangfix ssl USE_CSTD= gnu89 USE_GCC= yes USE_GNOME= libxml2 -USE_OPENSSL= yes USE_RC_SUBR= asterisk GNU_CONFIGURE= yes @@ -112,10 +111,9 @@ CURL_LIB_DEPENDS= libcurl.so:ftp/curl DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 -DAHDI_BUILD_DEPENDS= libpri>=1.4.10:misc/libpri \ - ${LOCALBASE}/include/dahdi/user.h:misc/dahdi DAHDI_LIB_DEPENDS= libpri.so:misc/libpri \ - libopenr2.so:misc/openr2 + libopenr2.so:misc/openr2 \ + libtonezone.so:misc/dahdi EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:www/neon @@ -255,7 +253,11 @@ post-install: ${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} (cd ${STAGEDIR} && \ + ${ECHO} "@owner ${ASTERISK_USER}" >> ${TMPPLIST} && \ + ${ECHO} "@group ${ASTERISK_GROUP}" >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \ - ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST}); + ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST} && \ + ${ECHO} "@owner" >> ${TMPPLIST} && \ + ${ECHO} "@group" >> ${TMPPLIST}); .include Modified: branches/2016Q3/net/asterisk11/Makefile ============================================================================== --- branches/2016Q3/net/asterisk11/Makefile Tue Jul 5 17:59:18 2016 (r418099) +++ branches/2016Q3/net/asterisk11/Makefile Tue Jul 5 18:24:49 2016 (r418100) @@ -2,7 +2,7 @@ PORTNAME= asterisk PORTVERSION= 11.22.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ @@ -21,11 +21,11 @@ EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 armv6 -USES= bison cpe gmake iconv localbase ncurses shebangfix sqlite +USES= bison cpe gmake iconv localbase ncurses shebangfix \ + sqlite ssl USE_CSTD= gnu89 USE_GNOME= libxml2 USE_LDCONFIG= yes -USE_OPENSSL= yes USE_RC_SUBR= asterisk GNU_CONFIGURE= yes @@ -118,10 +118,9 @@ CURL_LIB_DEPENDS= libcurl.so:ftp/curl DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 -DAHDI_BUILD_DEPENDS= libpri>=1.4.10:misc/libpri \ - ${LOCALBASE}/include/dahdi/user.h:misc/dahdi DAHDI_LIB_DEPENDS= libpri.so:misc/libpri \ - libopenr2.so:misc/openr2 + libopenr2.so:misc/openr2 \ + libtonezone.so:misc/dahdi EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:www/neon @@ -266,7 +265,11 @@ post-install: ${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} (cd ${STAGEDIR} && \ + ${ECHO} "@owner ${ASTERISK_USER}" >> ${TMPPLIST} && \ + ${ECHO} "@group ${ASTERISK_GROUP}" >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \ - ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST}); + ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST} && \ + ${ECHO} "@owner" >> ${TMPPLIST} && \ + ${ECHO} "@group" >> ${TMPPLIST}); .include Modified: branches/2016Q3/net/asterisk13/Makefile ============================================================================== --- branches/2016Q3/net/asterisk13/Makefile Tue Jul 5 17:59:18 2016 (r418099) +++ branches/2016Q3/net/asterisk13/Makefile Tue Jul 5 18:24:49 2016 (r418100) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.9.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ @@ -23,11 +24,11 @@ EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 armv6 -USES= bison cpe gmake iconv localbase ncurses shebangfix sqlite +USES= bison cpe gmake iconv libedit localbase ncurses \ + shebangfix sqlite ssl USE_CSTD= gnu89 USE_GNOME= libxml2 USE_LDCONFIG= yes -USE_OPENSSL= yes USE_RC_SUBR= asterisk GNU_CONFIGURE= yes @@ -124,10 +125,9 @@ CURL_LIB_DEPENDS= libcurl.so:ftp/curl DAHDI_CONFIGURE_ON= --with-dahdi --with-openr2 DAHDI_CONFIGURE_OFF= --without-dahdi --without-openr2 -DAHDI_BUILD_DEPENDS= libpri>=1.4.10:misc/libpri \ - ${LOCALBASE}/include/dahdi/user.h:misc/dahdi DAHDI_LIB_DEPENDS= libpri.so:misc/libpri \ - libopenr2.so:misc/openr2 + libopenr2.so:misc/openr2 \ + libtonezone.so:misc/dahdi EXCHANGE_CONFIGURE_OFF= --without-neon --without-neon29 EXCHANGE_LIB_DEPENDS= libneon.so:www/neon @@ -285,7 +285,11 @@ post-install: ${FIND} ${STAGEDIR}${DATADIR}/moh -type f | ${SED} "s,^${STAGEDIR}${DATADIR},${DATADIR}," >> ${TMPPLIST} (cd ${STAGEDIR} && \ + ${ECHO} "@owner ${ASTERISK_USER}" >> ${TMPPLIST} && \ + ${ECHO} "@group ${ASTERISK_GROUP}" >> ${TMPPLIST} && \ ${FIND} var/spool/${PORTNAME}/voicemail/default -type f | ${SED} "s,^,/," >> ${TMPPLIST} && \ - ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST}); + ${FIND} var/spool/${PORTNAME}/voicemail/ -type d | ${SED} "s,^,@dir /," >> ${TMPPLIST} && \ + ${ECHO} "@owner" >> ${TMPPLIST} && \ + ${ECHO} "@group" >> ${TMPPLIST}); .include