From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 1 15:53:48 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE34DBDE; Sun, 1 Mar 2015 15:53:48 +0000 (UTC) Received: from svn.freebsd.org (svn.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 B8C12F51; Sun, 1 Mar 2015 15:53:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t21Frmj7028146; Sun, 1 Mar 2015 15:53:48 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t21FrmQJ028144; Sun, 1 Mar 2015 15:53:48 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201503011553.t21FrmQJ028144@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sun, 1 Mar 2015 15:53:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380207 - branches/2015Q1/devel/jenkins-lts 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.18-1 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, 01 Mar 2015 15:53:48 -0000 Author: swills Date: Sun Mar 1 15:53:47 2015 New Revision: 380207 URL: https://svnweb.freebsd.org/changeset/ports/380207 QAT: https://qat.redports.org/buildarchive/r380207/ Log: MFH: r380169 devel/jenkins-lts: update to 1.596.1 Modified: branches/2015Q1/devel/jenkins-lts/Makefile branches/2015Q1/devel/jenkins-lts/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/jenkins-lts/Makefile ============================================================================== --- branches/2015Q1/devel/jenkins-lts/Makefile Sun Mar 1 15:16:42 2015 (r380206) +++ branches/2015Q1/devel/jenkins-lts/Makefile Sun Mar 1 15:53:47 2015 (r380207) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 1.580.1 +PORTVERSION= 1.596.1 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war-stable/${PORTVERSION}/ PKGNAMESUFFIX= -lts Modified: branches/2015Q1/devel/jenkins-lts/distinfo ============================================================================== --- branches/2015Q1/devel/jenkins-lts/distinfo Sun Mar 1 15:16:42 2015 (r380206) +++ branches/2015Q1/devel/jenkins-lts/distinfo Sun Mar 1 15:53:47 2015 (r380207) @@ -1,2 +1,2 @@ -SHA256 (jenkins/1.580.1/jenkins.war) = 53608b7e5b89d5cc1fbdbf8588b5c0a04a664f34d403ae4bffb80016511a6cdb -SIZE (jenkins/1.580.1/jenkins.war) = 68022189 +SHA256 (jenkins/1.596.1/jenkins.war) = 7ef24648ba0bdf7562034d467687afb2b7e7d168d65b61a2c4242bb7103351ec +SIZE (jenkins/1.596.1/jenkins.war) = 68552101 From owner-svn-ports-branches@FreeBSD.ORG Sun Mar 1 19:01:04 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A87EEFA0; Sun, 1 Mar 2015 19:01:04 +0000 (UTC) Received: from svn.freebsd.org (svn.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 8917C7D1; Sun, 1 Mar 2015 19:01:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t21J149X016434; Sun, 1 Mar 2015 19:01:04 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t21J13C0016428; Sun, 1 Mar 2015 19:01:03 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201503011901.t21J13C0016428@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sun, 1 Mar 2015 19:01:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380224 - in branches/2015Q1: devel/jenkins 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.18-1 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, 01 Mar 2015 19:01:04 -0000 Author: lwhsu Date: Sun Mar 1 19:01:02 2015 New Revision: 380224 URL: https://svnweb.freebsd.org/changeset/ports/380224 QAT: https://qat.redports.org/buildarchive/r380224/ Log: MFH: r380172 Add entry for security issue in jenkins Reviewed by: zi MFH: r380173 - Update to 1.600 Security: 7480b6ac-adf1-443e-a33c-3a3c0becba1e Notified by: swills Approved by: portmgr (swills) Modified: branches/2015Q1/devel/jenkins/Makefile branches/2015Q1/devel/jenkins/distinfo branches/2015Q1/security/vuxml/vuln.xml Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/jenkins/Makefile ============================================================================== --- branches/2015Q1/devel/jenkins/Makefile Sun Mar 1 18:56:56 2015 (r380223) +++ branches/2015Q1/devel/jenkins/Makefile Sun Mar 1 19:01:02 2015 (r380224) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 1.595 +PORTVERSION= 1.600 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war/${PORTVERSION}/ DISTNAME= jenkins Modified: branches/2015Q1/devel/jenkins/distinfo ============================================================================== --- branches/2015Q1/devel/jenkins/distinfo Sun Mar 1 18:56:56 2015 (r380223) +++ branches/2015Q1/devel/jenkins/distinfo Sun Mar 1 19:01:02 2015 (r380224) @@ -1,2 +1,2 @@ -SHA256 (jenkins/1.595/jenkins.war) = 2424e6316ec45d524d132203438e8d767a5e9bed747b2c583047ff944f2e2935 -SIZE (jenkins/1.595/jenkins.war) = 68215690 +SHA256 (jenkins/1.600/jenkins.war) = 9b7d9d1fd6dce1077599a31468b1ef2ebe7b849f6d2f52f943541b944d9c29f9 +SIZE (jenkins/1.600/jenkins.war) = 68808007 Modified: branches/2015Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2015Q1/security/vuxml/vuln.xml Sun Mar 1 18:56:56 2015 (r380223) +++ branches/2015Q1/security/vuxml/vuln.xml Sun Mar 1 19:01:02 2015 (r380224) @@ -57,6 +57,79 @@ Notes: --> + + jenkins -- multiple vulnerabilities + + + jenkins + 1.600 + + + jenkins-lts + 1.580.3 + + + + +

Kohsuke Kawaguchi from Jenkins team reports:

+
+

Description

+
SECURITY-125 (Combination filter Groovy script unsecured)
+

This vulnerability allows users with the job configuration + privilege to escalate his privileges, resulting in arbitrary code + execution to the master.

+
SECURITY-162 (directory traversal from artifacts via symlink)
+

This vulnerability allows users with the job configuration + privilege or users with commit access to the build script to + access arbitrary files/directories on the master, resulting in + the exposure of sensitive information, such as encryption keys.

+
SECURITY-163 (update center metadata retrieval DoS attack)
+

This vulnerability allows authenticated users to disrupt the + operation of Jenkins by feeding malicious update center data into + Jenkins, affecting plugin installation and tool installation.

+
SECURITY-165 (external entity injection via XPath)
+

This vulnerability allows users with the read access to Jenkins + to retrieve arbitrary XML document on the server, resulting in + the exposure of sensitive information inside/outside Jenkins.

+
SECURITY-166 (HudsonPrivateSecurityRealm allows creation of + reserved names)
+

For users using "Jenkins' own user database" setting, Jenkins + doesn't refuse reserved names, thus allowing privilege escalation.

+
SECURITY-167 (External entity processing in XML can reveal + sensitive local files)
+

This vulnerability allows attackers to create malicious XML + documents and feed that into Jenkins, which causes Jenkins to + retrieve arbitrary XML document on the server, resulting in the + exposure of sensitive information inside/outside Jenkins.

+

Severity

+

SECURITY-125 is rated critical. This attack can be + only mounted by users with some trust, but it results in arbitrary + code execution on the master.

+

SECURITY-162 is rated critical. This attack can be + only mounted by users with some trust, but it results in the + exposure of sensitive information.

+

SECURITY-163 is rated medium, as it results in the + loss of functionality.

+

SECURITY-165 is rated critical. This attack is + easy to mount, and it results in the exposure of sensitive + information.

+

SECURITY-166 is rated critical. For users who use + the affected feature, this attack results in arbitrary code + execution on the master.

+

SECURITY-167 is rated critical. This attack is + easy to mount, and it results in the exposure of sensitive information.

+
+ + + + https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-02-27 + + + 2015-03-01 + 2015-03-01 + + + django -- multiple vulnerabilities From owner-svn-ports-branches@FreeBSD.ORG Mon Mar 2 13:55:03 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F9C7E0E; Mon, 2 Mar 2015 13:55:03 +0000 (UTC) Received: from svn.freebsd.org (svn.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 4B186A30; Mon, 2 Mar 2015 13:55:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t22Dt3RF073181; Mon, 2 Mar 2015 13:55:03 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t22Dt20G073179; Mon, 2 Mar 2015 13:55:02 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201503021355.t22Dt20G073179@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Mon, 2 Mar 2015 13:55:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380261 - branches/2015Q1/lang/php5 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.18-1 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, 02 Mar 2015 13:55:03 -0000 Author: zi Date: Mon Mar 2 13:55:02 2015 New Revision: 380261 URL: https://svnweb.freebsd.org/changeset/ports/380261 QAT: https://qat.redports.org/buildarchive/r380261/ Log: MFH: r377732 Update to 5.4.37 release. Approved by: ports-secteam With hat: ports-secteam Modified: branches/2015Q1/lang/php5/Makefile branches/2015Q1/lang/php5/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/lang/php5/Makefile ============================================================================== --- branches/2015Q1/lang/php5/Makefile Mon Mar 2 13:39:29 2015 (r380260) +++ branches/2015Q1/lang/php5/Makefile Mon Mar 2 13:55:02 2015 (r380261) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php5 -PORTVERSION= 5.4.36 +PORTVERSION= 5.4.37 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q1/lang/php5/distinfo ============================================================================== --- branches/2015Q1/lang/php5/distinfo Mon Mar 2 13:39:29 2015 (r380260) +++ branches/2015Q1/lang/php5/distinfo Mon Mar 2 13:55:02 2015 (r380261) @@ -1,4 +1,4 @@ -SHA256 (php-5.4.36.tar.bz2) = b0951608c3e8afb978a624c7f79a889980210f5258f666c1d997bd6491e13241 -SIZE (php-5.4.36.tar.bz2) = 11892431 +SHA256 (php-5.4.37.tar.bz2) = 857bf6675eeb0ae9c3cd6f9ccdb2a9b7bf89dcfda7f0a80857638fe023f3a8ad +SIZE (php-5.4.37.tar.bz2) = 12275113 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344 SIZE (php-5.4.x-mail-header.patch) = 3379 From owner-svn-ports-branches@FreeBSD.ORG Mon Mar 2 14:14:35 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB8B34A3; Mon, 2 Mar 2015 14:14:35 +0000 (UTC) Received: from svn.freebsd.org (svn.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 8C537CE0; Mon, 2 Mar 2015 14:14:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t22EEZoW083420; Mon, 2 Mar 2015 14:14:35 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t22EEWi0083401; Mon, 2 Mar 2015 14:14:32 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201503021414.t22EEWi0083401@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Mon, 2 Mar 2015 14:14:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380263 - in branches/2015Q1: databases/php-adodb-ext lang/php5 lang/php55 lang/php55/files lang/php56 lang/php56/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.18-1 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, 02 Mar 2015 14:14:35 -0000 Author: zi Date: Mon Mar 2 14:14:31 2015 New Revision: 380263 URL: https://svnweb.freebsd.org/changeset/ports/380263 QAT: https://qat.redports.org/buildarchive/r380263/ Log: - Update PHP 5.4 to 5.4.38 release - Update PHP 5.5 to 5.5.22 release - Update PHP 5.6 to 5.6.6 release MFH: r377396,377730-377731,379433 Approved by: ports-secteam With hat: ports-secteam Deleted: branches/2015Q1/lang/php55/files/patch-sapi_fpm_Makefile.frag branches/2015Q1/lang/php55/files/patch-sapi_fpm_php-fpm.conf.in branches/2015Q1/lang/php56/files/patch-sapi_fpm_Makefile.frag branches/2015Q1/lang/php56/files/patch-sapi_fpm_php-fpm.conf.in Modified: branches/2015Q1/databases/php-adodb-ext/Makefile branches/2015Q1/lang/php5/Makefile branches/2015Q1/lang/php5/Makefile.ext branches/2015Q1/lang/php5/distinfo branches/2015Q1/lang/php55/Makefile branches/2015Q1/lang/php55/Makefile.ext branches/2015Q1/lang/php55/distinfo branches/2015Q1/lang/php55/pkg-plist branches/2015Q1/lang/php56/Makefile branches/2015Q1/lang/php56/Makefile.ext branches/2015Q1/lang/php56/distinfo branches/2015Q1/lang/php56/pkg-plist Modified: branches/2015Q1/databases/php-adodb-ext/Makefile ============================================================================== --- branches/2015Q1/databases/php-adodb-ext/Makefile Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/databases/php-adodb-ext/Makefile Mon Mar 2 14:14:31 2015 (r380263) @@ -18,6 +18,8 @@ USES= dos2unix zip USE_PHP= yes USE_PHPEXT= yes PHP_MODNAME= adodb +PHP_DEFAULT= 55 +IGNORE_WITH_PHP=56 SUB_FILES= pkg-message Modified: branches/2015Q1/lang/php5/Makefile ============================================================================== --- branches/2015Q1/lang/php5/Makefile Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php5/Makefile Mon Mar 2 14:14:31 2015 (r380263) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php5 -PORTVERSION= 5.4.37 +PORTVERSION= 5.4.38 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q1/lang/php5/Makefile.ext ============================================================================== --- branches/2015Q1/lang/php5/Makefile.ext Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php5/Makefile.ext Mon Mar 2 14:14:31 2015 (r380263) @@ -132,17 +132,16 @@ USES+= iconv:translit .endif .if ${PHP_MODNAME} == "imap" -LIB_DEPENDS+= libc-client4.so:${PORTSDIR}/mail/cclient +OPTIONS_DEFINE= PANDA +PANDA_DESC= Uses the forked panda-cclient instead of the original cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ - --with-pcre-dir=${LOCALBASE} -.if !defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} + --with-pcre-dir=${LOCALBASE} \ + --with-imap-ssl=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif -.endif .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} @@ -524,6 +523,14 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBA . endif .endif +.if ${PHP_MODNAME} == "imap" +. if ${PORT_OPTIONS:MPANDA} +LIB_DEPENDS+= libc-client4.so.10:${PORTSDIR}/mail/panda-cclient +. else +LIB_DEPENDS+= libc-client4.so.9:${PORTSDIR}/mail/cclient +. endif +.endif + .if ${PHP_MODNAME} == "mbstring" . if ${PORT_OPTIONS:MREGEX} LIB_DEPENDS+= libonig.so:${PORTSDIR}/devel/oniguruma4 Modified: branches/2015Q1/lang/php5/distinfo ============================================================================== --- branches/2015Q1/lang/php5/distinfo Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php5/distinfo Mon Mar 2 14:14:31 2015 (r380263) @@ -1,4 +1,4 @@ -SHA256 (php-5.4.37.tar.bz2) = 857bf6675eeb0ae9c3cd6f9ccdb2a9b7bf89dcfda7f0a80857638fe023f3a8ad -SIZE (php-5.4.37.tar.bz2) = 12275113 +SHA256 (php-5.4.38.tar.bz2) = abf37db0cfadc9bb814f9df35f6aa966ad63f4f4c4475e432ec625568a5d3e88 +SIZE (php-5.4.38.tar.bz2) = 12273298 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344 SIZE (php-5.4.x-mail-header.patch) = 3379 Modified: branches/2015Q1/lang/php55/Makefile ============================================================================== --- branches/2015Q1/lang/php55/Makefile Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php55/Makefile Mon Mar 2 14:14:31 2015 (r380263) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php55 -PORTVERSION= 5.5.20 +PORTVERSION= 5.5.22 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q1/lang/php55/Makefile.ext ============================================================================== --- branches/2015Q1/lang/php55/Makefile.ext Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php55/Makefile.ext Mon Mar 2 14:14:31 2015 (r380263) @@ -132,17 +132,16 @@ USES+= iconv:translit .endif .if ${PHP_MODNAME} == "imap" -LIB_DEPENDS+= libc-client4.so:${PORTSDIR}/mail/cclient +OPTIONS_DEFINE= PANDA +PANDA_DESC= Uses the forked panda-cclient instead of the original cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ - --with-pcre-dir=${LOCALBASE} -.if !defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} + --with-pcre-dir=${LOCALBASE} \ + --with-imap-ssl=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif -.endif .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} @@ -524,6 +523,14 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBA . endif .endif +.if ${PHP_MODNAME} == "imap" +. if ${PORT_OPTIONS:MPANDA} +LIB_DEPENDS+= libc-client4.so.10:${PORTSDIR}/mail/panda-cclient +. else +LIB_DEPENDS+= libc-client4.so.9:${PORTSDIR}/mail/cclient +. endif +.endif + .if ${PHP_MODNAME} == "mbstring" . if ${PORT_OPTIONS:MREGEX} LIB_DEPENDS+= libonig.so:${PORTSDIR}/devel/oniguruma4 Modified: branches/2015Q1/lang/php55/distinfo ============================================================================== --- branches/2015Q1/lang/php55/distinfo Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php55/distinfo Mon Mar 2 14:14:31 2015 (r380263) @@ -1,4 +1,4 @@ -SHA256 (php-5.5.20.tar.bz2) = f28a150d1cd8991bd1a41dce4fdff4e343d1dbe01a48b9b44bea74532ce0391a -SIZE (php-5.5.20.tar.bz2) = 13240796 +SHA256 (php-5.5.22.tar.bz2) = c218c184bef2905bc79fcdda6040f3d1738261395fb706396935d1c6f6e162bb +SIZE (php-5.5.22.tar.bz2) = 13305486 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 Modified: branches/2015Q1/lang/php55/pkg-plist ============================================================================== --- branches/2015Q1/lang/php55/pkg-plist Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php55/pkg-plist Mon Mar 2 14:14:31 2015 (r380263) @@ -91,6 +91,7 @@ include/php/ext/ereg/regex/regex2.h include/php/ext/ereg/regex/utils.h include/php/ext/libxml/php_libxml.h include/php/ext/mysqlnd/config-win.h +include/php/ext/mysqlnd/mysql_float_to_double.h include/php/ext/mysqlnd/mysqlnd.h include/php/ext/mysqlnd/mysqlnd_alloc.h include/php/ext/mysqlnd/mysqlnd_block_alloc.h Modified: branches/2015Q1/lang/php56/Makefile ============================================================================== --- branches/2015Q1/lang/php56/Makefile Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php56/Makefile Mon Mar 2 14:14:31 2015 (r380263) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.4 +PORTVERSION= 5.6.6 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q1/lang/php56/Makefile.ext ============================================================================== --- branches/2015Q1/lang/php56/Makefile.ext Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php56/Makefile.ext Mon Mar 2 14:14:31 2015 (r380263) @@ -132,17 +132,16 @@ USES+= iconv:translit .endif .if ${PHP_MODNAME} == "imap" -LIB_DEPENDS+= libc-client4.so:${PORTSDIR}/mail/cclient +OPTIONS_DEFINE= PANDA +PANDA_DESC= Uses the forked panda-cclient instead of the original cclient CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \ - --with-pcre-dir=${LOCALBASE} -.if !defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE} + --with-pcre-dir=${LOCALBASE} \ + --with-imap-ssl=${OPENSSLBASE} LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif -.endif .if ${PHP_MODNAME} == "interbase" CONFIGURE_ARGS+=--with-interbase=${LOCALBASE} @@ -527,6 +526,14 @@ CONFIGURE_ARGS+=--with-vpx-dir=${LOCALBA . endif .endif +.if ${PHP_MODNAME} == "imap" +. if ${PORT_OPTIONS:MPANDA} +LIB_DEPENDS+= libc-client4.so.10:${PORTSDIR}/mail/panda-cclient +. else +LIB_DEPENDS+= libc-client4.so.9:${PORTSDIR}/mail/cclient +. endif +.endif + .if ${PHP_MODNAME} == "mbstring" . if ${PORT_OPTIONS:MREGEX} LIB_DEPENDS+= libonig.so:${PORTSDIR}/devel/oniguruma4 Modified: branches/2015Q1/lang/php56/distinfo ============================================================================== --- branches/2015Q1/lang/php56/distinfo Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php56/distinfo Mon Mar 2 14:14:31 2015 (r380263) @@ -1,4 +1,4 @@ -SHA256 (php-5.6.4.tar.bz2) = 576f9001b612f5ddc22f447311bbec321e2c959b6a52259d664c4ba04ef044f1 -SIZE (php-5.6.4.tar.bz2) = 13498882 +SHA256 (php-5.6.6.tar.bz2) = 09625c9b65e0c8198dc76995a35f0feec0e13ea4489526e64a00954b12adbb4c +SIZE (php-5.6.6.tar.bz2) = 13687928 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 Modified: branches/2015Q1/lang/php56/pkg-plist ============================================================================== --- branches/2015Q1/lang/php56/pkg-plist Mon Mar 2 13:59:26 2015 (r380262) +++ branches/2015Q1/lang/php56/pkg-plist Mon Mar 2 14:14:31 2015 (r380263) @@ -93,6 +93,7 @@ include/php/ext/ereg/regex/regex2.h include/php/ext/ereg/regex/utils.h include/php/ext/libxml/php_libxml.h include/php/ext/mysqlnd/config-win.h +include/php/ext/mysqlnd/mysql_float_to_double.h include/php/ext/mysqlnd/mysqlnd.h include/php/ext/mysqlnd/mysqlnd_alloc.h include/php/ext/mysqlnd/mysqlnd_block_alloc.h From owner-svn-ports-branches@FreeBSD.ORG Mon Mar 2 17:14:44 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 37ABCA6E; Mon, 2 Mar 2015 17:14:44 +0000 (UTC) Received: from svn.freebsd.org (svn.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 EE5DF5FB; Mon, 2 Mar 2015 17:14:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t22HEhYX068918; Mon, 2 Mar 2015 17:14:43 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t22HEgg3068914; Mon, 2 Mar 2015 17:14:42 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201503021714.t22HEgg3068914@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Mon, 2 Mar 2015 17:14:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380276 - in branches/2015Q1/www/tengine: . 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.18-1 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, 02 Mar 2015 17:14:44 -0000 Author: robak Date: Mon Mar 2 17:14:42 2015 New Revision: 380276 URL: https://svnweb.freebsd.org/changeset/ports/380276 QAT: https://qat.redports.org/buildarchive/r380276/ Log: MFH: r379453 www/tengine: multiple fixes - Fix building issue when using custom port options - Fix problem with agentzh modules moved by upstream to openresty repo - Convert to @dir usage - Add LICENSE FILE - Pet portlint PR: 196002 Approved by: portmgr Added: branches/2015Q1/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config - copied unchanged from r379453, head/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config Deleted: branches/2015Q1/www/tengine/files/extra-patch-agentzh-set-misc-nginx-module-config Modified: branches/2015Q1/www/tengine/Makefile branches/2015Q1/www/tengine/distinfo branches/2015Q1/www/tengine/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/tengine/Makefile ============================================================================== --- branches/2015Q1/www/tengine/Makefile Mon Mar 2 17:00:32 2015 (r380275) +++ branches/2015Q1/www/tengine/Makefile Mon Mar 2 17:14:42 2015 (r380276) @@ -6,11 +6,13 @@ PORTVERSION= 2.0.3 PORTREVISION= 4 CATEGORIES= www MASTER_SITES= GH +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= robak@FreeBSD.org -COMMENT= Robust and small WWW server forked from nginx by Taobao +COMMENT= Robust and small WWW server forked from Nginx LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE WANT_GNOME= yes USE_GNOME= libxml2 libxslt @@ -326,17 +328,17 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .if ${PORT_OPTIONS:MECHO} NGINX_ECHO_VERSION= 0.50 GIT_ECHO_VERSION= 0-gf827a4f -MASTER_SITES+= https://github.com/agentzh/echo-nginx-module/tarball/v${NGINX_ECHO_VERSION}/:echo -DISTFILES+= agentzh-echo-nginx-module-v${NGINX_ECHO_VERSION}-${GIT_ECHO_VERSION}.tar.gz:echo -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-echo-nginx-module-${GIT_ECHO_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/echo-nginx-module/tarball/v${NGINX_ECHO_VERSION}/:echo +DISTFILES+= openresty-echo-nginx-module-v${NGINX_ECHO_VERSION}-${GIT_ECHO_VERSION}.tar.gz:echo +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-echo-nginx-module-${GIT_ECHO_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MHEADERS_MORE} NGINX_HEADERS_MORE_VERSION= 0.24 GIT_HEADERS_MORE_VERSION= 0-g7a6fd11 -MASTER_SITES+= https://github.com/agentzh/headers-more-nginx-module/tarball/v${NGINX_HEADERS_MORE_VERSION}/:headers_more -DISTFILES+= agentzh-headers-more-nginx-module-v${NGINX_HEADERS_MORE_VERSION}-${GIT_HEADERS_MORE_VERSION}.tar.gz:headers_more -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/headers-more-nginx-module/tarball/v${NGINX_HEADERS_MORE_VERSION}/:headers_more +DISTFILES+= openresty-headers-more-nginx-module-v${NGINX_HEADERS_MORE_VERSION}-${GIT_HEADERS_MORE_VERSION}.tar.gz:headers_more +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-headers-more-nginx-module-${GIT_HEADERS_MORE_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MHTTP_DAV} @@ -499,9 +501,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/s .if ${PORT_OPTIONS:MENCRYPTSESSION} NGINX_ENCRYPTSESSION_VERSION= 0.03 GIT_ENCRYPTSESSION_VERSION= 0-g49d741b -MASTER_SITES+= https://github.com/agentzh/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_VERSION}/:encryptsession -DISTFILES+= agentzh-encrypted-session-nginx-module-v${NGINX_ENCRYPTSESSION_VERSION}-${GIT_ENCRYPTSESSION_VERSION}.tar.gz:encryptsession -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-encrypted-session-nginx-module-${GIT_ENCRYPTSESSION_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/encrypted-session-nginx-module/tarball/v${NGINX_ENCRYPTSESSION_VERSION}/:encryptsession +DISTFILES+= openresty-encrypted-session-nginx-module-v${NGINX_ENCRYPTSESSION_VERSION}-${GIT_ENCRYPTSESSION_VERSION}.tar.gz:encryptsession +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-encrypted-session-nginx-module-${GIT_ENCRYPTSESSION_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MGRIDFS} @@ -527,9 +529,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/a .if ${PORT_OPTIONS:MMEMC} NGINX_MEMC_VERSION= 0.14 GIT_MEMC_VERSION= 0-gde4cf86 -MASTER_SITES+= https://github.com/agentzh/memc-nginx-module/tarball/v${NGINX_MEMC_VERSION}/:memc -DISTFILES+= agentzh-memc-nginx-module-v${NGINX_MEMC_VERSION}-${GIT_MEMC_VERSION}.tar.gz:memc -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-memc-nginx-module-${GIT_MEMC_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/memc-nginx-module/tarball/v${NGINX_MEMC_VERSION}/:memc +DISTFILES+= openresty-memc-nginx-module-v${NGINX_MEMC_VERSION}-${GIT_MEMC_VERSION}.tar.gz:memc +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-memc-nginx-module-${GIT_MEMC_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MMODSECURITY} @@ -561,25 +563,25 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch- .if ${PORT_OPTIONS:MRDS_CSV} NGINX_RDS_CSV_VERSION= 0.05 GIT_RDS_CSV_VERSION= 0-g607e26b -MASTER_SITES+= https://github.com/agentzh/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_VERSION}/:rdscsv -DISTFILES+= agentzh-rds-csv-nginx-module-v${NGINX_RDS_CSV_VERSION}-${GIT_RDS_CSV_VERSION}.tar.gz:rdscsv -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-rds-csv-nginx-module-${GIT_RDS_CSV_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/rds-csv-nginx-module/tarball/v${NGINX_RDS_CSV_VERSION}/:rdscsv +DISTFILES+= openresty-rds-csv-nginx-module-v${NGINX_RDS_CSV_VERSION}-${GIT_RDS_CSV_VERSION}.tar.gz:rdscsv +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-csv-nginx-module-${GIT_RDS_CSV_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MRDS_JSON} NGINX_RDS_JSON_VERSION= 0.13 GIT_RDS_JSON_VERSION= 0-g8292070 -MASTER_SITES+= https://github.com/agentzh/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_VERSION}/:rdsjson -DISTFILES+= agentzh-rds-json-nginx-module-v${NGINX_RDS_JSON_VERSION}-${GIT_RDS_JSON_VERSION}.tar.gz:rdsjson -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-rds-json-nginx-module-${GIT_RDS_JSON_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/rds-json-nginx-module/tarball/v${NGINX_RDS_JSON_VERSION}/:rdsjson +DISTFILES+= openresty-rds-json-nginx-module-v${NGINX_RDS_JSON_VERSION}-${GIT_RDS_JSON_VERSION}.tar.gz:rdsjson +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-rds-json-nginx-module-${GIT_RDS_JSON_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MREDIS2} NGINX_REDIS2_VERSION= 0.10 GIT_REDIS2_VERSION= 0-g78a7622 -MASTER_SITES+= https://github.com/agentzh/redis2-nginx-module/tarball/v${NGINX_REDIS2_VERSION}/:redis2 -DISTFILES+= agentzh-redis2-nginx-module-v${NGINX_REDIS2_VERSION}-${GIT_REDIS2_VERSION}.tar.gz:redis2 -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-redis2-nginx-module-${GIT_REDIS2_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/redis2-nginx-module/tarball/v${NGINX_REDIS2_VERSION}/:redis2 +DISTFILES+= openresty-redis2-nginx-module-v${NGINX_REDIS2_VERSION}-${GIT_REDIS2_VERSION}.tar.gz:redis2 +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-redis2-nginx-module-${GIT_REDIS2_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MRTMP} @@ -592,10 +594,10 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .if ${PORT_OPTIONS:MSET_MISC} NGINX_SET_MISC_VERSION= 0.23 GIT_SET_MISC_VERSION= 0-g6ce586e -MASTER_SITES+= https://github.com/agentzh/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc -DISTFILES+= agentzh-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-agentzh-set-misc-nginx-module-config +MASTER_SITES+= https://github.com/openresty/set-misc-nginx-module/tarball/v${NGINX_SET_MISC_VERSION}/:setmisc +DISTFILES+= openresty-set-misc-nginx-module-v${NGINX_SET_MISC_VERSION}-${GIT_SET_MISC_VERSION}.tar.gz:setmisc +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-set-misc-nginx-module-${GIT_SET_MISC_VERSION:S/^0-g//} +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openresty-set-misc-nginx-module-config .endif .if ${PORT_OPTIONS:MSFLOW} @@ -617,9 +619,9 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/n .if ${PORT_OPTIONS:MSRCACHE} NGINX_SRCACHE_VERSION= 0.24 GIT_SRCACHE_VERSION= 0-g33f0f29 -MASTER_SITES+= https://github.com/agentzh/srcache-nginx-module/tarball/v${NGINX_SRCACHE_VERSION}/:srcache -DISTFILES+= agentzh-srcache-nginx-module-v${NGINX_SRCACHE_VERSION}-${GIT_SRCACHE_VERSION}.tar.gz:srcache -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/srcache-nginx-module/tarball/v${NGINX_SRCACHE_VERSION}/:srcache +DISTFILES+= openresty-srcache-nginx-module-v${NGINX_SRCACHE_VERSION}-${GIT_SRCACHE_VERSION}.tar.gz:srcache +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-srcache-nginx-module-${GIT_SRCACHE_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MSUPERVISORD} @@ -647,13 +649,13 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/g .if ${PORT_OPTIONS:MXSS} NGINX_XSS_VERSION= 0.04 GIT_XSS_VERSION= 0-g7e37038 -MASTER_SITES+= https://github.com/agentzh/xss-nginx-module/tarball/v${NGINX_XSS_VERSION}/:xss -DISTFILES+= agentzh-xss-nginx-module-v${NGINX_XSS_VERSION}-${GIT_XSS_VERSION}.tar.gz:xss -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-xss-nginx-module-${GIT_XSS_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/xss-nginx-module/tarball/v${NGINX_XSS_VERSION}/:xss +DISTFILES+= openresty-xss-nginx-module-v${NGINX_XSS_VERSION}-${GIT_XSS_VERSION}.tar.gz:xss +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-xss-nginx-module-${GIT_XSS_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MSPDY} -WITH_HTTP_SSL= yes +WITH_HTTP_SSL= yes CONFIGURE_ARGS+=--with-http_spdy_module .endif @@ -697,9 +699,9 @@ CONFIGURE_ARGS+=--with-mail_ssl_module .if ${PORT_OPTIONS:MARRAYVAR} NGINX_ARRAYVAR_VERSION= 0.03 GIT_ARRAYVAR_VERSION= 0-g4676747 -MASTER_SITES+= https://github.com/agentzh/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_VERSION}/:arrayvar -DISTFILES+= agentzh-array-var-nginx-module-v${NGINX_ARRAYVAR_VERSION}-${GIT_ARRAYVAR_VERSION}.tar.gz:arrayvar -CONFIGURE_ARGS+=--add-module=${WRKDIR}/agentzh-array-var-nginx-module-${GIT_ARRAYVAR_VERSION:S/^0-g//} +MASTER_SITES+= https://github.com/openresty/array-var-nginx-module/tarball/v${NGINX_ARRAYVAR_VERSION}/:arrayvar +DISTFILES+= openresty-array-var-nginx-module-v${NGINX_ARRAYVAR_VERSION}-${GIT_ARRAYVAR_VERSION}.tar.gz:arrayvar +CONFIGURE_ARGS+=--add-module=${WRKDIR}/openresty-array-var-nginx-module-${GIT_ARRAYVAR_VERSION:S/^0-g//} .endif .if ${PORT_OPTIONS:MFORMINPUT} @@ -735,10 +737,10 @@ CONFIGURE_ARGS+=--without-http_rewrite_m .endif .if defined(NGINX_OPENSSL) -USE_OPENSSL= yes +USE_OPENSSL= yes .if ${PORT_OPTIONS:MSPDY} .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000028 -WITH_OPENSSL_PORT= yes +WITH_OPENSSL_PORT= yes .else WITH_OPENSSL_BASE= yes .endif @@ -805,8 +807,8 @@ post-patch: .endif .if ${PORT_OPTIONS:MSPDY} .if ${PORT_OPTIONS:MDRIZZLE} - @${REINPLACE_CMD} '584d' \ - ${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/src/ngx_http_drizzle_util.c + @${REINPLACE_CMD} '584d' \ + ${WRKDIR}/chaoslawful-drizzle-nginx-module-${GIT_DRIZZLE_VERSION:S/^0-g//}/src/ngx_http_drizzle_util.c .endif .endif .if ${PORT_OPTIONS:MSUPERVISORD} @@ -889,6 +891,6 @@ post-install: ${ECHO_CMD} ${SITE_ARCH_REL}/nginx.pm >> ${TMPPLIST} ${ECHO_CMD} @dirrm ${SITE_ARCH_REL}/auto/nginx >> ${TMPPLIST} .endif - @${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .include Modified: branches/2015Q1/www/tengine/distinfo ============================================================================== --- branches/2015Q1/www/tengine/distinfo Mon Mar 2 17:00:32 2015 (r380275) +++ branches/2015Q1/www/tengine/distinfo Mon Mar 2 17:14:42 2015 (r380276) @@ -14,10 +14,10 @@ SHA256 (ngx_http_auth_request_module-0.2 SIZE (ngx_http_auth_request_module-0.2.tar.gz) = 6736 SHA256 (ngx_cache_purge-2.1.tar.gz) = 424005af0c04e59ffa65a65e446081d4f95ee76a801a7555e001c67810bcb3b9 SIZE (ngx_cache_purge-2.1.tar.gz) = 10535 -SHA256 (agentzh-echo-nginx-module-v0.50-0-gf827a4f.tar.gz) = 0121dd5a8053d6960c9acc364f7552db1bcc64aa4340d0bf7f6d09d3125cfbe9 -SIZE (agentzh-echo-nginx-module-v0.50-0-gf827a4f.tar.gz) = 62907 -SHA256 (agentzh-headers-more-nginx-module-v0.24-0-g7a6fd11.tar.gz) = 1bc8e48da5c6b9968620114776be2751ab600c7953a04c08e16901de3ef2aec2 -SIZE (agentzh-headers-more-nginx-module-v0.24-0-g7a6fd11.tar.gz) = 27666 +SHA256 (openresty-echo-nginx-module-v0.50-0-gf827a4f.tar.gz) = 3bce25d45b81a9d0c44b918b8566b4b43b77ef877f5f6cde3175df82fd1bf097 +SIZE (openresty-echo-nginx-module-v0.50-0-gf827a4f.tar.gz) = 62916 +SHA256 (openresty-headers-more-nginx-module-v0.24-0-g7a6fd11.tar.gz) = e8575a05ffcb9887a6c0124d7db2dad53d475e733b9ce9f4507e40e5428f86ce +SIZE (openresty-headers-more-nginx-module-v0.24-0-g7a6fd11.tar.gz) = 27673 SHA256 (arut-nginx-dav-ext-module-v0.0.2-0-g0e07a3e.tar.gz) = a0d6fa256e354ce48c06e1f689d26ebb2f7b75f71ce682e34ae6c29331a7fbff SIZE (arut-nginx-dav-ext-module-v0.0.2-0-g0e07a3e.tar.gz) = 6065 SHA256 (vkholodkov-nginx-eval-module-1.0.3-0-g125fa2e.tar.gz) = 945046c42d973be9293e03ab41e3a0e04677524b2cd813cfc5146cf1d2f0ab8f @@ -50,46 +50,46 @@ SHA256 (chaoslawful-drizzle-nginx-module SIZE (chaoslawful-drizzle-nginx-module-v0.1.6-0-ge6937ba.tar.gz) = 61351 SHA256 (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 9a8c372f8e750d33018d9587d288c17f755e8da38592bca8ef9bf9ea4bab59a7 SIZE (simpl-ngx_devel_kit-v0.2.19-0-g8dd0df5.tar.gz) = 65033 -SHA256 (agentzh-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 4485214756dc935a959efd3a2fcd750263df1719956a4ac73f96b0cee0763395 -SIZE (agentzh-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 8947 +SHA256 (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 0c8b74f2fbe6114f6d59fecbf3539f5d13944f40895d1c379fdb5dfb0838c1e3 +SIZE (openresty-encrypted-session-nginx-module-v0.03-0-g49d741b.tar.gz) = 8954 SHA256 (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = f55617873c9b123d610d59e4da52703c07be0bae5c719ef0cc3d45a53480d29c SIZE (mdirolf-nginx-gridfs-v0.8-0-gb5f8113.tar.gz) = 18882 SHA256 (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = bfcdd60c6b53bd499e2bf22fefc96848de37e7d57dfaf7303bb00376dcb812f0 SIZE (mongodb-mongo-c-driver-v0.3.1-0-g9b4b232.tar.gz) = 53033 SHA256 (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 9253581f11966329f64b4b4a49a2a60798665812f9007222592586e64bcd66da SIZE (arut-nginx-let-module-v0.0.4-0-ga5e1dc5.tar.gz) = 20543 -SHA256 (agentzh-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 5e8cacd7af42685794bbe121264173de4141e5746031e23f8e363ab14ccb1534 -SIZE (agentzh-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 37755 +SHA256 (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = b60fed5921a0c19c6ffe71e5c764193283dbe635bb3bad6febd6655f94a633e9 +SIZE (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 37756 SHA256 (modsecurity-apache_2.7.5.tar.gz) = 9e907536278d8da80d3dbb29aeffe9c4ec37ce9b641035b2da64e993135647a2 SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387 SHA256 (ngx_postgres-0.9.tar.gz) = aac0141e73b5c440927b7e040072f120b36e49deb2ff36ad00ff96a80622fbec SIZE (ngx_postgres-0.9.tar.gz) = 41022 -SHA256 (agentzh-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 3fa9cb3960a97f505c9ad0cc8683c8fe17ba98aa98d003e255bf214e5144751c -SIZE (agentzh-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18423 -SHA256 (agentzh-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 9e59b90d84f9bc814eba85bfcf126e3fd6406ddc771702c096a657c17354c302 -SIZE (agentzh-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 32965 -SHA256 (agentzh-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = c2a164df07759d2a45beacc1f72316be84e9348b7ae5509723eabd2d61cb4897 -SIZE (agentzh-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 29850 +SHA256 (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = d5f14e45c6dc0d039ad52ae889775b5af1ff80a1c8edb69361c1581aca5d0b8f +SIZE (openresty-rds-csv-nginx-module-v0.05-0-g607e26b.tar.gz) = 18416 +SHA256 (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = e0813f2d1e0d499c4f44f7957253c7804ccc0d3a7d4446ac0c6eec834e9c21f4 +SIZE (openresty-rds-json-nginx-module-v0.13-0-g8292070.tar.gz) = 32961 +SHA256 (openresty-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 76606bf3b548b072f8a6426033c115d013c52068f174f61d21c671435087e97d +SIZE (openresty-redis2-nginx-module-v0.10-0-g78a7622.tar.gz) = 29850 SHA256 (rtmp-nginx-module-v1.0.8.tar.gz) = e905e40d1a1b81c720f1e799bee6a3525efaa6f2519212130d39eed3b8877c74 SIZE (rtmp-nginx-module-v1.0.8.tar.gz) = 513086 -SHA256 (agentzh-set-misc-nginx-module-v0.23-0-g6ce586e.tar.gz) = a5dea4570efa138e15bb97babb02e76f16319b4b660763492ef02615dc1def1f -SIZE (agentzh-set-misc-nginx-module-v0.23-0-g6ce586e.tar.gz) = 40355 +SHA256 (openresty-set-misc-nginx-module-v0.23-0-g6ce586e.tar.gz) = 23fadb942f64775bfa7b568d52f8adab01260c8ad95bbeb44af8e7ea5b87e349 +SIZE (openresty-set-misc-nginx-module-v0.23-0-g6ce586e.tar.gz) = 40336 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76 SIZE (nginx-sflow-module-0.9.7.tar.gz) = 27614 SHA256 (ngx_slowfs_cache-1.10.tar.gz) = 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SIZE (ngx_slowfs_cache-1.10.tar.gz) = 11809 -SHA256 (agentzh-srcache-nginx-module-v0.24-0-g33f0f29.tar.gz) = 5e3f59821f73c205e1df0c40fd02d987b21b19e3c267866659f883bddd5674c9 -SIZE (agentzh-srcache-nginx-module-v0.24-0-g33f0f29.tar.gz) = 67239 +SHA256 (openresty-srcache-nginx-module-v0.24-0-g33f0f29.tar.gz) = dbf003980f39ff8f21b304a5463691746b9adc9d2e745d0de809c5b1713246cd +SIZE (openresty-srcache-nginx-module-v0.24-0-g33f0f29.tar.gz) = 67245 SHA256 (ngx_supervisord-1.4.tar.gz) = 0954a4efb1b955692acf523e169221146d6aa93ad1643c9f2482f75a1fbf9e3b SIZE (ngx_supervisord-1.4.tar.gz) = 19351 SHA256 (yaoweibin-nginx_tcp_proxy_module-v0.26-0-gb83e5a6.tar.gz) = 4d843b8d0511b269382938ba5546f902ec24dbfa76c12f6bd6961d7aaaf3866a SIZE (yaoweibin-nginx_tcp_proxy_module-v0.26-0-gb83e5a6.tar.gz) = 127346 SHA256 (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 136239b8f9ab2fbefb2aabc6897d3f12cc8063ce817901f9b8a624e12fbc6035 SIZE (gabor-nginx-x-rid-header-0daa3cc.tar.gz) = 2714 -SHA256 (agentzh-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 3e5b1eba411e1e51bbb197d2adb2d5304cd4050dca95f506cae635e4af5e9b35 -SIZE (agentzh-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 10535 -SHA256 (agentzh-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9670207b5a74ddbdf510b973ddbcf3e4ecd4c5fe50829b17c560ba4a30aa73f4 -SIZE (agentzh-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9518 +SHA256 (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 0199bc3b53269f49073365fe08dc2c02decbaea614dc33db4666c7ab2cdb8bfa +SIZE (openresty-xss-nginx-module-v0.04-0-g7e37038.tar.gz) = 10542 +SHA256 (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = bc33d26af3f01882a187b312c27fb547f802eb36eedfa7d2caedf3ed9c424442 +SIZE (openresty-array-var-nginx-module-v0.03-0-g4676747.tar.gz) = 9518 SHA256 (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = d5b2c42a3b9fd2970107eb74c2226cbbfbad48c89807303db903932d21ff76aa SIZE (calio-form-input-nginx-module-v0.07-0-g78de845.tar.gz) = 10580 SHA256 (calio-iconv-nginx-module-v0.10-0-gb37efb5.tar.gz) = e90a406a14d5f419bd500e19082da81390e8ba6040926857926f1a899a53379d Copied: branches/2015Q1/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config (from r379453, head/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config Mon Mar 2 17:14:42 2015 (r380276, copy of r379453, head/www/tengine/files/extra-patch-openresty-set-misc-nginx-module-config) @@ -0,0 +1,13 @@ +--- ../openresty-set-misc-nginx-module-6ce586e/config.orig 2011-12-09 10:27:53.861265188 +0300 ++++ ../openresty-set-misc-nginx-module-6ce586e/config 2011-12-09 10:28:07.107259301 +0300 +@@ -1,10 +1,3 @@ +-if echo $HTTP_MODULES | grep " ndk_http_module" > /dev/null; then +- echo "found ngx_devel_kit for ngx_set_misc; looks good." +-else +- echo "error: ngx_devel_kit is required to build ngx_set_misc; please put it before ngx_set_misc." 1>&2 +- exit 1 +-fi +- + ngx_addon_name=ngx_http_set_misc_module + HTTP_AUX_FILTER_MODULES="$HTTP_AUX_FILTER_MODULES ngx_http_set_misc_module" + NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_set_base32.c $ngx_addon_dir/src/ngx_http_set_default_value.c $ngx_addon_dir/src/ngx_http_set_hashed_upstream.c $ngx_addon_dir/src/ngx_http_set_quote_sql.c $ngx_addon_dir/src/ngx_http_set_quote_json.c $ngx_addon_dir/src/ngx_http_set_unescape_uri.c $ngx_addon_dir/src/ngx_http_set_misc_module.c $ngx_addon_dir/src/ngx_http_set_escape_uri.c $ngx_addon_dir/src/ngx_http_set_hash.c $ngx_addon_dir/src/ngx_http_set_local_today.c $ngx_addon_dir/src/ngx_http_set_hex.c $ngx_addon_dir/src/ngx_http_set_base64.c $ngx_addon_dir/src/ngx_http_set_random.c" Modified: branches/2015Q1/www/tengine/pkg-plist ============================================================================== --- branches/2015Q1/www/tengine/pkg-plist Mon Mar 2 17:00:32 2015 (r380275) +++ branches/2015Q1/www/tengine/pkg-plist Mon Mar 2 17:14:42 2015 (r380276) @@ -14,7 +14,7 @@ %%ETCDIR%%/mime.types-dist @exec if [ ! -f %D/%%ETCDIR%%/mime.types ] ; then cp -p %D/%F %B/mime.types && chmod u+w %B/mime.types; fi @unexec if cmp -s %D/%%ETCDIR%%/nginx.conf-dist %D/%%ETCDIR%%/nginx.conf; then rm -f %D/%%ETCDIR%%/nginx.conf; fi -@dirrmtry %%ETCDIR%% +@dir %%ETCDIR%% %%ETCDIR%%/nginx.conf-dist @exec if [ ! -f %D/%%ETCDIR%%/nginx.conf ] ; then cp -p %D/%F %B/nginx.conf && chmod u+w %B/nginx.conf; fi @exec if [ ! -d %%NGINX_TMPDIR%% ] ; then mkdir %%NGINX_TMPDIR%%; fi @@ -25,7 +25,7 @@ %%WWWDATA%%www/nginx-dist/50x.html %%WWWDATA%%@exec chmod a-w %D/www/nginx-dist %%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi -%%WWWDATA%%@dirrmtry www/nginx-dist +%%WWWDATA%%@dir www/nginx-dist %%ETCDIR%%/include/ddebug.h %%ETCDIR%%/include/nginx.h %%ETCDIR%%/include/ngx_alloc.h @@ -200,6 +200,6 @@ sbin/nginx sbin/dso_tool @unexec if [ -z ${UPGRADE_PORT} ] ; then rm -fr %%NGINX_TMPDIR%%; fi man/man8/nginx.8.gz -@dirrmtry %%ETCDIR%%/modules -@dirrmtry %%ETCDIR%%/include -@dirrmtry %%NGINX_TMPDIR%% +@dir %%ETCDIR%%/modules +@dir %%ETCDIR%%/include +@dir %%NGINX_TMPDIR%% From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 4 15:45:12 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EB1951C7; Wed, 4 Mar 2015 15:45:12 +0000 (UTC) Received: from svn.freebsd.org (svn.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 D640F668; Wed, 4 Mar 2015 15:45:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t24FjC6S027625; Wed, 4 Mar 2015 15:45:12 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t24FjCvH027623; Wed, 4 Mar 2015 15:45:12 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201503041545.t24FjCvH027623@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 4 Mar 2015 15:45:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380442 - branches/2015Q1/net-im/ttytter 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.18-1 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, 04 Mar 2015 15:45:13 -0000 Author: antoine Date: Wed Mar 4 15:45:11 2015 New Revision: 380442 URL: https://svnweb.freebsd.org/changeset/ports/380442 QAT: https://qat.redports.org/buildarchive/r380442/ Log: MFH: r379818 Author rerolled distfile without bumping version. (diff is found in the referenced PR) - Fixes error "rate limit rate failure" - Enables SSL by default PR: 197988 Approved by: maintainer Modified: branches/2015Q1/net-im/ttytter/Makefile branches/2015Q1/net-im/ttytter/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/net-im/ttytter/Makefile ============================================================================== --- branches/2015Q1/net-im/ttytter/Makefile Wed Mar 4 15:42:57 2015 (r380441) +++ branches/2015Q1/net-im/ttytter/Makefile Wed Mar 4 15:45:11 2015 (r380442) @@ -3,6 +3,7 @@ PORTNAME= ttytter PORTVERSION= 2.1.00 +PORTREVISION= 1 CATEGORIES= net-im perl5 MASTER_SITES= http://www.floodgap.com/software/ttytter/dist2/:dist \ http://www.floodgap.com/software/ffsl/:license Modified: branches/2015Q1/net-im/ttytter/distinfo ============================================================================== --- branches/2015Q1/net-im/ttytter/distinfo Wed Mar 4 15:42:57 2015 (r380441) +++ branches/2015Q1/net-im/ttytter/distinfo Wed Mar 4 15:45:11 2015 (r380442) @@ -1,4 +1,4 @@ -SHA256 (ttytter/2.1.00.txt) = 6292ada5d238009c74345c48a66e59b3c0e4e084a733715953e408bb18191898 -SIZE (ttytter/2.1.00.txt) = 238284 +SHA256 (ttytter/2.1.00.txt) = 86c6e7767c65e3179d4ed6368e27df5c4b200285207c3df3164c5a84a73517b1 +SIZE (ttytter/2.1.00.txt) = 238320 SHA256 (ttytter/license.txt) = 42c576fcacb5bd6c8f8e64c479b0f8e4445c7e6c9ac013485c51b8f05f2352fd SIZE (ttytter/license.txt) = 14876 From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 4 23:36:20 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6421D7E5; Wed, 4 Mar 2015 23:36:20 +0000 (UTC) Received: from svn.freebsd.org (svn.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 4EBF2405; Wed, 4 Mar 2015 23:36:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t24NaKPP055302; Wed, 4 Mar 2015 23:36:20 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t24NaKLu055301; Wed, 4 Mar 2015 23:36:20 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503042336.t24NaKLu055301@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Mar 2015 23:36:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380458 - branches/2015Q1/textproc/bib2html 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.18-1 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, 04 Mar 2015 23:36:20 -0000 Author: amdmi3 Date: Wed Mar 4 23:36:19 2015 New Revision: 380458 URL: https://svnweb.freebsd.org/changeset/ports/380458 QAT: https://qat.redports.org/buildarchive/r380458/ Log: MFH: r380196 - Fix shebangs - Add LICENSE - Fix comment Approved by: ports-secteam (delphij) Modified: branches/2015Q1/textproc/bib2html/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/textproc/bib2html/Makefile ============================================================================== --- branches/2015Q1/textproc/bib2html/Makefile Wed Mar 4 23:31:56 2015 (r380457) +++ branches/2015Q1/textproc/bib2html/Makefile Wed Mar 4 23:36:19 2015 (r380458) @@ -3,18 +3,22 @@ PORTNAME= bib2html DISTVERSION= 5.1-1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc print MASTER_SITES= http://www.arakhne.org/IMG/gz/ \ http://fresh.t-systems-sfr.com/fresh/unix/src/privat2/ DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= The BibTeX to HTML Translator +COMMENT= BibTeX to HTML Translator + +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/../COPYING WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-[0-9]$//}/src -USES= perl5 +USES= perl5 shebangfix +SHEBANG_FILES= bib2html.pl bib2xml.pl USE_PERL5= run NO_BUILD= yes From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 4 23:39:41 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2B842926; Wed, 4 Mar 2015 23:39:41 +0000 (UTC) Received: from svn.freebsd.org (svn.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 161065F9; Wed, 4 Mar 2015 23:39:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t24Ndemi055829; Wed, 4 Mar 2015 23:39:40 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t24Ndekm055826; Wed, 4 Mar 2015 23:39:40 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503042339.t24Ndekm055826@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Mar 2015 23:39:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380459 - in branches/2015Q1/archivers/dact: . 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.18-1 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, 04 Mar 2015 23:39:41 -0000 Author: amdmi3 Date: Wed Mar 4 23:39:39 2015 New Revision: 380459 URL: https://svnweb.freebsd.org/changeset/ports/380459 QAT: https://qat.redports.org/buildarchive/r380459/ Log: MFH: r380197 - Unbreak modules build - Switch to @sample - Fix plist - Add LICENSE - Strip binary Approved by: ports-secteam (delphij) Modified: branches/2015Q1/archivers/dact/Makefile branches/2015Q1/archivers/dact/files/patch-Makefile.in branches/2015Q1/archivers/dact/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/archivers/dact/Makefile ============================================================================== --- branches/2015Q1/archivers/dact/Makefile Wed Mar 4 23:36:19 2015 (r380458) +++ branches/2015Q1/archivers/dact/Makefile Wed Mar 4 23:39:39 2015 (r380459) @@ -3,13 +3,16 @@ PORTNAME= dact PORTVERSION= 0.8.42 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers MASTER_SITES= http://www.rkeene.org/files/oss/dact/release/ MAINTAINER= ports@FreeBSD.org COMMENT= Dynamic Adaptive Compression Tool +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/LICENSE + LIB_DEPENDS= libmcrypt.so:${PORTSDIR}/security/libmcrypt \ liblzo2.so:${PORTSDIR}/archivers/lzo2 @@ -22,11 +25,14 @@ MAKE_ARGS= TOBUILD="dact libdact.so dact USE_LDCONFIG= yes -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOCS post-install: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/dact.conf ${STAGEDIR}${EXAMPLESDIR} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \ + ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so \ + ${STAGEDIR}${DATADIR}/*.so + ${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf \ + ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Docs/dact.txt ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} Modified: branches/2015Q1/archivers/dact/files/patch-Makefile.in ============================================================================== --- branches/2015Q1/archivers/dact/files/patch-Makefile.in Wed Mar 4 23:36:19 2015 (r380458) +++ branches/2015Q1/archivers/dact/files/patch-Makefile.in Wed Mar 4 23:39:39 2015 (r380459) @@ -1,5 +1,5 @@ ---- ./Makefile.in.orig 2006-03-25 14:15:04.000000000 +0100 -+++ ./Makefile.in 2014-03-25 00:16:17.000000000 +0100 +--- Makefile.in.orig 2006-03-25 16:15:04.000000000 +0300 ++++ Makefile.in 2015-02-25 22:26:51.000000000 +0300 @@ -24,8 +24,8 @@ prefix = @prefix@ @@ -11,3 +11,19 @@ sysconfdir = @sysconfdir@ mandir = @mandir@ datadir = @datadir@ +@@ -41,13 +41,14 @@ + # be kept in sync with OBJS + SHLIBOBJS += dact_common_shr.o comp_fail_shr.o comp_plain_shr.o buffer_shr.o header_shr.o sort_shr.o module_shr.o parse_shr.o dendian_shr.o crc_shr.o net_shr.o ui_shr.o sfx_shr.o libdact_shr.o @SHLIBOBJS@ + ALGO = comp_snibble.c comp_delta.c comp_text.c comp_rle.c cipher_chaos.c cipher_sub.c cipher_psub.c @ALGO@ ++MODS = $(ALGO:.c=.so) + + TOBUILD = dact$(EXEEXT) libdact.$(SHOBJEXT) libdact.a dact.conf + + all: @DEFAULT@ + + module: @DEPEND@ +- @MODS="$(ALGO:.c=.so)" LDLIBS="@ALLMODLIBS@" \ ++ @LDLIBS="@ALLMODLIBS@" \ + $(MAKE) $(TOBUILD) + + static: @DEPEND@ Modified: branches/2015Q1/archivers/dact/pkg-plist ============================================================================== --- branches/2015Q1/archivers/dact/pkg-plist Wed Mar 4 23:36:19 2015 (r380458) +++ branches/2015Q1/archivers/dact/pkg-plist Wed Mar 4 23:39:39 2015 (r380459) @@ -1,7 +1,18 @@ bin/dact -etc/dact.conf +@sample etc/dact.conf.sample lib/libdact.so man/man1/dact.1.gz +%%DATADIR%%/cipher_chaos.so +%%DATADIR%%/cipher_psub.so +%%DATADIR%%/cipher_serpent.so +%%DATADIR%%/cipher_sub.so +%%DATADIR%%/comp_bzlib.so +%%DATADIR%%/comp_delta.so +%%DATADIR%%/comp_mzlib.so +%%DATADIR%%/comp_mzlib2.so +%%DATADIR%%/comp_rle.so +%%DATADIR%%/comp_snibble.so +%%DATADIR%%/comp_text.so +%%DATADIR%%/comp_zlib.so %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/dact.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dact.conf From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 4 23:41:13 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16EA8A0A; Wed, 4 Mar 2015 23:41:13 +0000 (UTC) Received: from svn.freebsd.org (svn.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 01A0260A; Wed, 4 Mar 2015 23:41:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t24NfC6J058530; Wed, 4 Mar 2015 23:41:12 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t24NfCXB058529; Wed, 4 Mar 2015 23:41:12 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503042341.t24NfCXB058529@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Mar 2015 23:41:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380460 - branches/2015Q1/security/snortsnarf 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.18-1 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, 04 Mar 2015 23:41:13 -0000 Author: amdmi3 Date: Wed Mar 4 23:41:12 2015 New Revision: 380460 URL: https://svnweb.freebsd.org/changeset/ports/380460 QAT: https://qat.redports.org/buildarchive/r380460/ Log: MFH: r380198 - Add LICENSE - Fix shebangs Approved by: ports-secteam (delphij) Modified: branches/2015Q1/security/snortsnarf/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/security/snortsnarf/Makefile ============================================================================== --- branches/2015Q1/security/snortsnarf/Makefile Wed Mar 4 23:39:39 2015 (r380459) +++ branches/2015Q1/security/snortsnarf/Makefile Wed Mar 4 23:41:12 2015 (r380460) @@ -4,6 +4,7 @@ PORTNAME= snortsnarf PORTVERSION= 1.0 PORTEPOCH= 1 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Initial%20Release%20${PORTVERSION} DISTNAME= SnortSnarf-${PORTVERSION} @@ -11,9 +12,13 @@ DISTNAME= SnortSnarf-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Generate HTML report summaries from snort incident alerts +LICENSE= GPLv2 # or later +LICENSE_FILE= ${WRKSRC}/COPYING + RUN_DEPENDS= p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules -USES= perl5 +USES= perl5 shebangfix +SHEBANG_FILES= snortsnarf.pl NO_BUILD= yes USE_PERL5= run From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 4 23:42:30 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6C9F6AFE; Wed, 4 Mar 2015 23:42:30 +0000 (UTC) Received: from svn.freebsd.org (svn.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 56B4A6B0; Wed, 4 Mar 2015 23:42:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t24NgU5f059914; Wed, 4 Mar 2015 23:42:30 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t24NgTPc059912; Wed, 4 Mar 2015 23:42:29 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503042342.t24NgTPc059912@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Mar 2015 23:42:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380461 - branches/2015Q1/devel/openzz 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.18-1 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, 04 Mar 2015 23:42:30 -0000 Author: amdmi3 Date: Wed Mar 4 23:42:29 2015 New Revision: 380461 URL: https://svnweb.freebsd.org/changeset/ports/380461 QAT: https://qat.redports.org/buildarchive/r380461/ Log: MFH: r380199 - Add LICENSE - Add missing library to plist Approved by: ports-secteam (delphij) Modified: branches/2015Q1/devel/openzz/Makefile branches/2015Q1/devel/openzz/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/openzz/Makefile ============================================================================== --- branches/2015Q1/devel/openzz/Makefile Wed Mar 4 23:41:12 2015 (r380460) +++ branches/2015Q1/devel/openzz/Makefile Wed Mar 4 23:42:29 2015 (r380461) @@ -3,7 +3,7 @@ PORTNAME= openzz PORTVERSION= 1.0.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.0.4-4 DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} @@ -11,6 +11,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}-$ MAINTAINER= ports@FreeBSD.org COMMENT= Interpreted dynamic parser +LICENSE= LGPL21 # or later +LICENSE_FILE= ${WRKSRC}/COPYING + WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} GNU_CONFIGURE= yes Modified: branches/2015Q1/devel/openzz/pkg-plist ============================================================================== --- branches/2015Q1/devel/openzz/pkg-plist Wed Mar 4 23:41:12 2015 (r380460) +++ branches/2015Q1/devel/openzz/pkg-plist Wed Mar 4 23:42:29 2015 (r380461) @@ -9,3 +9,7 @@ lib/libozzi.a lib/libozzi.so lib/libozzi.so.0 lib/libozzi.so.0.1.4 +lib/libtagdtor.a +lib/libtagdtor.so +lib/libtagdtor.so.0 +lib/libtagdtor.so.0.0.0 From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 4 23:45:06 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1354FC07; Wed, 4 Mar 2015 23:45:06 +0000 (UTC) Received: from svn.freebsd.org (svn.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 D80A86CB; Wed, 4 Mar 2015 23:45:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t24Nj5Hb060433; Wed, 4 Mar 2015 23:45:05 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t24Nj5ve060429; Wed, 4 Mar 2015 23:45:05 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503042345.t24Nj5ve060429@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Mar 2015 23:45:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380462 - in branches/2015Q1/devel/noweb: . 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.18-1 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, 04 Mar 2015 23:45:06 -0000 Author: amdmi3 Date: Wed Mar 4 23:45:04 2015 New Revision: 380462 URL: https://svnweb.freebsd.org/changeset/ports/380462 QAT: https://qat.redports.org/buildarchive/r380462/ Log: MFH: r380200 - Pet portlint - Fix references to stagedir from installed files Approved by: ports-secteam (delphij) Added: branches/2015Q1/devel/noweb/files/patch-lib_Makefile - copied unchanged from r380200, head/devel/noweb/files/patch-lib_Makefile Modified: branches/2015Q1/devel/noweb/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/noweb/Makefile ============================================================================== --- branches/2015Q1/devel/noweb/Makefile Wed Mar 4 23:42:29 2015 (r380461) +++ branches/2015Q1/devel/noweb/Makefile Wed Mar 4 23:45:04 2015 (r380462) @@ -3,9 +3,9 @@ PORTNAME= noweb PORTVERSION= 2.11b +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://www.eecs.harvard.edu/pub/nr/ -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Simple, extensible literate-programming tool @@ -18,6 +18,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg BUILD_DEPENDS= icont:${PORTSDIR}/lang/icon RUN_DEPENDS= iconx:${PORTSDIR}/lang/icon +USES= tar:tgz WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src INSTALL_TARGET= install-code install-man install-elisp MAKE_ENV+= INSTALL_PREFIX=${STAGEDIR}${PREFIX} Copied: branches/2015Q1/devel/noweb/files/patch-lib_Makefile (from r380200, head/devel/noweb/files/patch-lib_Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/devel/noweb/files/patch-lib_Makefile Wed Mar 4 23:45:04 2015 (r380462, copy of r380200, head/devel/noweb/files/patch-lib_Makefile) @@ -0,0 +1,11 @@ +--- lib/Makefile.orig 2000-06-17 00:25:51.000000000 +0400 ++++ lib/Makefile 2015-02-26 03:38:28.000000000 +0300 +@@ -12,7 +12,7 @@ + + install: all + cp unmarkup emptydefn toascii nwmtime h2a btdefn $(LIB) +- sed 's@|LIBDIR|@$(LIB)@g' pipedocs > $(LIB)/pipedocs ++ sed 's@|LIBDIR|@$(LIBNAME)@g' pipedocs > $(LIB)/pipedocs + chmod +x $(LIB)/pipedocs + + checkin: From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 4 23:46:45 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 91B51DCA; Wed, 4 Mar 2015 23:46:45 +0000 (UTC) Received: from svn.freebsd.org (svn.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 722BC6DA; Wed, 4 Mar 2015 23:46:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t24NkjqD060857; Wed, 4 Mar 2015 23:46:45 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t24NkiJ9060853; Wed, 4 Mar 2015 23:46:44 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503042346.t24NkiJ9060853@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Mar 2015 23:46:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380463 - in branches/2015Q1/comms/yaps: . 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.18-1 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, 04 Mar 2015 23:46:45 -0000 Author: amdmi3 Date: Wed Mar 4 23:46:44 2015 New Revision: 380463 URL: https://svnweb.freebsd.org/changeset/ports/380463 QAT: https://qat.redports.org/buildarchive/r380463/ Log: MFH: r380201 - Simplify MASTER_SITES - Fix installation from non-root - Fix binary permissions Approved by: ports-secteam (delphij) Modified: branches/2015Q1/comms/yaps/Makefile branches/2015Q1/comms/yaps/files/patch-Makefile branches/2015Q1/comms/yaps/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/comms/yaps/Makefile ============================================================================== --- branches/2015Q1/comms/yaps/Makefile Wed Mar 4 23:45:04 2015 (r380462) +++ branches/2015Q1/comms/yaps/Makefile Wed Mar 4 23:46:44 2015 (r380463) @@ -3,23 +3,24 @@ PORTNAME= yaps PORTVERSION= 0.96 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= comms -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= apps/serialcomm/machines +MASTER_SITES= SUNSITE/apps/serialcomm/machines MAINTAINER= ports@FreeBSD.org COMMENT= Yet Another Pager Software: send messages to pager (SMS, TAP, ...) LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING.GPL USES= gmake OPTIONS_DEFINE= DOCS -post-install: +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/yaps ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/yaps.rc ${STAGEDIR}${PREFIX}/etc/yaps.rc.sample - ${INSTALL_MAN} ${WRKSRC}/yaps.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/yaps.1 ${STAGEDIR}${PREFIX}/man/man1/ @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/yaps.doc ${WRKSRC}/yaps.html ${STAGEDIR}${DOCSDIR} Modified: branches/2015Q1/comms/yaps/files/patch-Makefile ============================================================================== --- branches/2015Q1/comms/yaps/files/patch-Makefile Wed Mar 4 23:45:04 2015 (r380462) +++ branches/2015Q1/comms/yaps/files/patch-Makefile Wed Mar 4 23:46:44 2015 (r380463) @@ -1,6 +1,6 @@ ---- Makefile.orig 2013-11-17 23:01:50.000000000 +0800 -+++ Makefile 2013-11-17 23:04:00.000000000 +0800 -@@ -33,15 +33,15 @@ yaps.doc: yaps.html +--- Makefile.orig 1997-06-06 15:45:35.000000000 +0400 ++++ Makefile 2015-02-26 00:28:11.000000000 +0300 +@@ -33,15 +33,15 @@ lynx -cfg=/dev/null -nolist -dump $< > $@ install: $(DSTFLE) $(CFGFILE) @@ -15,7 +15,7 @@ $(DSTFLE): yaps - install -o $(YAPS_USER) -g $(YAPS_GROUP) -m $(YAPS_MODE) -s yaps $@ -+ install -o $(YAPS_USER) -g $(YAPS_GROUP) -m $(YAPS_MODE) -s yaps $(DESTDIR)$@ ++ install -m 711 -s yaps $(DESTDIR)$@ $(CFGFILE): yaps.rc @if [ ! -f $@ ]; then \ Modified: branches/2015Q1/comms/yaps/pkg-plist ============================================================================== --- branches/2015Q1/comms/yaps/pkg-plist Wed Mar 4 23:45:04 2015 (r380462) +++ branches/2015Q1/comms/yaps/pkg-plist Wed Mar 4 23:46:44 2015 (r380463) @@ -1,5 +1,5 @@ -bin/yaps -etc/yaps.rc.sample +@(root,dialer,2711) bin/yaps +@sample etc/yaps.rc.sample man/man1/yaps.1.gz %%PORTDOCS%%%%DOCSDIR%%/yaps.doc %%PORTDOCS%%%%DOCSDIR%%/yaps.html From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 4 23:48:30 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 45A68EC7; Wed, 4 Mar 2015 23:48:30 +0000 (UTC) Received: from svn.freebsd.org (svn.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 304616E9; Wed, 4 Mar 2015 23:48:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t24NmU7B061208; Wed, 4 Mar 2015 23:48:30 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t24NmUx5061207; Wed, 4 Mar 2015 23:48:30 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503042348.t24NmUx5061207@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Mar 2015 23:48:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380464 - branches/2015Q1/devel/clig 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.18-1 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, 04 Mar 2015 23:48:30 -0000 Author: amdmi3 Date: Wed Mar 4 23:48:29 2015 New Revision: 380464 URL: https://svnweb.freebsd.org/changeset/ports/380464 QAT: https://qat.redports.org/buildarchive/r380464/ Log: MFH: r380203 - Add LICENSE - Fix references to stagedir from installed files - Remove unneeded options.mk inclusion Approved by: ports-secteam (delphij) Modified: branches/2015Q1/devel/clig/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/clig/Makefile ============================================================================== --- branches/2015Q1/devel/clig/Makefile Wed Mar 4 23:46:44 2015 (r380463) +++ branches/2015Q1/devel/clig/Makefile Wed Mar 4 23:48:29 2015 (r380464) @@ -3,29 +3,30 @@ PORTNAME= clig PORTVERSION= 1.9.11.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel tcl MASTER_SITES= http://wsd.iitb.fhg.de/~geg/clighome/ MAINTAINER= ports@FreeBSD.org COMMENT= Auto-generate an (argc, argv) processor, usage message, and manpage -OPTIONS_DEFINE= DOCS +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING-2.0 NO_BUILD= yes USES+= tcl MAKEFILE= makefile MAKE_ENV+= NOPORTDOCS=${NOPORTDOCS} +MAKE_ARGS= prefix="${PREFIX}" build_root="${STAGEDIR}" WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= * -.include +OPTIONS_DEFINE= DOCS post-patch: @${RM} ${WRKSRC}/example/.cvsignore @${FIND} -d ${WRKSRC} -type d -and -name CVS -exec ${RM} -r {} \; - @${REINPLACE_CMD} -e 's|prefix =/usr|prefix=${STAGEDIR}${PREFIX}|; \ - s|/usr/bin/tclsh|${TCLSH}|; \ + @${REINPLACE_CMD} -e 's|/usr/bin/tclsh|${TCLSH}|; \ s|/doc/|/share/doc/|; \ s|-$$(VERSION)||;' \ ${WRKSRC}/makefile From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 4 23:50:00 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 506B5FC2; Wed, 4 Mar 2015 23:50:00 +0000 (UTC) Received: from svn.freebsd.org (svn.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 3B05D755; Wed, 4 Mar 2015 23:50:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t24No0xw061556; Wed, 4 Mar 2015 23:50:00 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t24No0jn061554; Wed, 4 Mar 2015 23:50:00 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503042350.t24No0jn061554@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Mar 2015 23:50:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380465 - branches/2015Q1/devel/pear-Var_Dump 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.18-1 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, 04 Mar 2015 23:50:00 -0000 Author: amdmi3 Date: Wed Mar 4 23:49:59 2015 New Revision: 380465 URL: https://svnweb.freebsd.org/changeset/ports/380465 QAT: https://qat.redports.org/buildarchive/r380465/ Log: MFH: r380204 - Fix shebangs - Add missing run-dependency on bash Approved by: ports-secteam (delphij) Modified: branches/2015Q1/devel/pear-Var_Dump/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/pear-Var_Dump/Makefile ============================================================================== --- branches/2015Q1/devel/pear-Var_Dump/Makefile Wed Mar 4 23:48:29 2015 (r380464) +++ branches/2015Q1/devel/pear-Var_Dump/Makefile Wed Mar 4 23:49:59 2015 (r380465) @@ -3,11 +3,17 @@ PORTNAME= Var_Dump PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= devel www pear MAINTAINER= ports@FreeBSD.org COMMENT= Provides methods for dumping structured information about a variable -USES= pear +LICENSE= PHP30 + +RUN_DEPENDS= bash:${PORTSDIR}/shells/bash + +USES= pear shebangfix +SHEBANG_FILES= scripts/gen_php_doc.sh .include From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 4 23:51:14 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EE394145; Wed, 4 Mar 2015 23:51:14 +0000 (UTC) Received: from svn.freebsd.org (svn.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 D7F3F7FE; Wed, 4 Mar 2015 23:51:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t24NpEhf063744; Wed, 4 Mar 2015 23:51:14 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t24NpEoe063743; Wed, 4 Mar 2015 23:51:14 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503042351.t24NpEoe063743@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Mar 2015 23:51:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380466 - in branches/2015Q1/mail/ez-pine-gpg: . 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.18-1 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, 04 Mar 2015 23:51:15 -0000 Author: amdmi3 Date: Wed Mar 4 23:51:13 2015 New Revision: 380466 URL: https://svnweb.freebsd.org/changeset/ports/380466 QAT: https://qat.redports.org/buildarchive/r380466/ Log: MFH: r380205 - Pet portlint - Add LICENSE - Fix references to stagedir from installed files Approved by: ports-secteam (delphij) Added: branches/2015Q1/mail/ez-pine-gpg/files/ - copied from r380205, head/mail/ez-pine-gpg/files/ Modified: branches/2015Q1/mail/ez-pine-gpg/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/mail/ez-pine-gpg/Makefile ============================================================================== --- branches/2015Q1/mail/ez-pine-gpg/Makefile Wed Mar 4 23:49:59 2015 (r380465) +++ branches/2015Q1/mail/ez-pine-gpg/Makefile Wed Mar 4 23:51:13 2015 (r380466) @@ -3,24 +3,26 @@ PORTNAME= ez-pine-gpg DISTVERSION= 0.4h -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://business-php.com/opensource/ez-pine-gpg/ DISTNAME= ${PORTNAME}_v${DISTVERSION} -EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Set of scripts to use gpg with Pine +LICENSE= GPLv2 # or later + RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg -WRKSRC= ${WRKDIR}/${PORTNAME} +USES= tar:tgz +WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes OPTIONS_DEFINE= DOCS do-install: - (cd ${WRKSRC} && ./install ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${SETENV} DESTDIR="${STAGEDIR}" ./install ${PREFIX}/bin) post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 5 22:22:56 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6559974B; Thu, 5 Mar 2015 22:22:56 +0000 (UTC) Received: from svn.freebsd.org (svn.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 34E1217D; Thu, 5 Mar 2015 22:22:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25MMtmK014460; Thu, 5 Mar 2015 22:22:55 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25MMsMh014452; Thu, 5 Mar 2015 22:22:54 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201503052222.t25MMsMh014452@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Thu, 5 Mar 2015 22:22:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380555 - in branches/2015Q1/databases: percona56-client/files percona56-server 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.18-1 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, 05 Mar 2015 22:22:56 -0000 Author: flo Date: Thu Mar 5 22:22:54 2015 New Revision: 380555 URL: https://svnweb.freebsd.org/changeset/ports/380555 QAT: https://qat.redports.org/buildarchive/r380555/ Log: MFH: r377634 Update to 5.6.22-71.0 Approved by: portmgr (bapt) Modified: branches/2015Q1/databases/percona56-client/files/patch-CMakeLists.txt branches/2015Q1/databases/percona56-server/Makefile branches/2015Q1/databases/percona56-server/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/databases/percona56-client/files/patch-CMakeLists.txt ============================================================================== --- branches/2015Q1/databases/percona56-client/files/patch-CMakeLists.txt Thu Mar 5 22:15:08 2015 (r380554) +++ branches/2015Q1/databases/percona56-client/files/patch-CMakeLists.txt Thu Mar 5 22:22:54 2015 (r380555) @@ -1,6 +1,6 @@ --- CMakeLists.txt.orig 2014-10-06 18:06:02.000000000 +0200 +++ CMakeLists.txt 2014-10-18 16:20:43.311977761 +0200 -@@ -500,39 +500,17 @@ +@@ -468,40 +468,17 @@ ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) @@ -36,6 +36,7 @@ - ENDIF() - ADD_SUBDIRECTORY(packaging/rpm-oel) - ADD_SUBDIRECTORY(packaging/rpm-fedora) +- ADD_SUBDIRECTORY(packaging/rpm-sles) -ENDIF() - INCLUDE(cmake/abi_check.cmake) Modified: branches/2015Q1/databases/percona56-server/Makefile ============================================================================== --- branches/2015Q1/databases/percona56-server/Makefile Thu Mar 5 22:15:08 2015 (r380554) +++ branches/2015Q1/databases/percona56-server/Makefile Thu Mar 5 22:22:54 2015 (r380555) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.21-70.1 +DISTVERSION= 5.6.22-71.0 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ Modified: branches/2015Q1/databases/percona56-server/distinfo ============================================================================== --- branches/2015Q1/databases/percona56-server/distinfo Thu Mar 5 22:15:08 2015 (r380554) +++ branches/2015Q1/databases/percona56-server/distinfo Thu Mar 5 22:22:54 2015 (r380555) @@ -1,2 +1,2 @@ -SHA256 (percona-server-5.6.21-70.1.tar.gz) = 3f2ed35912a7a22f740be441078736e868a079b2f76e82988720e238b3ea8160 -SIZE (percona-server-5.6.21-70.1.tar.gz) = 33911244 +SHA256 (percona-server-5.6.22-71.0.tar.gz) = 0a7269a71e009bc802adef1dd3502562f22b881b7f88823ca84c987724dcf10c +SIZE (percona-server-5.6.22-71.0.tar.gz) = 33992150 From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 5 22:29:12 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A61F9883; Thu, 5 Mar 2015 22:29:12 +0000 (UTC) Received: from svn.freebsd.org (svn.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 907F31B6; Thu, 5 Mar 2015 22:29:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25MTCGI015552; Thu, 5 Mar 2015 22:29:12 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25MTC7C015551; Thu, 5 Mar 2015 22:29:12 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503052229.t25MTC7C015551@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 5 Mar 2015 22:29:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380556 - in branches/2015Q1/editors/xed: . 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.18-1 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, 05 Mar 2015 22:29:12 -0000 Author: amdmi3 Date: Thu Mar 5 22:29:11 2015 New Revision: 380556 URL: https://svnweb.freebsd.org/changeset/ports/380556 QAT: https://qat.redports.org/buildarchive/r380556/ Log: MFH: r380476 - Simplify MASTER_SITES - Add LICENSE - Fix references to STAGEDIR Approved by: ports-secteam (delphij) Added: branches/2015Q1/editors/xed/files/ - copied from r380476, head/editors/xed/files/ Modified: branches/2015Q1/editors/xed/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/editors/xed/Makefile ============================================================================== --- branches/2015Q1/editors/xed/Makefile Thu Mar 5 22:22:54 2015 (r380555) +++ branches/2015Q1/editors/xed/Makefile Thu Mar 5 22:29:11 2015 (r380556) @@ -3,19 +3,24 @@ PORTNAME= xed PORTVERSION= 1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors -MASTER_SITES= ${MASTER_SITE_XCONTRIB} -MASTER_SITE_SUBDIR= editors +MASTER_SITES= XCONTRIB/editors DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Text editor for X +LICENSE= MIT + USES= imake tar:Z USE_XORG= xaw +MAKE_ARGS= BINDIR=${PREFIX}/bin \ + LIBDIR=${PREFIX}/lib/X11 \ + MANPATH=${PREFIX}/man pre-build: @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|extern char \*malloc();|/\* extern char \*malloc(); \*/|g' + .include From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 5 22:29:56 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70EAF967; Thu, 5 Mar 2015 22:29:56 +0000 (UTC) Received: from svn.freebsd.org (svn.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 59F171C1; Thu, 5 Mar 2015 22:29:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25MTu9Z015845; Thu, 5 Mar 2015 22:29:56 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25MTt2m015831; Thu, 5 Mar 2015 22:29:55 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201503052229.t25MTt2m015831@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Thu, 5 Mar 2015 22:29:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380557 - in branches/2015Q1/databases: percona55-client/files percona55-server percona55-server/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.18-1 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, 05 Mar 2015 22:29:56 -0000 Author: flo Date: Thu Mar 5 22:29:54 2015 New Revision: 380557 URL: https://svnweb.freebsd.org/changeset/ports/380557 QAT: https://qat.redports.org/buildarchive/r380557/ Log: MFH: r377635 Update to 5.5.41-37.0 Fixes for CVE-2015-0411 and CVE-2015-0432 Approved by: portmgr (bapt) Modified: branches/2015Q1/databases/percona55-client/files/patch-CMakeLists.txt branches/2015Q1/databases/percona55-client/files/patch-client_CMakeLists.txt branches/2015Q1/databases/percona55-server/Makefile branches/2015Q1/databases/percona55-server/distinfo branches/2015Q1/databases/percona55-server/files/patch-client_CMakeLists.txt Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/databases/percona55-client/files/patch-CMakeLists.txt ============================================================================== --- branches/2015Q1/databases/percona55-client/files/patch-CMakeLists.txt Thu Mar 5 22:29:11 2015 (r380556) +++ branches/2015Q1/databases/percona55-client/files/patch-CMakeLists.txt Thu Mar 5 22:29:54 2015 (r380557) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-10-06 18:02:58.000000000 +0200 -+++ CMakeLists.txt 2014-10-17 20:59:57.890024727 +0200 -@@ -419,31 +419,12 @@ +--- CMakeLists.txt.orig 2015-01-07 10:49:52.000000000 +0100 ++++ CMakeLists.txt 2015-01-21 20:01:50.952601051 +0100 +@@ -400,32 +400,11 @@ ENDIF() ADD_SUBDIRECTORY(extra) @@ -28,8 +28,8 @@ - ADD_SUBDIRECTORY(internal) - ENDIF() - ADD_SUBDIRECTORY(packaging/rpm-oel) +- ADD_SUBDIRECTORY(packaging/rpm-sles) -ENDIF() -+ +ADD_SUBDIRECTORY(client) +ADD_SUBDIRECTORY(libservices) +ADD_SUBDIRECTORY(support-files) @@ -38,7 +38,7 @@ INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -479,19 +460,21 @@ +@@ -461,19 +440,21 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() @@ -61,10 +61,11 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -518,5 +501,6 @@ +@@ -499,6 +480,7 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) + Modified: branches/2015Q1/databases/percona55-client/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2015Q1/databases/percona55-client/files/patch-client_CMakeLists.txt Thu Mar 5 22:29:11 2015 (r380556) +++ branches/2015Q1/databases/percona55-client/files/patch-client_CMakeLists.txt Thu Mar 5 22:29:54 2015 (r380557) @@ -1,18 +1,23 @@ ---- client/CMakeLists.txt.orig 2014-03-15 18:08:16.000000000 +0100 -+++ client/CMakeLists.txt 2014-03-22 19:33:32.505508311 +0100 -@@ -33,9 +33,11 @@ +--- client/CMakeLists.txt.orig 2015-01-07 10:49:52.000000000 +0100 ++++ client/CMakeLists.txt 2015-01-21 20:03:30.747577544 +0100 +@@ -33,6 +33,7 @@ TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) ENDIF(UNIX) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") + # mysqltest has unused result errors, so we skip Werror +@@ -42,7 +43,7 @@ + ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error") + ENDIF() TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) +- +ENDIF() - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) -@@ -47,15 +49,19 @@ + TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient) +@@ -53,15 +54,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) @@ -32,7 +37,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc ../sql/rpl_filter.cc ../sql/sql_list.cc) -@@ -73,7 +79,7 @@ +@@ -79,7 +84,7 @@ MYSQL_ADD_EXECUTABLE(echo echo.c) ENDIF(WIN32) Modified: branches/2015Q1/databases/percona55-server/Makefile ============================================================================== --- branches/2015Q1/databases/percona55-server/Makefile Thu Mar 5 22:29:11 2015 (r380556) +++ branches/2015Q1/databases/percona55-server/Makefile Thu Mar 5 22:29:54 2015 (r380557) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.5.40-36.1 +DISTVERSION= 5.5.41-37.0 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.5/Percona-Server-${DISTVERSION}/source/tarball/ Modified: branches/2015Q1/databases/percona55-server/distinfo ============================================================================== --- branches/2015Q1/databases/percona55-server/distinfo Thu Mar 5 22:29:11 2015 (r380556) +++ branches/2015Q1/databases/percona55-server/distinfo Thu Mar 5 22:29:54 2015 (r380557) @@ -1,2 +1,2 @@ -SHA256 (percona-server-5.5.40-36.1.tar.gz) = 33b2a66c2a221ec4e02b38f065f5a8fbbe5fdcaaf00e0ae5f267d4e2b746ffb4 -SIZE (percona-server-5.5.40-36.1.tar.gz) = 22710586 +SHA256 (percona-server-5.5.41-37.0.tar.gz) = 4de65ccbdd6c266f18339c2ea5427a15d90a8ce1ce1c7574aa2e72f685a10833 +SIZE (percona-server-5.5.41-37.0.tar.gz) = 22670445 Modified: branches/2015Q1/databases/percona55-server/files/patch-client_CMakeLists.txt ============================================================================== --- branches/2015Q1/databases/percona55-server/files/patch-client_CMakeLists.txt Thu Mar 5 22:29:11 2015 (r380556) +++ branches/2015Q1/databases/percona55-server/files/patch-client_CMakeLists.txt Thu Mar 5 22:29:54 2015 (r380557) @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2014-03-15 18:08:16.000000000 +0100 -+++ client/CMakeLists.txt 2014-03-22 21:03:06.194178397 +0100 -@@ -27,17 +27,20 @@ +--- client/CMakeLists.txt.orig 2015-01-07 10:49:52.000000000 +0100 ++++ client/CMakeLists.txt 2015-01-21 20:06:10.493605146 +0100 +@@ -27,11 +27,13 @@ ADD_DEFINITIONS(${READLINE_DEFINES}) ADD_DEFINITIONS(${SSL_DEFINES}) @@ -14,6 +14,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") +@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) @@ -21,7 +22,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient) -@@ -46,17 +49,21 @@ +@@ -52,17 +55,21 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) @@ -43,7 +44,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc ../sql/rpl_filter.cc ../sql/sql_list.cc) TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient) -@@ -67,13 +74,14 @@ +@@ -73,13 +80,14 @@ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlslap perconaserverclient) From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 5 22:30:14 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 48778A44; Thu, 5 Mar 2015 22:30:14 +0000 (UTC) Received: from svn.freebsd.org (svn.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 32A3A1C8; Thu, 5 Mar 2015 22:30:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25MUETY016122; Thu, 5 Mar 2015 22:30:14 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25MUEXr016121; Thu, 5 Mar 2015 22:30:14 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503052230.t25MUEXr016121@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 5 Mar 2015 22:30:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380558 - branches/2015Q1/benchmarks/polygraph 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.18-1 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, 05 Mar 2015 22:30:14 -0000 Author: amdmi3 Date: Thu Mar 5 22:30:13 2015 New Revision: 380558 URL: https://svnweb.freebsd.org/changeset/ports/380558 QAT: https://qat.redports.org/buildarchive/r380558/ Log: MFH: r380488 - Fix shebangs Approved by: ports-secteam (delphij) Modified: branches/2015Q1/benchmarks/polygraph/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/benchmarks/polygraph/Makefile ============================================================================== --- branches/2015Q1/benchmarks/polygraph/Makefile Thu Mar 5 22:29:54 2015 (r380557) +++ branches/2015Q1/benchmarks/polygraph/Makefile Thu Mar 5 22:30:13 2015 (r380558) @@ -3,6 +3,7 @@ PORTNAME= polygraph PORTVERSION= 4.3.2 +PORTREVISION= 1 CATEGORIES= benchmarks www MASTER_SITES= http://www.web-polygraph.org/downloads/srcs/ \ http://people.bsdgroup.de/~as/freebsd/distfiles/ @@ -14,10 +15,11 @@ COMMENT= Benchmarking tool for Web proxi LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= tar:tgz +USES= shebangfix tar:tgz +SHEBANG_FILES= tools/*.pl USE_GCC= any GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CONFLICTS= ltrace-0* From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 5 22:31:44 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 79663B78; Thu, 5 Mar 2015 22:31:44 +0000 (UTC) Received: from svn.freebsd.org (svn.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 61C71272; Thu, 5 Mar 2015 22:31:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25MVik2017532; Thu, 5 Mar 2015 22:31:44 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25MVh0L017529; Thu, 5 Mar 2015 22:31:43 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201503052231.t25MVh0L017529@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Thu, 5 Mar 2015 22:31:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380559 - branches/2015Q1/www/phpmyfaq 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.18-1 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, 05 Mar 2015 22:31:44 -0000 Author: flo Date: Thu Mar 5 22:31:43 2015 New Revision: 380559 URL: https://svnweb.freebsd.org/changeset/ports/380559 QAT: https://qat.redports.org/buildarchive/r380559/ Log: MFH: r377633 Update to 2.8.19 http://www.phpmyfaq.de/security/advisory-2014-11-30 Approved by: portmgr (bapt) Modified: branches/2015Q1/www/phpmyfaq/Makefile branches/2015Q1/www/phpmyfaq/distinfo branches/2015Q1/www/phpmyfaq/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/phpmyfaq/Makefile ============================================================================== --- branches/2015Q1/www/phpmyfaq/Makefile Thu Mar 5 22:30:13 2015 (r380558) +++ branches/2015Q1/www/phpmyfaq/Makefile Thu Mar 5 22:31:43 2015 (r380559) @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= phpmyfaq -PORTVERSION= 2.8.11 +PORTVERSION= 2.8.19 CATEGORIES= www MASTER_SITES= http://www.phpmyfaq.de/download/ +DISTNAME= phpMyFAQ-${PORTVERSION} MAINTAINER= flo@FreeBSD.org COMMENT= Multilingual, completely database-driven FAQ-system Modified: branches/2015Q1/www/phpmyfaq/distinfo ============================================================================== --- branches/2015Q1/www/phpmyfaq/distinfo Thu Mar 5 22:30:13 2015 (r380558) +++ branches/2015Q1/www/phpmyfaq/distinfo Thu Mar 5 22:31:43 2015 (r380559) @@ -1,2 +1,2 @@ -SHA256 (phpmyfaq-2.8.11.tar.gz) = e92c54ea38886b77208d3c6008c18e32cb58face5f14442a7f57cd4302377b95 -SIZE (phpmyfaq-2.8.11.tar.gz) = 4437745 +SHA256 (phpMyFAQ-2.8.19.tar.gz) = 9dbb375b7d14040701392dee7161e44ef3962df19880d0d8136653877a563d47 +SIZE (phpMyFAQ-2.8.19.tar.gz) = 5684525 Modified: branches/2015Q1/www/phpmyfaq/pkg-plist ============================================================================== --- branches/2015Q1/www/phpmyfaq/pkg-plist Thu Mar 5 22:30:13 2015 (r380558) +++ branches/2015Q1/www/phpmyfaq/pkg-plist Thu Mar 5 22:31:43 2015 (r380559) @@ -1,16 +1,3 @@ -@exec mkdir -p %D/www/phpmyfaq/attachments -@exec mkdir -p %D/www/phpmyfaq/data -@exec mkdir -p %D/www/phpmyfaq/images -@exec mkdir -p %D/www/phpmyfaq/inc -@exec mkdir -p %D/www/phpmyfaq/pdf -@exec mkdir -p %D/www/phpmyfaq/xml -@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/attachments -@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/config -@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/data -@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/images -@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/inc -@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/pdf -@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/xml %%WWWDIR%%/_.htaccess %%WWWDIR%%/_httpd.ini %%WWWDIR%%/_lighttpd.conf @@ -198,7 +185,6 @@ %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/jscripts/thickbox.js %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/langs/en.php %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/langs/zh.php -%%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/mediaplayer.swf %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/session/gc_counter.ajax.php %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/session/gc_log.ajax.php %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/dark/css/ajaximageeditor.css @@ -511,24 +497,6 @@ %%WWWDIR%%/admin/editor/plugins/legacyoutput/editor_plugin_src.js %%WWWDIR%%/admin/editor/plugins/lists/editor_plugin.js %%WWWDIR%%/admin/editor/plugins/lists/editor_plugin_src.js -%%WWWDIR%%/admin/editor/plugins/media/css/content.css -%%WWWDIR%%/admin/editor/plugins/media/css/media.css -%%WWWDIR%%/admin/editor/plugins/media/editor_plugin.js -%%WWWDIR%%/admin/editor/plugins/media/editor_plugin_src.js -%%WWWDIR%%/admin/editor/plugins/media/img/flash.gif -%%WWWDIR%%/admin/editor/plugins/media/img/flv_player.swf -%%WWWDIR%%/admin/editor/plugins/media/img/quicktime.gif -%%WWWDIR%%/admin/editor/plugins/media/img/realmedia.gif -%%WWWDIR%%/admin/editor/plugins/media/img/shockwave.gif -%%WWWDIR%%/admin/editor/plugins/media/img/trans.gif -%%WWWDIR%%/admin/editor/plugins/media/img/windowsmedia.gif -%%WWWDIR%%/admin/editor/plugins/media/js/embed.js -%%WWWDIR%%/admin/editor/plugins/media/js/media.js -%%WWWDIR%%/admin/editor/plugins/media/langs/cs_dlg.js -%%WWWDIR%%/admin/editor/plugins/media/langs/de_dlg.js -%%WWWDIR%%/admin/editor/plugins/media/langs/en_dlg.js -%%WWWDIR%%/admin/editor/plugins/media/media.htm -%%WWWDIR%%/admin/editor/plugins/media/moxieplayer.swf %%WWWDIR%%/admin/editor/plugins/nonbreaking/editor_plugin.js %%WWWDIR%%/admin/editor/plugins/nonbreaking/editor_plugin_src.js %%WWWDIR%%/admin/editor/plugins/noneditable/editor_plugin.js @@ -550,7 +518,7 @@ %%WWWDIR%%/admin/editor/plugins/paste/langs/en_dlg.js %%WWWDIR%%/admin/editor/plugins/paste/pastetext.htm %%WWWDIR%%/admin/editor/plugins/paste/pasteword.htm -%%WWWDIR%%/admin/editor/plugins/phpmyfaq/dialog.html +%%WWWDIR%%/admin/editor/plugins/phpmyfaq/dialog.php %%WWWDIR%%/admin/editor/plugins/phpmyfaq/editor_plugin.js %%WWWDIR%%/admin/editor/plugins/phpmyfaq/editor_plugin_src.js %%WWWDIR%%/admin/editor/plugins/phpmyfaq/img/phpmyfaq.gif @@ -559,11 +527,6 @@ %%WWWDIR%%/admin/editor/plugins/phpmyfaq/langs/de_dlg.js %%WWWDIR%%/admin/editor/plugins/phpmyfaq/langs/en.js %%WWWDIR%%/admin/editor/plugins/phpmyfaq/langs/en_dlg.js -%%WWWDIR%%/admin/editor/plugins/preview/editor_plugin.js -%%WWWDIR%%/admin/editor/plugins/preview/editor_plugin_src.js -%%WWWDIR%%/admin/editor/plugins/preview/example.html -%%WWWDIR%%/admin/editor/plugins/preview/jscripts/embed.js -%%WWWDIR%%/admin/editor/plugins/preview/preview.html %%WWWDIR%%/admin/editor/plugins/print/editor_plugin.js %%WWWDIR%%/admin/editor/plugins/print/editor_plugin_src.js %%WWWDIR%%/admin/editor/plugins/safari/blank.htm @@ -823,6 +786,8 @@ %%WWWDIR%%/assets/img/twitter.signin.png %%WWWDIR%%/assets/js/autosave.js %%WWWDIR%%/assets/js/functions.js +%%WWWDIR%%/assets/js/jquery.min.map +%%WWWDIR%%/assets/js/libs/jquery.min.map %%WWWDIR%%/assets/js/libs/jquery.min.js %%WWWDIR%%/assets/js/libs/modernizr.min.js %%WWWDIR%%/assets/js/phpmyfaq.js @@ -1078,6 +1043,7 @@ %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/LICENSE %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/MapClassLoader.php %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/README.md +%%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Psr4ClassLoader.php %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/ClassLoaderTest.php @@ -1152,6 +1118,11 @@ %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Pearlike2/FooBar.php %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/includepath/Foo.php %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4/traits.php +%%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/psr-4/Class_With_Underscores.php +%%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/psr-4/Foo.php +%%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/psr-4/Lets/Go/Deeper/Class_With_Underscores.php +%%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/psr-4/Lets/Go/Deeper/Foo.php +%%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Psr4ClassLoaderTest.php %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/UniversalClassLoader.php %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/WinCacheClassLoader.php @@ -1177,10 +1148,15 @@ %%WWWDIR%%/inc/libs/tcpdf/fonts/cid0jp.php %%WWWDIR%%/inc/libs/tcpdf/fonts/cid0kr.php %%WWWDIR%%/inc/libs/tcpdf/fonts/courier.php -%%WWWDIR%%/inc/libs/tcpdf/fonts/helvetica.php -%%WWWDIR%%/inc/libs/tcpdf/fonts/helveticab.php -%%WWWDIR%%/inc/libs/tcpdf/fonts/helveticabi.php -%%WWWDIR%%/inc/libs/tcpdf/fonts/helveticai.php +%%WWWDIR%%/inc/libs/tcpdf/fonts/dejavusans.ctg.z +%%WWWDIR%%/inc/libs/tcpdf/fonts/dejavusans.php +%%WWWDIR%%/inc/libs/tcpdf/fonts/dejavusans.z +%%WWWDIR%%/inc/libs/tcpdf/fonts/dejavusansb.ctg.z +%%WWWDIR%%/inc/libs/tcpdf/fonts/dejavusansb.php +%%WWWDIR%%/inc/libs/tcpdf/fonts/dejavusansb.z +%%WWWDIR%%/inc/libs/tcpdf/fonts/dejavusansbi.ctg.z +%%WWWDIR%%/inc/libs/tcpdf/fonts/dejavusansbi.php +%%WWWDIR%%/inc/libs/tcpdf/fonts/dejavusansbi.z %%WWWDIR%%/inc/libs/tcpdf/fonts/hysmyeongjostdmedium.php %%WWWDIR%%/inc/libs/tcpdf/fonts/kozgopromedium.php %%WWWDIR%%/inc/libs/tcpdf/fonts/kozminproregular.php @@ -1225,7 +1201,6 @@ %%WWWDIR%%/install/questionnaire.php %%WWWDIR%%/install/setup.php %%WWWDIR%%/install/sqlite.sql.php -%%WWWDIR%%/install/sqlite3.php %%WWWDIR%%/install/sqlite3.sql.php %%WWWDIR%%/install/sqlsrv.sql.php %%WWWDIR%%/install/stopwords.sql.php @@ -1296,285 +1271,10 @@ %%WWWDIR%%/translate.php %%WWWDIR%%/ucp.php %%WWWDIR%%/writecomment.php -@dirrm %%WWWDIR%%/xml -@dirrm %%WWWDIR%%/services/twitter -@dirrm %%WWWDIR%%/services -@dirrm %%WWWDIR%%/pdf -@dirrm %%WWWDIR%%/multisite -@dirrm %%WWWDIR%%/lang -@dirrm %%WWWDIR%%/install -@dirrm %%WWWDIR%%/inc/libs/twitteroauth -@dirrm %%WWWDIR%%/inc/libs/tcpdf/include/barcodes -@dirrm %%WWWDIR%%/inc/libs/tcpdf/include -@dirrm %%WWWDIR%%/inc/libs/tcpdf/fonts -@dirrm %%WWWDIR%%/inc/libs/tcpdf -@dirrm %%WWWDIR%%/inc/libs/phpseclib/Crypt -@dirrm %%WWWDIR%%/inc/libs/phpseclib -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/php5.4 -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/includepath -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Pearlike2 -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Pearlike -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Namespaced2 -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/fallback/Namespaced -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/fallback -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/deps -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/classmap -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/C/B -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/C -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/A/B -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision/A -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/beta/PrefixCollision -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/C/B -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/C -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/A/B -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision/A -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/beta/NamespaceCollision -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/beta -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/C -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision/A -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/PrefixCollision -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/C -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision/A -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/alpha/NamespaceCollision -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/alpha -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike2 -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Pearlike -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced2 -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Namespaced -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/fallback/Namespaced -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/fallback/Apc/Pearlike -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/fallback/Apc -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/fallback -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A/B -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision/A -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/NamespaceCollision -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A/B -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision/A -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc/ApcPrefixCollision -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta/Apc -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/beta -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision/A -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/NamespaceCollision -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision/A -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc/ApcPrefixCollision -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha/Apc -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/alpha -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Pearlike -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc/Namespaced -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures/Apc -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests/Fixtures -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader/Tests -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component/ClassLoader -@dirrm %%WWWDIR%%/inc/libs/Symfony/Component -@dirrm %%WWWDIR%%/inc/libs/Symfony -@dirrm %%WWWDIR%%/inc/libs -@dirrm %%WWWDIR%%/inc/fonts -@dirrm %%WWWDIR%%/inc/PMF/User -@dirrm %%WWWDIR%%/inc/PMF/String -@dirrm %%WWWDIR%%/inc/PMF/Services -@dirrm %%WWWDIR%%/inc/PMF/Search/Database -@dirrm %%WWWDIR%%/inc/PMF/Search -@dirrm %%WWWDIR%%/inc/PMF/Perm -@dirrm %%WWWDIR%%/inc/PMF/Mail -@dirrm %%WWWDIR%%/inc/PMF/Language -@dirrm %%WWWDIR%%/inc/PMF/Instance -@dirrm %%WWWDIR%%/inc/PMF/Helper -@dirrm %%WWWDIR%%/inc/PMF/Faq -@dirrm %%WWWDIR%%/inc/PMF/Export/Pdf -@dirrm %%WWWDIR%%/inc/PMF/Export -@dirrm %%WWWDIR%%/inc/PMF/Enc -@dirrm %%WWWDIR%%/inc/PMF/DB -@dirrm %%WWWDIR%%/inc/PMF/Category -@dirrm %%WWWDIR%%/inc/PMF/Cache -@dirrm %%WWWDIR%%/inc/PMF/Auth -@dirrm %%WWWDIR%%/inc/PMF/Attachment/Filesystem/File -@dirrm %%WWWDIR%%/inc/PMF/Attachment/Filesystem -@dirrm %%WWWDIR%%/inc/PMF/Attachment -@dirrm %%WWWDIR%%/inc/PMF -@dirrm %%WWWDIR%%/inc -@dirrm %%WWWDIR%%/images -@dirrm %%WWWDIR%%/feed/topten -@dirrm %%WWWDIR%%/feed/openquestions -@dirrm %%WWWDIR%%/feed/news -@dirrm %%WWWDIR%%/feed/latest -@dirrm %%WWWDIR%%/feed/category -@dirrm %%WWWDIR%%/feed -@dirrm %%WWWDIR%%/data -@dirrm %%WWWDIR%%/config -@dirrm %%WWWDIR%%/attachments -@dirrm %%WWWDIR%%/assets/template/default/less -@dirrm %%WWWDIR%%/assets/template/default/images -@dirrm %%WWWDIR%%/assets/template/default/css -@dirrm %%WWWDIR%%/assets/template/default -@dirrm %%WWWDIR%%/assets/template -@dirrm %%WWWDIR%%/assets/js/syntaxhighlighter/styles -@dirrm %%WWWDIR%%/assets/js/syntaxhighlighter/src -@dirrm %%WWWDIR%%/assets/js/syntaxhighlighter/scripts -@dirrm %%WWWDIR%%/assets/js/syntaxhighlighter -@dirrm %%WWWDIR%%/assets/js/plugins/datePicker -@dirrm %%WWWDIR%%/assets/js/plugins -@dirrm %%WWWDIR%%/assets/js/libs -@dirrm %%WWWDIR%%/assets/js -@dirrm %%WWWDIR%%/assets/img -@dirrm %%WWWDIR%%/assets -@dirrm %%WWWDIR%%/admin/images -@dirrm %%WWWDIR%%/admin/editor/utils -@dirrm %%WWWDIR%%/admin/editor/themes/simple/skins/o2k7/img -@dirrm %%WWWDIR%%/admin/editor/themes/simple/skins/o2k7 -@dirrm %%WWWDIR%%/admin/editor/themes/simple/skins/default -@dirrm %%WWWDIR%%/admin/editor/themes/simple/skins -@dirrm %%WWWDIR%%/admin/editor/themes/simple/langs -@dirrm %%WWWDIR%%/admin/editor/themes/simple/img -@dirrm %%WWWDIR%%/admin/editor/themes/simple -@dirrm %%WWWDIR%%/admin/editor/themes/advanced/skins/o2k7/img -@dirrm %%WWWDIR%%/admin/editor/themes/advanced/skins/o2k7 -@dirrm %%WWWDIR%%/admin/editor/themes/advanced/skins/highcontrast -@dirrm %%WWWDIR%%/admin/editor/themes/advanced/skins/default/img -@dirrm %%WWWDIR%%/admin/editor/themes/advanced/skins/default -@dirrm %%WWWDIR%%/admin/editor/themes/advanced/skins/cirkuit/img -@dirrm %%WWWDIR%%/admin/editor/themes/advanced/skins/cirkuit -@dirrm %%WWWDIR%%/admin/editor/themes/advanced/skins -@dirrm %%WWWDIR%%/admin/editor/themes/advanced/langs -@dirrm %%WWWDIR%%/admin/editor/themes/advanced/js -@dirrm %%WWWDIR%%/admin/editor/themes/advanced/img -@dirrm %%WWWDIR%%/admin/editor/themes/advanced -@dirrm %%WWWDIR%%/admin/editor/themes -@dirrm %%WWWDIR%%/admin/editor/plugins/xhtmlxtras/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/xhtmlxtras/js -@dirrm %%WWWDIR%%/admin/editor/plugins/xhtmlxtras/css -@dirrm %%WWWDIR%%/admin/editor/plugins/xhtmlxtras -@dirrm %%WWWDIR%%/admin/editor/plugins/wordcount -@dirrm %%WWWDIR%%/admin/editor/plugins/visualchars -@dirrm %%WWWDIR%%/admin/editor/plugins/visualblocks/css -@dirrm %%WWWDIR%%/admin/editor/plugins/visualblocks -@dirrm %%WWWDIR%%/admin/editor/plugins/template/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/template/js -@dirrm %%WWWDIR%%/admin/editor/plugins/template/css -@dirrm %%WWWDIR%%/admin/editor/plugins/template -@dirrm %%WWWDIR%%/admin/editor/plugins/table/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/table/js -@dirrm %%WWWDIR%%/admin/editor/plugins/table/css -@dirrm %%WWWDIR%%/admin/editor/plugins/table -@dirrm %%WWWDIR%%/admin/editor/plugins/tabfocus -@dirrm %%WWWDIR%%/admin/editor/plugins/syntaxhl/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/syntaxhl/js -@dirrm %%WWWDIR%%/admin/editor/plugins/syntaxhl/img -@dirrm %%WWWDIR%%/admin/editor/plugins/syntaxhl -@dirrm %%WWWDIR%%/admin/editor/plugins/style/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/style/js -@dirrm %%WWWDIR%%/admin/editor/plugins/style/css -@dirrm %%WWWDIR%%/admin/editor/plugins/style -@dirrm %%WWWDIR%%/admin/editor/plugins/spellchecker/img -@dirrm %%WWWDIR%%/admin/editor/plugins/spellchecker/css -@dirrm %%WWWDIR%%/admin/editor/plugins/spellchecker -@dirrm %%WWWDIR%%/admin/editor/plugins/searchreplace/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/searchreplace/js -@dirrm %%WWWDIR%%/admin/editor/plugins/searchreplace/css -@dirrm %%WWWDIR%%/admin/editor/plugins/searchreplace -@dirrm %%WWWDIR%%/admin/editor/plugins/save -@dirrm %%WWWDIR%%/admin/editor/plugins/safari -@dirrm %%WWWDIR%%/admin/editor/plugins/print -@dirrm %%WWWDIR%%/admin/editor/plugins/preview/jscripts -@dirrm %%WWWDIR%%/admin/editor/plugins/preview -@dirrm %%WWWDIR%%/admin/editor/plugins/phpmyfaq/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/phpmyfaq/js -@dirrm %%WWWDIR%%/admin/editor/plugins/phpmyfaq/img -@dirrm %%WWWDIR%%/admin/editor/plugins/phpmyfaq -@dirrm %%WWWDIR%%/admin/editor/plugins/paste/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/paste/js -@dirrm %%WWWDIR%%/admin/editor/plugins/paste/css -@dirrm %%WWWDIR%%/admin/editor/plugins/paste -@dirrm %%WWWDIR%%/admin/editor/plugins/pagebreak/img -@dirrm %%WWWDIR%%/admin/editor/plugins/pagebreak/css -@dirrm %%WWWDIR%%/admin/editor/plugins/pagebreak -@dirrm %%WWWDIR%%/admin/editor/plugins/noneditable -@dirrm %%WWWDIR%%/admin/editor/plugins/nonbreaking -@dirrm %%WWWDIR%%/admin/editor/plugins/media/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/media/js -@dirrm %%WWWDIR%%/admin/editor/plugins/media/img -@dirrm %%WWWDIR%%/admin/editor/plugins/media/css -@dirrm %%WWWDIR%%/admin/editor/plugins/media -@dirrm %%WWWDIR%%/admin/editor/plugins/lists -@dirrm %%WWWDIR%%/admin/editor/plugins/legacyoutput -@dirrm %%WWWDIR%%/admin/editor/plugins/layer -@dirrm %%WWWDIR%%/admin/editor/plugins/insertdatetime -@dirrm %%WWWDIR%%/admin/editor/plugins/inlinepopups/skins/clearlooks2/img -@dirrm %%WWWDIR%%/admin/editor/plugins/inlinepopups/skins/clearlooks2 -@dirrm %%WWWDIR%%/admin/editor/plugins/inlinepopups/skins -@dirrm %%WWWDIR%%/admin/editor/plugins/inlinepopups -@dirrm %%WWWDIR%%/admin/editor/plugins/iespell -@dirrm %%WWWDIR%%/admin/editor/plugins/fullscreen -@dirrm %%WWWDIR%%/admin/editor/plugins/fullpage/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/fullpage/js -@dirrm %%WWWDIR%%/admin/editor/plugins/fullpage/css -@dirrm %%WWWDIR%%/admin/editor/plugins/fullpage -@dirrm %%WWWDIR%%/admin/editor/plugins/example/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/example/js -@dirrm %%WWWDIR%%/admin/editor/plugins/example/img -@dirrm %%WWWDIR%%/admin/editor/plugins/example -@dirrm %%WWWDIR%%/admin/editor/plugins/emotions/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/emotions/js -@dirrm %%WWWDIR%%/admin/editor/plugins/emotions/img -@dirrm %%WWWDIR%%/admin/editor/plugins/emotions -@dirrm %%WWWDIR%%/admin/editor/plugins/directionality -@dirrm %%WWWDIR%%/admin/editor/plugins/contextmenu -@dirrm %%WWWDIR%%/admin/editor/plugins/compat2x -@dirrm %%WWWDIR%%/admin/editor/plugins/bbcode -@dirrm %%WWWDIR%%/admin/editor/plugins/autosave/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/autosave -@dirrm %%WWWDIR%%/admin/editor/plugins/autoresize -@dirrm %%WWWDIR%%/admin/editor/plugins/autolink -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/default/images/standard -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/default/images/small_icon -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/default/images/pagination -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/default/images/file_type -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/default/images/button -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/default/images/big_icon -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/default/images/action -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/default/images/New Folder -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/default/images -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/default/css -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/default -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/dark/images/standard -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/dark/images/pagination -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/dark/images/file_type -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/dark/images/big_icon -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/dark/images/action -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/dark/images -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/dark/css -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme/dark -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/theme -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/session -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/jscripts/edit_area/reg_syntax -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/jscripts/edit_area/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/jscripts/edit_area/images -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/jscripts/edit_area -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/jscripts -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager/inc -@dirrm %%WWWDIR%%/admin/editor/plugins/ajaxfilemanager -@dirrm %%WWWDIR%%/admin/editor/plugins/advlist -@dirrm %%WWWDIR%%/admin/editor/plugins/advlink/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/advlink/js -@dirrm %%WWWDIR%%/admin/editor/plugins/advlink/css -@dirrm %%WWWDIR%%/admin/editor/plugins/advlink -@dirrm %%WWWDIR%%/admin/editor/plugins/advimage/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/advimage/js -@dirrm %%WWWDIR%%/admin/editor/plugins/advimage/img -@dirrm %%WWWDIR%%/admin/editor/plugins/advimage/css -@dirrm %%WWWDIR%%/admin/editor/plugins/advimage -@dirrm %%WWWDIR%%/admin/editor/plugins/advhr/langs -@dirrm %%WWWDIR%%/admin/editor/plugins/advhr/js -@dirrm %%WWWDIR%%/admin/editor/plugins/advhr/css -@dirrm %%WWWDIR%%/admin/editor/plugins/advhr -@dirrm %%WWWDIR%%/admin/editor/plugins -@dirrm %%WWWDIR%%/admin/editor/langs -@dirrm %%WWWDIR%%/admin/editor -@dirrm %%WWWDIR%%/admin/assets/less -@dirrm %%WWWDIR%%/admin/assets/js -@dirrm %%WWWDIR%%/admin/assets/font -@dirrm %%WWWDIR%%/admin/assets/css -@dirrm %%WWWDIR%%/admin/assets -@dirrm %%WWWDIR%%/admin -@dirrm %%WWWDIR%% +@dir(www,www,) %%WWWDIR%%/xml +@dir(www,www,) %%WWWDIR%%/pdf +@dir(www,www,) %%WWWDIR%%/inc +@dir(www,www,) %%WWWDIR%%/images +@dir(www,www,) %%WWWDIR%%/data +@dir(www,www,) %%WWWDIR%%/config +@dir(www,www,) %%WWWDIR%%/attachments From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 5 22:33:56 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65A84C60; Thu, 5 Mar 2015 22:33:56 +0000 (UTC) Received: from svn.freebsd.org (svn.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 4EFE427D; Thu, 5 Mar 2015 22:33:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25MXuI2020288; Thu, 5 Mar 2015 22:33:56 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25MXtMl020285; Thu, 5 Mar 2015 22:33:55 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201503052233.t25MXtMl020285@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Thu, 5 Mar 2015 22:33:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380560 - in branches/2015Q1/lang/php53: . 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.18-1 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, 05 Mar 2015 22:33:56 -0000 Author: flo Date: Thu Mar 5 22:33:54 2015 New Revision: 380560 URL: https://svnweb.freebsd.org/changeset/ports/380560 QAT: https://qat.redports.org/buildarchive/r380560/ Log: MFH: r379853 Add patches for - CVE-2014-8142 - CVE-2015-0231 Approved by: portmgr (erwin) Added: branches/2015Q1/lang/php53/files/patch-CVE-2014-8142.patch - copied unchanged from r379853, head/lang/php53/files/patch-CVE-2014-8142.patch branches/2015Q1/lang/php53/files/patch-CVE-2015-0231.patch - copied unchanged from r379853, head/lang/php53/files/patch-CVE-2015-0231.patch Modified: branches/2015Q1/lang/php53/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/lang/php53/Makefile ============================================================================== --- branches/2015Q1/lang/php53/Makefile Thu Mar 5 22:31:43 2015 (r380559) +++ branches/2015Q1/lang/php53/Makefile Thu Mar 5 22:33:54 2015 (r380560) @@ -3,7 +3,7 @@ PORTNAME= php53 PORTVERSION= 5.3.29 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} MASTER_SITE_SUBDIR= distributions Copied: branches/2015Q1/lang/php53/files/patch-CVE-2014-8142.patch (from r379853, head/lang/php53/files/patch-CVE-2014-8142.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/lang/php53/files/patch-CVE-2014-8142.patch Thu Mar 5 22:33:54 2015 (r380560, copy of r379853, head/lang/php53/files/patch-CVE-2014-8142.patch) @@ -0,0 +1,56 @@ +Index: ext/standard/tests/serialize/bug68594.phpt +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ ext/standard/tests/serialize/bug68594.phpt 2015-02-13 11:27:34.753347966 -0500 +@@ -0,0 +1,23 @@ ++--TEST-- ++Bug #68545 Use after free vulnerability in unserialize() ++--FILE-- ++aaa = array(1,2,&$u,4,5); ++ $m->bbb = 1; ++ $m->ccc = &$u; ++ $m->ddd = str_repeat("A", $i); ++ ++ $z = serialize($m); ++ $z = str_replace("bbb", "aaa", $z); ++ $y = unserialize($z); ++ $z = serialize($y); ++} ++?> ++===DONE=== ++--EXPECTF-- ++===DONE=== +Index: ext/standard/var_unserializer.c +=================================================================== +--- ext/standard/var_unserializer.c 2015-02-13 11:27:34.793348294 -0500 ++++ ext/standard/var_unserializer.c 2015-02-13 11:27:34.753347966 -0500 +@@ -298,6 +298,9 @@ + } else { + /* object properties should include no integers */ + convert_to_string(key); ++ if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { ++ var_push_dtor(var_hash, old_data); ++ } + zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, + sizeof data, NULL); + } +Index: ext/standard/var_unserializer.re +=================================================================== +--- ext/standard/var_unserializer.re 2015-02-13 11:27:34.793348294 -0500 ++++ ext/standard/var_unserializer.re 2015-02-13 11:27:34.753347966 -0500 +@@ -304,6 +304,9 @@ + } else { + /* object properties should include no integers */ + convert_to_string(key); ++ if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { ++ var_push_dtor(var_hash, old_data); ++ } + zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, + sizeof data, NULL); + } Copied: branches/2015Q1/lang/php53/files/patch-CVE-2015-0231.patch (from r379853, head/lang/php53/files/patch-CVE-2015-0231.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/lang/php53/files/patch-CVE-2015-0231.patch Thu Mar 5 22:33:54 2015 (r380560, copy of r379853, head/lang/php53/files/patch-CVE-2015-0231.patch) @@ -0,0 +1,56 @@ +Index: ext/standard/tests/strings/bug68710.phpt +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ ext/standard/tests/strings/bug68710.phpt 2015-02-13 11:36:32.969760122 -0500 +@@ -0,0 +1,25 @@ ++--TEST-- ++Bug #68710 Use after free vulnerability in unserialize() (bypassing the ++CVE-2014-8142 fix) ++--FILE-- ++aaa = array(1,2,&$u,4,5); ++ $m->bbb = 1; ++ $m->ccc = &$u; ++ $m->ddd = str_repeat("A", $i); ++ ++ $z = serialize($m); ++ $z = str_replace("aaa", "123", $z); ++ $z = str_replace("bbb", "123", $z); ++ $y = unserialize($z); ++ $z = serialize($y); ++} ++?> ++===DONE=== ++--EXPECTF-- ++===DONE=== +Index: ext/standard/var_unserializer.c +=================================================================== +--- ext/standard/var_unserializer.c 2015-02-13 11:36:33.009760449 -0500 ++++ ext/standard/var_unserializer.c 2015-02-13 11:36:32.969760122 -0500 +@@ -298,7 +298,7 @@ + } else { + /* object properties should include no integers */ + convert_to_string(key); +- if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { ++ if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { + var_push_dtor(var_hash, old_data); + } + zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, +Index: ext/standard/var_unserializer.re +=================================================================== +--- ext/standard/var_unserializer.re 2015-02-13 11:36:33.009760449 -0500 ++++ ext/standard/var_unserializer.re 2015-02-13 11:36:32.969760122 -0500 +@@ -304,7 +304,7 @@ + } else { + /* object properties should include no integers */ + convert_to_string(key); +- if (zend_symtable_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { ++ if (zend_hash_find(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, (void **)&old_data)==SUCCESS) { + var_push_dtor(var_hash, old_data); + } + zend_hash_update(ht, Z_STRVAL_P(key), Z_STRLEN_P(key) + 1, &data, From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 5 22:44:26 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A516AF40; Thu, 5 Mar 2015 22:44:26 +0000 (UTC) Received: from svn.freebsd.org (svn.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 8F1E739F; Thu, 5 Mar 2015 22:44:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25MiQ19025380; Thu, 5 Mar 2015 22:44:26 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25MiQUR025378; Thu, 5 Mar 2015 22:44:26 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <201503052244.t25MiQUR025378@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio Date: Thu, 5 Mar 2015 22:44:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380562 - in branches/2015Q1/www/fcgi: . 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.18-1 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, 05 Mar 2015 22:44:26 -0000 Author: rodrigo Date: Thu Mar 5 22:44:25 2015 New Revision: 380562 URL: https://svnweb.freebsd.org/changeset/ports/380562 QAT: https://qat.redports.org/buildarchive/r380562/ Log: MFH: r380457 Patch fcgi to address CVE-2012-6687 vulnerabilities. PR: 197844 Submitted by: rodrigo Obtained from: ubuntu Security: CVE-2012-6687 Approved by: ports-secteam Added: branches/2015Q1/www/fcgi/files/patch-CVE-2012-6687-pool - copied unchanged from r380457, head/www/fcgi/files/patch-CVE-2012-6687-pool Modified: branches/2015Q1/www/fcgi/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/fcgi/Makefile ============================================================================== --- branches/2015Q1/www/fcgi/Makefile Thu Mar 5 22:34:46 2015 (r380561) +++ branches/2015Q1/www/fcgi/Makefile Thu Mar 5 22:44:25 2015 (r380562) @@ -3,7 +3,7 @@ PORTNAME= fcgi PORTVERSION= 2.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= http://www.fastcgi.com/dist/ \ http://www.skysmurf.nl/comp/FreeBSD/distfiles/ @@ -17,10 +17,11 @@ LICENSE_NAME= Open Market FastCGI licens LICENSE_FILE= ${WRKSRC}/LICENSE.TERMS LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= libtool +USES= cpe libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes +CPE_VENDOR= fastcgi OPTIONS_DEFINE= DOCS Copied: branches/2015Q1/www/fcgi/files/patch-CVE-2012-6687-pool (from r380457, head/www/fcgi/files/patch-CVE-2012-6687-pool) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/www/fcgi/files/patch-CVE-2012-6687-pool Thu Mar 5 22:44:25 2015 (r380562, copy of r380457, head/www/fcgi/files/patch-CVE-2012-6687-pool) @@ -0,0 +1,81 @@ +diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c +index 73e6a7f..af35aee 100755 +--- libfcgi/os_unix.c ++++ libfcgi/os_unix.c +@@ -42,6 +42,7 @@ static const char rcsid[] = "$Id: os_unix.c,v 1.37 2002/03/05 19:14:49 robs Exp + #include + #include + #include ++#include + + #ifdef HAVE_NETDB_H + #include +@@ -103,6 +104,9 @@ static int volatile maxFd = -1; + static int shutdownPending = FALSE; + static int shutdownNow = FALSE; + ++static int libfcgiOsClosePollTimeout = 2000; ++static int libfcgiIsAfUnixKeeperPollTimeout = 2000; ++ + void OS_ShutdownPending() + { + shutdownPending = TRUE; +@@ -168,6 +172,16 @@ int OS_LibInit(int stdioFds[3]) + if(libInitialized) + return 0; + ++ char *libfcgiOsClosePollTimeoutStr = getenv( "LIBFCGI_OS_CLOSE_POLL_TIMEOUT" ); ++ if(libfcgiOsClosePollTimeoutStr) { ++ libfcgiOsClosePollTimeout = atoi(libfcgiOsClosePollTimeoutStr); ++ } ++ ++ char *libfcgiIsAfUnixKeeperPollTimeoutStr = getenv( "LIBFCGI_IS_AF_UNIX_KEEPER_POLL_TIMEOUT" ); ++ if(libfcgiIsAfUnixKeeperPollTimeoutStr) { ++ libfcgiIsAfUnixKeeperPollTimeout = atoi(libfcgiIsAfUnixKeeperPollTimeoutStr); ++ } ++ + asyncIoTable = (AioInfo *)malloc(asyncIoTableSize * sizeof(AioInfo)); + if(asyncIoTable == NULL) { + errno = ENOMEM; +@@ -755,19 +769,16 @@ int OS_Close(int fd) + + if (shutdown(fd, 1) == 0) + { +- struct timeval tv; +- fd_set rfds; ++ struct pollfd pfd; + int rv; + char trash[1024]; + +- FD_ZERO(&rfds); ++ pfd.fd = fd; ++ pfd.events = POLLIN; + + do + { +- FD_SET(fd, &rfds); +- tv.tv_sec = 2; +- tv.tv_usec = 0; +- rv = select(fd + 1, &rfds, NULL, NULL, &tv); ++ rv = poll(&pfd, 1, libfcgiOsClosePollTimeout); + } + while (rv > 0 && read(fd, trash, sizeof(trash)) > 0); + } +@@ -1116,13 +1127,11 @@ static int is_reasonable_accept_errno (const int error) + */ + static int is_af_unix_keeper(const int fd) + { +- struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL }; +- fd_set read_fds; +- +- FD_ZERO(&read_fds); +- FD_SET(fd, &read_fds); ++ struct pollfd pfd; ++ pfd.fd = fd; ++ pfd.events = POLLIN; + +- return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds); ++ return poll(&pfd, 1, libfcgiIsAfUnixKeeperPollTimeout) >= 0 && (pfd.revents & POLLIN); + } + + /* From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 5 22:45:18 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0E504C4; Thu, 5 Mar 2015 22:45:18 +0000 (UTC) Received: from svn.freebsd.org (svn.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 E065A3C5; Thu, 5 Mar 2015 22:45:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25MjH4X025697; Thu, 5 Mar 2015 22:45:17 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25MjHiH025691; Thu, 5 Mar 2015 22:45:17 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201503052245.t25MjHiH025691@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 5 Mar 2015 22:45:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380563 - in branches/2015Q1/finance/R-cran-RFinanceYJ: . 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.18-1 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, 05 Mar 2015 22:45:18 -0000 Author: antoine Date: Thu Mar 5 22:45:16 2015 New Revision: 380563 URL: https://svnweb.freebsd.org/changeset/ports/380563 QAT: https://qat.redports.org/buildarchive/r380563/ Log: MFH: r377828 - Upstream rerolled tarball * Updated DESCRIPTION file - Update the patch to make fetchable more than 50 records because web page layout was changed in January 2015 Modified: branches/2015Q1/finance/R-cran-RFinanceYJ/Makefile branches/2015Q1/finance/R-cran-RFinanceYJ/distinfo branches/2015Q1/finance/R-cran-RFinanceYJ/files/patch-R-quoteStockTsData.R Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/finance/R-cran-RFinanceYJ/Makefile ============================================================================== --- branches/2015Q1/finance/R-cran-RFinanceYJ/Makefile Thu Mar 5 22:44:25 2015 (r380562) +++ branches/2015Q1/finance/R-cran-RFinanceYJ/Makefile Thu Mar 5 22:45:16 2015 (r380563) @@ -3,7 +3,7 @@ PORTNAME= RFinanceYJ PORTVERSION= 0.3.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= finance DISTNAME= ${PORTNAME}_${PORTVERSION} Modified: branches/2015Q1/finance/R-cran-RFinanceYJ/distinfo ============================================================================== --- branches/2015Q1/finance/R-cran-RFinanceYJ/distinfo Thu Mar 5 22:44:25 2015 (r380562) +++ branches/2015Q1/finance/R-cran-RFinanceYJ/distinfo Thu Mar 5 22:45:16 2015 (r380563) @@ -1,2 +1,2 @@ -SHA256 (RFinanceYJ_0.3.1.tar.gz) = b8fc8b7e6dcf0683b84df985749f6ebe2674f2761f3c64c9532a387965c7c0a9 -SIZE (RFinanceYJ_0.3.1.tar.gz) = 3719 +SHA256 (RFinanceYJ_0.3.1.tar.gz) = a33eeb02a919490bdaa3b2c7721c03a122f8a5d2574f39d90757b00399fe1562 +SIZE (RFinanceYJ_0.3.1.tar.gz) = 3635 Modified: branches/2015Q1/finance/R-cran-RFinanceYJ/files/patch-R-quoteStockTsData.R ============================================================================== --- branches/2015Q1/finance/R-cran-RFinanceYJ/files/patch-R-quoteStockTsData.R Thu Mar 5 22:44:25 2015 (r380562) +++ branches/2015Q1/finance/R-cran-RFinanceYJ/files/patch-R-quoteStockTsData.R Thu Mar 5 22:45:16 2015 (r380563) @@ -1,15 +1,70 @@ --- R/quoteStockTsData.R.orig 2013-08-13 00:05:58.000000000 +0900 -+++ R/quoteStockTsData.R 2014-05-25 10:58:31.000000000 +0900 -@@ -57,10 +57,10 @@ - - extractQuoteTable <- function(r,type){ - if(type %in% c("fund","fx")){ ++++ R/quoteStockTsData.R 2015-01-24 20:34:35.000000000 +0900 +@@ -46,42 +46,33 @@ + #get time series data from Yahoo! Finance. + quoteTsData <- function(x,function.financialproduct,since,start.num,date.end,time.interval,type="stock"){ + r <- NULL +- result.num <- 51 + financial.data <- data.frame(NULL) +- #start <- (gsub("([0-9]{4,4})-([0-9]{2,2})-([0-9]{2,2})","&c=\\1&a=\\2&b=\\3",since)) +- #end <- (gsub("([0-9]{4,4})-([0-9]{2,2})-([0-9]{2,2})","&f=\\1&d=\\2&e=\\3",date.end)) + start <- (gsub("([0-9]{4,4})-([0-9]{2,2})-([0-9]{2,2})","&sy=\\1&sm=\\2&sd=\\3",since)) + end <- (gsub("([0-9]{4,4})-([0-9]{2,2})-([0-9]{2,2})","&ey=\\1&em=\\2&ed=\\3",date.end)) + + if(!any(time.interval==c('d','w','m'))) stop("Invalid time.interval value") +- +- extractQuoteTable <- function(r,type){ +- if(type %in% c("fund","fx")){ - tbl <- r[[2]][[2]][[7]][[3]][[3]][[9]][[2]] -+ tbl <- r[[2]][[2]][[7]][[3]][[3]][[8]][[2]] - } - else{ +- } +- else{ - tbl <- r[[2]][[2]][[7]][[3]][[3]][[10]][[2]] -+ tbl <- r[[2]][[2]][[7]][[3]][[3]][[11]][[2]] +- } +- return(tbl) +- } +- +- while( result.num >= 51 ){ ++ while( 1 ){ + start.num <- start.num + 1 + quote.table <- NULL + quote.url <- paste('http://info.finance.yahoo.co.jp/history/?code=',x,start,end,'&p=',start.num,'&tm=',substr(time.interval,1,1),sep="") + +- try( r <- xmlRoot(htmlTreeParse(quote.url,error=xmlErrorCumulator(immediate=F))), TRUE) ++ try( r <- htmlParse(quote.url) ) + if( is.null(r) ) stop(paste("Can not access :", quote.url)) + +- #try( quote.table <- r[[2]][[1]][[1]][[16]][[1]][[1]][[1]][[4]][[1]][[1]][[1]], TRUE ) +- try( quote.table <- extractQuoteTable(r,type), TRUE ) ++ try( quote.table <- xpathApply(r,"//table")[[2]], TRUE ) ++ ++ quote.size <- xmlSize(quote.table) ++ ++ if( xmlSize(quote.table) <= 1 ){ ++ return(financial.data) ++ } + + if( is.null(quote.table) ){ + if( is.null(financial.data) ){ + stop(paste("Can not quote :", x)) + }else{ +- financial.data <- financial.data[order(financial.data$date),] +- return(financial.data) ++ financial.data <- financial.data[order(financial.data$date),] ++ return(financial.data) + } + } + +@@ -90,7 +81,6 @@ + financial.data <- rbind(financial.data,function.financialproduct(quote.table[[i]])) } - return(tbl) + +- result.num <- xmlSize(quote.table) + Sys.sleep(1) } + financial.data <- financial.data[order(financial.data$date),] +@@ -120,5 +110,3 @@ + return(startOfNextMonth-1) + } + +- +- From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 5 22:47:39 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BF1931FF; Thu, 5 Mar 2015 22:47:39 +0000 (UTC) Received: from svn.freebsd.org (svn.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 A94563E2; Thu, 5 Mar 2015 22:47:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25MldUN026131; Thu, 5 Mar 2015 22:47:39 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25MldM8026129; Thu, 5 Mar 2015 22:47:39 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201503052247.t25MldM8026129@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 5 Mar 2015 22:47:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380564 - branches/2015Q1/comms/librs232 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.18-1 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, 05 Mar 2015 22:47:39 -0000 Author: antoine Date: Thu Mar 5 22:47:38 2015 New Revision: 380564 URL: https://svnweb.freebsd.org/changeset/ports/380564 QAT: https://qat.redports.org/buildarchive/r380564/ Log: MFH: r376709 Update to 20150110. Modified: branches/2015Q1/comms/librs232/Makefile branches/2015Q1/comms/librs232/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/comms/librs232/Makefile ============================================================================== --- branches/2015Q1/comms/librs232/Makefile Thu Mar 5 22:45:16 2015 (r380563) +++ branches/2015Q1/comms/librs232/Makefile Thu Mar 5 22:47:38 2015 (r380564) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= librs232 -PORTVERSION= 20141206 +PORTVERSION= 20150110 CATEGORIES= comms DISTNAME= RS-232 MASTER_SITES= http://www.teuniz.net/RS-232/ Modified: branches/2015Q1/comms/librs232/distinfo ============================================================================== --- branches/2015Q1/comms/librs232/distinfo Thu Mar 5 22:45:16 2015 (r380563) +++ branches/2015Q1/comms/librs232/distinfo Thu Mar 5 22:47:38 2015 (r380564) @@ -1,2 +1,2 @@ -SHA256 (RS-232.tar.gz) = d515fb842dc3a67816aa238b2e45d2ede675be254f04c512f51077980f7b4b6a -SIZE (RS-232.tar.gz) = 12088 +SHA256 (RS-232.tar.gz) = 9fbf74cab1d19d0c2fe6506959dac6dcce406b7972ed3f1d90ed35f4595407cd +SIZE (RS-232.tar.gz) = 12109 From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 5 22:56:34 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59F0A4F0; Thu, 5 Mar 2015 22:56:34 +0000 (UTC) Received: from svn.freebsd.org (svn.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 3B51E6B8; Thu, 5 Mar 2015 22:56:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25MuY1E033902; Thu, 5 Mar 2015 22:56:34 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25MuXLa033900; Thu, 5 Mar 2015 22:56:33 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <201503052256.t25MuXLa033900@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio Date: Thu, 5 Mar 2015 22:56:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380566 - in branches/2015Q1/archivers/unace: . 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.18-1 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, 05 Mar 2015 22:56:34 -0000 Author: rodrigo Date: Thu Mar 5 22:56:33 2015 New Revision: 380566 URL: https://svnweb.freebsd.org/changeset/ports/380566 QAT: https://qat.redports.org/buildarchive/r380566/ Log: MFH: r380498 Add a patch to fix buffer overrun (CVE-2015-2063) Bump port revision Take the port maintenership PR: 198314 Submitted by: rodrigo Obtained from: debian Security: CVE-2015-2063 Approved by: ports-secteam Added: branches/2015Q1/archivers/unace/files/patch-CVE-2015-2063 - copied unchanged from r380498, head/archivers/unace/files/patch-CVE-2015-2063 Modified: branches/2015Q1/archivers/unace/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/archivers/unace/Makefile ============================================================================== --- branches/2015Q1/archivers/unace/Makefile Thu Mar 5 22:52:30 2015 (r380565) +++ branches/2015Q1/archivers/unace/Makefile Thu Mar 5 22:56:33 2015 (r380566) @@ -3,12 +3,12 @@ PORTNAME= unace PORTVERSION= 1.2b -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= utils/compress -MAINTAINER= ports@FreeBSD.org +MAINTAINER= rodrigo@FreeBSD.org COMMENT= Extract, view & test ACE archives MAKE_JOBS_UNSAFE= yes Copied: branches/2015Q1/archivers/unace/files/patch-CVE-2015-2063 (from r380498, head/archivers/unace/files/patch-CVE-2015-2063) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/archivers/unace/files/patch-CVE-2015-2063 Thu Mar 5 22:56:33 2015 (r380566, copy of r380498, head/archivers/unace/files/patch-CVE-2015-2063) @@ -0,0 +1,88 @@ +Description: Fixes a buffer overflow when reading bogus file headers + The header parser was not checking if it had read enough data when trying + to parse the header from memory, causing it to accept files with headers + smaller than expected. + . + Fixes CVE-2015-2063. +Author: Guillem Jover +Origin: vendor +Bug-Debian: https://bugs.debian.org/775003 +Forwarded: no +Last-Update: 2015-02-24 + +--- + unace.c | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +--- unace.c ++++ unace.c +@@ -113,6 +113,7 @@ INT read_header(INT print_err) + { + USHORT rd, + head_size, ++ need_size, + crc_ok; + LONG crc; + UCHAR *tp=readbuf; +@@ -128,6 +129,9 @@ INT read_header(INT print_err) + #endif + // read size_headrdb bytes into + head_size = head.HEAD_SIZE; // header structure ++ need_size = 3; ++ if (need_size > head.HEAD_SIZE) ++ return 0; + rd = (head_size > size_headrdb) ? size_headrdb : head_size; + if (read(archan, readbuf, rd) < rd) + return 0; +@@ -147,7 +151,12 @@ INT read_header(INT print_err) + head.HEAD_FLAGS=BUFP2WORD(tp); + + if (head.HEAD_FLAGS & ACE_ADDSIZE) ++ { ++ need_size += 4; ++ if (need_size > head.HEAD_SIZE) ++ return 0; + skipsize = head.ADDSIZE = BUF2LONG(tp); // get ADDSIZE ++ } + else + skipsize = 0; + +@@ -158,6 +167,9 @@ INT read_header(INT print_err) + switch (head.HEAD_TYPE) // specific buffer to head conversion + { + case MAIN_BLK: ++ need_size += 24; ++ if (need_size > head.HEAD_SIZE) ++ return 0; + memcpy(mhead.ACESIGN, tp, acesign_len); tp+=acesign_len; + mhead.VER_MOD=*tp++; + mhead.VER_CR =*tp++; +@@ -168,9 +180,15 @@ INT read_header(INT print_err) + mhead.RES2 =BUFP2WORD(tp); + mhead.RES =BUFP2LONG(tp); + mhead.AV_SIZE=*tp++; +- memcpy(mhead.AV, tp, rd-(USHORT)(tp-readbuf)); ++ if (mhead.AV_SIZE > sizeof(mhead.AV) || ++ mhead.AV_SIZE + need_size > head.HEAD_SIZE) ++ return 0; ++ memcpy(mhead.AV, tp, mhead.AV_SIZE); + break; + case FILE_BLK: ++ need_size += 28; ++ if (need_size > head.HEAD_SIZE) ++ return 0; + fhead.PSIZE =BUFP2LONG(tp); + fhead.SIZE =BUFP2LONG(tp); + fhead.FTIME =BUFP2LONG(tp); +@@ -181,7 +199,10 @@ INT read_header(INT print_err) + fhead.TECH.PARM =BUFP2WORD(tp); + fhead.RESERVED =BUFP2WORD(tp); + fhead.FNAME_SIZE=BUFP2WORD(tp); +- memcpy(fhead.FNAME, tp, rd-(USHORT)(tp-readbuf)); ++ if (fhead.FNAME_SIZE > sizeof(fhead.FNAME) || ++ fhead.FNAME_SIZE + need_size > head.HEAD_SIZE) ++ return 0; ++ memcpy(fhead.FNAME, tp, fhead.FNAME_SIZE); + break; + // default: (REC_BLK and future things): + // do nothing 'cause isn't needed for extraction From owner-svn-ports-branches@FreeBSD.ORG Thu Mar 5 23:47:46 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 01228BF3; Thu, 5 Mar 2015 23:47:45 +0000 (UTC) Received: from svn.freebsd.org (svn.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 DE266BCB; Thu, 5 Mar 2015 23:47:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t25Nlj0a057848; Thu, 5 Mar 2015 23:47:45 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t25NlihF057844; Thu, 5 Mar 2015 23:47:44 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201503052347.t25NlihF057844@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Thu, 5 Mar 2015 23:47:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380569 - in branches/2015Q1/security/putty: . 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.18-1 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, 05 Mar 2015 23:47:46 -0000 Author: mandree Date: Thu Mar 5 23:47:43 2015 New Revision: 380569 URL: https://svnweb.freebsd.org/changeset/ports/380569 QAT: https://qat.redports.org/buildarchive/r380569/ Log: MFH: r380554 Upgrade to upstream bugfix release 0.64. This fixes a security bug, various other bugs, and supports SSH connection sharing between multiple instances of PuTTY and its tools. Security: 92fc2e2b-c383-11e4-8ef7-080027ef73ec Security: CVE-2015-2157 Approved by: portmgr (erwin) Added: branches/2015Q1/security/putty/files/LICENSE - copied unchanged from r380554, head/security/putty/files/LICENSE Modified: branches/2015Q1/security/putty/Makefile branches/2015Q1/security/putty/distinfo branches/2015Q1/security/putty/files/patch-Makefile.gtk Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/security/putty/Makefile ============================================================================== --- branches/2015Q1/security/putty/Makefile Thu Mar 5 23:31:11 2015 (r380568) +++ branches/2015Q1/security/putty/Makefile Thu Mar 5 23:47:43 2015 (r380569) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= putty -PORTVERSION= 0.63 +PORTVERSION= 0.64 CATEGORIES= security ipv6 MASTER_SITES= http://the.earth.li/~sgtatham/putty/%SUBDIR%/ \ ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/ @@ -12,6 +12,9 @@ MASTER_SITE_SUBDIR= ${PORTVERSION} MAINTAINER= mandree@FreeBSD.org COMMENT= Secure shell and telnet client +LICENSE= MIT +LICENSE_FILE= ${FILESDIR}/LICENSE + USES= gmake pkgconfig WRKSRC= ${WRKDIR}/${DISTNAME}/unix MAKEFILE= Makefile.gtk Modified: branches/2015Q1/security/putty/distinfo ============================================================================== --- branches/2015Q1/security/putty/distinfo Thu Mar 5 23:31:11 2015 (r380568) +++ branches/2015Q1/security/putty/distinfo Thu Mar 5 23:47:43 2015 (r380569) @@ -1,2 +1,2 @@ -SHA256 (putty-0.63.tar.gz) = 81e8eaaf31be7d9a46b4f3fb80d1d9540776f142cd89d0a11f2f8082dc68f8b5 -SIZE (putty-0.63.tar.gz) = 1887913 +SHA256 (putty-0.64.tar.gz) = 2a46c97a184144e3ec2392aca9acc64d062317a3a38b9a5f623a147eda5f3821 +SIZE (putty-0.64.tar.gz) = 1977448 Copied: branches/2015Q1/security/putty/files/LICENSE (from r380554, head/security/putty/files/LICENSE) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/security/putty/files/LICENSE Thu Mar 5 23:47:43 2015 (r380569, copy of r380554, head/security/putty/files/LICENSE) @@ -0,0 +1,9 @@ +PuTTY is copyright 1997-2015 Simon Tatham. + +Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus Kuhn, Colin Watson, Christopher Staite, and CORE SDI S.A. + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SIMON TATHAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Modified: branches/2015Q1/security/putty/files/patch-Makefile.gtk ============================================================================== --- branches/2015Q1/security/putty/files/patch-Makefile.gtk Thu Mar 5 23:31:11 2015 (r380568) +++ branches/2015Q1/security/putty/files/patch-Makefile.gtk Thu Mar 5 23:47:43 2015 (r380569) @@ -1,6 +1,6 @@ ---- ./Makefile.gtk.orig 2011-07-12 20:29:31.000000000 +0200 -+++ ./Makefile.gtk 2011-07-17 14:56:18.000000000 +0200 -@@ -119,7 +119,7 @@ +--- Makefile.gtk.orig 2015-02-28 15:33:27 UTC ++++ Makefile.gtk +@@ -110,7 +110,7 @@ GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 unexport CFLAGS # work around a weird issue with krb5-config @@ -9,7 +9,7 @@ -I../macosx/ $(shell $(GTK_CONFIG) --cflags) -D _FILE_OFFSET_BITS=64 XLDFLAGS = $(LDFLAGS) $(shell $(GTK_CONFIG) --libs) ULDFLAGS = $(LDFLAGS) -@@ -146,7 +146,11 @@ +@@ -137,7 +137,11 @@ man1dir=$(mandir)/man1 .SUFFIXES: @@ -19,18 +19,9 @@ +all: plink pscp psftp puttygen +endif - plink: be_all_s.o cmdline.o cproxy.o ldisc.o logging.o misc.o pgssapi.o \ - pinger.o portfwd.o proxy.o raw.o rlogin.o settings.o ssh.o \ -@@ -851,7 +855,7 @@ - $(CC) $(COMPAT) $(CFLAGS) $(XFLAGS) -c ../unix/xpmputty.c - - version.o: FORCE -- if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \ -+ if test -z "$(VER)" ; then \ - $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \ - else \ - $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \ -@@ -861,6 +865,8 @@ + plink: be_all_s.o callback.o cmdline.o conf.o cproxy.o ldisc.o logging.o \ + misc.o noterm.o pgssapi.o pinger.o portfwd.o proxy.o raw.o \ +@@ -920,6 +924,8 @@ install: $(INSTALL_PROGRAM) -m 755 plink $(DESTDIR)$(bindir)/plink $(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp $(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp @@ -39,7 +30,7 @@ $(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm if test -n "$(UTMP_GROUP)"; then \ chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \ -@@ -870,15 +876,17 @@ +@@ -929,15 +935,17 @@ install: chmod 4755 $(DESTDIR)$(bindir)/pterm; \ fi $(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty From owner-svn-ports-branches@FreeBSD.ORG Fri Mar 6 12:26:40 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7ABAEDFC; Fri, 6 Mar 2015 12:26:40 +0000 (UTC) Received: from svn.freebsd.org (svn.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 65B0D127; Fri, 6 Mar 2015 12:26:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t26CQepm014502; Fri, 6 Mar 2015 12:26:40 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t26CQek2014501; Fri, 6 Mar 2015 12:26:40 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503061226.t26CQek2014501@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 6 Mar 2015 12:26:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380595 - branches/2015Q1/japanese/yasou-fpw 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.18-1 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, 06 Mar 2015 12:26:40 -0000 Author: amdmi3 Date: Fri Mar 6 12:26:39 2015 New Revision: 380595 URL: https://svnweb.freebsd.org/changeset/ports/380595 QAT: https://qat.redports.org/buildarchive/r380595/ Log: MFH: r380473 - Add some mirrors Approved by: ports-secteam (delphij) Modified: branches/2015Q1/japanese/yasou-fpw/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/japanese/yasou-fpw/Makefile ============================================================================== --- branches/2015Q1/japanese/yasou-fpw/Makefile Fri Mar 6 12:24:41 2015 (r380594) +++ branches/2015Q1/japanese/yasou-fpw/Makefile Fri Mar 6 12:26:39 2015 (r380595) @@ -4,7 +4,9 @@ PORTNAME= yasou-fpw PORTVERSION= 1.0.b0 CATEGORIES= japanese -MASTER_SITES= http://openlab.jp/edict/fpw/dist/yasou/ +MASTER_SITES= http://openlab.jp/edict/fpw/dist/yasou/ \ + ftp://ftp.rediris.es/sites/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ \ + ftp://relay1.tomsk.gov.ru/pub/FreeBSD/ports/distfiles/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.b0/beta0/} MAINTAINER= ports@FreeBSD.org From owner-svn-ports-branches@FreeBSD.ORG Fri Mar 6 22:03:14 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CDD73B36; Fri, 6 Mar 2015 22:03:14 +0000 (UTC) Received: from svn.freebsd.org (svn.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 B85A3A2C; Fri, 6 Mar 2015 22:03:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t26M3EQA008025; Fri, 6 Mar 2015 22:03:14 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t26M3E2h008024; Fri, 6 Mar 2015 22:03:14 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201503062203.t26M3E2h008024@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Fri, 6 Mar 2015 22:03:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380628 - branches/2015Q1/x11-toolkits/qt5-gui/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.18-1 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, 06 Mar 2015 22:03:14 -0000 Author: rakuco Date: Fri Mar 6 22:03:14 2015 New Revision: 380628 URL: https://svnweb.freebsd.org/changeset/ports/380628 QAT: https://qat.redports.org/buildarchive/r380628/ Log: MFH: r379187 Fix QSystemTray Add a patch found by PCBSD's Kris Moore that fixes QSystemTrayIcons on Desktops other than KDE. Provided by Kris via mailing list on 2015-01-29. Approved by: rakuco (mentor) Approved by: portmgr (erwin) Added: branches/2015Q1/x11-toolkits/qt5-gui/files/ - copied from r379187, head/x11-toolkits/qt5-gui/files/ Modified: Directory Properties: branches/2015Q1/ (props changed) From owner-svn-ports-branches@FreeBSD.ORG Fri Mar 6 22:05:32 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 398F5C3F; Fri, 6 Mar 2015 22:05:32 +0000 (UTC) Received: from svn.freebsd.org (svn.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 238A7A46; Fri, 6 Mar 2015 22:05:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t26M5WF4008516; Fri, 6 Mar 2015 22:05:32 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t26M5VvJ008513; Fri, 6 Mar 2015 22:05:31 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201503062205.t26M5VvJ008513@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Fri, 6 Mar 2015 22:05:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380629 - in branches/2015Q1/x11-toolkits: qt4-gui qt4-gui/files qt5-gui qt5-gui/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.18-1 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, 06 Mar 2015 22:05:32 -0000 Author: rakuco Date: Fri Mar 6 22:05:30 2015 New Revision: 380629 URL: https://svnweb.freebsd.org/changeset/ports/380629 QAT: https://qat.redports.org/buildarchive/r380629/ Log: MFH: r380452 Add patch for CVE-2015-0295, DoS vulnerability in the BMP image handler. Security: c9c3374d-c2c1-11e4-b236-5453ed2e2b49 Approved by: ports-secteam (delphij) Added: branches/2015Q1/x11-toolkits/qt4-gui/files/ - copied from r380452, head/x11-toolkits/qt4-gui/files/ branches/2015Q1/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295 - copied unchanged from r380452, head/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295 Modified: branches/2015Q1/x11-toolkits/qt4-gui/Makefile branches/2015Q1/x11-toolkits/qt5-gui/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/x11-toolkits/qt4-gui/Makefile ============================================================================== --- branches/2015Q1/x11-toolkits/qt4-gui/Makefile Fri Mar 6 22:03:14 2015 (r380628) +++ branches/2015Q1/x11-toolkits/qt4-gui/Makefile Fri Mar 6 22:05:30 2015 (r380629) @@ -3,7 +3,7 @@ PORTNAME= gui DISTVERSION= ${QT4_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- Modified: branches/2015Q1/x11-toolkits/qt5-gui/Makefile ============================================================================== --- branches/2015Q1/x11-toolkits/qt5-gui/Makefile Fri Mar 6 22:03:14 2015 (r380628) +++ branches/2015Q1/x11-toolkits/qt5-gui/Makefile Fri Mar 6 22:05:30 2015 (r380629) @@ -2,7 +2,7 @@ PORTNAME= gui DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- Copied: branches/2015Q1/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295 (from r380452, head/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295 Fri Mar 6 22:05:30 2015 (r380629, copy of r380452, head/x11-toolkits/qt5-gui/files/patch-CVE-2015-0295) @@ -0,0 +1,37 @@ +commit 661f6bfd032dacc62841037732816a583640e187 +Author: Richard J. Moore +Date: Sat Feb 21 17:43:21 2015 +0000 + + Fix a division by zero when processing malformed BMP files. + + This fixes a division by 0 when processing a maliciously crafted BMP + file. No impact beyond DoS. + + Task-number: QTBUG-44547 + Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973 + Reviewed-by: Thiago Macieira + Reviewed-by: Oswald Buddenhagen + +--- src/gui/image/qbmphandler.cpp ++++ src/gui/image/qbmphandler.cpp +@@ -314,12 +314,20 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int + } + } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) { + red_shift = calc_shift(red_mask); ++ if (((red_mask >> red_shift) + 1) == 0) ++ return false; + red_scale = 256 / ((red_mask >> red_shift) + 1); + green_shift = calc_shift(green_mask); ++ if (((green_mask >> green_shift) + 1) == 0) ++ return false; + green_scale = 256 / ((green_mask >> green_shift) + 1); + blue_shift = calc_shift(blue_mask); ++ if (((blue_mask >> blue_shift) + 1) == 0) ++ return false; + blue_scale = 256 / ((blue_mask >> blue_shift) + 1); + alpha_shift = calc_shift(alpha_mask); ++ if (((alpha_mask >> alpha_shift) + 1) == 0) ++ return false; + alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1); + } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) { + blue_mask = 0x000000ff; From owner-svn-ports-branches@FreeBSD.ORG Fri Mar 6 23:05:19 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B747A6AB; Fri, 6 Mar 2015 23:05:19 +0000 (UTC) Received: from svn.freebsd.org (svn.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 A1C0715E; Fri, 6 Mar 2015 23:05:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t26N5JOC040866; Fri, 6 Mar 2015 23:05:19 GMT (envelope-from jgh@FreeBSD.org) Received: (from jgh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t26N5JH2040865; Fri, 6 Mar 2015 23:05:19 GMT (envelope-from jgh@FreeBSD.org) Message-Id: <201503062305.t26N5JH2040865@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jgh set sender to jgh@FreeBSD.org using -f From: Jason Helfman Date: Fri, 6 Mar 2015 23:05:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380655 - branches/2015Q1/x11/xlockmore 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.18-1 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, 06 Mar 2015 23:05:19 -0000 Author: jgh Date: Fri Mar 6 23:05:18 2015 New Revision: 380655 URL: https://svnweb.freebsd.org/changeset/ports/380655 QAT: https://qat.redports.org/buildarchive/r380655/ Log: Approved by: ports-secteam (zi) MFH: r380475 - fix fetch, upstream is shifting to static parent to better track Modified: branches/2015Q1/x11/xlockmore/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/x11/xlockmore/Makefile ============================================================================== --- branches/2015Q1/x11/xlockmore/Makefile Fri Mar 6 22:43:28 2015 (r380654) +++ branches/2015Q1/x11/xlockmore/Makefile Fri Mar 6 23:05:18 2015 (r380655) @@ -5,7 +5,7 @@ PORTNAME= xlockmore PORTVERSION= 5.43 PORTREVISION= 3 CATEGORIES?= x11 -MASTER_SITES= http://www.tux.org/~bagleyd/xlock/${PORTNAME}-${PORTVERSION}/ \ +MASTER_SITES= http://www.tux.org/~bagleyd/xlock/xlockmore-old/${PORTNAME}-${PORTVERSION}/ \ ftp://ibiblio.org/pub/Linux/X11/screensavers/ \ CRITICAL From owner-svn-ports-branches@FreeBSD.ORG Sat Mar 7 17:03:29 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5594854F; Sat, 7 Mar 2015 17:03:29 +0000 (UTC) Received: from svn.freebsd.org (svn.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 3FA929B4; Sat, 7 Mar 2015 17:03:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t27H3T5M049284; Sat, 7 Mar 2015 17:03:29 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t27H3SVM049280; Sat, 7 Mar 2015 17:03:28 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201503071703.t27H3SVM049280@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Sat, 7 Mar 2015 17:03:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380708 - in branches/2015Q1/www: linux-c6-flashplugin11 linux-f10-flashplugin11 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.18-1 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, 07 Mar 2015 17:03:29 -0000 Author: xmj Date: Sat Mar 7 17:03:27 2015 New Revision: 380708 URL: https://svnweb.freebsd.org/changeset/ports/380708 QAT: https://qat.redports.org/buildarchive/r380708/ Log: MFH: r378579 www/linux-*-flashplugin11: update to 11.2r202.442 - Update to 11.2r202.442 - Fix 0day reported in CVE-2015-0313 Differential Revision: https://reviews.freebsd.org/D1783 Approved by: koobs (mentor) Approved by: ports-secteam (erwin) Security: 734bcd49-aae6-11e4-a0c1-c485083ca99c Modified: branches/2015Q1/www/linux-c6-flashplugin11/Makefile branches/2015Q1/www/linux-c6-flashplugin11/distinfo branches/2015Q1/www/linux-f10-flashplugin11/Makefile branches/2015Q1/www/linux-f10-flashplugin11/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/linux-c6-flashplugin11/Makefile ============================================================================== --- branches/2015Q1/www/linux-c6-flashplugin11/Makefile Sat Mar 7 16:44:05 2015 (r380707) +++ branches/2015Q1/www/linux-c6-flashplugin11/Makefile Sat Mar 7 17:03:27 2015 (r380708) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplugin -PORTVERSION= 11.2r202.440 +PORTVERSION= 11.2r202.442 CATEGORIES= www multimedia linux MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \ LOCAL/nox:suplib Modified: branches/2015Q1/www/linux-c6-flashplugin11/distinfo ============================================================================== --- branches/2015Q1/www/linux-c6-flashplugin11/distinfo Sat Mar 7 16:44:05 2015 (r380707) +++ branches/2015Q1/www/linux-c6-flashplugin11/distinfo Sat Mar 7 17:03:27 2015 (r380708) @@ -1,4 +1,4 @@ -SHA256 (flashplugin/11.2r202.440/install_flash_player_11_linux.i386.tar.gz) = c4317e9c224ffe5f056605ada015739fd51a962ed4589ef7d92c9839c3d3c8e2 -SIZE (flashplugin/11.2r202.440/install_flash_player_11_linux.i386.tar.gz) = 6927249 -SHA256 (flashplugin/11.2r202.440/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.440/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +SHA256 (flashplugin/11.2r202.442/install_flash_player_11_linux.i386.tar.gz) = b5cdb9cc826c40ffa3d4917662d4f05ec72478c2c50aeef4a514902b1146e200 +SIZE (flashplugin/11.2r202.442/install_flash_player_11_linux.i386.tar.gz) = 6928808 +SHA256 (flashplugin/11.2r202.442/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.442/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 Modified: branches/2015Q1/www/linux-f10-flashplugin11/Makefile ============================================================================== --- branches/2015Q1/www/linux-f10-flashplugin11/Makefile Sat Mar 7 16:44:05 2015 (r380707) +++ branches/2015Q1/www/linux-f10-flashplugin11/Makefile Sat Mar 7 17:03:27 2015 (r380708) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplugin -PORTVERSION= 11.2r202.440 +PORTVERSION= 11.2r202.442 CATEGORIES= www multimedia linux MASTER_SITES= http://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION:S/r/./}/:plugin \ LOCAL/nox:suplib Modified: branches/2015Q1/www/linux-f10-flashplugin11/distinfo ============================================================================== --- branches/2015Q1/www/linux-f10-flashplugin11/distinfo Sat Mar 7 16:44:05 2015 (r380707) +++ branches/2015Q1/www/linux-f10-flashplugin11/distinfo Sat Mar 7 17:03:27 2015 (r380708) @@ -1,4 +1,4 @@ -SHA256 (flashplugin/11.2r202.440/install_flash_player_11_linux.i386.tar.gz) = c4317e9c224ffe5f056605ada015739fd51a962ed4589ef7d92c9839c3d3c8e2 -SIZE (flashplugin/11.2r202.440/install_flash_player_11_linux.i386.tar.gz) = 6927249 -SHA256 (flashplugin/11.2r202.440/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf -SIZE (flashplugin/11.2r202.440/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455 +SHA256 (flashplugin/11.2r202.442/install_flash_player_11_linux.i386.tar.gz) = b5cdb9cc826c40ffa3d4917662d4f05ec72478c2c50aeef4a514902b1146e200 +SIZE (flashplugin/11.2r202.442/install_flash_player_11_linux.i386.tar.gz) = 6928808 +SHA256 (flashplugin/11.2r202.442/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 4a309b1a326bd2212cc72480628659e5a7fd61d9e0572cb7350c206f030955bf +SIZE (flashplugin/11.2r202.442/linux-f10-flashsupport-9.0.1.i386.tar.gz) = 3455