From owner-svn-ports-branches@FreeBSD.ORG Tue Feb 10 07:20:38 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5E513F66; Tue, 10 Feb 2015 07:20:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 48CF3E65; Tue, 10 Feb 2015 07:20:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1A7Kc65026932; Tue, 10 Feb 2015 07:20:38 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1A7KcBC026931; Tue, 10 Feb 2015 07:20:38 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201502100720.t1A7KcBC026931@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Tue, 10 Feb 2015 07:20:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378759 - in branches/2015Q1/net-mgmt/rancid3: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Feb 2015 07:20:38 -0000 Author: antoine Date: Tue Feb 10 07:20:37 2015 New Revision: 378759 URL: https://svnweb.freebsd.org/changeset/ports/378759 QAT: https://qat.redports.org/buildarchive/r378759/ Log: MFH: r378725 Do not patch Makefile.am to prevent running automake during build (Makefile.in is already patched) Deleted: branches/2015Q1/net-mgmt/rancid3/files/patch-etc__Makefile.am Modified: branches/2015Q1/net-mgmt/rancid3/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/net-mgmt/rancid3/Makefile ============================================================================== --- branches/2015Q1/net-mgmt/rancid3/Makefile Tue Feb 10 02:45:02 2015 (r378758) +++ branches/2015Q1/net-mgmt/rancid3/Makefile Tue Feb 10 07:20:37 2015 (r378759) @@ -57,7 +57,7 @@ pre-everything:: @ ${ECHO} "Make sure your rancid repository is quiet before upgrading; disable rancid cron jobs" post-patch: - ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${WRKSRC}/man/Makefile.am + ${REINPLACE_CMD} "s|par.1|rancid-par.1|" ${WRKSRC}/man/Makefile.in ${MV} ${WRKSRC}/man/par.1 ${WRKSRC}/man/rancid-par.1 post-install: From owner-svn-ports-branches@FreeBSD.ORG Thu Feb 12 23:37:30 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 618BBD41; Thu, 12 Feb 2015 23:37:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 426AFE33; Thu, 12 Feb 2015 23:37:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1CNbUgw076608; Thu, 12 Feb 2015 23:37:30 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1CNbTsV076606; Thu, 12 Feb 2015 23:37:29 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201502122337.t1CNbTsV076606@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Thu, 12 Feb 2015 23:37:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r378903 - in branches/2015Q1/x11-servers/xorg-server: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Feb 2015 23:37:30 -0000 Author: kwm Date: Thu Feb 12 23:37:29 2015 New Revision: 378903 URL: https://svnweb.freebsd.org/changeset/ports/378903 QAT: https://qat.redports.org/buildarchive/r378903/ Log: MFH: r378889 Fix CVE-2015-0255. Information leak in the XkbSetGeometry request of X servers. Submitted by: http://lists.freedesktop.org/archives/xorg/2015-February/057158.html Obtained from: upstream Approved by: ports-secteam (delphij@) Added: branches/2015Q1/x11-servers/xorg-server/files/patch-CVE-2015-0255 - copied unchanged from r378889, head/x11-servers/xorg-server/files/patch-CVE-2015-0255 Modified: branches/2015Q1/x11-servers/xorg-server/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/x11-servers/xorg-server/Makefile ============================================================================== --- branches/2015Q1/x11-servers/xorg-server/Makefile Thu Feb 12 22:44:14 2015 (r378902) +++ branches/2015Q1/x11-servers/xorg-server/Makefile Thu Feb 12 23:37:29 2015 (r378903) @@ -3,7 +3,7 @@ PORTNAME?= xorg-server PORTVERSION= 1.14.7 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES= x11-servers MASTER_SITES= XORG Copied: branches/2015Q1/x11-servers/xorg-server/files/patch-CVE-2015-0255 (from r378889, head/x11-servers/xorg-server/files/patch-CVE-2015-0255) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/x11-servers/xorg-server/files/patch-CVE-2015-0255 Thu Feb 12 23:37:29 2015 (r378903, copy of r378889, head/x11-servers/xorg-server/files/patch-CVE-2015-0255) @@ -0,0 +1,175 @@ +This patch has two commits. One is needed to address the CVE the other +is allow the patch to apply. + +http://lists.freedesktop.org/archives/xorg/2015-February/057158.html + +http://cgit.freedesktop.org/xorg/xserver/patch/?id=20079c36cf7d377938ca5478447d8b9045cb7d43 +http://cgit.freedesktop.org/xorg/xserver/patch/?id=81c90dc8f0aae3b65730409b1b615b5fa7280ebd + +--- xkb/xkb.c.orig 2015-02-12 20:30:54.131767000 +0100 ++++ xkb/xkb.c 2015-02-12 20:31:01.849633000 +0100 +@@ -4958,26 +4958,29 @@ ProcXkbGetGeometry(ClientPtr client) + + /***====================================================================***/ + +-static char * +-_GetCountedString(char **wire_inout, Bool swap) ++static Status ++_GetCountedString(char **wire_inout, ClientPtr client, char **str) + { +- char *wire, *str; +- CARD16 len, *plen; ++ char *wire, *next; ++ CARD16 len; + + wire = *wire_inout; +- plen = (CARD16 *) wire; +- if (swap) { +- swaps(plen); +- } +- len = *plen; +- str = malloc(len + 1); +- if (str) { +- memcpy(str, &wire[2], len); +- str[len] = '\0'; ++ len = *(CARD16 *) wire; ++ if (client->swapped) { ++ swaps(&len); + } +- wire += XkbPaddedSize(len + 2); +- *wire_inout = wire; +- return str; ++ next = wire + XkbPaddedSize(len + 2); ++ /* Check we're still within the size of the request */ ++ if (client->req_len < ++ bytes_to_int32(next - (char *) client->requestBuffer)) ++ return BadValue; ++ *str = malloc(len + 1); ++ if (!*str) ++ return BadAlloc; ++ memcpy(*str, &wire[2], len); ++ *(*str + len) = '\0'; ++ *wire_inout = next; ++ return Success; + } + + static Status +@@ -4986,25 +4989,29 @@ _CheckSetDoodad(char **wire_inout, + { + char *wire; + xkbDoodadWireDesc *dWire; ++ xkbAnyDoodadWireDesc any; ++ xkbTextDoodadWireDesc text; + XkbDoodadPtr doodad; ++ Status status; + + dWire = (xkbDoodadWireDesc *) (*wire_inout); ++ any = dWire->any; + wire = (char *) &dWire[1]; + if (client->swapped) { +- swapl(&dWire->any.name); +- swaps(&dWire->any.top); +- swaps(&dWire->any.left); +- swaps(&dWire->any.angle); ++ swapl(&any.name); ++ swaps(&any.top); ++ swaps(&any.left); ++ swaps(&any.angle); + } + CHK_ATOM_ONLY(dWire->any.name); +- doodad = XkbAddGeomDoodad(geom, section, dWire->any.name); ++ doodad = XkbAddGeomDoodad(geom, section, any.name); + if (!doodad) + return BadAlloc; + doodad->any.type = dWire->any.type; + doodad->any.priority = dWire->any.priority; +- doodad->any.top = dWire->any.top; +- doodad->any.left = dWire->any.left; +- doodad->any.angle = dWire->any.angle; ++ doodad->any.top = any.top; ++ doodad->any.left = any.left; ++ doodad->any.angle = any.angle; + switch (doodad->any.type) { + case XkbOutlineDoodad: + case XkbSolidDoodad: +@@ -5027,15 +5034,22 @@ _CheckSetDoodad(char **wire_inout, + dWire->text.colorNdx); + return BadMatch; + } ++ text = dWire->text; + if (client->swapped) { +- swaps(&dWire->text.width); +- swaps(&dWire->text.height); ++ swaps(&text.width); ++ swaps(&text.height); + } +- doodad->text.width = dWire->text.width; +- doodad->text.height = dWire->text.height; ++ doodad->text.width = text.width; ++ doodad->text.height = text.height; + doodad->text.color_ndx = dWire->text.colorNdx; +- doodad->text.text = _GetCountedString(&wire, client->swapped); +- doodad->text.font = _GetCountedString(&wire, client->swapped); ++ status = _GetCountedString(&wire, client, &doodad->text.text); ++ if (status != Success) ++ return status; ++ status = _GetCountedString(&wire, client, &doodad->text.font); ++ if (status != Success) { ++ free (doodad->text.text); ++ return status; ++ } + break; + case XkbIndicatorDoodad: + if (dWire->indicator.onColorNdx >= geom->num_colors) { +@@ -5070,7 +5084,9 @@ _CheckSetDoodad(char **wire_inout, + } + doodad->logo.color_ndx = dWire->logo.colorNdx; + doodad->logo.shape_ndx = dWire->logo.shapeNdx; +- doodad->logo.logo_name = _GetCountedString(&wire, client->swapped); ++ status = _GetCountedString(&wire, client, &doodad->logo.logo_name); ++ if (status != Success) ++ return status; + break; + default: + client->errorValue = _XkbErrCode2(0x4F, dWire->any.type); +@@ -5302,18 +5318,20 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSe + char *wire; + + wire = (char *) &req[1]; +- geom->label_font = _GetCountedString(&wire, client->swapped); ++ status = _GetCountedString(&wire, client, &geom->label_font); ++ if (status != Success) ++ return status; + + for (i = 0; i < req->nProperties; i++) { + char *name, *val; + +- name = _GetCountedString(&wire, client->swapped); +- if (!name) +- return BadAlloc; +- val = _GetCountedString(&wire, client->swapped); +- if (!val) { ++ status = _GetCountedString(&wire, client, &name); ++ if (status != Success) ++ return status; ++ status = _GetCountedString(&wire, client, &val); ++ if (status != Success) { + free(name); +- return BadAlloc; ++ return status; + } + if (XkbAddGeomProperty(geom, name, val) == NULL) { + free(name); +@@ -5347,9 +5365,9 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSe + for (i = 0; i < req->nColors; i++) { + char *name; + +- name = _GetCountedString(&wire, client->swapped); +- if (!name) +- return BadAlloc; ++ status = _GetCountedString(&wire, client, &name); ++ if (status != Success) ++ return status; + if (!XkbAddGeomColor(geom, name, geom->num_colors)) { + free(name); + return BadAlloc; From owner-svn-ports-branches@FreeBSD.ORG Sat Feb 14 21:44:43 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 99782F2B; Sat, 14 Feb 2015 21:44:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6AE39AA6; Sat, 14 Feb 2015 21:44:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1ELihfb099374; Sat, 14 Feb 2015 21:44:43 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1ELihjh099367; Sat, 14 Feb 2015 21:44:43 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201502142144.t1ELihjh099367@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sat, 14 Feb 2015 21:44:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379023 - in branches/2015Q1/lang/qt5-qml: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Feb 2015 21:44:43 -0000 Author: rakuco Date: Sat Feb 14 21:44:42 2015 New Revision: 379023 URL: https://svnweb.freebsd.org/changeset/ports/379023 QAT: https://qat.redports.org/buildarchive/r379023/ Log: MFH: r378099 Add upstream commit to fix a crash in devel/qtcreator. PR: 197079 Submitted by: Alex Richardson Approved by: portmgr (erwin) Added: branches/2015Q1/lang/qt5-qml/files/patch-git_cf6e9711 - copied unchanged from r378099, head/lang/qt5-qml/files/patch-git_cf6e9711 Modified: branches/2015Q1/lang/qt5-qml/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/lang/qt5-qml/Makefile ============================================================================== --- branches/2015Q1/lang/qt5-qml/Makefile Sat Feb 14 21:40:38 2015 (r379022) +++ branches/2015Q1/lang/qt5-qml/Makefile Sat Feb 14 21:44:42 2015 (r379023) @@ -2,6 +2,7 @@ PORTNAME= qml DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= lang PKGNAMEPREFIX= qt5- Copied: branches/2015Q1/lang/qt5-qml/files/patch-git_cf6e9711 (from r378099, head/lang/qt5-qml/files/patch-git_cf6e9711) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/lang/qt5-qml/files/patch-git_cf6e9711 Sat Feb 14 21:44:42 2015 (r379023, copy of r378099, head/lang/qt5-qml/files/patch-git_cf6e9711) @@ -0,0 +1,26 @@ +commit cf6e97119df5bf17b4a952b257d05d43b7d6ca26 +Author: Alex Richardson +Date: Wed Jan 21 09:10:01 2015 +0000 + + Don't crash on FreeBSD when computing stack limits + + On FreeBSD pthread_attr_t is a pointer and is dereferenced when calling + pthread_attr_get_np() so if we don't initialize it will probably crash. + This is not a problem on glibc systems since there pthread_attr_t is an + opaque union an doesn't need to be allocated using malloc(). + + Change-Id: I227685ddf9981974ade08aee8917f7262c301787 + Reviewed-by: Simon Hausmann + +--- src/qml/jsruntime/qv4engine.cpp ++++ src/qml/jsruntime/qv4engine.cpp +@@ -112,7 +112,8 @@ quintptr getStackLimit() + void* stackBottom = 0; + pthread_attr_t attr; + #if HAVE(PTHREAD_NP_H) && OS(FREEBSD) +- if (pthread_attr_get_np(pthread_self(), &attr) == 0) { ++ // on FreeBSD pthread_attr_init() must be called otherwise getting the attrs crashes ++ if (pthread_attr_init(&attr) == 0 && pthread_attr_get_np(pthread_self(), &attr) == 0) { + #else + if (pthread_getattr_np(pthread_self(), &attr) == 0) { + #endif