From owner-svn-ports-branches@FreeBSD.ORG Sun Feb 1 15:48:58 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 43D4A874; Sun, 1 Feb 2015 15:48:58 +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 2F48C29F; Sun, 1 Feb 2015 15:48:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11Fmwfi048671; Sun, 1 Feb 2015 15:48:58 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11FmwDS048670; Sun, 1 Feb 2015 15:48:58 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201502011548.t11FmwDS048670@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 1 Feb 2015 15:48:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378249 - in branches/2015Q1/sysutils/lsof: . 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: Sun, 01 Feb 2015 15:48:58 -0000 Author: riggs Date: Sun Feb 1 15:48:57 2015 New Revision: 378249 URL: https://svnweb.freebsd.org/changeset/ports/378249 QAT: https://qat.redports.org/buildarchive/r378249/ Log: MFH: r378245 Fix build on systems without /etc/make.conf PR: 197241 Submitted by: riggs Approved by: ports-secteam (zi), ler@lerctr.org (maintainer) Added: branches/2015Q1/sysutils/lsof/files/ - copied from r378245, head/sysutils/lsof/files/ Modified: branches/2015Q1/sysutils/lsof/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/sysutils/lsof/Makefile ============================================================================== --- branches/2015Q1/sysutils/lsof/Makefile Sun Feb 1 15:46:04 2015 (r378248) +++ branches/2015Q1/sysutils/lsof/Makefile Sun Feb 1 15:48:57 2015 (r378249) @@ -41,8 +41,8 @@ SHEBANG_FILES= scripts/sort_res.perl5 .include -.if ${ARCH} == "arm" -BROKEN= Does not compile on arm +.if !empty(ARCH:Marm*) && ((${OSVERSION} < 1001505) || (${OSVERSION} > 1100000 && ${OSVERSION} < 1100052)) +BROKEN= Not supported on ARM platform below release 10.1 or a more recent current .endif CONFIGURE_SCRIPT= Configure From owner-svn-ports-branches@FreeBSD.ORG Sun Feb 1 17:58:01 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 6B114950; Sun, 1 Feb 2015 17:58:01 +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 54DF5F80; Sun, 1 Feb 2015 17:58:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t11Hw14h010512; Sun, 1 Feb 2015 17:58:01 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t11Hvwo8010487; Sun, 1 Feb 2015 17:57:58 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201502011757.t11Hvwo8010487@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 Feb 2015 17:57:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378256 - in branches/2015Q1: security/vuxml www/py-django www/py-django-devel www/py-django14 www/py-django15 www/py-django16 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 Feb 2015 17:58:01 -0000 Author: lwhsu Date: Sun Feb 1 17:57:57 2015 New Revision: 378256 URL: https://svnweb.freebsd.org/changeset/ports/378256 QAT: https://qat.redports.org/buildarchive/r378256/ Log: MFH: r377750 Document Django 2014-01-13 vulnerabilty MFH: r377751 - Update to 1.7.3 Security: 9c7b6c20-a324-11e4-879c-00e0814cab4e MFH: r377752 - Update to 1.6.10 Security: 9c7b6c20-a324-11e4-879c-00e0814cab4e MFH: r377753 - Update to 1.4.18 Security: 9c7b6c20-a324-11e4-879c-00e0814cab4e MFH: r377754 - Update to 20150124 snapshot Security: 9c7b6c20-a324-11e4-879c-00e0814cab4e MFH: r377755 - Mark DEPRECATED since it is not supported by upstream MFH: r377804 - Fix description of 9c7b6c20-a324-11e4-879c-00e0814cab4e Approved by: ports-secteam (delphij) Modified: branches/2015Q1/security/vuxml/vuln.xml branches/2015Q1/www/py-django-devel/Makefile branches/2015Q1/www/py-django-devel/distinfo branches/2015Q1/www/py-django/Makefile branches/2015Q1/www/py-django/distinfo branches/2015Q1/www/py-django14/Makefile branches/2015Q1/www/py-django14/distinfo branches/2015Q1/www/py-django15/Makefile branches/2015Q1/www/py-django16/Makefile branches/2015Q1/www/py-django16/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/security/vuxml/vuln.xml ============================================================================== --- branches/2015Q1/security/vuxml/vuln.xml Sun Feb 1 17:49:26 2015 (r378255) +++ branches/2015Q1/security/vuxml/vuln.xml Sun Feb 1 17:57:57 2015 (r378256) @@ -57,6 +57,81 @@ Notes: --> + + django -- multiple vulnerabilities + + + py27-django + 1.41.4.18 + 1.51.5.12 + 1.61.6.10 + 1.71.7.3 + + + py32-django + 1.41.4.18 + 1.51.5.12 + 1.61.6.10 + 1.71.7.3 + + + py33-django + 1.41.4.18 + 1.51.5.12 + 1.61.6.10 + 1.71.7.3 + + + py34-django + 1.41.4.18 + 1.51.5.12 + 1.61.6.10 + 1.71.7.3 + + + py27-django-devel + 20150124,1 + + + py32-django-devel + 20150124,1 + + + py33-django-devel + 20150124,1 + + + py34-django-devel + 20150124,1 + + + + +

The Django project reports:

+
+

Today the Django team is issuing multiple releases -- + Django 1.4.18, Django 1.6.10, and Django 1.7.3 -- as part of our + security process. These releases are now available on PyPI and our + download page.

+

These releases address several security issues. We encourage all + users of Django to upgrade as soon as possible.

+
+ + + + https://www.djangoproject.com/weblog/2015/jan/13/security/ + CVE-2015-0219 + CVE-2015-0220 + CVE-2015-0221 + CVE-2015-0222 + + + 2015-01-13 + 2015-01-23 + 2015-01-24 + + + mutt -- denial of service via crafted mail message Modified: branches/2015Q1/www/py-django-devel/Makefile ============================================================================== --- branches/2015Q1/www/py-django-devel/Makefile Sun Feb 1 17:49:26 2015 (r378255) +++ branches/2015Q1/www/py-django-devel/Makefile Sun Feb 1 17:57:57 2015 (r378256) @@ -14,14 +14,14 @@ COMMENT= High-level Python Web framework LICENSE= BSD3CLAUSE -SNAPSHOTDATE= 20140821 +SNAPSHOTDATE= 20150124 USES= cpe gettext python USE_GITHUB= yes USE_PYTHON= autoplist distutils GH_ACCOUNT= ${PORTNAME} -GH_TAGNAME= ad96254 +GH_TAGNAME= f8e4e4a GH_COMMIT= ${GH_TAGNAME} CONFLICTS= py2[0-9]-django-[0-9]* Modified: branches/2015Q1/www/py-django-devel/distinfo ============================================================================== --- branches/2015Q1/www/py-django-devel/distinfo Sun Feb 1 17:49:26 2015 (r378255) +++ branches/2015Q1/www/py-django-devel/distinfo Sun Feb 1 17:57:57 2015 (r378256) @@ -1,2 +1,2 @@ -SHA256 (python/Django-20140821.tar.gz) = c93f6e71e46480f8fe63b015717f784d3f06bbfa7149f4677b67c608efec00ad -SIZE (python/Django-20140821.tar.gz) = 7536234 +SHA256 (python/Django-20150124.tar.gz) = 439d887de4dcceacd88e12779388270a1f654a650db4cc85ddfd1e130b2d0fb4 +SIZE (python/Django-20150124.tar.gz) = 7438215 Modified: branches/2015Q1/www/py-django/Makefile ============================================================================== --- branches/2015Q1/www/py-django/Makefile Sun Feb 1 17:49:26 2015 (r378255) +++ branches/2015Q1/www/py-django/Makefile Sun Feb 1 17:57:57 2015 (r378256) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.7 +PORTVERSION= 1.7.3 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION}/ \ CHEESESHOP Modified: branches/2015Q1/www/py-django/distinfo ============================================================================== --- branches/2015Q1/www/py-django/distinfo Sun Feb 1 17:49:26 2015 (r378255) +++ branches/2015Q1/www/py-django/distinfo Sun Feb 1 17:57:57 2015 (r378256) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.7.tar.gz) = 33f781f17f145f79ee8e0b8d753498e0e0188f0b53b2accad4045d623422d5e1 -SIZE (python/Django-1.7.tar.gz) = 7486550 +SHA256 (python/Django-1.7.3.tar.gz) = f226fb8aa438456968d403f6739de1cf2dad128db86f66ee2b41dfebe3645c5b +SIZE (python/Django-1.7.3.tar.gz) = 7589559 Modified: branches/2015Q1/www/py-django14/Makefile ============================================================================== --- branches/2015Q1/www/py-django14/Makefile Sun Feb 1 17:49:26 2015 (r378255) +++ branches/2015Q1/www/py-django14/Makefile Sun Feb 1 17:57:57 2015 (r378256) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.4.15 +PORTVERSION= 1.4.18 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION:R}/ \ CHEESESHOP Modified: branches/2015Q1/www/py-django14/distinfo ============================================================================== --- branches/2015Q1/www/py-django14/distinfo Sun Feb 1 17:49:26 2015 (r378255) +++ branches/2015Q1/www/py-django14/distinfo Sun Feb 1 17:57:57 2015 (r378256) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.4.15.tar.gz) = aa57ceb345091c25648b41c98a6f46fffd7884695fa884c7039291177ded14e9 -SIZE (python/Django-1.4.15.tar.gz) = 7754429 +SHA256 (python/Django-1.4.18.tar.gz) = bfd326fe490d03a2a86466fcb1ac335e7d8d58bc498cfe2311b1d751b515521f +SIZE (python/Django-1.4.18.tar.gz) = 7876896 Modified: branches/2015Q1/www/py-django15/Makefile ============================================================================== --- branches/2015Q1/www/py-django15/Makefile Sun Feb 1 17:49:26 2015 (r378255) +++ branches/2015Q1/www/py-django15/Makefile Sun Feb 1 17:57:57 2015 (r378256) @@ -14,6 +14,9 @@ DIST_SUBDIR= python MAINTAINER= lwhsu@FreeBSD.org COMMENT= High-level Python Web framework +DEPRECATED= not supported by upstream +EXPIRATION_DATE= 2015-02-28 + LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE Modified: branches/2015Q1/www/py-django16/Makefile ============================================================================== --- branches/2015Q1/www/py-django16/Makefile Sun Feb 1 17:49:26 2015 (r378255) +++ branches/2015Q1/www/py-django16/Makefile Sun Feb 1 17:57:57 2015 (r378256) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.6.7 +PORTVERSION= 1.6.10 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION}/ \ CHEESESHOP Modified: branches/2015Q1/www/py-django16/distinfo ============================================================================== --- branches/2015Q1/www/py-django16/distinfo Sun Feb 1 17:49:26 2015 (r378255) +++ branches/2015Q1/www/py-django16/distinfo Sun Feb 1 17:57:57 2015 (r378256) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.6.7.tar.gz) = 9a64211c96a3262bb2545acc82af5d8f3da0175299f7c7e901e4ed455be965fb -SIZE (python/Django-1.6.7.tar.gz) = 6647301 +SHA256 (python/Django-1.6.10.tar.gz) = 54eb59ce785401c7d1fdeed245efce597e90f811d6a20f6b5c6931c0049d63a6 +SIZE (python/Django-1.6.10.tar.gz) = 6760152 From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 3 10:46: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 AADB2986; Tue, 3 Feb 2015 10:46: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 8BA057C4; Tue, 3 Feb 2015 10:46: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 t13AkWuV074807; Tue, 3 Feb 2015 10:46:32 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13AkWQi074805; Tue, 3 Feb 2015 10:46:32 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201502031046.t13AkWQi074805@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Tue, 3 Feb 2015 10:46:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378345 - branches/2015Q1/devel/linux-c6-devtools 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: Tue, 03 Feb 2015 10:46:32 -0000 Author: xmj Date: Tue Feb 3 10:46:31 2015 New Revision: 378345 URL: https://svnweb.freebsd.org/changeset/ports/378345 QAT: https://qat.redports.org/buildarchive/r378345/ Log: MFH: r378327 devel/linux-c6-devtools: Fix GHOST, update glibc - Update Glibc, Fix CVE-2015-0235 (aka GHOST) - Update Linux kernel headers and source Differential Revision: https://reviews.freebsd.org/D1756 Approved by: swills (mentor) Approved by: ports-secteam (erwin) Security: 0765de84-a6c1-11e4-a0c1-c485083ca99c Modified: branches/2015Q1/devel/linux-c6-devtools/Makefile branches/2015Q1/devel/linux-c6-devtools/distinfo.i686 Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/devel/linux-c6-devtools/Makefile ============================================================================== --- branches/2015Q1/devel/linux-c6-devtools/Makefile Tue Feb 3 10:36:18 2015 (r378344) +++ branches/2015Q1/devel/linux-c6-devtools/Makefile Tue Feb 3 10:46:31 2015 (r378345) @@ -3,13 +3,14 @@ PORTNAME= devtools PORTVERSION= 6.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel +MASTER_SITES= CENTOS_LINUX CENTOS_LINUX_UPDATES DISTFILES= binutils-2.20.51.0.2-5.42.el6.i686.rpm \ binutils-devel-2.20.51.0.2-5.42.el6.i686.rpm \ - glibc-devel-2.12-1.149.el6.i686.rpm \ - glibc-headers-2.12-1.149.el6.i686.rpm \ - kernel-headers-2.6.32-504.el6.i686.rpm \ + glibc-devel-2.12-1.149.el6_6.5.i686.rpm \ + glibc-headers-2.12-1.149.el6_6.5.i686.rpm \ + kernel-headers-2.6.32-504.8.1.el6.i686.rpm \ libstdc++-devel-4.4.7-11.el6.i686.rpm \ libgomp-4.4.7-11.el6.i686.rpm \ mpfr-2.4.1-6.el6.i686.rpm \ @@ -33,8 +34,8 @@ USE_LDCONFIG= yes PLIST_SUB+= NLS="" SRC_DISTFILES= binutils-2.20.51.0.2-5.42.el6.src.rpm \ - glibc-2.12-1.149.el6.src.rpm \ - kernel-2.6.32-504.el6.src.rpm \ + glibc-2.12-1.149.el6_6.5.src.rpm \ + kernel-2.6.32-504.8.1.el6.src.rpm \ mpfr-2.4.1-6.el6.src.rpm \ gcc-4.4.7-11.el6.src.rpm Modified: branches/2015Q1/devel/linux-c6-devtools/distinfo.i686 ============================================================================== --- branches/2015Q1/devel/linux-c6-devtools/distinfo.i686 Tue Feb 3 10:36:18 2015 (r378344) +++ branches/2015Q1/devel/linux-c6-devtools/distinfo.i686 Tue Feb 3 10:46:31 2015 (r378345) @@ -2,12 +2,12 @@ SHA256 (rpm/i686/centos/6.6/binutils-2.2 SIZE (rpm/i686/centos/6.6/binutils-2.20.51.0.2-5.42.el6.i686.rpm) = 2910904 SHA256 (rpm/i686/centos/6.6/binutils-devel-2.20.51.0.2-5.42.el6.i686.rpm) = d44c78f454315ea16e0f7a3904e233c5a7d7b7d60e01380ad4701492bc729c0a SIZE (rpm/i686/centos/6.6/binutils-devel-2.20.51.0.2-5.42.el6.i686.rpm) = 745200 -SHA256 (rpm/i686/centos/6.6/glibc-devel-2.12-1.149.el6.i686.rpm) = 0d959a633daf7148a495d9f012216d7c7900deab63eb106a32ebf809d74a95fa -SIZE (rpm/i686/centos/6.6/glibc-devel-2.12-1.149.el6.i686.rpm) = 1006532 -SHA256 (rpm/i686/centos/6.6/glibc-headers-2.12-1.149.el6.i686.rpm) = 53abaca222194862b0ec504ba154fe6295d7de51ef55b9b4faeb0b54a9a82e40 -SIZE (rpm/i686/centos/6.6/glibc-headers-2.12-1.149.el6.i686.rpm) = 633832 -SHA256 (rpm/i686/centos/6.6/kernel-headers-2.6.32-504.el6.i686.rpm) = 95d0281dbdf5854e0baec91e4cbc88d359f32db28386a4a06ec512d9f0ed2906 -SIZE (rpm/i686/centos/6.6/kernel-headers-2.6.32-504.el6.i686.rpm) = 3498284 +SHA256 (rpm/i686/centos/6.6/glibc-devel-2.12-1.149.el6_6.5.i686.rpm) = d6c144e7cd4b67ecf5eafb02671c0f6f48d27f81df97c35808d2d442c7db582e +SIZE (rpm/i686/centos/6.6/glibc-devel-2.12-1.149.el6_6.5.i686.rpm) = 1007176 +SHA256 (rpm/i686/centos/6.6/glibc-headers-2.12-1.149.el6_6.5.i686.rpm) = c9484d79a9aac4a8b706aa17f5edbd51b5e5731fe0afb3e9914b3e83de1e801a +SIZE (rpm/i686/centos/6.6/glibc-headers-2.12-1.149.el6_6.5.i686.rpm) = 634456 +SHA256 (rpm/i686/centos/6.6/kernel-headers-2.6.32-504.8.1.el6.i686.rpm) = 7178d1695bb488a58dd68fe6f292bfaab89c95aaa97fc2bde172de2709cdf53c +SIZE (rpm/i686/centos/6.6/kernel-headers-2.6.32-504.8.1.el6.i686.rpm) = 3507356 SHA256 (rpm/i686/centos/6.6/libstdc++-devel-4.4.7-11.el6.i686.rpm) = bd7d8da981c7e0509801758e5b982b9c61c243283e1644911eab6e0feea555fd SIZE (rpm/i686/centos/6.6/libstdc++-devel-4.4.7-11.el6.i686.rpm) = 1666516 SHA256 (rpm/i686/centos/6.6/libgomp-4.4.7-11.el6.i686.rpm) = 50787632e8002ddaa84db1df285e8ee2f353e91a7221389548c712e8df2c33f1 @@ -24,10 +24,10 @@ SHA256 (rpm/i686/centos/6.6/gcc-gfortran SIZE (rpm/i686/centos/6.6/gcc-gfortran-4.4.7-11.el6.i686.rpm) = 4315364 SHA256 (rpm/i686/centos/6.6/binutils-2.20.51.0.2-5.42.el6.src.rpm) = c72cf98931aef94b7b321f408dbbecc8e93b511287cb9a3a40574d8bb9e03b2c SIZE (rpm/i686/centos/6.6/binutils-2.20.51.0.2-5.42.el6.src.rpm) = 16323273 -SHA256 (rpm/i686/centos/6.6/glibc-2.12-1.149.el6.src.rpm) = a80c56f07bd48485b3d6c5e68d5863cf8f5c98939016852990470613a7c59577 -SIZE (rpm/i686/centos/6.6/glibc-2.12-1.149.el6.src.rpm) = 16171993 -SHA256 (rpm/i686/centos/6.6/kernel-2.6.32-504.el6.src.rpm) = 84d5d3518814f748d0a6a9e63e8245af22fe664874a9c17520e94aad663a400c -SIZE (rpm/i686/centos/6.6/kernel-2.6.32-504.el6.src.rpm) = 99402046 +SHA256 (rpm/i686/centos/6.6/glibc-2.12-1.149.el6_6.5.src.rpm) = 35b591c1fa712aba6b334d244374e182e0f1b7c1f85268c9bbc9dde42f4d9fb3 +SIZE (rpm/i686/centos/6.6/glibc-2.12-1.149.el6_6.5.src.rpm) = 16181763 +SHA256 (rpm/i686/centos/6.6/kernel-2.6.32-504.8.1.el6.src.rpm) = 468cf0e8fe7ed619fe4595a5139acce5fc7b62b28b3a821c9d030a38a2e2843a +SIZE (rpm/i686/centos/6.6/kernel-2.6.32-504.8.1.el6.src.rpm) = 99386975 SHA256 (rpm/i686/centos/6.6/mpfr-2.4.1-6.el6.src.rpm) = 4b5fcd2cf40deb6a791f4fa4e39315e2345001e528c45ed52042e3c4ba467f6c SIZE (rpm/i686/centos/6.6/mpfr-2.4.1-6.el6.src.rpm) = 911271 SHA256 (rpm/i686/centos/6.6/gcc-4.4.7-11.el6.src.rpm) = df7730e2e7d52d5ce4c655bd4fff23c738fb6b1c5b81d6f2878e4c7664d7031b From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 3 19:53:07 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 EDE6CD07; Tue, 3 Feb 2015 19:53:07 +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 D946F610; Tue, 3 Feb 2015 19:53:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13Jr7QF040369; Tue, 3 Feb 2015 19:53:07 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13Jr7FP040368; Tue, 3 Feb 2015 19:53:07 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502031953.t13Jr7FP040368@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 19:53:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378371 - branches/2015Q1/games/golly 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: Tue, 03 Feb 2015 19:53:08 -0000 Author: amdmi3 Date: Tue Feb 3 19:53:07 2015 New Revision: 378371 URL: https://svnweb.freebsd.org/changeset/ports/378371 QAT: https://qat.redports.org/buildarchive/r378371/ Log: MFH: r377777 - Fix build on < 10.x after webkit-gtk2 update Approved by: portmgr blanket Approved by: portmgr (antoine) Modified: branches/2015Q1/games/golly/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/games/golly/Makefile ============================================================================== --- branches/2015Q1/games/golly/Makefile Tue Feb 3 19:48:16 2015 (r378370) +++ branches/2015Q1/games/golly/Makefile Tue Feb 3 19:53:07 2015 (r378371) @@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= makc@FreeBSD.org COMMENT= Conway's Game of Life and other cellular automata -USES= cmake:outsource perl5 python +USES= compiler:c++11-lib cmake:outsource perl5 python USE_WX= 3.0 WX_UNICODE= yes From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 3 20:12:57 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 F093B21B; Tue, 3 Feb 2015 20:12: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 DB9CE857; Tue, 3 Feb 2015 20:12: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 t13KCuL2050130; Tue, 3 Feb 2015 20:12:56 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13KCuCZ050129; Tue, 3 Feb 2015 20:12:56 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502032012.t13KCuCZ050129@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 3 Feb 2015 20:12:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378372 - branches/2015Q1/x11-toolkits/wxgtk30 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: Tue, 03 Feb 2015 20:12:57 -0000 Author: amdmi3 Date: Tue Feb 3 20:12:55 2015 New Revision: 378372 URL: https://svnweb.freebsd.org/changeset/ports/378372 QAT: https://qat.redports.org/buildarchive/r378372/ Log: MFH: r377776 - Fix library on < 10.x after webkit-gtk2 update Some dependent ports may need USES=compiler:c++11-lib as well PR: 196703 [1], 197031 [2] Submitted by: beastie@tardisi.com [1], amdmi3 [2] Approved by: portmaster@bsdforge.com (maintainer) Approved by: portmgr (antoine) Modified: branches/2015Q1/x11-toolkits/wxgtk30/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/x11-toolkits/wxgtk30/Makefile ============================================================================== --- branches/2015Q1/x11-toolkits/wxgtk30/Makefile Tue Feb 3 19:53:07 2015 (r378371) +++ branches/2015Q1/x11-toolkits/wxgtk30/Makefile Tue Feb 3 20:12:55 2015 (r378372) @@ -2,7 +2,7 @@ PORTNAME= wx PORTVERSION= 3.0.2 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows/${PORTVERSION} PKGNAMESUFFIX= 30-gtk2 @@ -17,7 +17,7 @@ LIB_DEPENDS+= libpng.so:${PORTSDIR}/grap libexpat.so:${PORTSDIR}/textproc/expat2\ libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 -USES+= iconv gmake pkgconfig tar:bzip2 +USES+= compiler:c++11-lib iconv gmake pkgconfig tar:bzip2 USE_XORG= x11 sm xxf86vm xinerama USE_GL= glu USE_GNOME= gtk20 @@ -52,4 +52,11 @@ GSTREAMER_USE= GNOME=gconf2 GSTREAMER=ye MSPACK_CONFIGURE_WITH= libmspack MSPACK_LIB_DEPENDS= libmspack.so:${PORTSDIR}/archivers/libmspack -.include +.include + +# PR 196703, 197031 +.if ${COMPILER_TYPE} == "gcc" +CONFIGURE_ARGS+=--disable-precomp-headers +.endif + +.include From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 3 22:46: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 AC4BCAB3; Tue, 3 Feb 2015 22:46: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 96F04AA8; Tue, 3 Feb 2015 22:46: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 t13MkE7K022042; Tue, 3 Feb 2015 22:46:14 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13MkE9W022038; Tue, 3 Feb 2015 22:46:14 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201502032246.t13MkE9W022038@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 3 Feb 2015 22:46:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378383 - in branches/2015Q1/archivers/unzip: . 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: Tue, 03 Feb 2015 22:46:14 -0000 Author: delphij Date: Tue Feb 3 22:46:13 2015 New Revision: 378383 URL: https://svnweb.freebsd.org/changeset/ports/378383 QAT: https://qat.redports.org/buildarchive/r378383/ Log: MFH: r378382 Apply Debian patch for CVE-2014-9636 which fixes out of boundary access issue in test_compr_eb. PR: ports/197300 Submitted by: Robert Simmons Security: e543c6f8-abf2-11e4-8ac7-d050992ecde8 Approved by: ports-secteam Modified: branches/2015Q1/archivers/unzip/Makefile branches/2015Q1/archivers/unzip/files/patch-extract.c Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/archivers/unzip/Makefile ============================================================================== --- branches/2015Q1/archivers/unzip/Makefile Tue Feb 3 22:37:45 2015 (r378382) +++ branches/2015Q1/archivers/unzip/Makefile Tue Feb 3 22:46:13 2015 (r378383) @@ -3,7 +3,7 @@ PORTNAME= unzip PORTVERSION= 6.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= archivers MASTER_SITES= SF/infozip/UnZip%206.x%20%28latest%29/UnZip%20${PORTVERSION}/:main \ SF/infozip/UnZip%205.x%20and%20earlier/5.51/:unreduce Modified: branches/2015Q1/archivers/unzip/files/patch-extract.c ============================================================================== --- branches/2015Q1/archivers/unzip/files/patch-extract.c Tue Feb 3 22:37:45 2015 (r378382) +++ branches/2015Q1/archivers/unzip/files/patch-extract.c Tue Feb 3 22:46:13 2015 (r378383) @@ -1,5 +1,5 @@ ---- extract.c.orig 2015-01-16 10:05:03.994866726 +0100 -+++ extract.c 2015-01-16 09:57:31.606898193 +0100 +--- extract.c.orig 2009-03-14 01:32:52 UTC ++++ extract.c @@ -1,5 +1,5 @@ /* - Copyright (c) 1990-2009 Info-ZIP. All rights reserved. @@ -7,7 +7,7 @@ See the accompanying file LICENSE, version 2009-Jan-02 or later (the contents of which are also included in unzip.h) for terms of use. -@@ -298,6 +298,8 @@ +@@ -298,6 +298,8 @@ char ZCONST Far TruncNTSD[] = #ifndef SFX static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \ EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n"; @@ -16,7 +16,7 @@ static ZCONST char Far InvalidComprDataEAs[] = " invalid compressed data for EAs\n"; # if (defined(WIN32) && defined(NTSD_EAS)) -@@ -2023,7 +2025,8 @@ +@@ -2023,7 +2025,8 @@ static int TestExtraField(__G__ ef, ef_l ebID = makeword(ef); ebLen = (unsigned)makeword(ef+EB_LEN); @@ -26,7 +26,7 @@ /* Discovered some extra field inconsistency! */ if (uO.qflag) Info(slide, 1, ((char *)slide, "%-22s ", -@@ -2032,6 +2035,16 @@ +@@ -2032,6 +2035,16 @@ static int TestExtraField(__G__ ef, ef_l ebLen, (ef_len - EB_HEADSIZE))); return PK_ERR; } @@ -43,7 +43,12 @@ switch (ebID) { case EF_OS2: -@@ -2221,10 +2234,17 @@ +@@ -2217,14 +2230,28 @@ static int test_compr_eb(__G__ eb, eb_si + ulg eb_ucsize; + uch *eb_ucptr; + int r; ++ ush method; + if (compr_offset < 4) /* field is not compressed: */ return PK_OK; /* do nothing and signal OK */ @@ -61,6 +66,12 @@ + ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) || + ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) + return IZ_EF_TRUNC; /* no/bad compressed data! */ ++ ++ method = makeword(eb + (EB_HEADSIZE + compr_offset)); ++ if ((method == STORED) && (eb_size - compr_offset != eb_ucsize)) ++ return PK_ERR; /* compressed & uncompressed ++ * should match in STORED ++ * method */ if ( #ifdef INT_16BIT From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 3 22:48:42 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 A51C7BB5; Tue, 3 Feb 2015 22:48:42 +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 8FE58AC0; Tue, 3 Feb 2015 22:48:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t13Mmg2h022512; Tue, 3 Feb 2015 22:48:42 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t13Mmge5022510; Tue, 3 Feb 2015 22:48:42 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201502032248.t13Mmge5022510@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 3 Feb 2015 22:48:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378384 - branches/2015Q1/security/openssl 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: Tue, 03 Feb 2015 22:48:42 -0000 Author: delphij Date: Tue Feb 3 22:48:41 2015 New Revision: 378384 URL: https://svnweb.freebsd.org/changeset/ports/378384 QAT: https://qat.redports.org/buildarchive/r378384/ Log: update to 1.0.1l. Security: vuxml 4e536c14-9791-11e4-977d-d050992ecde8 Approved by: ports-secteam Modified: branches/2015Q1/security/openssl/Makefile branches/2015Q1/security/openssl/distinfo Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/security/openssl/Makefile ============================================================================== --- branches/2015Q1/security/openssl/Makefile Tue Feb 3 22:46:13 2015 (r378383) +++ branches/2015Q1/security/openssl/Makefile Tue Feb 3 22:48:41 2015 (r378384) @@ -3,8 +3,8 @@ PORTNAME= openssl PORTVERSION= 1.0.1 -DISTVERSIONSUFFIX= j -PORTREVISION= 16 +DISTVERSIONSUFFIX= l +PORTREVISION= 18 CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ ftp://ftp.openssl.org/%SUBDIR%/ \ @@ -165,7 +165,6 @@ EXTRACONFIGURE+= no-rc5 .endif .if ${PORT_OPTIONS:MPADLOCK} -#BROKEN= does not build with openssl-1.0.1f PATCH_DIST_STRIP= -p1 PATCH_SITES+= http://git.alpinelinux.org/cgit/aports/plain/main/openssl/:padlock PATCHFILES+= 0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch:padlock \ Modified: branches/2015Q1/security/openssl/distinfo ============================================================================== --- branches/2015Q1/security/openssl/distinfo Tue Feb 3 22:46:13 2015 (r378383) +++ branches/2015Q1/security/openssl/distinfo Tue Feb 3 22:48:41 2015 (r378384) @@ -1,10 +1,10 @@ -SHA256 (openssl-1.0.1j/openssl-1.0.1j.tar.gz) = 1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3 -SIZE (openssl-1.0.1j/openssl-1.0.1j.tar.gz) = 4432964 -SHA256 (openssl-1.0.1j/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae -SIZE (openssl-1.0.1j/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512 -SHA256 (openssl-1.0.1j/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 39c31c2e33cded09543a2d1fd2e3238e9d11c672ba71a14d13095baad3ec9696 -SIZE (openssl-1.0.1j/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5867 -SHA256 (openssl-1.0.1j/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b -SIZE (openssl-1.0.1j/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625 -SHA256 (openssl-1.0.1j/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f -SIZE (openssl-1.0.1j/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777 +SHA256 (openssl-1.0.1l/openssl-1.0.1l.tar.gz) = b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4 +SIZE (openssl-1.0.1l/openssl-1.0.1l.tar.gz) = 4429979 +SHA256 (openssl-1.0.1l/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 18dd81fefb39b3328a444774ed10871ed50348ca171d2da9f826f916127b2dae +SIZE (openssl-1.0.1l/0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch) = 3512 +SHA256 (openssl-1.0.1l/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 30fbadf31dc13d9bcc758741f5560f6e13dd66c067f62d1b9066fb656f6aaaf2 +SIZE (openssl-1.0.1l/0002-engines-e_padlock-backport-cvs-head-changes.patch) = 5415 +SHA256 (openssl-1.0.1l/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = cbb2493ec9157e78035e9cc02be17655996ee9cd0a71b79507fc19f3862f452b +SIZE (openssl-1.0.1l/0003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch) = 20625 +SHA256 (openssl-1.0.1l/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 157ec6d17add25b96956abc7c44259c91eebe8a6c1026cdb976b895bf42ec56f +SIZE (openssl-1.0.1l/0004-crypto-engine-autoload-padlock-dynamic-engine.patch) = 777 From owner-svn-ports-branches@FreeBSD.ORG Wed Feb 4 14:49: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 DD0581FE; Wed, 4 Feb 2015 14:49: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 C8859AE; Wed, 4 Feb 2015 14:49: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 t14EniwE075573; Wed, 4 Feb 2015 14:49:44 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14EniAX075572; Wed, 4 Feb 2015 14:49:44 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502041449.t14EniAX075572@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Feb 2015 14:49:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378402 - branches/2015Q1/audio/wxguitar 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 Feb 2015 14:49:45 -0000 Author: amdmi3 Date: Wed Feb 4 14:49:44 2015 New Revision: 378402 URL: https://svnweb.freebsd.org/changeset/ports/378402 QAT: https://qat.redports.org/buildarchive/r378402/ Log: MFH: r378391 - Fix build on < 10.x after webkit-gtk2 update Approved by: portmgr blanket Approved by: portmgr (erwin) Modified: branches/2015Q1/audio/wxguitar/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/audio/wxguitar/Makefile ============================================================================== --- branches/2015Q1/audio/wxguitar/Makefile Wed Feb 4 14:03:51 2015 (r378401) +++ branches/2015Q1/audio/wxguitar/Makefile Wed Feb 4 14:49:44 2015 (r378402) @@ -13,6 +13,7 @@ COMMENT= Simple guitar tuning assistant RUN_DEPENDS= wavplay:${PORTSDIR}/audio/wavplay +USES= compiler:c++11-lib GNU_CONFIGURE= yes USE_WX= 3.0 WX_UNICODE= yes From owner-svn-ports-branches@FreeBSD.ORG Wed Feb 4 14:52: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 ED76450A; Wed, 4 Feb 2015 14:52: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 D8B401AD; Wed, 4 Feb 2015 14:52: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 t14EqEXd079516; Wed, 4 Feb 2015 14:52:14 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14EqEfu079515; Wed, 4 Feb 2015 14:52:14 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502041452.t14EqEfu079515@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Feb 2015 14:52:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378403 - branches/2015Q1/games/asc 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 Feb 2015 14:52:15 -0000 Author: amdmi3 Date: Wed Feb 4 14:52:13 2015 New Revision: 378403 URL: https://svnweb.freebsd.org/changeset/ports/378403 QAT: https://qat.redports.org/buildarchive/r378403/ Log: MFH: r378392 - Fix build on < 10.x after webkit-gtk2 update Approved by: portmgr blanket Approved by: portmgr (erwin) Modified: branches/2015Q1/games/asc/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/games/asc/Makefile ============================================================================== --- branches/2015Q1/games/asc/Makefile Wed Feb 4 14:49:44 2015 (r378402) +++ branches/2015Q1/games/asc/Makefile Wed Feb 4 14:52:13 2015 (r378403) @@ -28,7 +28,7 @@ LIB_DEPENDS= libvorbis.so:${PORTSDIR}/au OPTIONS_DEFINE= MUSIC XVID MUSIC_DESC= Install extra music files -USES= gmake libtool lua:51 perl5 pkgconfig tar:bzip2 +USES= compiler:c++11-lib gmake libtool lua:51 perl5 pkgconfig tar:bzip2 USE_SDL= image mixer sound sdl USE_WX= 3.0 WX_UNICODE= yes From owner-svn-ports-branches@FreeBSD.ORG Wed Feb 4 14:54:38 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 B7D54633; Wed, 4 Feb 2015 14:54:38 +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 A34871D5; Wed, 4 Feb 2015 14:54:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t14EscbO079900; Wed, 4 Feb 2015 14:54:38 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t14EscFZ079899; Wed, 4 Feb 2015 14:54:38 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201502041454.t14EscFZ079899@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Feb 2015 14:54:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378404 - branches/2015Q1/games/megaglest 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 Feb 2015 14:54:38 -0000 Author: amdmi3 Date: Wed Feb 4 14:54:37 2015 New Revision: 378404 URL: https://svnweb.freebsd.org/changeset/ports/378404 QAT: https://qat.redports.org/buildarchive/r378404/ Log: MFH: r378393 - Fix build on < 10.x after webkit-gtk2 update Approved by: portmgr blanket Approved by: portmgr (erwin) Modified: branches/2015Q1/games/megaglest/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/games/megaglest/Makefile ============================================================================== --- branches/2015Q1/games/megaglest/Makefile Wed Feb 4 14:52:13 2015 (r378403) +++ branches/2015Q1/games/megaglest/Makefile Wed Feb 4 14:54:37 2015 (r378404) @@ -23,7 +23,7 @@ RUN_DEPENDS= ${DATADIR}/tutorials/2_basi SUB_FILES= pkg-message -USES= cmake display:build dos2unix lua openal:al,alut pkgconfig tar:xz +USES= cmake compiler:c++11-lib display:build dos2unix lua openal:al,alut pkgconfig tar:xz USE_GL= glew gl glu USE_SDL= yes USE_WX= 3.0 From owner-svn-ports-branches@FreeBSD.ORG Fri Feb 6 22:20: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 0F90A85E; Fri, 6 Feb 2015 22:20: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 EF1C175B; Fri, 6 Feb 2015 22:20:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t16MKBQ2067577; Fri, 6 Feb 2015 22:20:11 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16MKB5f067571; Fri, 6 Feb 2015 22:20:11 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201502062220.t16MKB5f067571@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 6 Feb 2015 22:20:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378559 - in branches/2015Q1/net/openldap24-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: Fri, 06 Feb 2015 22:20:12 -0000 Author: delphij Date: Fri Feb 6 22:20:10 2015 New Revision: 378559 URL: https://svnweb.freebsd.org/changeset/ports/378559 QAT: https://qat.redports.org/buildarchive/r378559/ Log: MFH: r378558 Apply two upstream patches to address two remote DoS issues: - ITS8027: crash when a search includes the Deref control with an empty attribute list. - ITS8046: double free and crash by certain search queries using the Matched Values control. Approved by: ports-secteam@ Added: branches/2015Q1/net/openldap24-server/files/patch-ITS8027 - copied unchanged from r378558, head/net/openldap24-server/files/patch-ITS8027 branches/2015Q1/net/openldap24-server/files/patch-ITS8046 - copied unchanged from r378558, head/net/openldap24-server/files/patch-ITS8046 Modified: branches/2015Q1/net/openldap24-server/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/net/openldap24-server/Makefile ============================================================================== --- branches/2015Q1/net/openldap24-server/Makefile Fri Feb 6 22:18:15 2015 (r378558) +++ branches/2015Q1/net/openldap24-server/Makefile Fri Feb 6 22:20:10 2015 (r378559) @@ -59,7 +59,7 @@ BROKEN= incompatible OpenLDAP version: .endif PORTREVISION_CLIENT= 1 -PORTREVISION_SERVER= 2 +PORTREVISION_SERVER= 3 OPENLDAP_SHLIB_MAJOR= 2 OPENLDAP_SHLIB_MINOR= 10.3 OPENLDAP_MAJOR= ${DISTVERSION:R} Copied: branches/2015Q1/net/openldap24-server/files/patch-ITS8027 (from r378558, head/net/openldap24-server/files/patch-ITS8027) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/net/openldap24-server/files/patch-ITS8027 Fri Feb 6 22:20:10 2015 (r378559, copy of r378558, head/net/openldap24-server/files/patch-ITS8027) @@ -0,0 +1,26 @@ +From c32e74763f77675b9e144126e375977ed6dc562c Mon Sep 17 00:00:00 2001 +From: Howard Chu +Date: Mon, 19 Jan 2015 22:25:53 +0000 +Subject: [PATCH] ITS#8027 require non-empty AttributeList + +--- + servers/slapd/overlays/deref.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git servers/slapd/overlays/deref.c servers/slapd/overlays/deref.c +index 9420e3e..05aa890 100644 +--- servers/slapd/overlays/deref.c ++++ servers/slapd/overlays/deref.c +@@ -183,7 +183,8 @@ deref_parseCtrl ( + ber_len_t cnt = sizeof(struct berval); + ber_len_t off = 0; + +- if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR ) ++ if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR ++ || !cnt ) + { + rs->sr_text = "Dereference control: derefSpec decoding error"; + rs->sr_err = LDAP_PROTOCOL_ERROR; +-- +1.7.10.4 + Copied: branches/2015Q1/net/openldap24-server/files/patch-ITS8046 (from r378558, head/net/openldap24-server/files/patch-ITS8046) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/net/openldap24-server/files/patch-ITS8046 Fri Feb 6 22:20:10 2015 (r378559, copy of r378558, head/net/openldap24-server/files/patch-ITS8046) @@ -0,0 +1,34 @@ +From 2f1a2dd329b91afe561cd06b872d09630d4edb6a Mon Sep 17 00:00:00 2001 +From: Howard Chu +Date: Wed, 4 Feb 2015 02:03:55 +0000 +Subject: [PATCH] ITS#8046 fix vrFilter_free + +--- + servers/slapd/filter.c | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git servers/slapd/filter.c servers/slapd/filter.c +index b859f73..22c81c8 100644 +--- servers/slapd/filter.c ++++ servers/slapd/filter.c +@@ -1158,14 +1158,10 @@ get_vrFilter( Operation *op, BerElement *ber, + void + vrFilter_free( Operation *op, ValuesReturnFilter *vrf ) + { +- ValuesReturnFilter *p, *next; ++ ValuesReturnFilter *next; + +- if ( vrf == NULL ) { +- return; +- } +- +- for ( p = vrf; p != NULL; p = next ) { +- next = p->vrf_next; ++ for ( ; vrf != NULL; vrf = next ) { ++ next = vrf->vrf_next; + + switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) { + case LDAP_FILTER_PRESENT: +-- +1.7.10.4 + From owner-svn-ports-branches@FreeBSD.ORG Fri Feb 6 22:35:56 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 36CAC157; Fri, 6 Feb 2015 22:35: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 227CD941; Fri, 6 Feb 2015 22:35: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 t16MZth6077410; Fri, 6 Feb 2015 22:35:55 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16MZtmt077407; Fri, 6 Feb 2015 22:35:55 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201502062235.t16MZtmt077407@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Fri, 6 Feb 2015 22:35:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378564 - in branches/2015Q1/www/chromium: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.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 Feb 2015 22:35:56 -0000 Author: rene Date: Fri Feb 6 22:35:54 2015 New Revision: 378564 URL: https://svnweb.freebsd.org/changeset/ports/378564 QAT: https://qat.redports.org/buildarchive/r378564/ Log: MFH: r378563 www/chromium: update to 40.0.2214.111 [1] Apply a build fix for DragonFlyBSD [2] and FreeBSD 8 [3] Submitted by: Imre Vadasz [1,3] marino [2] Security: http://www.vuxml.org/freebsd/a6eb239f-adbe-11e4-9fce-080027593b9a.html Approved by: ports-secteam (delphij) Modified: branches/2015Q1/www/chromium/Makefile branches/2015Q1/www/chromium/distinfo branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/www/chromium/Makefile ============================================================================== --- branches/2015Q1/www/chromium/Makefile Fri Feb 6 22:28:52 2015 (r378563) +++ branches/2015Q1/www/chromium/Makefile Fri Feb 6 22:35:54 2015 (r378564) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 40.0.2214.93 +PORTVERSION= 40.0.2214.111 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Modified: branches/2015Q1/www/chromium/distinfo ============================================================================== --- branches/2015Q1/www/chromium/distinfo Fri Feb 6 22:28:52 2015 (r378563) +++ branches/2015Q1/www/chromium/distinfo Fri Feb 6 22:35:54 2015 (r378564) @@ -1,4 +1,4 @@ -SHA256 (chromium-40.0.2214.93.tar.xz) = c4937596bc02d346a89543a6b5bd0fab9f45e34f3ce20dee94dc132a95c990de -SIZE (chromium-40.0.2214.93.tar.xz) = 284982688 -SHA256 (chromium-40.0.2214.93-testdata.tar.xz) = 883761dd8f559c849f0998fbf4144f2d35a171a8fff67dbc464e3bb8a5da552b -SIZE (chromium-40.0.2214.93-testdata.tar.xz) = 115343772 +SHA256 (chromium-40.0.2214.111.tar.xz) = 9e1f1a661702217a3fa7bf25a0e70d334a236ca67fadc4bebcfa2e8f7328cd49 +SIZE (chromium-40.0.2214.111.tar.xz) = 284978632 +SHA256 (chromium-40.0.2214.111-testdata.tar.xz) = 3f800644e56ea82ed539fcf42d2b654742105108357869f4bbf737a4d6b172eb +SIZE (chromium-40.0.2214.111-testdata.tar.xz) = 115348388 Modified: branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc ============================================================================== --- branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc Fri Feb 6 22:28:52 2015 (r378563) +++ branches/2015Q1/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc Fri Feb 6 22:35:54 2015 (r378564) @@ -1,11 +1,17 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2015-01-25 14:30:34 UTC -+++ v8/src/base/platform/platform-posix.cc -@@ -259,6 +259,8 @@ +--- v8/src/base/platform/platform-posix.cc.orig 2015-01-27 03:22:59.000000000 +0100 ++++ v8/src/base/platform/platform-posix.cc 2015-02-06 18:41:53.881294389 +0100 +@@ -259,6 +259,14 @@ return static_cast(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast(gettid()); +#elif V8_OS_FREEBSD ++# ifdef __DragonFly__ ++ return static_cast(lwp_gettid()); ++# elif __FreeBSD_version__ < 900031 ++ return 0; /* ! */ ++# else + return static_cast(pthread_getthreadid_np()); ++# endif #else return static_cast(pthread_self()); #endif From owner-svn-ports-branches@FreeBSD.ORG Fri Feb 6 22:36: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 199AE253; Fri, 6 Feb 2015 22:36:46 +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 DFA33953; Fri, 6 Feb 2015 22:36: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 t16MajlZ077654; Fri, 6 Feb 2015 22:36:45 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t16Majev077652; Fri, 6 Feb 2015 22:36:45 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201502062236.t16Majev077652@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Fri, 6 Feb 2015 22:36:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378565 - in branches/2015Q1/ftp/proftpd: . 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 Feb 2015 22:36:46 -0000 Author: mm Date: Fri Feb 6 22:36:44 2015 New Revision: 378565 URL: https://svnweb.freebsd.org/changeset/ports/378565 QAT: https://qat.redports.org/buildarchive/r378565/ Log: MFH: r378282,378298,378300 ftp/proftpd: unbreak mod_sftp and fix rc script - fix mirror sites - fix rc script - compile with -lpthread PR: 191011, 195921, 196635, 197290 Approved by: portmgr (mat) Modified: branches/2015Q1/ftp/proftpd/Makefile branches/2015Q1/ftp/proftpd/files/proftpd.in Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/ftp/proftpd/Makefile ============================================================================== --- branches/2015Q1/ftp/proftpd/Makefile Fri Feb 6 22:35:54 2015 (r378564) +++ branches/2015Q1/ftp/proftpd/Makefile Fri Feb 6 22:36:44 2015 (r378565) @@ -5,11 +5,11 @@ PORTNAME?= proftpd .if !defined(DISTVERSION) PORTVERSION?= ${PROFTPD_VERSION} .endif -PORTREVISION?= 4 +PORTREVISION?= 6 CATEGORIES?= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ https://github.com/downloads/proftpd/proftpd.github.com/ \ - ftp://proftpd.networkedsystems.co.uk/distrib/source/ \ + ftp://ftpmirror.uk/ftp.proftpd.org/distrib/source/ \ http://www.mirrorservice.org/sites/ftp.proftpd.org/distrib/source/ .if defined(_BUILDING_PROFTPD_MODULE) DISTNAME= proftpd-${PROFTPD_VERSION} @@ -101,6 +101,7 @@ PLIST_SUB+= LOCALSTATEDIR="${LOCALSTATED .if !defined(_BUILDING_PROFTPD_MODULE) CPPFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} LIBS+= -lssl -lcrypto -L${OPENSSLLIB} +LDFLAGS+= -lpthread .endif .if !defined(_BUILDING_PROFTPD_MODULE) Modified: branches/2015Q1/ftp/proftpd/files/proftpd.in ============================================================================== --- branches/2015Q1/ftp/proftpd/files/proftpd.in Fri Feb 6 22:35:54 2015 (r378564) +++ branches/2015Q1/ftp/proftpd/files/proftpd.in Fri Feb 6 22:36:44 2015 (r378565) @@ -22,8 +22,10 @@ name=proftpd rcvar=proftpd_enable -proftpd_enable=${proftpd_enable:="NO"} -proftpd_config=${proftpd_config:="%%PREFIX%%/etc/proftpd.conf"} +load_rc_config $name + +: ${proftpd_enable:="NO"} +: ${proftpd_config:="%%PREFIX%%/etc/proftpd.conf"} command=%%PREFIX%%/sbin/proftpd command_args="-c ${proftpd_config}" @@ -37,5 +39,4 @@ stop_postcmd() rm -f $pidfile } -load_rc_config $name run_rc_command "$1" From owner-svn-ports-branches@FreeBSD.ORG Sat Feb 7 09:19: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 8C10833E; Sat, 7 Feb 2015 09:19: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 77B2FE6B; Sat, 7 Feb 2015 09:19:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t179J6YN076725; Sat, 7 Feb 2015 09:19:06 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t179J6BI076724; Sat, 7 Feb 2015 09:19:06 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201502070919.t179J6BI076724@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sat, 7 Feb 2015 09:19:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378578 - branches/2015Q1/sysutils/3dm 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 Feb 2015 09:19:06 -0000 Author: antoine Date: Sat Feb 7 09:19:05 2015 New Revision: 378578 URL: https://svnweb.freebsd.org/changeset/ports/378578 QAT: https://qat.redports.org/buildarchive/r378578/ Log: MFH: r378577 Mark BROKEN: Unfetchable Reported by: pkg-fallout Modified: branches/2015Q1/sysutils/3dm/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/sysutils/3dm/Makefile ============================================================================== --- branches/2015Q1/sysutils/3dm/Makefile Sat Feb 7 09:17:32 2015 (r378577) +++ branches/2015Q1/sysutils/3dm/Makefile Sat Feb 7 09:19:05 2015 (r378578) @@ -13,6 +13,7 @@ DIST_SUBDIR= 3dm2 MAINTAINER= takefu@airport.fm COMMENT= 3ware RAID controller monitoring daemon and web server +BROKEN= Unfetchable RESTRICTED= Source recipient must acknowledge license. Reproduction or redistribution prohibited. See http://www.lsi.com/Pages/user/eula.aspx FETCH_BEFORE_ARGS= -o ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} From owner-svn-ports-branches@FreeBSD.ORG Sat Feb 7 15:34:58 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 D58B4D8C; Sat, 7 Feb 2015 15:34:58 +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 A68E55F2; Sat, 7 Feb 2015 15:34:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17FYwK8054720; Sat, 7 Feb 2015 15:34:58 GMT (envelope-from johans@FreeBSD.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17FYvXM054714; Sat, 7 Feb 2015 15:34:57 GMT (envelope-from johans@FreeBSD.org) Message-Id: <201502071534.t17FYvXM054714@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: johans set sender to johans@FreeBSD.org using -f From: Johan van Selst Date: Sat, 7 Feb 2015 15:34:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378598 - in branches/2015Q1/devel/patch: . 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: Sat, 07 Feb 2015 15:34:58 -0000 Author: johans Date: Sat Feb 7 15:34:57 2015 New Revision: 378598 URL: https://svnweb.freebsd.org/changeset/ports/378598 QAT: https://qat.redports.org/buildarchive/r378598/ Log: Update to GNU patch 2.7.4; bugfix release, patches CVE-2015-1196 Approved by: ports-secteam (erwin) MFH: r378592 Modified: branches/2015Q1/devel/patch/Makefile branches/2015Q1/devel/patch/distinfo branches/2015Q1/devel/patch/files/patch-lib__localcharset.c Modified: branches/2015Q1/devel/patch/Makefile ============================================================================== --- branches/2015Q1/devel/patch/Makefile Sat Feb 7 15:14:29 2015 (r378597) +++ branches/2015Q1/devel/patch/Makefile Sat Feb 7 15:34:57 2015 (r378598) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= patch -PORTVERSION= 2.7.1 +PORTVERSION= 2.7.4 CATEGORIES= devel MASTER_SITES= GNU Modified: branches/2015Q1/devel/patch/distinfo ============================================================================== --- branches/2015Q1/devel/patch/distinfo Sat Feb 7 15:14:29 2015 (r378597) +++ branches/2015Q1/devel/patch/distinfo Sat Feb 7 15:34:57 2015 (r378598) @@ -1,2 +1,2 @@ -SHA256 (patch-2.7.1.tar.xz) = 9124ba46db0abd873d0995c2ca880e81252676bb6c03e0a37dfc5f608a9b0ceb -SIZE (patch-2.7.1.tar.xz) = 675896 +SHA256 (patch-2.7.4.tar.xz) = 0eacbb07ce106fe4dcbfbe6c052e55b50bf3df8e1bb16228c9da77b6659ff109 +SIZE (patch-2.7.4.tar.xz) = 714392 Modified: branches/2015Q1/devel/patch/files/patch-lib__localcharset.c ============================================================================== --- branches/2015Q1/devel/patch/files/patch-lib__localcharset.c Sat Feb 7 15:14:29 2015 (r378597) +++ branches/2015Q1/devel/patch/files/patch-lib__localcharset.c Sat Feb 7 15:34:57 2015 (r378598) @@ -4,8 +4,8 @@ cp = charset_aliases; if (cp == NULL) { --#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__) -+#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined __FreeBSD__) +-#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2) ++#if !(defined DARWIN7 || defined VMS || defined WINDOWS_NATIVE || defined __CYGWIN__ || defined OS2 || defined __FreeBSD__) const char *dir; const char *base = "charset.alias"; char *file_name; From owner-svn-ports-branches@FreeBSD.ORG Sat Feb 7 15:45:08 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 1AF3DF9E; Sat, 7 Feb 2015 15:45:08 +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 055CE6BF; Sat, 7 Feb 2015 15:45:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t17Fj7G8059480; Sat, 7 Feb 2015 15:45:07 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t17Fj7nq059478; Sat, 7 Feb 2015 15:45:07 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201502071545.t17Fj7nq059478@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sat, 7 Feb 2015 15:45:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378599 - in branches/2015Q1/x11/kdelibs4: . 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: Sat, 07 Feb 2015 15:45:08 -0000 Author: rakuco Date: Sat Feb 7 15:45:06 2015 New Revision: 378599 URL: https://svnweb.freebsd.org/changeset/ports/378599 QAT: https://qat.redports.org/buildarchive/r378599/ Log: MFH: r378101 Add upstream patch to fix a possible crash in KMail and KAddressBook. Original report here: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775114 Approved by: portmgr (erwin) Added: branches/2015Q1/x11/kdelibs4/files/patch-git_0df92439 - copied unchanged from r378101, head/x11/kdelibs4/files/patch-git_0df92439 Modified: branches/2015Q1/x11/kdelibs4/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/x11/kdelibs4/Makefile ============================================================================== --- branches/2015Q1/x11/kdelibs4/Makefile Sat Feb 7 15:34:57 2015 (r378598) +++ branches/2015Q1/x11/kdelibs4/Makefile Sat Feb 7 15:45:06 2015 (r378599) @@ -3,7 +3,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} Copied: branches/2015Q1/x11/kdelibs4/files/patch-git_0df92439 (from r378101, head/x11/kdelibs4/files/patch-git_0df92439) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/x11/kdelibs4/files/patch-git_0df92439 Sat Feb 7 15:45:06 2015 (r378599, copy of r378101, head/x11/kdelibs4/files/patch-git_0df92439) @@ -0,0 +1,355 @@ +commit 0df92439241a76c6a67efa9485bd95c3c25d63a0 +Author: Christian Mollekopf +Date: Thu Jan 22 15:04:16 2015 +0100 + + KRecursiveFilterProxyModel: Fixed the model + + The model was not working properly and didn't include all items under + some circumstances. + This patch fixes the following scenarios in particular: + + * The change in sourceDataChanged is required to fix the shortcut condition. + The idea is that if the parent is already part of the model (it must be if acceptRow returns true), + we can directly invoke dataChanged on the parent, resulting in the changed index + getting reevaluated. However, because the recursive filterAcceptsRow version was used + the shortcut was also used when only the current index matches the filter and + the parent index is in fact not yet in the model. In this case we failed to call + dataChanged on the right index and thus the complete branch was never added to the model. + + * The change in refreshAscendantMapping is required to include indexes that were + included by descendants. The intended way how this was supposed to work is that we + traverse the tree upwards and find the last index that is not yet part of the model. + We would then call dataChanged on that index causing it and its descendants to get reevaluated. + However, acceptRow does not reflect wether an index is already in the model or not. + Consider the following model: + + - A + - B + - C + - D + + If C is included in the model by default but D not, and A & B only get included due to C, we have the following model: + + - A + - B + - C + + If we then call refreshAscendantsMapping on D it will not consider B as already being part of the model. + This results in the toplevel index A being considered lastAscendant, and a call to dataChanged on A results in + a reevaluation of A only, which is already in the model. Thus D never gets added to the model. + + Unfortunately there is no way to probe QSortFilterProxyModel for indexes that are + already part of the model. Even the const mapFromSource internally creates a mapping when called, + and thus instead of revealing indexes that are not yet part of the model, it silently + creates a mapping (without issuing the relevant signals!). + + As the only possible workaround we have to issues dataChanged for all ancestors + which is ignored for indexes that are not yet mapped, and results in a rowsInserted + signal for the correct indexes. It also results in superfluous dataChanged signals, + since we don't know when to stop, but at least we have a properly behaving model + this way. + + REVIEW: 120119 + BUG: 338950 + +--- kdeui/itemviews/krecursivefilterproxymodel.cpp ++++ kdeui/itemviews/krecursivefilterproxymodel.cpp +@@ -108,12 +108,9 @@ public: + void sourceRowsRemoved(const QModelIndex &source_parent, int start, int end); + + /** +- Given that @p index does not match the filter, clear mappings in the QSortFilterProxyModel up to and excluding the +- first ascendant that does match, and remake the mappings. +- +- If @p refreshAll is true, this method also refreshes intermediate mappings. This is significant when removing rows. ++ Given that @p index does not match the filter, clear mappings in the QSortFilterProxyModel up to roo, and remake the mappings. + */ +- void refreshAscendantMapping(const QModelIndex &index, bool refreshAll = false); ++ void refreshAscendantMapping(const QModelIndex &index); + + bool ignoreRemove; + bool completeInsert; +@@ -126,7 +123,7 @@ void KRecursiveFilterProxyModelPrivate::sourceDataChanged(const QModelIndex &sou + + QModelIndex source_parent = source_top_left.parent(); + +- if (!source_parent.isValid() || q->filterAcceptsRow(source_parent.row(), source_parent.parent())) ++ if (!source_parent.isValid() || q->acceptRow(source_parent.row(), source_parent.parent())) + { + invokeDataChanged(source_top_left, source_bottom_right); + return; +@@ -146,27 +143,20 @@ void KRecursiveFilterProxyModelPrivate::sourceDataChanged(const QModelIndex &sou + refreshAscendantMapping(source_parent); + } + +-void KRecursiveFilterProxyModelPrivate::refreshAscendantMapping(const QModelIndex &index, bool refreshAll) ++void KRecursiveFilterProxyModelPrivate::refreshAscendantMapping(const QModelIndex &index) + { + Q_Q(KRecursiveFilterProxyModel); +- + Q_ASSERT(index.isValid()); +- QModelIndex lastAscendant = index; +- QModelIndex sourceAscendant = index.parent(); ++ ++ QModelIndex sourceAscendant = index; + // We got a matching descendant, so find the right place to insert the row. + // We need to tell the QSortFilterProxyModel that the first child between an existing row in the model + // has changed data so that it will get a mapping. +- while(sourceAscendant.isValid() && !q->acceptRow(sourceAscendant.row(), sourceAscendant.parent())) ++ while(sourceAscendant.isValid()) + { +- if (refreshAll) +- invokeDataChanged(sourceAscendant, sourceAscendant); +- +- lastAscendant = sourceAscendant; ++ invokeDataChanged(sourceAscendant, sourceAscendant); + sourceAscendant = sourceAscendant.parent(); + } +- +- // Inform the model that its data changed so that it creates new mappings and finds the rows which now match the filter. +- invokeDataChanged(lastAscendant, lastAscendant); + } + + void KRecursiveFilterProxyModelPrivate::sourceRowsAboutToBeInserted(const QModelIndex &source_parent, int start, int end) +@@ -261,7 +251,7 @@ void KRecursiveFilterProxyModelPrivate::sourceRowsRemoved(const QModelIndex &sou + // This is needed because QSFPM only invalidates the mapping for the + // index range given to dataChanged, not its children. + if (source_parent.isValid()) +- refreshAscendantMapping(source_parent, true); ++ refreshAscendantMapping(source_parent); + } + + KRecursiveFilterProxyModel::KRecursiveFilterProxyModel(QObject* parent) +--- kdeui/tests/CMakeLists.txt ++++ kdeui/tests/CMakeLists.txt +@@ -82,6 +82,7 @@ KDEUI_PROXYMODEL_TESTS( + kdescendantsproxymodeltest + kselectionproxymodeltest + testmodelqueuedconnections ++ krecursivefilterproxymodeltest + ) + + KDEUI_EXECUTABLE_TESTS( +--- /dev/null ++++ kdeui/tests/krecursivefilterproxymodeltest.cpp +@@ -0,0 +1,220 @@ ++/* ++ Copyright (c) 2014 Christian Mollekopf ++ ++ This library is free software; you can redistribute it and/or modify it ++ under the terms of the GNU Library General Public License as published by ++ the Free Software Foundation; either version 2 of the License, or (at your ++ option) any later version. ++ ++ This library is distributed in the hope that it will be useful, but WITHOUT ++ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public ++ License for more details. ++ ++ You should have received a copy of the GNU Library General Public License ++ along with this library; see the file COPYING.LIB. If not, write to the ++ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ 02110-1301, USA. ++*/ ++ ++ ++#include ++ ++#include ++#include ++ ++class ModelSignalSpy : public QObject { ++ Q_OBJECT ++public: ++ explicit ModelSignalSpy(QAbstractItemModel &model) { ++ connect(&model, SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(onRowsInserted(QModelIndex,int,int))); ++ connect(&model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(onRowsRemoved(QModelIndex,int,int))); ++ connect(&model, SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)), this, SLOT(onRowsMoved(QModelIndex,int,int, QModelIndex, int))); ++ connect(&model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(onDataChanged(QModelIndex,QModelIndex))); ++ connect(&model, SIGNAL(layoutChanged()), this, SLOT(onLayoutChanged())); ++ connect(&model, SIGNAL(modelReset()), this, SLOT(onModelReset())); ++ } ++ ++ QStringList mSignals; ++ QModelIndex parent; ++ int start; ++ int end; ++ ++public Q_SLOTS: ++ void onRowsInserted(QModelIndex p, int s, int e) { ++ mSignals << QLatin1String("rowsInserted"); ++ parent = p; ++ start = s; ++ end = e; ++ } ++ void onRowsRemoved(QModelIndex p, int s, int e) { ++ mSignals << QLatin1String("rowsRemoved"); ++ parent = p; ++ start = s; ++ end = e; ++ } ++ void onRowsMoved(QModelIndex,int,int,QModelIndex,int) { ++ mSignals << QLatin1String("rowsMoved"); ++ } ++ void onDataChanged(QModelIndex,QModelIndex) { ++ mSignals << QLatin1String("dataChanged"); ++ } ++ void onLayoutChanged() { ++ mSignals << QLatin1String("layoutChanged"); ++ } ++ void onModelReset() { ++ mSignals << QLatin1String("modelReset"); ++ } ++}; ++ ++class TestModel : public KRecursiveFilterProxyModel ++{ ++ Q_OBJECT ++public: ++ virtual bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const ++ { ++ // qDebug() << sourceModel()->index(sourceRow, 0, sourceParent).data().toString() << sourceModel()->index(sourceRow, 0, sourceParent).data(Qt::UserRole+1).toBool(); ++ return sourceModel()->index(sourceRow, 0, sourceParent).data(Qt::UserRole+1).toBool(); ++ } ++}; ++ ++static QModelIndex getIndex(const char *string, const QAbstractItemModel &model) ++{ ++ QModelIndexList list = model.match(model.index(0, 0), Qt::DisplayRole, QString::fromLatin1(string), 1, Qt::MatchRecursive); ++ if (list.isEmpty()) { ++ return QModelIndex(); ++ } ++ return list.first(); ++} ++ ++class KRecursiveFilterProxyModelTest : public QObject ++{ ++ Q_OBJECT ++private: ++ ++private slots: ++ // Test that we properly react to a data-changed signal in a descendant and include all required rows ++ void testDataChange() ++ { ++ QStandardItemModel model; ++ TestModel proxy; ++ proxy.setSourceModel(&model); ++ ++ QStandardItem *index1 = new QStandardItem("1"); ++ index1->setData(false); ++ model.appendRow(index1); ++ ++ QVERIFY(!getIndex("1", proxy).isValid()); ++ ++ QStandardItem *index1_1_1 = new QStandardItem("1.1.1"); ++ index1_1_1->setData(false); ++ QStandardItem *index1_1 = new QStandardItem("1.1"); ++ index1_1->setData(false); ++ index1_1->appendRow(index1_1_1); ++ index1->appendRow(index1_1); ++ ++ ModelSignalSpy spy(proxy); ++ index1_1_1->setData(true); ++ ++ QVERIFY(getIndex("1", proxy).isValid()); ++ QVERIFY(getIndex("1.1", proxy).isValid()); ++ QVERIFY(getIndex("1.1.1", proxy).isValid()); ++ ++ QCOMPARE(spy.mSignals, QStringList() << QLatin1String("rowsInserted")); ++ } ++ ++ void testInsert() ++ { ++ QStandardItemModel model; ++ TestModel proxy; ++ proxy.setSourceModel(&model); ++ ++ QStandardItem *index1 = new QStandardItem("index1"); ++ index1->setData(false); ++ model.appendRow(index1); ++ ++ QStandardItem *index1_1 = new QStandardItem("index1_1"); ++ index1_1->setData(false); ++ index1->appendRow(index1_1); ++ ++ QStandardItem *index1_1_1 = new QStandardItem("index1_1_1"); ++ index1_1_1->setData(false); ++ index1_1->appendRow(index1_1_1); ++ ++ QVERIFY(!getIndex("index1", proxy).isValid()); ++ QVERIFY(!getIndex("index1_1", proxy).isValid()); ++ QVERIFY(!getIndex("index1_1_1", proxy).isValid()); ++ ++ ModelSignalSpy spy(proxy); ++ { ++ QStandardItem *index1_1_1_1 = new QStandardItem("index1_1_1_1"); ++ index1_1_1_1->setData(true); ++ index1_1_1->appendRow(index1_1_1_1); ++ } ++ ++ QVERIFY(getIndex("index1", proxy).isValid()); ++ QVERIFY(getIndex("index1_1", proxy).isValid()); ++ QVERIFY(getIndex("index1_1_1", proxy).isValid()); ++ QVERIFY(getIndex("index1_1_1_1", proxy).isValid()); ++ QCOMPARE(spy.mSignals, QStringList() << QLatin1String("rowsInserted")); ++ QCOMPARE(spy.parent, QModelIndex()); ++ } ++ ++ ++ // We want to get index1_1_1_1 into the model which is a descendant of index1_1. ++ // index1_1 is already in the model from the neighbor2 branch. We must ensure dataChange is called on index1_1, ++ // so index1_1_1_1 is included in the model. ++ void testNeighborPath() ++ { ++ QStandardItemModel model; ++ TestModel proxy; ++ proxy.setSourceModel(&model); ++ ++ QStandardItem *index1 = new QStandardItem("index1"); ++ index1->setData(false); ++ model.appendRow(index1); ++ ++ QStandardItem *index1_1 = new QStandardItem("index1_1"); ++ index1_1->setData(false); ++ index1->appendRow(index1_1); ++ ++ QStandardItem *index1_1_1 = new QStandardItem("index1_1_1"); ++ index1_1_1->setData(false); ++ index1_1->appendRow(index1_1_1); ++ ++ { ++ QStandardItem *nb1 = new QStandardItem("neighbor"); ++ nb1->setData(false); ++ index1_1->appendRow(nb1); ++ ++ QStandardItem *nb2 = new QStandardItem("neighbor2"); ++ nb2->setData(true); ++ nb1->appendRow(nb2); ++ } ++ ++ //These tests affect the test. It seems without them the mapping is not created in qsortfilterproxymodel, resulting in the item ++ //simply getting added later on. With these the model didn't react to the added index1_1_1_1 as it should. ++ QVERIFY(!getIndex("index1_1_1", proxy).isValid()); ++ QVERIFY(getIndex("index1_1", proxy).isValid()); ++ QVERIFY(getIndex("neighbor", proxy).isValid()); ++ QVERIFY(getIndex("neighbor2", proxy).isValid()); ++ ++ ModelSignalSpy spy(proxy); ++ ++ { ++ QStandardItem *index1_1_1_1 = new QStandardItem("index1_1_1_1"); ++ index1_1_1_1->setData(true); ++ index1_1_1->appendRow(index1_1_1_1); ++ } ++ ++ QVERIFY(getIndex("index1_1_1", proxy).isValid()); ++ QVERIFY(getIndex("index1_1_1_1", proxy).isValid()); ++ //The dataChanged signals are not intentional and caused by refreshAscendantMapping. Unfortunately we can't avoid them. ++ QCOMPARE(spy.mSignals, QStringList() << QLatin1String("rowsInserted") << QLatin1String("dataChanged") << QLatin1String("dataChanged")); ++ } ++ ++}; ++ ++QTEST_KDEMAIN(KRecursiveFilterProxyModelTest, NoGUI) ++ ++#include "krecursivefilterproxymodeltest.moc"