From owner-svn-ports-all@freebsd.org Mon Jul 13 05:29:34 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DC77C359135; Mon, 13 Jul 2020 05:29:34 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B4sf64yM6z4RGm; Mon, 13 Jul 2020 05:29:34 +0000 (UTC) (envelope-from glewis@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8921110784; Mon, 13 Jul 2020 05:29:34 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06D5TYaf045985; Mon, 13 Jul 2020 05:29:34 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06D5TYXF045984; Mon, 13 Jul 2020 05:29:34 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <202007130529.06D5TYXF045984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Mon, 13 Jul 2020 05:29:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542112 - in head/java/openjdk8: . files X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: in head/java/openjdk8: . files X-SVN-Commit-Revision: 542112 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jul 2020 05:29:34 -0000 Author: glewis Date: Mon Jul 13 05:29:33 2020 New Revision: 542112 URL: https://svnweb.freebsd.org/changeset/ports/542112 Log: Don't print the company name in the version info This evidently breaks some software that does parsing of -version output PR: 244634 Submitted by: Stefan Ehmann Added: head/java/openjdk8/files/patch-jdk-src-share-classes-sun-misc-Version.java.template (contents, props changed) Modified: head/java/openjdk8/Makefile Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Mon Jul 13 04:32:18 2020 (r542111) +++ head/java/openjdk8/Makefile Mon Jul 13 05:29:33 2020 (r542112) @@ -2,7 +2,7 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= LOCAL/jkim:jtreg PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} Added: head/java/openjdk8/files/patch-jdk-src-share-classes-sun-misc-Version.java.template ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/openjdk8/files/patch-jdk-src-share-classes-sun-misc-Version.java.template Mon Jul 13 05:29:33 2020 (r542112) @@ -0,0 +1,20 @@ +--- jdk/src/share/classes/sun/misc/Version.java.template.orig 2020-07-12 22:11:20.576241000 -0700 ++++ jdk/src/share/classes/sun/misc/Version.java.template 2020-07-12 22:12:30.301432000 -0700 +@@ -106,7 +106,7 @@ + + /* Second line: runtime version (ie, libraries). */ + +- ps.print(java_runtime_name + " " + company_name + "(build " + java_runtime_version); ++ ps.print(java_runtime_name + " (build " + java_runtime_version); + + if (java_profile_name.length() > 0) { + // profile name +@@ -123,7 +123,7 @@ + String java_vm_name = System.getProperty("java.vm.name"); + String java_vm_version = System.getProperty("java.vm.version"); + String java_vm_info = System.getProperty("java.vm.info"); +- ps.println(java_vm_name + " " + company_name + "(build " + java_vm_version + ", " + ++ ps.println(java_vm_name + " (build " + java_vm_version + ", " + + java_vm_info + ")"); + } +