From owner-svn-ports-branches@freebsd.org Sun Jul 19 04:31:22 2015 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 917239A5F7C; Sun, 19 Jul 2015 04:31:22 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 759791A74; Sun, 19 Jul 2015 04:31:22 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6J4VMRv056732; Sun, 19 Jul 2015 04:31:22 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6J4VKqE056726; Sun, 19 Jul 2015 04:31:20 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201507190431.t6J4VKqE056726@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sun, 19 Jul 2015 04:31:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392483 - branches/2015Q3/devel/p4 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.20 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: Sun, 19 Jul 2015 04:31:22 -0000 Author: gordon Date: Sun Jul 19 04:31:19 2015 New Revision: 392483 URL: https://svnweb.freebsd.org/changeset/ports/392483 Log: MFH: r392478 Update to devel/p4 2015.1/1126382 to fix broken port. Migrate common variable for the devel/p4* ports into the Makefile.inc. PR: 201216 Differential Revision: https://reviews.freebsd.org/D3088 Approved by: mat (mentor) Approved by: ports-secteam (feld) Modified: branches/2015Q3/devel/p4/Makefile branches/2015Q3/devel/p4/Makefile.inc branches/2015Q3/devel/p4/distinfo.freebsd100x86 branches/2015Q3/devel/p4/distinfo.freebsd100x86_64 branches/2015Q3/devel/p4/distinfo.freebsd70x86 branches/2015Q3/devel/p4/distinfo.freebsd70x86_64 Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/p4/Makefile ============================================================================== --- branches/2015Q3/devel/p4/Makefile Sun Jul 19 02:23:01 2015 (r392482) +++ branches/2015Q3/devel/p4/Makefile Sun Jul 19 04:31:19 2015 (r392483) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4 -PORTVERSION= 2014.2.1045032 +PORTVERSION= 2015.1.1126382 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ @@ -13,14 +13,6 @@ EXTRACT_ONLY= # none MAINTAINER= gordon@FreeBSD.org COMMENT= Perforce client -BROKEN= checksum mismatch - -ONLY_FOR_ARCHS= amd64 i386 - -P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} -DIST_SUBDIR= perforce/${PORTVERSION}/bin.${PLATFORM} -DISTINFO_FILE= ${MASTERDIR}/distinfo.${PLATFORM} - RESTRICTED= Restricted distribution NO_BUILD= yes Modified: branches/2015Q3/devel/p4/Makefile.inc ============================================================================== --- branches/2015Q3/devel/p4/Makefile.inc Sun Jul 19 02:23:01 2015 (r392482) +++ branches/2015Q3/devel/p4/Makefile.inc Sun Jul 19 04:31:19 2015 (r392483) @@ -1,6 +1,8 @@ # Figure out what to install .if ${OPSYS} == FreeBSD +ONLY_FOR_ARCHS?= amd64 i386 + .if ${ARCH} == amd64 . if ${OSVERSION} >= 1000100 PLATFORM= freebsd100x86_64 @@ -22,3 +24,7 @@ IGNORE= unsupported OS release, sorry .else IGNORE= ${OPSYS} is unsupported, sorry .endif + +P4VERSION?= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} +DIST_SUBDIR?= perforce/${PORTVERSION}/bin.${PLATFORM} +DISTINFO_FILE?= ${MASTERDIR}/distinfo.${PLATFORM} Modified: branches/2015Q3/devel/p4/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q3/devel/p4/distinfo.freebsd100x86 Sun Jul 19 02:23:01 2015 (r392482) +++ branches/2015Q3/devel/p4/distinfo.freebsd100x86 Sun Jul 19 04:31:19 2015 (r392483) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1045032/bin.freebsd100x86/p4) = 1261bacd887cb09bcf79004a427784e3428ebef8ef7f8cd527e8f446feb3efb4 -SIZE (perforce/2014.2.1045032/bin.freebsd100x86/p4) = 2474416 +SHA256 (perforce/2015.1.1126382/bin.freebsd100x86/p4) = 4ac2ca86a68a355a0920e28a7ed41db4b8a6d7f2e0390069625665cf009cfad9 +SIZE (perforce/2015.1.1126382/bin.freebsd100x86/p4) = 2562660 Modified: branches/2015Q3/devel/p4/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q3/devel/p4/distinfo.freebsd100x86_64 Sun Jul 19 02:23:01 2015 (r392482) +++ branches/2015Q3/devel/p4/distinfo.freebsd100x86_64 Sun Jul 19 04:31:19 2015 (r392483) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1045032/bin.freebsd100x86_64/p4) = 676c424b485e90817e63592fc5f14ea151b489128078053989f2e85080d485c2 -SIZE (perforce/2014.2.1045032/bin.freebsd100x86_64/p4) = 2732720 +SHA256 (perforce/2015.1.1126382/bin.freebsd100x86_64/p4) = 77a102169d95b2f3f18039be0787a7373c71551358322a7ae35674f4991804c6 +SIZE (perforce/2015.1.1126382/bin.freebsd100x86_64/p4) = 2815472 Modified: branches/2015Q3/devel/p4/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q3/devel/p4/distinfo.freebsd70x86 Sun Jul 19 02:23:01 2015 (r392482) +++ branches/2015Q3/devel/p4/distinfo.freebsd70x86 Sun Jul 19 04:31:19 2015 (r392483) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1045032/bin.freebsd70x86/p4) = 0c48532af152ba9ef187fd3a098ec0be0c5f8b9312becea4a27fe63ddec427ac -SIZE (perforce/2014.2.1045032/bin.freebsd70x86/p4) = 2555504 +SHA256 (perforce/2015.1.1126382/bin.freebsd70x86/p4) = e0e5d3bd20246c03e7b3b9244701546b2e5dc9fa109bdc17dbf155b058ee95bc +SIZE (perforce/2015.1.1126382/bin.freebsd70x86/p4) = 2634304 Modified: branches/2015Q3/devel/p4/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q3/devel/p4/distinfo.freebsd70x86_64 Sun Jul 19 02:23:01 2015 (r392482) +++ branches/2015Q3/devel/p4/distinfo.freebsd70x86_64 Sun Jul 19 04:31:19 2015 (r392483) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1045032/bin.freebsd70x86_64/p4) = 3fbf5e0203bf4c2bc9b6107c8111c28e9d2f88372f6330fcff32057addf6c069 -SIZE (perforce/2014.2.1045032/bin.freebsd70x86_64/p4) = 2716456 +SHA256 (perforce/2015.1.1126382/bin.freebsd70x86_64/p4) = 648e9ebdd28fa5dfe5ffaa6d344385f49cc3e31641f10ba89a099d4aa199488e +SIZE (perforce/2015.1.1126382/bin.freebsd70x86_64/p4) = 2795160 From owner-svn-ports-branches@freebsd.org Sun Jul 19 04:32:22 2015 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 B2F4C9A5FBC; Sun, 19 Jul 2015 04:32:22 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 A22801BFC; Sun, 19 Jul 2015 04:32:22 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6J4WMd1059402; Sun, 19 Jul 2015 04:32:22 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6J4WKVN059389; Sun, 19 Jul 2015 04:32:20 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201507190432.t6J4WKVN059389@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sun, 19 Jul 2015 04:32:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392484 - in branches/2015Q3/devel/p4d: . files 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.20 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: Sun, 19 Jul 2015 04:32:22 -0000 Author: gordon Date: Sun Jul 19 04:32:19 2015 New Revision: 392484 URL: https://svnweb.freebsd.org/changeset/ports/392484 Log: MFH: r392477 Update devel/p4d to 2015.1/1045032 to fix broken fetch. Remove unneeded exec statements by moving them into the port stage or init script. PR: 198692 Differential Revision: https://reviews.freebsd.org/D3087 Approved by: mat (mentor) Approved by: ports-secteam (feld) Modified: branches/2015Q3/devel/p4d/Makefile branches/2015Q3/devel/p4d/distinfo.freebsd100x86 branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64 branches/2015Q3/devel/p4d/distinfo.freebsd70x86 branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64 branches/2015Q3/devel/p4d/files/p4d.in branches/2015Q3/devel/p4d/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/p4d/Makefile ============================================================================== --- branches/2015Q3/devel/p4d/Makefile Sun Jul 19 04:31:19 2015 (r392483) +++ branches/2015Q3/devel/p4d/Makefile Sun Jul 19 04:32:19 2015 (r392484) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4d -PORTVERSION= 2014.2.1045032 +PORTVERSION= 2015.1.1171507 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ @@ -15,12 +15,6 @@ COMMENT= Perforce server RUN_DEPENDS= p4:${PORTSDIR}/devel/p4 -ONLY_FOR_ARCHS= amd64 i386 - -P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} -DIST_SUBDIR= perforce/${PORTVERSION}/bin.${PLATFORM} -DISTINFO_FILE= ${MASTERDIR}/distinfo.${PLATFORM} - RESTRICTED= Restricted distribution NO_BUILD= yes @@ -29,6 +23,8 @@ NO_WRKSUBDIR= yes P4ROOT?= /var/db/p4d P4LOG?= /var/log/p4d.log +PLIST_SUB= P4ROOT=${P4ROOT} + SUB_LIST= P4ROOT=${P4ROOT} \ P4LOG=${P4LOG} @@ -43,13 +39,6 @@ GROUPS= p4admin do-install: ${INSTALL_PROGRAM} ${_DISTDIR}/p4d ${STAGEDIR}${PREFIX}/sbin/ - @${MKDIR} ${STAGEDIR}${P4ROOT} - @${ECHO_CMD} "@exec ${MKDIR} ${P4ROOT}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4ROOT}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHMOD} 750 ${P4ROOT}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${RMDIR} ${P4ROOT} 2>/dev/null || true" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${TOUCH} ${P4LOG}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4LOG}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHMOD} 640 ${P4LOG}" >> ${TMPPLIST} + ${MKDIR} ${STAGEDIR}${P4ROOT} .include Modified: branches/2015Q3/devel/p4d/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q3/devel/p4d/distinfo.freebsd100x86 Sun Jul 19 04:31:19 2015 (r392483) +++ branches/2015Q3/devel/p4d/distinfo.freebsd100x86 Sun Jul 19 04:32:19 2015 (r392484) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1045032/bin.freebsd100x86/p4d) = 7be673ffd8099882476d6502e9155d37ed4d55168be6df9f8935b0afefb6d238 -SIZE (perforce/2014.2.1045032/bin.freebsd100x86/p4d) = 4715188 +SHA256 (perforce/2015.1.1171507/bin.freebsd100x86/p4d) = 3dcf9efa82e44d4f10579c53095672ad90db040360ef83ee825a2325183379be +SIZE (perforce/2015.1.1171507/bin.freebsd100x86/p4d) = 5218084 Modified: branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64 Sun Jul 19 04:31:19 2015 (r392483) +++ branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64 Sun Jul 19 04:32:19 2015 (r392484) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1045032/bin.freebsd100x86_64/p4d) = 0c2fcfd58a90ca84d008c011235a731421092503ce73eee9b31d666f6cfc299f -SIZE (perforce/2014.2.1045032/bin.freebsd100x86_64/p4d) = 4878976 +SHA256 (perforce/2015.1.1171507/bin.freebsd100x86_64/p4d) = 6282e55d869cb64398f1203624f58acdbfdedf04311bb960de52aed451f4c38b +SIZE (perforce/2015.1.1171507/bin.freebsd100x86_64/p4d) = 5368544 Modified: branches/2015Q3/devel/p4d/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q3/devel/p4d/distinfo.freebsd70x86 Sun Jul 19 04:31:19 2015 (r392483) +++ branches/2015Q3/devel/p4d/distinfo.freebsd70x86 Sun Jul 19 04:32:19 2015 (r392484) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1045032/bin.freebsd70x86/p4d) = 40d1cb49c1edbe7886e7b18feed1cfbefc7a594271fc6658a806b022f833e1b5 -SIZE (perforce/2014.2.1045032/bin.freebsd70x86/p4d) = 5071328 +SHA256 (perforce/2015.1.1171507/bin.freebsd70x86/p4d) = a9b127101a540ead5192d9ee15eaf8ce5422671dafe36ad1dc2bd01ae217f77a +SIZE (perforce/2015.1.1171507/bin.freebsd70x86/p4d) = 5583296 Modified: branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64 Sun Jul 19 04:31:19 2015 (r392483) +++ branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64 Sun Jul 19 04:32:19 2015 (r392484) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1045032/bin.freebsd70x86_64/p4d) = cf918faed8cca2e02ccc342cf1cf4d7d3dd99b83c8d6b11020ad2033dd5e9c4b -SIZE (perforce/2014.2.1045032/bin.freebsd70x86_64/p4d) = 5243776 +SHA256 (perforce/2015.1.1171507/bin.freebsd70x86_64/p4d) = f2b05148753813c4241441861ed1c89f22810afb476d780081fffef9752820e7 +SIZE (perforce/2015.1.1171507/bin.freebsd70x86_64/p4d) = 5758976 Modified: branches/2015Q3/devel/p4d/files/p4d.in ============================================================================== --- branches/2015Q3/devel/p4d/files/p4d.in Sun Jul 19 04:31:19 2015 (r392483) +++ branches/2015Q3/devel/p4d/files/p4d.in Sun Jul 19 04:32:19 2015 (r392484) @@ -41,5 +41,13 @@ load_rc_config $name command="%%PREFIX%%/sbin/p4d" command_args="-r ${p4d_root} -p ${p4d_port} -v ${p4d_debug} -L ${p4d_log} -d ${p4d_args} > /dev/null 2>&1 &" p4d_user="p4admin" +start_precmd="p4d_prestart" + +p4d_prestart() +{ + if [ ! -f "${p4d_log}" ]; then + install -o p4admin -g p4admin -m 0640 /dev/null ${p4d_log} + fi +} run_rc_command "$1" Modified: branches/2015Q3/devel/p4d/pkg-plist ============================================================================== --- branches/2015Q3/devel/p4d/pkg-plist Sun Jul 19 04:31:19 2015 (r392483) +++ branches/2015Q3/devel/p4d/pkg-plist Sun Jul 19 04:32:19 2015 (r392484) @@ -1 +1,2 @@ sbin/p4d +@dir(p4admin,p4admin,0750) %%P4ROOT%% From owner-svn-ports-branches@freebsd.org Sun Jul 19 04:33:28 2015 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 717439A5FEC; Sun, 19 Jul 2015 04:33:28 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 54F531CE7; Sun, 19 Jul 2015 04:33:28 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6J4XSja059694; Sun, 19 Jul 2015 04:33:28 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6J4XQQM059683; Sun, 19 Jul 2015 04:33:26 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201507190433.t6J4XQQM059683@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sun, 19 Jul 2015 04:33:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392485 - in branches/2015Q3/devel/p4ftpd: . files 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.20 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: Sun, 19 Jul 2015 04:33:28 -0000 Author: gordon Date: Sun Jul 19 04:33:25 2015 New Revision: 392485 URL: https://svnweb.freebsd.org/changeset/ports/392485 Log: MFH: r392479 Update devel/p4ftpd to 2015..1/1024208 fixing broken distfile. Move unneeded execs from the plist into the init script. PR: 198692 Differential Revision: https://reviews.freebsd.org/D3089 Approved by: mat (mentor) Approved by: ports-secteam (feld) Modified: branches/2015Q3/devel/p4ftpd/Makefile branches/2015Q3/devel/p4ftpd/distinfo.freebsd100x86 branches/2015Q3/devel/p4ftpd/distinfo.freebsd100x86_64 branches/2015Q3/devel/p4ftpd/distinfo.freebsd70x86 branches/2015Q3/devel/p4ftpd/distinfo.freebsd70x86_64 branches/2015Q3/devel/p4ftpd/files/p4ftpd.in Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/p4ftpd/Makefile ============================================================================== --- branches/2015Q3/devel/p4ftpd/Makefile Sun Jul 19 04:32:19 2015 (r392484) +++ branches/2015Q3/devel/p4ftpd/Makefile Sun Jul 19 04:33:25 2015 (r392485) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4ftpd -PORTVERSION= 2014.2.962050 +PORTVERSION= 2015.1.1024208 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ @@ -13,12 +13,6 @@ EXTRACT_ONLY= # none MAINTAINER= gordon@FreeBSD.org COMMENT= Perforce server -ONLY_FOR_ARCHS= amd64 i386 - -P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} -DIST_SUBDIR= perforce/${PORTVERSION}/bin.${PLATFORM} -DISTINFO_FILE= ${MASTERDIR}/distinfo.${PLATFORM} - RESTRICTED= Restricted distribution NO_BUILD= yes @@ -39,8 +33,5 @@ GROUPS= p4admin do-install: ${INSTALL_PROGRAM} ${_DISTDIR}/p4ftpd ${STAGEDIR}${PREFIX}/sbin/ - @${ECHO_CMD} "@exec ${TOUCH} ${P4LOG}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4LOG}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHMOD} 640 ${P4LOG}" >> ${TMPPLIST} .include Modified: branches/2015Q3/devel/p4ftpd/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q3/devel/p4ftpd/distinfo.freebsd100x86 Sun Jul 19 04:32:19 2015 (r392484) +++ branches/2015Q3/devel/p4ftpd/distinfo.freebsd100x86 Sun Jul 19 04:33:25 2015 (r392485) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd100x86/p4ftpd) = 7d17b0c3a178a823c2b441067f3a6916c22e8c86a5628dd82cb575b36b729afd -SIZE (perforce/2014.2.962050/bin.freebsd100x86/p4ftpd) = 2551480 +SHA256 (perforce/2015.1.1024208/bin.freebsd100x86/p4ftpd) = f9c63fafb8bf114286a778704c16a7a5b8d6b6fc5e8201a2f75218e416c7f067 +SIZE (perforce/2015.1.1024208/bin.freebsd100x86/p4ftpd) = 2596224 Modified: branches/2015Q3/devel/p4ftpd/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q3/devel/p4ftpd/distinfo.freebsd100x86_64 Sun Jul 19 04:32:19 2015 (r392484) +++ branches/2015Q3/devel/p4ftpd/distinfo.freebsd100x86_64 Sun Jul 19 04:33:25 2015 (r392485) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd100x86_64/p4ftpd) = 11f2e5fcb17e21ec8bdba86a3e91dc99b55f55ab51ee230c603e1070b5b95969 -SIZE (perforce/2014.2.962050/bin.freebsd100x86_64/p4ftpd) = 2807824 +SHA256 (perforce/2015.1.1024208/bin.freebsd100x86_64/p4ftpd) = ef79956f0e17e26e16d1b7d486e6611263cce9fa64a733b7e6976f1dbc7cfc01 +SIZE (perforce/2015.1.1024208/bin.freebsd100x86_64/p4ftpd) = 2852272 Modified: branches/2015Q3/devel/p4ftpd/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q3/devel/p4ftpd/distinfo.freebsd70x86 Sun Jul 19 04:32:19 2015 (r392484) +++ branches/2015Q3/devel/p4ftpd/distinfo.freebsd70x86 Sun Jul 19 04:33:25 2015 (r392485) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd70x86/p4ftpd) = 9565b6c695bbe3739ada7a1c84a8d7014121fbe952ed6f2bc146fa4762bdd21d -SIZE (perforce/2014.2.962050/bin.freebsd70x86/p4ftpd) = 2629832 +SHA256 (perforce/2015.1.1024208/bin.freebsd70x86/p4ftpd) = 4e13ffd9ecc6fa773917f3da73f85220e0e934d09d8fd8736b06645023cab264 +SIZE (perforce/2015.1.1024208/bin.freebsd70x86/p4ftpd) = 2671092 Modified: branches/2015Q3/devel/p4ftpd/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q3/devel/p4ftpd/distinfo.freebsd70x86_64 Sun Jul 19 04:32:19 2015 (r392484) +++ branches/2015Q3/devel/p4ftpd/distinfo.freebsd70x86_64 Sun Jul 19 04:33:25 2015 (r392485) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd70x86_64/p4ftpd) = e68d416a3dbbd1e5c136542da9ca760e02f0aa86652d6ba97e75b92ae4219eaa -SIZE (perforce/2014.2.962050/bin.freebsd70x86_64/p4ftpd) = 2795112 +SHA256 (perforce/2015.1.1024208/bin.freebsd70x86_64/p4ftpd) = 6fa08dda4fad1e1c0ad5b5a5d267110c509ee240bb7c611433abb5ceb46056b7 +SIZE (perforce/2015.1.1024208/bin.freebsd70x86_64/p4ftpd) = 2840144 Modified: branches/2015Q3/devel/p4ftpd/files/p4ftpd.in ============================================================================== --- branches/2015Q3/devel/p4ftpd/files/p4ftpd.in Sun Jul 19 04:32:19 2015 (r392484) +++ branches/2015Q3/devel/p4ftpd/files/p4ftpd.in Sun Jul 19 04:33:25 2015 (r392485) @@ -40,5 +40,13 @@ load_rc_config $name command="%%PREFIX%%/sbin/p4ftpd" command_args="-l ${p4ftpd_listen} -p ${p4ftpd_port} -v ${p4ftpd_debug} -L ${p4ftpd_log} -d -u p4admin ${p4ftpd_args} > /dev/null 2>&1 &" +start_precmd="p4ftpd_prestart" + +p4ftpd_prestart() +{ + if [ ! -f "${p4ftpd_log}" ]; then + install -o p4admin -g p4admin -m 0640 /dev/null ${p4ftpd_log} + fi +} run_rc_command "$1" From owner-svn-ports-branches@freebsd.org Sun Jul 19 04:34:36 2015 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 D82169A4019; Sun, 19 Jul 2015 04:34:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 C7C161DD9; Sun, 19 Jul 2015 04:34:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6J4Yars059976; Sun, 19 Jul 2015 04:34:36 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6J4YY7g059969; Sun, 19 Jul 2015 04:34:34 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201507190434.t6J4YY7g059969@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sun, 19 Jul 2015 04:34:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392486 - in branches/2015Q3/devel/p4p: . files 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.20 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: Sun, 19 Jul 2015 04:34:37 -0000 Author: gordon Date: Sun Jul 19 04:34:33 2015 New Revision: 392486 URL: https://svnweb.freebsd.org/changeset/ports/392486 Log: MFH: r392480 Update devel/p4p to 2015.1/1126382 to fix the broken distfile. Move plist execs to the stage and init script. PR: 198692 Differential Revision: https://reviews.freebsd.org/D3092 Approved by: mat (mentor) Approved by: ports-secteam (feld) Modified: branches/2015Q3/devel/p4p/Makefile branches/2015Q3/devel/p4p/distinfo.freebsd100x86 branches/2015Q3/devel/p4p/distinfo.freebsd100x86_64 branches/2015Q3/devel/p4p/distinfo.freebsd70x86 branches/2015Q3/devel/p4p/distinfo.freebsd70x86_64 branches/2015Q3/devel/p4p/files/p4p.in branches/2015Q3/devel/p4p/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/p4p/Makefile ============================================================================== --- branches/2015Q3/devel/p4p/Makefile Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/Makefile Sun Jul 19 04:34:33 2015 (r392486) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4p -PORTVERSION= 2014.2.962050 +PORTVERSION= 2015.1.1126382 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ @@ -15,12 +15,6 @@ COMMENT= Perforce server RUN_DEPENDS= p4:${PORTSDIR}/devel/p4 -ONLY_FOR_ARCHS= amd64 i386 - -P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} -DIST_SUBDIR= perforce/${PORTVERSION}/bin.${PLATFORM} -DISTINFO_FILE= ${MASTERDIR}/distinfo.${PLATFORM} - RESTRICTED= Restricted distribution NO_BUILD= yes @@ -29,6 +23,8 @@ NO_WRKSUBDIR= yes P4CACHE?= /var/db/p4p P4LOG?= /var/log/p4p.log +PLIST_SUB= P4CACHE=${P4CACHE} + SUB_LIST= P4CACHE=${P4CACHE} \ P4LOG=${P4LOG} @@ -43,13 +39,6 @@ GROUPS= p4admin do-install: ${INSTALL_PROGRAM} ${_DISTDIR}/p4p ${STAGEDIR}${PREFIX}/sbin/ - @${MKDIR} ${STAGEDIR}${P4CACHE} - @${ECHO_CMD} "@exec ${MKDIR} ${P4CACHE}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4CACHE}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHMOD} 750 ${P4CACHE}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${RMDIR} ${P4CACHE} 2>/dev/null || true" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${TOUCH} ${P4LOG}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4LOG}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHMOD} 640 ${P4LOG}" >> ${TMPPLIST} + ${MKDIR} ${STAGEDIR}${P4CACHE} .include Modified: branches/2015Q3/devel/p4p/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q3/devel/p4p/distinfo.freebsd100x86 Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/distinfo.freebsd100x86 Sun Jul 19 04:34:33 2015 (r392486) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd100x86/p4p) = 555b1196824fd495bdf6a4524e77737fb679afa5b13d93386c1078d25bf77156 -SIZE (perforce/2014.2.962050/bin.freebsd100x86/p4p) = 2253172 +SHA256 (perforce/2015.1.1126382/bin.freebsd100x86/p4p) = 4112a14b93630f3cf78f1e733e90c72f9560eaf1fbb8f240a8bf73dfe002dc4a +SIZE (perforce/2015.1.1126382/bin.freebsd100x86/p4p) = 2362740 Modified: branches/2015Q3/devel/p4p/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q3/devel/p4p/distinfo.freebsd100x86_64 Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/distinfo.freebsd100x86_64 Sun Jul 19 04:34:33 2015 (r392486) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd100x86_64/p4p) = eb6e988d05d6e7bd65ffb3fc9beaa6a0f05aaf132d18731bf8280fcbe5456127 -SIZE (perforce/2014.2.962050/bin.freebsd100x86_64/p4p) = 2520496 +SHA256 (perforce/2015.1.1126382/bin.freebsd100x86_64/p4p) = 8fb5f91d99d7ef965d2879cbc934ba3bbb2ea296f137f27f3b0a323588baf1c5 +SIZE (perforce/2015.1.1126382/bin.freebsd100x86_64/p4p) = 2627408 Modified: branches/2015Q3/devel/p4p/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q3/devel/p4p/distinfo.freebsd70x86 Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/distinfo.freebsd70x86 Sun Jul 19 04:34:33 2015 (r392486) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd70x86/p4p) = 516f12eba6149dc2f50d2916086a64c474a031cc7d8c914c5d9717555b08f40a -SIZE (perforce/2014.2.962050/bin.freebsd70x86/p4p) = 2302392 +SHA256 (perforce/2015.1.1126382/bin.freebsd70x86/p4p) = b987a0bfeef99e28eaf12db66e0bb930c28180c1d69c8a05caf8c0964779a8f8 +SIZE (perforce/2015.1.1126382/bin.freebsd70x86/p4p) = 2404000 Modified: branches/2015Q3/devel/p4p/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q3/devel/p4p/distinfo.freebsd70x86_64 Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/distinfo.freebsd70x86_64 Sun Jul 19 04:34:33 2015 (r392486) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd70x86_64/p4p) = 0cd62924f16c9dcbd075f72712675d69ce1aa0f91634851e05ac81919fe2ee23 -SIZE (perforce/2014.2.962050/bin.freebsd70x86_64/p4p) = 2497968 +SHA256 (perforce/2015.1.1126382/bin.freebsd70x86_64/p4p) = 9609923de4f6c83e072c76448137e78e7721a50c03513b95bb2e8663ec26613f +SIZE (perforce/2015.1.1126382/bin.freebsd70x86_64/p4p) = 2601336 Modified: branches/2015Q3/devel/p4p/files/p4p.in ============================================================================== --- branches/2015Q3/devel/p4p/files/p4p.in Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/files/p4p.in Sun Jul 19 04:34:33 2015 (r392486) @@ -44,5 +44,13 @@ load_rc_config $name command="%%PREFIX%%/sbin/p4p" command_args="-r ${p4p_cache} -p ${p4p_port} -t ${p4p_target} -v ${p4p_debug} -L ${p4p_log} -d ${p4p_args} > /dev/null 2>&1 &" p4p_user="p4admin" +start_precmd="p4p_prestart" + +p4p_prestart() +{ + if [ ! -f "${p4p_log}" ]; then + install -o p4admin -g p4admin -m 0640 /dev/null ${p4p_log} + fi +} run_rc_command "$1" Modified: branches/2015Q3/devel/p4p/pkg-plist ============================================================================== --- branches/2015Q3/devel/p4p/pkg-plist Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/pkg-plist Sun Jul 19 04:34:33 2015 (r392486) @@ -1 +1,2 @@ sbin/p4p +@dir(p4admin,p4admin,0750) %%P4CACHE%% From owner-svn-ports-branches@freebsd.org Mon Jul 20 14:26:17 2015 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 CA0DC9A5C04; Mon, 20 Jul 2015 14:26:17 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 BA7F21FB4; Mon, 20 Jul 2015 14:26:17 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6KEQHSY093823; Mon, 20 Jul 2015 14:26:17 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6KEQHf5093822; Mon, 20 Jul 2015 14:26:17 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201507201426.t6KEQHf5093822@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Mon, 20 Jul 2015 14:26:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392570 - branches/2015Q3/mail/qpopper 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.20 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: Mon, 20 Jul 2015 14:26:17 -0000 Author: robak Date: Mon Jul 20 14:26:16 2015 New Revision: 392570 URL: https://svnweb.freebsd.org/changeset/ports/392570 Log: MFH: r392558 mail/qpopper: fix pkg-plist when not using APOP option PR: 198300 Submitted by: Helge Oldach Approved by: ports-secteam, maintainer timeout (4 months) Modified: branches/2015Q3/mail/qpopper/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/mail/qpopper/pkg-plist ============================================================================== --- branches/2015Q3/mail/qpopper/pkg-plist Mon Jul 20 14:24:05 2015 (r392569) +++ branches/2015Q3/mail/qpopper/pkg-plist Mon Jul 20 14:26:16 2015 (r392570) @@ -1,5 +1,5 @@ -@(%%USERS%%,%%GROUPS%%,4555) %%QPOPAUTH%%bin/qapopauth -@(%%USERS%%,%%GROUPS%%,4555) %%QPOPAUTH%%bin/qpopauth +%%QPOPAUTH%%@(%%USERS%%,%%GROUPS%%,4555) bin/qapopauth +%%QPOPAUTH%%@(%%USERS%%,%%GROUPS%%,4555) bin/qpopauth @sample(%%USERS%%,%%GROUPS%%,0444) %%ETCDIR%%/popusers.sample libexec/qpopper man/man8/qpopper.8.gz From owner-svn-ports-branches@freebsd.org Mon Jul 20 14:30:58 2015 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 2C3049A5CEF; Mon, 20 Jul 2015 14:30:58 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 12B9711BA; Mon, 20 Jul 2015 14:30:58 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6KEUvLN095177; Mon, 20 Jul 2015 14:30:57 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6KEUv4B095176; Mon, 20 Jul 2015 14:30:57 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201507201430.t6KEUv4B095176@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Mon, 20 Jul 2015 14:30:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392571 - branches/2015Q3/chinese/pcmanx 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.20 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: Mon, 20 Jul 2015 14:30:58 -0000 Author: robak Date: Mon Jul 20 14:30:57 2015 New Revision: 392571 URL: https://svnweb.freebsd.org/changeset/ports/392571 Log: MFH: r392552 chinese/pcmanx: fix LIB_DEPENDS typo PR: 201628 Submitted by: Ting-Wei Lan Approved by: ports-secteam Modified: branches/2015Q3/chinese/pcmanx/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/chinese/pcmanx/Makefile ============================================================================== --- branches/2015Q3/chinese/pcmanx/Makefile Mon Jul 20 14:26:16 2015 (r392570) +++ branches/2015Q3/chinese/pcmanx/Makefile Mon Jul 20 14:30:57 2015 (r392571) @@ -14,7 +14,7 @@ LICENSE= GPLv2 # or later LICENSE_FILE= ${WRKSRC}/COPYING USE_GNOME= gtk20 intlhack -USES= tar:xz iconv gmake pkgconfig +USES= gmake iconv pkgconfig tar:xz GNU_CONFIGURE= yes OPTIONS_DEFINE= NLS DEBUG DOCKLET NOTIFIER LIBNOTIFY NANCY MOUSE EXTERNAL IPLOOKUP PROXY @@ -56,7 +56,7 @@ CONFIGURE_ARGS+=--disable-notifier .if ${PORT_OPTIONS:MLIBNOTIFY} CONFIGURE_ARGS+=--enable-libnotify -LIB_DEPENDS+= libnotifa.soy:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= libnotify.so:${PORTSDIR}/devel/libnotify .endif .if empty(PORT_OPTIONS:MNANCY) From owner-svn-ports-branches@freebsd.org Mon Jul 20 14:47:40 2015 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 92F269A6202; Mon, 20 Jul 2015 14:47:40 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 695CE1F69; Mon, 20 Jul 2015 14:47:40 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6KElerQ002636; Mon, 20 Jul 2015 14:47:40 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6KEldsp002633; Mon, 20 Jul 2015 14:47:39 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507201447.t6KEldsp002633@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 20 Jul 2015 14:47:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392574 - branches/2015Q3/net-mgmt/cacti 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.20 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: Mon, 20 Jul 2015 14:47:40 -0000 Author: feld Date: Mon Jul 20 14:47:38 2015 New Revision: 392574 URL: https://svnweb.freebsd.org/changeset/ports/392574 Log: MFH: r392573 Update to 0.8.8f to resolve security and bug issues PR: 201702 Security: CVE-2015-4634 Security: 0bfda05f-2e6f-11e5-a4a5-002590263bf5 Approved by: ports-secteam (with hat) Modified: branches/2015Q3/net-mgmt/cacti/Makefile branches/2015Q3/net-mgmt/cacti/distinfo branches/2015Q3/net-mgmt/cacti/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/net-mgmt/cacti/Makefile ============================================================================== --- branches/2015Q3/net-mgmt/cacti/Makefile Mon Jul 20 14:45:44 2015 (r392573) +++ branches/2015Q3/net-mgmt/cacti/Makefile Mon Jul 20 14:47:38 2015 (r392574) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cacti -PORTVERSION= 0.8.8d${PATCHLEVEL} +PORTVERSION= 0.8.8f${PATCHLEVEL} CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ Modified: branches/2015Q3/net-mgmt/cacti/distinfo ============================================================================== --- branches/2015Q3/net-mgmt/cacti/distinfo Mon Jul 20 14:45:44 2015 (r392573) +++ branches/2015Q3/net-mgmt/cacti/distinfo Mon Jul 20 14:47:38 2015 (r392574) @@ -1,2 +1,2 @@ -SHA256 (cacti-0.8.8d.tar.gz) = 1e3fb4aa137c0a9cb682fa66956c1f59dfc730040a215c45b7f9a5f9b9714bec -SIZE (cacti-0.8.8d.tar.gz) = 2470512 +SHA256 (cacti-0.8.8f.tar.gz) = d92adfa054c1afaa295de3ddda95173bf18d5465fa95f4481611c69647a10999 +SIZE (cacti-0.8.8f.tar.gz) = 2594481 Modified: branches/2015Q3/net-mgmt/cacti/pkg-plist ============================================================================== --- branches/2015Q3/net-mgmt/cacti/pkg-plist Mon Jul 20 14:45:44 2015 (r392573) +++ branches/2015Q3/net-mgmt/cacti/pkg-plist Mon Jul 20 14:47:38 2015 (r392574) @@ -255,6 +255,8 @@ %%CACTIDIR%%/include/js/jquery.js %%CACTIDIR%%/include/js/jquery.zoom.css %%CACTIDIR%%/include/js/jquery.zoom.js +%%CACTIDIR%%/include/js/jquery-ui.css +%%CACTIDIR%%/include/js/jquery-ui.js %%CACTIDIR%%/include/js/jstree.js %%CACTIDIR%%/include/js/themes/default-dark/32px.png %%CACTIDIR%%/include/js/themes/default-dark/40px.png @@ -344,6 +346,8 @@ %%CACTIDIR%%/install/0_8_8a_to_0_8_8b.php %%CACTIDIR%%/install/0_8_8b_to_0_8_8c.php %%CACTIDIR%%/install/0_8_8c_to_0_8_8d.php +%%CACTIDIR%%/install/0_8_8d_to_0_8_8e.php +%%CACTIDIR%%/install/0_8_8e_to_0_8_8f.php %%CACTIDIR%%/install/0_8_to_0_8_1.php %%CACTIDIR%%/install/index.php %%CACTIDIR%%/install/install_finish.gif From owner-svn-ports-branches@freebsd.org Mon Jul 20 15:22:34 2015 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 1CFA49A6BC6; Mon, 20 Jul 2015 15:22:34 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 E7ED02C2E; Mon, 20 Jul 2015 15:22:33 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6KFMXwr020105; Mon, 20 Jul 2015 15:22:33 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6KFMXPF020103; Mon, 20 Jul 2015 15:22:33 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507201522.t6KFMXPF020103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 20 Jul 2015 15:22:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392588 - in branches/2015Q3/devel/pcre: . files 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.20 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: Mon, 20 Jul 2015 15:22:34 -0000 Author: feld Date: Mon Jul 20 15:22:32 2015 New Revision: 392588 URL: https://svnweb.freebsd.org/changeset/ports/392588 Log: MFH: r392587 Apply upstream fixes for a buffer overflow issue: 1571 Fix buffer overflow for forward reference within backward assertion with excess closing parenthesis. Bugzilla 1651. Obtained from: PCRE svn (r1571) Security: 8a1d0e63-1e07-11e5-b43d-002590263bf5 Security: CVE-2015-5073 PR: 201188 Approved by: ports-secteam (with hat) Added: branches/2015Q3/devel/pcre/files/patch-CVE-2015-5073 - copied unchanged from r392587, head/devel/pcre/files/patch-CVE-2015-5073 Modified: branches/2015Q3/devel/pcre/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/pcre/Makefile ============================================================================== --- branches/2015Q3/devel/pcre/Makefile Mon Jul 20 15:21:25 2015 (r392587) +++ branches/2015Q3/devel/pcre/Makefile Mon Jul 20 15:22:32 2015 (r392588) @@ -3,7 +3,7 @@ PORTNAME= pcre PORTVERSION= 8.37 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ ftp://ftp.csx.cam.ac.uk/pub/software/programming/${PORTNAME}/ \ Copied: branches/2015Q3/devel/pcre/files/patch-CVE-2015-5073 (from r392587, head/devel/pcre/files/patch-CVE-2015-5073) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/devel/pcre/files/patch-CVE-2015-5073 Mon Jul 20 15:22:32 2015 (r392588, copy of r392587, head/devel/pcre/files/patch-CVE-2015-5073) @@ -0,0 +1,11 @@ +--- pcre_compile.c.orig 2015/06/22 09:38:41 1570 ++++ pcre_compile.c 2015/06/23 16:34:53 1571 +@@ -9449,7 +9449,7 @@ + exceptional ones forgo this. We scan the pattern to check that they are fixed + length, and set their lengths. */ + +-if (cd->check_lookbehind) ++if (errorcode == 0 && cd->check_lookbehind) + { + pcre_uchar *cc = (pcre_uchar *)codestart; + From owner-svn-ports-branches@freebsd.org Mon Jul 20 16:39:02 2015 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 8E0709A6B73; Mon, 20 Jul 2015 16:39:02 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 7DDC218AA; Mon, 20 Jul 2015 16:39:02 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6KGd23B048996; Mon, 20 Jul 2015 16:39:02 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6KGd2fU048994; Mon, 20 Jul 2015 16:39:02 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507201639.t6KGd2fU048994@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 20 Jul 2015 16:39:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392592 - in branches/2015Q3/www/apache22: . files 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.20 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: Mon, 20 Jul 2015 16:39:02 -0000 Author: feld Date: Mon Jul 20 16:39:01 2015 New Revision: 392592 URL: https://svnweb.freebsd.org/changeset/ports/392592 Log: MFH: r392591 Backport patch for CVE and bump PORTREVISION Approved by: pgollucci Security: CVE-2015-3183 Security: 29083f8e-2ca8-11e5-86ff-14dae9d210b8 Approved by: ports-secteam (with hat) Added: branches/2015Q3/www/apache22/files/patch-CVE-2015-3183 - copied unchanged from r392591, head/www/apache22/files/patch-CVE-2015-3183 Modified: branches/2015Q3/www/apache22/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/apache22/Makefile ============================================================================== --- branches/2015Q3/www/apache22/Makefile Mon Jul 20 16:37:50 2015 (r392591) +++ branches/2015Q3/www/apache22/Makefile Mon Jul 20 16:39:01 2015 (r392592) @@ -2,7 +2,7 @@ PORTNAME= apache22 PORTVERSION= 2.2.29 -PORTREVISION?= 5 +PORTREVISION?= 6 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} Copied: branches/2015Q3/www/apache22/files/patch-CVE-2015-3183 (from r392591, head/www/apache22/files/patch-CVE-2015-3183) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/www/apache22/files/patch-CVE-2015-3183 Mon Jul 20 16:39:01 2015 (r392592, copy of r392591, head/www/apache22/files/patch-CVE-2015-3183) @@ -0,0 +1,777 @@ +diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c +index 347df85..5e190cb 100644 +--- modules/http/http_filters.c ++++ modules/http/http_filters.c +@@ -56,27 +56,31 @@ + #include + #endif + +-#define INVALID_CHAR -2 +- +-static long get_chunk_size(char *); +- +-typedef struct http_filter_ctx { ++typedef struct http_filter_ctx ++{ + apr_off_t remaining; + apr_off_t limit; + apr_off_t limit_used; +- enum { +- BODY_NONE, +- BODY_LENGTH, +- BODY_CHUNK, +- BODY_CHUNK_PART ++ apr_int32_t chunk_used; ++ apr_int32_t chunkbits; ++ enum ++ { ++ BODY_NONE, /* streamed data */ ++ BODY_LENGTH, /* data constrained by content length */ ++ BODY_CHUNK, /* chunk expected */ ++ BODY_CHUNK_PART, /* chunk digits */ ++ BODY_CHUNK_EXT, /* chunk extension */ ++ BODY_CHUNK_LF, /* got CR, expect LF after digits/extension */ ++ BODY_CHUNK_DATA, /* data constrained by chunked encoding */ ++ BODY_CHUNK_END, /* chunked data terminating CRLF */ ++ BODY_CHUNK_END_LF, /* got CR, expect LF after data */ ++ BODY_CHUNK_TRAILER /* trailers */ + } state; +- int eos_sent; +- char chunk_ln[32]; +- char *pos; +- apr_off_t linesize; ++ unsigned int eos_sent :1; + apr_bucket_brigade *bb; + } http_ctx_t; + ++/* bail out if some error in the HTTP input filter happens */ + static apr_status_t bail_out_on_error(http_ctx_t *ctx, + ap_filter_t *f, + int http_error) +@@ -109,119 +113,147 @@ static apr_status_t bail_out_on_error(http_ctx_t *ctx, + e = apr_bucket_eos_create(f->c->bucket_alloc); + APR_BRIGADE_INSERT_TAIL(bb, e); + ctx->eos_sent = 1; ++ /* If chunked encoding / content-length are corrupt, we may treat parts ++ * of this request's body as the next one's headers. ++ * To be safe, disable keep-alive. ++ */ ++ f->r->connection->keepalive = AP_CONN_CLOSE; + return ap_pass_brigade(f->r->output_filters, bb); + } + +-static apr_status_t get_remaining_chunk_line(http_ctx_t *ctx, +- apr_bucket_brigade *b, +- int linelimit) ++/** ++ * Parse a chunk line with optional extension, detect overflow. ++ * There are two error cases: ++ * 1) If the conversion would require too many bits, APR_EGENERAL is returned. ++ * 2) If the conversion used the correct number of bits, but an overflow ++ * caused only the sign bit to flip, then APR_ENOSPC is returned. ++ * In general, any negative number can be considered an overflow error. ++ */ ++static apr_status_t parse_chunk_size(http_ctx_t *ctx, const char *buffer, ++ apr_size_t len, int linelimit) + { +- apr_status_t rv; +- apr_off_t brigade_length; +- apr_bucket *e; +- const char *lineend; +- apr_size_t len; ++ apr_size_t i = 0; + +- /* +- * As the brigade b should have been requested in mode AP_MODE_GETLINE +- * all buckets in this brigade are already some type of memory +- * buckets (due to the needed scanning for LF in mode AP_MODE_GETLINE) +- * or META buckets. +- */ +- rv = apr_brigade_length(b, 0, &brigade_length); +- if (rv != APR_SUCCESS) { +- return rv; +- } +- /* Sanity check. Should never happen. See above. */ +- if (brigade_length == -1) { +- return APR_EGENERAL; +- } +- if (!brigade_length) { +- return APR_EAGAIN; +- } +- ctx->linesize += brigade_length; +- if (ctx->linesize > linelimit) { +- return APR_ENOSPC; +- } +- /* +- * As all buckets are already some type of memory buckets or META buckets +- * (see above), we only need to check the last byte in the last data bucket. +- */ +- for (e = APR_BRIGADE_LAST(b); +- e != APR_BRIGADE_SENTINEL(b); +- e = APR_BUCKET_PREV(e)) { ++ while (i < len) { ++ char c = buffer[i]; + +- if (APR_BUCKET_IS_METADATA(e)) { ++ ap_xlate_proto_from_ascii(&c, 1); ++ ++ /* handle CRLF after the chunk */ ++ if (ctx->state == BODY_CHUNK_END ++ || ctx->state == BODY_CHUNK_END_LF) { ++ if (c == LF) { ++ ctx->state = BODY_CHUNK; ++ } ++ else if (c == CR && ctx->state == BODY_CHUNK_END) { ++ ctx->state = BODY_CHUNK_END_LF; ++ } ++ else { ++ /* ++ * LF expected. ++ */ ++ return APR_EINVAL; ++ } ++ i++; + continue; + } +- rv = apr_bucket_read(e, &lineend, &len, APR_BLOCK_READ); +- if (rv != APR_SUCCESS) { +- return rv; ++ ++ /* handle start of the chunk */ ++ if (ctx->state == BODY_CHUNK) { ++ if (!apr_isxdigit(c)) { ++ /* ++ * Detect invalid character at beginning. This also works for ++ * empty chunk size lines. ++ */ ++ return APR_EINVAL; ++ } ++ else { ++ ctx->state = BODY_CHUNK_PART; ++ } ++ ctx->remaining = 0; ++ ctx->chunkbits = sizeof(apr_off_t) * 8; ++ ctx->chunk_used = 0; ++ } ++ ++ if (c == LF) { ++ if (ctx->remaining) { ++ ctx->state = BODY_CHUNK_DATA; ++ } ++ else { ++ ctx->state = BODY_CHUNK_TRAILER; ++ } + } +- if (len > 0) { +- break; /* we got the data we want */ ++ else if (ctx->state == BODY_CHUNK_LF) { ++ /* ++ * LF expected. ++ */ ++ return APR_EINVAL; + } +- /* If we got a zero-length data bucket, we try the next one */ +- } +- /* We had no data in this brigade */ +- if (!len || e == APR_BRIGADE_SENTINEL(b)) { +- return APR_EAGAIN; +- } +- if (lineend[len - 1] != APR_ASCII_LF) { +- return APR_EAGAIN; +- } +- /* Line is complete. So reset ctx->linesize for next round. */ +- ctx->linesize = 0; +- return APR_SUCCESS; +-} ++ else if (c == CR) { ++ ctx->state = BODY_CHUNK_LF; ++ } ++ else if (c == ';') { ++ ctx->state = BODY_CHUNK_EXT; ++ } ++ else if (ctx->state == BODY_CHUNK_EXT) { ++ /* ++ * Control chars (but tabs) are invalid. ++ */ ++ if (c != '\t' && apr_iscntrl(c)) { ++ return APR_EINVAL; ++ } ++ } ++ else if (ctx->state == BODY_CHUNK_PART) { ++ int xvalue; + +-static apr_status_t get_chunk_line(http_ctx_t *ctx, apr_bucket_brigade *b, +- int linelimit) +-{ +- apr_size_t len; +- int tmp_len; +- apr_status_t rv; ++ /* ignore leading zeros */ ++ if (!ctx->remaining && c == '0') { ++ i++; ++ continue; ++ } + +- tmp_len = sizeof(ctx->chunk_ln) - (ctx->pos - ctx->chunk_ln) - 1; +- /* Saveguard ourselves against underflows */ +- if (tmp_len < 0) { +- len = 0; +- } +- else { +- len = (apr_size_t) tmp_len; +- } +- /* +- * Check if there is space left in ctx->chunk_ln. If not, then either +- * the chunk size is insane or we have chunk-extensions. Ignore both +- * by discarding the remaining part of the line via +- * get_remaining_chunk_line. Only bail out if the line is too long. +- */ +- if (len > 0) { +- rv = apr_brigade_flatten(b, ctx->pos, &len); +- if (rv != APR_SUCCESS) { +- return rv; ++ ctx->chunkbits -= 4; ++ if (ctx->chunkbits < 0) { ++ /* overflow */ ++ return APR_ENOSPC; ++ } ++ ++ if (c >= '0' && c <= '9') { ++ xvalue = c - '0'; ++ } ++ else if (c >= 'A' && c <= 'F') { ++ xvalue = c - 'A' + 0xa; ++ } ++ else if (c >= 'a' && c <= 'f') { ++ xvalue = c - 'a' + 0xa; ++ } ++ else { ++ /* bogus character */ ++ return APR_EINVAL; ++ } ++ ++ ctx->remaining = (ctx->remaining << 4) | xvalue; ++ if (ctx->remaining < 0) { ++ /* overflow */ ++ return APR_ENOSPC; ++ } + } +- ctx->pos += len; +- ctx->linesize += len; +- *(ctx->pos) = '\0'; +- /* +- * Check if we really got a full line. If yes the +- * last char in the just read buffer must be LF. +- * If not advance the buffer and return APR_EAGAIN. +- * We do not start processing until we have the +- * full line. +- */ +- if (ctx->pos[-1] != APR_ASCII_LF) { +- /* Check if the remaining data in the brigade has the LF */ +- return get_remaining_chunk_line(ctx, b, linelimit); ++ else { ++ /* Should not happen */ ++ return APR_EGENERAL; + } +- /* Line is complete. So reset ctx->pos for next round. */ +- ctx->pos = ctx->chunk_ln; +- return APR_SUCCESS; ++ ++ i++; + } +- return get_remaining_chunk_line(ctx, b, linelimit); +-} + ++ /* sanity check */ ++ ctx->chunk_used += len; ++ if (ctx->chunk_used < 0 || ctx->chunk_used > linelimit) { ++ return APR_ENOSPC; ++ } ++ ++ return APR_SUCCESS; ++} + + static apr_status_t read_chunked_trailers(http_ctx_t *ctx, ap_filter_t *f, + apr_bucket_brigade *b, int merge) +@@ -235,7 +267,6 @@ static apr_status_t read_chunked_trailers(http_ctx_t *ctx, ap_filter_t *f, + r->status = HTTP_OK; + r->headers_in = r->trailers_in; + apr_table_clear(r->headers_in); +- ctx->state = BODY_NONE; + ap_get_mime_headers(r); + + if(r->status == HTTP_OK) { +@@ -282,6 +313,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, + apr_off_t totalread; + int http_error = HTTP_REQUEST_ENTITY_TOO_LARGE; + apr_bucket_brigade *bb; ++ int again; + + conf = (core_server_config *) + ap_get_module_config(f->r->server->module_config, &core_module); +@@ -295,7 +327,6 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, + const char *tenc, *lenp; + f->ctx = ctx = apr_pcalloc(f->r->pool, sizeof(*ctx)); + ctx->state = BODY_NONE; +- ctx->pos = ctx->chunk_ln; + ctx->bb = apr_brigade_create(f->r->pool, f->c->bucket_alloc); + bb = ctx->bb; + +@@ -337,7 +368,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, + */ + ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r, + "Unknown Transfer-Encoding: %s", tenc); +- return bail_out_on_error(ctx, f, HTTP_NOT_IMPLEMENTED); ++ return bail_out_on_error(ctx, f, HTTP_BAD_REQUEST); + } + lenp = NULL; + } +@@ -357,7 +388,7 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, + "Invalid Content-Length"); + +- return bail_out_on_error(ctx, f, HTTP_REQUEST_ENTITY_TOO_LARGE); ++ return bail_out_on_error(ctx, f, HTTP_BAD_REQUEST); + } + + /* If we have a limit in effect and we know the C-L ahead of +@@ -399,7 +430,8 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, + if (!ap_is_HTTP_SUCCESS(f->r->status)) { + ctx->state = BODY_NONE; + ctx->eos_sent = 1; +- } else { ++ } ++ else { + char *tmp; + int len; + +@@ -424,285 +456,194 @@ apr_status_t ap_http_filter(ap_filter_t *f, apr_bucket_brigade *b, + } + } + } ++ } + +- /* We can't read the chunk until after sending 100 if required. */ +- if (ctx->state == BODY_CHUNK) { +- apr_brigade_cleanup(bb); ++ /* sanity check in case we're read twice */ ++ if (ctx->eos_sent) { ++ e = apr_bucket_eos_create(f->c->bucket_alloc); ++ APR_BRIGADE_INSERT_TAIL(b, e); ++ return APR_SUCCESS; ++ } ++ ++ do { ++ apr_brigade_cleanup(b); ++ again = 0; /* until further notice */ ++ ++ /* read and handle the brigade */ ++ switch (ctx->state) { ++ case BODY_CHUNK: ++ case BODY_CHUNK_PART: ++ case BODY_CHUNK_EXT: ++ case BODY_CHUNK_LF: ++ case BODY_CHUNK_END: ++ case BODY_CHUNK_END_LF: { + +- rv = ap_get_brigade(f->next, bb, AP_MODE_GETLINE, +- block, 0); ++ rv = ap_get_brigade(f->next, b, AP_MODE_GETLINE, block, 0); + + /* for timeout */ +- if (block == APR_NONBLOCK_READ && +- ( (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb)) || +- (APR_STATUS_IS_EAGAIN(rv)) )) { +- ctx->state = BODY_CHUNK_PART; ++ if (block == APR_NONBLOCK_READ ++ && ((rv == APR_SUCCESS && APR_BRIGADE_EMPTY(b)) ++ || (APR_STATUS_IS_EAGAIN(rv)))) { + return APR_EAGAIN; + } + +- if (rv == APR_SUCCESS) { +- rv = get_chunk_line(ctx, bb, f->r->server->limit_req_line); +- if (APR_STATUS_IS_EAGAIN(rv)) { +- apr_brigade_cleanup(bb); +- ctx->state = BODY_CHUNK_PART; +- return rv; +- } +- if (rv == APR_SUCCESS) { +- ctx->remaining = get_chunk_size(ctx->chunk_ln); +- if (ctx->remaining == INVALID_CHAR) { +- rv = APR_EGENERAL; +- http_error = HTTP_SERVICE_UNAVAILABLE; +- } +- } +- } +- apr_brigade_cleanup(bb); +- +- /* Detect chunksize error (such as overflow) */ +- if (rv != APR_SUCCESS || ctx->remaining < 0) { +- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, "Error reading first chunk %s ", +- (ctx->remaining < 0) ? "(overflow)" : ""); +- if (APR_STATUS_IS_TIMEUP(rv) || ctx->remaining > 0) { +- http_error = HTTP_REQUEST_TIME_OUT; +- } +- ctx->remaining = 0; /* Reset it in case we have to +- * come back here later */ +- return bail_out_on_error(ctx, f, http_error); ++ if (rv == APR_EOF) { ++ return APR_INCOMPLETE; + } + +- if (!ctx->remaining) { +- return read_chunked_trailers(ctx, f, b, +- conf->merge_trailers == AP_MERGE_TRAILERS_ENABLE); ++ if (rv != APR_SUCCESS) { ++ return rv; + } +- } +- } +- else { +- bb = ctx->bb; +- } + +- if (ctx->eos_sent) { +- e = apr_bucket_eos_create(f->c->bucket_alloc); +- APR_BRIGADE_INSERT_TAIL(b, e); +- return APR_SUCCESS; +- } ++ e = APR_BRIGADE_FIRST(b); ++ while (e != APR_BRIGADE_SENTINEL(b)) { ++ const char *buffer; ++ apr_size_t len; + +- if (!ctx->remaining) { +- switch (ctx->state) { +- case BODY_NONE: +- break; +- case BODY_LENGTH: +- e = apr_bucket_eos_create(f->c->bucket_alloc); +- APR_BRIGADE_INSERT_TAIL(b, e); +- ctx->eos_sent = 1; +- return APR_SUCCESS; +- case BODY_CHUNK: +- case BODY_CHUNK_PART: +- { +- apr_brigade_cleanup(bb); ++ if (!APR_BUCKET_IS_METADATA(e)) { ++ int parsing = 0; + +- /* We need to read the CRLF after the chunk. */ +- if (ctx->state == BODY_CHUNK) { +- rv = ap_get_brigade(f->next, bb, AP_MODE_GETLINE, +- block, 0); +- if (block == APR_NONBLOCK_READ && +- ( (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb)) || +- (APR_STATUS_IS_EAGAIN(rv)) )) { +- return APR_EAGAIN; +- } +- /* If we get an error, then leave */ +- if (rv == APR_EOF) { +- return APR_INCOMPLETE; +- } +- if (rv != APR_SUCCESS) { +- return rv; +- } +- /* +- * We really don't care whats on this line. If it is RFC +- * compliant it should be only \r\n. If there is more +- * before we just ignore it as long as we do not get over +- * the limit for request lines. +- */ +- rv = get_remaining_chunk_line(ctx, bb, +- f->r->server->limit_req_line); +- apr_brigade_cleanup(bb); +- if (APR_STATUS_IS_EAGAIN(rv)) { +- return rv; +- } +- } else { +- rv = APR_SUCCESS; +- } ++ rv = apr_bucket_read(e, &buffer, &len, APR_BLOCK_READ); + +- if (rv == APR_SUCCESS) { +- /* Read the real chunk line. */ +- rv = ap_get_brigade(f->next, bb, AP_MODE_GETLINE, +- block, 0); +- /* Test timeout */ +- if (block == APR_NONBLOCK_READ && +- ( (rv == APR_SUCCESS && APR_BRIGADE_EMPTY(bb)) || +- (APR_STATUS_IS_EAGAIN(rv)) )) { +- ctx->state = BODY_CHUNK_PART; +- return APR_EAGAIN; +- } +- ctx->state = BODY_CHUNK; + if (rv == APR_SUCCESS) { +- rv = get_chunk_line(ctx, bb, f->r->server->limit_req_line); +- if (APR_STATUS_IS_EAGAIN(rv)) { +- ctx->state = BODY_CHUNK_PART; +- apr_brigade_cleanup(bb); +- return rv; +- } +- if (rv == APR_SUCCESS) { +- ctx->remaining = get_chunk_size(ctx->chunk_ln); +- if (ctx->remaining == INVALID_CHAR) { +- rv = APR_EGENERAL; +- http_error = HTTP_SERVICE_UNAVAILABLE; ++ parsing = 1; ++ rv = parse_chunk_size(ctx, buffer, len, ++ f->r->server->limit_req_fieldsize); ++ } ++ if (rv != APR_SUCCESS) { ++ ap_log_rerror(APLOG_MARK, APLOG_INFO, rv, f->r, ++ "Error reading/parsing chunk %s ", ++ (APR_ENOSPC == rv) ? "(overflow)" : ""); ++ if (parsing) { ++ if (rv != APR_ENOSPC) { ++ http_error = HTTP_BAD_REQUEST; + } ++ return bail_out_on_error(ctx, f, http_error); + } ++ return rv; + } +- apr_brigade_cleanup(bb); + } + +- /* Detect chunksize error (such as overflow) */ +- if (rv != APR_SUCCESS || ctx->remaining < 0) { +- ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, "Error reading chunk %s ", +- (ctx->remaining < 0) ? "(overflow)" : ""); +- if (APR_STATUS_IS_TIMEUP(rv) || ctx->remaining > 0) { +- http_error = HTTP_REQUEST_TIME_OUT; +- } +- ctx->remaining = 0; /* Reset it in case we have to +- * come back here later */ +- return bail_out_on_error(ctx, f, http_error); +- } ++ apr_bucket_delete(e); ++ e = APR_BRIGADE_FIRST(b); ++ } ++ again = 1; /* come around again */ + +- if (!ctx->remaining) { +- return read_chunked_trailers(ctx, f, b, ++ if (ctx->state == BODY_CHUNK_TRAILER) { ++ /* Treat UNSET as DISABLE - trailers aren't merged by default */ ++ return read_chunked_trailers(ctx, f, b, + conf->merge_trailers == AP_MERGE_TRAILERS_ENABLE); +- } + } ++ + break; + } +- } ++ case BODY_NONE: ++ case BODY_LENGTH: ++ case BODY_CHUNK_DATA: { + +- /* Ensure that the caller can not go over our boundary point. */ +- if (ctx->state == BODY_LENGTH || ctx->state == BODY_CHUNK) { +- if (ctx->remaining < readbytes) { +- readbytes = ctx->remaining; +- } +- AP_DEBUG_ASSERT(readbytes > 0); +- } ++ /* Ensure that the caller can not go over our boundary point. */ ++ if (ctx->state != BODY_NONE && ctx->remaining < readbytes) { ++ readbytes = ctx->remaining; ++ } ++ if (readbytes > 0) { + +- rv = ap_get_brigade(f->next, b, mode, block, readbytes); ++ rv = ap_get_brigade(f->next, b, mode, block, readbytes); + +- if (rv == APR_EOF && ctx->state != BODY_NONE && +- ctx->remaining > 0) { +- return APR_INCOMPLETE; +- } +- if (rv != APR_SUCCESS) { +- return rv; +- } ++ /* for timeout */ ++ if (block == APR_NONBLOCK_READ ++ && ((rv == APR_SUCCESS && APR_BRIGADE_EMPTY(b)) ++ || (APR_STATUS_IS_EAGAIN(rv)))) { ++ return APR_EAGAIN; ++ } + +- /* How many bytes did we just read? */ +- apr_brigade_length(b, 0, &totalread); ++ if (rv == APR_EOF && ctx->state != BODY_NONE ++ && ctx->remaining > 0) { ++ return APR_INCOMPLETE; ++ } + +- /* If this happens, we have a bucket of unknown length. Die because +- * it means our assumptions have changed. */ +- AP_DEBUG_ASSERT(totalread >= 0); ++ if (rv != APR_SUCCESS) { ++ return rv; ++ } + +- if (ctx->state != BODY_NONE) { +- ctx->remaining -= totalread; +- if (ctx->remaining > 0) { +- e = APR_BRIGADE_LAST(b); +- if (APR_BUCKET_IS_EOS(e)) { +- apr_bucket_delete(e); +- return APR_INCOMPLETE; +- } +- } +- } ++ /* How many bytes did we just read? */ ++ apr_brigade_length(b, 0, &totalread); + +- /* If we have no more bytes remaining on a C-L request, +- * save the callter a roundtrip to discover EOS. +- */ +- if (ctx->state == BODY_LENGTH && ctx->remaining == 0) { +- e = apr_bucket_eos_create(f->c->bucket_alloc); +- APR_BRIGADE_INSERT_TAIL(b, e); +- } ++ /* If this happens, we have a bucket of unknown length. Die because ++ * it means our assumptions have changed. */ ++ AP_DEBUG_ASSERT(totalread >= 0); + +- /* We have a limit in effect. */ +- if (ctx->limit) { +- /* FIXME: Note that we might get slightly confused on chunked inputs +- * as we'd need to compensate for the chunk lengths which may not +- * really count. This seems to be up for interpretation. */ +- ctx->limit_used += totalread; +- if (ctx->limit < ctx->limit_used) { +- ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, f->r, +- "Read content-length of %" APR_OFF_T_FMT +- " is larger than the configured limit" +- " of %" APR_OFF_T_FMT, ctx->limit_used, ctx->limit); +- apr_brigade_cleanup(bb); +- e = ap_bucket_error_create(HTTP_REQUEST_ENTITY_TOO_LARGE, NULL, +- f->r->pool, +- f->c->bucket_alloc); +- APR_BRIGADE_INSERT_TAIL(bb, e); +- e = apr_bucket_eos_create(f->c->bucket_alloc); +- APR_BRIGADE_INSERT_TAIL(bb, e); +- ctx->eos_sent = 1; +- return ap_pass_brigade(f->r->output_filters, bb); +- } +- } ++ if (ctx->state != BODY_NONE) { ++ ctx->remaining -= totalread; ++ if (ctx->remaining > 0) { ++ e = APR_BRIGADE_LAST(b); ++ if (APR_BUCKET_IS_EOS(e)) { ++ apr_bucket_delete(e); ++ return APR_INCOMPLETE; ++ } ++ } ++ else if (ctx->state == BODY_CHUNK_DATA) { ++ /* next chunk please */ ++ ctx->state = BODY_CHUNK_END; ++ ctx->chunk_used = 0; ++ } ++ } + +- return APR_SUCCESS; +-} ++ } + +-/** +- * Parse a chunk extension, detect overflow. +- * There are two error cases: +- * 1) If the conversion would require too many bits, a -1 is returned. +- * 2) If the conversion used the correct number of bits, but an overflow +- * caused only the sign bit to flip, then that negative number is +- * returned. +- * In general, any negative number can be considered an overflow error. +- */ +-static long get_chunk_size(char *b) +-{ +- long chunksize = 0; +- size_t chunkbits = sizeof(long) * 8; ++ /* If we have no more bytes remaining on a C-L request, ++ * save the caller a round trip to discover EOS. ++ */ ++ if (ctx->state == BODY_LENGTH && ctx->remaining == 0) { ++ e = apr_bucket_eos_create(f->c->bucket_alloc); ++ APR_BRIGADE_INSERT_TAIL(b, e); ++ ctx->eos_sent = 1; ++ } + +- ap_xlate_proto_from_ascii(b, strlen(b)); ++ /* We have a limit in effect. */ ++ if (ctx->limit) { ++ /* FIXME: Note that we might get slightly confused on chunked inputs ++ * as we'd need to compensate for the chunk lengths which may not ++ * really count. This seems to be up for interpretation. */ ++ ctx->limit_used += totalread; ++ if (ctx->limit < ctx->limit_used) { ++ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r, ++ "Read content-length of %" APR_OFF_T_FMT ++ " is larger than the configured limit" ++ " of %" APR_OFF_T_FMT, ctx->limit_used, ctx->limit); ++ return bail_out_on_error(ctx, f, HTTP_REQUEST_ENTITY_TOO_LARGE); ++ } ++ } + +- if (!apr_isxdigit(*b)) { +- /* +- * Detect invalid character at beginning. This also works for empty +- * chunk size lines. +- */ +- return INVALID_CHAR; +- } +- /* Skip leading zeros */ +- while (*b == '0') { +- ++b; +- } ++ break; ++ } ++ case BODY_CHUNK_TRAILER: { ++ ++ rv = ap_get_brigade(f->next, b, mode, block, readbytes); + +- while (apr_isxdigit(*b) && (chunkbits > 0)) { +- int xvalue = 0; ++ /* for timeout */ ++ if (block == APR_NONBLOCK_READ ++ && ((rv == APR_SUCCESS && APR_BRIGADE_EMPTY(b)) ++ || (APR_STATUS_IS_EAGAIN(rv)))) { ++ return APR_EAGAIN; ++ } ++ ++ if (rv != APR_SUCCESS) { ++ return rv; ++ } + +- if (*b >= '0' && *b <= '9') { +- xvalue = *b - '0'; ++ break; + } +- else if (*b >= 'A' && *b <= 'F') { +- xvalue = *b - 'A' + 0xa; ++ default: { ++ /* Should not happen */ ++ ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, f->r, ++ "Unexpected body state (%i)", (int)ctx->state); ++ return APR_EGENERAL; + } +- else if (*b >= 'a' && *b <= 'f') { +- xvalue = *b - 'a' + 0xa; + } + +- chunksize = (chunksize << 4) | xvalue; +- chunkbits -= 4; +- ++b; +- } +- if (apr_isxdigit(*b) && (chunkbits <= 0)) { +- /* overflow */ +- return -1; +- } ++ } while (again); + +- return chunksize; ++ return APR_SUCCESS; + } + + typedef struct header_struct { From owner-svn-ports-branches@freebsd.org Tue Jul 21 13:44:45 2015 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 50D1A9A532D; Tue, 21 Jul 2015 13:44:45 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 3E8B3198E; Tue, 21 Jul 2015 13:44:45 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6LDijP7073499; Tue, 21 Jul 2015 13:44:45 GMT (envelope-from blackend@FreeBSD.org) Received: (from blackend@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6LDieFA073483; Tue, 21 Jul 2015 13:44:40 GMT (envelope-from blackend@FreeBSD.org) Message-Id: <201507211344.t6LDieFA073483@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: blackend set sender to blackend@FreeBSD.org using -f From: Marc Fonvieille Date: Tue, 21 Jul 2015 13:44:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392632 - in branches/2015Q3/misc: freebsd-doc-all freebsd-doc-de freebsd-doc-en freebsd-doc-fr freebsd-doc-ja freebsd-doc-ru 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.20 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, 21 Jul 2015 13:44:45 -0000 Author: blackend (doc committer) Date: Tue Jul 21 13:44:39 2015 New Revision: 392632 URL: https://svnweb.freebsd.org/changeset/ports/392632 Log: MFH: r391677, r392492 Log (r391677): Update to r46935 of the FreeBSD docset (a.k.a. 10.2-R version) Approved by: doceng (implicit) Log (r392492): Update to r47011 of the FreeBSD docset (a.k.a., definitively, 10.2-R version) Approved by: doceng (implicit) Approved by: portmgr (implicit) Modified: branches/2015Q3/misc/freebsd-doc-all/Makefile branches/2015Q3/misc/freebsd-doc-de/pkg-plist.html-split branches/2015Q3/misc/freebsd-doc-en/Makefile branches/2015Q3/misc/freebsd-doc-en/distinfo branches/2015Q3/misc/freebsd-doc-en/pkg-plist.html branches/2015Q3/misc/freebsd-doc-en/pkg-plist.html-common branches/2015Q3/misc/freebsd-doc-en/pkg-plist.html-split branches/2015Q3/misc/freebsd-doc-en/pkg-plist.pdf branches/2015Q3/misc/freebsd-doc-en/pkg-plist.ps branches/2015Q3/misc/freebsd-doc-en/pkg-plist.txt branches/2015Q3/misc/freebsd-doc-fr/pkg-plist.html-split branches/2015Q3/misc/freebsd-doc-ja/pkg-plist.html-split branches/2015Q3/misc/freebsd-doc-ru/pkg-plist.html-split Modified: branches/2015Q3/misc/freebsd-doc-all/Makefile ============================================================================== --- branches/2015Q3/misc/freebsd-doc-all/Makefile Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-all/Makefile Tue Jul 21 13:44:39 2015 (r392632) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc-all -PORTVERSION= 46616 +PORTVERSION= 47011 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= #empty Modified: branches/2015Q3/misc/freebsd-doc-de/pkg-plist.html-split ============================================================================== --- branches/2015Q3/misc/freebsd-doc-de/pkg-plist.html-split Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-de/pkg-plist.html-split Tue Jul 21 13:44:39 2015 (r392632) @@ -135,6 +135,8 @@ %%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build-makefiles.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/editor-config.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-docbook-article.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples.html @@ -142,14 +144,12 @@ %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ix01.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/legalnotice.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/make-includes.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-before.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-quick-start.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-acknowledgements.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-conventions.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-notes.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/psgml-mode.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-docbook.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-html.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-linuxdoc.html @@ -160,17 +160,23 @@ %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/stylesheets-css.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/stylesheets.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-build.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-env.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-install.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools-optional.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-checking-out.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-choosing-directory.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-choosing-mirror.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-making-diff.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-revert.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-subversion-references.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-updating.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-word-list.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-markup-docbook.html -%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-markup.html +%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xhtml-markup.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-comments.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-conclusion.html %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-doctype-declaration.html @@ -248,6 +254,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-rcd.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-starting-services.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-sysctl.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-syslog.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-virtual-hosts.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/consoles.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-cds.html @@ -276,7 +283,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-enable.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-implementation.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-language.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-using.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/editors.html @@ -284,7 +290,7 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-web.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-zfs.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-linux.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-apps.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-concepts.html @@ -370,7 +376,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/make-delete-old.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/makeworld.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-afs.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-bittorrent.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-ftp.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-rsync.html @@ -446,6 +451,8 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn-mirrors.html +%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/swap-encrypting.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/synching.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html Modified: branches/2015Q3/misc/freebsd-doc-en/Makefile ============================================================================== --- branches/2015Q3/misc/freebsd-doc-en/Makefile Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-en/Makefile Tue Jul 21 13:44:39 2015 (r392632) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc -PORTVERSION= 46616 -PORTREVISION= 1 +PORTVERSION= 47011 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= LOCAL/blackend Modified: branches/2015Q3/misc/freebsd-doc-en/distinfo ============================================================================== --- branches/2015Q3/misc/freebsd-doc-en/distinfo Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-en/distinfo Tue Jul 21 13:44:39 2015 (r392632) @@ -1,2 +1,2 @@ -SHA256 (freebsd-doc-46616.tar.gz) = 27cd14dd93fa22f2d4e4a2c016e7eed834be7c2fa0c41c9bfd59858b64904059 -SIZE (freebsd-doc-46616.tar.gz) = 34832475 +SHA256 (freebsd-doc-47011.tar.gz) = 15d2b6a4669af80c7d9c590a4a214004dda6cf960e01f165866d55423b5d4058 +SIZE (freebsd-doc-47011.tar.gz) = 37106830 Modified: branches/2015Q3/misc/freebsd-doc-en/pkg-plist.html ============================================================================== --- branches/2015Q3/misc/freebsd-doc-en/pkg-plist.html Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-en/pkg-plist.html Tue Jul 21 13:44:39 2015 (r392632) @@ -14,6 +14,7 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.html +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.html Modified: branches/2015Q3/misc/freebsd-doc-en/pkg-plist.html-common ============================================================================== --- branches/2015Q3/misc/freebsd-doc-en/pkg-plist.html-common Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-en/pkg-plist.html-common Tue Jul 21 13:44:39 2015 (r392632) @@ -26,6 +26,7 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/docbook.css +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/docbook.css Modified: branches/2015Q3/misc/freebsd-doc-en/pkg-plist.html-split ============================================================================== --- branches/2015Q3/misc/freebsd-doc-en/pkg-plist.html-split Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-en/pkg-plist.html-split Tue Jul 21 13:44:39 2015 (r392632) @@ -141,6 +141,11 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/ssl-ca.html %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/trademarks.html %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/useful.html +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/index.html +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-cautions.html +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-conclusion.html +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-posix.html +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-testing.html %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/conclusion.html %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/freebsd-emulation.html %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/index.html Modified: branches/2015Q3/misc/freebsd-doc-en/pkg-plist.pdf ============================================================================== --- branches/2015Q3/misc/freebsd-doc-en/pkg-plist.pdf Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-en/pkg-plist.pdf Tue Jul 21 13:44:39 2015 (r392632) @@ -14,6 +14,7 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.pdf +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf Modified: branches/2015Q3/misc/freebsd-doc-en/pkg-plist.ps ============================================================================== --- branches/2015Q3/misc/freebsd-doc-en/pkg-plist.ps Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-en/pkg-plist.ps Tue Jul 21 13:44:39 2015 (r392632) @@ -14,6 +14,7 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.ps +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.ps Modified: branches/2015Q3/misc/freebsd-doc-en/pkg-plist.txt ============================================================================== --- branches/2015Q3/misc/freebsd-doc-en/pkg-plist.txt Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-en/pkg-plist.txt Tue Jul 21 13:44:39 2015 (r392632) @@ -16,6 +16,7 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.txt +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.txt Modified: branches/2015Q3/misc/freebsd-doc-fr/pkg-plist.html-split ============================================================================== --- branches/2015Q3/misc/freebsd-doc-fr/pkg-plist.html-split Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-fr/pkg-plist.html-split Tue Jul 21 13:44:39 2015 (r392632) @@ -437,7 +437,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-administration.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-config.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-inline-glossary.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-install.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-basics.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-strategies.html @@ -639,8 +638,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/outgoing-only.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/packages-using.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/permissions.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-core.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-developers.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-broken.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-finding-applications.html Modified: branches/2015Q3/misc/freebsd-doc-ja/pkg-plist.html-split ============================================================================== --- branches/2015Q3/misc/freebsd-doc-ja/pkg-plist.html-split Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-ja/pkg-plist.html-split Tue Jul 21 13:44:39 2015 (r392632) @@ -111,7 +111,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-install-trouble.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-netinstall.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-partitioning.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-post.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre.html Modified: branches/2015Q3/misc/freebsd-doc-ru/pkg-plist.html-split ============================================================================== --- branches/2015Q3/misc/freebsd-doc-ru/pkg-plist.html-split Tue Jul 21 13:00:02 2015 (r392631) +++ branches/2015Q3/misc/freebsd-doc-ru/pkg-plist.html-split Tue Jul 21 13:44:39 2015 (r392632) @@ -23,7 +23,6 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-printers.html %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-server.html %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-install.html -%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-ports-knobs.html %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-troubleshooting.html %%DOCSDIR%%/%%DOCLANG%%/articles/cups/trademarks.html %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/compairing-bsd-and-linux.html @@ -94,7 +93,6 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/next-steps.html %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other-useful-commands.html %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other.html -%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/printing-files-from-dos.html %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/your-working-environment.html %%DOCSDIR%%/%%DOCLANG%%/articles/pam/index.html @@ -157,16 +155,13 @@ %%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/advanced.html +%%DOCSDIR%%/%%DOCLANG%%/books/faq/all-about-zfs.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/applications.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/bibliography.html -%%DOCSDIR%%/%%DOCLANG%%/books/faq/commercial.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-drives.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-kbd-mice.html -%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-memory.html -%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-networking.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-other.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-processors.html -%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-sound.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/disks.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/funnies.html %%DOCSDIR%%/%%DOCLANG%%/books/faq/hardware.html From owner-svn-ports-branches@freebsd.org Wed Jul 22 02:52:48 2015 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 6032D9A7A4E; Wed, 22 Jul 2015 02:52:48 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 502E7106A; Wed, 22 Jul 2015 02:52:48 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6M2qm9h096490; Wed, 22 Jul 2015 02:52:48 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6M2qlVt096487; Wed, 22 Jul 2015 02:52:47 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507220252.t6M2qlVt096487@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 22 Jul 2015 02:52:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392657 - branches/2015Q3/net-mgmt/cacti 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.20 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: Wed, 22 Jul 2015 02:52:48 -0000 Author: feld Date: Wed Jul 22 02:52:46 2015 New Revision: 392657 URL: https://svnweb.freebsd.org/changeset/ports/392657 Log: MFH: r392656 Upstream re-rolled distfile. Bump PORTREVISION to address it. PR: 201702 Approved by: ports-secteam (with hat) Modified: branches/2015Q3/net-mgmt/cacti/Makefile branches/2015Q3/net-mgmt/cacti/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/net-mgmt/cacti/Makefile ============================================================================== --- branches/2015Q3/net-mgmt/cacti/Makefile Wed Jul 22 02:51:49 2015 (r392656) +++ branches/2015Q3/net-mgmt/cacti/Makefile Wed Jul 22 02:52:46 2015 (r392657) @@ -2,6 +2,7 @@ PORTNAME= cacti PORTVERSION= 0.8.8f${PATCHLEVEL} +PORTREVISION= 1 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ Modified: branches/2015Q3/net-mgmt/cacti/distinfo ============================================================================== --- branches/2015Q3/net-mgmt/cacti/distinfo Wed Jul 22 02:51:49 2015 (r392656) +++ branches/2015Q3/net-mgmt/cacti/distinfo Wed Jul 22 02:52:46 2015 (r392657) @@ -1,2 +1,2 @@ -SHA256 (cacti-0.8.8f.tar.gz) = d92adfa054c1afaa295de3ddda95173bf18d5465fa95f4481611c69647a10999 -SIZE (cacti-0.8.8f.tar.gz) = 2594481 +SHA256 (cacti-0.8.8f.tar.gz) = 2ea92407c11bf13302558a5bc9e1f3a57bd14a1d9ded48c505ec495762f76738 +SIZE (cacti-0.8.8f.tar.gz) = 2594409 From owner-svn-ports-branches@freebsd.org Wed Jul 22 22:18:21 2015 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 9CE069A86AA; Wed, 22 Jul 2015 22:18:21 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 83B6D198F; Wed, 22 Jul 2015 22:18:21 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6MMIL5O073051; Wed, 22 Jul 2015 22:18:21 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6MMIIG1073041; Wed, 22 Jul 2015 22:18:18 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201507222218.t6MMIIG1073041@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Wed, 22 Jul 2015 22:18:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392698 - in branches/2015Q3: . net/nocatsplash net/nocatsplash/files 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.20 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: Wed, 22 Jul 2015 22:18:21 -0000 Author: rene Date: Wed Jul 22 22:18:17 2015 New Revision: 392698 URL: https://svnweb.freebsd.org/changeset/ports/392698 Log: MFH: r392664 - fix and undeprecate - add license (GPLv2) - update MASTER_SITES and CONFLICTS - tidy up pkg-descr - pass maintainership to submitter PR: 197495 Submitted by: Chris Hutchinson Approved by: ports-secteam (feld) Added: branches/2015Q3/net/nocatsplash/files/patch-mkinstalldirs - copied unchanged from r392664, head/net/nocatsplash/files/patch-mkinstalldirs Deleted: branches/2015Q3/net/nocatsplash/pkg-install Modified: branches/2015Q3/GIDs branches/2015Q3/UIDs branches/2015Q3/net/nocatsplash/Makefile branches/2015Q3/net/nocatsplash/files/patch-src__http.c branches/2015Q3/net/nocatsplash/files/patch-src__splashd.c branches/2015Q3/net/nocatsplash/pkg-descr branches/2015Q3/net/nocatsplash/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/GIDs ============================================================================== --- branches/2015Q3/GIDs Wed Jul 22 21:54:18 2015 (r392697) +++ branches/2015Q3/GIDs Wed Jul 22 22:18:17 2015 (r392698) @@ -94,6 +94,7 @@ trircd:*:154: xorp:*:155: monetdb:*:156: barman:*:157: +nocat:*:159: sfs:*:171: agk:*:172: polipo:*:173: Modified: branches/2015Q3/UIDs ============================================================================== --- branches/2015Q3/UIDs Wed Jul 22 21:54:18 2015 (r392697) +++ branches/2015Q3/UIDs Wed Jul 22 22:18:17 2015 (r392698) @@ -101,6 +101,7 @@ rbldns:*:153:153::0:0:rbldnsd pseudo-use trircd:*:154:154::0:0:& user:/usr/local/etc/tr-ircd:/usr/sbin/nologin monetdb:*:156:156::0:0:MonetDB user:/usr/local/monetdb5:/bin/sh barman:*:157:157::0:0:Barman user:/var/barman:/bin/sh +nocat:*:159:159::0:0:NoCat Daemon:/libexec/nocat:/sbin/nologin sfs:*:171:171::0:0:Self-Certifying File System:/nonexistent:/usr/sbin/nologin agk:*:172:172::0:0:AquaGateKeeper:/nonexistent:/nonexistent polipo:*:173:173::0:0:polipo web cache:/nonexistent:/usr/sbin/nologin Modified: branches/2015Q3/net/nocatsplash/Makefile ============================================================================== --- branches/2015Q3/net/nocatsplash/Makefile Wed Jul 22 21:54:18 2015 (r392697) +++ branches/2015Q3/net/nocatsplash/Makefile Wed Jul 22 22:18:17 2015 (r392698) @@ -6,19 +6,17 @@ PORTVERSION= 0.82 PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://farrokhi.net/distfiles/ \ - http://nocat.net/download/NoCatSplash/ + http://BSDforge.com/projects/source/net/nocatsplash/ DISTNAME= NoCatSplash-nightly -MAINTAINER= ports@FreeBSD.org +MAINTAINER= portmaster@BSDforge.com COMMENT= Open 802.11 Splash Screen -BROKEN= Broken pkg-install script, should use USERS and UIDs -DEPRECATED= Broken for more than 6 months -EXPIRATION_DATE= 2015-07-21 +LICENSE= GPLv2 USE_GNOME= glib12 -CONFLICTS= nocatauth-server-* +CONFLICTS= nocatauth-server-[0-9]* GNU_CONFIGURE= yes USES= gmake tar:tgz @@ -34,4 +32,7 @@ CONFIGURE_ARGS+= --with-mode=${AUTHMODE} CONFIGURE_ARGS+= --with-docroot=${DOCROOT} .endif +USERS= nocat +GROUPS= nocat + .include Copied: branches/2015Q3/net/nocatsplash/files/patch-mkinstalldirs (from r392664, head/net/nocatsplash/files/patch-mkinstalldirs) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/net/nocatsplash/files/patch-mkinstalldirs Wed Jul 22 22:18:17 2015 (r392698, copy of r392664, head/net/nocatsplash/files/patch-mkinstalldirs) @@ -0,0 +1,28 @@ +--- mkinstalldirs.orig 2003-01-02 10:39:12 UTC ++++ mkinstalldirs +@@ -7,25 +7,6 @@ + errstatus=0 + dirmode="" + +-usage="\ +-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." +- +-# process command line arguments +-while test $# -gt 0 ; do +- case "${1}" in +- -h | --help | --h* ) # -h for help +- echo "${usage}" 1>&2; exit 0 ;; +- -m ) # -m PERM arg +- shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } +- dirmode="${1}" +- shift ;; +- -- ) shift; break ;; # stop option processing +- -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option +- * ) break ;; # first non-opt arg +- esac +-done +- + for file + do + if test -d "$file"; then Modified: branches/2015Q3/net/nocatsplash/files/patch-src__http.c ============================================================================== --- branches/2015Q3/net/nocatsplash/files/patch-src__http.c Wed Jul 22 21:54:18 2015 (r392697) +++ branches/2015Q3/net/nocatsplash/files/patch-src__http.c Wed Jul 22 22:18:17 2015 (r392698) @@ -1,5 +1,5 @@ ---- src/http.c.orig Wed Nov 19 16:26:07 2003 -+++ src/http.c Wed Nov 19 16:29:22 2003 +--- src/http.c.orig 2003-01-16 19:52:17 UTC ++++ src/http.c @@ -1,8 +1,10 @@ -# include -# include @@ -24,7 +24,7 @@ GIOChannel *http_bind_socket( const char *ip, int port, int queue ) { struct sockaddr_in addr; int fd, r, n = 1; -@@ -354,7 +353,7 @@ +@@ -354,7 +353,7 @@ ssize_t http_sendfile ( http_request *h, return -1; } Modified: branches/2015Q3/net/nocatsplash/files/patch-src__splashd.c ============================================================================== --- branches/2015Q3/net/nocatsplash/files/patch-src__splashd.c Wed Jul 22 21:54:18 2015 (r392697) +++ branches/2015Q3/net/nocatsplash/files/patch-src__splashd.c Wed Jul 22 22:18:17 2015 (r392698) @@ -1,5 +1,5 @@ ---- src/splashd.c.orig Wed Nov 19 16:29:47 2003 -+++ src/splashd.c Wed Nov 19 16:30:28 2003 +--- src/splashd.c.orig 2003-02-23 03:09:46 UTC ++++ src/splashd.c @@ -1,7 +1,10 @@ +# include +# include Modified: branches/2015Q3/net/nocatsplash/pkg-descr ============================================================================== --- branches/2015Q3/net/nocatsplash/pkg-descr Wed Jul 22 21:54:18 2015 (r392697) +++ branches/2015Q3/net/nocatsplash/pkg-descr Wed Jul 22 22:18:17 2015 (r392698) @@ -1,5 +1,5 @@ -NoCatSplash is a Open Public Network Gateway Daemon. It performs as a -[captive/open/active] portal. When run on a gateway/router on a network, +NoCatSplash is a Open Public Network Gateway Daemon. It performs as a +[captive/open/active] portal. When run on a gateway/router on a network, all web requests are redirected until the client either logs in or clicks "I Accept" to an AUP. The gateway daemon then changes the firewall rules on the gateway to pass traffic for that client (based on IP address and Modified: branches/2015Q3/net/nocatsplash/pkg-plist ============================================================================== --- branches/2015Q3/net/nocatsplash/pkg-plist Wed Jul 22 21:54:18 2015 (r392697) +++ branches/2015Q3/net/nocatsplash/pkg-plist Wed Jul 22 22:18:17 2015 (r392698) @@ -12,3 +12,4 @@ share/nocat/htdocs/images/auth_logo.gif sbin/splashd sbin/ghttpd etc/nocat.conf +@dir libexec/nocat From owner-svn-ports-branches@freebsd.org Wed Jul 22 23:47:53 2015 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 2FF749A7B2E; Wed, 22 Jul 2015 23:47:53 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 2057D1BE7; Wed, 22 Jul 2015 23:47:53 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6MNlqZp009970; Wed, 22 Jul 2015 23:47:52 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6MNlqQ6009968; Wed, 22 Jul 2015 23:47:52 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201507222347.t6MNlqQ6009968@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Wed, 22 Jul 2015 23:47:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392704 - branches/2015Q3/devel/ipython 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.20 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: Wed, 22 Jul 2015 23:47:53 -0000 Author: olgeni Date: Wed Jul 22 23:47:51 2015 New Revision: 392704 URL: https://svnweb.freebsd.org/changeset/ports/392704 Log: MFH: r391883 Update devel/ipython to version 3.2.1. Differential Revision: https://reviews.freebsd.org/D3075 Approved by: ports-secteam@ Security: CVE-2015-5607 Security: 81326883-2905-11e5-a4a5-002590263bf5 Modified: branches/2015Q3/devel/ipython/Makefile branches/2015Q3/devel/ipython/distinfo Modified: branches/2015Q3/devel/ipython/Makefile ============================================================================== --- branches/2015Q3/devel/ipython/Makefile Wed Jul 22 23:20:02 2015 (r392703) +++ branches/2015Q3/devel/ipython/Makefile Wed Jul 22 23:47:51 2015 (r392704) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ipython -PORTVERSION= 3.2.0 +PORTVERSION= 3.2.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2015Q3/devel/ipython/distinfo ============================================================================== --- branches/2015Q3/devel/ipython/distinfo Wed Jul 22 23:20:02 2015 (r392703) +++ branches/2015Q3/devel/ipython/distinfo Wed Jul 22 23:47:51 2015 (r392704) @@ -1,2 +1,2 @@ -SHA256 (ipython-3.2.0.tar.gz) = 8e64b441e16298c08025b826126b2d7bc5c1776d2d2f071672166f615f327887 -SIZE (ipython-3.2.0.tar.gz) = 10883925 +SHA256 (ipython-3.2.1.tar.gz) = c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177 +SIZE (ipython-3.2.1.tar.gz) = 10884249 From owner-svn-ports-branches@freebsd.org Thu Jul 23 15:05:53 2015 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 6043B9A9BDF; Thu, 23 Jul 2015 15:05:53 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 4FAA91A0E; Thu, 23 Jul 2015 15:05:53 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6NF5rAR004999; Thu, 23 Jul 2015 15:05:53 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6NF5qKV004996; Thu, 23 Jul 2015 15:05:52 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507231505.t6NF5qKV004996@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 23 Jul 2015 15:05:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392723 - in branches/2015Q3/graphics/gdk-pixbuf2: . files 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.20 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: Thu, 23 Jul 2015 15:05:53 -0000 Author: feld Date: Thu Jul 23 15:05:51 2015 New Revision: 392723 URL: https://svnweb.freebsd.org/changeset/ports/392723 Log: MFH: r392677 Fix heap overflow vulnability. Be more careful about integer overflow. While here: fix possible divide-by-zero. Notified by: feld@ Approved by: ports-secteam (with hat) Added: branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_gdk-pixbuf-loader.c - copied unchanged from r392677, head/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_gdk-pixbuf-loader.c branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_pixops_pixops.c - copied unchanged from r392677, head/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_pixops_pixops.c Modified: branches/2015Q3/graphics/gdk-pixbuf2/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/graphics/gdk-pixbuf2/Makefile ============================================================================== --- branches/2015Q3/graphics/gdk-pixbuf2/Makefile Thu Jul 23 13:56:32 2015 (r392722) +++ branches/2015Q3/graphics/gdk-pixbuf2/Makefile Thu Jul 23 15:05:51 2015 (r392723) @@ -1,10 +1,9 @@ # Created by: Ade Lovett # $FreeBSD$ -# $MCom: ports/trunk/graphics/gdk-pixbuf2/Makefile 20031 2014-11-02 21:47:55Z kwm $ PORTNAME= gdk-pixbuf PORTVERSION= 2.31.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= GNOME PKGNAMESUFFIX= 2 Copied: branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_gdk-pixbuf-loader.c (from r392677, head/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_gdk-pixbuf-loader.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_gdk-pixbuf-loader.c Thu Jul 23 15:05:51 2015 (r392723, copy of r392677, head/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_gdk-pixbuf-loader.c) @@ -0,0 +1,25 @@ +From 74c418ba2e41ab9e2287420378a6192788b1fab6 Mon Sep 17 00:00:00 2001 +From: Sarita Rawat +Date: Fri, 5 Jun 2015 06:56:00 +0000 +Subject: Avoid a possible divide-by-zero + +Pointed out in + +https://bugzilla.gnome.org/show_bug.cgi?id=750440 + +diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c +index 65845ed..668b703 100644 +--- gdk-pixbuf/gdk-pixbuf-loader.c ++++ gdk-pixbuf/gdk-pixbuf-loader.c +@@ -330,7 +330,7 @@ gdk_pixbuf_loader_prepare (GdkPixbuf *pixbuf, + else + anim = gdk_pixbuf_non_anim_new (pixbuf); + +- if (priv->needs_scale) { ++ if (priv->needs_scale && width != 0 && height != 0) { + priv->animation = GDK_PIXBUF_ANIMATION (_gdk_pixbuf_scaled_anim_new (anim, + (double) priv->width / width, + (double) priv->height / height, +-- +cgit v0.10.2 + Copied: branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_pixops_pixops.c (from r392677, head/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_pixops_pixops.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_pixops_pixops.c Thu Jul 23 15:05:51 2015 (r392723, copy of r392677, head/graphics/gdk-pixbuf2/files/patch-gdk-pixbuf_pixops_pixops.c) @@ -0,0 +1,82 @@ +From ffec86ed5010c5a2be14f47b33bcf4ed3169a199 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Mon, 13 Jul 2015 00:33:40 -0400 +Subject: pixops: Be more careful about integer overflow + +Our loader code is supposed to handle out-of-memory and overflow +situations gracefully, reporting errors instead of aborting. But +if you load an image at a specific size, we also execute our +scaling code, which was not careful enough about overflow in some +places. + +This commit makes the scaling code silently return if it fails to +allocate filter tables. This is the best we can do, since +gdk_pixbuf_scale() is not taking a GError. + +https://bugzilla.gnome.org/show_bug.cgi?id=752297 + +diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c +index 29a1c14..ce51745 100644 +--- gdk-pixbuf/pixops/pixops.c ++++ gdk-pixbuf/pixops/pixops.c +@@ -1272,7 +1272,16 @@ make_filter_table (PixopsFilter *filter) + int i_offset, j_offset; + int n_x = filter->x.n; + int n_y = filter->y.n; +- int *weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y); ++ gsize n_weights; ++ int *weights; ++ ++ n_weights = SUBSAMPLE * SUBSAMPLE * n_x * n_y; ++ if (n_weights / (SUBSAMPLE * SUBSAMPLE * n_x) != n_y) ++ return NULL; /* overflow, bail */ ++ ++ weights = g_try_new (int, n_weights); ++ if (!weights) ++ return NULL; /* overflow, bail */ + + for (i_offset=0; i_offset < SUBSAMPLE; i_offset++) + for (j_offset=0; j_offset < SUBSAMPLE; j_offset++) +@@ -1347,8 +1356,11 @@ pixops_process (guchar *dest_buf, + if (x_step == 0 || y_step == 0) + return; /* overflow, bail out */ + +- line_bufs = g_new (guchar *, filter->y.n); + filter_weights = make_filter_table (filter); ++ if (!filter_weights) ++ return; /* overflow, bail out */ ++ ++ line_bufs = g_new (guchar *, filter->y.n); + + check_shift = check_size ? get_check_shift (check_size) : 0; + +@@ -1468,7 +1480,7 @@ tile_make_weights (PixopsFilterDimension *dim, + double scale) + { + int n = ceil (1 / scale + 1); +- double *pixel_weights = g_new (double, SUBSAMPLE * n); ++ double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n); + int offset; + int i; + +@@ -1526,7 +1538,7 @@ bilinear_magnify_make_weights (PixopsFilterDimension *dim, + } + + dim->n = n; +- dim->weights = g_new (double, SUBSAMPLE * n); ++ dim->weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n); + + pixel_weights = dim->weights; + +@@ -1617,7 +1629,7 @@ bilinear_box_make_weights (PixopsFilterDimension *dim, + double scale) + { + int n = ceil (1/scale + 3.0); +- double *pixel_weights = g_new (double, SUBSAMPLE * n); ++ double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n); + double w; + int offset, i; + +-- +cgit v0.10.2 + From owner-svn-ports-branches@freebsd.org Thu Jul 23 16:24:26 2015 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 393A89A90A0; Thu, 23 Jul 2015 16:24:26 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 14CDB2940; Thu, 23 Jul 2015 16:24:26 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6NGOPfm039748; Thu, 23 Jul 2015 16:24:25 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6NGOPAZ039747; Thu, 23 Jul 2015 16:24:25 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <201507231624.t6NGOPAZ039747@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Thu, 23 Jul 2015 16:24:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392739 - branches/2015Q2/security/vuxml 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.20 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: Thu, 23 Jul 2015 16:24:26 -0000 Author: girgen Date: Thu Jul 23 16:24:25 2015 New Revision: 392739 URL: https://svnweb.freebsd.org/changeset/ports/392739 Log: Shibboleth SP software crashes on well-formed but invalid XML. The Service Provider software contains a code path with an uncaught exception that can be triggered by an unauthenticated attacker by supplying well-formed but schema-invalid XML in the form of SAML metadata or SAML protocol messages. The result is a crash and so causes a denial of service. You must rebuild opensaml and shibboleth with xmltooling-1.5.5 or later. The easiest way to do so is to update the whole chain including shibboleth-2.5.5 an opensaml2.5.5. URL: http://shibboleth.net/community/advisories/secadv_20150721.txt Security: CVE-2015-2684 Approved by: ports-secteam Modified: branches/2015Q2/security/vuxml/vuln.xml Modified: branches/2015Q2/security/vuxml/vuln.xml ============================================================================== --- branches/2015Q2/security/vuxml/vuln.xml Thu Jul 23 16:22:28 2015 (r392738) +++ branches/2015Q2/security/vuxml/vuln.xml Thu Jul 23 16:24:25 2015 (r392739) @@ -57,6 +57,54 @@ Notes: --> + + shibboleth-sp -- DoS vulnerability + + + xmltooling + 1.5.5 + + + opensaml2 + 2.5.5 + + + shibboleth-sp + 2.5.5 + + + + +

Shibboleth consortium reports:

+
+

+ Shibboleth SP software crashes on well-formed but invalid XML. +

+

+ The Service Provider software contains a code path with an uncaught + exception that can be triggered by an unauthenticated attacker by + supplying well-formed but schema-invalid XML in the form of SAML + metadata or SAML protocol messages. The result is a crash and so + causes a denial of service. +

+

+ You must rebuild opensaml and shibboleth with xmltooling-1.5.5 or + later. The easiest way to do so is to update the whole chain including + shibboleth-2.5.5 an opensaml2.5.5. +

+
+ + + + http://shibboleth.net/community/advisories/secadv_20150721.txt + CVE-2015-2684 + + + 2015-07-21 + 2015-07-23 + + + subversion -- DoS vulnerabilities From owner-svn-ports-branches@freebsd.org Thu Jul 23 16:38:42 2015 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 33A0B9A91FE; Thu, 23 Jul 2015 16:38:42 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 23E682DD5; Thu, 23 Jul 2015 16:38:42 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6NGcgxS044164; Thu, 23 Jul 2015 16:38:42 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6NGcfqY044163; Thu, 23 Jul 2015 16:38:41 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201507231638.t6NGcfqY044163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Thu, 23 Jul 2015 16:38:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392740 - branches/2015Q3/mail/dovecot-sieve 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.20 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: Thu, 23 Jul 2015 16:38:42 -0000 Author: robak Date: Thu Jul 23 16:38:41 2015 New Revision: 392740 URL: https://svnweb.freebsd.org/changeset/ports/392740 Log: MFH: r392710 mail/dovecot-sieve: update MASTER_SITES PR: 199076 Submitted by: Christian Heckendorf Approved by: ports-secteam, maintainer timeout (3 months) Modified: branches/2015Q3/mail/dovecot-sieve/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/mail/dovecot-sieve/Makefile ============================================================================== --- branches/2015Q3/mail/dovecot-sieve/Makefile Thu Jul 23 16:24:25 2015 (r392739) +++ branches/2015Q3/mail/dovecot-sieve/Makefile Thu Jul 23 16:38:41 2015 (r392740) @@ -6,7 +6,7 @@ PORTVERSION= ${DOVECOTVERSION}+${DISTVER DISTVERSION= 0.1.19 PORTREVISION= 2 CATEGORIES= mail -MASTER_SITES= http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/ +MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/ DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${DISTVERSIONPREFIX}${DISTVERSION:C/:(.)/\1/g}${DISTVERSIONSUFFIX} MAINTAINER= yds@CoolRat.org From owner-svn-ports-branches@freebsd.org Thu Jul 23 17:55:50 2015 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 DBA959A9D78; Thu, 23 Jul 2015 17:55:50 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 B22CE1504; Thu, 23 Jul 2015 17:55:50 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6NHtor0077362; Thu, 23 Jul 2015 17:55:50 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6NHtnhh077359; Thu, 23 Jul 2015 17:55:49 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507231755.t6NHtnhh077359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 23 Jul 2015 17:55:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392742 - branches/2015Q3/dns/libidn 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.20 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: Thu, 23 Jul 2015 17:55:51 -0000 Author: feld Date: Thu Jul 23 17:55:48 2015 New Revision: 392742 URL: https://svnweb.freebsd.org/changeset/ports/392742 Log: MFH: r392735 Update to 1.31 Add USES=gmake to build on all supported FreeBSD releases PR: 201780 Security: CVE-2015-2059 Security: 4caf01e2-30e6-11e5-a4a5-002590263bf5 Approved by: ports-secteam (with hat) Modified: branches/2015Q3/dns/libidn/Makefile branches/2015Q3/dns/libidn/distinfo branches/2015Q3/dns/libidn/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/dns/libidn/Makefile ============================================================================== --- branches/2015Q3/dns/libidn/Makefile Thu Jul 23 16:40:43 2015 (r392741) +++ branches/2015Q3/dns/libidn/Makefile Thu Jul 23 17:55:48 2015 (r392742) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libidn -PORTVERSION= 1.29 +PORTVERSION= 1.31 CATEGORIES= dns MASTER_SITES= GNU @@ -13,7 +13,7 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip -USES= iconv libtool makeinfo pathfix perl5 pkgconfig +USES= gmake iconv libtool makeinfo pathfix perl5 pkgconfig USE_LDCONFIG= yes USE_PERL5= build Modified: branches/2015Q3/dns/libidn/distinfo ============================================================================== --- branches/2015Q3/dns/libidn/distinfo Thu Jul 23 16:40:43 2015 (r392741) +++ branches/2015Q3/dns/libidn/distinfo Thu Jul 23 17:55:48 2015 (r392742) @@ -1,2 +1,2 @@ -SHA256 (libidn-1.29.tar.gz) = fb82747dbbf9b36f703ed27293317d818d7e851d4f5773dedf3efa4db32a7c7c -SIZE (libidn-1.29.tar.gz) = 3474087 +SHA256 (libidn-1.31.tar.gz) = afdf2fce91faea483ce24e26b5e3a9235e332029c9265d07214fd1cfaa08df08 +SIZE (libidn-1.31.tar.gz) = 3481725 Modified: branches/2015Q3/dns/libidn/pkg-plist ============================================================================== --- branches/2015Q3/dns/libidn/pkg-plist Thu Jul 23 16:40:43 2015 (r392741) +++ branches/2015Q3/dns/libidn/pkg-plist Thu Jul 23 17:55:48 2015 (r392742) @@ -10,7 +10,7 @@ info/libidn-components.png lib/libidn.a lib/libidn.so lib/libidn.so.11 -lib/libidn.so.11.6.12 +lib/libidn.so.11.6.14 libdata/pkgconfig/libidn.pc share/emacs/site-lisp/idna.el share/emacs/site-lisp/punycode.el @@ -21,6 +21,7 @@ share/emacs/site-lisp/punycode.el %%NLS%%share/locale/fi/LC_MESSAGES/libidn.mo %%NLS%%share/locale/fr/LC_MESSAGES/libidn.mo %%NLS%%share/locale/hr/LC_MESSAGES/libidn.mo +%%NLS%%share/locale/hu/LC_MESSAGES/libidn.mo %%NLS%%share/locale/id/LC_MESSAGES/libidn.mo %%NLS%%share/locale/it/LC_MESSAGES/libidn.mo %%NLS%%share/locale/ja/LC_MESSAGES/libidn.mo From owner-svn-ports-branches@freebsd.org Thu Jul 23 20:34:36 2015 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 8ED8E9A9C5F; Thu, 23 Jul 2015 20:34:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 7372814AD; Thu, 23 Jul 2015 20:34:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6NKYaQm047978; Thu, 23 Jul 2015 20:34:36 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6NKYYjs047971; Thu, 23 Jul 2015 20:34:34 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201507232034.t6NKYYjs047971@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Thu, 23 Jul 2015 20:34:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392752 - branches/2015Q3/devel/p4api 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.20 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: Thu, 23 Jul 2015 20:34:36 -0000 Author: gordon Date: Thu Jul 23 20:34:33 2015 New Revision: 392752 URL: https://svnweb.freebsd.org/changeset/ports/392752 Log: MFH: r392751 Unbreak devel/p4api and update to 2015.1/1126382 Approved by: mat (mentor, earlier version) Approved by: portmgr (erwin) Differential Revision: https://reviews.freebsd.org/D3090 Modified: branches/2015Q3/devel/p4api/Makefile branches/2015Q3/devel/p4api/distinfo.freebsd100x86 branches/2015Q3/devel/p4api/distinfo.freebsd100x86_64 branches/2015Q3/devel/p4api/distinfo.freebsd70x86 branches/2015Q3/devel/p4api/distinfo.freebsd70x86_64 branches/2015Q3/devel/p4api/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/p4api/Makefile ============================================================================== --- branches/2015Q3/devel/p4api/Makefile Thu Jul 23 20:15:24 2015 (r392751) +++ branches/2015Q3/devel/p4api/Makefile Thu Jul 23 20:34:33 2015 (r392752) @@ -1,29 +1,20 @@ # $FreeBSD$ PORTNAME= p4api -PORTVERSION= 2014.2.978861 +PORTVERSION= 2015.1.1126382 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/:tar \ ftp://ftp.perforce.com/perforce/${P4VERSION}/doc/manuals/p4api/:pdf EXTRACT_SUFX= DISTFILES= ${TAR_FILES}:tar p4api.pdf:pdf -DIST_SUBDIR= perforce/${PORTVERSION}/bin.${PLATFORM} -DISTINFO_FILE= ${MASTERDIR}/distinfo.${PLATFORM} EXTRACT_ONLY= ${TAR_FILES} MAINTAINER= gordon@FreeBSD.org COMMENT= Perforce API (static libraries and header files) -BROKEN= checksum mismatch - -ONLY_FOR_ARCHS= amd64 i386 - RESTRICTED= Restricted distribution NO_BUILD= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - -P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} OPTIONS_DEFINE= DOCS EXAMPLES @@ -35,21 +26,12 @@ TAR_FILES= p4api.tgz do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/perforce + cd ${WRKSRC}/include/p4 && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/perforce ${MKDIR} ${STAGEDIR}${PREFIX}/lib/perforce - cd ${WRKSRC}/include/p4; \ - for i in *.h; \ - do ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/include/perforce; \ - done - cd ${WRKSRC}/lib; \ - for i in lib*.a; \ - do ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib/perforce; \ - done + cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/perforce ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/p4api.pdf ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKSRC}/sample; \ - for i in *; \ - do ${INSTALL_DATA} $${i} ${STAGEDIR}${EXAMPLESDIR}; \ - done + cd ${WRKSRC}/sample && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Modified: branches/2015Q3/devel/p4api/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q3/devel/p4api/distinfo.freebsd100x86 Thu Jul 23 20:15:24 2015 (r392751) +++ branches/2015Q3/devel/p4api/distinfo.freebsd100x86 Thu Jul 23 20:34:33 2015 (r392752) @@ -1,4 +1,4 @@ -SHA256 (perforce/2014.2.978861/bin.freebsd100x86/p4api.tgz) = f8a8be20dbf2816d9f0f066b99b123ffba52be7ba9a160cace5a8214b82f311c -SIZE (perforce/2014.2.978861/bin.freebsd100x86/p4api.tgz) = 1354203 -SHA256 (perforce/2014.2.978861/bin.freebsd100x86/p4api.pdf) = 916c1cad730aed184ce5bd836a023b9c070fb09ade0bc1f420b774bce1b364c7 -SIZE (perforce/2014.2.978861/bin.freebsd100x86/p4api.pdf) = 1583688 +SHA256 (perforce/2015.1.1126382/bin.freebsd100x86/p4api.tgz) = 55273d0114caef8c44ba719199b523e7b88953727d815b29fecbe9f9bd7290eb +SIZE (perforce/2015.1.1126382/bin.freebsd100x86/p4api.tgz) = 1432888 +SHA256 (perforce/2015.1.1126382/bin.freebsd100x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd +SIZE (perforce/2015.1.1126382/bin.freebsd100x86/p4api.pdf) = 1623596 Modified: branches/2015Q3/devel/p4api/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q3/devel/p4api/distinfo.freebsd100x86_64 Thu Jul 23 20:15:24 2015 (r392751) +++ branches/2015Q3/devel/p4api/distinfo.freebsd100x86_64 Thu Jul 23 20:34:33 2015 (r392752) @@ -1,4 +1,4 @@ -SHA256 (perforce/2014.2.978861/bin.freebsd100x86_64/p4api.tgz) = 13bf3660e74bff958ebadbb358595202471be122c1f71dcdead2b501b406256c -SIZE (perforce/2014.2.978861/bin.freebsd100x86_64/p4api.tgz) = 1387999 -SHA256 (perforce/2014.2.978861/bin.freebsd100x86_64/p4api.pdf) = 916c1cad730aed184ce5bd836a023b9c070fb09ade0bc1f420b774bce1b364c7 -SIZE (perforce/2014.2.978861/bin.freebsd100x86_64/p4api.pdf) = 1583688 +SHA256 (perforce/2015.1.1126382/bin.freebsd100x86_64/p4api.tgz) = 359708ab1aa8310eb4fb13ca2bdce5b5ac687c16090891b6c3ca2ef3b6d5ea5b +SIZE (perforce/2015.1.1126382/bin.freebsd100x86_64/p4api.tgz) = 1468585 +SHA256 (perforce/2015.1.1126382/bin.freebsd100x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd +SIZE (perforce/2015.1.1126382/bin.freebsd100x86_64/p4api.pdf) = 1623596 Modified: branches/2015Q3/devel/p4api/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q3/devel/p4api/distinfo.freebsd70x86 Thu Jul 23 20:15:24 2015 (r392751) +++ branches/2015Q3/devel/p4api/distinfo.freebsd70x86 Thu Jul 23 20:34:33 2015 (r392752) @@ -1,4 +1,4 @@ -SHA256 (perforce/2014.2.978861/bin.freebsd70x86/p4api.tgz) = c0d9261bef27c4b070266765d027aef1e1a732102871652ffb0cc876c8ccf713 -SIZE (perforce/2014.2.978861/bin.freebsd70x86/p4api.tgz) = 1371008 -SHA256 (perforce/2014.2.978861/bin.freebsd70x86/p4api.pdf) = 916c1cad730aed184ce5bd836a023b9c070fb09ade0bc1f420b774bce1b364c7 -SIZE (perforce/2014.2.978861/bin.freebsd70x86/p4api.pdf) = 1583688 +SHA256 (perforce/2015.1.1126382/bin.freebsd70x86/p4api.tgz) = f0d3289467083d139ffbc24af26a7e5224ca532479926ca1ec206c5e0cdf6bbb +SIZE (perforce/2015.1.1126382/bin.freebsd70x86/p4api.tgz) = 1446584 +SHA256 (perforce/2015.1.1126382/bin.freebsd70x86/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd +SIZE (perforce/2015.1.1126382/bin.freebsd70x86/p4api.pdf) = 1623596 Modified: branches/2015Q3/devel/p4api/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q3/devel/p4api/distinfo.freebsd70x86_64 Thu Jul 23 20:15:24 2015 (r392751) +++ branches/2015Q3/devel/p4api/distinfo.freebsd70x86_64 Thu Jul 23 20:34:33 2015 (r392752) @@ -1,4 +1,4 @@ -SHA256 (perforce/2014.2.978861/bin.freebsd70x86_64/p4api.tgz) = 73ed2051b157af76c80cd3f89b1b4f561ddba7ea5d3bdf90fb1e89d86a1d79a0 -SIZE (perforce/2014.2.978861/bin.freebsd70x86_64/p4api.tgz) = 1390801 -SHA256 (perforce/2014.2.978861/bin.freebsd70x86_64/p4api.pdf) = 916c1cad730aed184ce5bd836a023b9c070fb09ade0bc1f420b774bce1b364c7 -SIZE (perforce/2014.2.978861/bin.freebsd70x86_64/p4api.pdf) = 1583688 +SHA256 (perforce/2015.1.1126382/bin.freebsd70x86_64/p4api.tgz) = 9ecc33449e024b5f98a36621923c17fb6967fc32eb1e6dd67ea774d1e4475fc3 +SIZE (perforce/2015.1.1126382/bin.freebsd70x86_64/p4api.tgz) = 1466900 +SHA256 (perforce/2015.1.1126382/bin.freebsd70x86_64/p4api.pdf) = 16e6e6548fe4e51210239cc643b08f07ed97159f004a7ef513cfd6f16403e1bd +SIZE (perforce/2015.1.1126382/bin.freebsd70x86_64/p4api.pdf) = 1623596 Modified: branches/2015Q3/devel/p4api/pkg-plist ============================================================================== --- branches/2015Q3/devel/p4api/pkg-plist Thu Jul 23 20:15:24 2015 (r392751) +++ branches/2015Q3/devel/p4api/pkg-plist Thu Jul 23 20:34:33 2015 (r392752) @@ -25,7 +25,12 @@ include/perforce/macfile.h include/perforce/mapapi.h include/perforce/md5.h include/perforce/msgclient.h +include/perforce/msgdb.h +include/perforce/msgdm.h +include/perforce/msgos.h +include/perforce/msgrpc.h include/perforce/msgserver.h +include/perforce/msgsupp.h include/perforce/netbuffer.h include/perforce/netconnect.h include/perforce/netportparser.h @@ -45,6 +50,7 @@ include/perforce/strops.h include/perforce/strtable.h include/perforce/strxml.h include/perforce/threading.h +include/perforce/ticket.h include/perforce/validate.h include/perforce/vararray.h include/perforce/web822.h From owner-svn-ports-branches@freebsd.org Thu Jul 23 23:27:29 2015 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 B4ADE9A99B6; Thu, 23 Jul 2015 23:27:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 9D0551E46; Thu, 23 Jul 2015 23:27:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6NNRTA6021344; Thu, 23 Jul 2015 23:27:29 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6NNRTmB021341; Thu, 23 Jul 2015 23:27:29 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201507232327.t6NNRTmB021341@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 23 Jul 2015 23:27:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392760 - branches/2015Q3/games/openra 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.20 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: Thu, 23 Jul 2015 23:27:29 -0000 Author: jbeich Date: Thu Jul 23 23:27:28 2015 New Revision: 392760 URL: https://svnweb.freebsd.org/changeset/ports/392760 Log: MFH: r392428 games/openra: update GeoLite2 to July snapshot Noticed by: pkg-fallout Approved by: ports-secteam buildfix blanket Modified: branches/2015Q3/games/openra/Makefile branches/2015Q3/games/openra/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/games/openra/Makefile ============================================================================== --- branches/2015Q3/games/openra/Makefile Thu Jul 23 23:18:42 2015 (r392759) +++ branches/2015Q3/games/openra/Makefile Thu Jul 23 23:27:28 2015 (r392760) @@ -3,6 +3,7 @@ PORTNAME= openra PORTVERSION= 20150614 DISTVERSIONPREFIX= release- +PORTREVISION= 1 CATEGORIES= games # XXX Convert to USES=nuget or package dependencies instead MASTER_SITES= https://nuget.org/api/v2/package/StyleCopPlus.MSBuild/4.7.49.5?dummy=/:StyleCopPlus \ Modified: branches/2015Q3/games/openra/distinfo ============================================================================== --- branches/2015Q3/games/openra/distinfo Thu Jul 23 23:18:42 2015 (r392759) +++ branches/2015Q3/games/openra/distinfo Thu Jul 23 23:27:28 2015 (r392760) @@ -26,5 +26,5 @@ SHA256 (SDL2-CS.dll) = 61ea325dad3c58544 SIZE (SDL2-CS.dll) = 2882560 SHA256 (Eluant.dll) = abb67679c241ae35a430f79696792cbd9093ceda5998f6f578d0fd763ee440b0 SIZE (Eluant.dll) = 64000 -SHA256 (GeoLite2-Country.mmdb.gz) = 0dbbf822d49ae5204613900a7ef6b111264bb76762196370753f7d62856cf43a -SIZE (GeoLite2-Country.mmdb.gz) = 2145305 +SHA256 (GeoLite2-Country.mmdb.gz) = 4819459376f61423f5fb96eff141bf486d8e6133c47acd832d2ba87a39f2a922 +SIZE (GeoLite2-Country.mmdb.gz) = 2355980 From owner-svn-ports-branches@freebsd.org Fri Jul 24 02:55:54 2015 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 98EDE9A8F47; Fri, 24 Jul 2015 02:55:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 88D8019E1; Fri, 24 Jul 2015 02:55:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6O2tsfw012888; Fri, 24 Jul 2015 02:55:54 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6O2tsFZ012887; Fri, 24 Jul 2015 02:55:54 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201507240255.t6O2tsFZ012887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 24 Jul 2015 02:55:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392766 - branches/2015Q3/Mk 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.20 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: Fri, 24 Jul 2015 02:55:54 -0000 Author: jbeich Date: Fri Jul 24 02:55:53 2015 New Revision: 392766 URL: https://svnweb.freebsd.org/changeset/ports/392766 Log: MFH: r392290 bsd.gecko.mk: PowerPC no longer needs the __STDC_CONSTANT_MACROS in CFLAGS sys/cdefs.h after base r227475 always defines __STDC_CONSTANT_MACROS for C++11 while Firefox enforces C++11 since 25.0 and also defines __STDC_CONSTANT_MACROS via mozilla-config.h since 26.0. As Firefox 38.0 enables -pedantic-errors this breaks build. So, remove the dup to unbreak build on powerpc and powerpc64. PR: 201294 Submitted by: jhibbits Approved by: ports-secteam (feld) Modified: branches/2015Q3/Mk/bsd.gecko.mk Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/Mk/bsd.gecko.mk ============================================================================== --- branches/2015Q3/Mk/bsd.gecko.mk Fri Jul 24 00:50:39 2015 (r392765) +++ branches/2015Q3/Mk/bsd.gecko.mk Fri Jul 24 02:55:53 2015 (r392766) @@ -448,7 +448,6 @@ LIBS+= -lcxxrt . endif .elif ${ARCH:Mpowerpc*} USES:= compiler:gcc-c++11-lib ${USES:Ncompiler*c++11*} -CFLAGS+= -D__STDC_CONSTANT_MACROS . if ${ARCH} == "powerpc64" MOZ_EXPORT+= UNAME_m="${ARCH}" CFLAGS+= -mminimal-toc From owner-svn-ports-branches@freebsd.org Fri Jul 24 03:31:40 2015 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 D35519A9535; Fri, 24 Jul 2015 03:31:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 7688A2A31; Fri, 24 Jul 2015 03:31:40 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6O3VeJ9034426; Fri, 24 Jul 2015 03:31:40 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6O3VYYa034402; Fri, 24 Jul 2015 03:31:34 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201507240331.t6O3VYYa034402@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 24 Jul 2015 03:31:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392767 - in branches/2015Q3: Mk Mk/Uses mail/linux-thunderbird mail/thunderbird mail/thunderbird-i18n mail/thunderbird/files multimedia/gmp-api multimedia/openh264 security/ca_root_nss... 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.20 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: Fri, 24 Jul 2015 03:31:40 -0000 Author: jbeich Date: Fri Jul 24 03:31:33 2015 New Revision: 392767 URL: https://svnweb.freebsd.org/changeset/ports/392767 Log: MFH: r392273, r392758, r392759, r392761 - Update NSS and ca_root_nss to 3.19.2 - Update Firefox and gmp-api to 39.0 - Update Firefox ESR and libxul to 38.1.0 - Update Thunderbird to 38.1.0 [1] - Stop regressing r380782 with harfbuzz/libvorbis deps Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.19.2_release_notes Changes: https://github.com/mozilla/gmp-api/compare/Firefox38...Firefox39 Changes: https://www.mozilla.org/firefox/39.0/releasenotes/ Changes: https://www.mozilla.org/firefox/38.1.0/releasenotes/ Changes: https://www.mozilla.org/thunderbird/38.0.1/releasenotes/ Changes: https://www.mozilla.org/thunderbird/38.1.0/releasenotes/ PR: 201769 [1] Submitted by: Christoph Moench-Tegeder (based on) [1] Security: https://vuxml.freebsd.org/freebsd/44d9daee-940c-4179-86bb-6e3ffd617869.html Approved by: ports-secteam (feld, delphij) Added: branches/2015Q3/mail/thunderbird/files/patch-bug1041268 - copied unchanged from r392761, head/mail/thunderbird/files/patch-bug1041268 branches/2015Q3/mail/thunderbird/files/patch-bug1073117 - copied unchanged from r392761, head/mail/thunderbird/files/patch-bug1073117 branches/2015Q3/mail/thunderbird/files/patch-bug1138845 - copied unchanged from r392761, head/mail/thunderbird/files/patch-bug1138845 branches/2015Q3/mail/thunderbird/files/patch-bug1143686 - copied unchanged from r392761, head/mail/thunderbird/files/patch-bug1143686 branches/2015Q3/mail/thunderbird/files/patch-bug1144643 - copied unchanged from r392761, head/mail/thunderbird/files/patch-bug1144643 branches/2015Q3/mail/thunderbird/files/patch-media-libstagefright-foundation-AString.cpp - copied unchanged from r392761, head/mail/thunderbird/files/patch-media-libstagefright-foundation-AString.cpp branches/2015Q3/mail/thunderbird/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c - copied unchanged from r392761, head/mail/thunderbird/files/patch-media-mtransport-third_party-nICEr-src-util-mbslen.c branches/2015Q3/mail/thunderbird/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp - copied unchanged from r392761, head/mail/thunderbird/files/patch-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp branches/2015Q3/mail/thunderbird/files/patch-memory-jemalloc-Makefile.in - copied unchanged from r392761, head/mail/thunderbird/files/patch-memory-jemalloc-Makefile.in branches/2015Q3/mail/thunderbird/files/patch-system-openh264 - copied unchanged from r392761, head/mail/thunderbird/files/patch-system-openh264 branches/2015Q3/mail/thunderbird/files/patch-toolkit_mozapps_installer_packager_mk - copied unchanged from r392761, head/mail/thunderbird/files/patch-toolkit_mozapps_installer_packager_mk branches/2015Q3/www/firefox-esr/files/patch-bug1041268 - copied unchanged from r392273, head/www/firefox-esr/files/patch-bug1041268 branches/2015Q3/www/firefox-esr/files/patch-bug1073117 - copied unchanged from r392273, head/www/firefox-esr/files/patch-bug1073117 branches/2015Q3/www/firefox-esr/files/patch-bug1138845 - copied unchanged from r392273, head/www/firefox-esr/files/patch-bug1138845 branches/2015Q3/www/firefox-esr/files/patch-bug1143686 - copied unchanged from r392273, head/www/firefox-esr/files/patch-bug1143686 branches/2015Q3/www/firefox-esr/files/patch-bug1144643 - copied unchanged from r392273, head/www/firefox-esr/files/patch-bug1144643 branches/2015Q3/www/firefox-esr/files/patch-media-libstagefright-foundation-AString.cpp - copied unchanged from r392273, head/www/firefox-esr/files/patch-media-libstagefright-foundation-AString.cpp branches/2015Q3/www/firefox-esr/files/patch-system-openh264 - copied unchanged from r392273, head/www/firefox-esr/files/patch-system-openh264 branches/2015Q3/www/libxul/files/patch-bug1041268 - copied unchanged from r392273, head/www/libxul/files/patch-bug1041268 branches/2015Q3/www/libxul/files/patch-bug1073117 - copied unchanged from r392273, head/www/libxul/files/patch-bug1073117 branches/2015Q3/www/libxul/files/patch-bug1138845 - copied unchanged from r392273, head/www/libxul/files/patch-bug1138845 branches/2015Q3/www/libxul/files/patch-bug1143686 - copied unchanged from r392273, head/www/libxul/files/patch-bug1143686 branches/2015Q3/www/libxul/files/patch-bug1144643 - copied unchanged from r392273, head/www/libxul/files/patch-bug1144643 branches/2015Q3/www/libxul/files/patch-media-libstagefright-foundation-AString.cpp - copied unchanged from r392273, head/www/libxul/files/patch-media-libstagefright-foundation-AString.cpp branches/2015Q3/www/libxul/files/patch-system-openh264 - copied unchanged from r392273, head/www/libxul/files/patch-system-openh264 Deleted: branches/2015Q3/mail/thunderbird/files/patch-bug1013675 branches/2015Q3/mail/thunderbird/files/patch-bug1015547 branches/2015Q3/mail/thunderbird/files/patch-bug1021171 branches/2015Q3/mail/thunderbird/files/patch-bug1026828 branches/2015Q3/mail/thunderbird/files/patch-bug1041795 branches/2015Q3/mail/thunderbird/files/patch-bug1046224 branches/2015Q3/mail/thunderbird/files/patch-bug1067377 branches/2015Q3/mail/thunderbird/files/patch-bug1073709 branches/2015Q3/mail/thunderbird/files/patch-bug1082199 branches/2015Q3/mail/thunderbird/files/patch-bug1103858 branches/2015Q3/mail/thunderbird/files/patch-bug1125579 branches/2015Q3/mail/thunderbird/files/patch-bug1125580 branches/2015Q3/mail/thunderbird/files/patch-bug858919 branches/2015Q3/mail/thunderbird/files/patch-bug961264 branches/2015Q3/mail/thunderbird/files/patch-mozilla-media-mtransport-third_party-nICEr-src-util-mbslen.c branches/2015Q3/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-spreadsortlib-spreadsort.hpp branches/2015Q3/mail/thunderbird/files/patch-mozilla-memory-jemalloc-Makefile.in branches/2015Q3/mail/thunderbird/files/patch-mozilla_toolkit_mozapps_installer_packager_mk branches/2015Q3/www/firefox-esr/files/patch-bug1013675 branches/2015Q3/www/firefox-esr/files/patch-bug1015547 branches/2015Q3/www/firefox-esr/files/patch-bug1021171 branches/2015Q3/www/firefox-esr/files/patch-bug1026828 branches/2015Q3/www/firefox-esr/files/patch-bug1041381 branches/2015Q3/www/firefox-esr/files/patch-bug1041795 branches/2015Q3/www/firefox-esr/files/patch-bug1046224 branches/2015Q3/www/firefox-esr/files/patch-bug1061736 branches/2015Q3/www/firefox-esr/files/patch-bug1067377 branches/2015Q3/www/firefox-esr/files/patch-bug1073709 branches/2015Q3/www/firefox-esr/files/patch-bug1082199 branches/2015Q3/www/firefox-esr/files/patch-bug1103858 branches/2015Q3/www/firefox-esr/files/patch-bug1125579 branches/2015Q3/www/firefox-esr/files/patch-bug1125580 branches/2015Q3/www/firefox-esr/files/patch-bug858919 branches/2015Q3/www/firefox-esr/files/patch-bug961264 branches/2015Q3/www/firefox/files/patch-bug1138845 branches/2015Q3/www/firefox/files/patch-bug1143686 branches/2015Q3/www/firefox/files/patch-bug1144643 branches/2015Q3/www/libxul/files/patch-bug1013675 branches/2015Q3/www/libxul/files/patch-bug1015547 branches/2015Q3/www/libxul/files/patch-bug1021171 branches/2015Q3/www/libxul/files/patch-bug1026828 branches/2015Q3/www/libxul/files/patch-bug1041381 branches/2015Q3/www/libxul/files/patch-bug1041795 branches/2015Q3/www/libxul/files/patch-bug1046224 branches/2015Q3/www/libxul/files/patch-bug1061736 branches/2015Q3/www/libxul/files/patch-bug1067377 branches/2015Q3/www/libxul/files/patch-bug1073709 branches/2015Q3/www/libxul/files/patch-bug1082199 branches/2015Q3/www/libxul/files/patch-bug1103858 branches/2015Q3/www/libxul/files/patch-bug1125579 branches/2015Q3/www/libxul/files/patch-bug1125580 branches/2015Q3/www/libxul/files/patch-bug858919 branches/2015Q3/www/libxul/files/patch-bug961264 Modified: branches/2015Q3/Mk/Uses/gecko.mk branches/2015Q3/Mk/bsd.gecko.mk branches/2015Q3/mail/linux-thunderbird/Makefile branches/2015Q3/mail/linux-thunderbird/distinfo branches/2015Q3/mail/linux-thunderbird/pkg-plist branches/2015Q3/mail/thunderbird-i18n/Makefile branches/2015Q3/mail/thunderbird-i18n/Makefile.lang branches/2015Q3/mail/thunderbird-i18n/Makefile.option branches/2015Q3/mail/thunderbird-i18n/distinfo branches/2015Q3/mail/thunderbird/Makefile branches/2015Q3/mail/thunderbird/distinfo branches/2015Q3/mail/thunderbird/files/patch-bug1021761 branches/2015Q3/mail/thunderbird/files/patch-bug1130155 branches/2015Q3/mail/thunderbird/files/patch-bug702179 branches/2015Q3/mail/thunderbird/files/patch-bug779713 branches/2015Q3/mail/thunderbird/files/patch-bug826985 branches/2015Q3/mail/thunderbird/files/patch-bug847568 branches/2015Q3/mail/thunderbird/files/patch-config-baseconfig.mk branches/2015Q3/mail/thunderbird/files/patch-ijg-libjpeg branches/2015Q3/mail/thunderbird/files/patch-mail-app-nsMailApp.cpp branches/2015Q3/mail/thunderbird/files/patch-z-bug517422 branches/2015Q3/multimedia/gmp-api/Makefile branches/2015Q3/multimedia/gmp-api/distinfo branches/2015Q3/multimedia/openh264/Makefile branches/2015Q3/security/ca_root_nss/Makefile branches/2015Q3/security/ca_root_nss/distinfo branches/2015Q3/security/nss/Makefile branches/2015Q3/security/nss/distinfo branches/2015Q3/www/firefox-esr-i18n/Makefile branches/2015Q3/www/firefox-esr-i18n/Makefile.lang branches/2015Q3/www/firefox-esr-i18n/Makefile.option branches/2015Q3/www/firefox-esr-i18n/distinfo branches/2015Q3/www/firefox-esr/Makefile branches/2015Q3/www/firefox-esr/distinfo branches/2015Q3/www/firefox-esr/files/patch-bug1013882 branches/2015Q3/www/firefox-esr/files/patch-bug1021761 branches/2015Q3/www/firefox-esr/files/patch-bug1130155 branches/2015Q3/www/firefox-esr/files/patch-bug702179 branches/2015Q3/www/firefox-esr/files/patch-bug779713 branches/2015Q3/www/firefox-esr/files/patch-bug826985 branches/2015Q3/www/firefox-esr/files/patch-bug847568 branches/2015Q3/www/firefox-esr/files/patch-ijg-libjpeg branches/2015Q3/www/firefox-esr/files/patch-z-bug517422 branches/2015Q3/www/firefox-i18n/Makefile branches/2015Q3/www/firefox-i18n/distinfo branches/2015Q3/www/firefox/Makefile branches/2015Q3/www/firefox/distinfo branches/2015Q3/www/firefox/files/patch-bug1013882 branches/2015Q3/www/firefox/files/patch-bug1073117 branches/2015Q3/www/firefox/files/patch-bug779713 branches/2015Q3/www/firefox/files/patch-bug826985 branches/2015Q3/www/firefox/files/patch-system-openh264 branches/2015Q3/www/libxul/Makefile branches/2015Q3/www/libxul/distinfo branches/2015Q3/www/libxul/files/patch-bug1013882 branches/2015Q3/www/libxul/files/patch-bug1021761 branches/2015Q3/www/libxul/files/patch-bug1130155 branches/2015Q3/www/libxul/files/patch-bug702179 branches/2015Q3/www/libxul/files/patch-bug779713 branches/2015Q3/www/libxul/files/patch-bug826985 branches/2015Q3/www/libxul/files/patch-bug847568 branches/2015Q3/www/libxul/files/patch-ijg-libjpeg branches/2015Q3/www/libxul/files/patch-z-bug517422 branches/2015Q3/www/linux-firefox/Makefile branches/2015Q3/www/linux-firefox/distinfo branches/2015Q3/www/linux-firefox/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/Mk/Uses/gecko.mk ============================================================================== --- branches/2015Q3/Mk/Uses/gecko.mk Fri Jul 24 02:55:53 2015 (r392766) +++ branches/2015Q3/Mk/Uses/gecko.mk Fri Jul 24 03:31:33 2015 (r392767) @@ -31,18 +31,18 @@ GECKO_CONFING?= ${LOCALBASE}/bin/${GECKO XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` -BUILD_DEPENDS+= libxul>=31:${PORTSDIR}/www/libxul -RUN_DEPENDS+= libxul>=31:${PORTSDIR}/www/libxul +BUILD_DEPENDS+= libxul>=38:${PORTSDIR}/www/libxul +RUN_DEPENDS+= libxul>=38:${PORTSDIR}/www/libxul .elif ${gecko_ARGS:Mfirefox} -_GECKO_DEFAULT_VERSION= 31 -_GECKO_VERSIONS= 31 38 +_GECKO_DEFAULT_VERSION= 38 +_GECKO_VERSIONS= 38 39 _GECKO_TYPE= firefox # Dependence lines for different Firefox versions -31_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr -38_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox +38_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr +39_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox .if exists(${LOCALBASE}/bin/firefox) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null @@ -65,8 +65,8 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE .elif ${gecko_ARGS:Mthunderbird} -_GECKO_DEFAULT_VERSION= 31 -_GECKO_VERSIONS= 31 +_GECKO_DEFAULT_VERSION= 38 +_GECKO_VERSIONS= 38 _GECKO_TYPE= thunderbird .if exists(${LOCALBASE}/bin/thunderbird) @@ -75,7 +75,7 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLE .endif # Dependence lines for different Thunderbird versions -31_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird +38_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird .else IGNORE= Unknown type of gecko dependency you may specify either libxul, firefox, seamonkey or thunderbird Modified: branches/2015Q3/Mk/bsd.gecko.mk ============================================================================== --- branches/2015Q3/Mk/bsd.gecko.mk Fri Jul 24 02:55:53 2015 (r392766) +++ branches/2015Q3/Mk/bsd.gecko.mk Fri Jul 24 03:31:33 2015 (r392767) @@ -161,8 +161,8 @@ icu_LIB_DEPENDS= libicui18n.so:${PORTSD icu_MOZ_OPTIONS= --with-system-icu --with-intl-api -jpeg_BUILD_DEPENDS=yasm:${PORTSDIR}/devel/yasm -# XXX depends on ports/180159 or package flavor support -#jpeg_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/libjpeg-turbo +# XXX JCS_EXTENSIONS API is currently disabled by r371283 +# XXX Remove files/patch-ijg-libjpeg once -turbo is default jpeg_USES= jpeg jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE} Modified: branches/2015Q3/mail/linux-thunderbird/Makefile ============================================================================== --- branches/2015Q3/mail/linux-thunderbird/Makefile Fri Jul 24 02:55:53 2015 (r392766) +++ branches/2015Q3/mail/linux-thunderbird/Makefile Fri Jul 24 03:31:33 2015 (r392767) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 31.7.0 +DISTVERSION= 38.1.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US Modified: branches/2015Q3/mail/linux-thunderbird/distinfo ============================================================================== --- branches/2015Q3/mail/linux-thunderbird/distinfo Fri Jul 24 02:55:53 2015 (r392766) +++ branches/2015Q3/mail/linux-thunderbird/distinfo Fri Jul 24 03:31:33 2015 (r392767) @@ -1,5 +1,5 @@ -SHA256 (thunderbird-31.7.0.tar.bz2) = 0a9b17c479e9673130d03bb38371013f2caa987690ca36318d32b934d54a5fb0 -SIZE (thunderbird-31.7.0.tar.bz2) = 36880203 +SHA256 (thunderbird-38.1.0.tar.bz2) = 3ef348d181d5a8ef35dd2781ac468e365878139e67a9c34fa817055928b95b3c +SIZE (thunderbird-38.1.0.tar.bz2) = 41827825 SHA256 (glib2-2.22.2-2.fc12.i686.rpm) = e3b459c245ec14e7248e9de4b506963a4773407f3e58835db5070d0ed02ecc99 SIZE (glib2-2.22.2-2.fc12.i686.rpm) = 1162908 SHA256 (gtk2-2.18.3-19.fc12.i686.rpm) = aea9cf7ffe9c8dae0faa2bf3d2aa1b2117c55dce03da72dcce8c268279ec0a4b Modified: branches/2015Q3/mail/linux-thunderbird/pkg-plist ============================================================================== --- branches/2015Q3/mail/linux-thunderbird/pkg-plist Fri Jul 24 02:55:53 2015 (r392766) +++ branches/2015Q3/mail/linux-thunderbird/pkg-plist Fri Jul 24 03:31:33 2015 (r392767) @@ -21,9 +21,99 @@ lib/%%APP_NAME%%/defaults/pref/channel-p lib/%%APP_NAME%%/dependentlibs.list lib/%%APP_NAME%%/dictionaries/en-US.aff lib/%%APP_NAME%%/dictionaries/en-US.dic +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/application.ini +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarm.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarmMonitor.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarmService.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAttachment.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAttendee.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calCachedCalendar.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calCalendarManager.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calCalendarSearchService.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDateTime.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDateTimeFormatter.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDavRequestHandlers.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDeletedItems.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDuration.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calEvent.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFilter.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFreeBusyService.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calHtmlExport.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calICSService-worker.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calICSService.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsImportExport.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsParser.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsSerializer.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calItemBase.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calItipItem.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calListFormatter.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calMonthGridPrinter.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calOutlookCSVImportExport.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calPeriod.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calProtocolHandler.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRecurrenceDate.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRecurrenceInfo.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRecurrenceRule.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRelation.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calStartupService.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTimezone.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTodo.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTransactionManager.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calUtils.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapCalendar.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapCalendarItems.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapErrors.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapRequest.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapSession.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapUtils.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWeekInfoService.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWeekPrinter.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.jar +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calBackendLoader.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calCompositeCalendar.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calDavCalendar.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calDefaultACLManager.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calICALJSComponents.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calICSCalendar.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calImportExportModule.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calItemModule.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calItipEmailTransport.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calItipProtocolHandler.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calMemoryCalendar.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calSleepMonitor.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calStorageCalendar.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calTimezoneService.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calWcapCalendarModule.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/components.manifest +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/icaljs-manifest +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/interfaces.xpt +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/libcalbasecomps.so +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/libical-manifest +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/lightningTextCalendarConverter.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults/preferences/lightning.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAlarmUtils.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAsyncUtils.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAuthUtils.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calExtract.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calHashedArray.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItemUtils.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calIteratorUtils.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItipUtils.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calPrintUtils.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calProviderUtils.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calRecurrenceUtils.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageHelpers.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageUpgrade.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calUtils.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calViewUtils.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calXMLUtils.jsm +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/ical.js +lib/%%APP_NAME%%/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones/zones.json lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png +lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon64.png lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf -lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png lib/%%APP_NAME%%/icons/updater.png lib/%%APP_NAME%%/isp/Bogofilter.sfd lib/%%APP_NAME%%/isp/DSPAM.sfd @@ -56,7 +146,6 @@ lib/%%APP_NAME%%/libsoftokn3.chk lib/%%APP_NAME%%/libsoftokn3.so lib/%%APP_NAME%%/libssl3.so lib/%%APP_NAME%%/libxul.so -lib/%%APP_NAME%%/mozilla-xremote-client lib/%%APP_NAME%%/omni.ja lib/%%APP_NAME%%/platform.ini lib/%%APP_NAME%%/plugin-container Modified: branches/2015Q3/mail/thunderbird-i18n/Makefile ============================================================================== --- branches/2015Q3/mail/thunderbird-i18n/Makefile Fri Jul 24 02:55:53 2015 (r392766) +++ branches/2015Q3/mail/thunderbird-i18n/Makefile Fri Jul 24 03:31:33 2015 (r392767) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird-i18n -PORTVERSION= 31.7.0 +PORTVERSION= 38.1.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi Modified: branches/2015Q3/mail/thunderbird-i18n/Makefile.lang ============================================================================== --- branches/2015Q3/mail/thunderbird-i18n/Makefile.lang Fri Jul 24 02:55:53 2015 (r392766) +++ branches/2015Q3/mail/thunderbird-i18n/Makefile.lang Fri Jul 24 03:31:33 2015 (r392767) @@ -1,9 +1,10 @@ # $FreeBSD$ -THUNDERBIRD_I18N_ALL_= ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR \ - es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id \ - is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm \ - ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW +THUNDERBIRD_I18N_ALL_= ar ast be bg bn-BD br ca cs cy da de dsb el en-GB \ + en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he \ + hr hsb hu hy-AM id is it ja ko lt nb-NO nl nn-NO \ + pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE \ + ta-LK tr uk vi zh-CN zh-TW .if defined(THUNDERBIRD_I18N_ALL) || defined(PACKAGE_BUILDING) || target(package) THUNDERBIRD_I18N= ${THUNDERBIRD_I18N_ALL_} @@ -32,12 +33,18 @@ THUNDERBIRD_I18N+= ca .if ${PORT_OPTIONS:MLANG_CS} THUNDERBIRD_I18N+= cs .endif +.if ${PORT_OPTIONS:MLANG_CY} +THUNDERBIRD_I18N+= cy +.endif .if ${PORT_OPTIONS:MLANG_DA} THUNDERBIRD_I18N+= da .endif .if ${PORT_OPTIONS:MLANG_DE} THUNDERBIRD_I18N+= de .endif +.if ${PORT_OPTIONS:MLANG_DSB} +THUNDERBIRD_I18N+= dsb +.endif .if ${PORT_OPTIONS:MLANG_EL} THUNDERBIRD_I18N+= el .endif @@ -86,6 +93,9 @@ THUNDERBIRD_I18N+= hr .if ${PORT_OPTIONS:MLANG_HU} THUNDERBIRD_I18N+= hu .endif +.if ${PORT_OPTIONS:MLANG_HSB} +THUNDERBIRD_I18N+= hsb +.endif .if ${PORT_OPTIONS:MLANG_AM} THUNDERBIRD_I18N+= hy-AM .endif Modified: branches/2015Q3/mail/thunderbird-i18n/Makefile.option ============================================================================== --- branches/2015Q3/mail/thunderbird-i18n/Makefile.option Fri Jul 24 02:55:53 2015 (r392766) +++ branches/2015Q3/mail/thunderbird-i18n/Makefile.option Fri Jul 24 03:31:33 2015 (r392767) @@ -9,8 +9,10 @@ OPTIONS_DEFINE= LANG_AR \ LANG_CA \ LANG_CN \ LANG_CS \ + LANG_CY \ LANG_DA \ LANG_DE \ + LANG_DSB \ LANG_EL \ LANG_GB \ LANG_US \ @@ -25,6 +27,7 @@ OPTIONS_DEFINE= LANG_AR \ LANG_GD \ LANG_GL \ LANG_HE \ + LANG_HSB \ LANG_HU \ LANG_AM \ LANG_ID \ @@ -59,3 +62,6 @@ OPTIONS_DEFINE= LANG_AR \ OPTIONS_DEFAULT=LANG_CN LANG_ES LANG_PBR LANG_RU LANG_JA LANG_DE LANG_FR \ LANG_KO LANG_IT LANG_PA + +LANG_DSB_DESC?= Lower Sorbian language support +LANG_HSB_DESC?= Upper Sorbian language support Modified: branches/2015Q3/mail/thunderbird-i18n/distinfo ============================================================================== --- branches/2015Q3/mail/thunderbird-i18n/distinfo Fri Jul 24 02:55:53 2015 (r392766) +++ branches/2015Q3/mail/thunderbird-i18n/distinfo Fri Jul 24 03:31:33 2015 (r392767) @@ -1,110 +1,116 @@ -SHA256 (xpi/thunderbird-i18n-31.7.0/ar.xpi) = fac353e1067852ccac7bc23a958c54fdebd2aad30ad9551a07deb23811046d79 -SIZE (xpi/thunderbird-i18n-31.7.0/ar.xpi) = 472812 -SHA256 (xpi/thunderbird-i18n-31.7.0/ast.xpi) = 4e39fb7792c7fe787bb9d9f3a03ac57da15e9b353a51f1602afcffc3e0e0ffa8 -SIZE (xpi/thunderbird-i18n-31.7.0/ast.xpi) = 393049 -SHA256 (xpi/thunderbird-i18n-31.7.0/be.xpi) = 8be5b81c0a747d89ff9f586d726706718711a01ffd70ecbed9fe00352fb795dd -SIZE (xpi/thunderbird-i18n-31.7.0/be.xpi) = 427488 -SHA256 (xpi/thunderbird-i18n-31.7.0/bg.xpi) = 7ab3641502204c37108430f5be2f78a161b1aa5a63561c8edcf0186a7f509df6 -SIZE (xpi/thunderbird-i18n-31.7.0/bg.xpi) = 493734 -SHA256 (xpi/thunderbird-i18n-31.7.0/bn-BD.xpi) = 51cf109e8416775e656a1431630f3f4a6b0bde3e44744449283d0666284698bf -SIZE (xpi/thunderbird-i18n-31.7.0/bn-BD.xpi) = 555613 -SHA256 (xpi/thunderbird-i18n-31.7.0/br.xpi) = 97bbaea547340a56f528d8675b04a596369fb9b63245e20acd76d74211f7a668 -SIZE (xpi/thunderbird-i18n-31.7.0/br.xpi) = 441445 -SHA256 (xpi/thunderbird-i18n-31.7.0/ca.xpi) = 49d3df068e9edcf17ed99754bd45c7d00c50f4bacd7a5484ab86018197258523 -SIZE (xpi/thunderbird-i18n-31.7.0/ca.xpi) = 441713 -SHA256 (xpi/thunderbird-i18n-31.7.0/cs.xpi) = d491ebf429f56ad21632bc476f9364857ee838a330ff1b966cae2e8ec5a944e8 -SIZE (xpi/thunderbird-i18n-31.7.0/cs.xpi) = 444701 -SHA256 (xpi/thunderbird-i18n-31.7.0/da.xpi) = c95a6ce7d22eca56f365f05805393a1b52a5427af02a447f9dba1cd1559dd7c7 -SIZE (xpi/thunderbird-i18n-31.7.0/da.xpi) = 422052 -SHA256 (xpi/thunderbird-i18n-31.7.0/de.xpi) = 0debd56af6d8872d525e62ae8fd609620c3a66a425817dec83d701346fd766ba -SIZE (xpi/thunderbird-i18n-31.7.0/de.xpi) = 424665 -SHA256 (xpi/thunderbird-i18n-31.7.0/el.xpi) = 9b3ca0a7df6b8bc91274b2b757dfb909beb04815cf51b377b22755114776b536 -SIZE (xpi/thunderbird-i18n-31.7.0/el.xpi) = 484855 -SHA256 (xpi/thunderbird-i18n-31.7.0/en-GB.xpi) = d8d4dc74889792dc9b434f11a8934d5363dafb07aada75068809f1d3ceba7d66 -SIZE (xpi/thunderbird-i18n-31.7.0/en-GB.xpi) = 412515 -SHA256 (xpi/thunderbird-i18n-31.7.0/en-US.xpi) = c4e5def480042a55d8532129f3bd5226004b98f5dd3991eeb429a35152f4391e -SIZE (xpi/thunderbird-i18n-31.7.0/en-US.xpi) = 413660 -SHA256 (xpi/thunderbird-i18n-31.7.0/es-AR.xpi) = e0bf50d99447934d0f9865329469559308ab54c32d2d64321a9742b3aa4be063 -SIZE (xpi/thunderbird-i18n-31.7.0/es-AR.xpi) = 438531 -SHA256 (xpi/thunderbird-i18n-31.7.0/es-ES.xpi) = 162a5c3879bb4d826b8cfea0dd68cf13f29d417bac79cc2482dd78d76cc0a8f7 -SIZE (xpi/thunderbird-i18n-31.7.0/es-ES.xpi) = 374979 -SHA256 (xpi/thunderbird-i18n-31.7.0/et.xpi) = 9f5846d2147eeb8a834a282abc80ef1cd58389faaf4a0dfedfc4e91cd28faaf5 -SIZE (xpi/thunderbird-i18n-31.7.0/et.xpi) = 434364 -SHA256 (xpi/thunderbird-i18n-31.7.0/eu.xpi) = bba78265515862435a7aa19345460c0bdd192be207550f6a9ac0cdb7de535ac8 -SIZE (xpi/thunderbird-i18n-31.7.0/eu.xpi) = 431449 -SHA256 (xpi/thunderbird-i18n-31.7.0/fi.xpi) = bdf3d4bf05bc66951c9d861af635c791fd3513f578fe32a9ccc150aa81ba6304 -SIZE (xpi/thunderbird-i18n-31.7.0/fi.xpi) = 435632 -SHA256 (xpi/thunderbird-i18n-31.7.0/fr.xpi) = 5700997d79942d74db684fddb255ee1e5a1b10b0c7c0df875b917dbba91f9607 -SIZE (xpi/thunderbird-i18n-31.7.0/fr.xpi) = 444144 -SHA256 (xpi/thunderbird-i18n-31.7.0/fy-NL.xpi) = ed3f3e4bbba12218a0025747257cdaefceb4f37ce65fbf8e3ec1746cacf62d62 -SIZE (xpi/thunderbird-i18n-31.7.0/fy-NL.xpi) = 438544 -SHA256 (xpi/thunderbird-i18n-31.7.0/ga-IE.xpi) = 788127820d6404540b698794a9008990f77005056ec1f15da05785087729c178 -SIZE (xpi/thunderbird-i18n-31.7.0/ga-IE.xpi) = 449362 -SHA256 (xpi/thunderbird-i18n-31.7.0/gd.xpi) = f688f29b6e4032d6f6fd9b3e7ae20d2f94f7ae34e977bcb1ea1e9b4393ac9f4d -SIZE (xpi/thunderbird-i18n-31.7.0/gd.xpi) = 453172 -SHA256 (xpi/thunderbird-i18n-31.7.0/gl.xpi) = 52ba67336de4d8d19ac1d29d22df362af9e8b43a2cb800a0303b51e0b6d4c4fb -SIZE (xpi/thunderbird-i18n-31.7.0/gl.xpi) = 446788 -SHA256 (xpi/thunderbird-i18n-31.7.0/he.xpi) = 39519209cf6c19208e8c677439b3cad194d9d14f7ff3814c189890d6285b7af7 -SIZE (xpi/thunderbird-i18n-31.7.0/he.xpi) = 476111 -SHA256 (xpi/thunderbird-i18n-31.7.0/hr.xpi) = 7abab0668491b42dff80e8b656407b9489f8a133a58f0ca42f8c83a1973efd77 -SIZE (xpi/thunderbird-i18n-31.7.0/hr.xpi) = 436980 -SHA256 (xpi/thunderbird-i18n-31.7.0/hu.xpi) = ec4d3c63698bc825fee4a2dedde66a7796fef0efee8df307d8f233f382ba784a -SIZE (xpi/thunderbird-i18n-31.7.0/hu.xpi) = 454542 -SHA256 (xpi/thunderbird-i18n-31.7.0/hy-AM.xpi) = f22b7f8a56d6b92448d4b1cf471fdad56cef13e8668a472e833a8efc8400b53f -SIZE (xpi/thunderbird-i18n-31.7.0/hy-AM.xpi) = 492766 -SHA256 (xpi/thunderbird-i18n-31.7.0/id.xpi) = 40c62742c10f08f1b93e68b026b48b849dcf323f99987720be19c0bc0f4fbb7f -SIZE (xpi/thunderbird-i18n-31.7.0/id.xpi) = 475876 -SHA256 (xpi/thunderbird-i18n-31.7.0/is.xpi) = 1007cd1f3f72deecdbfbb3ec54837955f53235de4b39405158eec9dd74750246 -SIZE (xpi/thunderbird-i18n-31.7.0/is.xpi) = 437959 -SHA256 (xpi/thunderbird-i18n-31.7.0/it.xpi) = 6de47224c4342a1fc1c81d8ec0bab90cdacb4b4e54709e9590c2bd341fbfbae7 -SIZE (xpi/thunderbird-i18n-31.7.0/it.xpi) = 368001 -SHA256 (xpi/thunderbird-i18n-31.7.0/ja.xpi) = 4e3f6637cccafab04d665bb66b2d808797384c3b322a4375efcb9a3be480fe7f -SIZE (xpi/thunderbird-i18n-31.7.0/ja.xpi) = 489267 -SHA256 (xpi/thunderbird-i18n-31.7.0/ko.xpi) = 6c962ee2ce9051223897ace9fa6d7c60ffb7e95b103a52bad0f17803efcfeaf2 -SIZE (xpi/thunderbird-i18n-31.7.0/ko.xpi) = 448920 -SHA256 (xpi/thunderbird-i18n-31.7.0/lt.xpi) = 9dbde5ddc20a9512320490318f5f6278d5626357f3b17401482a439a4f6be654 -SIZE (xpi/thunderbird-i18n-31.7.0/lt.xpi) = 456352 -SHA256 (xpi/thunderbird-i18n-31.7.0/nb-NO.xpi) = 51a38f39dfc18d945a0985a23d0b7770f8fe3cebf8a28f22fd92bb288345a9b0 -SIZE (xpi/thunderbird-i18n-31.7.0/nb-NO.xpi) = 430942 -SHA256 (xpi/thunderbird-i18n-31.7.0/nl.xpi) = 784ba5505afef70f492a85651c632da974c01bf1c5a945ff132df40b077304d7 -SIZE (xpi/thunderbird-i18n-31.7.0/nl.xpi) = 431888 -SHA256 (xpi/thunderbird-i18n-31.7.0/nn-NO.xpi) = cfd312de7632a96facd36acdc00a04bc571101d655c5c8f70300d3f982b58366 -SIZE (xpi/thunderbird-i18n-31.7.0/nn-NO.xpi) = 433198 -SHA256 (xpi/thunderbird-i18n-31.7.0/pa-IN.xpi) = e444889660a60b44a3e5e6fc94972e2b8a2b97e0fa8959b41bcacacfc8be931d -SIZE (xpi/thunderbird-i18n-31.7.0/pa-IN.xpi) = 525323 -SHA256 (xpi/thunderbird-i18n-31.7.0/pl.xpi) = 3ef71ff4f72e28f15ea76764be9179cefdbf92a2270e87dad557cbf6d6c44f36 -SIZE (xpi/thunderbird-i18n-31.7.0/pl.xpi) = 410873 -SHA256 (xpi/thunderbird-i18n-31.7.0/pt-BR.xpi) = 298f9a4a205a77e471f96e38d12dbba00b6fb9ddf89b496e8b5eb106d1f33c97 -SIZE (xpi/thunderbird-i18n-31.7.0/pt-BR.xpi) = 450477 -SHA256 (xpi/thunderbird-i18n-31.7.0/pt-PT.xpi) = e01d684612fd224536e9cb21f44ace5cab81bf8fd15e8e5265847df1b2407a59 -SIZE (xpi/thunderbird-i18n-31.7.0/pt-PT.xpi) = 439603 -SHA256 (xpi/thunderbird-i18n-31.7.0/rm.xpi) = 0d2606836428595232daf0aedbafea4935e641658712fd99e34668e686c0d2e7 -SIZE (xpi/thunderbird-i18n-31.7.0/rm.xpi) = 439185 -SHA256 (xpi/thunderbird-i18n-31.7.0/ro.xpi) = 7de4b8e3ffcf3ac7ced5aeae0ca84d1e9c8603646e54473665505e1f1ac66925 -SIZE (xpi/thunderbird-i18n-31.7.0/ro.xpi) = 479749 -SHA256 (xpi/thunderbird-i18n-31.7.0/ru.xpi) = 38b372432b02c42703e3f425946cee6a42918d574f7bff7df5f9997ddb076f64 -SIZE (xpi/thunderbird-i18n-31.7.0/ru.xpi) = 436156 -SHA256 (xpi/thunderbird-i18n-31.7.0/si.xpi) = 3441d57aeedf15c5a29800e8f544b8571d41e5ed5a381d8bb2087cda97074970 -SIZE (xpi/thunderbird-i18n-31.7.0/si.xpi) = 528812 -SHA256 (xpi/thunderbird-i18n-31.7.0/sk.xpi) = dcd56d713daa7b6fb03d64219797e159eab8bef2e7eb9bd7999c0b285a24d153 -SIZE (xpi/thunderbird-i18n-31.7.0/sk.xpi) = 452995 -SHA256 (xpi/thunderbird-i18n-31.7.0/sl.xpi) = 7e7fb8287b9255aa8988bf63677e0bed8ae30c0da5ac7d83ba1300ba2bca41d3 -SIZE (xpi/thunderbird-i18n-31.7.0/sl.xpi) = 433874 -SHA256 (xpi/thunderbird-i18n-31.7.0/sq.xpi) = b9270889a4905233e450be25d61e4a1359a057bc6c021d5aba23a941cde56123 -SIZE (xpi/thunderbird-i18n-31.7.0/sq.xpi) = 454695 -SHA256 (xpi/thunderbird-i18n-31.7.0/sr.xpi) = 0ef471cf54c052214d5169189a72efc0e8d65801e482aeff413ffc7c822c1651 -SIZE (xpi/thunderbird-i18n-31.7.0/sr.xpi) = 537335 -SHA256 (xpi/thunderbird-i18n-31.7.0/sv-SE.xpi) = 803529203aded6bf1194a6d5d575f5e16f8a4a249a68878650c5469e92512923 -SIZE (xpi/thunderbird-i18n-31.7.0/sv-SE.xpi) = 436106 -SHA256 (xpi/thunderbird-i18n-31.7.0/ta-LK.xpi) = 3529d8a55ea5458edf24059d55178b6c4935aa82b604bc1c46e4b4bffb88234b -SIZE (xpi/thunderbird-i18n-31.7.0/ta-LK.xpi) = 553509 -SHA256 (xpi/thunderbird-i18n-31.7.0/tr.xpi) = e83e64f528b12b1550efb28ba4dea51e7912ab2af470c1382d78e01d9dc3a3ff -SIZE (xpi/thunderbird-i18n-31.7.0/tr.xpi) = 457360 -SHA256 (xpi/thunderbird-i18n-31.7.0/uk.xpi) = 12c2001834af439d1a0f95ed3f416788672d41c5b02481d26e54f66e721c83a6 -SIZE (xpi/thunderbird-i18n-31.7.0/uk.xpi) = 499656 -SHA256 (xpi/thunderbird-i18n-31.7.0/vi.xpi) = 7a20d9842117105f4ac641d602977cf20d4149564593adba0f3415976fd7b52d -SIZE (xpi/thunderbird-i18n-31.7.0/vi.xpi) = 513835 -SHA256 (xpi/thunderbird-i18n-31.7.0/zh-CN.xpi) = f582fac503f385ceb59761134ed24170ded9f65861106ff77219040b169e6a37 -SIZE (xpi/thunderbird-i18n-31.7.0/zh-CN.xpi) = 462668 -SHA256 (xpi/thunderbird-i18n-31.7.0/zh-TW.xpi) = 3b60993a3c85f61ef57b02334d3a71d864e9e6609ec29f398c1f60094cad43a3 -SIZE (xpi/thunderbird-i18n-31.7.0/zh-TW.xpi) = 463408 +SHA256 (xpi/thunderbird-i18n-38.1.0/ar.xpi) = 8bc4384ede05efcb02e67a8888651a81f22cbaea3bbf6072e156d707e2a9ad49 +SIZE (xpi/thunderbird-i18n-38.1.0/ar.xpi) = 475295 +SHA256 (xpi/thunderbird-i18n-38.1.0/ast.xpi) = 2a8b35fb65014cc2789e38a396a9c153b8726f5cc5c50ec042e29d9c7972b4fb +SIZE (xpi/thunderbird-i18n-38.1.0/ast.xpi) = 405893 +SHA256 (xpi/thunderbird-i18n-38.1.0/be.xpi) = 0bd3e4dcc65e44d62127fb1832803f75a0bad4cd179135375460327363e81864 +SIZE (xpi/thunderbird-i18n-38.1.0/be.xpi) = 442473 +SHA256 (xpi/thunderbird-i18n-38.1.0/bg.xpi) = 806a7f2d151db0f5334b2791dbd708b3f631b2ec214b2f6edfa7aa95abe0b59a +SIZE (xpi/thunderbird-i18n-38.1.0/bg.xpi) = 506149 +SHA256 (xpi/thunderbird-i18n-38.1.0/bn-BD.xpi) = 5f16873ea47e84fb01a263f7ab59a90188ad6c5b57ab13b90c925b4a8d0bf06a +SIZE (xpi/thunderbird-i18n-38.1.0/bn-BD.xpi) = 560648 +SHA256 (xpi/thunderbird-i18n-38.1.0/br.xpi) = c976d2fdb520e178df568a5824f4416b043f9ebbe436ddbfb81ef5b5f972d6e9 +SIZE (xpi/thunderbird-i18n-38.1.0/br.xpi) = 449788 +SHA256 (xpi/thunderbird-i18n-38.1.0/ca.xpi) = 82a2eef48fefe335f1f8d53d21861a45f7b73b4ad8b65c912f9820bf69273309 +SIZE (xpi/thunderbird-i18n-38.1.0/ca.xpi) = 450347 +SHA256 (xpi/thunderbird-i18n-38.1.0/cs.xpi) = a1e0b882b599705e1150a66139fee97dc009be2a8e64e6a7c2b1158373bfd3ca +SIZE (xpi/thunderbird-i18n-38.1.0/cs.xpi) = 448723 +SHA256 (xpi/thunderbird-i18n-38.1.0/cy.xpi) = 877cbe5d9dba3f90c2754788baaa137fb45bf9e2d071a50df69e970f341a6365 +SIZE (xpi/thunderbird-i18n-38.1.0/cy.xpi) = 434848 +SHA256 (xpi/thunderbird-i18n-38.1.0/da.xpi) = fad0fc825311a1b546eb117c8cc838f542485ff87cb71c5a656c449366a71526 +SIZE (xpi/thunderbird-i18n-38.1.0/da.xpi) = 425828 +SHA256 (xpi/thunderbird-i18n-38.1.0/de.xpi) = bc900b8f0f2db4c0e5527780db826789d61bf5b265ccf62033909fbb4f21e12e +SIZE (xpi/thunderbird-i18n-38.1.0/de.xpi) = 429876 +SHA256 (xpi/thunderbird-i18n-38.1.0/dsb.xpi) = 06ebda860118ac5833c6d8884a4e94bab7265622a48978c0e1b472055f784314 +SIZE (xpi/thunderbird-i18n-38.1.0/dsb.xpi) = 458486 +SHA256 (xpi/thunderbird-i18n-38.1.0/el.xpi) = d6df1e34d17723f2b52aecea1fab9af964bd936816f51e5dc0f335bbf59a9a6c +SIZE (xpi/thunderbird-i18n-38.1.0/el.xpi) = 493511 +SHA256 (xpi/thunderbird-i18n-38.1.0/en-GB.xpi) = 07e443159860c85c82f01dbc57e0c83904fa7788dd69fb234970ef0484afdc81 +SIZE (xpi/thunderbird-i18n-38.1.0/en-GB.xpi) = 416571 +SHA256 (xpi/thunderbird-i18n-38.1.0/en-US.xpi) = ef68841d061f743ab199e087ab45c12a2f1c4b481d2017f535bcadab2e8902ad +SIZE (xpi/thunderbird-i18n-38.1.0/en-US.xpi) = 416640 +SHA256 (xpi/thunderbird-i18n-38.1.0/es-AR.xpi) = c5b0d927e51ef06414cc14a64ab84d0d4e3b86f2833dd0bc1211a056507d425d +SIZE (xpi/thunderbird-i18n-38.1.0/es-AR.xpi) = 442640 +SHA256 (xpi/thunderbird-i18n-38.1.0/es-ES.xpi) = 79bb32e02108f6f8971c6504adc39ff45a202cb91b6e7daca286a3b0aaa6e1b0 +SIZE (xpi/thunderbird-i18n-38.1.0/es-ES.xpi) = 376066 +SHA256 (xpi/thunderbird-i18n-38.1.0/et.xpi) = 9fe401fa441232dd29fee49d26fcb65af34ccffc2666bf2fb09546a947d91e9d +SIZE (xpi/thunderbird-i18n-38.1.0/et.xpi) = 438262 +SHA256 (xpi/thunderbird-i18n-38.1.0/eu.xpi) = 0d54de9beec9e2f232a016d93d0b626bf8be86a1966ad6fb02c8d1cfe531a3f0 +SIZE (xpi/thunderbird-i18n-38.1.0/eu.xpi) = 434837 +SHA256 (xpi/thunderbird-i18n-38.1.0/fi.xpi) = cc7bf6325bf7d4c914cb7958687c776db8e2444cd969ac16e91d6a67be0ab729 +SIZE (xpi/thunderbird-i18n-38.1.0/fi.xpi) = 438889 +SHA256 (xpi/thunderbird-i18n-38.1.0/fr.xpi) = 56dbffbc5e1286f71eeb33961e209a6c6a9dd3916c4b3432733baf8f10c10e77 +SIZE (xpi/thunderbird-i18n-38.1.0/fr.xpi) = 448227 +SHA256 (xpi/thunderbird-i18n-38.1.0/fy-NL.xpi) = 00ec21c0bab139981ab81902051d7c59a5fa3a6ae7865e9613ebd95c0fe1bf87 +SIZE (xpi/thunderbird-i18n-38.1.0/fy-NL.xpi) = 442161 +SHA256 (xpi/thunderbird-i18n-38.1.0/ga-IE.xpi) = 76384620c71115c8ebb3afcc4b30de9de45d1230e44983b4bd3d1473bb9c144e +SIZE (xpi/thunderbird-i18n-38.1.0/ga-IE.xpi) = 457412 +SHA256 (xpi/thunderbird-i18n-38.1.0/gd.xpi) = 1da8565cafbb009abb0b0424fc15e0dc2bcf2c3048e14f7e1cf5e62bb5618835 +SIZE (xpi/thunderbird-i18n-38.1.0/gd.xpi) = 456317 +SHA256 (xpi/thunderbird-i18n-38.1.0/gl.xpi) = ff3d29d1a050b74e64e0a4450b65edb247a5eb36a1b8df6b57dc3851b1658fd3 +SIZE (xpi/thunderbird-i18n-38.1.0/gl.xpi) = 457860 +SHA256 (xpi/thunderbird-i18n-38.1.0/he.xpi) = aab3240dca233f9e6ec9077be40a3d0033d75ccbd196a9ccce2726261c9d4c41 +SIZE (xpi/thunderbird-i18n-38.1.0/he.xpi) = 485888 +SHA256 (xpi/thunderbird-i18n-38.1.0/hr.xpi) = f368ccd53d7d405c07149b351f56d391142b40e8774d9d7fa623ff3318428b6a +SIZE (xpi/thunderbird-i18n-38.1.0/hr.xpi) = 440419 +SHA256 (xpi/thunderbird-i18n-38.1.0/hsb.xpi) = f47a8a2ff662acef03541ead6caf3e900706ce348b7577cd656222e9dcc2c47a +SIZE (xpi/thunderbird-i18n-38.1.0/hsb.xpi) = 456454 +SHA256 (xpi/thunderbird-i18n-38.1.0/hu.xpi) = c8393cb2f5c8aab62fec71e53f19791e7ce4d3acc37814a4796e7b390a4e1fcf +SIZE (xpi/thunderbird-i18n-38.1.0/hu.xpi) = 457987 +SHA256 (xpi/thunderbird-i18n-38.1.0/hy-AM.xpi) = 56454db77528fd2bc02abd4f4ecde69adbe278cbe807842e3e92d709d5df526c +SIZE (xpi/thunderbird-i18n-38.1.0/hy-AM.xpi) = 500379 +SHA256 (xpi/thunderbird-i18n-38.1.0/id.xpi) = 913db42b7530f55a8f3836d4dd493cf45df86509c77cfc64aca28c4bf60c6321 +SIZE (xpi/thunderbird-i18n-38.1.0/id.xpi) = 483209 +SHA256 (xpi/thunderbird-i18n-38.1.0/is.xpi) = 0a0194046282ea36e3c48238f08bfa9ffff07531d473b9a800628b6fb22b4970 +SIZE (xpi/thunderbird-i18n-38.1.0/is.xpi) = 443008 +SHA256 (xpi/thunderbird-i18n-38.1.0/it.xpi) = 2b7659c9a0c57e608d05f64bff90b3f6e631ce089ed1135465e89a133482fca7 +SIZE (xpi/thunderbird-i18n-38.1.0/it.xpi) = 369023 +SHA256 (xpi/thunderbird-i18n-38.1.0/ja.xpi) = c790816d9a735d0ff3e3d82516b6c10076a94c6e278fdea05f04d52615984257 +SIZE (xpi/thunderbird-i18n-38.1.0/ja.xpi) = 492860 +SHA256 (xpi/thunderbird-i18n-38.1.0/ko.xpi) = 42a147ac06a0cd7995a78f014259464db2e51391aec4ea16a548e0d5f156d951 +SIZE (xpi/thunderbird-i18n-38.1.0/ko.xpi) = 454852 +SHA256 (xpi/thunderbird-i18n-38.1.0/lt.xpi) = bbdb182ae21c8b8da1175b5a936e8563250838e538004a45b7847d27a0b192ad +SIZE (xpi/thunderbird-i18n-38.1.0/lt.xpi) = 454571 +SHA256 (xpi/thunderbird-i18n-38.1.0/nb-NO.xpi) = e4b10c9cfd80c6f9b683880e454cc3dcd2e9eb01acdc0090e73b6c6b6b71a7d3 +SIZE (xpi/thunderbird-i18n-38.1.0/nb-NO.xpi) = 434340 +SHA256 (xpi/thunderbird-i18n-38.1.0/nl.xpi) = 032f473e1fce313d8d9cdcc49cdaf390711c266069c45df4dbee2e9c81e19b0d +SIZE (xpi/thunderbird-i18n-38.1.0/nl.xpi) = 435107 +SHA256 (xpi/thunderbird-i18n-38.1.0/nn-NO.xpi) = 361710679e3229b98aa5785b1cf36afa493e5ded84353a69574e4cbe7f5bbe29 +SIZE (xpi/thunderbird-i18n-38.1.0/nn-NO.xpi) = 436622 +SHA256 (xpi/thunderbird-i18n-38.1.0/pa-IN.xpi) = 53afb6a6ff09df13b97ffc88f95a527d860e751fd79e873a78be2e7bd977a15e +SIZE (xpi/thunderbird-i18n-38.1.0/pa-IN.xpi) = 530483 +SHA256 (xpi/thunderbird-i18n-38.1.0/pl.xpi) = d9c770408d6b8cc52df4113ccfeb339fc7e34ca45a62df49ee5f24e70a5e3503 +SIZE (xpi/thunderbird-i18n-38.1.0/pl.xpi) = 411508 +SHA256 (xpi/thunderbird-i18n-38.1.0/pt-BR.xpi) = 8160379e9ff6319939e7a9e2d37c0a7f66f436796f16c0c3ef8a70f1a2e17ea0 +SIZE (xpi/thunderbird-i18n-38.1.0/pt-BR.xpi) = 443773 +SHA256 (xpi/thunderbird-i18n-38.1.0/pt-PT.xpi) = d6354d745df58c48d15792c35aa8f4874d11bff0980df6b567de58f659357efe +SIZE (xpi/thunderbird-i18n-38.1.0/pt-PT.xpi) = 442063 +SHA256 (xpi/thunderbird-i18n-38.1.0/rm.xpi) = fbc4bb3603cd5927c98e82ca83e830bd0c0807cc63ee0215f60e1cea66cc4400 +SIZE (xpi/thunderbird-i18n-38.1.0/rm.xpi) = 442112 +SHA256 (xpi/thunderbird-i18n-38.1.0/ro.xpi) = 2e768e1a2e9ae04bafea1948c19b2b6e83f436f3a2841a94550f95bde7b30b42 +SIZE (xpi/thunderbird-i18n-38.1.0/ro.xpi) = 448347 +SHA256 (xpi/thunderbird-i18n-38.1.0/ru.xpi) = 85ab5454186b1a35c1268a8854b2407f1a260857a092de2cdc1c0fb84e278104 +SIZE (xpi/thunderbird-i18n-38.1.0/ru.xpi) = 437591 +SHA256 (xpi/thunderbird-i18n-38.1.0/si.xpi) = 8df4c4ca6dbb901f419b69b37da8b0762483e080513b6cebe0d4424444f6ce25 +SIZE (xpi/thunderbird-i18n-38.1.0/si.xpi) = 535362 +SHA256 (xpi/thunderbird-i18n-38.1.0/sk.xpi) = 8b34d932a49e56cc47b9dae57f7a515b40bcc1ae4efa50f1dd275855abb30659 +SIZE (xpi/thunderbird-i18n-38.1.0/sk.xpi) = 456606 +SHA256 (xpi/thunderbird-i18n-38.1.0/sl.xpi) = 7d2bbe2b04052165bde61b4e24f2c928460f914a57c8bec36d3496de67d5dd66 +SIZE (xpi/thunderbird-i18n-38.1.0/sl.xpi) = 437847 +SHA256 (xpi/thunderbird-i18n-38.1.0/sq.xpi) = 0e41b9ab3ec7853e3c8d19ad6380598ccc4d04884426f64be577a045f876cdd6 +SIZE (xpi/thunderbird-i18n-38.1.0/sq.xpi) = 446896 +SHA256 (xpi/thunderbird-i18n-38.1.0/sr.xpi) = c2d6d4a751580f2107aaeec7f23584ca7a8803cd15289fbf863d124a1801ffee +SIZE (xpi/thunderbird-i18n-38.1.0/sr.xpi) = 543336 +SHA256 (xpi/thunderbird-i18n-38.1.0/sv-SE.xpi) = 59cfe9b9ee411b92e288d0050ba3baddd5bc7bb779ed4fbff7681ae252053133 +SIZE (xpi/thunderbird-i18n-38.1.0/sv-SE.xpi) = 439633 +SHA256 (xpi/thunderbird-i18n-38.1.0/ta-LK.xpi) = 891b12e9f7722c570189c0c47a814e96ac3ef9e16b2d50625a4766085649d16f +SIZE (xpi/thunderbird-i18n-38.1.0/ta-LK.xpi) = 558759 +SHA256 (xpi/thunderbird-i18n-38.1.0/tr.xpi) = 5b42a203b0a6938a9967ce982fb800bd4db8ef0d2def1b9966e1352e843729fc +SIZE (xpi/thunderbird-i18n-38.1.0/tr.xpi) = 447799 +SHA256 (xpi/thunderbird-i18n-38.1.0/uk.xpi) = e32214709147900c4336af83dce5445614b72d4059dad67b6f703a0853ec2ad1 +SIZE (xpi/thunderbird-i18n-38.1.0/uk.xpi) = 509621 +SHA256 (xpi/thunderbird-i18n-38.1.0/vi.xpi) = 6d9b056f1d13e7dd95b79780c65e202c5c428f87e206370a5264644579a41626 +SIZE (xpi/thunderbird-i18n-38.1.0/vi.xpi) = 519864 +SHA256 (xpi/thunderbird-i18n-38.1.0/zh-CN.xpi) = 9d00bbc2f01c6974877923f9d770e16112b5e859788a728a7244052361f1ea7b +SIZE (xpi/thunderbird-i18n-38.1.0/zh-CN.xpi) = 466411 +SHA256 (xpi/thunderbird-i18n-38.1.0/zh-TW.xpi) = 65dd33db3a18a4f8eeb54b953650a3a592a8821765e44888849f15531bcf88ca +SIZE (xpi/thunderbird-i18n-38.1.0/zh-TW.xpi) = 466660 Modified: branches/2015Q3/mail/thunderbird/Makefile ============================================================================== --- branches/2015Q3/mail/thunderbird/Makefile Fri Jul 24 02:55:53 2015 (r392766) +++ branches/2015Q3/mail/thunderbird/Makefile Fri Jul 24 03:31:33 2015 (r392767) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 31.7.0 -PORTREVISION= 1 +DISTVERSION= 38.1.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source @@ -13,31 +12,32 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.10.6:${PORTSDIR}/devel/nspr \ - nss>=3.16.2.3:${PORTSDIR}/security/nss \ +BUILD_DEPENDS= nspr>=4.10.8:${PORTSDIR}/devel/nspr \ + nss>=3.19.2:${PORTSDIR}/security/nss \ libevent2>=2.0.21_2:${PORTSDIR}/devel/libevent2 \ cairo>=1.12.16_1,2:${PORTSDIR}/graphics/cairo \ soundtouch>=1.8.0:${PORTSDIR}/audio/soundtouch \ - harfbuzz>=0.9.25:${PORTSDIR}/print/harfbuzz \ + harfbuzz>=0.9.34:${PORTSDIR}/print/harfbuzz \ graphite2>=1.2.4:${PORTSDIR}/graphics/graphite2 \ libvorbis>=1.3.5:${PORTSDIR}/audio/libvorbis \ opus>=1.1:${PORTSDIR}/audio/opus \ libvpx>=1.3.0:${PORTSDIR}/multimedia/libvpx \ - sqlite3>=3.8.4.2:${PORTSDIR}/databases/sqlite3 \ + sqlite3>=3.8.9:${PORTSDIR}/databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \ v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip +# opus>=1.1:${PORTSDIR}/audio/opus \ LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l EM_VERSION= 1.8.2 -L_VERSION= 3.3.7 +L_VERSION= 4.0.1 SSP_UNSAFE= yes USE_GECKO= gecko -USE_MOZILLA= # empty +USE_MOZILLA= -opus USE_QT5= # empty QT_NONSTANDARD= yes @@ -67,7 +67,7 @@ OPTIONS_DEFAULT:=${OPTIONS_DEFAULT:S/GST .include -WRKSRC= ${WRKDIR}/comm-esr31 +WRKSRC= ${WRKDIR}/comm-esr38 MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi @@ -103,7 +103,7 @@ EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/ins MOZ_OPTIONS+= --enable-calendar MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:tl}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi +XPI_FILE= ${MOZ_OBJDIR}/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:tl}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} XPI_ID= lightning@thunderbird.mozilla.org .else Modified: branches/2015Q3/mail/thunderbird/distinfo ============================================================================== --- branches/2015Q3/mail/thunderbird/distinfo Fri Jul 24 02:55:53 2015 (r392766) +++ branches/2015Q3/mail/thunderbird/distinfo Fri Jul 24 03:31:33 2015 (r392767) @@ -1,4 +1,4 @@ -SHA256 (thunderbird-31.7.0.source.tar.bz2) = dc3a6afaab486ba09745898f55986f98cc9bf7647cd992849f9c7ead563479b7 -SIZE (thunderbird-31.7.0.source.tar.bz2) = 171059989 +SHA256 (thunderbird-38.1.0.source.tar.bz2) = ddf1fd6048f07370bb0375eac76e687c19d29100c19e9f86fc04bb88d4409787 +SIZE (thunderbird-38.1.0.source.tar.bz2) = 204161689 SHA256 (enigmail-1.8.2.tar.gz) = 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SIZE (enigmail-1.8.2.tar.gz) = 1604159 Modified: branches/2015Q3/mail/thunderbird/files/patch-bug1021761 ============================================================================== --- branches/2015Q3/mail/thunderbird/files/patch-bug1021761 Fri Jul 24 02:55:53 2015 (r392766) +++ branches/2015Q3/mail/thunderbird/files/patch-bug1021761 Fri Jul 24 03:31:33 2015 (r392767) @@ -218,12 +218,12 @@ index a962553..1f780f4 100644 assert(p); pthread_mutex_unlock(&stm->mutex); -@@ -313,10 +360,10 @@ alsa_refill_stream(cubeb_stream * stm) - return ERROR; - } - if (got > 0) { -- snd_pcm_sframes_t wrote = snd_pcm_writei(stm->pcm, p, got); -+ snd_pcm_sframes_t wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got); +@@ -327,10 +374,10 @@ alsa_refill_stream(cubeb_stream * stm) + b[i] *= stm->volume; + } + } +- wrote = snd_pcm_writei(stm->pcm, p, got); ++ wrote = WRAP(snd_pcm_writei)(stm->pcm, p, got); if (wrote == -EPIPE) { - snd_pcm_recover(stm->pcm, wrote, 1); - wrote = snd_pcm_writei(stm->pcm, p, got); @@ -533,42 +533,51 @@ index a962553..1f780f4 100644 assert((nfds_t) r == stm->nfds); r = pthread_cond_init(&stm->cond, NULL); -@@ -937,12 +1043,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) +@@ -895,7 +1001,7 @@ alsa_stream_destroy(cubeb_stream * stm) + pthread_mutex_lock(&stm->mutex); + if (stm->pcm) { + if (stm->state == DRAINING) { +- snd_pcm_drain(stm->pcm); ++ WRAP(snd_pcm_drain)(stm->pcm); + } + alsa_locked_pcm_close(stm->pcm); + stm->pcm = NULL; +@@ -938,12 +1044,12 @@ alsa_get_max_channel_count(cubeb * ctx, uint32_t * max_channels) return CUBEB_ERROR; } -- rv = snd_pcm_hw_params_any(stm->pcm, hw_params); -+ rv = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); - if (rv < 0) { +- r = snd_pcm_hw_params_any(stm->pcm, hw_params); ++ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params); + if (r < 0) { return CUBEB_ERROR; } -- rv = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); -+ rv = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); - if (rv < 0) { +- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels); ++ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels); + if (r < 0) { return CUBEB_ERROR; } -@@ -962,34 +1068,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) { +@@ -963,34 +1069,34 @@ alsa_get_preferred_sample_rate(cubeb * ctx, uint32_t * rate) { /* get a pcm, disabling resampling, so we get a rate the * hardware/dmix/pulse/etc. supports. */ -- rv = snd_pcm_open(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); -+ rv = WRAP(snd_pcm_open)(&pcm, "", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); - if (rv < 0) { +- r = snd_pcm_open(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); ++ r = WRAP(snd_pcm_open)(&pcm, "default", SND_PCM_STREAM_PLAYBACK | SND_PCM_NO_AUTO_RESAMPLE, 0); + if (r < 0) { return CUBEB_ERROR; } -- rv = snd_pcm_hw_params_any(pcm, hw_params); -+ rv = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); - if (rv < 0) { +- r = snd_pcm_hw_params_any(pcm, hw_params); ++ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params); + if (r < 0) { - snd_pcm_close(pcm); + WRAP(snd_pcm_close)(pcm); return CUBEB_ERROR; } -- rv = snd_pcm_hw_params_get_rate(hw_params, rate, &dir); -+ rv = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir); - if (rv >= 0) { +- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir); ++ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir); + if (r >= 0) { /* There is a default rate: use it. */ - snd_pcm_close(pcm); + WRAP(snd_pcm_close)(pcm); @@ -578,9 +587,9 @@ index a962553..1f780f4 100644 /* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */ *rate = 44100; -- rv = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); -+ rv = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); - if (rv < 0) { +- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL); ++ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL); + if (r < 0) { - snd_pcm_close(pcm); + WRAP(snd_pcm_close)(pcm); return CUBEB_ERROR; @@ -634,7 +643,7 @@ new file mode 100644 index 0000000..5e38e27 --- /dev/null +++ mozilla/media/libcubeb/src/cubeb_oss.c -@@ -0,0 +1,397 @@ +@@ -0,0 +1,402 @@ +/* + * Copyright © 2014 Mozilla Foundation + * @@ -1030,7 +1039,12 @@ index 0000000..5e38e27 + .stream_start = oss_stream_start, + .stream_stop = oss_stream_stop, + .stream_get_position = oss_stream_get_position, -+ .stream_get_latency = oss_stream_get_latency ++ .stream_get_latency = oss_stream_get_latency, ++ .stream_set_volume = oss_stream_set_volume, ++ .stream_set_panning = oss_stream_set_panning, ++ .stream_get_current_device = NULL, ++ .stream_device_destroy = NULL, ++ .stream_register_device_changed_callback = NULL +}; diff --git media/libcubeb/src/moz.build media/libcubeb/src/moz.build index 8b7a0dd..31212ce 100644 @@ -1056,36 +1070,33 @@ index 8b7a0dd..31212ce 100644 +CFLAGS += CONFIG['MOZ_OSS_CFLAGS'] CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] -diff --git media/webrtc/signaling/test/Makefile.in media/webrtc/signaling/test/Makefile.in +diff --git media/webrtc/signaling/test/moz.build media/webrtc/signaling/test/moz.build index 991f03f..3d99eb5 100644 ---- mozilla/media/webrtc/signaling/test/Makefile.in -+++ mozilla/media/webrtc/signaling/test/Makefile.in -@@ -26,9 +26,9 @@ ifdef JS_SHARED_LIBRARY - LIBS += $(MOZ_JS_LIBS) - endif - --ifdef MOZ_ALSA -+ifdef MOZ_OSS - LIBS += \ -- $(MOZ_ALSA_LIBS) \ -+ $(MOZ_OSS_LIBS) \ - $(NULL) - endif +--- mozilla/media/webrtc/signaling/test/moz.build ++++ mozilla/media/webrtc/signaling/test/moz.build +@@ -112,8 +112,8 @@ if CONFIG['JS_SHARED_LIBRARY']: + OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] + OS_LIBS += CONFIG['REALTIME_LIBS'] + +-if CONFIG['MOZ_ALSA']: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] ++if CONFIG['MOZ_OSS']: ++ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] -diff --git toolkit/library/libxul.mk toolkit/library/libxul.mk + if CONFIG['MOZ_NATIVE_JPEG']: + OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] +diff --git toolkit/library/moz.build toolkit/library/moz.build index e191f13..4fb268a 100644 ---- mozilla/toolkit/library/libxul.mk -+++ mozilla/toolkit/library/libxul.mk -@@ -146,9 +146,9 @@ OS_LIBS += $(call EXPAND_LIBNAME,secur32 - endif - endif - --ifdef MOZ_ALSA --EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) --endif -+ifdef MOZ_OSS -+EXTRA_DSO_LDOPTS += $(MOZ_OSS_LIBS) -+endif +--- mozilla/toolkit/library/moz.build ++++ mozilla/toolkit/library/moz.build +@@ -234,8 +234,8 @@ if CONFIG['MOZ_NATIVE_LIBVPX']: + if not CONFIG['MOZ_TREE_PIXMAN']: + OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS'] + +-if CONFIG['MOZ_ALSA']: +- OS_LIBS += CONFIG['MOZ_ALSA_LIBS'] ++if CONFIG['MOZ_OSS']: ++ OS_LIBS += CONFIG['MOZ_OSS_LIBS'] - ifdef HAVE_CLOCK_MONOTONIC - EXTRA_DSO_LDOPTS += $(REALTIME_LIBS) + if CONFIG['HAVE_CLOCK_MONOTONIC']: + OS_LIBS += CONFIG['REALTIME_LIBS'] Copied: branches/2015Q3/mail/thunderbird/files/patch-bug1041268 (from r392761, head/mail/thunderbird/files/patch-bug1041268) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/mail/thunderbird/files/patch-bug1041268 Fri Jul 24 03:31:33 2015 (r392767, copy of r392761, head/mail/thunderbird/files/patch-bug1041268) @@ -0,0 +1,26 @@ +diff --git media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc +index 97f69d3..77a50b3 100644 +--- mozilla/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc ++++ mozilla/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.cc +@@ -18,7 +18,7 @@ ScreenCapturer* ScreenCapturer::Create() { + return Create(DesktopCaptureOptions::CreateDefault()); + } + +-#if defined(WEBRTC_LINUX) ++#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) + ScreenCapturer* ScreenCapturer::CreateWithXDamage( + bool use_update_notifications) { + DesktopCaptureOptions options; +diff --git media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h +index a8d40a7..177a6c1 100644 +--- mozilla/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h ++++ mozilla/media/webrtc/trunk/webrtc/modules/desktop_capture/screen_capturer.h +@@ -74,7 +74,7 @@ class ScreenCapturer : public DesktopCapturer { + static ScreenCapturer* Create(const DesktopCaptureOptions& options); + static ScreenCapturer* Create(); + +-#if defined(WEBRTC_LINUX) ++#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD) + // Creates platform-specific capturer and instructs it whether it should use + // X DAMAGE support. + static ScreenCapturer* CreateWithXDamage(bool use_x_damage); Copied: branches/2015Q3/mail/thunderbird/files/patch-bug1073117 (from r392761, head/mail/thunderbird/files/patch-bug1073117) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/mail/thunderbird/files/patch-bug1073117 Fri Jul 24 03:31:33 2015 (r392767, copy of r392761, head/mail/thunderbird/files/patch-bug1073117) @@ -0,0 +1,877 @@ +diff --git widget/gtk/gtk2drawing.c widget/gtk/gtk2drawing.c +index 34f22af..1b950ab 100644 +--- mozilla/widget/gtk/gtk2drawing.c ++++ mozilla/widget/gtk/gtk2drawing.c +@@ -831,7 +831,7 @@ moz_gtk_get_focus_outline_size(gint* focus_h_width, gint* focus_v_width) + return MOZ_GTK_SUCCESS; + } + +-gint ++static gint + moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus, + gint* focus_width, gint* focus_pad) + { +@@ -928,7 +928,7 @@ moz_gtk_splitter_get_metrics(gint orientation, gint* size) + return MOZ_GTK_SUCCESS; + } + +-gint ++static gint + moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border) + { + static const GtkBorder default_inner_border = { 1, 1, 1, 1 }; +diff --git widget/gtk/gtk3drawing.c widget/gtk/gtk3drawing.c +index 08a58d6..7fef6fa 100644 +--- mozilla/widget/gtk/gtk3drawing.c ++++ mozilla/widget/gtk/gtk3drawing.c +@@ -65,6 +65,7 @@ static GtkWidget* gScrolledWindowWidget; + static style_prop_t style_prop_func; + static gboolean have_arrow_scaling; + static gboolean checkbox_check_state; ++static gboolean notebook_has_tab_gap; + static gboolean is_initialized; + + #define ARROW_UP 0 +@@ -725,6 +726,14 @@ moz_gtk_init() + else + checkbox_check_state = GTK_STATE_FLAG_ACTIVE; + ++ if(!gtk_check_version(3, 12, 0)) { ++ ensure_tab_widget(); ++ gtk_widget_style_get(gTabWidget, "has-tab-gap", ¬ebook_has_tab_gap, NULL); ++ } ++ else { ++ notebook_has_tab_gap = TRUE; ++ } ++ + /* Add style property to GtkEntry. + * Adding the style property to the normal GtkEntry class means that it + * will work without issues inside GtkComboBox and for Spinbuttons. */ +@@ -762,37 +771,17 @@ moz_gtk_radio_get_metrics(gint* indicator_size, gint* indicator_spacing) + gint + moz_gtk_get_focus_outline_size(gint* focus_h_width, gint* focus_v_width) + { +- gboolean interior_focus; +- gint focus_width = 0; ++ GtkBorder border; ++ GtkBorder padding; ++ GtkStyleContext *style; + + ensure_entry_widget(); +- gtk_widget_style_get(gEntryWidget, +- "interior-focus", &interior_focus, +- "focus-line-width", &focus_width, +- NULL); +- if (interior_focus) { +- GtkBorder border; +- GtkStyleContext *style = gtk_widget_get_style_context(gEntryWidget); +- gtk_style_context_get_border(style, 0, &border); +- *focus_h_width = border.left + focus_width; +- *focus_v_width = border.top + focus_width; +- } else { +- *focus_h_width = focus_width; +- *focus_v_width = focus_width; +- } +- return MOZ_GTK_SUCCESS; +-} +- +-gint +-moz_gtk_widget_get_focus(GtkWidget* widget, gboolean* interior_focus, +- gint* focus_width, gint* focus_pad) +-{ +- gtk_widget_style_get (widget, +- "interior-focus", interior_focus, +- "focus-line-width", focus_width, +- "focus-padding", focus_pad, +- NULL); ++ style = gtk_widget_get_style_context(gEntryWidget); + ++ gtk_style_context_get_border(style, 0, &border); ++ gtk_style_context_get_padding(style, 0, &padding); ++ *focus_h_width = border.left + padding.left; ++ *focus_v_width = border.top + padding.top; + return MOZ_GTK_SUCCESS; + } + +@@ -880,24 +860,6 @@ moz_gtk_splitter_get_metrics(gint orientation, gint* size) + return MOZ_GTK_SUCCESS; + } + +-gint +-moz_gtk_button_get_inner_border(GtkWidget* widget, GtkBorder* inner_border) +-{ +- static const GtkBorder default_inner_border = { 1, 1, 1, 1 }; +- GtkBorder *tmp_border; +- +- gtk_widget_style_get (widget, "inner-border", &tmp_border, NULL); +- +- if (tmp_border) { +- *inner_border = *tmp_border; +- gtk_border_free(tmp_border); +- } +- else +- *inner_border = default_inner_border; +- +- return MOZ_GTK_SUCCESS; +-} +- + static gint + moz_gtk_button_paint(cairo_t *cr, GdkRectangle* rect, + GtkWidgetState* state, +@@ -908,19 +870,8 @@ moz_gtk_button_paint(cairo_t *cr, GdkRectangle* rect, + GtkStyleContext* style = gtk_widget_get_style_context(widget); + gint x = rect->x, y=rect->y, width=rect->width, height=rect->height; + +- gboolean interior_focus; +- gint focus_width, focus_pad; +- +- moz_gtk_widget_get_focus(widget, &interior_focus, &focus_width, &focus_pad); + gtk_widget_set_direction(widget, direction); +- +- if (!interior_focus && state->focused) { +- x += focus_width + focus_pad; +- y += focus_width + focus_pad; +- width -= 2 * (focus_width + focus_pad); +- height -= 2 * (focus_width + focus_pad); +- } +- ++ + gtk_style_context_save(style); + gtk_style_context_set_state(style, state_flags); + +@@ -953,20 +904,12 @@ moz_gtk_button_paint(cairo_t *cr, GdkRectangle* rect, + } + + if (state->focused) { +- if (interior_focus) { +- GtkBorder border; +- gtk_style_context_get_border(style, state_flags, &border); +- x += border.left + focus_pad; +- y += border.top + focus_pad; +- width -= 2 * (border.left + focus_pad); +- height -= 2 * (border.top + focus_pad); +- } else { +- x -= focus_width + focus_pad; +- y -= focus_width + focus_pad; +- width += 2 * (focus_width + focus_pad); +- height += 2 * (focus_width + focus_pad); +- } +- ++ GtkBorder border; ++ gtk_style_context_get_border(style, state_flags, &border); ++ x += border.left; ++ y += border.top; ++ width -= (border.left + border.right); ++ height -= (border.top + border.bottom); + gtk_render_focus(style, cr, x, y, width, height); + } + gtk_style_context_restore(style); +@@ -1056,33 +999,23 @@ calculate_button_inner_rect(GtkWidget* button, GdkRectangle* rect, + GtkTextDirection direction, + gboolean ignore_focus) + { +- GtkBorder inner_border; +- gboolean interior_focus; +- gint focus_width, focus_pad; + GtkStyleContext* style; + GtkBorder border; ++ GtkBorder padding = {0, 0, 0, 0}; + + style = gtk_widget_get_style_context(button); + + /* This mirrors gtkbutton's child positioning */ +- moz_gtk_button_get_inner_border(button, &inner_border); +- moz_gtk_widget_get_focus(button, &interior_focus, +- &focus_width, &focus_pad); +- +- if (ignore_focus) +- focus_width = focus_pad = 0; +- + gtk_style_context_get_border(style, 0, &border); ++ if (!ignore_focus) ++ gtk_style_context_get_padding(style, 0, &padding); + +- inner_rect->x = rect->x + border.left + focus_width + focus_pad; +- inner_rect->x += direction == GTK_TEXT_DIR_LTR ? *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Fri Jul 24 05:46:13 2015 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 7712F9A8C72; Fri, 24 Jul 2015 05:46:13 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 39E571CE6; Fri, 24 Jul 2015 05:46:13 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6O5kCx9000240; Fri, 24 Jul 2015 05:46:12 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6O5kB4v000237; Fri, 24 Jul 2015 05:46:11 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201507240546.t6O5kB4v000237@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Fri, 24 Jul 2015 05:46:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392769 - in branches/2015Q3/www/chromium: . files 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.20 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: Fri, 24 Jul 2015 05:46:13 -0000 Author: rene Date: Fri Jul 24 05:46:10 2015 New Revision: 392769 URL: https://svnweb.freebsd.org/changeset/ports/392769 Log: MFH: r392612 - Update to 43.0.2357.134 - Add patch from OpenBSD to handle PDF downloads Submitted by: LeFroid Obtained from: https://github.com/gliaskos/freebsd-chromium/pull/24 Approved by: ports-secteam (delphij) Added: branches/2015Q3/www/chromium/files/patch-chrome__browser__download__download_commands.cc - copied unchanged from r392612, head/www/chromium/files/patch-chrome__browser__download__download_commands.cc Modified: branches/2015Q3/www/chromium/Makefile branches/2015Q3/www/chromium/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/chromium/Makefile ============================================================================== --- branches/2015Q3/www/chromium/Makefile Fri Jul 24 04:28:40 2015 (r392768) +++ branches/2015Q3/www/chromium/Makefile Fri Jul 24 05:46:10 2015 (r392769) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 43.0.2357.132 +PORTVERSION= 43.0.2357.134 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on @@ -73,6 +73,7 @@ GYP_DEFINES+= \ linux_breakpad=0 \ linux_use_heapchecker=0 \ linux_strip_binary=1 \ + use_aura=1 \ test_isolation_mode=noop \ disable_nacl=1 \ enable_extensions=1 \ Modified: branches/2015Q3/www/chromium/distinfo ============================================================================== --- branches/2015Q3/www/chromium/distinfo Fri Jul 24 04:28:40 2015 (r392768) +++ branches/2015Q3/www/chromium/distinfo Fri Jul 24 05:46:10 2015 (r392769) @@ -1,4 +1,4 @@ -SHA256 (chromium-43.0.2357.132.tar.xz) = 405f52c6649f1d2937952fbcfcd238ba058db7d13edf4705f7027805f3ce1809 -SIZE (chromium-43.0.2357.132.tar.xz) = 290954464 -SHA256 (chromium-43.0.2357.132-testdata.tar.xz) = 9433cb06677281af688bfc5692625d610499ea803514f751bda59164fb683905 -SIZE (chromium-43.0.2357.132-testdata.tar.xz) = 127574536 +SHA256 (chromium-43.0.2357.134.tar.xz) = d3a1bbe3e1445dfcf5ef4aff4b11a8f3770436c8b8954b7cc5fee5416f117659 +SIZE (chromium-43.0.2357.134.tar.xz) = 290976408 +SHA256 (chromium-43.0.2357.134-testdata.tar.xz) = f69b79d44e670ffc73f476e1d8e08d04a540c011ff1c7b6afbc76cdde88dfdeb +SIZE (chromium-43.0.2357.134-testdata.tar.xz) = 127570540 Copied: branches/2015Q3/www/chromium/files/patch-chrome__browser__download__download_commands.cc (from r392612, head/www/chromium/files/patch-chrome__browser__download__download_commands.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/www/chromium/files/patch-chrome__browser__download__download_commands.cc Fri Jul 24 05:46:10 2015 (r392769, copy of r392612, head/www/chromium/files/patch-chrome__browser__download__download_commands.cc) @@ -0,0 +1,38 @@ +--- chrome/browser/download/download_commands.cc.orig 2015-07-16 07:26:09.936296000 -0400 ++++ chrome/browser/download/download_commands.cc 2015-07-16 07:27:35.099271000 -0400 +@@ -100,7 +100,7 @@ + download_crx_util::IsExtensionDownload(*download_item_); + case ALWAYS_OPEN_TYPE: + #if defined(OS_WIN) || defined(OS_LINUX) || \ +- (defined(OS_MACOSX) && !defined(OS_IOS)) ++ (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD) + if (CanOpenPdfInSystemViewer()) { + DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( + download_item_->GetBrowserContext()); +@@ -144,7 +144,7 @@ + DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( + download_item_->GetBrowserContext()); + #if defined(OS_WIN) || defined(OS_LINUX) || \ +- (defined(OS_MACOSX) && !defined(OS_IOS)) ++ (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD) + if (CanOpenPdfInSystemViewer()) { + prefs->SetShouldOpenPdfInSystemReader(!is_checked); + DownloadItemModel(download_item_) +@@ -218,7 +218,7 @@ + return browser_displayer.browser(); + } + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + bool DownloadCommands::IsDownloadPdf() const { + base::FilePath path = download_item_->GetTargetFilePath(); + return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); +@@ -235,7 +235,7 @@ + return IsDownloadPdf() && + (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date + : true); +-#elif defined(OS_MACOSX) || defined(OS_LINUX) ++#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + return IsDownloadPdf(); + #endif + } From owner-svn-ports-branches@freebsd.org Fri Jul 24 05:47:49 2015 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 792D09A8CBD; Fri, 24 Jul 2015 05:47:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 44C0D1DDA; Fri, 24 Jul 2015 05:47:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6O5lm4m000505; Fri, 24 Jul 2015 05:47:48 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6O5lmPu000504; Fri, 24 Jul 2015 05:47:48 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201507240547.t6O5lmPu000504@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Fri, 24 Jul 2015 05:47:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392770 - branches/2015Q3/www/chromium/files 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.20 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: Fri, 24 Jul 2015 05:47:49 -0000 Author: rene Date: Fri Jul 24 05:47:47 2015 New Revision: 392770 URL: https://svnweb.freebsd.org/changeset/ports/392770 Log: MFH: r392749 Fix passing arguments containing spaces to the wrapper shell script. PR: 195816 Submitted by: yuri@rawbw.com Approved by: ports-secteam (feld) Modified: branches/2015Q3/www/chromium/files/chrome.in Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/chromium/files/chrome.in ============================================================================== --- branches/2015Q3/www/chromium/files/chrome.in Fri Jul 24 05:46:10 2015 (r392769) +++ branches/2015Q3/www/chromium/files/chrome.in Fri Jul 24 05:47:47 2015 (r392770) @@ -15,4 +15,4 @@ $SYSCTL=1 EOMSG exit 1 fi -%%PREFIX%%/share/chromium/chrome $* +%%PREFIX%%/share/chromium/chrome "$@" From owner-svn-ports-branches@freebsd.org Fri Jul 24 09:08:27 2015 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 CF7A29A98CA; Fri, 24 Jul 2015 09:08:27 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 BF57C1F98; Fri, 24 Jul 2015 09:08:27 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6O98RMq096728; Fri, 24 Jul 2015 09:08:27 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6O98RC4096726; Fri, 24 Jul 2015 09:08:27 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201507240908.t6O98RC4096726@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 24 Jul 2015 09:08:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392805 - branches/2015Q3/russian/wordpress 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.20 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: Fri, 24 Jul 2015 09:08:27 -0000 Author: sunpoet Date: Fri Jul 24 09:08:26 2015 New Revision: 392805 URL: https://svnweb.freebsd.org/changeset/ports/392805 Log: MFH: r392803 - Update to 4.2.3 - While I'm here, add NO_ARCH Changes: https://wordpress.org/news/2015/07/wordpress-4-2-3/ PR: 201794 Submitted by: Mihail Timofeev <9267096@gmail.com> (maintainer) Approved by: portmgr (erwin) Modified: branches/2015Q3/russian/wordpress/Makefile branches/2015Q3/russian/wordpress/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/russian/wordpress/Makefile ============================================================================== --- branches/2015Q3/russian/wordpress/Makefile Fri Jul 24 09:00:34 2015 (r392804) +++ branches/2015Q3/russian/wordpress/Makefile Fri Jul 24 09:08:26 2015 (r392805) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.2.2 +PORTVERSION= 4.2.3 DISTVERSIONSUFFIX= -ru_RU CATEGORIES= russian www MASTER_SITES= http://ru.wordpress.org/ @@ -14,6 +14,7 @@ LICENSE= GPLv2 CONFLICTS_INSTALL= wordpress-3.* de-wordpress-3.* ja-wordpress-3.* +NO_ARCH= yes NO_BUILD= yes USES= cpe USE_PHP= curl gd hash mysql pcre tokenizer xml zip zlib Modified: branches/2015Q3/russian/wordpress/distinfo ============================================================================== --- branches/2015Q3/russian/wordpress/distinfo Fri Jul 24 09:00:34 2015 (r392804) +++ branches/2015Q3/russian/wordpress/distinfo Fri Jul 24 09:08:26 2015 (r392805) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.2.2-ru_RU.tar.gz) = 2b3a7c550fa51ce19bdadbd7f482467165ecbffdc933a67ac86a0ca8dc69456b -SIZE (wordpress-4.2.2-ru_RU.tar.gz) = 6751459 +SHA256 (wordpress-4.2.3-ru_RU.tar.gz) = 5b523a2f463a73a86f673ed90885864b355cbd5172b8466bd0c9b88207a1e5fa +SIZE (wordpress-4.2.3-ru_RU.tar.gz) = 6778280 From owner-svn-ports-branches@freebsd.org Fri Jul 24 09:10:09 2015 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 A6FB29A9975; Fri, 24 Jul 2015 09:10:09 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 95BFE1181; Fri, 24 Jul 2015 09:10:09 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6O9A9HD097028; Fri, 24 Jul 2015 09:10:09 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6O9A8gU097024; Fri, 24 Jul 2015 09:10:08 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201507240910.t6O9A8gU097024@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Fri, 24 Jul 2015 09:10:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392806 - branches/2015Q3/german/wordpress 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.20 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: Fri, 24 Jul 2015 09:10:09 -0000 Author: sunpoet Date: Fri Jul 24 09:10:07 2015 New Revision: 392806 URL: https://svnweb.freebsd.org/changeset/ports/392806 Log: MFH: r392804 - Update to 4.2.3 - Add NO_ARCH Changes: https://wordpress.org/news/2015/07/wordpress-4-2-3/ Approved by: portmgr (erwin) Modified: branches/2015Q3/german/wordpress/Makefile branches/2015Q3/german/wordpress/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/german/wordpress/Makefile ============================================================================== --- branches/2015Q3/german/wordpress/Makefile Fri Jul 24 09:08:26 2015 (r392805) +++ branches/2015Q3/german/wordpress/Makefile Fri Jul 24 09:10:07 2015 (r392806) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.2.2 +PORTVERSION= 4.2.3 DISTVERSIONSUFFIX= -de_DE CATEGORIES= german www MASTER_SITES= http://de.wordpress.org/ @@ -14,6 +14,7 @@ LICENSE= GPLv2 CONFLICTS_INSTALL= wordpress-[0-9].* ja-wordpress-[0-9].* ru-wordpress-[0-9].* +NO_ARCH= yes NO_BUILD= yes USES= cpe USE_PHP= curl gd hash mysql pcre tokenizer xml zip zlib Modified: branches/2015Q3/german/wordpress/distinfo ============================================================================== --- branches/2015Q3/german/wordpress/distinfo Fri Jul 24 09:08:26 2015 (r392805) +++ branches/2015Q3/german/wordpress/distinfo Fri Jul 24 09:10:07 2015 (r392806) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.2.2-de_DE.tar.gz) = 08546e93beb8558264f86392c389fb883c0a38a5058a8ca7877a88e2d36cdc13 -SIZE (wordpress-4.2.2-de_DE.tar.gz) = 6733834 +SHA256 (wordpress-4.2.3-de_DE.tar.gz) = ca11196c86487db052e929b4bda1098fa63a449a23a13ddd008a523ef4090e18 +SIZE (wordpress-4.2.3-de_DE.tar.gz) = 6727515 From owner-svn-ports-branches@freebsd.org Fri Jul 24 14:19:35 2015 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 71D799A95ED; Fri, 24 Jul 2015 14:19:35 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 6228B144A; Fri, 24 Jul 2015 14:19:35 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6OEJZHU024907; Fri, 24 Jul 2015 14:19:35 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6OEJYpQ024904; Fri, 24 Jul 2015 14:19:34 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507241419.t6OEJYpQ024904@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 24 Jul 2015 14:19:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392825 - branches/2015Q3/www/wordpress 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.20 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: Fri, 24 Jul 2015 14:19:35 -0000 Author: feld Date: Fri Jul 24 14:19:33 2015 New Revision: 392825 URL: https://svnweb.freebsd.org/changeset/ports/392825 Log: MFH: r392824 Update to 4.2.3, fixing CVEs Add NO_ARCH Security: CVE-2015-5622 Security: CVE-2015-5623 Security: c80b27a2-3165-11e5-8a1d-14dae9d210b8 Approved by: ports-secteam (with hat) Modified: branches/2015Q3/www/wordpress/Makefile branches/2015Q3/www/wordpress/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/www/wordpress/Makefile ============================================================================== --- branches/2015Q3/www/wordpress/Makefile Fri Jul 24 14:18:34 2015 (r392824) +++ branches/2015Q3/www/wordpress/Makefile Fri Jul 24 14:19:33 2015 (r392825) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wordpress -PORTVERSION= 4.2.2 +PORTVERSION= 4.2.3 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://wordpress.org/ @@ -14,6 +14,7 @@ LICENSE= GPLv2 CONFLICTS_INSTALL= de-wordpress-[0-9].* ja-wordpress-[0-9].* ru-wordpress-[0-9].* +NO_ARCH= yes NO_BUILD= yes USES= cpe USE_PHP= curl gd hash mysql pcre tokenizer xml zip zlib Modified: branches/2015Q3/www/wordpress/distinfo ============================================================================== --- branches/2015Q3/www/wordpress/distinfo Fri Jul 24 14:18:34 2015 (r392824) +++ branches/2015Q3/www/wordpress/distinfo Fri Jul 24 14:19:33 2015 (r392825) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.2.2.tar.gz) = 3c4e2cc3af289366ff5352e35c3f80fca2dcaed3d56a79f33b25374c356c3f90 -SIZE (wordpress-4.2.2.tar.gz) = 6307937 +SHA256 (wordpress-4.2.3.tar.gz) = 49073745a56f8ddf740b95018071d69c3100d730dba014566a49c7b386786b16 +SIZE (wordpress-4.2.3.tar.gz) = 6313518 From owner-svn-ports-branches@freebsd.org Fri Jul 24 16:23:50 2015 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 72B719A967D; Fri, 24 Jul 2015 16:23:50 +0000 (UTC) (envelope-from so14k@valentine.liquidneon.com) Received: from valentine.liquidneon.com (valentine.liquidneon.com [216.87.78.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "valentine.liquidneon.com", Issuer "Gandi Standard SSL CA 2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 54A3515F6; Fri, 24 Jul 2015 16:23:50 +0000 (UTC) (envelope-from so14k@valentine.liquidneon.com) Received: by valentine.liquidneon.com (Postfix, from userid 1018) id E4F4A8FFDD; Fri, 24 Jul 2015 10:23:12 -0600 (MDT) Date: Fri, 24 Jul 2015 10:23:12 -0600 From: Brad Davis To: Palle Girgensohn Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r392739 - branches/2015Q2/security/vuxml Message-ID: <20150724162312.GO94853@valentine.liquidneon.com> References: <201507231624.t6NGOPAZ039747@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201507231624.t6NGOPAZ039747@repo.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 24 Jul 2015 16:23:50 -0000 On Thu, Jul 23, 2015 at 04:24:25PM +0000, Palle Girgensohn wrote: > Author: girgen > Date: Thu Jul 23 16:24:25 2015 > New Revision: 392739 > URL: https://svnweb.freebsd.org/changeset/ports/392739 > > Log: > Shibboleth SP software crashes on well-formed but invalid XML. > > The Service Provider software contains a code path with an uncaught > exception that can be triggered by an unauthenticated attacker by > supplying well-formed but schema-invalid XML in the form of SAML > metadata or SAML protocol messages. The result is a crash and so > causes a denial of service. > > You must rebuild opensaml and shibboleth with xmltooling-1.5.5 or later. > The easiest way to do so is to update the whole chain including > shibboleth-2.5.5 an opensaml2.5.5. > > URL: http://shibboleth.net/community/advisories/secadv_20150721.txt > Security: CVE-2015-2684 > Approved by: ports-secteam > > Modified: > branches/2015Q2/security/vuxml/vuln.xml Shouldn't this have gone into HEAD? I thought vuln.xml was only used in head, not from the branches. Regards, Brad Davis From owner-svn-ports-branches@freebsd.org Fri Jul 24 16:54:07 2015 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 195C69A9C3F for ; Fri, 24 Jul 2015 16:54:07 +0000 (UTC) (envelope-from feld@feld.me) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (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 DF0791519 for ; Fri, 24 Jul 2015 16:54:06 +0000 (UTC) (envelope-from feld@feld.me) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id A5FAC20790 for ; Fri, 24 Jul 2015 12:54:04 -0400 (EDT) Received: from web3 ([10.202.2.213]) by compute3.internal (MEProxy); Fri, 24 Jul 2015 12:54:04 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=feld.me; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=/36z0quV+egPeCZGVUjQxTMD5VM=; b=FOT6vB YLITJjou5qS3DmnpuirCxSRkZb6Ps/h6wmPV1GhAI8hREFgvjJVy6lJHI/XemRW5 IG0kdkDDfpcrAbrSNlmi8FU4y/revx6kXz6ekacWEDOKD8m9bSKRB78kOx6M/hbU l/0cl/F4YKWt+6r/44MlRHSm6BC1rRkW43Gjc= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=/36z0quV+egPeCZ GVUjQxTMD5VM=; b=WNfpU+HWQQMchpgAPgr/Wur4lPjd5b0e/vlX0+bTj/Eufjg sPrPPOagP69xhsKjUx+7tPX61vqIi11OCifgbh21B9BY67rDb2zCtwCrof1ngFwa nbgdWAzgK2hlqauLu/tY0N1rL7/dNI8tQgJg0+0w7cVd1EQPMNwB1jgGQZIU= Received: by web3.nyi.internal (Postfix, from userid 99) id 725A010D078; Fri, 24 Jul 2015 12:54:04 -0400 (EDT) Message-Id: <1437756844.2148972.332341833.7702303E@webmail.messagingengine.com> X-Sasl-Enc: YaArTkSVOU3hEgJqPKTqVz7+cwDixdpVTpIi6yPOPcqg 1437756844 From: Mark Felder To: Brad Davis , Palle Girgensohn Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain X-Mailer: MessagingEngine.com Webmail Interface - ajax-63a5d8c6 Subject: Re: svn commit: r392739 - branches/2015Q2/security/vuxml Date: Fri, 24 Jul 2015 11:54:04 -0500 In-Reply-To: <20150724162312.GO94853@valentine.liquidneon.com> References: <201507231624.t6NGOPAZ039747@repo.freebsd.org> <20150724162312.GO94853@valentine.liquidneon.com> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 24 Jul 2015 16:54:07 -0000 On Fri, Jul 24, 2015, at 11:23, Brad Davis wrote: > On Thu, Jul 23, 2015 at 04:24:25PM +0000, Palle Girgensohn wrote: > > Author: girgen > > Date: Thu Jul 23 16:24:25 2015 > > New Revision: 392739 > > URL: https://svnweb.freebsd.org/changeset/ports/392739 > > > > Log: > > Shibboleth SP software crashes on well-formed but invalid XML. > > > > The Service Provider software contains a code path with an uncaught > > exception that can be triggered by an unauthenticated attacker by > > supplying well-formed but schema-invalid XML in the form of SAML > > metadata or SAML protocol messages. The result is a crash and so > > causes a denial of service. > > > > You must rebuild opensaml and shibboleth with xmltooling-1.5.5 or later. > > The easiest way to do so is to update the whole chain including > > shibboleth-2.5.5 an opensaml2.5.5. > > > > URL: http://shibboleth.net/community/advisories/secadv_20150721.txt > > Security: CVE-2015-2684 > > Approved by: ports-secteam > > > > Modified: > > branches/2015Q2/security/vuxml/vuln.xml > > Shouldn't this have gone into HEAD? I thought vuln.xml was only used in > head, not from the branches. > And not even the current branch... That's weird. Can we get old branches locked down a bit further? From owner-svn-ports-branches@freebsd.org Fri Jul 24 21:38:59 2015 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 C71E19AA618; Fri, 24 Jul 2015 21:38:59 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from mail.pingpong.net (mail.pingpong.net [79.136.116.202]) by mx1.freebsd.org (Postfix) with ESMTP id 850021B12; Fri, 24 Jul 2015 21:38:59 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from [10.0.1.9] (h-85-24-195-121.na.cust.bahnhof.se [85.24.195.121]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.pingpong.net (Postfix) with ESMTPSA id C601BB1ED; Fri, 24 Jul 2015 23:38:51 +0200 (CEST) Subject: Re: svn commit: r392739 - branches/2015Q2/security/vuxml Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2102\)) Content-Type: multipart/signed; boundary="Apple-Mail=_5E2EEE63-F3B4-49B9-BB90-52B8579A597A"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Pgp-Agent: GPGMail 2.5 From: Palle Girgensohn In-Reply-To: <1437756844.2148972.332341833.7702303E@webmail.messagingengine.com> Date: Fri, 24 Jul 2015 23:38:51 +0200 Cc: Brad Davis , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Message-Id: <9A468FE8-4FB1-4781-B21E-D16444233D80@FreeBSD.org> References: <201507231624.t6NGOPAZ039747@repo.freebsd.org> <20150724162312.GO94853@valentine.liquidneon.com> <1437756844.2148972.332341833.7702303E@webmail.messagingengine.com> To: Mark Felder X-Mailer: Apple Mail (2.2102) X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 24 Jul 2015 21:38:59 -0000 --Apple-Mail=_5E2EEE63-F3B4-49B9-BB90-52B8579A597A Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > 24 jul 2015 kl. 18:54 skrev Mark Felder : >=20 >=20 >=20 > On Fri, Jul 24, 2015, at 11:23, Brad Davis wrote: >> On Thu, Jul 23, 2015 at 04:24:25PM +0000, Palle Girgensohn wrote: >>> Author: girgen >>> Date: Thu Jul 23 16:24:25 2015 >>> New Revision: 392739 >>> URL: https://svnweb.freebsd.org/changeset/ports/392739 >>>=20 >>> Log: >>> Shibboleth SP software crashes on well-formed but invalid XML. >>>=20 >>> The Service Provider software contains a code path with an uncaught >>> exception that can be triggered by an unauthenticated attacker by >>> supplying well-formed but schema-invalid XML in the form of SAML >>> metadata or SAML protocol messages. The result is a crash and so >>> causes a denial of service. >>>=20 >>> You must rebuild opensaml and shibboleth with xmltooling-1.5.5 or = later. >>> The easiest way to do so is to update the whole chain including >>> shibboleth-2.5.5 an opensaml2.5.5. >>>=20 >>> URL: = http://shibboleth.net/community/advisories/secadv_20150721.txt >>> Security: CVE-2015-2684 >>> Approved by: ports-secteam >>>=20 >>> Modified: >>> branches/2015Q2/security/vuxml/vuln.xml >>=20 >> Shouldn't this have gone into HEAD? I thought vuln.xml was only used = in >> head, not from the branches. >>=20 >=20 > And not even the current branch... That's weird. >=20 > Can we get old branches locked down a bit further? Umm, sorry, my mistake, I had the 2015Q2 branch checked out, and just = entierly missed it. I will merge to HEAD as I write... :-/ --Apple-Mail=_5E2EEE63-F3B4-49B9-BB90-52B8579A597A Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org iQEcBAEBCAAGBQJVsrBrAAoJEIhV+7FrxBJD7EYH/3RBjdp3COKn/EfZgg+Y+YWm jEEYDL/8LjINmOzHeh9uNM/U45KFeqdNopHYDi7NPozsY2Ko26ZJ/JCWrSporcbE hkrLag0m+oDWBTqFEcOlfeqY1+RmRpiFZsagwomHTPa1qeJVlRsRRmV0SBf6TO0p 2ydduXqvkpJM4veRSdrN+bI4jl/ZdPR77b0RmWtQs6HqThyv7vsMaU3pgYWHMtrY h7+ud574Pk/odFj7lrtyfZa1RQmw4o7zDpi5M7Gy/YLFok56kdbz6ONzEptATf0v jneJwepV+uGuYcLT3AjJixH2o5OATNOl5LpAQcl93o7MnBqvhXJkKTeXBg7cMFM= =A5kk -----END PGP SIGNATURE----- --Apple-Mail=_5E2EEE63-F3B4-49B9-BB90-52B8579A597A-- From owner-svn-ports-branches@freebsd.org Fri Jul 24 23:16:37 2015 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 E877F9AA958 for ; Fri, 24 Jul 2015 23:16:36 +0000 (UTC) (envelope-from feld@feld.me) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) (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 AE5211E69 for ; Fri, 24 Jul 2015 23:16:36 +0000 (UTC) (envelope-from feld@feld.me) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id C5B7F20976 for ; Fri, 24 Jul 2015 19:16:34 -0400 (EDT) Received: from web3 ([10.202.2.213]) by compute1.internal (MEProxy); Fri, 24 Jul 2015 19:16:34 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=feld.me; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=7Jc0vab551keYNmt6t2XcZLAblc=; b=JxDdi0 eyfQDqmzo/OZaI+AT6GTPSq3vr1PTfN2Ts/dQxkRnbpAvdipJX6MYKq3yZngle6E BYpbFykqZhg/puYlSCvP9CO298Wd+Xbz3JudfMBkzodctMjn51JyKp+jLLFwZN4x +4MgI+qxAzZBVJidHDQrAP0VU0jKycAJMkrWI= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=7Jc0vab551keYNm t6t2XcZLAblc=; b=PSptotncEel4IXjLMcXcUuy2inGdF6+7+CBLBCsgBTwiIFz ONPQVMpyghXwLry/1MTHKl1dJjHHlzxWxhw5EhPNGbimHQ0+kIi7Xq0aEKgdsOqF wzXvX55v0QBMLcHqEnh6oJX7WqA2cE7bLASEcJg527f3GUj5M7lo4BEG2FDQ= Received: by web3.nyi.internal (Postfix, from userid 99) id 8896B10ECB9; Fri, 24 Jul 2015 19:16:34 -0400 (EDT) Message-Id: <1437779794.2853329.332590825.1F60B83A@webmail.messagingengine.com> X-Sasl-Enc: Q4uTwCPLbnZGIrZmsWbiPHNzZb71LPKUF34QmK0j6GaC 1437779794 From: Mark Felder To: Palle Girgensohn Cc: Brad Davis , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain X-Mailer: MessagingEngine.com Webmail Interface - ajax-63a5d8c6 Subject: Re: svn commit: r392739 - branches/2015Q2/security/vuxml Date: Fri, 24 Jul 2015 18:16:34 -0500 In-Reply-To: <9A468FE8-4FB1-4781-B21E-D16444233D80@FreeBSD.org> References: <201507231624.t6NGOPAZ039747@repo.freebsd.org> <20150724162312.GO94853@valentine.liquidneon.com> <1437756844.2148972.332341833.7702303E@webmail.messagingengine.com> <9A468FE8-4FB1-4781-B21E-D16444233D80@FreeBSD.org> X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 24 Jul 2015 23:16:37 -0000 On Fri, Jul 24, 2015, at 16:38, Palle Girgensohn wrote: > > > 24 jul 2015 kl. 18:54 skrev Mark Felder : > > > > > > > > On Fri, Jul 24, 2015, at 11:23, Brad Davis wrote: > >> On Thu, Jul 23, 2015 at 04:24:25PM +0000, Palle Girgensohn wrote: > >>> Author: girgen > >>> Date: Thu Jul 23 16:24:25 2015 > >>> New Revision: 392739 > >>> URL: https://svnweb.freebsd.org/changeset/ports/392739 > >>> > >>> Log: > >>> Shibboleth SP software crashes on well-formed but invalid XML. > >>> > >>> The Service Provider software contains a code path with an uncaught > >>> exception that can be triggered by an unauthenticated attacker by > >>> supplying well-formed but schema-invalid XML in the form of SAML > >>> metadata or SAML protocol messages. The result is a crash and so > >>> causes a denial of service. > >>> > >>> You must rebuild opensaml and shibboleth with xmltooling-1.5.5 or later. > >>> The easiest way to do so is to update the whole chain including > >>> shibboleth-2.5.5 an opensaml2.5.5. > >>> > >>> URL: http://shibboleth.net/community/advisories/secadv_20150721.txt > >>> Security: CVE-2015-2684 > >>> Approved by: ports-secteam > >>> > >>> Modified: > >>> branches/2015Q2/security/vuxml/vuln.xml > >> > >> Shouldn't this have gone into HEAD? I thought vuln.xml was only used in > >> head, not from the branches. > >> > > > > And not even the current branch... That's weird. > > > > Can we get old branches locked down a bit further? > > Umm, sorry, my mistake, I had the 2015Q2 branch checked out, and just > entierly missed it. I will merge to HEAD as I write... :-/ > That's OK, things happen. I already copied your entry to HEAD. From owner-svn-ports-branches@freebsd.org Fri Jul 24 23:20:37 2015 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 24B0D9AAA37; Fri, 24 Jul 2015 23:20:37 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 0F1BC10DA; Fri, 24 Jul 2015 23:20:37 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6ONKa82087078; Fri, 24 Jul 2015 23:20:36 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6ONKaaw087077; Fri, 24 Jul 2015 23:20:36 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201507242320.t6ONKaaw087077@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 24 Jul 2015 23:20:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392849 - branches/2015Q3/multimedia/mps-youtube 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.20 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: Fri, 24 Jul 2015 23:20:37 -0000 Author: antoine Date: Fri Jul 24 23:20:36 2015 New Revision: 392849 URL: https://svnweb.freebsd.org/changeset/ports/392849 Log: MFH: r392848 For now, ignore on the package builders when default python version is not 3.2+ Reported by: pkg-fallout Modified: branches/2015Q3/multimedia/mps-youtube/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/multimedia/mps-youtube/Makefile ============================================================================== --- branches/2015Q3/multimedia/mps-youtube/Makefile Fri Jul 24 23:19:08 2015 (r392848) +++ branches/2015Q3/multimedia/mps-youtube/Makefile Fri Jul 24 23:20:36 2015 (r392849) @@ -45,4 +45,10 @@ USE_PYTHON= autoplist distutils post-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME} -.include +.include + +.if defined(PACKAGE_BUILDING) && ${PYTHON_VER} != ${PYTHON_DEFAULT} +IGNORE= you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER} +.endif + +.include From owner-svn-ports-branches@freebsd.org Sat Jul 25 10:27:22 2015 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 C8B7E9A86E1; Sat, 25 Jul 2015 10:27:22 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 AF6921FDF; Sat, 25 Jul 2015 10:27:22 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6PARMH6067806; Sat, 25 Jul 2015 10:27:22 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6PARKaN067796; Sat, 25 Jul 2015 10:27:20 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201507251027.t6PARKaN067796@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sat, 25 Jul 2015 10:27:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392866 - in branches/2015Q3/net-mgmt/icinga2: . files 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.20 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: Sat, 25 Jul 2015 10:27:22 -0000 Author: lme Date: Sat Jul 25 10:27:19 2015 New Revision: 392866 URL: https://svnweb.freebsd.org/changeset/ports/392866 Log: MFH: r392046 - Update to 2.3.6 - Install more config files as sample config - Fix directory permissions under /var - Change database backend options to GROUP, so one can de-select both [1] PR: 201114 [1] Submitted by: Niels Kristensen Approved by: portmgr (delphij) Added: branches/2015Q3/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt - copied unchanged from r392046, head/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt branches/2015Q3/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt - copied unchanged from r392046, head/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt Modified: branches/2015Q3/net-mgmt/icinga2/Makefile branches/2015Q3/net-mgmt/icinga2/distinfo branches/2015Q3/net-mgmt/icinga2/files/icinga2.in branches/2015Q3/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt branches/2015Q3/net-mgmt/icinga2/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/net-mgmt/icinga2/Makefile ============================================================================== --- branches/2015Q3/net-mgmt/icinga2/Makefile Sat Jul 25 09:57:39 2015 (r392865) +++ branches/2015Q3/net-mgmt/icinga2/Makefile Sat Jul 25 10:27:19 2015 (r392866) @@ -2,7 +2,7 @@ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.3.4 +DISTVERSION= 2.3.6 CATEGORIES= net-mgmt MAINTAINER= lme@FreeBSD.org @@ -24,8 +24,8 @@ USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= DOCS -OPTIONS_MULTI= BACKEND -OPTIONS_MULTI_BACKEND= MYSQL PGSQL +OPTIONS_GROUP= BACKEND +OPTIONS_GROUP_BACKEND= MYSQL PGSQL OPTIONS_RADIO= PLUGINS OPTIONS_RADIO_PLUGINS= MONPLUGINS NAGPLUGINS @@ -50,6 +50,7 @@ CMAKE_ARGS+= -DICINGA2_USER=${ICINGA2USE -DICINGA2_COMMAND_USER=${ICINGA2USER} \ -DICINGA2_COMMAND_GROUP=${ICINGA2USER} \ -DICINGA2_PLUGINDIR=${LOCALBASE}/libexec/nagios \ + -DICINGA2_RUNDIR=/var/run \ -DCMAKE_INSTALL_SYSCONFDIR=${PREFIX}/etc \ -DCMAKE_INSTALL_LOCALSTATEDIR=${LOCALSTATEDIR} \ -DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man \ @@ -59,6 +60,10 @@ SUB_LIST= ICINGA2LOGDIR=${ICINGA2LOGDIR} ICINGA2GROUP=${ICINGA2GROUP} \ WWWGRP=${WWWGRP} +PLIST_SUB= ICINGA2USER=${ICINGA2USER} \ + ICINGA2GROUP=${ICINGA2GROUP} \ + WWWGRP=${WWWGRP} + # Config files with references to "Linux" LINUX_CONFIG= groups.conf services.conf hosts.conf @@ -81,6 +86,7 @@ post-patch: pre-install: ${FIND} ${WRKSRC}/etc -type f -name "*.conf" -exec ${MV} {} {}.sample \; + ${FIND} ${WRKSRC}/itl -type f -name "*.conf" -exec ${MV} {} {}.sample \; ${FIND} ${WRKSRC}/etc/icinga2/scripts -type f -name "*.sh" \ -exec ${MV} {} {}.sample \; Modified: branches/2015Q3/net-mgmt/icinga2/distinfo ============================================================================== --- branches/2015Q3/net-mgmt/icinga2/distinfo Sat Jul 25 09:57:39 2015 (r392865) +++ branches/2015Q3/net-mgmt/icinga2/distinfo Sat Jul 25 10:27:19 2015 (r392866) @@ -1,2 +1,2 @@ -SHA256 (icinga-icinga2-v2.3.4_GH0.tar.gz) = 3a6d23214c90c1e308df784254659c51962f4c49b13093aff2095e1dfa06cdaa -SIZE (icinga-icinga2-v2.3.4_GH0.tar.gz) = 782506 +SHA256 (icinga-icinga2-v2.3.6_GH0.tar.gz) = 96453fbfa418329b74d45bd2a202302add03d907fac28644e1228d869c478093 +SIZE (icinga-icinga2-v2.3.6_GH0.tar.gz) = 816718 Modified: branches/2015Q3/net-mgmt/icinga2/files/icinga2.in ============================================================================== --- branches/2015Q3/net-mgmt/icinga2/files/icinga2.in Sat Jul 25 09:57:39 2015 (r392865) +++ branches/2015Q3/net-mgmt/icinga2/files/icinga2.in Sat Jul 25 10:27:19 2015 (r392866) @@ -78,18 +78,22 @@ reload_precmd() { } start_precmd() { - # Create necessary directories / change ownership - for d in "${icinga2_logdir}" "${icinga2_logdir}/compat" \ - "${icinga2_logdir}/compat/archives" "${icinga2_libdir}" \ - "${icinga2_spooldir}" "${icinga2_spooldir}/tmp" \ - "${icinga2_rundir}" "${icinga2_cachedir}"; do - install -d -o ${icinga2_user} -g ${icinga2_group} "${d}" - done - - install -d -o ${icinga2_user} -g %%WWWGRP%% "${icinga2_rundir}/cmd" - - chown -R ${icinga2_user}:${icinga2_user} "${icinga2_libdir}" - chown -R ${icinga2_user}:${icinga2_user} "${icinga2_spooldir}" +# # Create necessary directories / change ownership +# for d in "${icinga2_logdir}" "${icinga2_logdir}/compat" \ +# "${icinga2_logdir}/compat/archives" "${icinga2_libdir}" \ +# "${icinga2_spooldir}" "${icinga2_spooldir}/tmp" \ +# "${icinga2_rundir}" "${icinga2_cachedir}"; do +# if [ ! -d "${d}" ]; then +# install -d -o ${icinga2_user} -g ${icinga2_group} "${d}" +# else +# chown ${icinga2_user}:${icinga2_group} "${d}" +# fi +# done +# +# install -d -o ${icinga2_user} -g %%WWWGRP%% "${icinga2_rundir}/cmd" +# +# chown -R ${icinga2_user}:${icinga2_user} "${icinga2_libdir}" +# chown -R ${icinga2_user}:${icinga2_user} "${icinga2_spooldir}" if ! icinga2_checkconfig; then return 1 Modified: branches/2015Q3/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt ============================================================================== --- branches/2015Q3/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt Sat Jul 25 09:57:39 2015 (r392865) +++ branches/2015Q3/net-mgmt/icinga2/files/patch-etc_CMakeLists.txt Sat Jul 25 10:27:19 2015 (r392866) @@ -1,20 +1,20 @@ ---- etc/CMakeLists.txt.orig 2015-03-26 09:50:40.000000000 +0100 -+++ etc/CMakeLists.txt 2015-03-26 20:46:49.751242000 +0100 -@@ -26,39 +26,39 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" +--- etc/CMakeLists.txt.orig 2015-07-08 10:17:44.000000000 +0200 ++++ etc/CMakeLists.txt 2015-07-13 22:06:31.230363000 +0200 +@@ -26,43 +26,43 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" configure_file(logrotate.d/icinga2.cmake ${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 @ONLY) endif() -install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/init.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) --install_if_not_exists(icinga2/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) +install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/init.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) -+install_if_not_exists(icinga2/icinga2.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) if(NOT WIN32) - install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) +- install_if_not_exists(icinga2/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) + install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/icinga2/constants.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) ++ install_if_not_exists(icinga2/icinga2.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) else() -- install_if_not_exists(${CMAKE_CURRENT_SOURCE_DIR}/icinga2/win32/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) -+ install_if_not_exists(${CMAKE_CURRENT_SOURCE_DIR}/icinga2/win32/constants.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) + install_if_not_exists(${CMAKE_CURRENT_SOURCE_DIR}/icinga2/win32/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) + install_if_not_exists(icinga2/win32/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) endif() -install_if_not_exists(icinga2/zones.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) @@ -28,14 +28,16 @@ if(NOT WIN32) - install_if_not_exists(icinga2/conf.d/hosts.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) +- install_if_not_exists(icinga2/conf.d/services.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) + install_if_not_exists(icinga2/conf.d/hosts.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) ++ install_if_not_exists(icinga2/conf.d/services.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) else() install_if_not_exists(icinga2/conf.d/win32/hosts.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) + install_if_not_exists(icinga2/conf.d/win32/services.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) endif() -install_if_not_exists(icinga2/conf.d/notifications.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) -install_if_not_exists(icinga2/conf.d/satellite.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) --install_if_not_exists(icinga2/conf.d/services.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) -install_if_not_exists(icinga2/conf.d/templates.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) -install_if_not_exists(icinga2/conf.d/timeperiods.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) -install_if_not_exists(icinga2/conf.d/users.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) @@ -43,12 +45,8 @@ -install_if_not_exists(icinga2/features-available/debuglog.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) -install_if_not_exists(icinga2/features-available/icingastatus.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) -install_if_not_exists(icinga2/features-available/mainlog.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) --install_if_not_exists(icinga2/features-available/syslog.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) --install_if_not_exists(icinga2/scripts/mail-host-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts) --install_if_not_exists(icinga2/scripts/mail-service-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts) +install_if_not_exists(icinga2/conf.d/notifications.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) +install_if_not_exists(icinga2/conf.d/satellite.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) -+install_if_not_exists(icinga2/conf.d/services.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) +install_if_not_exists(icinga2/conf.d/templates.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) +install_if_not_exists(icinga2/conf.d/timeperiods.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) +install_if_not_exists(icinga2/conf.d/users.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/conf.d) @@ -56,9 +54,14 @@ +install_if_not_exists(icinga2/features-available/debuglog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) +install_if_not_exists(icinga2/features-available/icingastatus.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) +install_if_not_exists(icinga2/features-available/mainlog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) -+install_if_not_exists(icinga2/features-available/syslog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) -+install_if_not_exists(icinga2/scripts/mail-host-notification.sh.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts) -+install_if_not_exists(icinga2/scripts/mail-service-notification.sh.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts) + if(NOT WIN32) +- install_if_not_exists(icinga2/features-available/syslog.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) ++ install_if_not_exists(icinga2/features-available/syslog.conf.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/features-available) + endif() +-install_if_not_exists(icinga2/scripts/mail-host-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts) +-install_if_not_exists(icinga2/scripts/mail-service-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts) ++ install_if_not_exists(icinga2/scripts/mail-host-notification.sh.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts) ++ install_if_not_exists(icinga2/scripts/mail-service-notification.sh.sample ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts) install_if_not_exists(icinga2/zones.d/README ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/zones.d) install_if_not_exists(icinga2/repository.d/README ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/repository.d) Copied: branches/2015Q3/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt (from r392046, head/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt Sat Jul 25 10:27:19 2015 (r392866, copy of r392046, head/net-mgmt/icinga2/files/patch-itl_CMakeLists.txt) @@ -0,0 +1,10 @@ +--- itl/CMakeLists.txt.orig 2015-07-13 22:14:51.872881000 +0200 ++++ itl/CMakeLists.txt 2015-07-13 22:15:19.702183000 +0200 +@@ -18,6 +18,6 @@ + add_subdirectory(plugins-contrib.d) + + install( +- FILES itl command.conf command-icinga.conf hangman timeperiod.conf plugins command-plugins.conf manubulon command-plugins-manubulon.conf windows-plugins command-plugins-windows.conf nscp command-nscp-local.conf plugins-contrib ++ FILES itl command.conf.sample command-icinga.conf.sample hangman timeperiod.conf.sample plugins command-plugins.conf.sample manubulon command-plugins-manubulon.conf.sample windows-plugins command-plugins-windows.conf.sample nscp command-nscp-local.conf.sample plugins-contrib + DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include + ) Copied: branches/2015Q3/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt (from r392046, head/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt Sat Jul 25 10:27:19 2015 (r392866, copy of r392046, head/net-mgmt/icinga2/files/patch-itl_plugins-contrib.d_CMakeLists.txt) @@ -0,0 +1,10 @@ +--- itl/plugins-contrib.d/CMakeLists.txt.orig 2015-07-13 22:15:59.084514000 +0200 ++++ itl/plugins-contrib.d/CMakeLists.txt 2015-07-13 22:16:44.501021000 +0200 +@@ -16,6 +16,6 @@ + # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + install( +- FILES databases.conf ipmi.conf network-components.conf operating-system.conf virtualization.conf vmware.conf web.conf ++ FILES databases.conf.sample ipmi.conf.sample network-components.conf.sample operating-system.conf.sample virtualization.conf.sample vmware.conf.sample web.conf.sample + DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include/plugins-contrib.d + ) Modified: branches/2015Q3/net-mgmt/icinga2/pkg-plist ============================================================================== --- branches/2015Q3/net-mgmt/icinga2/pkg-plist Sat Jul 25 09:57:39 2015 (r392865) +++ branches/2015Q3/net-mgmt/icinga2/pkg-plist Sat Jul 25 10:27:19 2015 (r392866) @@ -18,8 +18,8 @@ etc/bash_completion.d/icinga2 @sample %%ETCDIR%%/features-available/gelf.conf.sample @sample %%ETCDIR%%/features-available/graphite.conf.sample @sample %%ETCDIR%%/features-available/icingastatus.conf.sample -%%MYSQL%%@sample(icinga,icinga,0640) %%ETCDIR%%/features-available/ido-mysql.conf.sample -%%PGSQL%%@sample(icinga,icinga,0640) %%ETCDIR%%/features-available/ido-pgsql.conf.sample +%%MYSQL%%@sample(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0640) %%ETCDIR%%/features-available/ido-mysql.conf.sample +%%PGSQL%%@sample(%%ICINGA2USER%%,%%ICINGA2GROUP%%,0640) %%ETCDIR%%/features-available/ido-pgsql.conf.sample @sample %%ETCDIR%%/features-available/livestatus.conf.sample @sample %%ETCDIR%%/features-available/mainlog.conf.sample @sample %%ETCDIR%%/features-available/notification.conf.sample @@ -42,7 +42,7 @@ lib/icinga2/libchecker.so lib/icinga2/libcli.so lib/icinga2/libcompat.so lib/icinga2/libconfig.so -lib/icinga2/libdb_ido.so +%%MYSQL%%%%PGSQL%%llib/icinga2/libdb_ido.so %%MYSQL%%lib/icinga2/libdb_ido_mysql.so %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so lib/icinga2/libexecvpe.so @@ -78,8 +78,8 @@ sbin/icinga2 %%PORTDOCS%%%%DOCSDIR%%/markdown/21-debug.md %%PORTDOCS%%%%DOCSDIR%%/markdown/22-appendix.md %%PORTDOCS%%%%DOCSDIR%%/markdown/3-monitoring-basics.md -%%PORTDOCS%%%%DOCSDIR%%/markdown/4-advanced-topics.md -%%PORTDOCS%%%%DOCSDIR%%/markdown/5-configuring-icinga-2.md +%%PORTDOCS%%%%DOCSDIR%%/markdown/4-configuring-icinga-2.md +%%PORTDOCS%%%%DOCSDIR%%/markdown/5-advanced-topics.md %%PORTDOCS%%%%DOCSDIR%%/markdown/6-object-types.md %%PORTDOCS%%%%DOCSDIR%%/markdown/7-icinga-template-library.md %%PORTDOCS%%%%DOCSDIR%%/markdown/8-cli-commands.md @@ -94,39 +94,41 @@ sbin/icinga2 %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.1.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.2.0.sql %%PGSQL%%%%DATADIR%%-ido-pgsql/schema/upgrade/2.3.0.sql -%%DATADIR%%/include/command-icinga.conf -%%DATADIR%%/include/command-nscp-local.conf -%%DATADIR%%/include/command-plugins-manubulon.conf -%%DATADIR%%/include/command-plugins.conf -%%DATADIR%%/include/command.conf +@sample %%DATADIR%%/include/command-icinga.conf.sample +@sample %%DATADIR%%/include/command-nscp-local.conf.sample +@sample %%DATADIR%%/include/command-plugins-manubulon.conf.sample +@sample %%DATADIR%%/include/command-plugins.conf.sample +@sample %%DATADIR%%/include/command.conf.sample %%DATADIR%%/include/hangman %%DATADIR%%/include/itl %%DATADIR%%/include/manubulon %%DATADIR%%/include/nscp %%DATADIR%%/include/plugins %%DATADIR%%/include/plugins-contrib -%%DATADIR%%/include/plugins-contrib.d/databases.conf -%%DATADIR%%/include/plugins-contrib.d/ipmi.conf -%%DATADIR%%/include/plugins-contrib.d/network-components.conf -%%DATADIR%%/include/plugins-contrib.d/operating-system.conf -%%DATADIR%%/include/plugins-contrib.d/virtualization.conf -%%DATADIR%%/include/plugins-contrib.d/vmware.conf -%%DATADIR%%/include/plugins-contrib.d/web.conf -%%DATADIR%%/include/timeperiod.conf +@sample %%DATADIR%%/include/plugins-contrib.d/databases.conf.sample +@sample %%DATADIR%%/include/plugins-contrib.d/ipmi.conf.sample +@sample %%DATADIR%%/include/plugins-contrib.d/network-components.conf.sample +@sample %%DATADIR%%/include/plugins-contrib.d/operating-system.conf.sample +@sample %%DATADIR%%/include/plugins-contrib.d/virtualization.conf.sample +@sample %%DATADIR%%/include/plugins-contrib.d/vmware.conf.sample +@sample %%DATADIR%%/include/plugins-contrib.d/web.conf.sample +@sample %%DATADIR%%/include/timeperiod.conf.sample +@sample %%DATADIR%%/include/command-plugins-windows.conf.sample +%%DATADIR%%/include/windows-plugins @dir %%ETCDIR%%/pki -@dir /var/cache/icinga2 -@dir /var/lib/icinga2/api/log -@dir /var/lib/icinga2/api/repository -@dir /var/lib/icinga2/api/zones -@dir /var/lib/icinga2/api -@dir /var/lib/icinga2 +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/cache/icinga2 +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/log +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/repository +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api/zones +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2/api +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/lib/icinga2 @dir /var/lib -@dir /var/log/icinga2/compat/archives -@dir /var/log/icinga2/compat -@dir /var/log/icinga2/crash -@dir /var/log/icinga2 -@dir /var/run/icinga2/cmd -@dir /var/run/icinga2 -@dir /var/spool/icinga2/perfdata -@dir /var/spool/icinga2/tmp -@dir /var/spool/icinga2 +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/compat/archives +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/compat +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2/crash +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/log/icinga2 +@dir(%%ICINGA2USER%%,%%WWWGRP%%,2750) /var/run/icinga2/cmd +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/run/icinga2 +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2/perfdata +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2/tmp +@dir(%%ICINGA2USER%%,%%ICINGA2GROUP%%) /var/spool/icinga2 From owner-svn-ports-branches@freebsd.org Sat Jul 25 10:28:32 2015 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 297A19A874F; Sat, 25 Jul 2015 10:28:32 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 1A61811C9; Sat, 25 Jul 2015 10:28:32 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6PASVBj068002; Sat, 25 Jul 2015 10:28:31 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6PASVM2068000; Sat, 25 Jul 2015 10:28:31 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201507251028.t6PASVM2068000@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sat, 25 Jul 2015 10:28:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392867 - branches/2015Q3/net-mgmt/icinga2 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.20 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: Sat, 25 Jul 2015 10:28:32 -0000 Author: lme Date: Sat Jul 25 10:28:30 2015 New Revision: 392867 URL: https://svnweb.freebsd.org/changeset/ports/392867 Log: MFH: r392076 - Fix typo in plist [1] - Install libdb_ido.so conditionally Noticed by: pi [1] Approved by: portmgr (delphij) Modified: branches/2015Q3/net-mgmt/icinga2/Makefile branches/2015Q3/net-mgmt/icinga2/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/net-mgmt/icinga2/Makefile ============================================================================== --- branches/2015Q3/net-mgmt/icinga2/Makefile Sat Jul 25 10:27:19 2015 (r392866) +++ branches/2015Q3/net-mgmt/icinga2/Makefile Sat Jul 25 10:28:30 2015 (r392867) @@ -73,6 +73,13 @@ PGSQL_USES= pgsql OPTIONS_SUB= yes .include + +.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL} +PLIST_SUB+= DBBACKEND="@comment " +.else +PLIST_SUB+= DBBACKEND="" +.endif + .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= flex>=2.5.31:${PORTSDIR}/textproc/flex CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING=${LOCALBASE}/bin/flex Modified: branches/2015Q3/net-mgmt/icinga2/pkg-plist ============================================================================== --- branches/2015Q3/net-mgmt/icinga2/pkg-plist Sat Jul 25 10:27:19 2015 (r392866) +++ branches/2015Q3/net-mgmt/icinga2/pkg-plist Sat Jul 25 10:28:30 2015 (r392867) @@ -42,7 +42,7 @@ lib/icinga2/libchecker.so lib/icinga2/libcli.so lib/icinga2/libcompat.so lib/icinga2/libconfig.so -%%MYSQL%%%%PGSQL%%llib/icinga2/libdb_ido.so +%%DBBACKEND%%lib/icinga2/libdb_ido.so %%MYSQL%%lib/icinga2/libdb_ido_mysql.so %%PGSQL%%lib/icinga2/libdb_ido_pgsql.so lib/icinga2/libexecvpe.so From owner-svn-ports-branches@freebsd.org Sat Jul 25 10:29:58 2015 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 BCB009A87BC; Sat, 25 Jul 2015 10:29:58 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 AD7D212BC; Sat, 25 Jul 2015 10:29:58 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6PATwY2068199; Sat, 25 Jul 2015 10:29:58 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6PATw71068197; Sat, 25 Jul 2015 10:29:58 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201507251029.t6PATw71068197@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sat, 25 Jul 2015 10:29:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392868 - branches/2015Q3/net-mgmt/icinga2 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.20 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: Sat, 25 Jul 2015 10:29:58 -0000 Author: lme Date: Sat Jul 25 10:29:57 2015 New Revision: 392868 URL: https://svnweb.freebsd.org/changeset/ports/392868 Log: MFH: r392847 Update to 2.3.8 Changelog: https://github.com/Icinga/icinga2/blob/v2.3.8/ChangeLog Committed from: Essen FreeBSD Hackathon Approved by: portmgr (erwin) Modified: branches/2015Q3/net-mgmt/icinga2/Makefile branches/2015Q3/net-mgmt/icinga2/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/net-mgmt/icinga2/Makefile ============================================================================== --- branches/2015Q3/net-mgmt/icinga2/Makefile Sat Jul 25 10:28:30 2015 (r392867) +++ branches/2015Q3/net-mgmt/icinga2/Makefile Sat Jul 25 10:29:57 2015 (r392868) @@ -2,7 +2,7 @@ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.3.6 +DISTVERSION= 2.3.8 CATEGORIES= net-mgmt MAINTAINER= lme@FreeBSD.org Modified: branches/2015Q3/net-mgmt/icinga2/distinfo ============================================================================== --- branches/2015Q3/net-mgmt/icinga2/distinfo Sat Jul 25 10:28:30 2015 (r392867) +++ branches/2015Q3/net-mgmt/icinga2/distinfo Sat Jul 25 10:29:57 2015 (r392868) @@ -1,2 +1,2 @@ -SHA256 (icinga-icinga2-v2.3.6_GH0.tar.gz) = 96453fbfa418329b74d45bd2a202302add03d907fac28644e1228d869c478093 -SIZE (icinga-icinga2-v2.3.6_GH0.tar.gz) = 816718 +SHA256 (icinga-icinga2-v2.3.8_GH0.tar.gz) = 43bf41a7afc03c1527c82139e74cce17c5b3609a8ec14bb0db1f8df193a14054 +SIZE (icinga-icinga2-v2.3.8_GH0.tar.gz) = 817951