From owner-svn-ports-branches@freebsd.org Sun Jun 28 14:19:01 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54ED398FF9C; Sun, 28 Jun 2015 14:19:01 +0000 (UTC) (envelope-from antoine@FreeBSD.org) 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 4329E1D5A; Sun, 28 Jun 2015 14:19:01 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5SEJ1va034533; Sun, 28 Jun 2015 14:19:01 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5SEJ18h034531; Sun, 28 Jun 2015 14:19:01 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201506281419.t5SEJ18h034531@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 28 Jun 2015 14:19:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r390783 - branches/2015Q2/java/jai X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Jun 2015 14:19:01 -0000 Author: antoine Date: Sun Jun 28 14:19:00 2015 New Revision: 390783 URL: https://svnweb.freebsd.org/changeset/ports/390783 Log: MFH: r390782 Mark BROKEN: unfetchable Reported by: pkg-fallout Modified: branches/2015Q2/java/jai/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/java/jai/Makefile ============================================================================== --- branches/2015Q2/java/jai/Makefile Sun Jun 28 14:16:04 2015 (r390782) +++ branches/2015Q2/java/jai/Makefile Sun Jun 28 14:19:00 2015 (r390783) @@ -11,6 +11,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/./ MAINTAINER= java@FreeBSD.org COMMENT= High performance image processing libraries for Java +BROKEN= unfetchable + USES= zip USE_JAVA= yes JAVA_VERSION= 1.6+ From owner-svn-ports-branches@freebsd.org Tue Jun 30 03:30:31 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57F6F990A89; Tue, 30 Jun 2015 03:30:31 +0000 (UTC) (envelope-from danilo@FreeBSD.org) 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 49012123E; Tue, 30 Jun 2015 03:30:31 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5U3UV8k079964; Tue, 30 Jun 2015 03:30:31 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5U3UVak079963; Tue, 30 Jun 2015 03:30:31 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201506300330.t5U3UVak079963@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Tue, 30 Jun 2015 03:30:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r390947 - branches/2015Q2/lang/yap-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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jun 2015 03:30:31 -0000 Author: danilo Date: Tue Jun 30 03:30:30 2015 New Revision: 390947 URL: https://svnweb.freebsd.org/changeset/ports/390947 Log: MFH: r390944 - Add missing dependency on libgmp - Add LDFLAGS necessary to link with libgmp - Fix shebang on an example file PR: 201133 Submitted by: amdmi3 Approved by: ports-secteam (delphij) Modified: branches/2015Q2/lang/yap-devel/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/lang/yap-devel/Makefile ============================================================================== --- branches/2015Q2/lang/yap-devel/Makefile Tue Jun 30 03:26:22 2015 (r390946) +++ branches/2015Q2/lang/yap-devel/Makefile Tue Jun 30 03:30:30 2015 (r390947) @@ -3,7 +3,7 @@ PORTNAME= yap PORTVERSION= 6.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= http://www.dcc.fc.up.pt/~vsc/Yap/ PKGNAMESUFFIX= -devel @@ -14,6 +14,8 @@ COMMENT= High-performance Prolog compile LICENSE= ART20 LGPL3 LICENSE_COMB= dual +LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp + CONFLICTS= yap-6.2.* OPTIONS_DEFINE= DOCS MYDDAS @@ -28,12 +30,19 @@ DOCS_INSTALL_TARGET= install install_doc MYDDAS_LIB_DEPENDS= libiodbc.so:${PORTSDIR}/databases/libiodbc MYDDAS_CONFIGURE_ENABLE= myddas myddas-top-level +LDFLAGS+= -L${LOCALBASE}/lib +MAKE_ENV= PKGLDFLAGS="${LDFLAGS}" + STRIP= #none USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-max-performance --disable-clpbn-bp -USES= gmake +USES= gmake shebangfix +SHEBANG_FILES= packages/http/examples/demo_inetd +SHEBANG_LANG= swipl +swipl_OLD_CMD= /usr/bin/swipl +swipl_CMD= ${LOCALBASE}/bin/swipl # installed by lang/swi-pl USE_GCC= any EXTRACT_CMD= ${GZIP_CMD} From owner-svn-ports-branches@freebsd.org Tue Jun 30 12:26:32 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 663BE990E26; Tue, 30 Jun 2015 12:26:32 +0000 (UTC) (envelope-from robak@FreeBSD.org) 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 573661BEA; Tue, 30 Jun 2015 12:26:32 +0000 (UTC) (envelope-from robak@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5UCQWR9047162; Tue, 30 Jun 2015 12:26:32 GMT (envelope-from robak@FreeBSD.org) Received: (from robak@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5UCQWAO047161; Tue, 30 Jun 2015 12:26:32 GMT (envelope-from robak@FreeBSD.org) Message-Id: <201506301226.t5UCQWAO047161@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: robak set sender to robak@FreeBSD.org using -f From: Bartek Rutkowski Date: Tue, 30 Jun 2015 12:26:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r390956 - branches/2015Q2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Jun 2015 12:26:32 -0000 Author: robak Date: Tue Jun 30 12:26:31 2015 New Revision: 390956 URL: https://svnweb.freebsd.org/changeset/ports/390956 Log: MFH: r390953 sysutils/ansible: update 1.9.1 -> 1.9.2 * Security fix for CVE-2015-3908 * Security fix for jail, zone and chroot plugins * Bugfixes: https://raw.githubusercontent.com/ansible/ansible/v1.9.2-1/CHANGELOG.md PR: 201200 Submitted by: Nikolai Lifanov (maintainer) Approved by: portmgr Modified: Directory Properties: branches/2015Q2/ (props changed) From owner-svn-ports-branches@freebsd.org Wed Jul 1 09:46:58 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CE9649901D6; Wed, 1 Jul 2015 09:46:58 +0000 (UTC) (envelope-from avilla@FreeBSD.org) 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 A5BF314D0; Wed, 1 Jul 2015 09:46:58 +0000 (UTC) (envelope-from avilla@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t619kwZN013481; Wed, 1 Jul 2015 09:46:58 GMT (envelope-from avilla@FreeBSD.org) Received: (from avilla@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t619kwXN013479; Wed, 1 Jul 2015 09:46:58 GMT (envelope-from avilla@FreeBSD.org) Message-Id: <201507010946.t619kwXN013479@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avilla set sender to avilla@FreeBSD.org using -f From: Alberto Villa Date: Wed, 1 Jul 2015 09:46:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r391041 - branches/2015Q2/graphics/opengtl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jul 2015 09:46:58 -0000 Author: avilla Date: Wed Jul 1 09:46:57 2015 New Revision: 391041 URL: https://svnweb.freebsd.org/changeset/ports/391041 Log: MFH: r390784 graphics/opengtl: fix build with LLVM 3.3 PR: 201022 Submitted by: matthew@reztek.cz Obtained from: Gentoo Approved by: ports-secteam (build fix blanket) Modified: branches/2015Q2/graphics/opengtl/Makefile branches/2015Q2/graphics/opengtl/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/graphics/opengtl/Makefile ============================================================================== --- branches/2015Q2/graphics/opengtl/Makefile Wed Jul 1 09:31:21 2015 (r391040) +++ branches/2015Q2/graphics/opengtl/Makefile Wed Jul 1 09:46:57 2015 (r391041) @@ -2,23 +2,25 @@ PORTNAME= opengtl PORTVERSION= 0.9.18 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics devel MASTER_SITES= http://download.${PORTNAME}.org/ DISTNAME= OpenGTL-${PORTVERSION} +PATCH_SITES= http://dev.gentoo.org/~creffett/distfiles/ +PATCHFILES= ${PORTNAME}-${PORTVERSION}-llvm-3.3.patch +PATCH_DIST_STRIP=-p1 MAINTAINER= avilla@FreeBSD.org COMMENT= Graphics Transformation Languages LICENSE= LGPL20 -BROKEN= Depends on deleted devel/llvm32 -#LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ -# libLLVM-3.2.so:${PORTSDIR}/devel/llvm32 +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ + libLLVM-3.3.so:${PORTSDIR}/devel/llvm33 USES= cmake perl5 tar:bzip2 USE_LDCONFIG= yes -CMAKE_ARGS= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config32 +CMAKE_ARGS= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config33 PLIST_SUB+= PORTVERSION=${PORTVERSION} Modified: branches/2015Q2/graphics/opengtl/distinfo ============================================================================== --- branches/2015Q2/graphics/opengtl/distinfo Wed Jul 1 09:31:21 2015 (r391040) +++ branches/2015Q2/graphics/opengtl/distinfo Wed Jul 1 09:46:57 2015 (r391041) @@ -1,2 +1,4 @@ SHA256 (OpenGTL-0.9.18.tar.bz2) = f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8 SIZE (OpenGTL-0.9.18.tar.bz2) = 536113 +SHA256 (opengtl-0.9.18-llvm-3.3.patch) = c43418bc039660ae86cb86b8b8175342793cb1361c699faa9b6342bc896e3d6c +SIZE (opengtl-0.9.18-llvm-3.3.patch) = 27930 From owner-svn-ports-branches@freebsd.org Wed Jul 1 12:36:36 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 832E398FD57; Wed, 1 Jul 2015 12:36:36 +0000 (UTC) (envelope-from mat@FreeBSD.org) 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 5A6DC156A; Wed, 1 Jul 2015 12:36:36 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t61CaaNV099382; Wed, 1 Jul 2015 12:36:36 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t61Caa97099381; Wed, 1 Jul 2015 12:36:36 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201507011236.t61Caa97099381@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 1 Jul 2015 12:36:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r391055 - branches/2015Q3 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jul 2015 12:36:36 -0000 Author: mat Date: Wed Jul 1 12:36:35 2015 New Revision: 391055 URL: https://svnweb.freebsd.org/changeset/ports/391055 Log: Branch 2015Q3 Sponsored by: Absolight Added: branches/2015Q3/ - copied from r391052, head/ From owner-svn-ports-branches@freebsd.org Wed Jul 1 13:35:17 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76620990922; Wed, 1 Jul 2015 13:35:17 +0000 (UTC) (envelope-from feld@FreeBSD.org) 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 4D27329B3; Wed, 1 Jul 2015 13:35:17 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t61DZHkp029617; Wed, 1 Jul 2015 13:35:17 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t61DZGqI029614; Wed, 1 Jul 2015 13:35:16 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507011335.t61DZGqI029614@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 1 Jul 2015 13:35:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r391059 - branches/2015Q3/graphics/netpbm X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jul 2015 13:35:17 -0000 Author: feld Date: Wed Jul 1 13:35:15 2015 New Revision: 391059 URL: https://svnweb.freebsd.org/changeset/ports/391059 Log: MFH: r391058 Update to 10.35.96 CVE-2015-3885 fix is included Approved by: ports-secteam (with hat) Modified: branches/2015Q3/graphics/netpbm/Makefile branches/2015Q3/graphics/netpbm/distinfo branches/2015Q3/graphics/netpbm/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/graphics/netpbm/Makefile ============================================================================== --- branches/2015Q3/graphics/netpbm/Makefile Wed Jul 1 13:28:35 2015 (r391058) +++ branches/2015Q3/graphics/netpbm/Makefile Wed Jul 1 13:35:15 2015 (r391059) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= netpbm -PORTVERSION= 10.35.94 -PORTREVISION= 1 +PORTVERSION= 10.35.96 +PORTREVISION= 0 CATEGORIES= graphics MASTER_SITES= SF/netpbm/super_stable/${PORTVERSION} \ LOCAL/dinoex/:man Modified: branches/2015Q3/graphics/netpbm/distinfo ============================================================================== --- branches/2015Q3/graphics/netpbm/distinfo Wed Jul 1 13:28:35 2015 (r391058) +++ branches/2015Q3/graphics/netpbm/distinfo Wed Jul 1 13:35:15 2015 (r391059) @@ -1,4 +1,4 @@ -SHA256 (netpbm-10.35.94.tgz) = 0ef6152fa83fec57109fbc3e89c5e64151e122795ea3b2a27ae27c776d280dbf -SIZE (netpbm-10.35.94.tgz) = 2557942 +SHA256 (netpbm-10.35.96.tgz) = e652f3642e930156afaffb4c28e135efe026b41cd64be20e245b0c8124819eee +SIZE (netpbm-10.35.96.tgz) = 2559587 SHA256 (netpbm-manpages-2013-03-09.tgz) = 430a9c5becbc55e2fed832fa40d9fb050ac6ad426cbf39dc73af5d6be37f8cd6 SIZE (netpbm-manpages-2013-03-09.tgz) = 1464320 Modified: branches/2015Q3/graphics/netpbm/pkg-plist ============================================================================== --- branches/2015Q3/graphics/netpbm/pkg-plist Wed Jul 1 13:28:35 2015 (r391058) +++ branches/2015Q3/graphics/netpbm/pkg-plist Wed Jul 1 13:35:15 2015 (r391059) @@ -278,6 +278,7 @@ bin/ppmtoppm bin/ppmtopuzz bin/ppmtorgb3 bin/ppmtosixel +bin/ppmtotga bin/ppmtoterm bin/ppmtouil bin/ppmtowinicon From owner-svn-ports-branches@freebsd.org Wed Jul 1 14:07:58 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37CD999118D; Wed, 1 Jul 2015 14:07:58 +0000 (UTC) (envelope-from kwm@FreeBSD.org) 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 1C5D32640; Wed, 1 Jul 2015 14:07:58 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t61E7vO8046610; Wed, 1 Jul 2015 14:07:57 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t61E7vre046608; Wed, 1 Jul 2015 14:07:57 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201507011407.t61E7vre046608@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Wed, 1 Jul 2015 14:07:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r391067 - in branches/2015Q3/textproc/libxml2: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jul 2015 14:07:58 -0000 Author: kwm Date: Wed Jul 1 14:07:57 2015 New Revision: 391067 URL: https://svnweb.freebsd.org/changeset/ports/391067 Log: MFH: r391064 Fix libxml2 CVE-2015-1819 doc/ tree tested by: wblock@ Obtained from: libxml2 upstream Security: 9c7177ff-1fe1-11e5-9a01-bcaec565249c Approved by: portmgr (erwin@) Added: branches/2015Q3/textproc/libxml2/files/patch-CVE-2015-1819 - copied unchanged from r391064, head/textproc/libxml2/files/patch-CVE-2015-1819 Modified: branches/2015Q3/textproc/libxml2/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/textproc/libxml2/Makefile ============================================================================== --- branches/2015Q3/textproc/libxml2/Makefile Wed Jul 1 14:07:45 2015 (r391066) +++ branches/2015Q3/textproc/libxml2/Makefile Wed Jul 1 14:07:57 2015 (r391067) @@ -1,10 +1,9 @@ # Created by: Yukihiro Nakai # $FreeBSD$ -# $MCom: ports/trunk/textproc/libxml2/Makefile 19578 2014-04-25 21:50:30Z kwm $ PORTNAME= libxml2 PORTVERSION= 2.9.2 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= textproc gnome MASTER_SITES= ftp://xmlsoft.org/libxml2/ \ http://xmlsoft.org/sources/ \ Copied: branches/2015Q3/textproc/libxml2/files/patch-CVE-2015-1819 (from r391064, head/textproc/libxml2/files/patch-CVE-2015-1819) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/textproc/libxml2/files/patch-CVE-2015-1819 Wed Jul 1 14:07:57 2015 (r391067, copy of r391064, head/textproc/libxml2/files/patch-CVE-2015-1819) @@ -0,0 +1,171 @@ +From 213f1fe0d76d30eaed6e5853057defc43e6df2c9 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Tue, 14 Apr 2015 17:41:48 +0800 +Subject: CVE-2015-1819 Enforce the reader to run in constant memory + +One of the operation on the reader could resolve entities +leading to the classic expansion issue. Make sure the +buffer used for xmlreader operation is bounded. +Introduce a new allocation type for the buffers for this effect. + +diff --git a/buf.c b/buf.c +index 6efc7b6..07922ff 100644 +--- buf.c ++++ buf.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include /* for XML_MAX_TEXT_LENGTH */ + #include "buf.h" + + #define WITH_BUFFER_COMPAT +@@ -299,7 +300,8 @@ xmlBufSetAllocationScheme(xmlBufPtr buf, + if ((scheme == XML_BUFFER_ALLOC_DOUBLEIT) || + (scheme == XML_BUFFER_ALLOC_EXACT) || + (scheme == XML_BUFFER_ALLOC_HYBRID) || +- (scheme == XML_BUFFER_ALLOC_IMMUTABLE)) { ++ (scheme == XML_BUFFER_ALLOC_IMMUTABLE) || ++ (scheme == XML_BUFFER_ALLOC_BOUNDED)) { + buf->alloc = scheme; + if (buf->buffer) + buf->buffer->alloc = scheme; +@@ -458,6 +460,18 @@ xmlBufGrowInternal(xmlBufPtr buf, size_t len) { + size = buf->use + len + 100; + #endif + ++ if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { ++ /* ++ * Used to provide parsing limits ++ */ ++ if ((buf->use + len >= XML_MAX_TEXT_LENGTH) || ++ (buf->size >= XML_MAX_TEXT_LENGTH)) { ++ xmlBufMemoryError(buf, "buffer error: text too long\n"); ++ return(0); ++ } ++ if (size >= XML_MAX_TEXT_LENGTH) ++ size = XML_MAX_TEXT_LENGTH; ++ } + if ((buf->alloc == XML_BUFFER_ALLOC_IO) && (buf->contentIO != NULL)) { + size_t start_buf = buf->content - buf->contentIO; + +@@ -739,6 +753,15 @@ xmlBufResize(xmlBufPtr buf, size_t size) + CHECK_COMPAT(buf) + + if (buf->alloc == XML_BUFFER_ALLOC_IMMUTABLE) return(0); ++ if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { ++ /* ++ * Used to provide parsing limits ++ */ ++ if (size >= XML_MAX_TEXT_LENGTH) { ++ xmlBufMemoryError(buf, "buffer error: text too long\n"); ++ return(0); ++ } ++ } + + /* Don't resize if we don't have to */ + if (size < buf->size) +@@ -867,6 +890,15 @@ xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len) { + + needSize = buf->use + len + 2; + if (needSize > buf->size){ ++ if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { ++ /* ++ * Used to provide parsing limits ++ */ ++ if (needSize >= XML_MAX_TEXT_LENGTH) { ++ xmlBufMemoryError(buf, "buffer error: text too long\n"); ++ return(-1); ++ } ++ } + if (!xmlBufResize(buf, needSize)){ + xmlBufMemoryError(buf, "growing buffer"); + return XML_ERR_NO_MEMORY; +@@ -938,6 +970,15 @@ xmlBufAddHead(xmlBufPtr buf, const xmlChar *str, int len) { + } + needSize = buf->use + len + 2; + if (needSize > buf->size){ ++ if (buf->alloc == XML_BUFFER_ALLOC_BOUNDED) { ++ /* ++ * Used to provide parsing limits ++ */ ++ if (needSize >= XML_MAX_TEXT_LENGTH) { ++ xmlBufMemoryError(buf, "buffer error: text too long\n"); ++ return(-1); ++ } ++ } + if (!xmlBufResize(buf, needSize)){ + xmlBufMemoryError(buf, "growing buffer"); + return XML_ERR_NO_MEMORY; +diff --git a/include/libxml/tree.h b/include/libxml/tree.h +index 2f90717..4a9b3bc 100644 +--- include/libxml/tree.h ++++ include/libxml/tree.h +@@ -76,7 +76,8 @@ typedef enum { + XML_BUFFER_ALLOC_EXACT, /* grow only to the minimal size */ + XML_BUFFER_ALLOC_IMMUTABLE, /* immutable buffer */ + XML_BUFFER_ALLOC_IO, /* special allocation scheme used for I/O */ +- XML_BUFFER_ALLOC_HYBRID /* exact up to a threshold, and doubleit thereafter */ ++ XML_BUFFER_ALLOC_HYBRID, /* exact up to a threshold, and doubleit thereafter */ ++ XML_BUFFER_ALLOC_BOUNDED /* limit the upper size of the buffer */ + } xmlBufferAllocationScheme; + + /** +diff --git a/xmlreader.c b/xmlreader.c +index f19e123..471e7e2 100644 +--- xmlreader.c ++++ xmlreader.c +@@ -2091,6 +2091,9 @@ xmlNewTextReader(xmlParserInputBufferPtr input, const char *URI) { + "xmlNewTextReader : malloc failed\n"); + return(NULL); + } ++ /* no operation on a reader should require a huge buffer */ ++ xmlBufSetAllocationScheme(ret->buffer, ++ XML_BUFFER_ALLOC_BOUNDED); + ret->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler)); + if (ret->sax == NULL) { + xmlBufFree(ret->buffer); +@@ -3616,6 +3619,7 @@ xmlTextReaderConstValue(xmlTextReaderPtr reader) { + return(((xmlNsPtr) node)->href); + case XML_ATTRIBUTE_NODE:{ + xmlAttrPtr attr = (xmlAttrPtr) node; ++ const xmlChar *ret; + + if ((attr->children != NULL) && + (attr->children->type == XML_TEXT_NODE) && +@@ -3629,10 +3633,21 @@ xmlTextReaderConstValue(xmlTextReaderPtr reader) { + "xmlTextReaderSetup : malloc failed\n"); + return (NULL); + } ++ xmlBufSetAllocationScheme(reader->buffer, ++ XML_BUFFER_ALLOC_BOUNDED); + } else + xmlBufEmpty(reader->buffer); + xmlBufGetNodeContent(reader->buffer, node); +- return(xmlBufContent(reader->buffer)); ++ ret = xmlBufContent(reader->buffer); ++ if (ret == NULL) { ++ /* error on the buffer best to reallocate */ ++ xmlBufFree(reader->buffer); ++ reader->buffer = xmlBufCreateSize(100); ++ xmlBufSetAllocationScheme(reader->buffer, ++ XML_BUFFER_ALLOC_BOUNDED); ++ ret = BAD_CAST ""; ++ } ++ return(ret); + } + break; + } +@@ -5131,6 +5146,9 @@ xmlTextReaderSetup(xmlTextReaderPtr reader, + "xmlTextReaderSetup : malloc failed\n"); + return (-1); + } ++ /* no operation on a reader should require a huge buffer */ ++ xmlBufSetAllocationScheme(reader->buffer, ++ XML_BUFFER_ALLOC_BOUNDED); + if (reader->sax == NULL) + reader->sax = (xmlSAXHandler *) xmlMalloc(sizeof(xmlSAXHandler)); + if (reader->sax == NULL) { +-- +cgit v0.10.2 + From owner-svn-ports-branches@freebsd.org Thu Jul 2 13:30:53 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA568993326; Thu, 2 Jul 2015 13:30:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB47B1AC1; Thu, 2 Jul 2015 13:30:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t62DUr1K050393; Thu, 2 Jul 2015 13:30:53 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t62DUrSd050392; Thu, 2 Jul 2015 13:30:53 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201507021330.t62DUrSd050392@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 2 Jul 2015 13:30:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r391144 - branches/2015Q3/x11/xfce4-taskmanager X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2015 13:30:54 -0000 Author: amdmi3 Date: Thu Jul 2 13:30:53 2015 New Revision: 391144 URL: https://svnweb.freebsd.org/changeset/ports/391144 Log: MFH: r391131 - Fix build with GTK3 PR: 200280 Reported by: fidaj@ukr.net Submitted by: amdmi3 Approved by: olivierd (xfce) Approved by: ports-secteam (feld) Modified: branches/2015Q3/x11/xfce4-taskmanager/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/x11/xfce4-taskmanager/Makefile ============================================================================== --- branches/2015Q3/x11/xfce4-taskmanager/Makefile Thu Jul 2 13:28:16 2015 (r391143) +++ branches/2015Q3/x11/xfce4-taskmanager/Makefile Thu Jul 2 13:30:53 2015 (r391144) @@ -26,7 +26,7 @@ OPTIONS_DEFAULT= GTK2 GTK2_USE= GNOME=gtk20,libwnck GTK2_CONFIGURE_ON= --enable-wnck --disable-wnck3 -GTK3_USE= GNOME=gtk30,libwnck3 +GTK3_USE= GNOME=gtk20,gtk30,libwnck3 GTK3_CONFIGURE_ON= --enable-gtk3 --enable-wnck3 --disable-wnck CONFIGURE_ARGS= --disable-gksu From owner-svn-ports-branches@freebsd.org Thu Jul 2 13:37:37 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EFC789934A3; Thu, 2 Jul 2015 13:37:37 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E043F1EE3; Thu, 2 Jul 2015 13:37:37 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t62Dbb0r052695; Thu, 2 Jul 2015 13:37:37 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t62DbbpB052694; Thu, 2 Jul 2015 13:37:37 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201507021337.t62DbbpB052694@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 2 Jul 2015 13:37:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r391146 - branches/2015Q3/devel/pwlib X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2015 13:37:38 -0000 Author: amdmi3 Date: Thu Jul 2 13:37:37 2015 New Revision: 391146 URL: https://svnweb.freebsd.org/changeset/ports/391146 Log: MFH: r391132 - This installs fine on armv6 Approved by: ports-secteam (feld) Modified: branches/2015Q3/devel/pwlib/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/pwlib/Makefile ============================================================================== --- branches/2015Q3/devel/pwlib/Makefile Thu Jul 2 13:31:49 2015 (r391145) +++ branches/2015Q3/devel/pwlib/Makefile Thu Jul 2 13:37:37 2015 (r391146) @@ -33,8 +33,6 @@ OPTIONS_DEFAULT= PLUGINS LDAP OPTIONS_SUB= yes LDAP_DESC= OpenLDAP support -BROKEN_armv6= Does not install on arm: mtree - CFLAGS+= -O1 MAKE_ENV= STDCCFLAGS+="-I${LOCALBASE}" CPPFLAGS+= -O1 -I${WRKSRC}/include -I${LOCALBASE}/include From owner-svn-ports-branches@freebsd.org Thu Jul 2 18:32:00 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6A62D993C77; Thu, 2 Jul 2015 18:32:00 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DA8C1BEF; Thu, 2 Jul 2015 18:32:00 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t62IW0S4016545; Thu, 2 Jul 2015 18:32:00 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t62IVxw0016534; Thu, 2 Jul 2015 18:31:59 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201507021831.t62IVxw0016534@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 2 Jul 2015 18:31:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r391179 - in branches/2015Q3/java/openjdk8: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2015 18:32:00 -0000 Author: jkim Date: Thu Jul 2 18:31:58 2015 New Revision: 391179 URL: https://svnweb.freebsd.org/changeset/ports/391179 Log: MFH: r391177 - Fix broken preprocessor directives. - Use sysctl(3) instead of procfs(5) when we need executable path from PID. Approved by: ports-secteam (delphij) Added: branches/2015Q3/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp - copied unchanged from r391177, head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp branches/2015Q3/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-vmError_bsd.cpp - copied unchanged from r391177, head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-vmError_bsd.cpp branches/2015Q3/java/openjdk8/files/patch-jdk-src-solaris-bin-java_md_solinux.c - copied unchanged from r391177, head/java/openjdk8/files/patch-jdk-src-solaris-bin-java_md_solinux.c Modified: branches/2015Q3/java/openjdk8/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/java/openjdk8/Makefile ============================================================================== --- branches/2015Q3/java/openjdk8/Makefile Thu Jul 2 18:18:16 2015 (r391178) +++ branches/2015Q3/java/openjdk8/Makefile Thu Jul 2 18:31:58 2015 (r391179) @@ -2,7 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \ https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \ Copied: branches/2015Q3/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp (from r391177, head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp Thu Jul 2 18:31:58 2015 (r391179, copy of r391177, head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-os_bsd.cpp) @@ -0,0 +1,31 @@ +--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig ++++ hotspot/src/os/bsd/vm/os_bsd.cpp +@@ -1234,14 +1234,14 @@ + pid_t os::Bsd::gettid() { + int retval = -1; + +-#ifdef __APPLE__ //XNU kernel ++#if defined(__APPLE__) //XNU kernel + // despite the fact mach port is actually not a thread id use it + // instead of syscall(SYS_thread_selfid) as it certainly fits to u4 + retval = ::pthread_mach_thread_np(::pthread_self()); + guarantee(retval != 0, "just checking"); + return retval; + +-#elifdef __FreeBSD__ ++#elif defined(__FreeBSD__) + #if __FreeBSD_version > 900030 + return ::pthread_getthreadid_np(); + #else +@@ -1249,9 +1249,9 @@ + thr_self(&tid); + return (pid_t)tid; + #endif +-#elifdef __OpenBSD__ ++#elif defined(__OpenBSD__) + retval = syscall(SYS_getthrid); +-#elifdef __NetBSD__ ++#elif defined(__NetBSD__) + retval = (pid_t) _lwp_self(); + #endif + Copied: branches/2015Q3/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-vmError_bsd.cpp (from r391177, head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-vmError_bsd.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-vmError_bsd.cpp Thu Jul 2 18:31:58 2015 (r391179, copy of r391177, head/java/openjdk8/files/patch-hotspot-src-os-bsd-vm-vmError_bsd.cpp) @@ -0,0 +1,63 @@ +--- hotspot/src/os/bsd/vm/vmError_bsd.cpp.orig ++++ hotspot/src/os/bsd/vm/vmError_bsd.cpp +@@ -33,30 +33,50 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#include ++#endif ++ ++#define GDB_CMD "gdb" ++ ++static void set_debugger(char *buf, int buflen) { ++ int pid = os::current_process_id(); ++#ifdef __FreeBSD__ ++ char cmd[PATH_MAX+1]; ++ int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid }; ++ size_t len = sizeof(cmd); ++ if (sysctl(name, 4, cmd, &len, NULL, 0) == 0 && len > 0) { ++ cmd[len] = '\0'; ++ jio_snprintf(buf, buflen, "%s %s %d", GDB_CMD, cmd, pid); ++ } else ++#endif ++ jio_snprintf(buf, buflen, "%s /proc/%d/file %d", GDB_CMD, pid, pid); ++} + + void VMError::show_message_box(char *buf, int buflen) { + bool yes; + do { +- error_string(buf, buflen); +- int len = (int)strlen(buf); ++ intx tid = os::current_thread_id(); ++ set_debugger(buf, buflen); ++ int len = (int)strlen(buf) + 1; ++ char *msg = &buf[len]; ++ error_string(msg, buflen - len); ++ len += (int)strlen(msg); + char *p = &buf[len]; + + jio_snprintf(p, buflen - len, + "\n\n" + "Do you want to debug the problem?\n\n" +- "To debug, run 'gdb /proc/%d/file %d'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" +- "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n" ++ "To debug, run '%s'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" ++ "Enter 'yes' to launch " GDB_CMD " automatically (PATH must include " GDB_CMD ")\n" + "Otherwise, press RETURN to abort...", +- os::current_process_id(), os::current_process_id(), +- os::current_thread_id(), os::current_thread_id()); ++ buf, tid, tid); + +- yes = os::message_box("Unexpected Error", buf); ++ yes = os::message_box("Unexpected Error", msg); + + if (yes) { + // yes, user asked VM to launch debugger +- jio_snprintf(buf, buflen, "gdb /proc/%d/file %d", +- os::current_process_id(), os::current_process_id()); +- + os::fork_and_exec(buf); + yes = false; + } Copied: branches/2015Q3/java/openjdk8/files/patch-jdk-src-solaris-bin-java_md_solinux.c (from r391177, head/java/openjdk8/files/patch-jdk-src-solaris-bin-java_md_solinux.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/java/openjdk8/files/patch-jdk-src-solaris-bin-java_md_solinux.c Thu Jul 2 18:31:58 2015 (r391179, copy of r391177, head/java/openjdk8/files/patch-jdk-src-solaris-bin-java_md_solinux.c) @@ -0,0 +1,53 @@ +--- jdk/src/solaris/bin/java_md_solinux.c.orig ++++ jdk/src/solaris/bin/java_md_solinux.c +@@ -35,6 +35,9 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#endif + #include "manifest_info.h" + #include "version_comp.h" + +@@ -925,7 +928,7 @@ + * onwards the filename returned in DL_info structure from dladdr is + * an absolute pathname so technically realpath isn't required. + * On Linux we read the executable name from /proc/self/exe. +- * On FreeBSD we read the executable name from /proc/curproc/file. ++ * On FreeBSD, we get the executable name via sysctl(3). + * As a fallback, and for platforms other than Solaris, Linux, and + * FreeBSD, we use FindExecName to compute the executable name. + */ +@@ -954,13 +957,9 @@ + } + } + } +-#elif defined(__linux__) || defined(__FreeBSD__) ++#elif defined(__linux__) + { +-#if defined(__FreeBSD__) +- const char* self = "/proc/curproc/file"; +-#else + const char* self = "/proc/self/exe"; +-#endif + char buf[PATH_MAX+1]; + int len = readlink(self, buf, PATH_MAX); + if (len >= 0) { +@@ -968,6 +967,16 @@ + exec_path = JLI_StringDup(buf); + } + } ++#elif defined(__FreeBSD__) ++ { ++ char buf[PATH_MAX+1]; ++ int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; ++ size_t len = sizeof(buf); ++ if (sysctl(name, 4, buf, &len, NULL, 0) == 0 && len > 0) { ++ buf[len] = '\0'; ++ exec_path = JLI_StringDup(buf); ++ } ++ } + #else /* !__solaris__ && !__linux__ && !__FreeBSD__ */ + { + /* Not implemented */ From owner-svn-ports-branches@freebsd.org Thu Jul 2 18:36:29 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EAB64993CA9; Thu, 2 Jul 2015 18:36:29 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CFC121D46; Thu, 2 Jul 2015 18:36:29 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t62IaTOd017329; Thu, 2 Jul 2015 18:36:29 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t62IaS86017321; Thu, 2 Jul 2015 18:36:28 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201507021836.t62IaS86017321@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 2 Jul 2015 18:36:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r391180 - in branches/2015Q3/java: openjdk6 openjdk6/files openjdk7 openjdk7/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2015 18:36:30 -0000 Author: jkim Date: Thu Jul 2 18:36:27 2015 New Revision: 391180 URL: https://svnweb.freebsd.org/changeset/ports/391180 Log: MFH: r391178 Use sysctl(3) instead of procfs(5) when we need executable path from PID. Approved by: ports-secteam (delphij) Added: branches/2015Q3/java/openjdk7/files/patch-src-os-bsd-vm-vmError_bsd.cpp - copied unchanged from r391178, head/java/openjdk7/files/patch-src-os-bsd-vm-vmError_bsd.cpp branches/2015Q3/java/openjdk7/files/patch-src-solaris-bin-java_md_solinux.c - copied unchanged from r391178, head/java/openjdk7/files/patch-src-solaris-bin-java_md_solinux.c Modified: branches/2015Q3/java/openjdk6/Makefile branches/2015Q3/java/openjdk6/files/patch-set branches/2015Q3/java/openjdk7/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/java/openjdk6/Makefile ============================================================================== --- branches/2015Q3/java/openjdk6/Makefile Thu Jul 2 18:31:58 2015 (r391179) +++ branches/2015Q3/java/openjdk6/Makefile Thu Jul 2 18:36:27 2015 (r391180) @@ -3,6 +3,7 @@ PORTNAME= openjdk6 PORTVERSION= b35 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= APACHE/ant/binaries/:ant \ Modified: branches/2015Q3/java/openjdk6/files/patch-set ============================================================================== --- branches/2015Q3/java/openjdk6/files/patch-set Thu Jul 2 18:31:58 2015 (r391179) +++ branches/2015Q3/java/openjdk6/files/patch-set Thu Jul 2 18:36:27 2015 (r391180) @@ -1936,44 +1936,74 @@ } --- hotspot/src/os/bsd/vm/vmError_bsd.cpp +++ hotspot/src/os/bsd/vm/vmError_bsd.cpp -@@ -34,6 +34,12 @@ +@@ -33,30 +33,50 @@ + #include #include #include - +#ifdef __FreeBSD__ -+#define GDB_LAUNCHER "gdb /proc/%d/file %d" -+#else -+#define GDB_LAUNCHER "gdb /proc/%d/exe %d" ++#include ++#include +#endif + ++#define GDB_CMD "gdb" ++ ++static void set_debugger(char *buf, int buflen) { ++ int pid = os::current_process_id(); ++#ifdef __FreeBSD__ ++ char cmd[PATH_MAX+1]; ++ int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid }; ++ size_t len = sizeof(cmd); ++ if (sysctl(name, 4, cmd, &len, NULL, 0) == 0 && len > 0) { ++ cmd[len] = '\0'; ++ jio_snprintf(buf, buflen, "%s %s %d", GDB_CMD, cmd, pid); ++ } else ++#endif ++ jio_snprintf(buf, buflen, "%s /proc/%d/file %d", GDB_CMD, pid, pid); ++} + void VMError::show_message_box(char *buf, int buflen) { bool yes; do { -@@ -44,7 +50,7 @@ +- error_string(buf, buflen); +- int len = (int)strlen(buf); ++ intx tid = os::current_thread_id(); ++ set_debugger(buf, buflen); ++ int len = (int)strlen(buf) + 1; ++ char *msg = &buf[len]; ++ error_string(msg, buflen - len); ++ len += (int)strlen(msg); + char *p = &buf[len]; + jio_snprintf(p, buflen - len, "\n\n" "Do you want to debug the problem?\n\n" - "To debug, run 'gdb /proc/%d/exe %d'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" -+ "To debug, run '" GDB_LAUNCHER "'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" - "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n" +- "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n" ++ "To debug, run '%s'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" ++ "Enter 'yes' to launch " GDB_CMD " automatically (PATH must include " GDB_CMD ")\n" "Otherwise, press RETURN to abort...", - os::current_process_id(), os::current_process_id(), -@@ -54,7 +60,7 @@ +- os::current_process_id(), os::current_process_id(), +- os::current_thread_id(), os::current_thread_id()); ++ buf, tid, tid); + +- yes = os::message_box("Unexpected Error", buf); ++ yes = os::message_box("Unexpected Error", msg); if (yes) { // yes, user asked VM to launch debugger - jio_snprintf(buf, buflen, "gdb /proc/%d/exe %d", -+ jio_snprintf(buf, buflen, GDB_LAUNCHER, - os::current_process_id(), os::current_process_id()); - +- os::current_process_id(), os::current_process_id()); +- os::fork_and_exec(buf); + yes = false; + } --- hotspot/src/os/posix/launcher/java_md.c +++ hotspot/src/os/posix/launcher/java_md.c @@ -35,6 +35,9 @@ #include #include #include -+#ifndef _SC_PHYS_PAGES ++#ifdef __FreeBSD__ +#include +#endif @@ -1999,31 +2029,26 @@ strcat(new_runpath, ":"); strcat(new_runpath, runpath); } -@@ -992,9 +995,13 @@ - } - } - } --#elif defined(__linux__) -+#elif defined(__linux__) || defined(_ALLBSD_SOURCE) - { -+#ifdef __FreeBSD__ -+ const char* self = "/proc/curproc/file"; -+#else - const char* self = "/proc/self/exe"; -+#endif - char buf[PATH_MAX+1]; - int len = readlink(self, buf, PATH_MAX); - if (len >= 0) { -@@ -1002,7 +1009,7 @@ +@@ -1002,7 +1005,17 @@ exec_path = JLI_StringDup(buf); } } -#else /* !__sun && !__linux */ -+#else /* !__sun && !__linux && !_ALLBSD_SOURCE */ ++#elif defined(__FreeBSD__) ++ { ++ char buf[PATH_MAX+1]; ++ int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; ++ size_t len = sizeof(buf); ++ if (sysctl(name, 4, buf, &len, NULL, 0) == 0 && len > 0) { ++ buf[len] = '\0'; ++ exec_path = JLI_StringDup(buf); ++ } ++ } ++#else /* !__sun && !__linux && !__FreeBSD__ */ { /* Not implemented */ } -@@ -1100,6 +1107,7 @@ +@@ -1100,6 +1113,7 @@ /* Compute physical memory by asking the OS */ uint64_t physical_memory(void) { @@ -2031,7 +2056,7 @@ const uint64_t pages = (uint64_t) sysconf(_SC_PHYS_PAGES); const uint64_t page_size = (uint64_t) sysconf(_SC_PAGESIZE); const uint64_t result = pages * page_size; -@@ -1111,6 +1119,28 @@ +@@ -1111,6 +1125,28 @@ " physical memory: " UINT64_FORMAT " (%.3fGB)\n", pages, page_size, result, result / (double) GB); } @@ -2060,7 +2085,7 @@ return result; } -@@ -1271,7 +1301,7 @@ +@@ -1271,7 +1307,7 @@ #endif } @@ -2069,7 +2094,7 @@ #ifdef i586 /* -@@ -1450,7 +1480,7 @@ +@@ -1450,7 +1486,7 @@ #endif /* __sun && i586 */ @@ -2078,7 +2103,7 @@ /* The definition of a server-class machine for linux-i586 */ jboolean -@@ -1481,7 +1511,7 @@ +@@ -1481,7 +1517,7 @@ return result; } @@ -2087,7 +2112,7 @@ #if defined(_ALLBSD_SOURCE) && defined(i586) -@@ -1508,7 +1538,7 @@ +@@ -1508,7 +1544,7 @@ } } if (_launcher_debug) { @@ -2096,7 +2121,7 @@ (result == JNI_TRUE ? "true" : "false")); } return result; -@@ -1672,7 +1702,7 @@ +@@ -1672,7 +1708,7 @@ while (dp != NULL) { cp = strchr(dp, (int)':'); if (cp != NULL) @@ -2105,7 +2130,7 @@ if ((target = ProcessDir(info, dp)) != NULL) break; dp = cp; -@@ -1931,8 +1961,8 @@ +@@ -1931,8 +1967,8 @@ #define MAX_PID_STR_SZ 20 void SetJavaLauncherPlatformProps() { @@ -8559,15 +8584,13 @@ #include #include #include -@@ -34,17 +35,33 @@ +@@ -34,17 +35,31 @@ #include #include #include +#if defined(_ALLBSD_SOURCE) -+#include -+#endif -+#ifndef _SC_PHYS_PAGES +#include ++#include +#endif + #include "manifest_info.h" @@ -8592,9 +8615,9 @@ +#define LD_LIBRARY_PATH "LD_LIBRARY_PATH" +#endif - /* - * If a processor / os combination has the ability to run binaries of -@@ -75,14 +92,31 @@ + #define JRE_ERROR1 "Error: Could not find Java SE Runtime Environment." + #define JRE_ERROR11 "Error: Path length exceeds maximum length (PATH_MAX)" +@@ -79,14 +94,31 @@ #endif /* pointer to environment */ @@ -8628,7 +8651,7 @@ static const char *user_dir = "/java"; #else /* Solaris */ static const char *system_dir = "/usr/jdk"; -@@ -404,10 +438,10 @@ +@@ -408,10 +440,10 @@ * If not on Solaris, assume only a single LD_LIBRARY_PATH * variable. */ @@ -8641,7 +8664,7 @@ /* * On linux, if a binary is running as sgid or suid, glibc sets * LD_LIBRARY_PATH to the empty string for security purposes. (In -@@ -423,6 +457,22 @@ +@@ -427,6 +459,22 @@ if((getgid() != getegid()) || (getuid() != geteuid()) ) { return; } @@ -8664,7 +8687,7 @@ #endif /* runpath contains current effective LD_LIBRARY_PATH setting */ -@@ -431,7 +481,7 @@ +@@ -435,7 +483,7 @@ new_runpath = JLI_MemAlloc( ((runpath!=NULL)?strlen(runpath):0) + 2*strlen(jrepath) + 2*strlen(arch) + strlen(jvmpath) + 52); @@ -8673,7 +8696,7 @@ /* -@@ -446,7 +496,7 @@ +@@ -450,7 +498,7 @@ /* jvmpath, ((running != wanted)?((wanted==64)?"/"LIBARCH64NAME:"/.."):""), */ @@ -8682,7 +8705,7 @@ "%s:" "%s/lib/%s:" "%s/../lib/%s", -@@ -721,7 +771,7 @@ +@@ -725,7 +773,7 @@ jboolean GetApplicationHome(char *buf, jint bufsize) { @@ -8691,31 +8714,26 @@ char *execname = GetExecname(); if (execname) { strncpy(buf, execname, bufsize-1); -@@ -878,9 +928,13 @@ - } - } - } --#elif defined(__linux__) -+#elif defined(__linux__) || defined(_ALLBSD_SOURCE) - { -+#ifdef __FreeBSD__ -+ const char* self = "/proc/curproc/file"; -+#else - const char* self = "/proc/self/exe"; -+#endif - char buf[PATH_MAX+1]; - int len = readlink(self, buf, PATH_MAX); - if (len >= 0) { -@@ -888,7 +942,7 @@ +@@ -892,7 +940,17 @@ exec_path = JLI_StringDup(buf); } } -#else /* !__sun && !__linux */ -+#else /* !__sun && !__linux && !_ALLBSD_SOURCE */ ++#elif defined(__FreeBSD__) ++ { ++ char buf[PATH_MAX+1]; ++ int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; ++ size_t len = sizeof(buf); ++ if (sysctl(name, 4, buf, &len, NULL, 0) == 0 && len > 0) { ++ buf[len] = '\0'; ++ exec_path = JLI_StringDup(buf); ++ } ++ } ++#else /* !__sun && !__linux && !__FreeBSD__ */ { /* Not implemented */ } -@@ -977,6 +1031,7 @@ +@@ -981,6 +1039,7 @@ /* Compute physical memory by asking the OS */ uint64_t physical_memory(void) { @@ -8723,7 +8741,7 @@ const uint64_t pages = (uint64_t) sysconf(_SC_PHYS_PAGES); const uint64_t page_size = (uint64_t) sysconf(_SC_PAGESIZE); const uint64_t result = pages * page_size; -@@ -988,6 +1043,28 @@ +@@ -992,6 +1051,28 @@ " physical memory: " UINT64_FORMAT " (%.3fGB)\n", pages, page_size, result, result / (double) GB); } @@ -8752,7 +8770,7 @@ return result; } -@@ -1083,7 +1160,7 @@ +@@ -1087,7 +1168,7 @@ #endif /* __sun && i586 */ @@ -8761,7 +8779,7 @@ /* * A utility method for asking the CPU about itself. -@@ -1148,7 +1225,7 @@ +@@ -1152,7 +1233,7 @@ #endif } @@ -8770,7 +8788,7 @@ #ifdef i586 /* -@@ -1360,6 +1437,39 @@ +@@ -1364,6 +1445,39 @@ #endif /* __linux__ && i586 */ @@ -8810,7 +8828,7 @@ /* Dispatch to the platform-specific definition of "server-class" */ jboolean ServerClassMachine(void) { -@@ -1374,6 +1484,8 @@ +@@ -1378,6 +1492,8 @@ result = solaris_i586_ServerClassMachine(); #elif defined(__linux__) && defined(i586) result = linux_i586_ServerClassMachine(); @@ -8819,7 +8837,7 @@ #else if (_launcher_debug) { printf("ServerClassMachine: returns default value of %s\n", -@@ -1514,7 +1626,7 @@ +@@ -1518,7 +1634,7 @@ while (dp != NULL) { cp = strchr(dp, (int)':'); if (cp != NULL) @@ -8828,7 +8846,7 @@ if ((target = ProcessDir(info, dp)) != NULL) break; dp = cp; -@@ -1692,9 +1804,29 @@ +@@ -1696,9 +1812,29 @@ return(borrowed_unsetenv(name)); } @@ -8859,7 +8877,7 @@ static void* hSplashLib = NULL; -@@ -1722,13 +1854,15 @@ +@@ -1747,13 +1883,15 @@ return "%lld"; } @@ -8877,7 +8895,7 @@ pthread_t tid; pthread_attr_t attr; pthread_attr_init(&attr); -@@ -1741,7 +1875,7 @@ +@@ -1766,7 +1904,7 @@ if (pthread_create(&tid, &attr, (void *(*)(void*))continuation, (void*)args) == 0) { void * tmp; pthread_join(tid, &tmp); @@ -8886,7 +8904,7 @@ } else { /* * Continue execution in current thread if for some reason (e.g. out of -@@ -1759,25 +1893,23 @@ +@@ -1784,25 +1922,23 @@ if (thr_create(NULL, stack_size, (void *(*)(void *))continuation, args, flags, &tid) == 0) { void * tmp; thr_join(tid, NULL, &tmp); Modified: branches/2015Q3/java/openjdk7/Makefile ============================================================================== --- branches/2015Q3/java/openjdk7/Makefile Thu Jul 2 18:31:58 2015 (r391179) +++ branches/2015Q3/java/openjdk7/Makefile Thu Jul 2 18:36:27 2015 (r391180) @@ -3,6 +3,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ Copied: branches/2015Q3/java/openjdk7/files/patch-src-os-bsd-vm-vmError_bsd.cpp (from r391178, head/java/openjdk7/files/patch-src-os-bsd-vm-vmError_bsd.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/java/openjdk7/files/patch-src-os-bsd-vm-vmError_bsd.cpp Thu Jul 2 18:36:27 2015 (r391180, copy of r391178, head/java/openjdk7/files/patch-src-os-bsd-vm-vmError_bsd.cpp) @@ -0,0 +1,63 @@ +--- hotspot/src/os/bsd/vm/vmError_bsd.cpp.orig ++++ hotspot/src/os/bsd/vm/vmError_bsd.cpp +@@ -33,30 +33,50 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#include ++#endif ++ ++#define GDB_CMD "gdb" ++ ++static void set_debugger(char *buf, int buflen) { ++ int pid = os::current_process_id(); ++#ifdef __FreeBSD__ ++ char cmd[PATH_MAX+1]; ++ int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid }; ++ size_t len = sizeof(cmd); ++ if (sysctl(name, 4, cmd, &len, NULL, 0) == 0 && len > 0) { ++ cmd[len] = '\0'; ++ jio_snprintf(buf, buflen, "%s %s %d", GDB_CMD, cmd, pid); ++ } else ++#endif ++ jio_snprintf(buf, buflen, "%s /proc/%d/file %d", GDB_CMD, pid, pid); ++} + + void VMError::show_message_box(char *buf, int buflen) { + bool yes; + do { +- error_string(buf, buflen); +- int len = (int)strlen(buf); ++ intx tid = os::current_thread_id(); ++ set_debugger(buf, buflen); ++ int len = (int)strlen(buf) + 1; ++ char *msg = &buf[len]; ++ error_string(msg, buflen - len); ++ len += (int)strlen(msg); + char *p = &buf[len]; + + jio_snprintf(p, buflen - len, + "\n\n" + "Do you want to debug the problem?\n\n" +- "To debug, run 'gdb /proc/%d/exe %d'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" +- "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n" ++ "To debug, run '%s'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" ++ "Enter 'yes' to launch " GDB_CMD " automatically (PATH must include " GDB_CMD ")\n" + "Otherwise, press RETURN to abort...", +- os::current_process_id(), os::current_process_id(), +- os::current_thread_id(), os::current_thread_id()); ++ buf, tid, tid); + +- yes = os::message_box("Unexpected Error", buf); ++ yes = os::message_box("Unexpected Error", msg); + + if (yes) { + // yes, user asked VM to launch debugger +- jio_snprintf(buf, buflen, "gdb /proc/%d/exe %d", +- os::current_process_id(), os::current_process_id()); +- + os::fork_and_exec(buf); + yes = false; + } Copied: branches/2015Q3/java/openjdk7/files/patch-src-solaris-bin-java_md_solinux.c (from r391178, head/java/openjdk7/files/patch-src-solaris-bin-java_md_solinux.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q3/java/openjdk7/files/patch-src-solaris-bin-java_md_solinux.c Thu Jul 2 18:36:27 2015 (r391180, copy of r391178, head/java/openjdk7/files/patch-src-solaris-bin-java_md_solinux.c) @@ -0,0 +1,58 @@ +--- jdk/src/solaris/bin/java_md_solinux.c.orig ++++ jdk/src/solaris/bin/java_md_solinux.c +@@ -35,6 +35,9 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#endif + #include "manifest_info.h" + #include "version_comp.h" + +@@ -899,9 +902,9 @@ + * onwards the filename returned in DL_info structure from dladdr is + * an absolute pathname so technically realpath isn't required. + * On Linux we read the executable name from /proc/self/exe. +- * On *BSD we read the executable name from /proc/curproc/file. ++ * On FreeBSD, we get the executable name via sysctl(3). + * As a fallback, and for platforms other than Solaris, Linux, and +- * *BSD, we use FindExecName to compute the executable name. ++ * FreeBSD, we use FindExecName to compute the executable name. + */ + const char* + SetExecname(char **argv) +@@ -928,13 +931,9 @@ + } + } + } +-#elif defined(__linux__) || defined(_ALLBSD_SOURCE) ++#elif defined(__linux__) + { +-#if defined(_ALLBSD_SOURCE) +- const char* self = "/proc/curproc/file"; +-#else + const char* self = "/proc/self/exe"; +-#endif + char buf[PATH_MAX+1]; + int len = readlink(self, buf, PATH_MAX); + if (len >= 0) { +@@ -942,7 +941,17 @@ + exec_path = JLI_StringDup(buf); + } + } +-#else /* !__solaris__ && !__linux__ && !_ALLBSD_SOURCE */ ++#elif defined(__FreeBSD__) ++ { ++ char buf[PATH_MAX+1]; ++ int name[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; ++ size_t len = sizeof(buf); ++ if (sysctl(name, 4, buf, &len, NULL, 0) == 0 && len > 0) { ++ buf[len] = '\0'; ++ exec_path = JLI_StringDup(buf); ++ } ++ } ++#else /* !__sun && !__linux && !__FreeBSD__ */ + { + /* Not implemented */ + } From owner-svn-ports-branches@freebsd.org Thu Jul 2 20:35:33 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2DD869933EF; Thu, 2 Jul 2015 20:35:33 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1E808111C; Thu, 2 Jul 2015 20:35:33 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t62KZWZm077453; Thu, 2 Jul 2015 20:35:32 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t62KZWt0077452; Thu, 2 Jul 2015 20:35:32 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507022035.t62KZWt0077452@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 2 Jul 2015 20:35:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r391190 - branches/2015Q3/net-mgmt/unifi4 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2015 20:35:33 -0000 Author: feld Date: Thu Jul 2 20:35:32 2015 New Revision: 391190 URL: https://svnweb.freebsd.org/changeset/ports/391190 Log: MFH: r391187 4.6.6 is now a General Availability Release It appears Unifi kills the download URL when they promote a version to a General Availability Release. We will keep the Makefile aware of both URLs now so this is a transparent change to users in the future. Approved by: ports-secteam (with hat) Modified: branches/2015Q3/net-mgmt/unifi4/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/net-mgmt/unifi4/Makefile ============================================================================== --- branches/2015Q3/net-mgmt/unifi4/Makefile Thu Jul 2 20:30:52 2015 (r391189) +++ branches/2015Q3/net-mgmt/unifi4/Makefile Thu Jul 2 20:35:32 2015 (r391190) @@ -5,7 +5,8 @@ PORTNAME= unifi4 PORTVERSION= 4.6.6 PORTREVISION= 0 CATEGORIES= net-mgmt java -MASTER_SITES= http://dl.ubnt.com/unifi/${PORTVERSION}-${UBNT_BUILD}/ +MASTER_SITES= http://dl.ubnt.com/unifi/${PORTVERSION}-${UBNT_BUILD}/ \ + https://www.ubnt.com/downloads/unifi/${PORTVERSION}/ DISTNAME= UniFi.unix DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} From owner-svn-ports-branches@freebsd.org Fri Jul 3 14:47:34 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B83F993004; Fri, 3 Jul 2015 14:47:34 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8C3EB2125; Fri, 3 Jul 2015 14:47:34 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t63ElY4L055293; Fri, 3 Jul 2015 14:47:34 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t63ElYTK055292; Fri, 3 Jul 2015 14:47:34 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201507031447.t63ElYTK055292@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 3 Jul 2015 14:47:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r391248 - branches/2015Q3/graphics/inkscape X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2015 14:47:34 -0000 Author: amdmi3 Date: Fri Jul 3 14:47:33 2015 New Revision: 391248 URL: https://svnweb.freebsd.org/changeset/ports/391248 Log: MFH: r391247 - Fix another shebang Approved by: portmgr blanket Approved by: ports-secteam (shebang fix blanket) Modified: branches/2015Q3/graphics/inkscape/Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/graphics/inkscape/Makefile ============================================================================== --- branches/2015Q3/graphics/inkscape/Makefile Fri Jul 3 14:46:25 2015 (r391247) +++ branches/2015Q3/graphics/inkscape/Makefile Fri Jul 3 14:47:33 2015 (r391248) @@ -3,7 +3,7 @@ PORTNAME= inkscape PORTVERSION= 0.91 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics gnome MASTER_SITES= https://inkscape.global.ssl.fastly.net/media/resources/file/ \ LOCAL/kwm @@ -33,7 +33,7 @@ CONFIGURE_ARGS= --without-gnome-vfs python_OLD_CMD?=/usr/bin/env python python_CMD?= ${LOCALBASE}/bin/python2 SHEBANG_FILES= cxxtest/cxxtestgen.pl share/extensions/*.p[lm] \ - share/extensions/*.py + share/extensions/*.py share/extensions/genpofiles.sh OPTIONS_DEFINE= POPPLER OPENMP VISIO CDR DBUS WPG OPTIONS_DEFAULT=POPPLER VISIO CDR WPG From owner-svn-ports-branches@freebsd.org Fri Jul 3 16:07:21 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F4FA993F9C; Fri, 3 Jul 2015 16:07:21 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DAB892826; Fri, 3 Jul 2015 16:07:20 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t63G7KC5094740; Fri, 3 Jul 2015 16:07:20 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t63G7K1f094738; Fri, 3 Jul 2015 16:07:20 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201507031607.t63G7K1f094738@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Fri, 3 Jul 2015 16:07:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r391253 - branches/2015Q3/security/linux-c6-openssl X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2015 16:07:21 -0000 Author: tijl Date: Fri Jul 3 16:07:19 2015 New Revision: 391253 URL: https://svnweb.freebsd.org/changeset/ports/391253 Log: MFH: r391244 Update to 1.0.1e-30.el6.11 Approved by: ports-secteam (feld) Security: CVE-2014-8176 Security: CVE-2015-1788 Security: CVE-2015-1789 Security: CVE-2015-1790 Security: CVE-2015-1791 Security: CVE-2015-1792 Security: https://www.openssl.org/news/secadv_20150611.txt Modified: branches/2015Q3/security/linux-c6-openssl/Makefile branches/2015Q3/security/linux-c6-openssl/distinfo.i686 Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/security/linux-c6-openssl/Makefile ============================================================================== --- branches/2015Q3/security/linux-c6-openssl/Makefile Fri Jul 3 15:56:03 2015 (r391252) +++ branches/2015Q3/security/linux-c6-openssl/Makefile Fri Jul 3 16:07:19 2015 (r391253) @@ -3,7 +3,7 @@ PORTNAME= openssl PORTVERSION= 1.0.1e -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security linux MASTER_SITES= CENTOS_LINUX_UPDATES @@ -15,7 +15,7 @@ CONFLICTS= linux-openssl-[0-9]* linux-f8 ONLY_FOR_ARCHS= i386 amd64 USE_LINUX= c6 USE_LINUX_RPM= yes -RPMVERSION= 30.el6.8 +RPMVERSION= 30.el6.11 BRANDELF_FILES= usr/bin/openssl USE_LDCONFIG= yes Modified: branches/2015Q3/security/linux-c6-openssl/distinfo.i686 ============================================================================== --- branches/2015Q3/security/linux-c6-openssl/distinfo.i686 Fri Jul 3 15:56:03 2015 (r391252) +++ branches/2015Q3/security/linux-c6-openssl/distinfo.i686 Fri Jul 3 16:07:19 2015 (r391253) @@ -1,4 +1,4 @@ -SHA256 (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.8.i686.rpm) = 41659461dfbc5f9ad6f32bf6d01385d0612829409a357e38aa060365123e7052 -SIZE (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.8.i686.rpm) = 1583880 -SHA256 (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.8.src.rpm) = e7c3b41c56fd2e7a3816d94623f9cbe57b0f1539f84032672f0e48e75e9e3a6b -SIZE (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.8.src.rpm) = 3195156 +SHA256 (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.11.i686.rpm) = aeb1ce9586380db077c6ed640fd8343c7dc9e81522c51761b3c73f3aa54f2c1c +SIZE (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.11.i686.rpm) = 1585676 +SHA256 (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.11.src.rpm) = aac901f048953cae0a9d6962636edecb05142f577eca9b5eef37831be727e109 +SIZE (rpm/i686/centos/6.6/openssl-1.0.1e-30.el6.11.src.rpm) = 3204421 From owner-svn-ports-branches@freebsd.org Fri Jul 3 19:21:33 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 288BC9944E6; Fri, 3 Jul 2015 19:21:33 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1A42A27C0; Fri, 3 Jul 2015 19:21:33 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t63JLWhG094722; Fri, 3 Jul 2015 19:21:32 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t63JLWvp094720; Fri, 3 Jul 2015 19:21:32 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201507031921.t63JLWvp094720@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 3 Jul 2015 19:21:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r391271 - branches/2015Q3/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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2015 19:21:33 -0000 Author: feld Date: Fri Jul 3 19:21:32 2015 New Revision: 391271 URL: https://svnweb.freebsd.org/changeset/ports/391271 Log: MFH: r391270 Update to 1.0.71 Resolves CVE-2015-3279 PR: 201311 Submitted by: maintainer Approved by: ports-secteam (with hat) Modified: branches/2015Q3/print/cups-filters/Makefile branches/2015Q3/print/cups-filters/distinfo Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/print/cups-filters/Makefile ============================================================================== --- branches/2015Q3/print/cups-filters/Makefile Fri Jul 3 19:20:32 2015 (r391270) +++ branches/2015Q3/print/cups-filters/Makefile Fri Jul 3 19:21:32 2015 (r391271) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cups-filters -PORTVERSION= 1.0.70 +PORTVERSION= 1.0.71 CATEGORIES= print MASTER_SITES= http://www.openprinting.org/download/cups-filters/ Modified: branches/2015Q3/print/cups-filters/distinfo ============================================================================== --- branches/2015Q3/print/cups-filters/distinfo Fri Jul 3 19:20:32 2015 (r391270) +++ branches/2015Q3/print/cups-filters/distinfo Fri Jul 3 19:21:32 2015 (r391271) @@ -1,2 +1,2 @@ -SHA256 (cups-filters-1.0.70.tar.xz) = f605fa635ff3653b4d5543a426d9ece4f890abea032fdd05536016a488520868 -SIZE (cups-filters-1.0.70.tar.xz) = 1338076 +SHA256 (cups-filters-1.0.71.tar.xz) = 3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f +SIZE (cups-filters-1.0.71.tar.xz) = 1339116