From owner-svn-ports-branches@freebsd.org Sun Dec 13 01:44:52 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B9799A1462C;
Sun, 13 Dec 2015 01:44:52 +0000 (UTC)
(envelope-from jason.unovitch@gmail.com)
Received: from mail-qg0-x22b.google.com (mail-qg0-x22b.google.com
[IPv6:2607:f8b0:400d:c04::22b])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 7BBF21443;
Sun, 13 Dec 2015 01:44:52 +0000 (UTC)
(envelope-from jason.unovitch@gmail.com)
Received: by qgew101 with SMTP id w101so22823942qge.2;
Sat, 12 Dec 2015 17:44:51 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=from:user-agent:in-reply-to:references:mime-version
:content-transfer-encoding:content-type:subject:reply-to:date:to:cc
:message-id; bh=fNca9wO0d/CjczBLpuDY7iy8Ky/Ux68nhf0ZjVS5jNA=;
b=KKCFTg2hukDgFiUino+UjJ/ZGX4qMYPLYp8jOZqA/3lMxQLGS0uWO5TrSeq+njuvyl
hhjUSkmAsBLur7xdfWmvTniruKl1ID/rVImjZ7bpejn3G96p4ycKIF358DyEoF0MDtoV
6LVNOPWS+Fyam6NzjD76s81mYa7wDu/34hLEG7WUZGzTPox3ZQWFk0K/XNc3vBfekAAd
chdMYXpZ+Jt7fgEwI0ONJa6tX9Uoqjsrni3/a+Es6qkzf/TUo5Xs7vrV9JWmJPxtl93h
d0aLbQNxy9P9RGvdYBJczZu9wL9xIXrnAtQOUAUd4ioPwbWbgfiuPxCvxXF1QIUUhrMn
RLlg==
X-Received: by 10.140.109.247 with SMTP id l110mr33221943qgf.35.1449971091422;
Sat, 12 Dec 2015 17:44:51 -0800 (PST)
Received: from android-18788fb5f991b5a.nc-us.unovitch.com
(cpe-98-24-222-249.nc.res.rr.com. [98.24.222.249])
by smtp.gmail.com with ESMTPSA id m107sm1424254qgm.19.2015.12.12.17.44.50
(version=TLSv1/SSLv3 cipher=OTHER);
Sat, 12 Dec 2015 17:44:50 -0800 (PST)
From: Jason Unovitch <jason.unovitch@gmail.com>
X-Google-Original-From: Jason Unovitch <junovitch@FreeBSD.org>
User-Agent: K-9 Mail for Android
In-Reply-To: <m26103d8zx.fsf@freebsd.org>
References: <201512120313.tBC3DNQf013915@repo.freebsd.org>
<20151212124157.GB46628@Silverstone.nc-us.unovitch.com>
<m26103d8zx.fsf@freebsd.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain;
charset=UTF-8
Subject: Re: svn commit: r403581 - branches/2015Q4/sysutils/py-salt
Reply-to: junovitch@FreeBSD.org
Date: Sat, 12 Dec 2015 20:44:38 -0500
To: Dryice Liu <dryice@freebsd.org>
CC: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Message-ID: <23438DAC-7CC7-4CA4-A862-5F8CA0DB2F2F@FreeBSD.org>
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Dec 2015 01:44:52 -0000
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
On December 12, 2015 9:41:54 AM EST, Dryice Liu <dryice@freebsd.org> wrote:
>Jason Unovitch <junovitch@FreeBSD.org> wrote:
>
>> On Sat, Dec 12, 2015 at 03:13:23AM +0000, Dryice Dong Liu wrote:
>>> Author: dryice
>>> Date: Sat Dec 12 03:13:23 2015
>>> New Revision: 403581
>>> URL: https://svnweb.freebsd.org/changeset/ports/403581
>>>
>>> Log:
>>> MFH: r403109
>>>
>>> Update to 2015.8.3
>>>
>>> PR: 205043
>>> Submitted by: Christer Edwards <christer.edwards@gmail.com>
>(maintainer)
>>> Approved by: portmgr (feld)
>>
>> Please keep in mind the implied SVN task here... neither SVN nor
>> Tools/scripts/mfh will tell you if prior commits are actually needed
>to
>> build. Here the port is failing to build after this with the
>following
>> error since the prior commits were required.
>>
>> ===> Patching for py27-salt-2015.8.3
>> ===> Applying FreeBSD patches for py27-salt-2015.8.3
>> Ignoring previously applied (or reversed) patch.
>> 4 out of 4 hunks ignored--saving rejects to
>salt/utils/__init__.py.rej
>> => Patch patch-salt__utils____init__.py failed to apply cleanly.
>> => Patch(es) patch-salt__grains__core.py applied cleanly.
>> *** [do-patch] Error code 1
>
>You are right. This is my mistake. Thanks for fixing it.
>
>
>Dryice
Don't worry about it. Think "learning opportunity" instead of "mistake". It was an easy fix and certainly one that shows why we all review each others work.
-----BEGIN PGP SIGNATURE-----
iQFHBAEBCgAxKhxKYXNvbiBVbm92aXRjaCA8amFzb24udW5vdml0Y2hAZ21haWwu
Y29tPgUCVmzNaQAKCRBv1JwwFhyqbuyPB/9moLK6Q3HZb82XDZOXvZTGvfs1N5v/
6HiwLrcUkFlVvUIW8H09mgXKLqrBQKSIu01kC5TbmbTNrz8KIq/h4IZR8ORylWti
KRu8gIxStJbe14UKN1mZTPmFQPWcxzDTDmQIQ3Qg/8s0m+xt6yppRJHePHa+0dyg
EtoDs2KLCMESh+eSkHR/s8zJd5iyOuOHrpYN0Hwuw4YH4LuZVRoiLWQMRcPyBdlW
gw4TGCBtcBy6xQ5Godb4BgbL16pPxsb+ZBzl/veezau32zRJcVn4++6VS0nCOU2v
KaRemy6XOJcSA9vLQHD0lS6/LKDhIknW/9y7gU9albk8KrYLmbI6LIPi
=PCwp
-----END PGP SIGNATURE-----
From owner-svn-ports-branches@freebsd.org Sun Dec 13 06:32:13 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6AB6A42A2D;
Sun, 13 Dec 2015 06:32:13 +0000 (UTC)
(envelope-from koobs.freebsd@gmail.com)
Received: from mail-pa0-x22e.google.com (mail-pa0-x22e.google.com
[IPv6:2607:f8b0:400e:c03::22e])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id BCBA718C9;
Sun, 13 Dec 2015 06:32:13 +0000 (UTC)
(envelope-from koobs.freebsd@gmail.com)
Received: by pacdm15 with SMTP id dm15so86883834pac.3;
Sat, 12 Dec 2015 22:32:13 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=sender:reply-to:subject:references:to:cc:from:message-id:date
:user-agent:mime-version:in-reply-to:content-type
:content-transfer-encoding;
bh=BIiMWsDznQW4i7pmlgCfbatJxibUkswACP2MbSx1SGc=;
b=GqqjkLUlZCPw25YED6Y6DfVvd9LUDBUshNO5cwaCjIwbvFuWQQ9RKSfWWWuyJxiJcw
ZUX4MrjkCQONQc+hlm+vDZ9J4QgWjEApXjrPQadofOn69mLKuXh7tfTAG/2AItz9huaU
NR94SOVk+z1n6ioffq/esLnJnWTRD1GfbCN+cKdV6u3Pyjs4KCAiY1JHwe8QfJ6PbJaT
JowG01gXJCo7FoS7gxa22FPM+OwPYBdCRr7mTJ0KtGZiv/WEK991thRYSzQupD6quPzq
qZiafq4+SXZ1C6VAu3bs6seA42v0fksFgmEurRhcukrMs7WlKfPsT2EKa7ai91YmU+m1
zwPA==
X-Received: by 10.66.139.72 with SMTP id qw8mr36629474pab.130.1449988333136;
Sat, 12 Dec 2015 22:32:13 -0800 (PST)
Received: from ?IPv6:2001:44b8:31ae:7b01:e88a:629d:a199:b333?
(2001-44b8-31ae-7b01-e88a-629d-a199-b333.static.ipv6.internode.on.net.
[2001:44b8:31ae:7b01:e88a:629d:a199:b333])
by smtp.gmail.com with ESMTPSA id 72sm34521632pfi.33.2015.12.12.22.32.10
(version=TLSv1/SSLv3 cipher=OTHER);
Sat, 12 Dec 2015 22:32:12 -0800 (PST)
Sender: Kubilay Kocak <koobs.freebsd@gmail.com>
Reply-To: koobs@FreeBSD.org
Subject: Re: svn commit: r403581 - branches/2015Q4/sysutils/py-salt
References: <201512120313.tBC3DNQf013915@repo.freebsd.org>
<20151212124157.GB46628@Silverstone.nc-us.unovitch.com>
<m26103d8zx.fsf@freebsd.org>
<23438DAC-7CC7-4CA4-A862-5F8CA0DB2F2F@FreeBSD.org>
To: junovitch@FreeBSD.org, Dryice Liu <dryice@freebsd.org>
Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
From: Kubilay Kocak <koobs@FreeBSD.org>
Message-ID: <566D10E7.7030001@FreeBSD.org>
Date: Sun, 13 Dec 2015 17:32:07 +1100
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:42.0) Gecko/20100101
Thunderbird/42.0
MIME-Version: 1.0
In-Reply-To: <23438DAC-7CC7-4CA4-A862-5F8CA0DB2F2F@FreeBSD.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Dec 2015 06:32:14 -0000
On 13/12/2015 12:44 PM, Jason Unovitch wrote:
> Don't worry about it. Think "learning opportunity" instead of
> "mistake". It was an easy fix and certainly one that shows why we all
> review each others work.
*GROUP HUG*.
You rock Jason, has anyone told you that yet?
From owner-svn-ports-branches@freebsd.org Mon Dec 14 11:05:13 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F010A4313F;
Mon, 14 Dec 2015 11:05:13 +0000 (UTC)
(envelope-from koobs@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1167612F4;
Mon, 14 Dec 2015 11:05:13 +0000 (UTC)
(envelope-from koobs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBEB5Cj2051078;
Mon, 14 Dec 2015 11:05:12 GMT (envelope-from koobs@FreeBSD.org)
Received: (from koobs@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBEB5Cjv051077;
Mon, 14 Dec 2015 11:05:12 GMT (envelope-from koobs@FreeBSD.org)
Message-Id: <201512141105.tBEB5Cjv051077@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: koobs set sender to
koobs@FreeBSD.org using -f
From: Kubilay Kocak <koobs@FreeBSD.org>
Date: Mon, 14 Dec 2015 11:05:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403714 - branches/2015Q4/devel/py-icalendar
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Dec 2015 11:05:13 -0000
Author: koobs
Date: Mon Dec 14 11:05:11 2015
New Revision: 403714
URL: https://svnweb.freebsd.org/changeset/ports/403714
Log:
MFH: r403713
devel/py-icalendar: Allow build with Python 3.x
Allow building with Python 3.x (Supported since 3.6)
While I'm here,
* Add LICENSE_FILE
PR: 204935
Submitted by: Christian Geier <catcher+freebsdbugzilla lostpackets de>
Approved by: maintainer <jun-g daemonfreaks com>
Approved by: ports-secteam (blanket)
Modified:
branches/2015Q4/devel/py-icalendar/Makefile
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/devel/py-icalendar/Makefile
==============================================================================
--- branches/2015Q4/devel/py-icalendar/Makefile Mon Dec 14 11:02:39 2015 (r403713)
+++ branches/2015Q4/devel/py-icalendar/Makefile Mon Dec 14 11:05:11 2015 (r403714)
@@ -11,11 +11,12 @@ MAINTAINER= jun-g@daemonfreaks.com
COMMENT= Parser and generator of iCalender files for Python
LICENSE= BSD2CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE.rst
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}pytz>0:${PORTSDIR}/devel/py-pytz
-USES= python:2
+USES= python
USE_PYTHON= distutils autoplist
NO_ARCH= yes
From owner-svn-ports-branches@freebsd.org Tue Dec 15 21:04:16 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3433BA48DA2;
Tue, 15 Dec 2015 21:04:16 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E08421CA2;
Tue, 15 Dec 2015 21:04:15 +0000 (UTC)
(envelope-from rene@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBFL4FPH087641;
Tue, 15 Dec 2015 21:04:15 GMT (envelope-from rene@FreeBSD.org)
Received: (from rene@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBFL4E3Y087639;
Tue, 15 Dec 2015 21:04:14 GMT (envelope-from rene@FreeBSD.org)
Message-Id: <201512152104.tBFL4E3Y087639@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rene set sender to
rene@FreeBSD.org using -f
From: Rene Ladan <rene@FreeBSD.org>
Date: Tue, 15 Dec 2015 21:04:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403809 - branches/2015Q4/www/chromium
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2015 21:04:16 -0000
Author: rene
Date: Tue Dec 15 21:04:14 2015
New Revision: 403809
URL: https://svnweb.freebsd.org/changeset/ports/403809
Log:
MFH: r403797
www/chromium: update to 47.0.2526.80
The increased size of the main tarball is already reported at
https://code.google.com/p/chromium/issues/detail?id=569095
Security: http://vuxml.freebsd.org/freebsd/72c145df-a1e0-11e5-8ad0-00262d5ed8ee.html
Approved by: ports-secteam (feld)
Modified:
branches/2015Q4/www/chromium/Makefile
branches/2015Q4/www/chromium/distinfo
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/www/chromium/Makefile
==============================================================================
--- branches/2015Q4/www/chromium/Makefile Tue Dec 15 21:02:05 2015 (r403808)
+++ branches/2015Q4/www/chromium/Makefile Tue Dec 15 21:04:14 2015 (r403809)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= chromium
-PORTVERSION= 47.0.2526.73
+PORTVERSION= 47.0.2526.80
CATEGORIES= www
MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
Modified: branches/2015Q4/www/chromium/distinfo
==============================================================================
--- branches/2015Q4/www/chromium/distinfo Tue Dec 15 21:02:05 2015 (r403808)
+++ branches/2015Q4/www/chromium/distinfo Tue Dec 15 21:04:14 2015 (r403809)
@@ -1,4 +1,4 @@
-SHA256 (chromium-47.0.2526.73.tar.xz) = 6d66d01c8ddff6562ff13d30ed65ef0cdc2888d9e4924be615d576b7eb15f4f5
-SIZE (chromium-47.0.2526.73.tar.xz) = 394631144
-SHA256 (chromium-47.0.2526.73-testdata.tar.xz) = b7a3d7d77a2161f33728c357e62f746b29330d23920dc1b42dd86e3f1948805a
-SIZE (chromium-47.0.2526.73-testdata.tar.xz) = 117390036
+SHA256 (chromium-47.0.2526.80.tar.xz) = b107148323a3b641eae29bfeda298183c0d1c110ef96a04a13f329015d614d05
+SIZE (chromium-47.0.2526.80.tar.xz) = 1210266772
+SHA256 (chromium-47.0.2526.80-testdata.tar.xz) = 155165253d232cc2fd5f072d45aec98efca7ca38e29661890b3debc9ad310bfd
+SIZE (chromium-47.0.2526.80-testdata.tar.xz) = 117394704
From owner-svn-ports-branches@freebsd.org Tue Dec 15 21:23:02 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 69C64A48A33;
Tue, 15 Dec 2015 21:23:02 +0000 (UTC)
(envelope-from ohauer@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 416D61C49;
Tue, 15 Dec 2015 21:23:02 +0000 (UTC)
(envelope-from ohauer@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBFLN18b094267;
Tue, 15 Dec 2015 21:23:01 GMT (envelope-from ohauer@FreeBSD.org)
Received: (from ohauer@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBFLN0cD094259;
Tue, 15 Dec 2015 21:23:00 GMT (envelope-from ohauer@FreeBSD.org)
Message-Id: <201512152123.tBFLN0cD094259@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ohauer set sender to
ohauer@FreeBSD.org using -f
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Tue, 15 Dec 2015 21:23:00 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403813 - in branches/2015Q4/devel/subversion17: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2015 21:23:02 -0000
Author: ohauer
Date: Tue Dec 15 21:23:00 2015
New Revision: 403813
URL: https://svnweb.freebsd.org/changeset/ports/403813
Log:
MFH: r403807
- backport patch for CVE-2015-5343 [1]
- sync 220_subversion.conf.sample.in with subversion 1.8/1.9
- bump PORTREVISION
[1] http://subversion.apache.org/security/CVE-2015-5343-advisory.txt
Approved by: portmgr (feld@)
Added:
branches/2015Q4/devel/subversion17/files/patch-subversion__mod_dav_svn__util.c
- copied unchanged from r403807, head/devel/subversion17/files/patch-subversion__mod_dav_svn__util.c
Modified:
branches/2015Q4/devel/subversion17/Makefile.common
branches/2015Q4/devel/subversion17/files/220_subversion.conf.sample.in
branches/2015Q4/devel/subversion17/files/pkg-message.in
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/devel/subversion17/Makefile.common
==============================================================================
--- branches/2015Q4/devel/subversion17/Makefile.common Tue Dec 15 21:18:52 2015 (r403812)
+++ branches/2015Q4/devel/subversion17/Makefile.common Tue Dec 15 21:23:00 2015 (r403813)
@@ -3,11 +3,15 @@
PORTNAME= subversion
PORTVERSION= 1.7.22
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES+= devel
MASTER_SITES= APACHE/subversion
DIST_SUBDIR= subversion17
-PKGNAMESUFFIX= 17
+#PKGNAMESUFFIX= 17
+
+DEPRECATED= See https://subversion.apache.org/docs/release-notes/1.9.html#svn-1.7-deprecation
+EXPIRATION_DATE=2015-12-29
+
USE_KDE4= # Used below if KWallet support is enabled
GNU_CONFIGURE= yes
Modified: branches/2015Q4/devel/subversion17/files/220_subversion.conf.sample.in
==============================================================================
--- branches/2015Q4/devel/subversion17/files/220_subversion.conf.sample.in Tue Dec 15 21:18:52 2015 (r403812)
+++ branches/2015Q4/devel/subversion17/files/220_subversion.conf.sample.in Tue Dec 15 21:23:00 2015 (r403813)
@@ -57,6 +57,11 @@
##
##<IfModule dav_svn_module>
##<Location /svn/>
+## <ifModule mime_module>
+## RemoveEncoding .gz .tgz .Z
+## RemoveType .gz .tgz .Z
+## </ifModule>
+##
## # Enable Subversion
## DAV svn
##
Copied: branches/2015Q4/devel/subversion17/files/patch-subversion__mod_dav_svn__util.c (from r403807, head/devel/subversion17/files/patch-subversion__mod_dav_svn__util.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/devel/subversion17/files/patch-subversion__mod_dav_svn__util.c Tue Dec 15 21:23:00 2015 (r403813, copy of r403807, head/devel/subversion17/files/patch-subversion__mod_dav_svn__util.c)
@@ -0,0 +1,18 @@
+http://subversion.apache.org/security/CVE-2015-5343-advisory.txt
+================================================================
+--- subversion/mod_dav_svn/util.c.orig 2013-11-14 21:11:33 UTC
++++ subversion/mod_dav_svn/util.c
+@@ -753,7 +753,12 @@ request_body_to_string(svn_string_t **re
+
+ if (content_length)
+ {
+- buf = svn_stringbuf_create_ensure(content_length, pool);
++ /* Do not allocate more than 1 MB until we receive request body. */
++ apr_size_t alloc_len = 1 * 1024 *1024;
++ if (content_length < alloc_len)
++ alloc_len = (apr_size_t) content_length;
++
++ buf = svn_stringbuf_create_ensure(alloc_len, pool);
+ }
+ else
+ {
Modified: branches/2015Q4/devel/subversion17/files/pkg-message.in
==============================================================================
--- branches/2015Q4/devel/subversion17/files/pkg-message.in Tue Dec 15 21:18:52 2015 (r403812)
+++ branches/2015Q4/devel/subversion17/files/pkg-message.in Tue Dec 15 21:23:00 2015 (r403813)
@@ -1,2 +1,6 @@
The subversion dav modules are no longer activated in httpd.conf!
There is now a dedicated modules file in %%APACHEETCDIR%%/modules.d
+
+Attention:
+subversion17 is deprecated and scheduled for removal!
+Please consider updating to subversion 1.8/1.9
From owner-svn-ports-branches@freebsd.org Tue Dec 15 21:37:17 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5856EA48396;
Tue, 15 Dec 2015 21:37:17 +0000 (UTC)
(envelope-from ohauer@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 17BE214FD;
Tue, 15 Dec 2015 21:37:17 +0000 (UTC)
(envelope-from ohauer@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBFLbGWr098135;
Tue, 15 Dec 2015 21:37:16 GMT (envelope-from ohauer@FreeBSD.org)
Received: (from ohauer@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBFLbF5S098130;
Tue, 15 Dec 2015 21:37:15 GMT (envelope-from ohauer@FreeBSD.org)
Message-Id: <201512152137.tBFLbF5S098130@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ohauer set sender to
ohauer@FreeBSD.org using -f
From: Olli Hauer <ohauer@FreeBSD.org>
Date: Tue, 15 Dec 2015 21:37:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403816 - in branches/2015Q4/devel/subversion: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Dec 2015 21:37:17 -0000
Author: ohauer
Date: Tue Dec 15 21:37:15 2015
New Revision: 403816
URL: https://svnweb.freebsd.org/changeset/ports/403816
Log:
MFH: r403808
- update to 1.8.15
Version 1.8.15
(15 Dec 2015, from /branches/1.8.x)
http://svn.apache.org/repos/asf/subversion/tags/1.8.15
User-visible changes:
- Client-side bugfixes:
* gpg-agent: fix crash with non-canonical $HOME (r1691928, issue #4584)
- Client-side and server-side bugfixes:
* fix a segfault with old style text delta (r1618472 et al)
- Server-side bugfixes:
* fsfs: reduce memory allocation with Apache (r1591005 et al)
* mod_dav_svn: emit first log items as soon as possible (r1666965 et al)
* mod_dav_svn: use LimitXMLRequestBody for skel-encoded requests (r1687812)
- Bindings bugfixes:
* swig: fix memory corruption in svn_client_copy_source_t (r1694929)
Developer-visible changes:
- General:
* better configure-time detection of httpd authz fix (r1687304 et al)
* fix compilation with apr 1.2.x (r1701237)
Approved by: lev@ (explicit)
Approved by: portmgr (feld@)
Security: vid="daadef86-a366-11e5-8b40-20cf30e32f6d"
Modified:
branches/2015Q4/devel/subversion/Makefile
branches/2015Q4/devel/subversion/Makefile.common
branches/2015Q4/devel/subversion/distinfo
branches/2015Q4/devel/subversion/files/220_subversion.conf.sample.in
branches/2015Q4/devel/subversion/files/build-outputs.mk.addons
Modified: branches/2015Q4/devel/subversion/Makefile
==============================================================================
--- branches/2015Q4/devel/subversion/Makefile Tue Dec 15 21:37:12 2015 (r403815)
+++ branches/2015Q4/devel/subversion/Makefile Tue Dec 15 21:37:15 2015 (r403816)
@@ -1,7 +1,7 @@
# Created by: rooneg@electricjellyfish.net
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 3
MAINTAINER= lev@FreeBSD.org
COMMENT= Version control system
@@ -169,9 +169,9 @@ post-install: ${MKREPOS_TARGET}
(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - )
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
+
+post-install-SVNSERVE_WRAPPER-on:
@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample
-.endif
# ===============================================================================
repository: _mkrepos
Modified: branches/2015Q4/devel/subversion/Makefile.common
==============================================================================
--- branches/2015Q4/devel/subversion/Makefile.common Tue Dec 15 21:37:12 2015 (r403815)
+++ branches/2015Q4/devel/subversion/Makefile.common Tue Dec 15 21:37:15 2015 (r403816)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME?= subversion
-PORTVERSION= 1.8.14
+PORTVERSION= 1.8.15
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= APACHE/subversion
Modified: branches/2015Q4/devel/subversion/distinfo
==============================================================================
--- branches/2015Q4/devel/subversion/distinfo Tue Dec 15 21:37:12 2015 (r403815)
+++ branches/2015Q4/devel/subversion/distinfo Tue Dec 15 21:37:15 2015 (r403816)
@@ -1,2 +1,2 @@
-SHA256 (subversion18/subversion-1.8.14.tar.bz2) = 7f3883cdfcad4174e06dd94d6e3e8ec91856823268eebe60c924be76f5229a1f
-SIZE (subversion18/subversion-1.8.14.tar.bz2) = 6850562
+SHA256 (subversion18/subversion-1.8.15.tar.bz2) = cf98a1f7686cfd6a15cbcde8379f15730fd5e00a3573cdb035a6491dbcccc82c
+SIZE (subversion18/subversion-1.8.15.tar.bz2) = 6917489
Modified: branches/2015Q4/devel/subversion/files/220_subversion.conf.sample.in
==============================================================================
--- branches/2015Q4/devel/subversion/files/220_subversion.conf.sample.in Tue Dec 15 21:37:12 2015 (r403815)
+++ branches/2015Q4/devel/subversion/files/220_subversion.conf.sample.in Tue Dec 15 21:37:15 2015 (r403816)
@@ -39,6 +39,15 @@
## KeepAlive on
## MaxKeepAliveRequests 1000
##
+## # http://subversion.apache.org/docs/release-notes/1.7.html#server-performance-tuning
+## # Calculate your own values!
+## # For mod_dav_svn, a 1GB cache configuration with maximum data coverage looks like this
+## <IfModule dav_svn_module>
+## SVNInMemoryCacheSize 1048576
+## SVNCacheFullTexts on
+## SVNCacheTextDeltas on
+## </IfModule>
+##
## Multiple Repos with Digest auth:
## - AuthName is an arbitrary name that you choose for the authentication
## domain. Most browsers display this name in the dialog box when prompting
@@ -46,8 +55,13 @@
## - AuthType specifies the type of authentication to use.
## - AuthUserFile specifies the location of the password file to use.
##
-##<IfModule dav_module>
+##<IfModule dav_svn_module>
##<Location /svn/>
+## <ifModule mime_module>
+## RemoveEncoding .gz .tgz .Z
+## RemoveType .gz .tgz .Z
+## </ifModule>
+##
## # Enable Subversion
## DAV svn
##
Modified: branches/2015Q4/devel/subversion/files/build-outputs.mk.addons
==============================================================================
--- branches/2015Q4/devel/subversion/files/build-outputs.mk.addons Tue Dec 15 21:37:12 2015 (r403815)
+++ branches/2015Q4/devel/subversion/files/build-outputs.mk.addons Tue Dec 15 21:37:15 2015 (r403816)
@@ -2767,7 +2767,7 @@ subversion/tests/libsvn_ra_local/ra-loca
subversion/tests/libsvn_repos/dir-delta-editor.lo: subversion/tests/libsvn_repos/dir-delta-editor.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/libsvn_repos/dir-delta-editor.h subversion/tests/svn_test.h
-subversion/tests/libsvn_repos/repos-test.lo: subversion/tests/libsvn_repos/repos-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_repos_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/tests/libsvn_repos/dir-delta-editor.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
+subversion/tests/libsvn_repos/repos-test.lo: subversion/tests/libsvn_repos/repos-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_repos_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/tests/libsvn_repos/dir-delta-editor.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
subversion/tests/libsvn_subr/auth-test.lo: subversion/tests/libsvn_subr/auth-test.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/tests/svn_test.h
From owner-svn-ports-branches@freebsd.org Wed Dec 16 00:55:07 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 802E2A484FF;
Wed, 16 Dec 2015 00:55:07 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 3BAB51BD8;
Wed, 16 Dec 2015 00:55:07 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBG0t6td066827;
Wed, 16 Dec 2015 00:55:06 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBG0t5Vc066820;
Wed, 16 Dec 2015 00:55:05 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201512160055.tBG0t5Vc066820@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 16 Dec 2015 00:55:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403828 - in branches/2015Q4/dns: bind910 bind910/files
bind99 bind99/files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Dec 2015 00:55:07 -0000
Author: mat
Date: Wed Dec 16 00:55:05 2015
New Revision: 403828
URL: https://svnweb.freebsd.org/changeset/ports/403828
Log:
MFH: r403826
Update BIND9 to the latest patch releases, 9.9.8-P2, 9.10.3-P2, and snapshot.
Changes: https://kb.isc.org/article/AA-01326/81/BIND-9.9.8-P2-Release-Notes.html
Changes: https://kb.isc.org/article/AA-01328/81/BIND-9.10.3-P2-Release-Notes.html
Security: CVE-2015-3193
Security: CVE-2015-8000
Security: CVE-2015-8461
Sponsored by: Absolight
Modified:
branches/2015Q4/dns/bind910/Makefile
branches/2015Q4/dns/bind910/distinfo
branches/2015Q4/dns/bind910/files/patch-configure
branches/2015Q4/dns/bind99/Makefile
branches/2015Q4/dns/bind99/distinfo
branches/2015Q4/dns/bind99/files/patch-configure
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/dns/bind910/Makefile
==============================================================================
--- branches/2015Q4/dns/bind910/Makefile Wed Dec 16 00:50:47 2015 (r403827)
+++ branches/2015Q4/dns/bind910/Makefile Wed Dec 16 00:55:05 2015 (r403828)
@@ -5,10 +5,10 @@ PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/}
.if defined(BIND_TOOLS_SLAVE)
# dns/bind-tools here
-PORTREVISION= 1
+PORTREVISION= 0
.else
# dns/bind910 here
-PORTREVISION= 1
+PORTREVISION= 0
.endif
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
@@ -29,7 +29,7 @@ COMMENT= BIND DNS suite with updated DNS
LICENSE= ISCL
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.10.3
+ISCVERSION= 9.10.3-P2
MAKE_JOBS_UNSAFE= yes
Modified: branches/2015Q4/dns/bind910/distinfo
==============================================================================
--- branches/2015Q4/dns/bind910/distinfo Wed Dec 16 00:50:47 2015 (r403827)
+++ branches/2015Q4/dns/bind910/distinfo Wed Dec 16 00:55:05 2015 (r403828)
@@ -1,2 +1,2 @@
-SHA256 (bind-9.10.3.tar.gz) = 9ac33bd8754ab4b6ee449b1b2aa88e09f51cda088486f4ab1585acd920b98ff0
-SIZE (bind-9.10.3.tar.gz) = 8552545
+SHA256 (bind-9.10.3-P2.tar.gz) = 4a6c1911ac0d4b6be635b63de3429b6c168ea244043f12bbc8a4eb3368fd6ecd
+SIZE (bind-9.10.3-P2.tar.gz) = 8523719
Modified: branches/2015Q4/dns/bind910/files/patch-configure
==============================================================================
--- branches/2015Q4/dns/bind910/files/patch-configure Wed Dec 16 00:50:47 2015 (r403827)
+++ branches/2015Q4/dns/bind910/files/patch-configure Wed Dec 16 00:55:05 2015 (r403828)
@@ -1,4 +1,4 @@
---- configure.orig 2015-09-09 02:23:40 UTC
+--- configure.orig 2015-12-06 12:37:44 UTC
+++ configure
@@ -14100,27 +14100,9 @@ done
# problems start to show up.
@@ -79,7 +79,7 @@
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -21451,7 +21393,7 @@ $as_echo "" >&6; }
+@@ -21456,7 +21398,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).
Modified: branches/2015Q4/dns/bind99/Makefile
==============================================================================
--- branches/2015Q4/dns/bind99/Makefile Wed Dec 16 00:50:47 2015 (r403827)
+++ branches/2015Q4/dns/bind99/Makefile Wed Dec 16 00:55:05 2015 (r403828)
@@ -3,7 +3,7 @@
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMESUFFIX= 99
@@ -15,7 +15,7 @@ COMMENT= BIND DNS suite with updated DNS
LICENSE= ISCL
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.9.8
+ISCVERSION= 9.9.8-P2
MAKE_JOBS_UNSAFE= yes
Modified: branches/2015Q4/dns/bind99/distinfo
==============================================================================
--- branches/2015Q4/dns/bind99/distinfo Wed Dec 16 00:50:47 2015 (r403827)
+++ branches/2015Q4/dns/bind99/distinfo Wed Dec 16 00:55:05 2015 (r403828)
@@ -1,4 +1,4 @@
-SHA256 (bind-9.9.8.tar.gz) = 643997cdb0dd232a4c9f7c0f1436841fbf325c6b7269e6490bf5f380eda344e3
-SIZE (bind-9.9.8.tar.gz) = 8015834
-SHA256 (9.9.8-rpz2+rl.14038.05.patch.xz) = 1b22dec59f2c6ee798db1b9dfee252117a9a05b0646635eb8b25124298b12a26
-SIZE (9.9.8-rpz2+rl.14038.05.patch.xz) = 39212
+SHA256 (bind-9.9.8-P2.tar.gz) = f5841926e19637b93ec0b44b5abfbab2410e692736cf11143d461f656fbdf329
+SIZE (bind-9.9.8-P2.tar.gz) = 7996912
+SHA256 (9.9.8-P2-rpz2+rl.14038.05.patch.xz) = d729e23fcb2baa657b36cdb9da3b224d29c155aa911a4880b3d500bc7453d178
+SIZE (9.9.8-P2-rpz2+rl.14038.05.patch.xz) = 39232
Modified: branches/2015Q4/dns/bind99/files/patch-configure
==============================================================================
--- branches/2015Q4/dns/bind99/files/patch-configure Wed Dec 16 00:50:47 2015 (r403827)
+++ branches/2015Q4/dns/bind99/files/patch-configure Wed Dec 16 00:55:05 2015 (r403828)
@@ -1,6 +1,6 @@
---- configure.orig 2015-09-09 02:23:50 UTC
+--- configure.orig 2015-12-06 12:12:21 UTC
+++ configure
-@@ -14284,27 +14284,9 @@ done
+@@ -14289,27 +14289,9 @@ done
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
@@ -30,7 +30,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
$as_echo_n "checking linking as $TRY_LIBS... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -14347,47 +14329,7 @@ $as_echo "no" >&6; } ;;
+@@ -14352,47 +14334,7 @@ $as_echo "no" >&6; } ;;
no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
esac
@@ -79,7 +79,7 @@
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -20337,7 +20279,7 @@ $as_echo "" >&6; }
+@@ -20342,7 +20284,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).
From owner-svn-ports-branches@freebsd.org Wed Dec 16 13:57:14 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39077A43009;
Wed, 16 Dec 2015 13:57:14 +0000 (UTC)
(envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E64981F17;
Wed, 16 Dec 2015 13:57:13 +0000 (UTC)
(envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBGDvDYb043890;
Wed, 16 Dec 2015 13:57:13 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGDvDIe043889;
Wed, 16 Dec 2015 13:57:13 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201512161357.tBGDvDIe043889@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 16 Dec 2015 13:57:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403862 - branches/2015Q4/x11/dmenu
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Dec 2015 13:57:14 -0000
Author: jbeich
Date: Wed Dec 16 13:57:12 2015
New Revision: 403862
URL: https://svnweb.freebsd.org/changeset/ports/403862
Log:
MFH: r403653
x11/dmenu: make XINERAMA=on actually work
Approved by: portmgr blanket
Approved by: ports-secteam (feld)
Modified:
branches/2015Q4/x11/dmenu/Makefile
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/x11/dmenu/Makefile
==============================================================================
--- branches/2015Q4/x11/dmenu/Makefile Wed Dec 16 13:45:17 2015 (r403861)
+++ branches/2015Q4/x11/dmenu/Makefile Wed Dec 16 13:57:12 2015 (r403862)
@@ -3,6 +3,7 @@
PORTNAME= dmenu
PORTVERSION= 4.5
+PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://dl.suckless.org/tools/ \
http://schot.a-eskwadraat.nl/files/
@@ -33,6 +34,8 @@ post-patch:
-e "s,%%PREFIX%%,${PREFIX},g" \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%MANPREFIX%%,${MANPREFIX},g"
+
+post-patch-XINERAMA-off:
@${REINPLACE_CMD} -e 's,$${XINERAMALIBS},,g' \
-e 's,$${XINERAMAFLAGS},,g' ${WRKSRC}/config.mk
From owner-svn-ports-branches@freebsd.org Thu Dec 17 10:00:14 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F121A49345
for <svn-ports-branches@mailman.ysv.freebsd.org>;
Thu, 17 Dec 2015 10:00:14 +0000 (UTC)
(envelope-from josebarros@trt16.gov.br)
Received: from gator4179.hostgator.com (gator4179.hostgator.com
[108.167.133.35])
(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 C4AB61AFD
for <svn-ports-branches@freebsd.org>; Thu, 17 Dec 2015 10:00:12 +0000 (UTC)
(envelope-from josebarros@trt16.gov.br)
Received: from [37.139.50.116] (port=3778 helo=qmcily)
by gator4179.hostgator.com with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256)
(Exim 4.85) (envelope-from <josebarros@trt16.gov.br>)
id 1a9TC4-000UsO-ED; Thu, 17 Dec 2015 01:41:45 -0600
Message-ID: <484DFBA8A3774D0ED2D79E2A3E11FB38@trt16.gov.br>
From: "REPLICA-WATCHES" <josebarros@trt16.gov.br>
To: <community-relations@sri.com>, <paul.hohle@amd.com>,
<svn-ports-branches@freebsd.org>, <daisy.lawhorn@moose-mail.com>,
<swdrc@appna.org>, <info@tecnonexo.com>, <falcon1@shabakah.com>
Subject: Best watches in the world. Best present.
Date: Thu, 17 Dec 2015 10:34:46 +0400
MIME-Version: 1.0
X-AntiAbuse: This header was added to track abuse,
please include it with any abuse report
X-AntiAbuse: Primary Hostname - gator4179.hostgator.com
X-AntiAbuse: Original Domain - freebsd.org
X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12]
X-AntiAbuse: Sender Address Domain - trt16.gov.br
X-BWhitelist: no
X-Source-IP: 37.139.50.116
X-Exim-ID: 1a9TC4-000UsO-ED
X-Source:
X-Source-Args:
X-Source-Dir:
X-Source-Sender: (qmcily) [37.139.50.116]:3778
X-Source-Auth: dawn@trulyyoursllc.com
X-Email-Count: 0
X-Source-Cap: dHJ1bHl5cnM7dHJ1bHl5cnM7Z2F0b3I0MTc5Lmhvc3RnYXRvci5jb20=
Content-Type: text/plain; charset="windows-1251"
Content-Transfer-Encoding: quoted-printable
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2015 10:00:14 -0000
=A0Order your=A0watches, bags here- http://goo.gl/1dfrLo
uyb m bc n y xcpb
ys wz woe ygb ul iz
cksgm co nn podg eihmq mudvn
ggtl cc oyk c epcy jq
skzg mjx mhk t efbc jrq
wxhx n wrtfz uws dj r
akqg gc bhp kwews bz hbuaa
gqzjv qnr nzw ppyci w xpm
mrd iivqw ak v uaah ip
h ez s h gcpzf eibxe
ks fqulj gn zqjrk mhd fm
vuf x b toj ztb hciet
krgyw g nqcty milq zaz hg
mcj iyecc jz sfema wifiq kciab
ss kcim ntpq h qjcj wq
e hxzw ovggu dss w y
od ip i urrc c h
jtsad aedz cyxxn hfn qcyvv six
xaoy al gq le pwq jaat
do tvrqq s x dhvbn cm
kjfiz dm rg y mxr et
vjvuw fzivr cwott wgsk k gjh
vgclh zh zfq omz hcwm ltv
cxzch gd bzza jrhhz y pba
aope ic vcqr ege xlz k
foia vh c ilylu s s
wyyzs dg pn piobp kcn p
b sq pl xsq thz fwq
xuk nhmrz mltdg gjky lidqf crd
ilv f yn ood sdh a
lik l vsg z rzbb jmhol
d t m krssc s b
bae h tnidu df vhrz es
xft jwq t uvqd r cnl
ujgo pivnj sj avofj b uzj
levi he q rfv zsod kp
vqyb bdxo epms bmfh mma z
b jv s xvst ksmld ceo
wm j eaqgu f eims q
lyq hcwu tiff czwbh x ub
uejrs obci mlzgs ovhm wet ugwx
inhlx z ff xw luetr rqjey
uwcr x mlp pjbf bfomj na
v qska ibl lf fg aff
w igbwa eaiz batt p qv
adsil rrxqr wck zpppj pnue koljc
zhf wzqv ldb cuzlc u bfq
aymx ju rlfq pb opdsm she
va o whiel mvic xn hdj
q hstlv jr ju gbke q
u cgeq vbdc cktq mttxz d
n iyyj oedz clyyd eq kyk
lf yoe wwkdg cdinz mrpl yiglj
gn ggx url pwxwm fn cfk
From owner-svn-ports-branches@freebsd.org Thu Dec 17 10:38:20 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76614A49162;
Thu, 17 Dec 2015 10:38:20 +0000 (UTC)
(envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 351011F97;
Thu, 17 Dec 2015 10:38:20 +0000 (UTC)
(envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHAcJsI011335;
Thu, 17 Dec 2015 10:38:19 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHAcJVt011333;
Thu, 17 Dec 2015 10:38:19 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201512171038.tBHAcJVt011333@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 17 Dec 2015 10:38:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403902 - in branches/2015Q4/security: tor tor-devel
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2015 10:38:20 -0000
Author: amdmi3
Date: Thu Dec 17 10:38:18 2015
New Revision: 403902
URL: https://svnweb.freebsd.org/changeset/ports/403902
Log:
MFH: r403901
- Fix build with TCMALLOC and STATIC_TOR
PR: 204739
Submitted by: amdmi3
Approved by: portmgr blanket
Approved by: ports-secteam blanket
Modified:
branches/2015Q4/security/tor-devel/Makefile
branches/2015Q4/security/tor/Makefile
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/security/tor-devel/Makefile
==============================================================================
--- branches/2015Q4/security/tor-devel/Makefile Thu Dec 17 10:36:53 2015 (r403901)
+++ branches/2015Q4/security/tor-devel/Makefile Thu Dec 17 10:38:18 2015 (r403902)
@@ -87,7 +87,7 @@ TOR_LIBEVENT_LIBS:= -levent_openssl ${TO
.if ${PORT_OPTIONS:MTCMALLOC}
CONFIGURE_ARGS+= --with-tcmalloc
.if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS += ${LOCALBASE}/lib/libtcmalloc.so:${PORTSDIR}/devel/google-perftools
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libtcmalloc.a:${PORTSDIR}/devel/google-perftools
.else
LIB_DEPENDS+= libtcmalloc.so:${PORTSDIR}/devel/google-perftools
.endif
@@ -104,8 +104,15 @@ CONFIGURE_ARGS+= --disable-transparent
.endif
post-patch:
- @${REINPLACE_CMD} -E -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
- -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
+ @${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
+ ${WRKSRC}/configure
+
+post-patch-STATIC_TOR-off:
+ @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
+ ${WRKSRC}/configure
+
+post-patch-STATIC_TOR-on:
+ @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \
${WRKSRC}/configure
post-configure:
Modified: branches/2015Q4/security/tor/Makefile
==============================================================================
--- branches/2015Q4/security/tor/Makefile Thu Dec 17 10:36:53 2015 (r403901)
+++ branches/2015Q4/security/tor/Makefile Thu Dec 17 10:38:18 2015 (r403902)
@@ -84,7 +84,7 @@ TOR_LIBEVENT_LIBS:= -levent_openssl ${TO
.if ${PORT_OPTIONS:MTCMALLOC}
CONFIGURE_ARGS+= --with-tcmalloc
.if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS += ${LOCALBASE}/lib/libtcmalloc.so:${PORTSDIR}/devel/google-perftools
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libtcmalloc.a:${PORTSDIR}/devel/google-perftools
.else
LIB_DEPENDS+= libtcmalloc.so:${PORTSDIR}/devel/google-perftools
.endif
@@ -101,8 +101,15 @@ CONFIGURE_ARGS+= --disable-transparent
.endif
post-patch:
- @${REINPLACE_CMD} -E -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
- -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
+ @${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2@g" \
+ ${WRKSRC}/configure
+
+post-patch-STATIC_TOR-off:
+ @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
+ ${WRKSRC}/configure
+
+post-patch-STATIC_TOR-on:
+ @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \
${WRKSRC}/configure
post-configure:
From owner-svn-ports-branches@freebsd.org Thu Dec 17 17:22:26 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3529EA4962D;
Thu, 17 Dec 2015 17:22:26 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id E057817B7;
Thu, 17 Dec 2015 17:22:25 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHHMPP4031372;
Thu, 17 Dec 2015 17:22:25 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHHMOn4031370;
Thu, 17 Dec 2015 17:22:24 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201512171722.tBHHMOn4031370@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 17 Dec 2015 17:22:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403914 - in branches/2015Q4/sysutils/tmux: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2015 17:22:26 -0000
Author: mat
Date: Thu Dec 17 17:22:24 2015
New Revision: 403914
URL: https://svnweb.freebsd.org/changeset/ports/403914
Log:
MFH: r403912
Fix a regression in 2.1 where tmux was misshandling key strokes if you
started typing too fast after a tmux command.
PR: 205372
Submitted by: me jahn de
Obtained from: https://github.com/tmux/tmux/commit/8c8cddbe022af5ece9949804cacffbee6b8972fa
Sponsored by: Absolight
Added:
branches/2015Q4/sysutils/tmux/files/patch-server-client.c
- copied unchanged from r403912, head/sysutils/tmux/files/patch-server-client.c
Modified:
branches/2015Q4/sysutils/tmux/Makefile
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/sysutils/tmux/Makefile
==============================================================================
--- branches/2015Q4/sysutils/tmux/Makefile Thu Dec 17 17:19:48 2015 (r403913)
+++ branches/2015Q4/sysutils/tmux/Makefile Thu Dec 17 17:22:24 2015 (r403914)
@@ -4,6 +4,7 @@
PORTNAME= tmux
PORTVERSION= 2.0
PORTREVISION= 1
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//}
Copied: branches/2015Q4/sysutils/tmux/files/patch-server-client.c (from r403912, head/sysutils/tmux/files/patch-server-client.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/sysutils/tmux/files/patch-server-client.c Thu Dec 17 17:22:24 2015 (r403914, copy of r403912, head/sysutils/tmux/files/patch-server-client.c)
@@ -0,0 +1,34 @@
+From 8c8cddbe022af5ece9949804cacffbee6b8972fa Mon Sep 17 00:00:00 2001
+From: nicm <nicm>
+Date: Tue, 20 Oct 2015 14:19:27 +0000
+Subject: [PATCH] The table could change when retrying so don't save it at
+ start of server_client_handle_key.
+
+--- server-client.c.orig 2015-09-27 09:42:08 UTC
++++ server-client.c
+@@ -540,7 +540,7 @@ server_client_handle_key(struct client *
+ struct window *w;
+ struct window_pane *wp;
+ struct timeval tv;
+- struct key_table *table = c->keytable;
++ struct key_table *table;
+ struct key_binding bd_find, *bd;
+ int xtimeout;
+
+@@ -606,7 +606,7 @@ server_client_handle_key(struct client *
+ retry:
+ /* Try to see if there is a key binding in the current table. */
+ bd_find.key = key;
+- bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find);
++ bd = RB_FIND(key_bindings, &c->keytable->key_bindings, &bd_find);
+ if (bd != NULL) {
+ /*
+ * Key was matched in this table. If currently repeating but a
+@@ -624,6 +624,7 @@ retry:
+ * Take a reference to this table to make sure the key binding
+ * doesn't disappear.
+ */
++ table = c->keytable;
+ table->references++;
+
+ /*
From owner-svn-ports-branches@freebsd.org Thu Dec 17 18:16:47 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04F08A49B56;
Thu, 17 Dec 2015 18:16:47 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id C60651CD7;
Thu, 17 Dec 2015 18:16:46 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHIGjfh046189;
Thu, 17 Dec 2015 18:16:45 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHIGjL3046187;
Thu, 17 Dec 2015 18:16:45 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201512171816.tBHIGjL3046187@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 17 Dec 2015 18:16:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403918 - in branches/2015Q4/print/foomatic-filters: .
files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2015 18:16:47 -0000
Author: feld
Date: Thu Dec 17 18:16:45 2015
New Revision: 403918
URL: https://svnweb.freebsd.org/changeset/ports/403918
Log:
MFH: r403917
print/foomatic-filters: Patch vulnerabilities
Approved by: ports-secteam (with hat)
Security: CVE-2015-8560
Security: CVE-2015-8327
Added:
branches/2015Q4/print/foomatic-filters/files/patch-util.c
- copied unchanged from r403917, head/print/foomatic-filters/files/patch-util.c
Modified:
branches/2015Q4/print/foomatic-filters/Makefile
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/print/foomatic-filters/Makefile
==============================================================================
--- branches/2015Q4/print/foomatic-filters/Makefile Thu Dec 17 18:15:54 2015 (r403917)
+++ branches/2015Q4/print/foomatic-filters/Makefile Thu Dec 17 18:16:45 2015 (r403918)
@@ -3,7 +3,7 @@
PORTNAME= foomatic-filters
PORTVERSION= 4.0.17
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= http://www.openprinting.org/download/foomatic/
Copied: branches/2015Q4/print/foomatic-filters/files/patch-util.c (from r403917, head/print/foomatic-filters/files/patch-util.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/print/foomatic-filters/files/patch-util.c Thu Dec 17 18:16:45 2015 (r403918, copy of r403917, head/print/foomatic-filters/files/patch-util.c)
@@ -0,0 +1,12 @@
+Resolves CVE-2015-8327 and CVE-2015-8560
+--- util.c.orig 2015-12-17 18:07:21 UTC
++++ util.c
+@@ -31,7 +31,7 @@
+ #include <assert.h>
+
+
+-const char* shellescapes = "|<>&!$\'\"#*?()[]{}";
++const char* shellescapes = "|;<>&!$\'\"`#*?()[]{}";
+
+ const char * temp_dir()
+ {
From owner-svn-ports-branches@freebsd.org Thu Dec 17 18:33:58 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA752A4A77C;
Thu, 17 Dec 2015 18:33:58 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 9C3EC17E3;
Thu, 17 Dec 2015 18:33:58 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHIXvu6052086;
Thu, 17 Dec 2015 18:33:57 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHIXvdI052082;
Thu, 17 Dec 2015 18:33:57 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201512171833.tBHIXvdI052082@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 17 Dec 2015 18:33:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403920 - in branches/2015Q4/print/cups-filters: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2015 18:33:59 -0000
Author: feld
Date: Thu Dec 17 18:33:57 2015
New Revision: 403920
URL: https://svnweb.freebsd.org/changeset/ports/403920
Log:
MFH: r400989
Update to version 1.1.0
PR: 204114
Submitted by: Naram Qashat (maintainer)
Approved by: ports-secteam (with hat)
Modified:
branches/2015Q4/print/cups-filters/Makefile
branches/2015Q4/print/cups-filters/distinfo
branches/2015Q4/print/cups-filters/files/patch-utils_cups-browsed.c
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/print/cups-filters/Makefile
==============================================================================
--- branches/2015Q4/print/cups-filters/Makefile Thu Dec 17 18:31:45 2015 (r403919)
+++ branches/2015Q4/print/cups-filters/Makefile Thu Dec 17 18:33:57 2015 (r403920)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cups-filters
-PORTVERSION= 1.0.76
+PORTVERSION= 1.1.0
CATEGORIES= print
MASTER_SITES= http://www.openprinting.org/download/cups-filters/
Modified: branches/2015Q4/print/cups-filters/distinfo
==============================================================================
--- branches/2015Q4/print/cups-filters/distinfo Thu Dec 17 18:31:45 2015 (r403919)
+++ branches/2015Q4/print/cups-filters/distinfo Thu Dec 17 18:33:57 2015 (r403920)
@@ -1,2 +1,2 @@
-SHA256 (cups-filters-1.0.76.tar.xz) = b3a190b11a102af6994e41d2cfa47e5caf999c7d046f3c0b940f6b38729f5b32
-SIZE (cups-filters-1.0.76.tar.xz) = 1353016
+SHA256 (cups-filters-1.1.0.tar.xz) = 03505a803799308f22bebd6ff8162a12efb4cfd5cfcd39f81479ae6301d52c7b
+SIZE (cups-filters-1.1.0.tar.xz) = 1357364
Modified: branches/2015Q4/print/cups-filters/files/patch-utils_cups-browsed.c
==============================================================================
--- branches/2015Q4/print/cups-filters/files/patch-utils_cups-browsed.c Thu Dec 17 18:31:45 2015 (r403919)
+++ branches/2015Q4/print/cups-filters/files/patch-utils_cups-browsed.c Thu Dec 17 18:33:57 2015 (r403920)
@@ -1,4 +1,4 @@
---- utils/cups-browsed.c.orig 2014-11-27 12:00:47 UTC
+--- utils/cups-browsed.c.orig 2015-10-27 15:04:51 UTC
+++ utils/cups-browsed.c
@@ -23,16 +23,16 @@
@@ -16,6 +16,6 @@
#include <stdio.h>
#include <sys/stat.h>
+#include <ifaddrs.h>
- #include <assert.h>
#include <stdlib.h>
#include <time.h>
+ #include <signal.h>
From owner-svn-ports-branches@freebsd.org Thu Dec 17 18:34:46 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id D972FA4A7F4;
Thu, 17 Dec 2015 18:34:46 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id A69571935;
Thu, 17 Dec 2015 18:34:46 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHIYj4O052279;
Thu, 17 Dec 2015 18:34:45 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHIYjq5052277;
Thu, 17 Dec 2015 18:34:45 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201512171834.tBHIYjq5052277@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 17 Dec 2015 18:34:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403921 - branches/2015Q4/print/cups-filters
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2015 18:34:47 -0000
Author: feld
Date: Thu Dec 17 18:34:45 2015
New Revision: 403921
URL: https://svnweb.freebsd.org/changeset/ports/403921
Log:
MFH: r403304
- Update to 1.2.0
PR: 204915
Submitted by: maintainer
Approved by: mat (mentor)
Differential Revision: https://reviews.freebsd.org/D4400
Approved by: ports-secteam (with hat)
Modified:
branches/2015Q4/print/cups-filters/Makefile
branches/2015Q4/print/cups-filters/distinfo
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/print/cups-filters/Makefile
==============================================================================
--- branches/2015Q4/print/cups-filters/Makefile Thu Dec 17 18:33:57 2015 (r403920)
+++ branches/2015Q4/print/cups-filters/Makefile Thu Dec 17 18:34:45 2015 (r403921)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cups-filters
-PORTVERSION= 1.1.0
+PORTVERSION= 1.2.0
CATEGORIES= print
MASTER_SITES= http://www.openprinting.org/download/cups-filters/
Modified: branches/2015Q4/print/cups-filters/distinfo
==============================================================================
--- branches/2015Q4/print/cups-filters/distinfo Thu Dec 17 18:33:57 2015 (r403920)
+++ branches/2015Q4/print/cups-filters/distinfo Thu Dec 17 18:34:45 2015 (r403921)
@@ -1,2 +1,2 @@
-SHA256 (cups-filters-1.1.0.tar.xz) = 03505a803799308f22bebd6ff8162a12efb4cfd5cfcd39f81479ae6301d52c7b
-SIZE (cups-filters-1.1.0.tar.xz) = 1357364
+SHA256 (cups-filters-1.2.0.tar.xz) = 31dcb71dc79129056a5b0f6d30880bdb6511ee7acd06a3f5bd4e9d2684801d62
+SIZE (cups-filters-1.2.0.tar.xz) = 1357268
From owner-svn-ports-branches@freebsd.org Thu Dec 17 18:35:38 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4A27EA4A8A6;
Thu, 17 Dec 2015 18:35:38 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id F13551A31;
Thu, 17 Dec 2015 18:35:37 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHIZbJD052506;
Thu, 17 Dec 2015 18:35:37 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHIZaFo052502;
Thu, 17 Dec 2015 18:35:36 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201512171835.tBHIZaFo052502@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 17 Dec 2015 18:35:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403922 - in branches/2015Q4/print/cups-filters: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2015 18:35:38 -0000
Author: feld
Date: Thu Dec 17 18:35:36 2015
New Revision: 403922
URL: https://svnweb.freebsd.org/changeset/ports/403922
Log:
MFH: r403515
- Update to 1.3.0
Changes: http://fossies.org/linux/cups-filters/NEWS
PR: 205235
Submitted by: Naram Qashat <cyberbotx@cyberbotx.com> (maintainer)
Approved by: ports-secteam (with hat)
Modified:
branches/2015Q4/print/cups-filters/Makefile
branches/2015Q4/print/cups-filters/distinfo
branches/2015Q4/print/cups-filters/files/patch-utils_cups-browsed.c
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/print/cups-filters/Makefile
==============================================================================
--- branches/2015Q4/print/cups-filters/Makefile Thu Dec 17 18:34:45 2015 (r403921)
+++ branches/2015Q4/print/cups-filters/Makefile Thu Dec 17 18:35:36 2015 (r403922)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cups-filters
-PORTVERSION= 1.2.0
+PORTVERSION= 1.3.0
CATEGORIES= print
MASTER_SITES= http://www.openprinting.org/download/cups-filters/
Modified: branches/2015Q4/print/cups-filters/distinfo
==============================================================================
--- branches/2015Q4/print/cups-filters/distinfo Thu Dec 17 18:34:45 2015 (r403921)
+++ branches/2015Q4/print/cups-filters/distinfo Thu Dec 17 18:35:36 2015 (r403922)
@@ -1,2 +1,2 @@
-SHA256 (cups-filters-1.2.0.tar.xz) = 31dcb71dc79129056a5b0f6d30880bdb6511ee7acd06a3f5bd4e9d2684801d62
-SIZE (cups-filters-1.2.0.tar.xz) = 1357268
+SHA256 (cups-filters-1.3.0.tar.xz) = 61b669809dda352a427546e09de5a68a3d960c7646ef5c590772d4aa1b445995
+SIZE (cups-filters-1.3.0.tar.xz) = 1362904
Modified: branches/2015Q4/print/cups-filters/files/patch-utils_cups-browsed.c
==============================================================================
--- branches/2015Q4/print/cups-filters/files/patch-utils_cups-browsed.c Thu Dec 17 18:34:45 2015 (r403921)
+++ branches/2015Q4/print/cups-filters/files/patch-utils_cups-browsed.c Thu Dec 17 18:35:36 2015 (r403922)
@@ -1,6 +1,6 @@
---- utils/cups-browsed.c.orig 2015-10-27 15:04:51 UTC
+--- utils/cups-browsed.c.orig 2015-12-09 01:09:45 UTC
+++ utils/cups-browsed.c
-@@ -23,16 +23,16 @@
+@@ -23,17 +23,17 @@
#include <ctype.h>
#include <errno.h>
@@ -11,6 +11,7 @@
#include <sys/types.h>
#include <net/if.h>
#include <netinet/in.h>
+ #include <arpa/inet.h>
-#include <ifaddrs.h>
#include <resolv.h>
#include <stdio.h>
From owner-svn-ports-branches@freebsd.org Thu Dec 17 18:36:15 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F747A4A922;
Thu, 17 Dec 2015 18:36:15 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2AA511B2E;
Thu, 17 Dec 2015 18:36:15 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHIaEs8052697;
Thu, 17 Dec 2015 18:36:14 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHIaEYn052695;
Thu, 17 Dec 2015 18:36:14 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201512171836.tBHIaEYn052695@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 17 Dec 2015 18:36:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403923 - branches/2015Q4/print/cups-filters
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2015 18:36:15 -0000
Author: feld
Date: Thu Dec 17 18:36:13 2015
New Revision: 403923
URL: https://svnweb.freebsd.org/changeset/ports/403923
Log:
MFH: r403919
print/cups-filters: Update to 1.4.0
This update resolves a code execution vulnerability.
Approved by: ports-secteam (with hat)
Security: CVE-2015-8560
Modified:
branches/2015Q4/print/cups-filters/Makefile
branches/2015Q4/print/cups-filters/distinfo
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/print/cups-filters/Makefile
==============================================================================
--- branches/2015Q4/print/cups-filters/Makefile Thu Dec 17 18:35:36 2015 (r403922)
+++ branches/2015Q4/print/cups-filters/Makefile Thu Dec 17 18:36:13 2015 (r403923)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cups-filters
-PORTVERSION= 1.3.0
+PORTVERSION= 1.4.0
CATEGORIES= print
MASTER_SITES= http://www.openprinting.org/download/cups-filters/
Modified: branches/2015Q4/print/cups-filters/distinfo
==============================================================================
--- branches/2015Q4/print/cups-filters/distinfo Thu Dec 17 18:35:36 2015 (r403922)
+++ branches/2015Q4/print/cups-filters/distinfo Thu Dec 17 18:36:13 2015 (r403923)
@@ -1,2 +1,2 @@
-SHA256 (cups-filters-1.3.0.tar.xz) = 61b669809dda352a427546e09de5a68a3d960c7646ef5c590772d4aa1b445995
-SIZE (cups-filters-1.3.0.tar.xz) = 1362904
+SHA256 (cups-filters-1.4.0.tar.xz) = 0aa63f82a3feb5c46136b917722ee1565b4c1e2e533db4716f62d31e29c6579a
+SIZE (cups-filters-1.4.0.tar.xz) = 1373724
From owner-svn-ports-branches@freebsd.org Thu Dec 17 19:04:28 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 43362A4A04A;
Thu, 17 Dec 2015 19:04:28 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 1014E18BF;
Thu, 17 Dec 2015 19:04:27 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHJ4R4X064330;
Thu, 17 Dec 2015 19:04:27 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHJ4RQV064328;
Thu, 17 Dec 2015 19:04:27 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201512171904.tBHJ4RQV064328@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 17 Dec 2015 19:04:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403933 - branches/2015Q4/www/joomla3
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2015 19:04:28 -0000
Author: feld
Date: Thu Dec 17 19:04:26 2015
New Revision: 403933
URL: https://svnweb.freebsd.org/changeset/ports/403933
Log:
MFH: r403930
www/joomla3: Update to 3.4.6
Approved by: ports-secteam (with hat)
Security: a9f60ce8-a4e0-11e5-b864-14dae9d210b8
Modified:
branches/2015Q4/www/joomla3/Makefile
branches/2015Q4/www/joomla3/distinfo
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/www/joomla3/Makefile
==============================================================================
--- branches/2015Q4/www/joomla3/Makefile Thu Dec 17 19:03:54 2015 (r403932)
+++ branches/2015Q4/www/joomla3/Makefile Thu Dec 17 19:04:26 2015 (r403933)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= joomla
-PORTVERSION= 3.4.5
+PORTVERSION= 3.4.6
CATEGORIES= www
PKGNAMESUFFIX= 3
Modified: branches/2015Q4/www/joomla3/distinfo
==============================================================================
--- branches/2015Q4/www/joomla3/distinfo Thu Dec 17 19:03:54 2015 (r403932)
+++ branches/2015Q4/www/joomla3/distinfo Thu Dec 17 19:04:26 2015 (r403933)
@@ -1,2 +1,2 @@
-SHA256 (joomla-joomla-cms-3.4.5_GH0.tar.gz) = f6592083d4f17313c2b02a6169d768bd5a7f3da576eb3b63e27e36dbfac368a0
-SIZE (joomla-joomla-cms-3.4.5_GH0.tar.gz) = 9509172
+SHA256 (joomla-joomla-cms-3.4.6_GH0.tar.gz) = e9d8c54d0da7c7b0eb566710cc9d86bb936f13548206e0ee8311f57fe8c7c34d
+SIZE (joomla-joomla-cms-3.4.6_GH0.tar.gz) = 9510229
From owner-svn-ports-branches@freebsd.org Thu Dec 17 19:05:45 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A4FDA4A184;
Thu, 17 Dec 2015 19:05:45 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 060811AEE;
Thu, 17 Dec 2015 19:05:44 +0000 (UTC)
(envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHJ5iB0064653;
Thu, 17 Dec 2015 19:05:44 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHJ5hVU064651;
Thu, 17 Dec 2015 19:05:43 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201512171905.tBHJ5hVU064651@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 17 Dec 2015 19:05:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403935 - branches/2015Q4/www/py-amf
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Dec 2015 19:05:45 -0000
Author: feld
Date: Thu Dec 17 19:05:43 2015
New Revision: 403935
URL: https://svnweb.freebsd.org/changeset/ports/403935
Log:
MFH: r403934
www/py-amf: Update to 0.8.0
Approved by: ports-secteam (with hat)
Security: CVE-2015-8549
Modified:
branches/2015Q4/www/py-amf/Makefile
branches/2015Q4/www/py-amf/distinfo
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/www/py-amf/Makefile
==============================================================================
--- branches/2015Q4/www/py-amf/Makefile Thu Dec 17 19:05:07 2015 (r403934)
+++ branches/2015Q4/www/py-amf/Makefile Thu Dec 17 19:05:43 2015 (r403935)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= amf
-PORTVERSION= 0.7.2
+PORTVERSION= 0.8.0
CATEGORIES= www devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Modified: branches/2015Q4/www/py-amf/distinfo
==============================================================================
--- branches/2015Q4/www/py-amf/distinfo Thu Dec 17 19:05:07 2015 (r403934)
+++ branches/2015Q4/www/py-amf/distinfo Thu Dec 17 19:05:43 2015 (r403935)
@@ -1,2 +1,2 @@
-SHA256 (PyAMF-0.7.2.tar.gz) = 3e39d43989f75a4d35f4c2a591d8163637f67eaf856bdae749bd8b64b1c1b672
-SIZE (PyAMF-0.7.2.tar.gz) = 1648116
+SHA256 (PyAMF-0.8.0.tar.gz) = 0455d68983e3ee49f82721132074877428d58acec52f19697a88c03b5fba74e4
+SIZE (PyAMF-0.8.0.tar.gz) = 1651369
From owner-svn-ports-branches@freebsd.org Fri Dec 18 14:27:24 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id E860CA4B43A;
Fri, 18 Dec 2015 14:27:24 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id B6370174B;
Fri, 18 Dec 2015 14:27:24 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBIERNfh005954;
Fri, 18 Dec 2015 14:27:23 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBIERNFb005953;
Fri, 18 Dec 2015 14:27:23 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201512181427.tBIERNFb005953@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Fri, 18 Dec 2015 14:27:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r403965 - in branches/2015Q4/sysutils/tmux: . files
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Dec 2015 14:27:25 -0000
Author: mat
Date: Fri Dec 18 14:27:23 2015
New Revision: 403965
URL: https://svnweb.freebsd.org/changeset/ports/403965
Log:
MFH: -r403912
backout commit r403914, the quarterly branch has 2.0, not 2.1.
Fix a regression in 2.1 where tmux was misshandling key strokes if you
started typing too fast after a tmux command.
PR: 205372
Submitted by: me jahn de
Obtained from: https://github.com/tmux/tmux/commit/8c8cddbe022af5ece9949804cacffbee6b8972fa
Sponsored by: Absolight
Deleted:
branches/2015Q4/sysutils/tmux/files/patch-server-client.c
Modified:
branches/2015Q4/sysutils/tmux/Makefile
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/sysutils/tmux/Makefile
==============================================================================
--- branches/2015Q4/sysutils/tmux/Makefile Fri Dec 18 14:23:32 2015 (r403964)
+++ branches/2015Q4/sysutils/tmux/Makefile Fri Dec 18 14:27:23 2015 (r403965)
@@ -4,7 +4,6 @@
PORTNAME= tmux
PORTVERSION= 2.0
PORTREVISION= 1
-PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//}
From owner-svn-ports-branches@freebsd.org Sat Dec 19 12:58:28 2015
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E5C8A4CC96;
Sat, 19 Dec 2015 12:58:28 +0000 (UTC)
(envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 3662F1D33;
Sat, 19 Dec 2015 12:58:28 +0000 (UTC)
(envelope-from rakuco@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBJCwRTE009442;
Sat, 19 Dec 2015 12:58:27 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBJCwQJu009434;
Sat, 19 Dec 2015 12:58:26 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201512191258.tBJCwQJu009434@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rakuco set sender to
rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sat, 19 Dec 2015 12:58:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-branches@freebsd.org
Subject: svn commit: r404014 - in branches/2015Q4: devel/py-pykde4
games/kajongg x11/kdelibs4 x11/kdelibs4/files x11/plasma-scriptengine-python
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
<svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>,
<mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Dec 2015 12:58:28 -0000
Author: rakuco
Date: Sat Dec 19 12:58:26 2015
New Revision: 404014
URL: https://svnweb.freebsd.org/changeset/ports/404014
Log:
MFH: r403982
Remove ${STAGEDIR} from pyc/pyo files installed with kdelibs's CMake macros.
Bug 200018 is caused by the .pyc/.pyo files installed by devel/py-pykde4
containing references to the stage directory in them. When
editors/kate-plugin-pate is built by a user with write-access to those
PyKDE4 .pyc/.pyo files, they are rewritten automatically by Python to point
to their current location, which most of the times is different from the
staging location of where devel/py-pykde4 was built. This at the very least
leads to a filesystem violation in Poudriere.
The fix I landed upstream involves making kdelibs's PythonCompile.py accept
a --destination-dir parameter with the directory we want to register in the
.pyc/.pyo files, just like several ports do in their build or post-install
targets by calling Python's compileall.py module with -d.
The patches in files/ look somewhat confusing because we already patch
PythonMacros.cmake to build .pyo files and had to integrate the other
patches into it. At least I have added some context to
patch-cmake_modules_PythonMacros.cmake to reduce the confusion.
Bump PORTREVISION in affected ports:
- devel/py-pykde4: Install .pyc/.pyo files with ${STAGEDIR} in them.
- games/kajongg: The plist now includes .pyo files, and was adjusted to work
with Python 3 in the future if necessary.
- x11/kdelibs4: Install new CMake files.
- x11/plasma-scriptengine-python: Install .pyc/.pyo files with ${STAGEDIR}
in them.
PR: 200018
Approved by: ports-secteam (feld)
Added:
branches/2015Q4/x11/kdelibs4/files/patch-git_016841a
- copied unchanged from r403982, head/x11/kdelibs4/files/patch-git_016841a
branches/2015Q4/x11/kdelibs4/files/patch-git_94f1d2f
- copied unchanged from r403982, head/x11/kdelibs4/files/patch-git_94f1d2f
Modified:
branches/2015Q4/devel/py-pykde4/Makefile
branches/2015Q4/games/kajongg/Makefile
branches/2015Q4/games/kajongg/pkg-plist
branches/2015Q4/x11/kdelibs4/Makefile
branches/2015Q4/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake
branches/2015Q4/x11/plasma-scriptengine-python/Makefile
Directory Properties:
branches/2015Q4/ (props changed)
Modified: branches/2015Q4/devel/py-pykde4/Makefile
==============================================================================
--- branches/2015Q4/devel/py-pykde4/Makefile Sat Dec 19 11:03:36 2015 (r404013)
+++ branches/2015Q4/devel/py-pykde4/Makefile Sat Dec 19 12:58:26 2015 (r404014)
@@ -2,6 +2,7 @@
PORTNAME= pykde4
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde python
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Modified: branches/2015Q4/games/kajongg/Makefile
==============================================================================
--- branches/2015Q4/games/kajongg/Makefile Sat Dec 19 11:03:36 2015 (r404013)
+++ branches/2015Q4/games/kajongg/Makefile Sat Dec 19 12:58:26 2015 (r404014)
@@ -2,6 +2,7 @@
PORTNAME= kajongg
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= games kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
Modified: branches/2015Q4/games/kajongg/pkg-plist
==============================================================================
--- branches/2015Q4/games/kajongg/pkg-plist Sat Dec 19 11:03:36 2015 (r404013)
+++ branches/2015Q4/games/kajongg/pkg-plist Sat Dec 19 12:58:26 2015 (r404014)
@@ -2,128 +2,187 @@ bin/kajongg
bin/kajonggserver
share/applications/kde4/kajongg.desktop
share/apps/kajongg/about.py
-share/apps/kajongg/about.pyc
+share/apps/kajongg/%%PYCACHE%%about.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%about.%%PYO_SUFFIX%%
share/apps/kajongg/altint.py
-share/apps/kajongg/altint.pyc
+share/apps/kajongg/%%PYCACHE%%altint.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%altint.%%PYO_SUFFIX%%
share/apps/kajongg/animation.py
-share/apps/kajongg/animation.pyc
+share/apps/kajongg/%%PYCACHE%%animation.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%animation.%%PYO_SUFFIX%%
share/apps/kajongg/background.py
-share/apps/kajongg/background.pyc
+share/apps/kajongg/%%PYCACHE%%background.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%background.%%PYO_SUFFIX%%
share/apps/kajongg/backgroundselector.py
-share/apps/kajongg/backgroundselector.pyc
+share/apps/kajongg/%%PYCACHE%%backgroundselector.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%backgroundselector.%%PYO_SUFFIX%%
share/apps/kajongg/backgroundselector.ui
share/apps/kajongg/board.py
-share/apps/kajongg/board.pyc
+share/apps/kajongg/%%PYCACHE%%board.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%board.%%PYO_SUFFIX%%
share/apps/kajongg/chat.py
-share/apps/kajongg/chat.pyc
+share/apps/kajongg/%%PYCACHE%%chat.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%chat.%%PYO_SUFFIX%%
share/apps/kajongg/client.py
-share/apps/kajongg/client.pyc
+share/apps/kajongg/%%PYCACHE%%client.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%client.%%PYO_SUFFIX%%
share/apps/kajongg/common.py
-share/apps/kajongg/common.pyc
+share/apps/kajongg/%%PYCACHE%%common.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%common.%%PYO_SUFFIX%%
share/apps/kajongg/config.py
-share/apps/kajongg/config.pyc
+share/apps/kajongg/%%PYCACHE%%config.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%config.%%PYO_SUFFIX%%
share/apps/kajongg/configdialog.py
-share/apps/kajongg/configdialog.pyc
+share/apps/kajongg/%%PYCACHE%%configdialog.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%configdialog.%%PYO_SUFFIX%%
share/apps/kajongg/deferredutil.py
-share/apps/kajongg/deferredutil.pyc
+share/apps/kajongg/%%PYCACHE%%deferredutil.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%deferredutil.%%PYO_SUFFIX%%
share/apps/kajongg/dialogs.py
-share/apps/kajongg/dialogs.pyc
+share/apps/kajongg/%%PYCACHE%%dialogs.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%dialogs.%%PYO_SUFFIX%%
share/apps/kajongg/differ.py
-share/apps/kajongg/differ.pyc
+share/apps/kajongg/%%PYCACHE%%differ.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%differ.%%PYO_SUFFIX%%
share/apps/kajongg/game.py
-share/apps/kajongg/game.pyc
+share/apps/kajongg/%%PYCACHE%%game.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%game.%%PYO_SUFFIX%%
share/apps/kajongg/games.py
-share/apps/kajongg/games.pyc
+share/apps/kajongg/%%PYCACHE%%games.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%games.%%PYO_SUFFIX%%
share/apps/kajongg/genericdelegates.py
-share/apps/kajongg/genericdelegates.pyc
+share/apps/kajongg/%%PYCACHE%%genericdelegates.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%genericdelegates.%%PYO_SUFFIX%%
share/apps/kajongg/guiutil.py
-share/apps/kajongg/guiutil.pyc
+share/apps/kajongg/%%PYCACHE%%guiutil.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%guiutil.%%PYO_SUFFIX%%
share/apps/kajongg/hand.py
-share/apps/kajongg/hand.pyc
+share/apps/kajongg/%%PYCACHE%%hand.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%hand.%%PYO_SUFFIX%%
share/apps/kajongg/handboard.py
-share/apps/kajongg/handboard.pyc
+share/apps/kajongg/%%PYCACHE%%handboard.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%handboard.%%PYO_SUFFIX%%
share/apps/kajongg/humanclient.py
-share/apps/kajongg/humanclient.pyc
+share/apps/kajongg/%%PYCACHE%%humanclient.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%humanclient.%%PYO_SUFFIX%%
share/apps/kajongg/intelligence.py
-share/apps/kajongg/intelligence.pyc
+share/apps/kajongg/%%PYCACHE%%intelligence.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%intelligence.%%PYO_SUFFIX%%
share/apps/kajongg/kajongg.py
share/apps/kajongg/kajonggserver.py
share/apps/kajongg/kajonggui.rc
share/apps/kajongg/kde.py
-share/apps/kajongg/kde.pyc
+share/apps/kajongg/%%PYCACHE%%kde.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%kde.%%PYO_SUFFIX%%
share/apps/kajongg/kdestub.py
-share/apps/kajongg/kdestub.pyc
+share/apps/kajongg/%%PYCACHE%%kdestub.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%kdestub.%%PYO_SUFFIX%%
share/apps/kajongg/log.py
-share/apps/kajongg/log.pyc
+share/apps/kajongg/%%PYCACHE%%log.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%log.%%PYO_SUFFIX%%
share/apps/kajongg/login.py
-share/apps/kajongg/login.pyc
+share/apps/kajongg/%%PYCACHE%%login.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%login.%%PYO_SUFFIX%%
share/apps/kajongg/mainwindow.py
-share/apps/kajongg/mainwindow.pyc
+share/apps/kajongg/%%PYCACHE%%mainwindow.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%mainwindow.%%PYO_SUFFIX%%
share/apps/kajongg/meld.py
-share/apps/kajongg/meld.pyc
+share/apps/kajongg/%%PYCACHE%%meld.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%meld.%%PYO_SUFFIX%%
share/apps/kajongg/message.py
-share/apps/kajongg/message.pyc
+share/apps/kajongg/%%PYCACHE%%message.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%message.%%PYO_SUFFIX%%
share/apps/kajongg/modeltest.py
-share/apps/kajongg/modeltest.pyc
+share/apps/kajongg/%%PYCACHE%%modeltest.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%modeltest.%%PYO_SUFFIX%%
share/apps/kajongg/move.py
-share/apps/kajongg/move.pyc
+share/apps/kajongg/%%PYCACHE%%move.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%move.%%PYO_SUFFIX%%
share/apps/kajongg/permutations.py
-share/apps/kajongg/permutations.pyc
+share/apps/kajongg/%%PYCACHE%%permutations.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%permutations.%%PYO_SUFFIX%%
share/apps/kajongg/player.py
-share/apps/kajongg/player.pyc
+share/apps/kajongg/%%PYCACHE%%player.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%player.%%PYO_SUFFIX%%
share/apps/kajongg/playerlist.py
-share/apps/kajongg/playerlist.pyc
+share/apps/kajongg/%%PYCACHE%%playerlist.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%playerlist.%%PYO_SUFFIX%%
share/apps/kajongg/predefined.py
-share/apps/kajongg/predefined.pyc
+share/apps/kajongg/%%PYCACHE%%predefined.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%predefined.%%PYO_SUFFIX%%
share/apps/kajongg/qstring.py
-share/apps/kajongg/qstring.pyc
+share/apps/kajongg/%%PYCACHE%%qstring.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%qstring.%%PYO_SUFFIX%%
share/apps/kajongg/qt.py
-share/apps/kajongg/qt.pyc
+share/apps/kajongg/%%PYCACHE%%qt.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%qt.%%PYO_SUFFIX%%
share/apps/kajongg/qt4.py
-share/apps/kajongg/qt4.pyc
+share/apps/kajongg/%%PYCACHE%%qt4.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%qt4.%%PYO_SUFFIX%%
share/apps/kajongg/qt4reactor.py
-share/apps/kajongg/qt4reactor.pyc
+share/apps/kajongg/%%PYCACHE%%qt4reactor.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%qt4reactor.%%PYO_SUFFIX%%
share/apps/kajongg/qt5.py
-share/apps/kajongg/qt5.pyc
+share/apps/kajongg/%%PYCACHE%%qt5.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%qt5.%%PYO_SUFFIX%%
share/apps/kajongg/query.py
-share/apps/kajongg/query.pyc
+share/apps/kajongg/%%PYCACHE%%query.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%query.%%PYO_SUFFIX%%
share/apps/kajongg/rule.py
-share/apps/kajongg/rule.pyc
+share/apps/kajongg/%%PYCACHE%%rule.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%rule.%%PYO_SUFFIX%%
share/apps/kajongg/rulecode.py
-share/apps/kajongg/rulecode.pyc
+share/apps/kajongg/%%PYCACHE%%rulecode.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%rulecode.%%PYO_SUFFIX%%
share/apps/kajongg/rulesetselector.py
-share/apps/kajongg/rulesetselector.pyc
+share/apps/kajongg/%%PYCACHE%%rulesetselector.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%rulesetselector.%%PYO_SUFFIX%%
share/apps/kajongg/scene.py
-share/apps/kajongg/scene.pyc
+share/apps/kajongg/%%PYCACHE%%scene.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%scene.%%PYO_SUFFIX%%
share/apps/kajongg/scoring.py
-share/apps/kajongg/scoring.pyc
+share/apps/kajongg/%%PYCACHE%%scoring.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%scoring.%%PYO_SUFFIX%%
share/apps/kajongg/scoringdialog.py
-share/apps/kajongg/scoringdialog.pyc
+share/apps/kajongg/%%PYCACHE%%scoringdialog.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%scoringdialog.%%PYO_SUFFIX%%
share/apps/kajongg/server.py
-share/apps/kajongg/server.pyc
+share/apps/kajongg/%%PYCACHE%%server.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%server.%%PYO_SUFFIX%%
share/apps/kajongg/sound.py
-share/apps/kajongg/sound.pyc
+share/apps/kajongg/%%PYCACHE%%sound.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%sound.%%PYO_SUFFIX%%
share/apps/kajongg/statesaver.py
-share/apps/kajongg/statesaver.pyc
+share/apps/kajongg/%%PYCACHE%%statesaver.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%statesaver.%%PYO_SUFFIX%%
share/apps/kajongg/tables.py
-share/apps/kajongg/tables.pyc
+share/apps/kajongg/%%PYCACHE%%tables.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%tables.%%PYO_SUFFIX%%
share/apps/kajongg/tile.py
-share/apps/kajongg/tile.pyc
+share/apps/kajongg/%%PYCACHE%%tile.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%tile.%%PYO_SUFFIX%%
share/apps/kajongg/tileset.py
-share/apps/kajongg/tileset.pyc
+share/apps/kajongg/%%PYCACHE%%tileset.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%tileset.%%PYO_SUFFIX%%
share/apps/kajongg/tilesetselector.py
-share/apps/kajongg/tilesetselector.pyc
+share/apps/kajongg/%%PYCACHE%%tilesetselector.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%tilesetselector.%%PYO_SUFFIX%%
share/apps/kajongg/tilesetselector.ui
share/apps/kajongg/tree.py
-share/apps/kajongg/tree.pyc
+share/apps/kajongg/%%PYCACHE%%tree.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%tree.%%PYO_SUFFIX%%
share/apps/kajongg/uitile.py
-share/apps/kajongg/uitile.pyc
+share/apps/kajongg/%%PYCACHE%%uitile.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%uitile.%%PYO_SUFFIX%%
share/apps/kajongg/uiwall.py
-share/apps/kajongg/uiwall.pyc
+share/apps/kajongg/%%PYCACHE%%uiwall.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%uiwall.%%PYO_SUFFIX%%
share/apps/kajongg/util.py
-share/apps/kajongg/util.pyc
+share/apps/kajongg/%%PYCACHE%%util.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%util.%%PYO_SUFFIX%%
share/apps/kajongg/visible.py
-share/apps/kajongg/visible.pyc
+share/apps/kajongg/%%PYCACHE%%visible.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%visible.%%PYO_SUFFIX%%
share/apps/kajongg/voices/female1/COPYRIGHT
share/apps/kajongg/voices/female1/b1.ogg
share/apps/kajongg/voices/female1/b2.ogg
@@ -300,7 +359,8 @@ share/apps/kajongg/voices/male2/wn.ogg
share/apps/kajongg/voices/male2/ws.ogg
share/apps/kajongg/voices/male2/ww.ogg
share/apps/kajongg/wall.py
-share/apps/kajongg/wall.pyc
+share/apps/kajongg/%%PYCACHE%%wall.%%PYC_SUFFIX%%
+share/apps/kajongg/%%PYCACHE%%wall.%%PYO_SUFFIX%%
share/doc/HTML/en/kajongg/chat.png
share/doc/HTML/en/kajongg/common
share/doc/HTML/en/kajongg/config_background.png
Modified: branches/2015Q4/x11/kdelibs4/Makefile
==============================================================================
--- branches/2015Q4/x11/kdelibs4/Makefile Sat Dec 19 11:03:36 2015 (r404013)
+++ branches/2015Q4/x11/kdelibs4/Makefile Sat Dec 19 12:58:26 2015 (r404014)
@@ -3,7 +3,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
Modified: branches/2015Q4/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake
==============================================================================
--- branches/2015Q4/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake Sat Dec 19 11:03:36 2015 (r404013)
+++ branches/2015Q4/x11/kdelibs4/files/patch-cmake_modules_PythonMacros.cmake Sat Dec 19 12:58:26 2015 (r404014)
@@ -1,6 +1,13 @@
---- cmake/modules/PythonMacros.cmake.orig 2013-01-23 22:44:16.000000000 +0100
-+++ cmake/modules/PythonMacros.cmake 2013-02-27 13:39:48.000000000 +0100
-@@ -43,9 +43,11 @@
+The pyo-related changes are (at least for now) FreeBSD-specific and are present
+in order to install .pyo files in addition to .pyc files when installing Python
+modules.
+
+The "--destination-dir" changes are required to fix PR 200018 and come from a
+change landed upstream, 94f1d2f ("PythonMacros: specify destination directory
+in byte-compiled files"). See patch-git_94f1d2f for more information.
+--- cmake/modules/PythonMacros.cmake
++++ cmake/modules/PythonMacros.cmake
+@@ -41,16 +41,18 @@ macro(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR)
if(PYTHON_VERSION_STRING VERSION_GREATER 3.1)
# To get the right version for suffix
set(_bin_pyc "${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/__pycache__/${_filenamebase}.cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}.pyc")
@@ -12,25 +19,37 @@
set(_py_install_dir "${DESTINATION_DIR}")
endif()
-@@ -60,6 +62,7 @@
- TARGET compile_python_files
+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+
+ # Setting because it will be displayed later, in compile_python_files
+- set(_message "Byte-compiling ${_bin_py} to ${_bin_pyc}")
++ set(_message "Byte-compiling ${_bin_py} to ${_bin_pyc} and ${_bin_pyo}")
+
+ string(REPLACE "/" "_" _rule_name "${_basepath}/${_bin_pyc}")
+ add_custom_target("${_rule_name}" ALL)
+@@ -60,7 +62,8 @@ macro(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR)
+ add_custom_command(
+ TARGET "${_rule_name}"
COMMAND "${CMAKE_COMMAND}" -E echo "${_message}"
- COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}"
-+ COMMAND "${PYTHON_EXECUTABLE}" -O "${_python_compile_py}" "${_bin_py}"
+- COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}"
++ COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}"
++ COMMAND "${PYTHON_EXECUTABLE}" -O "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}"
DEPENDS "${_absfilename}"
)
else()
-@@ -68,11 +71,13 @@
+@@ -68,12 +71,13 @@ macro(PYTHON_INSTALL SOURCE_FILE DESTINATION_DIR)
+ TARGET "${_rule_name}"
COMMAND "${CMAKE_COMMAND}" -E echo "${_message}"
COMMAND "${CMAKE_COMMAND}" -E copy "${_absfilename}" "${_bin_py}"
- COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}"
-+ COMMAND "${PYTHON_EXECUTABLE}" -O "${_python_compile_py}" "${_bin_py}"
+- COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "${_bin_py}"
++ COMMAND "${PYTHON_EXECUTABLE}" "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}"
++ COMMAND "${PYTHON_EXECUTABLE}" -O "${_python_compile_py}" "--destination-dir" "${DESTINATION_DIR}" "${_bin_py}"
DEPENDS "${_absfilename}"
)
endif()
- install(FILES ${_bin_pyc} DESTINATION "${_py_install_dir}")
-+ install(FILES ${_bin_pyo} DESTINATION "${_py_install_dir}")
+- install(FILES ${_bin_pyc} DESTINATION "${_py_install_dir}")
++ install(FILES ${_bin_pyc} ${_bin_pyo} DESTINATION "${_py_install_dir}")
unset(_py_install_dir)
unset(_message)
Copied: branches/2015Q4/x11/kdelibs4/files/patch-git_016841a (from r403982, head/x11/kdelibs4/files/patch-git_016841a)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/x11/kdelibs4/files/patch-git_016841a Sat Dec 19 12:58:26 2015 (r404014, copy of r403982, head/x11/kdelibs4/files/patch-git_016841a)
@@ -0,0 +1,78 @@
+commit 016841aeb0b180981122085e9b1d49ae66951670
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date: Fri Dec 18 13:35:35 2015 +0100
+
+ FindPyKDE4: Make PYKDE4_INSTALL_PYTHON_FILES use PYTHON_INSTALL.
+
+ Commit 94f1d2f ("PythonMacros: specify destination directory in
+ byte-compiled files") broke Kajongg's build because it uses the
+ PYKDE4_INSTALL_PYTHON_FILES() macro, whose use of PythonCompile.py had
+ not been updated.
+
+ Instead of just passing --destination-dir in FindPyKDE4.cmake, rewrite
+ the PYKDE4_INSTALL_PYTHON_FILES() macro to use PythonMacros's
+ PYTHON_INSTALL(). Not only does this fix Kajongg's build, but it also
+ removes a lot of code duplication and makes
+ PYKDE4_INSTALL_PYTHON_FILES() work with Python 3.2+'s different .pyc
+ location.
+
+ REVIEW: 126413
+
+Required for PR 200018.
+--- cmake/modules/FindPyKDE4.cmake
++++ cmake/modules/FindPyKDE4.cmake
+@@ -9,6 +9,7 @@
+ # This file is in the public domain.
+
+ INCLUDE(FindPythonInterp)
++include(PythonMacros)
+
+ SET(PYKDE4_FOUND FALSE)
+
+@@ -104,45 +105,8 @@ ENDIF(PYTHONINTERP_FOUND)
+ # project..
+ #
+ MACRO(PYKDE4_INSTALL_PYTHON_FILES)
+-
+- ADD_CUSTOM_TARGET(pysupport ALL)
+ FOREACH (_current_file ${ARGN})
+-
+- # Install the source file.
+- INSTALL(FILES ${_current_file} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+-
+- # Byte compile and install the .pyc file.
+- GET_FILENAME_COMPONENT(_absfilename ${_current_file} ABSOLUTE)
+- GET_FILENAME_COMPONENT(_filename ${_current_file} NAME)
+- GET_FILENAME_COMPONENT(_filenamebase ${_current_file} NAME_WE)
+- GET_FILENAME_COMPONENT(_basepath ${_current_file} PATH)
+- SET(_bin_py ${CMAKE_BINARY_DIR}/${_basepath}/${_filename})
+- SET(_bin_pyc ${CMAKE_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+-
+- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+-
+- SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
+-
+- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
+- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
+- ADD_CUSTOM_COMMAND(
+- TARGET pysupport
+- COMMAND ${CMAKE_COMMAND} -E echo ${message}
+- COMMAND ${PYTHON_EXECUTABLE} ${current_module_dir}/PythonCompile.py ${_bin_py}
+- DEPENDS ${_absfilename}
+- )
+- ELSE(_abs_bin_py STREQUAL ${_absfilename})
+- ADD_CUSTOM_COMMAND(
+- TARGET pysupport
+- COMMAND ${CMAKE_COMMAND} -E echo ${message}
+- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
+- COMMAND ${PYTHON_EXECUTABLE} ${current_module_dir}/PythonCompile.py ${_bin_py}
+- DEPENDS ${_absfilename}
+- )
+- ENDIF(_abs_bin_py STREQUAL ${_absfilename})
+-
+- INSTALL(FILES ${_bin_pyc} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+-
++ python_install(${_current_file} ${DATA_INSTALL_DIR}/${PROJECT_NAME})
+ ENDFOREACH (_current_file)
+ ENDMACRO(PYKDE4_INSTALL_PYTHON_FILES)
+
Copied: branches/2015Q4/x11/kdelibs4/files/patch-git_94f1d2f (from r403982, head/x11/kdelibs4/files/patch-git_94f1d2f)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/2015Q4/x11/kdelibs4/files/patch-git_94f1d2f Sat Dec 19 12:58:26 2015 (r404014, copy of r403982, head/x11/kdelibs4/files/patch-git_94f1d2f)
@@ -0,0 +1,67 @@
+commit 94f1d2fa9582a2942d5154b85c849cc3c6140e31
+Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date: Wed Dec 16 18:25:13 2015 +0100
+
+ PythonMacros: specify destination directory in byte-compiled files.
+
+ The PYTHON_INSTALL() macro is a wrapper around the py_compile Python
+ module that also installs the byte-code (.pyc) file it generates.
+
+ However, when a .py file is passed to py_compile without any additional
+ arguments, its full path is recorded in the .pyc file. This is
+ problematic, as most distributions install all files into a build root
+ instead of simply copying files to / as part of the packaging process.
+ In this case, the generated .pyc file will have something like
+ /wrkdir/buildroot/usr/lib/python2.7/site-packages/Foo/my_module.py
+ in it. Not only does this show up in exception tracebacks, but if the
+ user later invokes my_module.py and has write access to my_module's
+ directory, my_module.pyc will be rewritten with the right path to
+ my_module.py (without the build root). This can lead to uninstallation
+ errors if the package management system checks each file before removal,
+ for example.
+
+ Fix it by rewritting the PythonCompile.py script so that it takes a
+ --destination-dir argument that we use to pass the full path to
+ my_module.py instead of letting it be (wrongly) deduced.
+
+ It is important to note that PythonCompile.py now uses the argparse
+ module, which is not present in Python <= 2.6, Python 3.0 and Python
+ 3.1.
+
+ REVIEW: 126345
+
+Required for PR 200018. Part of this commit is in patch-cmake_modules_PythonMacros.py.
+--- cmake/modules/PythonCompile.py
++++ cmake/modules/PythonCompile.py
+@@ -1,4 +1,29 @@
+ # By Simon Edwards <simon@simonzone.com>
+ # This file is in the public domain.
+-import py_compile, sys
+-sys.exit(py_compile.main())
++
++"""
++Byte-compiles a given Python source file, generating a .pyc file or, if the
++Python executable was invoked with -O, a .pyo file from it.
++It uses the --destination-dir option to set the path to the source file (which
++will appear in tracebacks, for example), so that if the .py file was in a build
++root will appear with the right path.
++"""
++
++import argparse
++import os
++import py_compile
++
++
++if __name__ == '__main__':
++ parser = argparse.ArgumentParser('Byte-compiles a Python source file.')
++ parser.add_argument('-d', '--destination-dir', required=True,
++ help='Location where the source file will be '
++ 'installed, without any build roots.')
++ parser.add_argument('source_file',
++ help='Source file to byte-compile.')
++
++ args = parser.parse_args()
++
++ dfile = os.path.join(args.destination_dir,
++ os.path.basename(args.source_file))
++ py_compile.compile(args.source_file, dfile=dfile)
Modified: branches/2015Q4/x11/plasma-scriptengine-python/Makefile
==============================================================================
--- branches/2015Q4/x11/plasma-scriptengine-python/Makefile Sat Dec 19 11:03:36 2015 (r404013)
+++ branches/2015Q4/x11/plasma-scriptengine-python/Makefile Sat Dec 19 12:58:26 2015 (r404014)
@@ -2,6 +2,7 @@
PORTNAME= plasma-scriptengine-python
PORTVERSION= ${KDE4_WORKSPACE_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
DISTNAME= kde-workspace-${PORTVERSION}