From owner-svn-ports-branches@freebsd.org Sun Aug 21 12:52:58 2016 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 96EBCBC012F; Sun, 21 Aug 2016 12:52:58 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49F3914C4; Sun, 21 Aug 2016 12:52:58 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7LCqvPP090842; Sun, 21 Aug 2016 12:52:57 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7LCqvce090839; Sun, 21 Aug 2016 12:52:57 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201608211252.u7LCqvce090839@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 21 Aug 2016 12:52:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420551 - in branches/2016Q3/lang/rexx-regina: . 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.22 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, 21 Aug 2016 12:52:58 -0000 Author: riggs Date: Sun Aug 21 12:52:57 2016 New Revision: 420551 URL: https://svnweb.freebsd.org/changeset/ports/420551 Log: MFH: r420550 Fix spurious linking issues with libregina.so PR: 211974 Submitted by: bob@eager.cx Approved by: ports-secteam (build fix blanket) Modified: branches/2016Q3/lang/rexx-regina/Makefile branches/2016Q3/lang/rexx-regina/files/patch-configure Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/lang/rexx-regina/Makefile ============================================================================== --- branches/2016Q3/lang/rexx-regina/Makefile Sun Aug 21 12:51:05 2016 (r420550) +++ branches/2016Q3/lang/rexx-regina/Makefile Sun Aug 21 12:52:57 2016 (r420551) @@ -3,6 +3,7 @@ PORTNAME= regina PORTVERSION= 3.8.2 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= SF/${PORTNAME}-rexx/${PORTNAME}-rexx/${PORTVERSION} PKGNAMEPREFIX= rexx- Modified: branches/2016Q3/lang/rexx-regina/files/patch-configure ============================================================================== --- branches/2016Q3/lang/rexx-regina/files/patch-configure Sun Aug 21 12:51:05 2016 (r420550) +++ branches/2016Q3/lang/rexx-regina/files/patch-configure Sun Aug 21 12:52:57 2016 (r420551) @@ -34,7 +34,7 @@ + LD_RXLIB_A1="$ac_cv_prog_CC -shared ${LDFLAGS} -o \$(@)" + LD_RXLIB_A2="$ac_cv_prog_CC -shared ${LDFLAGS} -o \$(@)" + LD_RXLIB_UTILA="$ac_cv_prog_CC -shared ${LDFLAGS} -o \$(@)" -+ SHL_LD="$ac_cv_prog_CC -shared ${LDFLAGS} -o ${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')' ++ SHL_LD="$ac_cv_prog_CC -shared ${LDFLAGS} -o ${SHLPRE}${SHLFILE}${SHLPST} -Wl,-soname=${SHLPRE}${SHLFILE}${SHLPST} "'$('SHOFILES')' + ;; + *openbsd*) if test "$ac_cv_prog_CC" = "gcc" -o "$ac_cv_prog_CC" = "g++" -o "$ac_cv_prog_CC" = "clang"; then From owner-svn-ports-branches@freebsd.org Mon Aug 22 06:20:32 2016 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 29E6EBC1D6E; Mon, 22 Aug 2016 06:20:32 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D40F518ED; Mon, 22 Aug 2016 06:20:31 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7M6KVAp080447; Mon, 22 Aug 2016 06:20:31 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7M6KUax080444; Mon, 22 Aug 2016 06:20:30 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201608220620.u7M6KUax080444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Mon, 22 Aug 2016 06:20:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420588 - branches/2016Q3/security/libgcrypt 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.22 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: Mon, 22 Aug 2016 06:20:32 -0000 Author: cpm Date: Mon Aug 22 06:20:30 2016 New Revision: 420588 URL: https://svnweb.freebsd.org/changeset/ports/420588 Log: MFH: r420399 - Update to 1.7.3 (security fixes) - Bump library version in pkg-plist ref: https://lists.gnupg.org/pipermail/gnupg-announce/2016q3/000395.html Reviewed by: amdmi3 (mentor) Approved by: amdmi3 (mentor) Differential Revision: D7558 Approved by: ports-secteam (junovitch) Modified: branches/2016Q3/security/libgcrypt/Makefile branches/2016Q3/security/libgcrypt/distinfo branches/2016Q3/security/libgcrypt/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/security/libgcrypt/Makefile ============================================================================== --- branches/2016Q3/security/libgcrypt/Makefile Mon Aug 22 04:32:18 2016 (r420587) +++ branches/2016Q3/security/libgcrypt/Makefile Mon Aug 22 06:20:30 2016 (r420588) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libgcrypt -PORTVERSION= 1.7.2 +PORTVERSION= 1.7.3 CATEGORIES= security MASTER_SITES= GNUPG Modified: branches/2016Q3/security/libgcrypt/distinfo ============================================================================== --- branches/2016Q3/security/libgcrypt/distinfo Mon Aug 22 04:32:18 2016 (r420587) +++ branches/2016Q3/security/libgcrypt/distinfo Mon Aug 22 06:20:30 2016 (r420588) @@ -1,3 +1,3 @@ -TIMESTAMP = 1468663748 -SHA256 (libgcrypt-1.7.2.tar.bz2) = 3d35df906d6eab354504c05d749a9b021944cb29ff5f65c8ef9c3dd5f7b6689f -SIZE (libgcrypt-1.7.2.tar.bz2) = 2845301 +TIMESTAMP = 1471514079 +SHA256 (libgcrypt-1.7.3.tar.bz2) = ddac6111077d0a1612247587be238c5294dd0ee4d76dc7ba783cc55fb0337071 +SIZE (libgcrypt-1.7.3.tar.bz2) = 2861294 Modified: branches/2016Q3/security/libgcrypt/pkg-plist ============================================================================== --- branches/2016Q3/security/libgcrypt/pkg-plist Mon Aug 22 04:32:18 2016 (r420587) +++ branches/2016Q3/security/libgcrypt/pkg-plist Mon Aug 22 06:20:30 2016 (r420588) @@ -6,6 +6,6 @@ include/gcrypt.h lib/libgcrypt.a lib/libgcrypt.so lib/libgcrypt.so.20 -lib/libgcrypt.so.20.1.2 +lib/libgcrypt.so.20.1.3 man/man1/hmac256.1.gz share/aclocal/libgcrypt.m4 From owner-svn-ports-branches@freebsd.org Mon Aug 22 09:43:57 2016 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 25E55BBF34E; Mon, 22 Aug 2016 09:43:57 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ECA6F1BA0; Mon, 22 Aug 2016 09:43:56 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7M9hubk058360; Mon, 22 Aug 2016 09:43:56 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7M9huDv058359; Mon, 22 Aug 2016 09:43:56 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201608220943.u7M9huDv058359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 22 Aug 2016 09:43:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420594 - branches/2016Q3/devel/cvsps 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.22 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: Mon, 22 Aug 2016 09:43:57 -0000 Author: amdmi3 Date: Mon Aug 22 09:43:55 2016 New Revision: 420594 URL: https://svnweb.freebsd.org/changeset/ports/420594 Log: MFH: r420593 - Add MASTER_SITES, fixing fetch PR: 212039 Submitted by: lbartoletti@tuxfamily.org Approved by: ports-secteam blanket Modified: branches/2016Q3/devel/cvsps/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/devel/cvsps/Makefile ============================================================================== --- branches/2016Q3/devel/cvsps/Makefile Mon Aug 22 09:42:52 2016 (r420593) +++ branches/2016Q3/devel/cvsps/Makefile Mon Aug 22 09:43:55 2016 (r420594) @@ -3,9 +3,10 @@ PORTNAME= cvsps PORTVERSION= 2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel -MASTER_SITES= http://www.cobite.com/cvsps/ +MASTER_SITES= http://www.cobite.com/cvsps/ \ + SF/${PORTNAME}/ MAINTAINER= ports@FreeBSD.org COMMENT= Create patchset information from CVS From owner-svn-ports-branches@freebsd.org Mon Aug 22 10:27:02 2016 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 46139BC05ED; Mon, 22 Aug 2016 10:27:02 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 217621EF0; Mon, 22 Aug 2016 10:27:02 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7MAR1GY073462; Mon, 22 Aug 2016 10:27:01 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7MAR1FE073459; Mon, 22 Aug 2016 10:27:01 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201608221027.u7MAR1FE073459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Mon, 22 Aug 2016 10:27:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420596 - in branches/2016Q3/devel/qca: . 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.22 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: Mon, 22 Aug 2016 10:27:02 -0000 Author: rakuco Date: Mon Aug 22 10:27:00 2016 New Revision: 420596 URL: https://svnweb.freebsd.org/changeset/ports/420596 Log: MFH: r417968 r418048 r420303 devel/qca: Fix building without SSLv3 and SHA-0 - Add 2 patches from upstream project - Fix building when libssl does not have SSLv3 - Fix building when libcrypto does not have SHA-0 - Replace USE_OPENSSL with USES= ssl - Rework files/patch-libressl with `make makepatch` Tested with devel/qca and devel/qca-qt5 PR: 210053 Approved by: Maintainer time-out Obtained from: KDE Differential Revision: D6885 devel/qca: Fix build failure on 9.3 / OpenSSL 0.9.7 - Re-add patch for compression to satisfy 0.9.7 PR: 210053 Adjust the SHA0 removal patch. The upstream fix was still returning "sha0" in all_hash_types() even when SHA0 support is not present. The fix has also been submitted upstream. PR: 211833 Submitted by: matthew@reztek.cz Approved by: ports-secteam (junovitch) Added: branches/2016Q3/devel/qca/files/patch-plugins_qca-ossl_CMakeLists.txt - copied unchanged from r417968, head/devel/qca/files/patch-plugins_qca-ossl_CMakeLists.txt branches/2016Q3/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp - copied, changed from r417968, head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp Deleted: branches/2016Q3/devel/qca/files/patch-libressl Modified: branches/2016Q3/devel/qca/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/devel/qca/Makefile ============================================================================== --- branches/2016Q3/devel/qca/Makefile Mon Aug 22 10:05:42 2016 (r420595) +++ branches/2016Q3/devel/qca/Makefile Mon Aug 22 10:27:00 2016 (r420596) @@ -3,6 +3,7 @@ PORTNAME= qca PORTVERSION= 2.1.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= KDE/stable/qca/${PORTVERSION}/src @@ -38,7 +39,7 @@ GNUPG_CMAKE_ON= -DWITH_gnupg_PLUGIN=yes GNUPG_RUN_DEPENDS= gpg2:security/gnupg OPENSSL_CMAKE_ON= -DWITH_ossl_PLUGIN=yes -OPENSSL_USE= OPENSSL=yes +OPENSSL_USES= ssl SASL_CMAKE_ON= -DWITH_cyrus-sasl_PLUGIN=yes SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 Copied: branches/2016Q3/devel/qca/files/patch-plugins_qca-ossl_CMakeLists.txt (from r417968, head/devel/qca/files/patch-plugins_qca-ossl_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/devel/qca/files/patch-plugins_qca-ossl_CMakeLists.txt Mon Aug 22 10:27:00 2016 (r420596, copy of r417968, head/devel/qca/files/patch-plugins_qca-ossl_CMakeLists.txt) @@ -0,0 +1,28 @@ +qca-ossl: Fix build without support for SHA-0 +https://quickgit.kde.org/?p=qca.git&a=commit&h=0dbed8eb38afd1561907a52283091c37e7b85156 + +LibreSSL >= 2.3.0 removed support for SHA-0, so there's no EVP_sha +anymore. +Wikipedia says about SHA-0: "160-bit hash function published in 1993 +under the name SHA. It was withdrawn shortly after publication due to +an undisclosed "significant flaw" and replaced by the slightly revised +version SHA-1.' + +REVIEW: 125387 + +--- plugins/qca-ossl/CMakeLists.txt.orig ++++ plugins/qca-ossl/CMakeLists.txt +@@ -24,6 +24,13 @@ + else(HAVE_OPENSSL_AES_CTR) + message(WARNING "qca-ossl will be compiled without AES CTR mode encryption support") + endif(HAVE_OPENSSL_AES_CTR) ++ ++ check_function_exists(EVP_sha HAVE_OPENSSL_SHA0) ++ if(HAVE_OPENSSL_SHA0) ++ add_definitions(-DHAVE_OPENSSL_SHA0) ++ else(HAVE_OPENSSL_SHA0) ++ message(WARNING "qca-ossl will be compiled without SHA-0 digest algorithm support") ++ endif(HAVE_OPENSSL_SHA0) + + set(QCA_OSSL_SOURCES qca-ossl.cpp) + Copied and modified: branches/2016Q3/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp (from r417968, head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp) ============================================================================== --- head/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp Sun Jul 3 12:10:18 2016 (r417968, copy source) +++ branches/2016Q3/devel/qca/files/patch-plugins_qca-ossl_qca-ossl.cpp Mon Aug 22 10:27:00 2016 (r420596) @@ -1,27 +1,31 @@ -qca-ossl: Fix build without SSLv3 +qca-ossl: Fix build without SSLv3 http://quickgit.kde.org/?p=qca.git&a=commit&h=20a587d77636186edb044cd2b71d6d90fe98d232 -This fixes building with LibreSSL >= 2.3.0 which has removed support -for SSLv3 completely. As far as I know OpenSSL can be configured to -build without it, so it might be helpful there as well. +This fixes building with LibreSSL >= 2.3.0 which has removed support +for SSLv3 completely. As far as I know OpenSSL can be configured to +build without it, so it might be helpful there as well. -REVIEW: 125386 +REVIEW: 125386 -qca-ossl: Fix build without support for SHA-0 +qca-ossl: Fix build without support for SHA-0 https://quickgit.kde.org/?p=qca.git&a=commit&h=0dbed8eb38afd1561907a52283091c37e7b85156 -LibreSSL >= 2.3.0 removed support for SHA-0, so there's no EVP_sha -anymore. -Wikipedia says about SHA-0: "160-bit hash function published in 1993 -under the name SHA. It was withdrawn shortly after publication due to -an undisclosed "significant flaw" and replaced by the slightly revised -version SHA-1.' +LibreSSL >= 2.3.0 removed support for SHA-0, so there's no EVP_sha +anymore. +Wikipedia says about SHA-0: "160-bit hash function published in 1993 +under the name SHA. It was withdrawn shortly after publication due to +an undisclosed "significant flaw" and replaced by the slightly revised +version SHA-1.' + +REVIEW: 125387 + +Also includes: +qca-ossl: Remove SHA0 from all_hash_types() when it is not available. +https://git.reviewboard.kde.org/r/128700/ -REVIEW: 125387 - ---- plugins/qca-ossl/qca-ossl.cpp.orig 2016-07-03 11:34:48 UTC +--- plugins/qca-ossl/qca-ossl.cpp.orig 2015-10-02 09:39:21 UTC +++ plugins/qca-ossl/qca-ossl.cpp -@@ -5403,9 +5403,11 @@ +@@ -5403,9 +5403,11 @@ public: ctx = SSL_CTX_new(SSLv2_client_method()); break; #endif @@ -33,7 +37,30 @@ REVIEW: 125387 case TLS::TLS_v1: ctx = SSL_CTX_new(TLSv1_client_method()); break; -@@ -7135,8 +7135,10 @@ +@@ -5805,7 +5807,11 @@ public: + { + SessionInfo sessInfo; + +- sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(ssl->session)); ++#ifndef OPENSSL_NO_COMP ++ sessInfo.isCompressed = (0 != ssl->session->compress_meth); ++#else ++ sessInfo.isCompressed = 0; ++#endif + + if (ssl->version == TLS1_VERSION) + sessInfo.version = TLS::TLS_v1; +@@ -6880,7 +6886,9 @@ static QStringList all_hash_types() + { + QStringList list; + list += "sha1"; ++#ifdef HAVE_OPENSSL_SHA0 + list += "sha0"; ++#endif + list += "ripemd160"; + #ifdef HAVE_OPENSSL_MD2 + list += "md2"; +@@ -7133,8 +7141,10 @@ public: return new opensslInfoContext(this); else if ( type == "sha1" ) return new opensslHashContext( EVP_sha1(), this, type); From owner-svn-ports-branches@freebsd.org Mon Aug 22 13:15:53 2016 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 C512BBC1AC9; Mon, 22 Aug 2016 13:15:53 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 927FB17AE; Mon, 22 Aug 2016 13:15:53 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7MDFqTP038703; Mon, 22 Aug 2016 13:15:52 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7MDFpJY038690; Mon, 22 Aug 2016 13:15:51 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201608221315.u7MDFpJY038690@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 22 Aug 2016 13:15:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420611 - in branches/2016Q3/net-mgmt/nagios4: . 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.22 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: Mon, 22 Aug 2016 13:15:53 -0000 Author: mat Date: Mon Aug 22 13:15:51 2016 New Revision: 420611 URL: https://svnweb.freebsd.org/changeset/ports/420611 Log: MFH: r420608 Update to 4.2.0. Security: CVE-2008-4796 Security: CVE-2013-4214 Changes: https://github.com/NagiosEnterprises/nagioscore/blob/nagios-4.2.0/Changelog Sponsored by: Absolight Added: branches/2016Q3/net-mgmt/nagios4/files/patch-html_Makefile.in - copied unchanged from r420608, head/net-mgmt/nagios4/files/patch-html_Makefile.in branches/2016Q3/net-mgmt/nagios4/files/patch-html_index.php - copied unchanged from r420608, head/net-mgmt/nagios4/files/patch-html_index.php branches/2016Q3/net-mgmt/nagios4/files/patch-html_main.php - copied unchanged from r420608, head/net-mgmt/nagios4/files/patch-html_main.php branches/2016Q3/net-mgmt/nagios4/files/patch-include_locations.h.in - copied unchanged from r420608, head/net-mgmt/nagios4/files/patch-include_locations.h.in branches/2016Q3/net-mgmt/nagios4/files/patch-lib_runcmd.c - copied unchanged from r420608, head/net-mgmt/nagios4/files/patch-lib_runcmd.c branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in - copied unchanged from r420608, head/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in - copied unchanged from r420608, head/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in - copied unchanged from r420608, head/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in - copied unchanged from r420608, head/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in Deleted: branches/2016Q3/net-mgmt/nagios4/files/patch-html__Makefile.in branches/2016Q3/net-mgmt/nagios4/files/patch-html__index.php branches/2016Q3/net-mgmt/nagios4/files/patch-html__main.php branches/2016Q3/net-mgmt/nagios4/files/patch-include__locations.h.in branches/2016Q3/net-mgmt/nagios4/files/patch-lib__runcmd.c branches/2016Q3/net-mgmt/nagios4/files/patch-lib_iobroker.c branches/2016Q3/net-mgmt/nagios4/files/patch-lib_nsock.c branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in Modified: branches/2016Q3/net-mgmt/nagios4/Makefile branches/2016Q3/net-mgmt/nagios4/distinfo branches/2016Q3/net-mgmt/nagios4/files/patch-configure branches/2016Q3/net-mgmt/nagios4/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/net-mgmt/nagios4/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/nagios4/Makefile Mon Aug 22 13:15:15 2016 (r420610) +++ branches/2016Q3/net-mgmt/nagios4/Makefile Mon Aug 22 13:15:51 2016 (r420611) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= nagios -PORTVERSION= 4.1.1 -PORTREVISION= 4 +PORTVERSION= 4.2.0 +PORTREVISION= 0 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= 4 Modified: branches/2016Q3/net-mgmt/nagios4/distinfo ============================================================================== --- branches/2016Q3/net-mgmt/nagios4/distinfo Mon Aug 22 13:15:15 2016 (r420610) +++ branches/2016Q3/net-mgmt/nagios4/distinfo Mon Aug 22 13:15:51 2016 (r420611) @@ -1,2 +1,3 @@ -SHA256 (nagios-4.1.1.tar.gz) = 58218e5e66c8078fc578a60db33b5c3da10fc6a793e97d2b00780517e3efa0a7 -SIZE (nagios-4.1.1.tar.gz) = 11142182 +TIMESTAMP = 1471870658 +SHA256 (nagios-4.2.0.tar.gz) = 93be769854d7e64c526da29b79c92fb500a9795a82547a85ca0a9180a8f6725c +SIZE (nagios-4.2.0.tar.gz) = 11155104 Modified: branches/2016Q3/net-mgmt/nagios4/files/patch-configure ============================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-configure Mon Aug 22 13:15:15 2016 (r420610) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-configure Mon Aug 22 13:15:51 2016 (r420611) @@ -1,6 +1,6 @@ ---- configure.orig 2015-08-19 21:49:52 UTC +--- configure.orig 2016-08-01 15:46:23 UTC +++ configure -@@ -6016,7 +6016,6 @@ cat >>confdefs.h <<_ACEOF +@@ -4721,7 +4721,6 @@ cat >>confdefs.h <<_ACEOF #define DEFAULT_NAGIOS_GROUP "$nagios_grp" _ACEOF @@ -8,7 +8,7 @@ -@@ -6037,7 +6036,6 @@ fi +@@ -4742,7 +4741,6 @@ fi @@ -16,7 +16,7 @@ MAIL_PROG=no -@@ -7768,7 +7766,7 @@ $as_echo_n "checking for linker flags fo +@@ -5643,7 +5641,7 @@ $as_echo_n "checking for linker flags fo MOD_LDFLAGS="-shared" MOD_CFLAGS="-fPIC" ;; Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-html_Makefile.in (from r420608, head/net-mgmt/nagios4/files/patch-html_Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-html_Makefile.in Mon Aug 22 13:15:51 2016 (r420611, copy of r420608, head/net-mgmt/nagios4/files/patch-html_Makefile.in) @@ -0,0 +1,14 @@ +--- html/Makefile.in.orig 2016-08-01 15:46:23 UTC ++++ html/Makefile.in +@@ -45,11 +45,8 @@ devclean: distclean + + install: + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-html_index.php (from r420608, head/net-mgmt/nagios4/files/patch-html_index.php) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-html_index.php Mon Aug 22 13:15:51 2016 (r420611, copy of r420608, head/net-mgmt/nagios4/files/patch-html_index.php) @@ -0,0 +1,11 @@ +--- html/index.php.orig 2016-08-01 15:46:23 UTC ++++ html/index.php +@@ -1,6 +1,7 @@ + Nagios® Core™ +
Version
+
August 01, 2016
+-
Check for updates
+- +- +- +-
+- +-
+-
Warning: Automatic Update Checks are Disabled!
+-
Disabling update checks presents a possible security risk. Visit nagios.org to check for updates manually or enable update checks in your Nagios config file.
+-
+- +-
+-
A new version of Nagios Core is available!
+-
Visit nagios.org to download Nagios .
+-
+- +
+ + Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-include_locations.h.in (from r420608, head/net-mgmt/nagios4/files/patch-include_locations.h.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-include_locations.h.in Mon Aug 22 13:15:51 2016 (r420611, copy of r420608, head/net-mgmt/nagios4/files/patch-include_locations.h.in) @@ -0,0 +1,11 @@ +--- include/locations.h.in.orig 2016-08-01 15:46:23 UTC ++++ include/locations.h.in +@@ -19,7 +19,7 @@ + + #define DEFAULT_TEMP_FILE "@localstatedir@/tempfile" + #define DEFAULT_TEMP_PATH "/tmp" +-#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/spool/checkresults" ++#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/checkresults" + #define DEFAULT_STATUS_FILE "@localstatedir@/status.dat" + #define DEFAULT_LOG_FILE "@localstatedir@/nagios.log" + #define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/archives/" Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-lib_runcmd.c (from r420608, head/net-mgmt/nagios4/files/patch-lib_runcmd.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-lib_runcmd.c Mon Aug 22 13:15:51 2016 (r420611, copy of r420608, head/net-mgmt/nagios4/files/patch-lib_runcmd.c) @@ -0,0 +1,11 @@ +--- lib/runcmd.c.orig 2016-08-01 15:46:23 UTC ++++ lib/runcmd.c +@@ -36,7 +36,7 @@ + #endif + + /* Determine whether we have setenv()/unsetenv() (see setenv(3) on Linux) */ +-#if _BSD_SOURCE || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 ++#if defined(__DragonFly__) || __FreeBSD__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 + # define HAVE_SETENV + #endif + Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in (from r420608, head/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in Mon Aug 22 13:15:51 2016 (r420611, copy of r420608, head/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in) @@ -0,0 +1,11 @@ +--- sample-config/cgi.cfg.in.orig 2016-08-01 15:46:23 UTC ++++ sample-config/cgi.cfg.in +@@ -277,7 +277,7 @@ default_statuswrl_layout=4 + # OS and distribution, so you may have to tweak this to + # work on your system. + +-ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$ ++ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$ + + + Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in (from r420608, head/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in Mon Aug 22 13:15:51 2016 (r420611, copy of r420608, head/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in) @@ -0,0 +1,11 @@ +--- sample-config/nagios.cfg.in.orig 2016-08-01 15:46:23 UTC ++++ sample-config/nagios.cfg.in +@@ -31,7 +31,7 @@ cfg_file=@sysconfdir@/objects/contacts.c + cfg_file=@sysconfdir@/objects/timeperiods.cfg + cfg_file=@sysconfdir@/objects/templates.cfg + +-# Definitions for monitoring the local (Linux) host ++# Definitions for monitoring the local (FreeBSD) host + cfg_file=@sysconfdir@/objects/localhost.cfg + + # Definitions for monitoring a Windows machine Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in (from r420608, head/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in Mon Aug 22 13:15:51 2016 (r420611, copy of r420608, head/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in) @@ -0,0 +1,40 @@ +--- sample-config/template-object/localhost.cfg.in.orig 2016-08-01 15:46:23 UTC ++++ sample-config/template-object/localhost.cfg.in +@@ -4,7 +4,7 @@ + # + # NOTE: This config file is intended to serve as an *extremely* simple + # example of how you can create configuration entries to monitor +-# the local (Linux) machine. ++# the local (FreeBSD) machine. + # + ############################################################################### + +@@ -22,9 +22,9 @@ + # Define a host for the local machine + + define host{ +- use linux-server ; Name of host template to use ++ use freebsd-server ; Name of host template to use + ; This host definition will inherit all variables that are defined +- ; in (or inherited by) the linux-server host template definition. ++ ; in (or inherited by) the freebsd-server host template definition. + host_name localhost + alias localhost + address 127.0.0.1 +@@ -40,12 +40,12 @@ define host{ + ############################################################################### + ############################################################################### + +-# Define an optional hostgroup for Linux machines ++# Define an optional hostgroup for FreeBSD machines + + define hostgroup{ +- hostgroup_name linux-servers ; The name of the hostgroup +- alias Linux Servers ; Long name of the group +- members localhost ; Comma separated list of hosts that belong to this group ++ hostgroup_name freebsd-servers ; The name of the hostgroup ++ alias FreeBSD Servers ; Long name of the group ++ members localhost ; Comma separated list of hosts that belong to this group + } + + Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in (from r420608, head/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in Mon Aug 22 13:15:51 2016 (r420611, copy of r420608, head/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in) @@ -0,0 +1,26 @@ +--- sample-config/template-object/templates.cfg.in.orig 2016-08-01 15:46:23 UTC ++++ sample-config/template-object/templates.cfg.in +@@ -61,17 +61,17 @@ define host{ + } + + +-# Linux host definition template - This is NOT a real host, just a template! ++# FreeBSD host definition template - This is NOT a real host, just a template! + + define host{ +- name linux-server ; The name of this host template ++ name freebsd-server ; The name of this host template + use generic-host ; This template inherits other values from the generic-host template +- check_period 24x7 ; By default, Linux hosts are checked round the clock ++ check_period 24x7 ; By default, FreeBSD hosts are checked round the clock + check_interval 5 ; Actively check the host every 5 minutes + retry_interval 1 ; Schedule host check retries at 1 minute intervals +- max_check_attempts 10 ; Check each Linux host 10 times (max) +- check_command check-host-alive ; Default command to check Linux hosts +- notification_period workhours ; Linux admins hate to be woken up, so we only notify during the day ++ max_check_attempts 10 ; Check each FreeBSD host 10 times (max) ++ check_command check-host-alive ; Default command to check FreeBSD hosts ++ notification_period workhours ; FreeBSD admins hate to be woken up, so we only notify during the day + ; Note that the notification_period variable is being overridden from + ; the value that is inherited from the generic-host template! + notification_interval 120 ; Resend notifications every 2 hours Modified: branches/2016Q3/net-mgmt/nagios4/pkg-plist ============================================================================== --- branches/2016Q3/net-mgmt/nagios4/pkg-plist Mon Aug 22 13:15:15 2016 (r420610) +++ branches/2016Q3/net-mgmt/nagios4/pkg-plist Mon Aug 22 13:15:51 2016 (r420611) @@ -222,6 +222,9 @@ %%WWWDIR%%/images/logos/nagios.gd2 %%WWWDIR%%/images/logos/nagios.gif %%WWWDIR%%/images/logos/nagiosvrml.png +%%WWWDIR%%/images/logos/netbsd.gif +%%WWWDIR%%/images/logos/netbsd.jpg +%%WWWDIR%%/images/logos/netbsd.png %%WWWDIR%%/images/logos/next.gd2 %%WWWDIR%%/images/logos/next.gif %%WWWDIR%%/images/logos/next.jpg @@ -280,6 +283,9 @@ %%WWWDIR%%/images/logos/sunlogo.gif %%WWWDIR%%/images/logos/sunlogo.jpg %%WWWDIR%%/images/logos/sunlogo.png +%%WWWDIR%%/images/logos/suse.gif +%%WWWDIR%%/images/logos/suse.jpg +%%WWWDIR%%/images/logos/suse.png %%WWWDIR%%/images/logos/switch.gd2 %%WWWDIR%%/images/logos/switch.gif %%WWWDIR%%/images/logos/switch40.gd2 @@ -387,7 +393,7 @@ %%WWWDIR%%/map-form.html %%WWWDIR%%/map-links.html %%WWWDIR%%/map-popup.html -%%WWWDIR%%/map.html +%%WWWDIR%%/map.php %%WWWDIR%%/robots.txt %%WWWDIR%%/rss-corebanner.php %%WWWDIR%%/rss-corefeed.html @@ -429,5 +435,5 @@ @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,2775) %%NAGIOSDIR%%/checkresults @dir(%%NAGIOSUSER%%,%%WWWGRP%%,775) %%NAGIOSDIR%%/rw @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%% -@unexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi -@unexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi +@postunexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi +@postunexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi From owner-svn-ports-branches@freebsd.org Mon Aug 22 16:45:20 2016 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 DE53DBC210A; Mon, 22 Aug 2016 16:45:20 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9DE511D15; Mon, 22 Aug 2016 16:45:20 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7MGjJgh018455; Mon, 22 Aug 2016 16:45:19 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7MGjIA5018446; Mon, 22 Aug 2016 16:45:18 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201608221645.u7MGjIA5018446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Mon, 22 Aug 2016 16:45:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420623 - in branches/2016Q3/x11-fonts: fontconfig fontconfig-reference fontconfig/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.22 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: Mon, 22 Aug 2016 16:45:21 -0000 Author: kwm Date: Mon Aug 22 16:45:18 2016 New Revision: 420623 URL: https://svnweb.freebsd.org/changeset/ports/420623 Log: MFH: r420579 Update fontconfig to 2.12.1. Add license lines Add option to select the preferred hinting configuration Add CPE info [1] PR: 211570 Submitted by: lightside@gmx.com, rakuco@ [1] Security: 44989c29-67d1-11e6-8b1d-c86000169601, CVE-2016-5384 Approved by: ports-secteam@ (junovitch@) Deleted: branches/2016Q3/x11-fonts/fontconfig/files/fc-cache.1 branches/2016Q3/x11-fonts/fontconfig/files/fc-cat.1 branches/2016Q3/x11-fonts/fontconfig/files/fc-list.1 branches/2016Q3/x11-fonts/fontconfig/files/fc-match.1 branches/2016Q3/x11-fonts/fontconfig/files/fc-query.1 branches/2016Q3/x11-fonts/fontconfig/files/fc-scan.1 branches/2016Q3/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c Modified: branches/2016Q3/x11-fonts/fontconfig-reference/Makefile branches/2016Q3/x11-fonts/fontconfig-reference/pkg-plist branches/2016Q3/x11-fonts/fontconfig/Makefile branches/2016Q3/x11-fonts/fontconfig/distinfo branches/2016Q3/x11-fonts/fontconfig/files/patch-Makefile.in branches/2016Q3/x11-fonts/fontconfig/files/patch-configure branches/2016Q3/x11-fonts/fontconfig/files/patch-src__fccompat.c branches/2016Q3/x11-fonts/fontconfig/files/patch-src_fcatomic.h branches/2016Q3/x11-fonts/fontconfig/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/x11-fonts/fontconfig-reference/Makefile ============================================================================== --- branches/2016Q3/x11-fonts/fontconfig-reference/Makefile Mon Aug 22 16:39:33 2016 (r420622) +++ branches/2016Q3/x11-fonts/fontconfig-reference/Makefile Mon Aug 22 16:45:18 2016 (r420623) @@ -4,6 +4,8 @@ PORTREVISION= 0 PORTEPOCH= 0 +NO_ARCH= yes + DOCSDIR= ${PREFIX}/share/doc/fontconfig-devel do-install: Modified: branches/2016Q3/x11-fonts/fontconfig-reference/pkg-plist ============================================================================== --- branches/2016Q3/x11-fonts/fontconfig-reference/pkg-plist Mon Aug 22 16:39:33 2016 (r420622) +++ branches/2016Q3/x11-fonts/fontconfig-reference/pkg-plist Mon Aug 22 16:45:18 2016 (r420623) @@ -156,6 +156,11 @@ man/man3/FcPatternHash.3.gz man/man3/FcPatternPrint.3.gz man/man3/FcPatternReference.3.gz man/man3/FcPatternRemove.3.gz +man/man3/FcRangeCopy.3.gz +man/man3/FcRangeCreateDouble.3.gz +man/man3/FcRangeCreateInteger.3.gz +man/man3/FcRangeDestroy.3.gz +man/man3/FcRangeGetDouble.3.gz man/man3/FcStrBasename.3.gz man/man3/FcStrCmp.3.gz man/man3/FcStrCmpIgnoreCase.3.gz @@ -188,3 +193,5 @@ man/man3/FcValueDestroy.3.gz man/man3/FcValueEqual.3.gz man/man3/FcValuePrint.3.gz man/man3/FcValueSave.3.gz +man/man3/FcWeightFromOpenType.3.gz +man/man3/FcWeightToOpenType.3.gz Modified: branches/2016Q3/x11-fonts/fontconfig/Makefile ============================================================================== --- branches/2016Q3/x11-fonts/fontconfig/Makefile Mon Aug 22 16:39:33 2016 (r420622) +++ branches/2016Q3/x11-fonts/fontconfig/Makefile Mon Aug 22 16:45:18 2016 (r420623) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= fontconfig -PORTVERSION= 2.11.1 -PORTREVISION?= 3 +PORTVERSION= 2.12.1 +PORTREVISION?= 0 PORTEPOCH?= 1 CATEGORIES= x11-fonts MASTER_SITES= http://www.freedesktop.org/software/fontconfig/release/ @@ -11,6 +11,9 @@ MASTER_SITES= http://www.freedesktop.org MAINTAINER= gnome@FreeBSD.org COMMENT= XML-based font configuration API for X Windows +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING + USES= tar:bzip2 .if !defined(REFERENCE_PORT) @@ -18,7 +21,8 @@ USES= tar:bzip2 LIB_DEPENDS= libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 -USES+= gmake libtool pathfix pkgconfig +USES+= cpe gmake libtool pathfix pkgconfig +CPE_VENDOR= fontconfig_project USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-configdir=${PREFIX}/etc/fonts/conf.d \ @@ -26,6 +30,7 @@ CONFIGURE_ARGS= --with-configdir=${PREFI --with-xmldir=${PREFIX}/etc/fonts \ --with-expat-includes=${LOCALBASE}/include \ --with-expat-lib=${LOCALBASE}/lib \ + --with-default-hinting=${PREFERRED_HINTING} \ --with-default-fonts=${PREFIX}/share/fonts \ --with-add-fonts=${LOCALBASE}/lib/X11/fonts \ --with-cache-dir=/var/db/fontconfig \ @@ -34,25 +39,32 @@ CONFIGURE_ARGS= --with-configdir=${PREFI # D6155: static linked library linking added to support statically linked # applications, e.g. x11/xforward static option -CONFIGURE_ARGS+= --enable-static +CONFIGURE_ARGS+= --enable-static +# Python is not required, because fc-blanks.h is available in distfile +CONFIGURE_ENV= PYTHON=":" MAKE_ENV= LC_ALL=C PKGINSTALL= ${WRKDIR}/pkg-install INSTALL_TARGET=install-strip -MAN1PAGES= fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1 -MAN5PAGES= fonts-conf.5 +PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING} PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt OPTIONS_DEFINE= DOCS +OPTIONS_SINGLE= HINTING +HINTING_DESC= Preferred pixel hinting configuration +.for opt in NONE SLIGHT MEDIUM FULL +OPTIONS_SINGLE_HINTING+= HINTING_${opt} +HINTING_${opt}_DESC= ${opt:tl} +HINTING_${opt}_VARS= PREFERRED_HINTING=${opt:tl} +.endfor +OPTIONS_DEFAULT= HINTING_SLIGHT post-install: - ${INSTALL_MAN} ${MAN5PAGES:S|^|${WRKSRC}/doc/|} \ - ${STAGEDIR}${PREFIX}/man/man5 -.for manpage in ${MAN1PAGES} - ${INSTALL_MAN} ${FILESDIR}/${manpage} \ + ${INSTALL_MAN} ${WRKSRC}/fc-*/*.1 \ ${STAGEDIR}${PREFIX}/man/man1 -.endfor + ${INSTALL_MAN} ${WRKSRC}/doc/*.5 \ + ${STAGEDIR}${PREFIX}/man/man5 ${INSTALL_DATA} ${WRKSRC}/fonts.conf \ ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample @${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \ Modified: branches/2016Q3/x11-fonts/fontconfig/distinfo ============================================================================== --- branches/2016Q3/x11-fonts/fontconfig/distinfo Mon Aug 22 16:39:33 2016 (r420622) +++ branches/2016Q3/x11-fonts/fontconfig/distinfo Mon Aug 22 16:45:18 2016 (r420623) @@ -1,2 +1,3 @@ -SHA256 (fontconfig-2.11.1.tar.bz2) = dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 -SIZE (fontconfig-2.11.1.tar.bz2) = 1516095 +TIMESTAMP = 1470376167 +SHA256 (fontconfig-2.12.1.tar.bz2) = b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 +SIZE (fontconfig-2.12.1.tar.bz2) = 1608901 Modified: branches/2016Q3/x11-fonts/fontconfig/files/patch-Makefile.in ============================================================================== --- branches/2016Q3/x11-fonts/fontconfig/files/patch-Makefile.in Mon Aug 22 16:39:33 2016 (r420622) +++ branches/2016Q3/x11-fonts/fontconfig/files/patch-Makefile.in Mon Aug 22 16:45:18 2016 (r420623) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2012-11-01 10:55:40.000000000 +0000 -+++ Makefile.in 2012-11-01 10:56:37.000000000 +0000 -@@ -932,28 +932,6 @@ +--- Makefile.in.orig 2016-08-05 05:49:13 UTC ++++ Makefile.in +@@ -1027,28 +1027,6 @@ fonts.conf: fonts.conf.in Makefile mv $@.tmp $@ install-data-local: fonts.conf Modified: branches/2016Q3/x11-fonts/fontconfig/files/patch-configure ============================================================================== --- branches/2016Q3/x11-fonts/fontconfig/files/patch-configure Mon Aug 22 16:39:33 2016 (r420622) +++ branches/2016Q3/x11-fonts/fontconfig/files/patch-configure Mon Aug 22 16:45:18 2016 (r420623) @@ -1,6 +1,6 @@ ---- configure.orig 2013-12-27 19:47:10.000000000 +0100 -+++ configure 2013-12-27 19:47:24.000000000 +0100 -@@ -654,6 +654,7 @@ +--- configure.orig 2016-08-05 05:49:14 UTC ++++ configure +@@ -654,6 +654,7 @@ ax_pthread_config XMLDIR CONFIGDIR BASECONFIGDIR Modified: branches/2016Q3/x11-fonts/fontconfig/files/patch-src__fccompat.c ============================================================================== --- branches/2016Q3/x11-fonts/fontconfig/files/patch-src__fccompat.c Mon Aug 22 16:39:33 2016 (r420622) +++ branches/2016Q3/x11-fonts/fontconfig/files/patch-src__fccompat.c Mon Aug 22 16:45:18 2016 (r420623) @@ -4,9 +4,9 @@ Removing this code from ARM builds resol https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=183536 ---- src/fccompat.c.orig 2014-08-12 16:34:15.875384345 +0200 -+++ src/fccompat.c 2014-08-12 16:35:04.752379905 +0200 -@@ -191,7 +191,7 @@ +--- src/fccompat.c.orig 2016-07-11 02:41:06 UTC ++++ src/fccompat.c +@@ -191,7 +191,7 @@ FcRandom(void) #else random_r (&fcrandbuf, &result); #endif Modified: branches/2016Q3/x11-fonts/fontconfig/files/patch-src_fcatomic.h ============================================================================== --- branches/2016Q3/x11-fonts/fontconfig/files/patch-src_fcatomic.h Mon Aug 22 16:39:33 2016 (r420622) +++ branches/2016Q3/x11-fonts/fontconfig/files/patch-src_fcatomic.h Mon Aug 22 16:45:18 2016 (r420623) @@ -1,6 +1,6 @@ ---- ./src/fcatomic.h.orig 2013-10-11 03:10:18.000000000 +0000 -+++ ./src/fcatomic.h 2014-12-06 21:48:12.136252912 +0000 -@@ -96,7 +96,17 @@ +--- src/fcatomic.h.orig 2016-07-11 02:41:06 UTC ++++ src/fcatomic.h +@@ -96,7 +96,17 @@ typedef int fc_atomic_int_t; #define fc_atomic_int_add(AI, V) __sync_fetch_and_add (&(AI), (V)) #define fc_atomic_ptr_get(P) (void *) (__sync_synchronize (), *(P)) Modified: branches/2016Q3/x11-fonts/fontconfig/pkg-plist ============================================================================== --- branches/2016Q3/x11-fonts/fontconfig/pkg-plist Mon Aug 22 16:39:33 2016 (r420622) +++ branches/2016Q3/x11-fonts/fontconfig/pkg-plist Mon Aug 22 16:45:18 2016 (r420623) @@ -7,6 +7,10 @@ bin/fc-query bin/fc-scan bin/fc-validate etc/fonts/conf.avail/10-autohint.conf +etc/fonts/conf.avail/10-hinting-full.conf +etc/fonts/conf.avail/10-hinting-medium.conf +etc/fonts/conf.avail/10-hinting-none.conf +etc/fonts/conf.avail/10-hinting-slight.conf etc/fonts/conf.avail/10-no-sub-pixel.conf etc/fonts/conf.avail/10-scale-bitmap-fonts.conf etc/fonts/conf.avail/10-sub-pixel-bgr.conf @@ -35,6 +39,7 @@ etc/fonts/conf.avail/70-no-bitmaps.conf etc/fonts/conf.avail/70-yes-bitmaps.conf etc/fonts/conf.avail/80-delicious.conf etc/fonts/conf.avail/90-synthetic.conf +etc/fonts/conf.d/10-hinting-%%PREFERRED_HINTING%%.conf etc/fonts/conf.d/10-scale-bitmap-fonts.conf etc/fonts/conf.d/20-unhint-small-vera.conf etc/fonts/conf.d/30-metric-aliases.conf @@ -59,13 +64,15 @@ include/fontconfig/fontconfig.h lib/libfontconfig.a lib/libfontconfig.so lib/libfontconfig.so.1 -lib/libfontconfig.so.1.8.0 +lib/libfontconfig.so.1.9.2 libdata/pkgconfig/fontconfig.pc man/man1/fc-cache.1.gz man/man1/fc-cat.1.gz man/man1/fc-list.1.gz man/man1/fc-match.1.gz +man/man1/fc-pattern.1.gz man/man1/fc-query.1.gz man/man1/fc-scan.1.gz +man/man1/fc-validate.1.gz man/man5/fonts-conf.5.gz @dir /var/db/fontconfig From owner-svn-ports-branches@freebsd.org Mon Aug 22 19:44:06 2016 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 25197BC2DC7; Mon, 22 Aug 2016 19:44:06 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CF3631D24; Mon, 22 Aug 2016 19:44:05 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7MJi5Ln086657; Mon, 22 Aug 2016 19:44:05 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7MJi4La086655; Mon, 22 Aug 2016 19:44:04 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201608221944.u7MJi4La086655@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Mon, 22 Aug 2016 19:44:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420633 - branches/2016Q3/deskutils/gnome-maps 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.22 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: Mon, 22 Aug 2016 19:44:06 -0000 Author: kwm Date: Mon Aug 22 19:44:04 2016 New Revision: 420633 URL: https://svnweb.freebsd.org/changeset/ports/420633 Log: MFH: r420632 Update gnome-maps to 3.18.3.1. Add license block. While here record indirect dependancies. This release uses another map provider since the one in previous releases discontinued it's services. PR: 211509 (based on) Submitted by: cpm@ Approved by: ports-secteam@ fixit blanket Modified: branches/2016Q3/deskutils/gnome-maps/Makefile branches/2016Q3/deskutils/gnome-maps/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/deskutils/gnome-maps/Makefile ============================================================================== --- branches/2016Q3/deskutils/gnome-maps/Makefile Mon Aug 22 19:40:01 2016 (r420632) +++ branches/2016Q3/deskutils/gnome-maps/Makefile Mon Aug 22 19:44:04 2016 (r420633) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gnome-maps -PORTVERSION= 3.18.2 +PORTVERSION= 3.18.3.1 CATEGORIES= deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -10,12 +10,18 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Map application for GNOME 3 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= geoclue>=0:net/geoclue \ itstool:textproc/itstool LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libgeocode-glib.so:net/geocode-glib \ libgee-0.8.so:devel/libgee \ + libcogl.so:graphics/cogl \ + libclutter-1.0.so:graphics/clutter \ libchamplain-0.12.so:graphics/libchamplain \ + libjson-glib-1.0.so:devel/json-glib \ libfolks.so:net-im/folks \ libgjs.so:lang/gjs RUN_DEPENDS= geoclue>=0:net/geoclue @@ -23,7 +29,9 @@ RUN_DEPENDS= geoclue>=0:net/geoclue PORTSCOUT= limitw:1,even USES= gettext gmake gnome libtool pathfix pkgconfig tar:xz -USE_GNOME= gnomedesktop3 gtk30 intlhack +USE_GNOME= cairo gnomedesktop3 gtk30 intlhack +USE_GL= egl +USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes Modified: branches/2016Q3/deskutils/gnome-maps/distinfo ============================================================================== --- branches/2016Q3/deskutils/gnome-maps/distinfo Mon Aug 22 19:40:01 2016 (r420632) +++ branches/2016Q3/deskutils/gnome-maps/distinfo Mon Aug 22 19:44:04 2016 (r420633) @@ -1,2 +1,3 @@ -SHA256 (gnome3/gnome-maps-3.18.2.tar.xz) = 693ff1559252eabe5d8c9c7354333b5aa1996e870936456d15706a0e0bac9278 -SIZE (gnome3/gnome-maps-3.18.2.tar.xz) = 864904 +TIMESTAMP = 1471891367 +SHA256 (gnome3/gnome-maps-3.18.3.1.tar.xz) = cace391b937d09263d6114f3cd63aeb50d7cccbd34f7163769f1a09c37f5cb25 +SIZE (gnome3/gnome-maps-3.18.3.1.tar.xz) = 872804 From owner-svn-ports-branches@freebsd.org Mon Aug 22 22:22:03 2016 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 6D85EBC2C1C; Mon, 22 Aug 2016 22:22:03 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 396551191; Mon, 22 Aug 2016 22:22:03 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7MMM2cV043707; Mon, 22 Aug 2016 22:22:02 GMT (envelope-from mm@FreeBSD.org) Received: (from mm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7MMM2Oi043706; Mon, 22 Aug 2016 22:22:02 GMT (envelope-from mm@FreeBSD.org) Message-Id: <201608222222.u7MMM2Oi043706@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mm set sender to mm@FreeBSD.org using -f From: Martin Matuska Date: Mon, 22 Aug 2016 22:22:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420637 - branches/2016Q3/ftp/curl-hiphop 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.22 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: Mon, 22 Aug 2016 22:22:03 -0000 Author: mm Date: Mon Aug 22 22:22:02 2016 New Revision: 420637 URL: https://svnweb.freebsd.org/changeset/ports/420637 Log: MFH: 419757 mark ftp/curl-hiphop broken, deprecated and set expiration date Approved by: portmgr (junovitch) Modified: branches/2016Q3/ftp/curl-hiphop/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/ftp/curl-hiphop/Makefile ============================================================================== --- branches/2016Q3/ftp/curl-hiphop/Makefile Mon Aug 22 21:15:16 2016 (r420636) +++ branches/2016Q3/ftp/curl-hiphop/Makefile Mon Aug 22 22:22:02 2016 (r420637) @@ -6,6 +6,10 @@ PKGNAMESUFFIX= -hiphop MAINTAINER= mm@FreeBSD.org COMMENT= Static libcurl with custom patches for HipHop +BROKEN= fails to build +DEPRECATED= useful only for removed hiphop-php +EXPIRATION_DATE= 2016-09-07 + SSP_UNSAFE= Refuses -l in LDFLAGS BUILDING_HIPHOP= yes From owner-svn-ports-branches@freebsd.org Tue Aug 23 14:43:30 2016 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 19FA3BC3B83; Tue, 23 Aug 2016 14:43:30 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD4F1119E; Tue, 23 Aug 2016 14:43:29 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7NEhT2j016318; Tue, 23 Aug 2016 14:43:29 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7NEhRMe016303; Tue, 23 Aug 2016 14:43:27 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201608231443.u7NEhRMe016303@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 23 Aug 2016 14:43:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420685 - in branches/2016Q3/net-mgmt/nagios4: . 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.22 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, 23 Aug 2016 14:43:30 -0000 Author: mat Date: Tue Aug 23 14:43:27 2016 New Revision: 420685 URL: https://svnweb.freebsd.org/changeset/ports/420685 Log: MFH: r420683 Revert the update to 4.2. It currently exits with a bus error, which is, not good. Reported by: many Sponsored by: Absolight Added: branches/2016Q3/net-mgmt/nagios4/files/patch-html__Makefile.in - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-html__Makefile.in branches/2016Q3/net-mgmt/nagios4/files/patch-html__index.php - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-html__index.php branches/2016Q3/net-mgmt/nagios4/files/patch-html__main.php - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-html__main.php branches/2016Q3/net-mgmt/nagios4/files/patch-include__locations.h.in - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-include__locations.h.in branches/2016Q3/net-mgmt/nagios4/files/patch-lib__runcmd.c - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-lib__runcmd.c branches/2016Q3/net-mgmt/nagios4/files/patch-lib_iobroker.c - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-lib_iobroker.c branches/2016Q3/net-mgmt/nagios4/files/patch-lib_nsock.c - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-lib_nsock.c branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in - copied unchanged from r420683, head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in Deleted: branches/2016Q3/net-mgmt/nagios4/files/patch-html_Makefile.in branches/2016Q3/net-mgmt/nagios4/files/patch-html_index.php branches/2016Q3/net-mgmt/nagios4/files/patch-html_main.php branches/2016Q3/net-mgmt/nagios4/files/patch-include_locations.h.in branches/2016Q3/net-mgmt/nagios4/files/patch-lib_runcmd.c branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_cgi.cfg.in branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_nagios.cfg.in branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_localhost.cfg.in branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config_template-object_templates.cfg.in Modified: branches/2016Q3/net-mgmt/nagios4/Makefile branches/2016Q3/net-mgmt/nagios4/distinfo branches/2016Q3/net-mgmt/nagios4/files/patch-configure branches/2016Q3/net-mgmt/nagios4/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/net-mgmt/nagios4/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/nagios4/Makefile Tue Aug 23 14:42:02 2016 (r420684) +++ branches/2016Q3/net-mgmt/nagios4/Makefile Tue Aug 23 14:43:27 2016 (r420685) @@ -2,8 +2,9 @@ # $FreeBSD$ PORTNAME= nagios -PORTVERSION= 4.2.0 -PORTREVISION= 0 +PORTVERSION= 4.1.1 +PORTREVISION= 4 +PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= 4 Modified: branches/2016Q3/net-mgmt/nagios4/distinfo ============================================================================== --- branches/2016Q3/net-mgmt/nagios4/distinfo Tue Aug 23 14:42:02 2016 (r420684) +++ branches/2016Q3/net-mgmt/nagios4/distinfo Tue Aug 23 14:43:27 2016 (r420685) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471870658 -SHA256 (nagios-4.2.0.tar.gz) = 93be769854d7e64c526da29b79c92fb500a9795a82547a85ca0a9180a8f6725c -SIZE (nagios-4.2.0.tar.gz) = 11155104 +TIMESTAMP = 1471962949 +SHA256 (nagios-4.1.1.tar.gz) = 58218e5e66c8078fc578a60db33b5c3da10fc6a793e97d2b00780517e3efa0a7 +SIZE (nagios-4.1.1.tar.gz) = 11142182 Modified: branches/2016Q3/net-mgmt/nagios4/files/patch-configure ============================================================================== --- branches/2016Q3/net-mgmt/nagios4/files/patch-configure Tue Aug 23 14:42:02 2016 (r420684) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-configure Tue Aug 23 14:43:27 2016 (r420685) @@ -1,6 +1,6 @@ ---- configure.orig 2016-08-01 15:46:23 UTC +--- configure.orig 2015-08-19 21:49:52 UTC +++ configure -@@ -4721,7 +4721,6 @@ cat >>confdefs.h <<_ACEOF +@@ -6016,7 +6016,6 @@ cat >>confdefs.h <<_ACEOF #define DEFAULT_NAGIOS_GROUP "$nagios_grp" _ACEOF @@ -8,7 +8,7 @@ -@@ -4742,7 +4741,6 @@ fi +@@ -6037,7 +6036,6 @@ fi @@ -16,7 +16,7 @@ MAIL_PROG=no -@@ -5643,7 +5641,7 @@ $as_echo_n "checking for linker flags fo +@@ -7768,7 +7766,7 @@ $as_echo_n "checking for linker flags fo MOD_LDFLAGS="-shared" MOD_CFLAGS="-fPIC" ;; Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-html__Makefile.in (from r420683, head/net-mgmt/nagios4/files/patch-html__Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-html__Makefile.in Tue Aug 23 14:43:27 2016 (r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-html__Makefile.in) @@ -0,0 +1,14 @@ +--- html/Makefile.in.orig 2015-08-19 21:49:52 UTC ++++ html/Makefile.in +@@ -45,11 +45,8 @@ devclean: distclean + + install: + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/media + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-html__index.php (from r420683, head/net-mgmt/nagios4/files/patch-html__index.php) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-html__index.php Tue Aug 23 14:43:27 2016 (r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-html__index.php) @@ -0,0 +1,11 @@ +--- html/index.php.orig 2015-08-19 21:49:52 UTC ++++ html/index.php +@@ -1,6 +1,7 @@ + Nagios® Core™ +
Version
+
August 19, 2015
+-
Check for updates
+- +- +- +-
+- +-
+-
Warning: Automatic Update Checks are Disabled!
+-
Disabling update checks presents a possible security risk. Visit nagios.org to check for updates manually or enable update checks in your Nagios config file.
+-
+- +-
+-
A new version of Nagios Core is available!
+-
Visit nagios.org to download Nagios .
+-
+- +
+ + Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-include__locations.h.in (from r420683, head/net-mgmt/nagios4/files/patch-include__locations.h.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-include__locations.h.in Tue Aug 23 14:43:27 2016 (r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-include__locations.h.in) @@ -0,0 +1,11 @@ +--- include/locations.h.in.orig 2014-08-12 15:00:01 UTC ++++ include/locations.h.in +@@ -19,7 +19,7 @@ + + #define DEFAULT_TEMP_FILE "@localstatedir@/tempfile" + #define DEFAULT_TEMP_PATH "/tmp" +-#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/spool/checkresults" ++#define DEFAULT_CHECK_RESULT_PATH "@localstatedir@/checkresults" + #define DEFAULT_STATUS_FILE "@localstatedir@/status.dat" + #define DEFAULT_LOG_FILE "@localstatedir@/nagios.log" + #define DEFAULT_LOG_ARCHIVE_PATH "@localstatedir@/archives/" Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-lib__runcmd.c (from r420683, head/net-mgmt/nagios4/files/patch-lib__runcmd.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-lib__runcmd.c Tue Aug 23 14:43:27 2016 (r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-lib__runcmd.c) @@ -0,0 +1,11 @@ +--- lib/runcmd.c.orig 2014-08-12 15:00:01 UTC ++++ lib/runcmd.c +@@ -36,7 +36,7 @@ + #endif + + /* Determine whether we have setenv()/unsetenv() (see setenv(3) on Linux) */ +-#if _BSD_SOURCE || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 ++#if defined(__DragonFly__) || __FreeBSD__ || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 + # define HAVE_SETENV + #endif + Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-lib_iobroker.c (from r420683, head/net-mgmt/nagios4/files/patch-lib_iobroker.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-lib_iobroker.c Tue Aug 23 14:43:27 2016 (r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-lib_iobroker.c) @@ -0,0 +1,16 @@ +--- lib/iobroker.c.orig 2014-08-12 15:00:01 UTC ++++ lib/iobroker.c +@@ -415,11 +415,11 @@ int iobroker_poll(iobroker_set *iobs, in + iobs->pfd[p].events = POLLIN; + p++; + } +- nfds = poll(iobs->pfd, iobs->num_fds, timeout); ++ nfds = poll(iobs->pfd, p, timeout); + if (nfds < 0) { + return IOBROKER_ELIB; + } +- for (i = 0; i < iobs->num_fds; i++) { ++ for (i = 0; i < p; i++) { + iobroker_fd *s; + if ((iobs->pfd[i].revents & POLLIN) != POLLIN) { + continue; Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-lib_nsock.c (from r420683, head/net-mgmt/nagios4/files/patch-lib_nsock.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-lib_nsock.c Tue Aug 23 14:43:27 2016 (r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-lib_nsock.c) @@ -0,0 +1,11 @@ +--- lib/nsock.c.orig 2014-08-12 15:00:01 UTC ++++ lib/nsock.c +@@ -81,7 +81,7 @@ int nsock_unix(const char *path, unsigne + if(flags & NSOCK_UDP) + return sock; + +- if(listen(sock, 3) < 0) { ++ if(listen(sock, 48) < 0) { + close(sock); + return NSOCK_ELISTEN; + } Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in (from r420683, head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in Tue Aug 23 14:43:27 2016 (r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-sample-config__cgi.cfg.in) @@ -0,0 +1,11 @@ +--- sample-config/cgi.cfg.in.orig 2014-08-12 15:00:01 UTC ++++ sample-config/cgi.cfg.in +@@ -263,7 +263,7 @@ default_statuswrl_layout=4 + # OS and distribution, so you may have to tweak this to + # work on your system. + +-ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$ ++ping_syntax=/sbin/ping -n -c 5 $HOSTADDRESS$ + + + Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in (from r420683, head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in Tue Aug 23 14:43:27 2016 (r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-sample-config__nagios.cfg.in) @@ -0,0 +1,11 @@ +--- sample-config/nagios.cfg.in.orig 2014-08-12 15:00:01 UTC ++++ sample-config/nagios.cfg.in +@@ -31,7 +31,7 @@ cfg_file=@sysconfdir@/objects/contacts.c + cfg_file=@sysconfdir@/objects/timeperiods.cfg + cfg_file=@sysconfdir@/objects/templates.cfg + +-# Definitions for monitoring the local (Linux) host ++# Definitions for monitoring the local (FreeBSD) host + cfg_file=@sysconfdir@/objects/localhost.cfg + + # Definitions for monitoring a Windows machine Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in (from r420683, head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in Tue Aug 23 14:43:27 2016 (r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-sample-config__template-object__localhost.cfg.in) @@ -0,0 +1,40 @@ +--- sample-config/template-object/localhost.cfg.in.orig 2014-08-12 15:00:01 UTC ++++ sample-config/template-object/localhost.cfg.in +@@ -4,7 +4,7 @@ + # + # NOTE: This config file is intended to serve as an *extremely* simple + # example of how you can create configuration entries to monitor +-# the local (Linux) machine. ++# the local (FreeBSD) machine. + # + ############################################################################### + +@@ -22,9 +22,9 @@ + # Define a host for the local machine + + define host{ +- use linux-server ; Name of host template to use ++ use freebsd-server ; Name of host template to use + ; This host definition will inherit all variables that are defined +- ; in (or inherited by) the linux-server host template definition. ++ ; in (or inherited by) the freebsd-server host template definition. + host_name localhost + alias localhost + address 127.0.0.1 +@@ -40,12 +40,12 @@ define host{ + ############################################################################### + ############################################################################### + +-# Define an optional hostgroup for Linux machines ++# Define an optional hostgroup for FreeBSD machines + + define hostgroup{ +- hostgroup_name linux-servers ; The name of the hostgroup +- alias Linux Servers ; Long name of the group +- members localhost ; Comma separated list of hosts that belong to this group ++ hostgroup_name freebsd-servers ; The name of the hostgroup ++ alias FreeBSD Servers ; Long name of the group ++ members localhost ; Comma separated list of hosts that belong to this group + } + + Copied: branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in (from r420683, head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in Tue Aug 23 14:43:27 2016 (r420685, copy of r420683, head/net-mgmt/nagios4/files/patch-sample-config__template-object__templates.cfg.in) @@ -0,0 +1,26 @@ +--- sample-config/template-object/templates.cfg.in.orig 2014-08-12 15:00:01 UTC ++++ sample-config/template-object/templates.cfg.in +@@ -61,17 +61,17 @@ define host{ + } + + +-# Linux host definition template - This is NOT a real host, just a template! ++# FreeBSD host definition template - This is NOT a real host, just a template! + + define host{ +- name linux-server ; The name of this host template ++ name freebsd-server ; The name of this host template + use generic-host ; This template inherits other values from the generic-host template +- check_period 24x7 ; By default, Linux hosts are checked round the clock ++ check_period 24x7 ; By default, FreeBSD hosts are checked round the clock + check_interval 5 ; Actively check the host every 5 minutes + retry_interval 1 ; Schedule host check retries at 1 minute intervals +- max_check_attempts 10 ; Check each Linux host 10 times (max) +- check_command check-host-alive ; Default command to check Linux hosts +- notification_period workhours ; Linux admins hate to be woken up, so we only notify during the day ++ max_check_attempts 10 ; Check each FreeBSD host 10 times (max) ++ check_command check-host-alive ; Default command to check FreeBSD hosts ++ notification_period workhours ; FreeBSD admins hate to be woken up, so we only notify during the day + ; Note that the notification_period variable is being overridden from + ; the value that is inherited from the generic-host template! + notification_interval 120 ; Resend notifications every 2 hours Modified: branches/2016Q3/net-mgmt/nagios4/pkg-plist ============================================================================== --- branches/2016Q3/net-mgmt/nagios4/pkg-plist Tue Aug 23 14:42:02 2016 (r420684) +++ branches/2016Q3/net-mgmt/nagios4/pkg-plist Tue Aug 23 14:43:27 2016 (r420685) @@ -222,9 +222,6 @@ %%WWWDIR%%/images/logos/nagios.gd2 %%WWWDIR%%/images/logos/nagios.gif %%WWWDIR%%/images/logos/nagiosvrml.png -%%WWWDIR%%/images/logos/netbsd.gif -%%WWWDIR%%/images/logos/netbsd.jpg -%%WWWDIR%%/images/logos/netbsd.png %%WWWDIR%%/images/logos/next.gd2 %%WWWDIR%%/images/logos/next.gif %%WWWDIR%%/images/logos/next.jpg @@ -283,9 +280,6 @@ %%WWWDIR%%/images/logos/sunlogo.gif %%WWWDIR%%/images/logos/sunlogo.jpg %%WWWDIR%%/images/logos/sunlogo.png -%%WWWDIR%%/images/logos/suse.gif -%%WWWDIR%%/images/logos/suse.jpg -%%WWWDIR%%/images/logos/suse.png %%WWWDIR%%/images/logos/switch.gd2 %%WWWDIR%%/images/logos/switch.gif %%WWWDIR%%/images/logos/switch40.gd2 @@ -393,7 +387,7 @@ %%WWWDIR%%/map-form.html %%WWWDIR%%/map-links.html %%WWWDIR%%/map-popup.html -%%WWWDIR%%/map.php +%%WWWDIR%%/map.html %%WWWDIR%%/robots.txt %%WWWDIR%%/rss-corebanner.php %%WWWDIR%%/rss-corefeed.html @@ -435,5 +429,5 @@ @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,2775) %%NAGIOSDIR%%/checkresults @dir(%%NAGIOSUSER%%,%%WWWGRP%%,775) %%NAGIOSDIR%%/rw @dir(%%NAGIOSUSER%%,%%NAGIOSGROUP%%,775) %%NAGIOSDIR%% -@postunexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi -@postunexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi +@unexec if [ -d %%NAGIOSDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%NAGIOSDIR%%`` to remove any files left behind."; fi +@unexec if [ -d %%ETCDIR%% ]; then echo "==> If you are permanently removing this port, you should do a ``rm -rf %%ETCDIR%%`` to remove any configuration files."; fi From owner-svn-ports-branches@freebsd.org Tue Aug 23 15:02:38 2016 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 7E89BBC33D2; Tue, 23 Aug 2016 15:02:38 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3200E1F1C; Tue, 23 Aug 2016 15:02:38 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7NF2bWw024298; Tue, 23 Aug 2016 15:02:37 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7NF2bpa024279; Tue, 23 Aug 2016 15:02:37 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201608231502.u7NF2bpa024279@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 23 Aug 2016 15:02:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420690 - branches/2016Q3/net-mgmt/nagios4 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.22 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, 23 Aug 2016 15:02:38 -0000 Author: mat Date: Tue Aug 23 15:02:37 2016 New Revision: 420690 URL: https://svnweb.freebsd.org/changeset/ports/420690 Log: MFH: r420689 Make stage-qa happy, and make sure the files are in the right group. Sponsored by: Absolight Modified: branches/2016Q3/net-mgmt/nagios4/Makefile branches/2016Q3/net-mgmt/nagios4/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/net-mgmt/nagios4/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/nagios4/Makefile Tue Aug 23 15:01:03 2016 (r420689) +++ branches/2016Q3/net-mgmt/nagios4/Makefile Tue Aug 23 15:02:37 2016 (r420690) @@ -3,7 +3,7 @@ PORTNAME= nagios PORTVERSION= 4.1.1 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x/${PORTNAME}-${PORTVERSION} @@ -17,9 +17,10 @@ LICENSE= GPLv2 BROKEN_powerpc64= Does not build LIB_DEPENDS= libltdl.so:devel/libltdl \ + libpng16.so:graphics/png \ libgd.so:graphics/gd -USES= cpe gmake perl5 +USES= cpe gmake jpeg perl5 USE_PERL5= build USE_PHP= xml USE_RC_SUBR= nagios Modified: branches/2016Q3/net-mgmt/nagios4/pkg-plist ============================================================================== --- branches/2016Q3/net-mgmt/nagios4/pkg-plist Tue Aug 23 15:01:03 2016 (r420689) +++ branches/2016Q3/net-mgmt/nagios4/pkg-plist Tue Aug 23 15:02:37 2016 (r420690) @@ -1,16 +1,16 @@ @(,%%NAGIOSGROUP%%,755) bin/nagios @(,%%NAGIOSGROUP%%,755) bin/nagiostats %%ETCDIR%%/cgi.cfg-sample -%%ETCDIR%%/nagios.cfg-sample -%%ETCDIR%%/objects/commands.cfg-sample -%%ETCDIR%%/objects/contacts.cfg-sample -%%ETCDIR%%/objects/localhost.cfg-sample -%%ETCDIR%%/objects/printer.cfg-sample -%%ETCDIR%%/objects/switch.cfg-sample -%%ETCDIR%%/objects/templates.cfg-sample -%%ETCDIR%%/objects/timeperiods.cfg-sample -%%ETCDIR%%/objects/windows.cfg-sample -%%ETCDIR%%/resource.cfg-sample +@(,%%NAGIOSGROUP%%,) %%ETCDIR%%/nagios.cfg-sample +@(,%%NAGIOSGROUP%%,) %%ETCDIR%%/objects/commands.cfg-sample +@(,%%NAGIOSGROUP%%,) %%ETCDIR%%/objects/contacts.cfg-sample +@(,%%NAGIOSGROUP%%,) %%ETCDIR%%/objects/localhost.cfg-sample +@(,%%NAGIOSGROUP%%,) %%ETCDIR%%/objects/printer.cfg-sample +@(,%%NAGIOSGROUP%%,) %%ETCDIR%%/objects/switch.cfg-sample +@(,%%NAGIOSGROUP%%,) %%ETCDIR%%/objects/templates.cfg-sample +@(,%%NAGIOSGROUP%%,) %%ETCDIR%%/objects/timeperiods.cfg-sample +@(,%%NAGIOSGROUP%%,) %%ETCDIR%%/objects/windows.cfg-sample +@(,%%NAGIOSGROUP%%,) %%ETCDIR%%/resource.cfg-sample %%WWWDIR%%/angularjs/angular-1.3.9/angular.min.js %%WWWDIR%%/angularjs/angular-1.3.9/angular.min.js.map %%WWWDIR%%/angularjs/ui-bootstrap-tpls-0.12.0.min.js From owner-svn-ports-branches@freebsd.org Tue Aug 23 15:36:59 2016 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 ABAE6BC3704; Tue, 23 Aug 2016 15:36:59 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C5831838; Tue, 23 Aug 2016 15:36:59 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7NFaw6Z037263; Tue, 23 Aug 2016 15:36:58 GMT (envelope-from olivierd@FreeBSD.org) Received: (from olivierd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7NFawkF037262; Tue, 23 Aug 2016 15:36:58 GMT (envelope-from olivierd@FreeBSD.org) Message-Id: <201608231536.u7NFawkF037262@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivierd set sender to olivierd@FreeBSD.org using -f From: Olivier Duchateau Date: Tue, 23 Aug 2016 15:36:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420702 - branches/2016Q3/x11-wm/xfce4-session/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.22 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, 23 Aug 2016 15:36:59 -0000 Author: olivierd Date: Tue Aug 23 15:36:58 2016 New Revision: 420702 URL: https://svnweb.freebsd.org/changeset/ports/420702 Log: MFH: r420679 Add missing braces in polkit example rules. PR: 212061 Submitted by: Approved by: portmgr (feld@) Modified: branches/2016Q3/x11-wm/xfce4-session/files/pkg-message.in Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/x11-wm/xfce4-session/files/pkg-message.in ============================================================================== --- branches/2016Q3/x11-wm/xfce4-session/files/pkg-message.in Tue Aug 23 15:29:09 2016 (r420701) +++ branches/2016Q3/x11-wm/xfce4-session/files/pkg-message.in Tue Aug 23 15:36:58 2016 (r420702) @@ -3,8 +3,8 @@ files in %%LOCALBASE%%/etc/polkit-1/rule like this (replace PUTYOURGROUPHERE by your group): polkit.addRule(function (action, subject) { - if (action.id == "org.freedesktop.consolekit.system.restart" || - action.id == "org.freedesktop.consolekit.system.stop" + if ((action.id == "org.freedesktop.consolekit.system.restart" || + action.id == "org.freedesktop.consolekit.system.stop") && subject.isInGroup("PUTYOURGROUPHERE")) { return polkit.Result.YES; } From owner-svn-ports-branches@freebsd.org Tue Aug 23 15:38:12 2016 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 2D394BC37E5; Tue, 23 Aug 2016 15:38:12 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B19C195B; Tue, 23 Aug 2016 15:38:11 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7NFcB8g037457; Tue, 23 Aug 2016 15:38:11 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7NFcBfL037456; Tue, 23 Aug 2016 15:38:11 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201608231538.u7NFcBfL037456@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 23 Aug 2016 15:38:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420703 - branches/2016Q3/net/qt5-network/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.22 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, 23 Aug 2016 15:38:12 -0000 Author: rakuco Date: Tue Aug 23 15:38:11 2016 New Revision: 420703 URL: https://svnweb.freebsd.org/changeset/ports/420703 Log: MFH: r420681 Fix the build with LibreSSL. LibreSSL does not define SSL_CTRL_SET_CURVES, so check for the macro's existence before using it. I'm committing this mostly to get it into the 2016Q3 branch so it lives a bit longer: starting with Qt 5.6, upstream explicitly does not support LibreSSL and fails at configuration time if it is detected (the rationale being that they do not want to make the OpenSSL backend code even more confusing with additional checks and code paths for LibreSSL; patches adding a separate LibreSSL backend are more than welcome, but someone needs to write the code and maintain it). PORTREVISION is not being bumped because the LibreSSL build was simply broken before, and the patch does not change anything for OpenSSL users. PR: 211832 Submitted by: matthew@reztek.cz Approved by: ports-secteam (feld) Added: branches/2016Q3/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp - copied unchanged from r420681, head/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp Modified: Directory Properties: branches/2016Q3/ (props changed) Copied: branches/2016Q3/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp (from r420681, head/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp Tue Aug 23 15:38:11 2016 (r420703, copy of r420681, head/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp) @@ -0,0 +1,29 @@ +Obtained from: https://github.com/libressl-portable/openbsd/issues/33 + +From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001 +From: hasufell +Date: Sat, 10 Oct 2015 01:15:01 +0200 +Subject: [PATCH] Fix compilation with libressl + +By additionally checking for defined(SSL_CTRL_SET_CURVES), which +is defined in openssl, but not in libressl. +--- src/network/ssl/qsslcontext_openssl.cpp.orig 2015-10-13 04:35:28 UTC ++++ src/network/ssl/qsslcontext_openssl.cpp +@@ -338,7 +338,7 @@ init_context: + + const QVector qcurves = sslContext->sslConfiguration.ellipticCurves(); + if (!qcurves.isEmpty()) { +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) + // Set the curves to be used + if (q_SSLeay() >= 0x10002000L) { + // SSL_CTX_ctrl wants a non-const pointer as last argument, +@@ -352,7 +352,7 @@ init_context: + return sslContext; + } + } else +-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) ++#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) + { + // specific curves requested, but not possible to set -> error + sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); From owner-svn-ports-branches@freebsd.org Tue Aug 23 17:52:53 2016 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 CD0E3BC4EE0; Tue, 23 Aug 2016 17:52:53 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 92E8216DA; Tue, 23 Aug 2016 17:52:53 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7NHqqAd092123; Tue, 23 Aug 2016 17:52:52 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7NHqqWY092120; Tue, 23 Aug 2016 17:52:52 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201608231752.u7NHqqWY092120@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Tue, 23 Aug 2016 17:52:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420723 - branches/2016Q3/graphics/eog 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.22 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, 23 Aug 2016 17:52:53 -0000 Author: kwm Date: Tue Aug 23 17:52:52 2016 New Revision: 420723 URL: https://svnweb.freebsd.org/changeset/ports/420723 Log: MFH: r420627 Update eog to 3.18.3. Add indirect dependacies. Switch to lcms2 since that is actualy used. Security: f5035ead-688b-11e6-8b1d-c86000169601, CVE-2016-6855 Approved by: ports-secteam@ (junovitch@) Modified: branches/2016Q3/graphics/eog/Makefile branches/2016Q3/graphics/eog/distinfo branches/2016Q3/graphics/eog/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/graphics/eog/Makefile ============================================================================== --- branches/2016Q3/graphics/eog/Makefile Tue Aug 23 17:52:44 2016 (r420722) +++ branches/2016Q3/graphics/eog/Makefile Tue Aug 23 17:52:52 2016 (r420723) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= eog -PORTVERSION= 3.18.2 +PORTVERSION= 3.18.3 CATEGORIES= graphics gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -13,14 +13,15 @@ COMMENT= The Eye Of Gnome image viewer BUILD_DEPENDS= itstool:textproc/itstool \ gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas LIB_DEPENDS= libpeas-gtk-1.0.so:devel/libpeas \ - liblcms.so:graphics/lcms + liblcms2.so:graphics/lcms2 RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas PORTSCOUT= limitw:1,even -USES= desktop-file-utils gettext gmake gnome libtool pathfix \ +USES= desktop-file-utils gettext gmake gnome jpeg libtool pathfix \ pkgconfig tar:xz -USE_GNOME= intltool librsvg2 gtk30 gnomedesktop3 introspection:build +USE_GNOME= cairo intltool librsvg2 gtk30 gnomedesktop3 introspection +USE_XORG= x11 INSTALLS_ICONS= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include Modified: branches/2016Q3/graphics/eog/distinfo ============================================================================== --- branches/2016Q3/graphics/eog/distinfo Tue Aug 23 17:52:44 2016 (r420722) +++ branches/2016Q3/graphics/eog/distinfo Tue Aug 23 17:52:52 2016 (r420723) @@ -1,2 +1,3 @@ -SHA256 (gnome3/eog-3.18.2.tar.xz) = dc2d16e3754cad12703261fe586e7599c4df2e39282f6c28681a514f749fe636 -SIZE (gnome3/eog-3.18.2.tar.xz) = 4327676 +TIMESTAMP = 1471883741 +SHA256 (gnome3/eog-3.18.3.tar.xz) = fb534bab125f28445fe7d17ea04817ba17e2a9a0d94ba6bc6408a3aadab43563 +SIZE (gnome3/eog-3.18.3.tar.xz) = 4334460 Modified: branches/2016Q3/graphics/eog/pkg-plist ============================================================================== --- branches/2016Q3/graphics/eog/pkg-plist Tue Aug 23 17:52:44 2016 (r420722) +++ branches/2016Q3/graphics/eog/pkg-plist Tue Aug 23 17:52:52 2016 (r420723) @@ -86,7 +86,6 @@ share/gtk-doc/html/eog/eog-zoom.html share/gtk-doc/html/eog/eog.devhelp2 share/gtk-doc/html/eog/home.png share/gtk-doc/html/eog/index.html -share/gtk-doc/html/eog/index.sgml share/gtk-doc/html/eog/left-insensitive.png share/gtk-doc/html/eog/left.png share/gtk-doc/html/eog/pt01.html From owner-svn-ports-branches@freebsd.org Wed Aug 24 10:39:38 2016 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 61AA7BC3992; Wed, 24 Aug 2016 10:39:38 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 344D3183E; Wed, 24 Aug 2016 10:39:38 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7OAdbsO077157; Wed, 24 Aug 2016 10:39:37 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7OAdbYg077156; Wed, 24 Aug 2016 10:39:37 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201608241039.u7OAdbYg077156@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Wed, 24 Aug 2016 10:39:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420784 - branches/2016Q3/editors/codelite 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.22 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, 24 Aug 2016 10:39:38 -0000 Author: cpm Date: Wed Aug 24 10:39:37 2016 New Revision: 420784 URL: https://svnweb.freebsd.org/changeset/ports/420784 Log: MFH: r420700 - Fix codelite install for Clang 3.4, 3.5 and 3.6. ===> Registering installation for codelite-9.2_1 pkg-static: Unable to access file /tmp/ports/usr/ports/editors/codelite/work/stage/usr/local/bin/codelite-lldb: No such file or directory pkg-static: Unable to access file /tmp/ports/usr/ports/editors/codelite/work/stage/usr/local/lib/codelite/LLDBDebugger.so: No such file or directory *** Error code 74 PR: 211851 Submitted by: Mahdi Mokhtari (maintainer) Reported by: rozhuk.im@gmail.com Reviewed by: amdmi3 (mentor) Approved by: amdmi3 (mentor) Approved by: ports-secteam (junovitch) Modified: branches/2016Q3/editors/codelite/pkg-plist Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/editors/codelite/pkg-plist ============================================================================== --- branches/2016Q3/editors/codelite/pkg-plist Wed Aug 24 09:57:07 2016 (r420783) +++ branches/2016Q3/editors/codelite/pkg-plist Wed Aug 24 10:39:37 2016 (r420784) @@ -9,6 +9,10 @@ bin/codelite_fix_files bin/codelite_indexer bin/codelite_kill_children bin/codelite_xterm +%%CLANG37%%bin/codelite-lldb +%%CLANG37%%lib/codelite/LLDBDebugger.so +%%CLANG38%%bin/codelite-lldb +%%CLANG38%%lib/codelite/LLDBDebugger.so lib/codelite/CMakePlugin.so lib/codelite/CallGraph.so lib/codelite/CodeFormatter.so From owner-svn-ports-branches@freebsd.org Wed Aug 24 14:30:50 2016 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 1CAC8BC290F; Wed, 24 Aug 2016 14:30:50 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DB35C198F; Wed, 24 Aug 2016 14:30:49 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7OEUnup064118; Wed, 24 Aug 2016 14:30:49 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7OEUltb064101; Wed, 24 Aug 2016 14:30:47 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201608241430.u7OEUltb064101@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 24 Aug 2016 14:30:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420792 - in branches/2016Q3: . databases/postgresql91-server databases/postgresql91-server/files databases/postgresql92-server databases/postgresql92-server/files databases/postgresql9... 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.22 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, 24 Aug 2016 14:30:50 -0000 Author: feld Date: Wed Aug 24 14:30:47 2016 New Revision: 420792 URL: https://svnweb.freebsd.org/changeset/ports/420792 Log: MFH: r420089 r420093 The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 9.5.4, 9.4.9, 9.3.14, 9.2.18 and 9.1.23. This release fixes two security issues. It also patches a number of other bugs reported over the last three months. Users who rely on security isolation between database users should update as soon as possible. Other users should plan to update at the next convenient downtime. If you are using the ICU patch, please consult UPDATING. Improve periodic cleanup, suggested by claudius (at) ambtec.de. [1] PR: 210941 [1] Security: CVE-2016-5423, CVE-2016-5424 Approved by: ports-secteam (with hat) Modified: branches/2016Q3/UPDATING branches/2016Q3/databases/postgresql91-server/Makefile branches/2016Q3/databases/postgresql91-server/distinfo branches/2016Q3/databases/postgresql91-server/files/502.pgsql.in branches/2016Q3/databases/postgresql92-server/Makefile branches/2016Q3/databases/postgresql92-server/distinfo branches/2016Q3/databases/postgresql92-server/files/502.pgsql.in branches/2016Q3/databases/postgresql93-server/Makefile branches/2016Q3/databases/postgresql93-server/distinfo branches/2016Q3/databases/postgresql93-server/files/502.pgsql.in branches/2016Q3/databases/postgresql94-server/Makefile branches/2016Q3/databases/postgresql94-server/distinfo branches/2016Q3/databases/postgresql94-server/files/502.pgsql.in branches/2016Q3/databases/postgresql95-server/Makefile branches/2016Q3/databases/postgresql95-server/distinfo branches/2016Q3/databases/postgresql95-server/files/502.pgsql.in Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/UPDATING ============================================================================== --- branches/2016Q3/UPDATING Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/UPDATING Wed Aug 24 14:30:47 2016 (r420792) @@ -5,6 +5,71 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20160811: + AFFECTS: users of databases/postgresqlNN-server with ICU patch + AUTHOR: girgen@FreeBSD.org + + The ICU patch is added to the PostgreSQL-9.5 server. Please note that you + must never change between using the ICU patch and using system locale for the + same database cluster without REINDEXing all TEXT/VARCHAR columns or + dump+restore your database. Failing to do so will result in corrupted indexes + due to the differences between the locale definitions. ICU will always be the + better choice for speed and correctness. :) + + Also, the ICU patch used to support other unicode encodings than UTF-8, but + that has been removed due to lack of demand and the complicated testing + required. If you use another unicode encoding and rely on ICU for collation, + please refrain from upgrading the postgresql server and instead contact the + author named above. + +20160722: + AFFECTS: users of emulators/virtualbox-ose + AUTHOR: jkim@FreeBSD.org + + VirtualBox has been updated to 5.0.26 and it is incompatible with old + kernel modules. You should upgrade emulators/virtualbox-ose-kmod and + load new kernel modules before starting new version, e.g., + + # service vboxnet restart + +20160722: + AFFECTS: users of games/stonesoup-* + AUTHOR: lifanov@mail.lifanov.com + + The WIZARD option has been renamed to NOWIZARD and is now an opt-out to + better reflect the upstream. If you run a shared game server and would + like the Wizard mode support disabled, please update port options. + +20160718: + AFFECTS: users of www/awstats + AUTHOR: adamw@FreeBSD.org + + The directory containing icons has changed from ".../icons" to ".../icon". + awstats has, in its suggested configuration file, contained an alias + from /awstatsicons. After applying the awstats-7.5 update, you must + update that alias to point to /usr/local/www/awstats/icon (just remove + the "s" at the end). + +20160708: + AFFECTS: users of sysutils/screen + AUTHOR: cy@FreeBSD.org + + As of GNU Screen 4.4.0 (r417201): + + Note that there was fix to screen message structure field + responsible for $TERM handling, making it impossible + to attach to older versions. + +20160704: + AFFECTS: users of databases/mysql57-* + AUTHOR: riggs@FreeBSD.org + + The default location for my.cnf has changed from "/var/db/mysql/my.cnf" + to "/usr/local/etc/mysql/my.cnf". Existing my.cnf files must be merged + manually with the new default and moved to the new location. To + continue using the my.cnf file at the old location, set "mysql_optfile" + in /etc/rc.conf to point to the location of the existing my.cnf file. + 20160701: AFFECTS: users of www/node5 AUTHOR: bradleythughes@fastmail.fm Modified: branches/2016Q3/databases/postgresql91-server/Makefile ============================================================================== --- branches/2016Q3/databases/postgresql91-server/Makefile Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql91-server/Makefile Wed Aug 24 14:30:47 2016 (r420792) @@ -15,6 +15,9 @@ CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R ${PORTNAME}9[^${PORTVERSION:R:E}]-client* \ ${PORTNAME}${COMPONENT}-9.[^${PORTVERSION:R:E}].* +DEPRECATED= End-of-life is near +EXPIRATION_DATE=2016-10-01 + WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql @@ -117,7 +120,7 @@ LIBEDIT_USES= libedit LIBEDIT_USES_OFF= readline .endif # CLIENT_ONLY -SSL_USE= OPENSSL=yes +SSL_USES= ssl SSL_CONFIGURE_WITH=openssl PAM_CONFIGURE_WITH= pam Modified: branches/2016Q3/databases/postgresql91-server/distinfo ============================================================================== --- branches/2016Q3/databases/postgresql91-server/distinfo Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql91-server/distinfo Wed Aug 24 14:30:47 2016 (r420792) @@ -1,4 +1,5 @@ -SHA256 (postgresql/postgresql-9.1.22.tar.bz2) = f619664b0dde4e1a75fdc00c35afb4517002984a462d70967ffcdedfeee5e16e -SIZE (postgresql/postgresql-9.1.22.tar.bz2) = 15860904 +TIMESTAMP = 1470723784 +SHA256 (postgresql/postgresql-9.1.23.tar.bz2) = 7f7471e8b3b369726f1c1df0e6a163dde63b6546c4bba985c1f36a574c75f6d5 +SIZE (postgresql/postgresql-9.1.23.tar.bz2) = 15856178 SHA256 (postgresql/pg-929-icu-2015-04-18.diff.gz) = 9aff1ba25fbe5892a3868bff516df685531c85901c360548e38bf2e5fa0e14ab SIZE (postgresql/pg-929-icu-2015-04-18.diff.gz) = 4469 Modified: branches/2016Q3/databases/postgresql91-server/files/502.pgsql.in ============================================================================== --- branches/2016Q3/databases/postgresql91-server/files/502.pgsql.in Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql91-server/files/502.pgsql.in Wed Aug 24 14:30:47 2016 (r420792) @@ -76,7 +76,7 @@ pgsql_backup() { fi # cleaning up old data - find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \ + find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \ -a -mtime +${daily_pgsql_savedays} -delete echo } Modified: branches/2016Q3/databases/postgresql92-server/Makefile ============================================================================== --- branches/2016Q3/databases/postgresql92-server/Makefile Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql92-server/Makefile Wed Aug 24 14:30:47 2016 (r420792) @@ -18,7 +18,7 @@ CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql -ICU_PATCHFILE?= pg-929-icu-2015-04-18.diff.gz +ICU_PATCHFILE?= pg-9218-icu-2016-08-10.diff.gz OPTIONS_SUB= yes @@ -29,9 +29,9 @@ USES+= gmake GNU_CONFIGURE= yes .endif -PG_USER= pgsql -PG_GROUP= pgsql -PG_UID= 70 +PG_USER?= pgsql +PG_GROUP?= pgsql +PG_UID?= 70 LDFLAGS+= -L${LOCALBASE}/lib INCLUDES+= -I${LOCALBASE}/include @@ -118,7 +118,7 @@ LIBEDIT_USES= libedit LIBEDIT_USES_OFF= readline .endif # CLIENT_ONLY -SSL_USE= OPENSSL=yes +SSL_USES= ssl SSL_CONFIGURE_WITH=openssl PAM_CONFIGURE_WITH= pam Modified: branches/2016Q3/databases/postgresql92-server/distinfo ============================================================================== --- branches/2016Q3/databases/postgresql92-server/distinfo Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql92-server/distinfo Wed Aug 24 14:30:47 2016 (r420792) @@ -1,4 +1,5 @@ -SHA256 (postgresql/postgresql-9.2.17.tar.bz2) = c660cc0ee42c221ebedc2c75ad0d4b30ec8da488a954df9987a3fc83bcb7363f -SIZE (postgresql/postgresql-9.2.17.tar.bz2) = 16497200 -SHA256 (postgresql/pg-929-icu-2015-04-18.diff.gz) = 9aff1ba25fbe5892a3868bff516df685531c85901c360548e38bf2e5fa0e14ab -SIZE (postgresql/pg-929-icu-2015-04-18.diff.gz) = 4469 +TIMESTAMP = 1470919631 +SHA256 (postgresql/postgresql-9.2.18.tar.bz2) = d7aa37d586ae4d46d07a4fac417ff966e45a9dd99bac8b3cd149be8df9ea35f4 +SIZE (postgresql/postgresql-9.2.18.tar.bz2) = 16448429 +SHA256 (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 2f9c831b3dff866f0b2f6f2a9ef771a4045486bc252a851aadc73c50d376319d +SIZE (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 5587 Modified: branches/2016Q3/databases/postgresql92-server/files/502.pgsql.in ============================================================================== --- branches/2016Q3/databases/postgresql92-server/files/502.pgsql.in Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql92-server/files/502.pgsql.in Wed Aug 24 14:30:47 2016 (r420792) @@ -76,7 +76,7 @@ pgsql_backup() { fi # cleaning up old data - find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \ + find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \ -a -mtime +${daily_pgsql_savedays} -delete echo } Modified: branches/2016Q3/databases/postgresql93-server/Makefile ============================================================================== --- branches/2016Q3/databases/postgresql93-server/Makefile Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql93-server/Makefile Wed Aug 24 14:30:47 2016 (r420792) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.3.13 +DISTVERSION?= 9.3.14 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org @@ -13,4 +13,6 @@ INSTALL_DIRS?= src/common src/timezone s src/bin/pg_controldata src/bin/pg_resetxlog src/pl \ src/bin/pg_basebackup +ICU_PATCHFILE?= pg-9314-icu-2016-08-10.diff.gz + .include "${.CURDIR}/../postgresql92-server/Makefile" Modified: branches/2016Q3/databases/postgresql93-server/distinfo ============================================================================== --- branches/2016Q3/databases/postgresql93-server/distinfo Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql93-server/distinfo Wed Aug 24 14:30:47 2016 (r420792) @@ -1,4 +1,5 @@ -SHA256 (postgresql/postgresql-9.3.13.tar.bz2) = 5544e1d29bfdb9a815d3533400ae242b8763c399285e5d4020ffdb49c362a72b -SIZE (postgresql/postgresql-9.3.13.tar.bz2) = 17061824 -SHA256 (postgresql/pg-929-icu-2015-04-18.diff.gz) = 9aff1ba25fbe5892a3868bff516df685531c85901c360548e38bf2e5fa0e14ab -SIZE (postgresql/pg-929-icu-2015-04-18.diff.gz) = 4469 +TIMESTAMP = 1470919705 +SHA256 (postgresql/postgresql-9.3.14.tar.bz2) = 5c4322f1c42ba1ff4b28383069c56663b46160bb08e85d41fa2ab9a5009d039d +SIZE (postgresql/postgresql-9.3.14.tar.bz2) = 17042199 +SHA256 (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 4be31ad9899d5caf9f57ad7ebfc0d14f0fcf58ad539c82fb353b016fb76c0c30 +SIZE (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 5583 Modified: branches/2016Q3/databases/postgresql93-server/files/502.pgsql.in ============================================================================== --- branches/2016Q3/databases/postgresql93-server/files/502.pgsql.in Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql93-server/files/502.pgsql.in Wed Aug 24 14:30:47 2016 (r420792) @@ -76,7 +76,7 @@ pgsql_backup() { fi # cleaning up old data - find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \ + find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \ -a -mtime +${daily_pgsql_savedays} -delete echo } Modified: branches/2016Q3/databases/postgresql94-server/Makefile ============================================================================== --- branches/2016Q3/databases/postgresql94-server/Makefile Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql94-server/Makefile Wed Aug 24 14:30:47 2016 (r420792) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.4.8 +DISTVERSION?= 9.4.9 MAINTAINER?= pgsql@FreeBSD.org @@ -12,6 +12,6 @@ INSTALL_DIRS?= src/common src/timezone s src/bin/pg_controldata src/bin/pg_resetxlog src/pl \ src/bin/pg_basebackup -ICU_PATCHFILE= pg-941-icu-2015-04-18.diff.gz +ICU_PATCHFILE= pg-949-icu-2016-08-10.diff.gz .include "${.CURDIR}/../postgresql92-server/Makefile" Modified: branches/2016Q3/databases/postgresql94-server/distinfo ============================================================================== --- branches/2016Q3/databases/postgresql94-server/distinfo Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql94-server/distinfo Wed Aug 24 14:30:47 2016 (r420792) @@ -1,4 +1,5 @@ -SHA256 (postgresql/postgresql-9.4.8.tar.bz2) = 4a10640e180e0d9adb587bc25a82dcce6bf507b033637e7fb9d4eeffa33a6b4c -SIZE (postgresql/postgresql-9.4.8.tar.bz2) = 17740626 -SHA256 (postgresql/pg-941-icu-2015-04-18.diff.gz) = 30c1366539fd0833db37a98b32bd22e8da4538e58f8dbc2ad2f63dc54835609b -SIZE (postgresql/pg-941-icu-2015-04-18.diff.gz) = 4279 +TIMESTAMP = 1470919711 +SHA256 (postgresql/postgresql-9.4.9.tar.bz2) = c120a62e90214c20d9160da3ca3fbaec97d5f1656f1dd033f60e7297b7a1e1c9 +SIZE (postgresql/postgresql-9.4.9.tar.bz2) = 17763281 +SHA256 (postgresql/pg-949-icu-2016-08-10.diff.gz) = 8e7f0470b5c04653aee850c58e690d1ca5f7cb3a2acb5d64c793a8412ee9ebfe +SIZE (postgresql/pg-949-icu-2016-08-10.diff.gz) = 5263 Modified: branches/2016Q3/databases/postgresql94-server/files/502.pgsql.in ============================================================================== --- branches/2016Q3/databases/postgresql94-server/files/502.pgsql.in Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql94-server/files/502.pgsql.in Wed Aug 24 14:30:47 2016 (r420792) @@ -76,7 +76,7 @@ pgsql_backup() { fi # cleaning up old data - find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \ + find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \ -a -mtime +${daily_pgsql_savedays} -delete echo } Modified: branches/2016Q3/databases/postgresql95-server/Makefile ============================================================================== --- branches/2016Q3/databases/postgresql95-server/Makefile Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql95-server/Makefile Wed Aug 24 14:30:47 2016 (r420792) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.5.3 +DISTVERSION?= 9.5.4 MAINTAINER?= pgsql@FreeBSD.org @@ -15,6 +15,6 @@ INSTALL_DIRS?= src/common src/timezone s src/bin/pg_test_fsync src/bin/pg_test_timing \ src/bin/pg_xlogdump src/bin/pg_upgrade -ICU_PATCHFILE= sorry-icu-patch-is-not-quite-ready-for-95-yet +ICU_PATCHFILE= pg-954-icu-2016-08-10.diff.gz .include "${.CURDIR}/../postgresql92-server/Makefile" Modified: branches/2016Q3/databases/postgresql95-server/distinfo ============================================================================== --- branches/2016Q3/databases/postgresql95-server/distinfo Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql95-server/distinfo Wed Aug 24 14:30:47 2016 (r420792) @@ -1,2 +1,5 @@ -SHA256 (postgresql/postgresql-9.5.3.tar.bz2) = 7385c01dc58acba8d7ac4e6ad42782bd7c0b59272862a3a3d5fe378d4503a0b4 -SIZE (postgresql/postgresql-9.5.3.tar.bz2) = 18455394 +TIMESTAMP = 1470919717 +SHA256 (postgresql/postgresql-9.5.4.tar.bz2) = cf5e571164ad66028ecd7dd8819e3765470d45bcd440d258b686be7e69c76ed0 +SIZE (postgresql/postgresql-9.5.4.tar.bz2) = 18496299 +SHA256 (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5fa083ec38087d6a0961642208f012e902221270708b919b92e9eedaa755e365 +SIZE (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5952 Modified: branches/2016Q3/databases/postgresql95-server/files/502.pgsql.in ============================================================================== --- branches/2016Q3/databases/postgresql95-server/files/502.pgsql.in Wed Aug 24 14:00:34 2016 (r420791) +++ branches/2016Q3/databases/postgresql95-server/files/502.pgsql.in Wed Aug 24 14:30:47 2016 (r420792) @@ -76,7 +76,7 @@ pgsql_backup() { fi # cleaning up old data - find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' \) \ + find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \ -a -mtime +${daily_pgsql_savedays} -delete echo } From owner-svn-ports-branches@freebsd.org Wed Aug 24 14:43:16 2016 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 798CDBC2F3D; Wed, 24 Aug 2016 14:43:16 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 465DA14D0; Wed, 24 Aug 2016 14:43:16 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7OEhFsl071504; Wed, 24 Aug 2016 14:43:15 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7OEhFGp071501; Wed, 24 Aug 2016 14:43:15 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201608241443.u7OEhFGp071501@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 24 Aug 2016 14:43:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420793 - branches/2016Q3/security/gnupg1 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.22 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, 24 Aug 2016 14:43:16 -0000 Author: feld Date: Wed Aug 24 14:43:15 2016 New Revision: 420793 URL: https://svnweb.freebsd.org/changeset/ports/420793 Log: MFH: r420375 - Upgrade to 1.4.21 (security, predictable bits in some situation). References: https://lists.gnupg.org/pipermail/gnupg-announce/2016q3/000395.html Approved by: ports-secteam (with hat) Modified: branches/2016Q3/security/gnupg1/Makefile branches/2016Q3/security/gnupg1/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/security/gnupg1/Makefile ============================================================================== --- branches/2016Q3/security/gnupg1/Makefile Wed Aug 24 14:30:47 2016 (r420792) +++ branches/2016Q3/security/gnupg1/Makefile Wed Aug 24 14:43:15 2016 (r420793) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gnupg -PORTVERSION= 1.4.20 +PORTVERSION= 1.4.21 #PORTREVISION= 0 CATEGORIES= security MASTER_SITES= GNUPG Modified: branches/2016Q3/security/gnupg1/distinfo ============================================================================== --- branches/2016Q3/security/gnupg1/distinfo Wed Aug 24 14:30:47 2016 (r420792) +++ branches/2016Q3/security/gnupg1/distinfo Wed Aug 24 14:43:15 2016 (r420793) @@ -1,4 +1,5 @@ -SHA256 (gnupg-1.4.20.tar.bz2) = 04988b1030fa28ddf961ca8ff6f0f8984e0cddcb1eb02859d5d8fe0fe237edcc -SIZE (gnupg-1.4.20.tar.bz2) = 3692881 -SHA256 (gnupg-1.4.20.tar.bz2.sig) = 60699efc9c9546722c04aba69fff874aaf5dacd7d4637238cb8d66960963f843 -SIZE (gnupg-1.4.20.tar.bz2.sig) = 574 +TIMESTAMP = 1471478689 +SHA256 (gnupg-1.4.21.tar.bz2) = 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276 +SIZE (gnupg-1.4.21.tar.bz2) = 3689305 +SHA256 (gnupg-1.4.21.tar.bz2.sig) = 2836778a868cf45ba5c785221f447d34f841f5bb653fe2edf3a8dd88b486b26e +SIZE (gnupg-1.4.21.tar.bz2.sig) = 287 From owner-svn-ports-branches@freebsd.org Wed Aug 24 15:10:22 2016 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 7B730BC485E; Wed, 24 Aug 2016 15:10:22 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DD7F1A84; Wed, 24 Aug 2016 15:10:22 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7OFALnE079844; Wed, 24 Aug 2016 15:10:21 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7OFALuj079842; Wed, 24 Aug 2016 15:10:21 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201608241510.u7OFALuj079842@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Wed, 24 Aug 2016 15:10:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420798 - branches/2016Q3/lang/php70 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.22 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, 24 Aug 2016 15:10:22 -0000 Author: tz Date: Wed Aug 24 15:10:21 2016 New Revision: 420798 URL: https://svnweb.freebsd.org/changeset/ports/420798 Log: MFH: r420589 lang/php70: Upgrade from 7.0.9 to 7.0.10 Changes: https://php.net/ChangeLog-7.php#7.0.10 Approved by: ports-secteam (junovitch), junovitch (mentor) Modified: branches/2016Q3/lang/php70/Makefile branches/2016Q3/lang/php70/distinfo Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/lang/php70/Makefile ============================================================================== --- branches/2016Q3/lang/php70/Makefile Wed Aug 24 15:02:16 2016 (r420797) +++ branches/2016Q3/lang/php70/Makefile Wed Aug 24 15:10:21 2016 (r420798) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php70 -PORTVERSION= 7.0.9 +PORTVERSION= 7.0.10 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions Modified: branches/2016Q3/lang/php70/distinfo ============================================================================== --- branches/2016Q3/lang/php70/distinfo Wed Aug 24 15:02:16 2016 (r420797) +++ branches/2016Q3/lang/php70/distinfo Wed Aug 24 15:10:21 2016 (r420798) @@ -1,3 +1,3 @@ -TIMESTAMP = 1469527532 -SHA256 (php-7.0.9.tar.bz2) = 2ee6968b5875f2f38700c58a189aad859a6a0b85fc337aa102ec2dc3652c3b7b -SIZE (php-7.0.9.tar.bz2) = 14870061 +TIMESTAMP = 1471602535 +SHA256 (php-7.0.10.tar.xz) = 348476ff7ba8d95a1e28e1059430c10470c5f8110f6d9133d30153dda4cdf56a +SIZE (php-7.0.10.tar.xz) = 12474728 From owner-svn-ports-branches@freebsd.org Thu Aug 25 07:41:01 2016 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 A849ABC3618; Thu, 25 Aug 2016 07:41:01 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 861FD1828; Thu, 25 Aug 2016 07:41:01 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7P7f0Fm053536; Thu, 25 Aug 2016 07:41:00 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7P7f0p7053534; Thu, 25 Aug 2016 07:41:00 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201608250741.u7P7f0p7053534@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Thu, 25 Aug 2016 07:41:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420837 - in branches/2016Q3/devel/qmake5: . 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.22 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, 25 Aug 2016 07:41:01 -0000 Author: rakuco Date: Thu Aug 25 07:41:00 2016 New Revision: 420837 URL: https://svnweb.freebsd.org/changeset/ports/420837 Log: MFH: r420773 Import upstream patch to fix the detection of clang's version number. Our clang reports itself as "FreeBSD clang version x.y.z" instead of just "clang version x.y.z", which was preventing the sed pattern used in the configure script from matching and thus QT_CLANG_MAJOR_VERSION and QT_CLANG_MINOR_VERSION were never defined. One of the consequences is that tests for those values in mkspecs later always failed, which led to some features such as C++14 support being disabled. PR: 210327 Approved by: ports-secteam (junovitch) Modified: branches/2016Q3/devel/qmake5/Makefile branches/2016Q3/devel/qmake5/files/patch-configure Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/devel/qmake5/Makefile ============================================================================== --- branches/2016Q3/devel/qmake5/Makefile Thu Aug 25 06:54:40 2016 (r420836) +++ branches/2016Q3/devel/qmake5/Makefile Thu Aug 25 07:41:00 2016 (r420837) @@ -2,6 +2,7 @@ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- Modified: branches/2016Q3/devel/qmake5/files/patch-configure ============================================================================== --- branches/2016Q3/devel/qmake5/files/patch-configure Thu Aug 25 06:54:40 2016 (r420836) +++ branches/2016Q3/devel/qmake5/files/patch-configure Thu Aug 25 07:41:00 2016 (r420837) @@ -1,6 +1,27 @@ ---- ./configure.orig 2013-10-22 01:49:15.000000000 -0700 -+++ ./configure 2013-11-04 07:40:28.945418565 -0800 -@@ -4194,11 +4194,11 @@ +The first two hunks make sure only qmake is build, as the rest of Qt is built +in other ports. + +The last hunk is backported from upstream: + +commit a9474d1260a8c8cc9eae14f2984098919d9684e5 +Author: Raphael Kubo da Costa +Date: Tue Aug 23 20:25:14 2016 +0200 + + configure: Correctly detect clang's version on FreeBSD + + "clang -v" on FreeBSD reports something like "FreeBSD clang version + x.y.z [...]" instead of just "clang version x.y.z [...]", which fails to + match the sed pattern in the configure script, resulting in qconfig.pri + having no clang version defined. + + Augment the pattern so that both version strings match. + + Change-Id: I5f38f8480f4b1156ca7147e32c1157a009557035 + Reviewed-by: Thiago Macieira + +--- configure.orig 2015-10-13 04:35:07 UTC ++++ configure +@@ -4038,11 +4038,11 @@ if true; then ###[ '!' -f "$outpath/bin/ fi echo "QMAKESPEC = $adjqmakespec" >> "$mkfile" echo "QT_VERSION = $QT_VERSION" >> "$mkfile" @@ -15,11 +36,20 @@ echo "EXEEXT = $EXEEXT" >> "$mkfile" echo "RM_F = rm -f" >> "$mkfile" echo "RM_RF = rm -rf" >> "$mkfile" -@@ -4214,6 +4214,7 @@ - rm "$mkfile.tmp" +@@ -4061,6 +4061,7 @@ if true; then ###[ '!' -f "$outpath/bin/ + fi fi done + exit 0 - (cd "$outpath/qmake"; "$MAKE") || exit 2 - fi # Build qmake + if [ "$OPT_VERBOSE" = yes ]; then + # Show the output of make +@@ -6474,7 +6472,7 @@ case "$QMAKE_CONF_COMPILER" in + # Clang + COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -v 2>&1 | sed -n -E ' + /^Apple (clang|LLVM) version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_APPLE_CLANG_MAJOR_VERSION=\1; QT_APPLE_CLANG_MINOR_VERSION=\2/;p;q;} +-/^clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'` ++/^(FreeBSD )?clang version /{s///; s/^([0-9]*)\.([0-9]*).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'` + eval "$COMPILER_VERSION" + ;; + *icpc) From owner-svn-ports-branches@freebsd.org Fri Aug 26 10:22:18 2016 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 45516A948CF; Fri, 26 Aug 2016 10:22:18 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 159BB876; Fri, 26 Aug 2016 10:22:18 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7QAMHk9055733; Fri, 26 Aug 2016 10:22:17 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7QAMHbH055732; Fri, 26 Aug 2016 10:22:17 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201608261022.u7QAMHbH055732@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Fri, 26 Aug 2016 10:22:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420909 - branches/2016Q3/dns/libpsl 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.22 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, 26 Aug 2016 10:22:18 -0000 Author: novel Date: Fri Aug 26 10:22:17 2016 New Revision: 420909 URL: https://svnweb.freebsd.org/changeset/ports/420909 Log: MFH: r420812 dns/libpsl: fix configure with NLS disabled Add gettext-tools to NLS_USES_OFF because otherwise it fails to configure. PR: 210342 Submitted by: matthew@reztek.cz Approved by: maintainer timeout (>1 month) Approved by: ports-secteam (junovitch) Modified: branches/2016Q3/dns/libpsl/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/dns/libpsl/Makefile ============================================================================== --- branches/2016Q3/dns/libpsl/Makefile Fri Aug 26 10:21:48 2016 (r420908) +++ branches/2016Q3/dns/libpsl/Makefile Fri Aug 26 10:22:17 2016 (r420909) @@ -49,6 +49,7 @@ IDN2_LIB_DEPENDS= libidn2.so:dns/libidn2 IDN2_USES= iconv NLS_CPPFLAGS= -DENABLE_NLS=1 NLS_USES= gettext +NLS_USES_OFF= gettext-tools post-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/psl2c ${STAGEDIR}${PREFIX}/bin/ From owner-svn-ports-branches@freebsd.org Fri Aug 26 17:06:04 2016 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 CA1F2B75328; Fri, 26 Aug 2016 17:06:04 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A094910; Fri, 26 Aug 2016 17:06:04 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7QH63wB005728; Fri, 26 Aug 2016 17:06:03 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7QH63UN005727; Fri, 26 Aug 2016 17:06:03 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201608261706.u7QH63UN005727@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 26 Aug 2016 17:06:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420934 - branches/2016Q3/www/impresscms 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.22 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, 26 Aug 2016 17:06:04 -0000 Author: amdmi3 Date: Fri Aug 26 17:06:03 2016 New Revision: 420934 URL: https://svnweb.freebsd.org/changeset/ports/420934 Log: MFH: r420908 (partial) - Switch to infozip to fix extraction problems (on some FreeBSD version stock unzip extracts empty dirs, on other empty files) Approved by: ports-secteam blanket Modified: branches/2016Q3/www/impresscms/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/www/impresscms/Makefile ============================================================================== --- branches/2016Q3/www/impresscms/Makefile Fri Aug 26 16:43:32 2016 (r420933) +++ branches/2016Q3/www/impresscms/Makefile Fri Aug 26 17:06:03 2016 (r420934) @@ -3,7 +3,7 @@ PORTNAME= impresscms PORTVERSION= 1.3.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/ImpressCMS%20Official%20Releases/ImpressCMS%201.3%20Branch/ImpressCMS%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION}_final @@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}_fin MAINTAINER= ports@FreeBSD.org COMMENT= Community Developed Content Management System -USES= cpe shebangfix zip +USES= cpe shebangfix zip:infozip SHEBANG_FILES= htdocs/editors/FCKeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl \ htdocs/libraries/phpopenid/admin/packagexml.py USE_PHP= mysql pcre session iconv xml gd From owner-svn-ports-branches@freebsd.org Fri Aug 26 17:26:46 2016 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 47903B758B9; Fri, 26 Aug 2016 17:26:46 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 11544360; Fri, 26 Aug 2016 17:26:45 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7QHQjVv013621; Fri, 26 Aug 2016 17:26:45 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7QHQjsV013617; Fri, 26 Aug 2016 17:26:45 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201608261726.u7QHQjsV013617@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 26 Aug 2016 17:26:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r420936 - in branches/2016Q3/java/openjdk6: . 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.22 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, 26 Aug 2016 17:26:46 -0000 Author: jkim Date: Fri Aug 26 17:26:44 2016 New Revision: 420936 URL: https://svnweb.freebsd.org/changeset/ports/420936 Log: MFH: r420883 Update to b40. Approved by: ports-secteam (junovitch) Modified: branches/2016Q3/java/openjdk6/Makefile branches/2016Q3/java/openjdk6/distinfo branches/2016Q3/java/openjdk6/files/patch-set branches/2016Q3/java/openjdk6/files/patch-test Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/java/openjdk6/Makefile ============================================================================== --- branches/2016Q3/java/openjdk6/Makefile Fri Aug 26 17:12:21 2016 (r420935) +++ branches/2016Q3/java/openjdk6/Makefile Fri Aug 26 17:26:44 2016 (r420936) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openjdk6 -PORTVERSION= b39 +PORTVERSION= b40 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= APACHE/ant/binaries/:ant \ @@ -27,7 +27,7 @@ LIB_DEPENDS= libfreetype.so:print/freety RUN_DEPENDS= javavm:java/javavmwrapper \ dejavu>0:x11-fonts/dejavu -OPENJDK_BUILDDATE= 03_may_2016 +OPENJDK_BUILDDATE= 22_aug_2016 OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE OPTIONS_DEFAULT=ICEDTEA TZUPDATE Modified: branches/2016Q3/java/openjdk6/distinfo ============================================================================== --- branches/2016Q3/java/openjdk6/distinfo Fri Aug 26 17:12:21 2016 (r420935) +++ branches/2016Q3/java/openjdk6/distinfo Fri Aug 26 17:26:44 2016 (r420936) @@ -1,6 +1,7 @@ +TIMESTAMP = 1472148301 SHA256 (apache-ant-1.9.6-bin.tar.bz2) = a43b0928960d63d6b1e2bed37e1ce4fd8fa1788ba84e08388bfe9513f02e8db3 SIZE (apache-ant-1.9.6-bin.tar.bz2) = 4385004 -SHA256 (openjdk-6-src-b39-03_may_2016.tar.xz) = d11dc2ababe88e7891f1abbd7fa4fe033a65dea22c071331a641374b3247717f -SIZE (openjdk-6-src-b39-03_may_2016.tar.xz) = 33887004 +SHA256 (openjdk-6-src-b40-22_aug_2016.tar.xz) = 70ac61635032e77cecf935b53b22a9545d5d0a7f55ad6a15dca9b84a2be993be +SIZE (openjdk-6-src-b40-22_aug_2016.tar.xz) = 34323680 SHA256 (jtreg-4.1-bin-b05_29_nov_2012.zip) = 9291eb4a14501232b35614e88686ff66ad8b69d0098dbd4322b28f97b672653d SIZE (jtreg-4.1-bin-b05_29_nov_2012.zip) = 5993382 Modified: branches/2016Q3/java/openjdk6/files/patch-set ============================================================================== --- branches/2016Q3/java/openjdk6/files/patch-set Fri Aug 26 17:12:21 2016 (r420935) +++ branches/2016Q3/java/openjdk6/files/patch-set Fri Aug 26 17:26:44 2016 (r420936) @@ -595,7 +595,11 @@ HOSTCXX = $(CXX) HOSTCC = $(CC) endif -@@ -110,12 +110,16 @@ +@@ -107,15 +107,20 @@ + ifeq ($(SHARK_BUILD), true) + CFLAGS += $(LLVM_CFLAGS) + endif ++CFLAGS += -std=gnu++98 CFLAGS += $(VM_PICFLAG) CFLAGS += -fno-rtti CFLAGS += -fno-exceptions @@ -618,7 +622,7 @@ endif ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) -@@ -163,14 +167,24 @@ +@@ -163,14 +168,24 @@ WARNINGS_ARE_ERRORS = -Werror endif @@ -650,7 +654,7 @@ endif CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) -@@ -282,7 +296,11 @@ +@@ -282,7 +297,11 @@ DEBUG_CFLAGS/ppc = -g DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),) @@ -2402,7 +2406,7 @@ Compilation* c = Compilation::current(); void* res = c->arena()->Amalloc(size); ((Instruction*)res)->_id = c->get_next_id(); -@@ -1529,7 +1529,7 @@ +@@ -1532,7 +1532,7 @@ friend class SuxAndWeightAdjuster; public: @@ -2433,7 +2437,7 @@ inline const char* bool_to_str(bool b) { --- hotspot/src/share/vm/classfile/verifier.hpp +++ hotspot/src/share/vm/classfile/verifier.hpp -@@ -84,9 +84,9 @@ +@@ -85,9 +85,9 @@ // These macros are used similarly to CHECK macros but also check // the status of the verifier and return if that has an error. #define CHECK_VERIFY(verifier) \ @@ -2645,6 +2649,44 @@ // Accessor float padded_average() const { return _padded_avg; } +--- hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp ++++ hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp +@@ -1562,7 +1562,7 @@ + #define ARRAY_LOADTO32(T, T2, format, stackRes, extra) \ + { \ + ARRAY_INTRO(-2); \ +- extra; \ ++ (void)extra; \ + SET_ ## stackRes(*(T2 *)(((address) arrObj->base(T)) + index * sizeof(T2)), \ + -2); \ + UPDATE_PC_AND_TOS_AND_CONTINUE(1, -1); \ +@@ -1573,7 +1573,7 @@ + { \ + ARRAY_INTRO(-2); \ + SET_ ## stackRes(*(T2 *)(((address) arrObj->base(T)) + index * sizeof(T2)), -1); \ +- extra; \ ++ (void)extra; \ + UPDATE_PC_AND_CONTINUE(1); \ + } + +@@ -1598,7 +1598,7 @@ + #define ARRAY_STOREFROM32(T, T2, format, stackSrc, extra) \ + { \ + ARRAY_INTRO(-3); \ +- extra; \ ++ (void)extra; \ + *(T2 *)(((address) arrObj->base(T)) + index * sizeof(T2)) = stackSrc( -1); \ + UPDATE_PC_AND_TOS_AND_CONTINUE(1, -3); \ + } +@@ -1607,7 +1607,7 @@ + #define ARRAY_STOREFROM64(T, T2, stackSrc, extra) \ + { \ + ARRAY_INTRO(-4); \ +- extra; \ ++ (void)extra; \ + *(T2 *)(((address) arrObj->base(T)) + index * sizeof(T2)) = stackSrc( -1); \ + UPDATE_PC_AND_TOS_AND_CONTINUE(1, -4); \ + } --- hotspot/src/share/vm/libadt/port.hpp +++ hotspot/src/share/vm/libadt/port.hpp @@ -163,7 +163,7 @@ @@ -2815,7 +2857,7 @@ } --- hotspot/src/share/vm/oops/klass.cpp +++ hotspot/src/share/vm/oops/klass.cpp -@@ -181,7 +181,7 @@ +@@ -190,7 +190,7 @@ } void* Klass_vtbl::operator new(size_t ignored, KlassHandle& klass, @@ -2918,7 +2960,7 @@ return TypeKlassPtr::make(ciArrayKlass::make(t)); } if (!t->is_klass()) { -@@ -4164,7 +4169,7 @@ +@@ -4163,7 +4168,7 @@ } } #else // !ASSERT @@ -2940,7 +2982,7 @@ // Out-of-line code from node constructors. // Executed only when extra debug info. is being passed around. -@@ -459,6 +463,10 @@ +@@ -467,6 +471,10 @@ _in[6] = n6; if (n6 != NULL) n6->add_out((Node *)this); } @@ -2998,7 +3040,7 @@ --- hotspot/src/share/vm/runtime/arguments.cpp +++ hotspot/src/share/vm/runtime/arguments.cpp -@@ -2499,7 +2499,9 @@ +@@ -2507,7 +2507,9 @@ FLAG_SET_CMDLINE(uintx, MaxNewSize, NewSize); } @@ -3008,7 +3050,7 @@ // Increase some data structure sizes for efficiency FLAG_SET_CMDLINE(uintx, BaseFootPrintEstimate, MaxHeapSize); -@@ -3046,6 +3048,10 @@ +@@ -3054,6 +3056,10 @@ UNSUPPORTED_OPTION(UseG1GC, "G1 GC"); #endif @@ -3195,8 +3237,8 @@ --- hotspot/src/share/vm/utilities/macros.hpp +++ hotspot/src/share/vm/utilities/macros.hpp -@@ -177,6 +177,14 @@ - #define NOT_WIN64(code) code +@@ -194,6 +194,14 @@ + #define NOT_SHARK(code) code #endif +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) @@ -3212,7 +3254,7 @@ #define X86_ONLY(code) code --- hotspot/src/share/vm/utilities/taskqueue.hpp +++ hotspot/src/share/vm/utilities/taskqueue.hpp -@@ -334,8 +334,12 @@ bool GenericTaskQueue::push_slow(E +@@ -334,8 +334,12 @@ if (dirty_n_elems == N - 1) { // Actually means 0, so do the push. uint localBot = _bottom; @@ -3227,7 +3269,7 @@ OrderAccess::release_store(&_bottom, increment_index(localBot)); TASKQUEUE_STATS_ONLY(stats.record_push()); return true; -@@ -385,13 +389,24 @@ bool GenericTaskQueue::pop_local_s +@@ -385,13 +389,24 @@ template bool GenericTaskQueue::pop_global(E& t) { Age oldAge = _age.get(); @@ -3254,7 +3296,7 @@ Age newAge(oldAge); newAge.increment(); Age resAge = _age.cmpxchg(newAge, oldAge); -@@ -668,13 +683,17 @@ public: +@@ -668,13 +683,17 @@ template inline bool GenericTaskQueue::push(E t) { uint localBot = _bottom; @@ -3275,7 +3317,7 @@ OrderAccess::release_store(&_bottom, increment_index(localBot)); TASKQUEUE_STATS_ONLY(stats.record_push()); return true; -@@ -698,7 +717,12 @@ GenericTaskQueue::pop_local(E& t) +@@ -698,7 +717,12 @@ // This is necessary to prevent any read below from being reordered // before the store just above. OrderAccess::fence(); @@ -3302,7 +3344,7 @@ tty->print ("/usr/bin/sh -c "); --- jdk/make/com/sun/java/pack/Makefile +++ jdk/make/com/sun/java/pack/Makefile -@@ -61,6 +61,7 @@ +@@ -62,6 +62,7 @@ ifeq ($(STANDALONE),true) @@ -3310,7 +3352,7 @@ ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME) ZIPOBJS = $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \ -@@ -78,6 +79,10 @@ +@@ -79,6 +80,10 @@ ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 OTHER_CXXFLAGS += $(ZINCLUDE) LDDFLAGS += $(ZIPOBJS) @@ -3321,8 +3363,8 @@ else OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI OTHER_LDLIBS += $(JVMLIB) -@@ -102,7 +107,11 @@ - COMPILER_WARNINGS_FATAL=false +@@ -100,7 +105,11 @@ + RES = $(OBJDIR)/$(PGRM).res else LDOUTPUT = -o #Have a space +ifeq ($(PLATFORM), bsd) @@ -3346,7 +3388,7 @@ RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java --- jdk/make/com/sun/security/auth/module/Makefile +++ jdk/make/com/sun/security/auth/module/Makefile -@@ -70,7 +70,7 @@ +@@ -67,7 +67,7 @@ include FILES_c_solaris.gmk endif # solaris @@ -3446,7 +3488,7 @@ PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME) # suffix used for make dependencies files. -@@ -104,6 +98,10 @@ +@@ -108,6 +102,10 @@ # as the default. CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN @@ -3455,9 +3497,9 @@ + CFLAGS_REQUIRED_i586 += -mstackrealign +endif CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_ppc += -fsigned-char -D_BIG_ENDIAN CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9 - LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9 -@@ -201,7 +199,7 @@ +@@ -204,7 +202,7 @@ CPP_ARCH_FLAGS += -D_$(ARCH)_ endif @@ -3466,9 +3508,9 @@ -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT ifeq ($(ARCH_DATA_MODEL), 64) -@@ -211,33 +209,15 @@ - CPPFLAGS_OPT = - CPPFLAGS_DBG = -DDEBUG +@@ -217,33 +215,15 @@ + CPPFLAGS_DBG += -DLOGGING + endif -ifdef LIBRARY - # Libraries need to locate other libraries at runtime, and you can tell @@ -3504,7 +3546,7 @@ # # -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always -@@ -259,9 +239,9 @@ +@@ -264,9 +244,9 @@ ifeq ($(VARIANT), OPT) ifneq ($(NO_STRIP), true) ifneq ($(DEBUG_BINARIES), true) @@ -3516,7 +3558,7 @@ endif endif endif -@@ -271,13 +251,9 @@ +@@ -276,13 +256,9 @@ # LD_MAPFILE_FLAG = -Xlinker --version-script -Xlinker @@ -3533,7 +3575,7 @@ endif # -@@ -306,24 +282,22 @@ +@@ -311,24 +287,22 @@ override HAVE_FILIOH = false override HAVE_GETHRTIME = false override HAVE_GETHRVTIME = false @@ -3563,7 +3605,7 @@ override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER override SUN_CMM_SUBDIR = override THREADS_FLAG = native -@@ -344,6 +318,14 @@ +@@ -349,6 +323,14 @@ # DPS (Displayable PostScript) is available on Solaris machines HAVE_DPS = no @@ -3655,7 +3697,7 @@ ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli OTHER_LDLIBS += -ljli -@@ -166,6 +182,10 @@ +@@ -163,6 +179,10 @@ THREADLIBS = $(LIBTHREAD) endif # USE_PTHREADS @@ -3666,7 +3708,7 @@ # # This rule only applies on unix. It supports quantify and its ilk. # -@@ -221,15 +241,19 @@ +@@ -218,15 +238,19 @@ ifneq ($(PLATFORM), windows) @@ -3688,7 +3730,7 @@ VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"' --- jdk/make/common/Release.gmk +++ jdk/make/common/Release.gmk -@@ -145,14 +145,13 @@ +@@ -151,14 +151,13 @@ tnameserv.1 \ unpack200.1 @@ -3704,7 +3746,7 @@ extcheck.1 \ idlj.1 \ jar.1 \ -@@ -191,6 +190,11 @@ +@@ -197,6 +196,11 @@ JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING) endif # linux @@ -3716,7 +3758,7 @@ define copy-man-pages $(MKDIR) -p $1/man/man1 for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \ -@@ -313,6 +317,12 @@ +@@ -319,6 +323,12 @@ SOURCE_DIRS += $(CLOSED_SRC)/share/classes endif @@ -3729,7 +3771,7 @@ # # Specific files and directories that will be filtered out from above areas. -@@ -629,6 +639,8 @@ +@@ -639,6 +649,8 @@ $(BOOT_JAVA_CMD) -jar $(JARSPLIT_JARFILE) \ $(TOTAL_JAR_FILELIST) \ -o $(RT_JAR_FILELIST) $(RES_JAR_FILELIST) @@ -3738,7 +3780,7 @@ @$(java-vm-cleanup) # Create the manifest file. -@@ -974,7 +986,7 @@ +@@ -985,7 +997,7 @@ @# generated by the more efficient solaris/windows method of copying files. @# So for Linux, make use of the -T option (like Solaris' -I option) of @# obtaining the list of files from a file. MKS tar has no such option. @@ -3747,7 +3789,7 @@ for d in $(SOURCE_DIRS); do \ $(RM) $(ABS_TEMPDIR)/src-files.list; \ ($(CD) $$d && \ -@@ -987,7 +999,7 @@ +@@ -998,7 +1010,7 @@ done ; \ ) ; \ if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \ @@ -3758,7 +3800,7 @@ done --- jdk/make/common/shared/Compiler-gcc.gmk +++ jdk/make/common/shared/Compiler-gcc.gmk -@@ -99,6 +99,24 @@ +@@ -74,6 +74,24 @@ endif @@ -3885,21 +3927,10 @@ + TAR = $(UTILS_USR_BIN_PATH)tar + endif +endif ---- jdk/make/common/shared/Defs.gmk -+++ jdk/make/common/shared/Defs.gmk -@@ -143,7 +143,7 @@ - echo older; \ - else \ - if [ $(call MajorVersion,$1) -eq $(call MajorVersion,$2) -a \ -- $(call MinorVersion,$1) -lt $(call MinorVersion,$2) ]; then \ -+ `echo $(call MinorVersion,$1) | sed -e 's/\([0-9]*\)\(.*\)/\1/'` -lt $(call MinorVersion,$2) ]; then \ - echo older; \ - else \ - echo newer; \ --- jdk/make/common/shared/Platform.gmk +++ jdk/make/common/shared/Platform.gmk -@@ -264,6 +264,76 @@ - MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2) +@@ -214,6 +214,76 @@ + MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' ) endif +ifeq ($(SYSTEM_UNAME), FreeBSD) @@ -3975,31 +4006,8 @@ # Windows with and without CYGWIN will be slightly different ifeq ($(SYSTEM_UNAME), Windows_NT) PLATFORM = windows -@@ -413,6 +483,13 @@ - # system swapping during the build. - # If we don't know, assume 512. Subtract 128 from MB for VM MAX. - # Don't set VM max over 1024-128=896. -+# 736 is the max for OpenBSD. -+ifeq ($(OS_VENDOR), OpenBSD) -+ ABS_MAX_MEMORY := "736" -+else -+ ABS_MAX_MEMORY := "896" -+endif -+ - ifneq ($(MB_OF_MEMORY),) - LOW_MEMORY_MACHINE := $(shell \ - if [ $(MB_OF_MEMORY) -le 512 ] ; then \ -@@ -424,7 +501,7 @@ - if [ $(MB_OF_MEMORY) -le 1024 ] ; then \ - expr $(MB_OF_MEMORY) '-' 128 ; \ - else \ -- echo "896"; \ -+ echo $(ABS_MAX_MEMORY); \ - fi) - MIN_VM_MEMORY := $(shell \ - if [ $(MAX_VM_MEMORY) -le 128 ] ; then \ -@@ -476,6 +553,15 @@ - ARCH_VM_SUBDIR=jre/lib/$(LIBARCH) +@@ -445,6 +515,15 @@ + export MIN_VM_MEMORY endif +# Darwin-specific Overrides @@ -4016,7 +4024,7 @@ _USER2:=$(subst ", ,$(_USER1)) --- jdk/make/common/shared/Sanity-Settings.gmk +++ jdk/make/common/shared/Sanity-Settings.gmk -@@ -242,6 +242,7 @@ +@@ -245,6 +245,7 @@ ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH) ALL_SETTINGS+=$(call addAltSetting,FREETYPE_LIB_PATH) endif @@ -4026,7 +4034,7 @@ ifdef OPENJDK --- jdk/make/common/shared/Sanity.gmk +++ jdk/make/common/shared/Sanity.gmk -@@ -90,6 +90,11 @@ +@@ -142,6 +142,11 @@ $(EGREP) "\#define" | $(NAWK) '{print $$3}') endif @@ -4114,7 +4122,7 @@ # Library to compile. --- jdk/make/java/java/Makefile +++ jdk/make/java/java/Makefile -@@ -167,8 +167,10 @@ +@@ -165,8 +165,10 @@ # Is the altzone extern documented in ctime(3C) available? # ifneq ($(PLATFORM), windows) @@ -4125,7 +4133,7 @@ ifeq ($(HAVE_ALTZONE),true) OTHER_CPPFLAGS += -DHAVE_ALTZONE -@@ -205,9 +207,14 @@ +@@ -203,9 +205,14 @@ OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \ -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib else @@ -4242,7 +4250,7 @@ OTHER_CPPFLAGS += -DEXPAND_CLASSPATH_WILDCARDS -@@ -98,7 +104,11 @@ +@@ -96,7 +102,11 @@ OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC) OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC) @@ -4255,7 +4263,7 @@ # # Library to compile. -@@ -136,8 +146,29 @@ +@@ -134,8 +144,29 @@ endif # PLATFORM @@ -4302,7 +4310,7 @@ endif --- jdk/make/java/net/FILES_c.gmk +++ jdk/make/java/net/FILES_c.gmk -@@ -43,6 +43,10 @@ +@@ -44,6 +44,10 @@ FILES_c += linux_close.c endif @@ -4315,7 +4323,7 @@ FILES_c += DualStackPlainSocketImpl.c --- jdk/make/java/net/Makefile +++ jdk/make/java/net/Makefile -@@ -92,6 +92,12 @@ +@@ -94,6 +94,12 @@ include $(BUILDDIR)/common/Library.gmk @@ -4326,9 +4334,9 @@ + OTHER_LDLIBS = $(JVMLIB) -pthread +else ifeq ($(PLATFORM), windows) - OTHER_LDLIBS = ws2_32.lib $(JVMLIB) - # Will not compile at warning level 3 if warnings are fatal -@@ -102,6 +108,7 @@ + OTHER_LDLIBS = ws2_32.lib $(JVMLIB) \ + secur32.lib iphlpapi.lib delayimp.lib \ +@@ -104,6 +110,7 @@ ifeq ($(PLATFORM), linux) OTHER_LDLIBS += -lpthread endif @@ -4379,8 +4387,8 @@ ifeq ($(PLATFORM),windows) OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \ -libpath:$(LIBDIR) java.lib \ -@@ -137,6 +164,9 @@ - COMPILER_WARNINGS_FATAL=true +@@ -136,6 +163,9 @@ + ifeq ($(PLATFORM), linux) OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl endif +ifeq ($(PLATFORM), bsd) @@ -4389,7 +4397,7 @@ ifeq ($(PLATFORM), solaris) OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \ -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -@@ -159,6 +189,9 @@ +@@ -158,6 +188,9 @@ ifeq ($(PLATFORM), linux) FILES_m = mapfile-linux endif @@ -4401,7 +4409,7 @@ --- jdk/make/java/npt/Makefile +++ jdk/make/java/npt/Makefile -@@ -70,6 +70,18 @@ +@@ -65,6 +65,18 @@ OTHER_LCF += -export:nptInitialize -export:nptTerminate endif @@ -4439,7 +4447,7 @@ # and since 2D can do this derivation on the fly at run time there is no --- jdk/make/java/redist/Makefile +++ jdk/make/java/redist/Makefile -@@ -311,7 +311,7 @@ +@@ -310,7 +310,7 @@ $(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir $(install-file) @@ -4448,7 +4456,7 @@ # The oblique fonts are only needed/wanted on Linux. -@@ -325,7 +325,7 @@ +@@ -324,7 +324,7 @@ $(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir $(install-file) @@ -4459,7 +4467,7 @@ # Import internal files (ones that are stashed in this source tree) --- jdk/make/java/security/Makefile +++ jdk/make/java/security/Makefile -@@ -51,7 +51,15 @@ +@@ -54,7 +54,15 @@ ifneq ($(ARCH_DATA_MODEL), 64) PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows endif @@ -4498,7 +4506,7 @@ +endif --- jdk/make/java/zip/Makefile +++ jdk/make/java/zip/Makefile -@@ -72,16 +72,24 @@ +@@ -69,16 +69,24 @@ CPPFLAGS += -UDEBUG endif @@ -4586,10 +4594,10 @@ +endif # PLATFORM # - # This turns off all assert() checking in the optimized library + # This controls the ability to do logging in the library. --- jdk/make/sun/awt/Makefile +++ jdk/make/sun/awt/Makefile -@@ -129,6 +129,14 @@ +@@ -130,6 +130,14 @@ OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl endif @@ -4604,7 +4612,7 @@ FILES_c += initIDs.c # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX -@@ -241,7 +249,7 @@ +@@ -243,7 +251,7 @@ # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS endif # PLATFORM @@ -4613,7 +4621,7 @@ # vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl -@@ -422,6 +430,19 @@ +@@ -420,6 +428,19 @@ # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS endif # PLATFORM @@ -4633,7 +4641,7 @@ FONTCONFIGS = $(_FONTCONFIGS:%=$(LIBDIR)/%.src) BINARYFONTCONFIGS = $(_FONTCONFIGS:%.properties=$(LIBDIR)/%.bfc) -@@ -515,6 +536,9 @@ +@@ -513,6 +534,9 @@ -I$(OPENWIN_HOME)/include/X11/extensions \ -I$(PLATFORM_SRC)/native/$(PKGDIR)/font endif @@ -4643,7 +4651,7 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ -I$(SHARE_SRC)/native/$(PKGDIR)/../font \ -I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \ -@@ -536,7 +560,13 @@ +@@ -534,7 +558,13 @@ -I$(PLATFORM_SRC)/native/$(PKGDIR) \ $(EVENT_MODEL) @@ -4718,7 +4726,7 @@ $(AWT_RUNPATH) --- jdk/make/sun/font/Makefile +++ jdk/make/sun/font/Makefile -@@ -177,6 +177,15 @@ +@@ -188,6 +188,15 @@ # Libraries to link, and other C flags. # @@ -4734,7 +4742,7 @@ ifeq ($(PLATFORM), solaris) # Note that on Solaris, fontmanager is built against the headless library. LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/headless -@@ -187,6 +196,7 @@ +@@ -198,6 +207,7 @@ OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic endif endif @@ -4744,7 +4752,7 @@ --- jdk/make/sun/image/generic/Makefile +++ jdk/make/sun/image/generic/Makefile -@@ -69,5 +69,9 @@ +@@ -68,5 +68,9 @@ -I$(PLATFORM_SRC)/native/$(PKGDIR)/medialib OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES @@ -4802,7 +4810,7 @@ +endif --- jdk/make/sun/security/pkcs11/Makefile +++ jdk/make/sun/security/pkcs11/Makefile -@@ -156,7 +156,7 @@ +@@ -158,7 +158,7 @@ # # Libraries to link # @@ -4931,7 +4939,7 @@ # Since this library will be living in a subdirectory below the other libraries # we need to add an extra runpath so that libraries in the upper directory # are found at runtime. -@@ -86,7 +91,12 @@ +@@ -87,7 +92,12 @@ vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 @@ -4945,7 +4953,7 @@ $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi ifeq ($(PLATFORM), solaris) -@@ -94,8 +104,6 @@ +@@ -95,8 +105,6 @@ dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) endif @@ -4954,7 +4962,7 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \ -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ -I$(PLATFORM_SRC)/native/sun/awt \ -@@ -122,9 +130,11 @@ +@@ -123,9 +131,11 @@ -I$(SHARE_SRC)/native/sun/awt \ -I$(PLATFORM_SRC)/native/sun/awt @@ -4967,7 +4975,7 @@ -I/usr/include/X11/extensions \ -I$(MOTIF_DIR)/include \ -I$(OPENWIN_HOME)/include -@@ -134,6 +144,14 @@ +@@ -135,6 +145,14 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions -I$(MOTIF_DIR)/include endif @@ -5014,7 +5022,7 @@ --- jdk/src/share/bin/java.c +++ jdk/src/share/bin/java.c -@@ -104,6 +104,11 @@ +@@ -109,6 +109,11 @@ static char *launchername; jboolean _launcher_debug = JNI_FALSE; @@ -5026,7 +5034,7 @@ /* * Entries for splash screen environment variables. * putenv is performed in SelectVersion. We need -@@ -146,6 +151,10 @@ +@@ -151,6 +156,10 @@ static void SetPaths(int argc, char **argv); @@ -5037,7 +5045,7 @@ /* Maximum supported entries from jvm.cfg. */ #define INIT_MAX_KNOWN_VMS 10 /* Values for vmdesc.flag */ -@@ -184,13 +193,13 @@ +@@ -197,13 +206,13 @@ int JNICALL JavaMain(void * args); /* entry point */ @@ -5053,7 +5061,7 @@ /* * Entry point. -@@ -332,49 +341,24 @@ +@@ -361,49 +370,24 @@ /* Show the splash screen if needed */ ShowSplashScreen(); @@ -5112,7 +5120,7 @@ int argc = args->argc; char **argv = args->argv; char *jarfile = args->jarfile; -@@ -1159,6 +1143,10 @@ +@@ -1100,6 +1084,10 @@ } else if (strcmp(arg, "-X") == 0) { printXUsage = JNI_TRUE; return JNI_TRUE; @@ -5121,9 +5129,9 @@ + continueInSameThread = JNI_TRUE; +#endif /* - * The following case provide backward compatibility with old-style - * command line options. -@@ -1979,6 +1967,84 @@ + * The following case checks for -XshowSettings OR -XshowSetting:SUBOPT. + * In the latter case, any SUBOPT value not recognized will default to "all" +@@ -1878,6 +1866,84 @@ return -1; } @@ -5210,7 +5218,7 @@ { --- jdk/src/share/bin/java.h +++ jdk/src/share/bin/java.h -@@ -91,11 +91,17 @@ +@@ -95,11 +95,17 @@ void PrintMachineDependentOptions(); const char *jlong_format_specifier(); @@ -5287,7 +5295,7 @@ } else if (nm.equals("true")) { --- jdk/src/share/classes/java/util/TimeZone.java +++ jdk/src/share/classes/java/util/TimeZone.java -@@ -833,15 +833,13 @@ +@@ -848,15 +848,13 @@ } int gmtOffset = (hours * 60 + num) * 60 * 1000; @@ -5306,7 +5314,7 @@ } --- jdk/src/share/classes/sun/awt/FontConfiguration.java +++ jdk/src/share/classes/sun/awt/FontConfiguration.java -@@ -1073,7 +1073,7 @@ +@@ -1121,7 +1121,7 @@ */ HashMap existsMap; public boolean needToSearchForFile(String fileName) { @@ -5315,7 +5323,7 @@ return false; } else if (existsMap == null) { existsMap = new HashMap(); -@@ -1309,7 +1309,7 @@ +@@ -1361,7 +1361,7 @@ + " entry is missing!!!"); @@ -5340,7 +5348,7 @@ /** * - does basic verification of the file * - reads the header table for this font (within a collection) -@@ -1061,6 +1068,10 @@ +@@ -1089,6 +1096,10 @@ * greater than 32767, so read and store those as ints */ int stringPtr = sbuffer.get() & 0xffff; @@ -5351,7 +5359,7 @@ for (int i=0; i() { public Boolean run() { String osname = System.getProperty("os.name"); @@ -5552,7 +5560,7 @@ } --- jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java +++ jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java -@@ -82,7 +82,11 @@ +@@ -83,7 +83,11 @@ String osname = System.getProperty("os.name"); if (osname.startsWith("SunOS")) { gssLib = "libgss.so"; @@ -5567,7 +5575,7 @@ } --- jdk/src/share/classes/sun/security/krb5/Config.java +++ jdk/src/share/classes/sun/security/krb5/Config.java -@@ -711,7 +711,11 @@ +@@ -699,7 +699,11 @@ } } else if (osname.startsWith("SunOS")) { name = "/etc/krb5/krb5.conf"; @@ -5582,7 +5590,7 @@ } --- jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java +++ jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java -@@ -386,8 +386,12 @@ +@@ -412,8 +412,12 @@ String uidStr = null; long uid = 0; @@ -5692,7 +5700,7 @@ #ifndef FULL #define FULL 1 /* Adds <500 bytes to the zipped final product. */ #endif -@@ -89,11 +93,13 @@ +@@ -90,11 +94,13 @@ // bytes and byte arrays typedef unsigned int uint; @@ -5745,20 +5753,6 @@ true)); } ---- jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c -+++ jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c -@@ -33,7 +33,11 @@ - - #include - // for malloc -+#ifdef _ALLBSD_SOURCE -+#include -+#else - #include -+#endif - #include "SoundDefs.h" - #include "DirectAudio.h" - #include "Utilities.h" --- jdk/src/share/native/com/sun/media/sound/SoundDefs.h +++ jdk/src/share/native/com/sun/media/sound/SoundDefs.h @@ -31,6 +31,7 @@ @@ -8695,9 +8689,9 @@ +#define LD_LIBRARY_PATH "LD_LIBRARY_PATH" +#endif - #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 @@ + /* + * If a processor / os combination has the ability to run binaries of +@@ -75,14 +90,31 @@ #endif /* pointer to environment */ @@ -8731,7 +8725,7 @@ static const char *user_dir = "/java"; #else /* Solaris */ static const char *system_dir = "/usr/jdk"; -@@ -408,10 +440,10 @@ +@@ -404,10 +436,10 @@ * If not on Solaris, assume only a single LD_LIBRARY_PATH * variable. */ @@ -8744,7 +8738,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 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***