From owner-svn-ports-all@freebsd.org Sun Apr 24 05:50:43 2016 Return-Path: Delivered-To: svn-ports-all@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 24EB9B199A5; Sun, 24 Apr 2016 05:50:43 +0000 (UTC) (envelope-from brooks@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 CC6691DF5; Sun, 24 Apr 2016 05:50:42 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O5ofKc078035; Sun, 24 Apr 2016 05:50:41 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O5of7b078033; Sun, 24 Apr 2016 05:50:41 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201604240550.u3O5of7b078033@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Sun, 24 Apr 2016 05:50:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413920 - head/devel/llvm-cheri X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 05:50:43 -0000 Author: brooks Date: Sun Apr 24 05:50:41 2016 New Revision: 413920 URL: https://svnweb.freebsd.org/changeset/ports/413920 Log: Update to an April 23rd snapshot. Modified: head/devel/llvm-cheri/Makefile.snapshot head/devel/llvm-cheri/distinfo Modified: head/devel/llvm-cheri/Makefile.snapshot ============================================================================== --- head/devel/llvm-cheri/Makefile.snapshot Sat Apr 23 22:49:10 2016 (r413919) +++ head/devel/llvm-cheri/Makefile.snapshot Sun Apr 24 05:50:41 2016 (r413920) @@ -6,8 +6,8 @@ # LLVM_MAJOR= 3.8 LLVM_RELEASE= ${LLVM_MAJOR}.0 -SNAPDATE= 20160303 +SNAPDATE= 20160423 -LLVM_COMMIT= 388f6926b8f9bb0557c65b74badb8a34734f13dc -CLANG_COMMIT= 473591c52d2160071616e8574dc80305abfdda52 +LLVM_COMMIT= 84185b767e5dadecddece2b6161be42917389ab2 +CLANG_COMMIT= 5cb14ce28a05af60f3a31b8dc14403511ddaac80 LLDB_COMMIT= 7ee5905d0109a13d543a127a9cda7c280c8103c8 Modified: head/devel/llvm-cheri/distinfo ============================================================================== --- head/devel/llvm-cheri/distinfo Sat Apr 23 22:49:10 2016 (r413919) +++ head/devel/llvm-cheri/distinfo Sun Apr 24 05:50:41 2016 (r413920) @@ -1,4 +1,4 @@ -SHA256 (CTSRD-CHERI-llvm-3.8.d20160303-388f6926b8f9bb0557c65b74badb8a34734f13dc_GH0.tar.gz) = 8ceac98a4bb053c328f7e689832100d94bf5748e4f4fb335f88860b787176521 -SIZE (CTSRD-CHERI-llvm-3.8.d20160303-388f6926b8f9bb0557c65b74badb8a34734f13dc_GH0.tar.gz) = 22354244 -SHA256 (CTSRD-CHERI-clang-473591c52d2160071616e8574dc80305abfdda52_GH0.tar.gz) = f5638a7845db7066b6453908bf9f1a77f41a3d45914b7b103dc7552290a1a4b0 -SIZE (CTSRD-CHERI-clang-473591c52d2160071616e8574dc80305abfdda52_GH0.tar.gz) = 12886568 +SHA256 (CTSRD-CHERI-llvm-3.8.d20160423-84185b767e5dadecddece2b6161be42917389ab2_GH0.tar.gz) = 84e9aa29d1d61c75c8463388e6b013c0a1d892389297d2ab7b9442950d3035ab +SIZE (CTSRD-CHERI-llvm-3.8.d20160423-84185b767e5dadecddece2b6161be42917389ab2_GH0.tar.gz) = 22355018 +SHA256 (CTSRD-CHERI-clang-5cb14ce28a05af60f3a31b8dc14403511ddaac80_GH0.tar.gz) = 8de511db6d3754838aa2afafc7608ea94820331f6963d119aab83eabc6b93949 +SIZE (CTSRD-CHERI-clang-5cb14ce28a05af60f3a31b8dc14403511ddaac80_GH0.tar.gz) = 12888717 From owner-svn-ports-all@freebsd.org Sun Apr 24 06:58:12 2016 Return-Path: Delivered-To: svn-ports-all@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 D3656B1941F; Sun, 24 Apr 2016 06:58:12 +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 B02981262; Sun, 24 Apr 2016 06:58:12 +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 u3O6wBRE099031; Sun, 24 Apr 2016 06:58:11 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O6wBRo099030; Sun, 24 Apr 2016 06:58:11 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201604240658.u3O6wBRo099030@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 24 Apr 2016 06:58:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413921 - head/multimedia/mkvtoolnix/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 06:58:12 -0000 Author: riggs Date: Sun Apr 24 06:58:11 2016 New Revision: 413921 URL: https://svnweb.freebsd.org/changeset/ports/413921 Log: Fix build with gcc 4.8 Modified: head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp Modified: head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp ============================================================================== --- head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp Sun Apr 24 05:50:41 2016 (r413920) +++ head/multimedia/mkvtoolnix/files/patch-lib_nlohmann-json_src_json.hpp Sun Apr 24 06:58:11 2016 (r413921) @@ -1,17 +1,48 @@ --- lib/nlohmann-json/src/json.hpp.orig 2016-04-23 13:52:02 UTC +++ lib/nlohmann-json/src/json.hpp -@@ -6224,7 +6224,9 @@ class basic_json +@@ -87,6 +87,14 @@ struct has_mapped_type + static constexpr bool value = sizeof(test(0)) == 1; + }; + ++template ++std::string ToString(T val) ++{ ++ std::ostringstream TempStream; ++ TempStream << val; ++ return TempStream.str(); ++} ++ + } + + /*! +@@ -3029,7 +3037,7 @@ class basic_json + catch (std::out_of_range&) + { + // create better exception explanation +- throw std::out_of_range("array index " + std::to_string(idx) + " is out of range"); ++ throw std::out_of_range("array index " + ToString(idx) + " is out of range"); + } + } + else +@@ -3073,7 +3081,7 @@ class basic_json + catch (std::out_of_range&) + { + // create better exception explanation +- throw std::out_of_range("array index " + std::to_string(idx) + " is out of range"); ++ throw std::out_of_range("array index " + ToString(idx) + " is out of range"); + } + } + else +@@ -6224,7 +6232,7 @@ class basic_json // use integer array index as key case value_t::array: { - return std::to_string(array_index); -+ std::ostringstream TempStream; -+ TempStream << array_index; -+ return TempStream.str(); ++ return ToString(array_index); } // use key from the object -@@ -8204,7 +8206,7 @@ basic_json_parser_63: +@@ -8204,7 +8212,7 @@ basic_json_parser_63: */ long double str_to_float_t(long double* /* type */, char** endptr) const { @@ -20,3 +51,31 @@ } /*! +@@ -8244,7 +8252,8 @@ basic_json_parser_63: + */ + float str_to_float_t(float* /* type */, char** endptr) const + { +- return std::strtof(reinterpret_cast(m_start), endptr); ++ auto v = std::strtod(reinterpret_cast(m_start), endptr); ++ return (float)v; + } + + /*! +@@ -8316,7 +8325,7 @@ basic_json_parser_63: + { + // positive, parse with strtoull and attempt cast to + // number_unsigned_t +- if (attempt_cast(std::strtoull(reinterpret_cast(m_start), &endptr, ++ if (attempt_cast(strtoull(reinterpret_cast(m_start), &endptr, + 10), result.m_value.number_unsigned)) + { + result.m_type = value_t::number_unsigned; +@@ -8331,7 +8340,7 @@ basic_json_parser_63: + { + // Negative, parse with strtoll and attempt cast to + // number_integer_t +- if (attempt_cast(std::strtoll(reinterpret_cast(m_start), &endptr, ++ if (attempt_cast(strtoll(reinterpret_cast(m_start), &endptr, + 10), result.m_value.number_integer)) + { + result.m_type = value_t::number_integer; From owner-svn-ports-all@freebsd.org Sun Apr 24 07:14:55 2016 Return-Path: Delivered-To: svn-ports-all@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 63465B197F4; Sun, 24 Apr 2016 07:14:55 +0000 (UTC) (envelope-from brooks@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 1B93E1AF6; Sun, 24 Apr 2016 07:14:55 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O7EswV005118; Sun, 24 Apr 2016 07:14:54 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O7Esg1005115; Sun, 24 Apr 2016 07:14:54 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201604240714.u3O7Esg1005115@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Sun, 24 Apr 2016 07:14:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413922 - in head/devel: llvm-cheri llvm-cheri128 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 07:14:55 -0000 Author: brooks Date: Sun Apr 24 07:14:53 2016 New Revision: 413922 URL: https://svnweb.freebsd.org/changeset/ports/413922 Log: Add a version of llvm-cheri for 128-bit CHERI capabilities. No functional change to devel/llvm-cheri, just plist generalization. Sponsored by: DARPA, AFRL Added: head/devel/llvm-cheri128/ head/devel/llvm-cheri128/Makefile (contents, props changed) Modified: head/devel/llvm-cheri/Makefile head/devel/llvm-cheri/pkg-plist Modified: head/devel/llvm-cheri/Makefile ============================================================================== --- head/devel/llvm-cheri/Makefile Sun Apr 24 06:58:11 2016 (r413921) +++ head/devel/llvm-cheri/Makefile Sun Apr 24 07:14:53 2016 (r413922) @@ -10,7 +10,7 @@ COMMENT= LLVM and Clang with support for BROKEN_powerpc64= Does not build -LLVM_SUFFIX= -cheri +LLVM_SUFFIX?= -cheri LLVM_PREFIX= ${PREFIX}/llvm${LLVM_SUFFIX} COMMAND_SUFFIX= ${LLVM_SUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} @@ -23,7 +23,7 @@ SUB_FILES= llvm-wrapper.sh SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} -CMAKE_ARGS= -DBUILD_SHARED_LIBS=ON \ +CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON \ -DLLVM_DEFAULT_TARGET_TRIPLE=cheri-unknown-freebsd USE_GITHUB= yes @@ -56,8 +56,10 @@ OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx -LLVM_RELEASE= ${PORTVERSION:C/\.r[0-9]*//} -PLIST_SUB+= LLVM_RELEASE=${LLVM_RELEASE} +LLVM_RELEASE= ${PORTVERSION:C/\.d[0-9]*//} +PLIST_SUB+= COMMAND_SUFFIX=${COMMAND_SUFFIX} \ + LLVM_RELEASE=${LLVM_RELEASE} \ + LLVM_SUFFIX=${LLVM_SUFFIX} COMMANDS= bugpoint \ llc \ @@ -213,20 +215,23 @@ regression-test: ${BUILD_COOKIE} build-plist: ${RM} -f ${PLIST} ${PLIST}.tmp .for command in ${COMMANDS} - ${ECHO_CMD} bin/${COMMAND_PREFIX}${command}${COMMAND_SUFFIX} >> ${PLIST}.tmp + ${ECHO_CMD} bin/${COMMAND_PREFIX}${command}%%COMMAND_SUFFIX%% >> ${PLIST}.tmp .endfor .for command in ${LIT_COMMANDS} - ${ECHO_CMD} %%LIT%%bin/${COMMAND_PREFIX}${command}${COMMAND_SUFFIX} >> ${PLIST}.tmp - ${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||}/bin/${command} >> ${PLIST}.tmp + ${ECHO_CMD} %%LIT%%bin/${COMMAND_PREFIX}${command}%%COMMAND_SUFFIX%% >> ${PLIST}.tmp + ${ECHO_CMD} %%LIT%%${LLVM_PREFIX:S|${PREFIX}/||:S|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|}/bin/${command} >> ${PLIST}.tmp .endfor ${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \ ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \ ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \ -e 's|${PORTVERSION}|%%PORTVERSION%%|' \ - -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' | \ + -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \ + -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \ + -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' | \ ${SORT} >> ${PLIST}.tmp ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \ - ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' | \ + ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \ + -e 's|${LLVM_SUFFIX}|%%LLVM_SUFFIX%%|' | \ ${SORT} >> ${PLIST}.tmp awk '{if ($$0 ~ /clang/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} print}' ${PLIST}.tmp >> ${PLIST} ${RM} -f ${PLIST}.tmp Modified: head/devel/llvm-cheri/pkg-plist ============================================================================== --- head/devel/llvm-cheri/pkg-plist Sun Apr 24 06:58:11 2016 (r413921) +++ head/devel/llvm-cheri/pkg-plist Sun Apr 24 07:14:53 2016 (r413922) @@ -1,1805 +1,1805 @@ -bin/bugpoint-cheri -bin/llc-cheri -bin/lli-cheri -bin/llvm-ar-cheri -bin/llvm-as-cheri -bin/llvm-bcanalyzer-cheri -bin/llvm-config-cheri -bin/llvm-cov-cheri -bin/llvm-diff-cheri -bin/llvm-dis-cheri -bin/llvm-dwarfdump-cheri -bin/llvm-extract-cheri -bin/llvm-link-cheri -bin/llvm-mc-cheri -bin/llvm-mcmarkup-cheri -bin/llvm-nm-cheri -bin/llvm-objdump-cheri -bin/llvm-profdata-cheri -bin/llvm-ranlib-cheri -bin/llvm-readobj-cheri -bin/llvm-rtdyld-cheri -bin/llvm-size-cheri -bin/llvm-stress-cheri -bin/llvm-split-cheri -bin/llvm-symbolizer-cheri -bin/llvm-tblgen-cheri -bin/opt-cheri -%%CLANG%%bin/clang-cheri -%%CLANG%%bin/clang++-cheri -%%CLANG%%bin/clang-check-cheri -%%CLANG%%bin/clang-cpp-cheri -%%CLANG%%bin/clang-format-cheri -%%LIT%%bin/lit-cheri -%%LIT%%llvm-cheri/bin/lit -%%LIT%%bin/llvm-lit-cheri -%%LIT%%llvm-cheri/bin/llvm-lit -%%LIT%%bin/FileCheck-cheri -%%LIT%%llvm-cheri/bin/FileCheck -llvm-cheri/bin/bugpoint -llvm-cheri/bin/capsizefix -%%CLANG%%llvm-cheri/bin/clang -%%CLANG%%llvm-cheri/bin/clang++ -%%CLANG%%llvm-cheri/bin/clang-3.8 -%%CLANG%%llvm-cheri/bin/clang-check -%%CLANG%%llvm-cheri/bin/clang-cl -%%CLANG%%llvm-cheri/bin/clang-cpp -%%CLANG%%llvm-cheri/bin/clang-format -%%CLANG%%llvm-cheri/bin/git-clang-format -llvm-cheri/bin/llc -llvm-cheri/bin/lli -llvm-cheri/bin/llvm-ar -llvm-cheri/bin/llvm-as -llvm-cheri/bin/llvm-bcanalyzer -llvm-cheri/bin/llvm-c-test -llvm-cheri/bin/llvm-config -llvm-cheri/bin/llvm-cov -llvm-cheri/bin/llvm-cxxdump -llvm-cheri/bin/llvm-diff -llvm-cheri/bin/llvm-dis -llvm-cheri/bin/llvm-dsymutil -llvm-cheri/bin/llvm-dwarfdump -llvm-cheri/bin/llvm-extract -llvm-cheri/bin/llvm-lib -llvm-cheri/bin/llvm-link -llvm-cheri/bin/llvm-lto -llvm-cheri/bin/llvm-mc -llvm-cheri/bin/llvm-mcmarkup -llvm-cheri/bin/llvm-nm -llvm-cheri/bin/llvm-objdump -llvm-cheri/bin/llvm-pdbdump -llvm-cheri/bin/llvm-profdata -llvm-cheri/bin/llvm-ranlib -llvm-cheri/bin/llvm-readobj -llvm-cheri/bin/llvm-rtdyld -llvm-cheri/bin/llvm-size -llvm-cheri/bin/llvm-split -llvm-cheri/bin/llvm-stress -llvm-cheri/bin/llvm-symbolizer -llvm-cheri/bin/llvm-tblgen -llvm-cheri/bin/obj2yaml -llvm-cheri/bin/opt -llvm-cheri/bin/verify-uselistorder -llvm-cheri/bin/yaml2obj -%%CLANG%%llvm-cheri/include/clang-c/BuildSystem.h -%%CLANG%%llvm-cheri/include/clang-c/CXCompilationDatabase.h -%%CLANG%%llvm-cheri/include/clang-c/CXErrorCode.h -%%CLANG%%llvm-cheri/include/clang-c/CXString.h -%%CLANG%%llvm-cheri/include/clang-c/Documentation.h -%%CLANG%%llvm-cheri/include/clang-c/Index.h -%%CLANG%%llvm-cheri/include/clang-c/Platform.h -%%CLANG%%llvm-cheri/include/clang/ARCMigrate/ARCMT.h -%%CLANG%%llvm-cheri/include/clang/ARCMigrate/ARCMTActions.h -%%CLANG%%llvm-cheri/include/clang/ARCMigrate/FileRemapper.h -%%CLANG%%llvm-cheri/include/clang/AST/APValue.h -%%CLANG%%llvm-cheri/include/clang/AST/AST.h -%%CLANG%%llvm-cheri/include/clang/AST/ASTConsumer.h -%%CLANG%%llvm-cheri/include/clang/AST/ASTContext.h -%%CLANG%%llvm-cheri/include/clang/AST/ASTDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/AST/ASTFwd.h -%%CLANG%%llvm-cheri/include/clang/AST/ASTImporter.h -%%CLANG%%llvm-cheri/include/clang/AST/ASTLambda.h -%%CLANG%%llvm-cheri/include/clang/AST/ASTMutationListener.h -%%CLANG%%llvm-cheri/include/clang/AST/ASTTypeTraits.h -%%CLANG%%llvm-cheri/include/clang/AST/ASTUnresolvedSet.h -%%CLANG%%llvm-cheri/include/clang/AST/ASTVector.h -%%CLANG%%llvm-cheri/include/clang/AST/Attr.h -%%CLANG%%llvm-cheri/include/clang/AST/AttrDump.inc -%%CLANG%%llvm-cheri/include/clang/AST/AttrImpl.inc -%%CLANG%%llvm-cheri/include/clang/AST/AttrIterator.h -%%CLANG%%llvm-cheri/include/clang/AST/AttrVisitor.inc -%%CLANG%%llvm-cheri/include/clang/AST/Attrs.inc -%%CLANG%%llvm-cheri/include/clang/AST/BaseSubobject.h -%%CLANG%%llvm-cheri/include/clang/AST/BuiltinTypes.def -%%CLANG%%llvm-cheri/include/clang/AST/CXXInheritance.h -%%CLANG%%llvm-cheri/include/clang/AST/CanonicalType.h -%%CLANG%%llvm-cheri/include/clang/AST/CharUnits.h -%%CLANG%%llvm-cheri/include/clang/AST/Comment.h -%%CLANG%%llvm-cheri/include/clang/AST/CommentBriefParser.h -%%CLANG%%llvm-cheri/include/clang/AST/CommentCommandInfo.inc -%%CLANG%%llvm-cheri/include/clang/AST/CommentCommandList.inc -%%CLANG%%llvm-cheri/include/clang/AST/CommentCommandTraits.h -%%CLANG%%llvm-cheri/include/clang/AST/CommentDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/AST/CommentHTMLNamedCharacterReferences.inc -%%CLANG%%llvm-cheri/include/clang/AST/CommentHTMLTags.inc -%%CLANG%%llvm-cheri/include/clang/AST/CommentHTMLTagsProperties.inc -%%CLANG%%llvm-cheri/include/clang/AST/CommentLexer.h -%%CLANG%%llvm-cheri/include/clang/AST/CommentNodes.inc -%%CLANG%%llvm-cheri/include/clang/AST/CommentParser.h -%%CLANG%%llvm-cheri/include/clang/AST/CommentSema.h -%%CLANG%%llvm-cheri/include/clang/AST/CommentVisitor.h -%%CLANG%%llvm-cheri/include/clang/AST/DataRecursiveASTVisitor.h -%%CLANG%%llvm-cheri/include/clang/AST/Decl.h -%%CLANG%%llvm-cheri/include/clang/AST/DeclAccessPair.h -%%CLANG%%llvm-cheri/include/clang/AST/DeclBase.h -%%CLANG%%llvm-cheri/include/clang/AST/DeclCXX.h -%%CLANG%%llvm-cheri/include/clang/AST/DeclContextInternals.h -%%CLANG%%llvm-cheri/include/clang/AST/DeclFriend.h -%%CLANG%%llvm-cheri/include/clang/AST/DeclGroup.h -%%CLANG%%llvm-cheri/include/clang/AST/DeclLookups.h -%%CLANG%%llvm-cheri/include/clang/AST/DeclNodes.inc -%%CLANG%%llvm-cheri/include/clang/AST/DeclObjC.h -%%CLANG%%llvm-cheri/include/clang/AST/DeclOpenMP.h -%%CLANG%%llvm-cheri/include/clang/AST/DeclTemplate.h -%%CLANG%%llvm-cheri/include/clang/AST/DeclVisitor.h -%%CLANG%%llvm-cheri/include/clang/AST/DeclarationName.h -%%CLANG%%llvm-cheri/include/clang/AST/DependentDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/AST/EvaluatedExprVisitor.h -%%CLANG%%llvm-cheri/include/clang/AST/Expr.h -%%CLANG%%llvm-cheri/include/clang/AST/ExprCXX.h -%%CLANG%%llvm-cheri/include/clang/AST/ExprObjC.h -%%CLANG%%llvm-cheri/include/clang/AST/ExprOpenMP.h -%%CLANG%%llvm-cheri/include/clang/AST/ExternalASTSource.h -%%CLANG%%llvm-cheri/include/clang/AST/GlobalDecl.h -%%CLANG%%llvm-cheri/include/clang/AST/LambdaCapture.h -%%CLANG%%llvm-cheri/include/clang/AST/Mangle.h -%%CLANG%%llvm-cheri/include/clang/AST/MangleNumberingContext.h -%%CLANG%%llvm-cheri/include/clang/AST/NSAPI.h -%%CLANG%%llvm-cheri/include/clang/AST/NestedNameSpecifier.h -%%CLANG%%llvm-cheri/include/clang/AST/OpenMPClause.h -%%CLANG%%llvm-cheri/include/clang/AST/OperationKinds.h -%%CLANG%%llvm-cheri/include/clang/AST/ParentMap.h -%%CLANG%%llvm-cheri/include/clang/AST/PrettyPrinter.h -%%CLANG%%llvm-cheri/include/clang/AST/RawCommentList.h -%%CLANG%%llvm-cheri/include/clang/AST/RecordLayout.h -%%CLANG%%llvm-cheri/include/clang/AST/RecursiveASTVisitor.h -%%CLANG%%llvm-cheri/include/clang/AST/Redeclarable.h -%%CLANG%%llvm-cheri/include/clang/AST/SelectorLocationsKind.h -%%CLANG%%llvm-cheri/include/clang/AST/Stmt.h -%%CLANG%%llvm-cheri/include/clang/AST/StmtCXX.h -%%CLANG%%llvm-cheri/include/clang/AST/StmtGraphTraits.h -%%CLANG%%llvm-cheri/include/clang/AST/StmtIterator.h -%%CLANG%%llvm-cheri/include/clang/AST/StmtNodes.inc -%%CLANG%%llvm-cheri/include/clang/AST/StmtObjC.h -%%CLANG%%llvm-cheri/include/clang/AST/StmtOpenMP.h -%%CLANG%%llvm-cheri/include/clang/AST/StmtVisitor.h -%%CLANG%%llvm-cheri/include/clang/AST/TemplateBase.h -%%CLANG%%llvm-cheri/include/clang/AST/TemplateName.h -%%CLANG%%llvm-cheri/include/clang/AST/Type.h -%%CLANG%%llvm-cheri/include/clang/AST/TypeLoc.h -%%CLANG%%llvm-cheri/include/clang/AST/TypeLocNodes.def -%%CLANG%%llvm-cheri/include/clang/AST/TypeLocVisitor.h -%%CLANG%%llvm-cheri/include/clang/AST/TypeNodes.def -%%CLANG%%llvm-cheri/include/clang/AST/TypeOrdering.h -%%CLANG%%llvm-cheri/include/clang/AST/TypeVisitor.h -%%CLANG%%llvm-cheri/include/clang/AST/UnresolvedSet.h -%%CLANG%%llvm-cheri/include/clang/AST/VTTBuilder.h -%%CLANG%%llvm-cheri/include/clang/AST/VTableBuilder.h -%%CLANG%%llvm-cheri/include/clang/ASTMatchers/ASTMatchFinder.h -%%CLANG%%llvm-cheri/include/clang/ASTMatchers/ASTMatchers.h -%%CLANG%%llvm-cheri/include/clang/ASTMatchers/ASTMatchersInternal.h -%%CLANG%%llvm-cheri/include/clang/ASTMatchers/ASTMatchersMacros.h -%%CLANG%%llvm-cheri/include/clang/ASTMatchers/Dynamic/Diagnostics.h -%%CLANG%%llvm-cheri/include/clang/ASTMatchers/Dynamic/Parser.h -%%CLANG%%llvm-cheri/include/clang/ASTMatchers/Dynamic/Registry.h -%%CLANG%%llvm-cheri/include/clang/ASTMatchers/Dynamic/VariantValue.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/Consumed.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/Dominators.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/FormatString.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/LiveVariables.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/PostOrderCFGView.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/PseudoConstantAnalysis.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/ReachableCode.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/ThreadSafety.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/ThreadSafetyCommon.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/ThreadSafetyLogical.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/ThreadSafetyOps.def -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/ThreadSafetyTIL.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/ThreadSafetyTraverse.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/ThreadSafetyUtil.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Analyses/UninitializedValues.h -%%CLANG%%llvm-cheri/include/clang/Analysis/AnalysisContext.h -%%CLANG%%llvm-cheri/include/clang/Analysis/AnalysisDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/Analysis/CFG.h -%%CLANG%%llvm-cheri/include/clang/Analysis/CFGStmtMap.h -%%CLANG%%llvm-cheri/include/clang/Analysis/CallGraph.h -%%CLANG%%llvm-cheri/include/clang/Analysis/CodeInjector.h -%%CLANG%%llvm-cheri/include/clang/Analysis/DomainSpecific/CocoaConventions.h -%%CLANG%%llvm-cheri/include/clang/Analysis/DomainSpecific/ObjCNoReturn.h -%%CLANG%%llvm-cheri/include/clang/Analysis/FlowSensitive/DataflowValues.h -%%CLANG%%llvm-cheri/include/clang/Analysis/ProgramPoint.h -%%CLANG%%llvm-cheri/include/clang/Analysis/Support/BumpVector.h -%%CLANG%%llvm-cheri/include/clang/Basic/ABI.h -%%CLANG%%llvm-cheri/include/clang/Basic/AddressSpaces.h -%%CLANG%%llvm-cheri/include/clang/Basic/AllDiagnostics.h -%%CLANG%%llvm-cheri/include/clang/Basic/AttrHasAttributeImpl.inc -%%CLANG%%llvm-cheri/include/clang/Basic/AttrKinds.h -%%CLANG%%llvm-cheri/include/clang/Basic/AttrList.inc -%%CLANG%%llvm-cheri/include/clang/Basic/Attributes.h -%%CLANG%%llvm-cheri/include/clang/Basic/Builtins.def -%%CLANG%%llvm-cheri/include/clang/Basic/Builtins.h -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsAArch64.def -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsAMDGPU.def -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsARM.def -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsHexagon.def -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsLe64.def -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsMips.def -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsNEON.def -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsNVPTX.def -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsPPC.def -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsSystemZ.def -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsWebAssembly.def -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsX86.def -%%CLANG%%llvm-cheri/include/clang/Basic/BuiltinsXCore.def -%%CLANG%%llvm-cheri/include/clang/Basic/CapturedStmt.h -%%CLANG%%llvm-cheri/include/clang/Basic/CharInfo.h -%%CLANG%%llvm-cheri/include/clang/Basic/CommentOptions.h -%%CLANG%%llvm-cheri/include/clang/Basic/Diagnostic.h -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticASTKinds.inc -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticAnalysisKinds.inc -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticCategories.h -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticCommentKinds.inc -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticCommonKinds.inc -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticDriverKinds.inc -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticFrontendKinds.inc -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticGroups.inc -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticIDs.h -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticIndexName.inc -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticLexKinds.inc -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticOptions.def -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticOptions.h -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticParseKinds.inc -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticSemaKinds.inc -%%CLANG%%llvm-cheri/include/clang/Basic/DiagnosticSerializationKinds.inc -%%CLANG%%llvm-cheri/include/clang/Basic/ExceptionSpecificationType.h -%%CLANG%%llvm-cheri/include/clang/Basic/ExpressionTraits.h -%%CLANG%%llvm-cheri/include/clang/Basic/FileManager.h -%%CLANG%%llvm-cheri/include/clang/Basic/FileSystemOptions.h -%%CLANG%%llvm-cheri/include/clang/Basic/FileSystemStatCache.h -%%CLANG%%llvm-cheri/include/clang/Basic/IdentifierTable.h -%%CLANG%%llvm-cheri/include/clang/Basic/LLVM.h -%%CLANG%%llvm-cheri/include/clang/Basic/Lambda.h -%%CLANG%%llvm-cheri/include/clang/Basic/LangOptions.def -%%CLANG%%llvm-cheri/include/clang/Basic/LangOptions.h -%%CLANG%%llvm-cheri/include/clang/Basic/Linkage.h -%%CLANG%%llvm-cheri/include/clang/Basic/MacroBuilder.h -%%CLANG%%llvm-cheri/include/clang/Basic/Module.h -%%CLANG%%llvm-cheri/include/clang/Basic/ObjCRuntime.h -%%CLANG%%llvm-cheri/include/clang/Basic/OpenCLExtensions.def -%%CLANG%%llvm-cheri/include/clang/Basic/OpenMPKinds.def -%%CLANG%%llvm-cheri/include/clang/Basic/OpenMPKinds.h -%%CLANG%%llvm-cheri/include/clang/Basic/OperatorKinds.def -%%CLANG%%llvm-cheri/include/clang/Basic/OperatorKinds.h -%%CLANG%%llvm-cheri/include/clang/Basic/OperatorPrecedence.h -%%CLANG%%llvm-cheri/include/clang/Basic/PartialDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/Basic/PlistSupport.h -%%CLANG%%llvm-cheri/include/clang/Basic/PrettyStackTrace.h -%%CLANG%%llvm-cheri/include/clang/Basic/SanitizerBlacklist.h -%%CLANG%%llvm-cheri/include/clang/Basic/Sanitizers.def -%%CLANG%%llvm-cheri/include/clang/Basic/Sanitizers.h -%%CLANG%%llvm-cheri/include/clang/Basic/SourceLocation.h -%%CLANG%%llvm-cheri/include/clang/Basic/SourceManager.h -%%CLANG%%llvm-cheri/include/clang/Basic/SourceManagerInternals.h -%%CLANG%%llvm-cheri/include/clang/Basic/Specifiers.h -%%CLANG%%llvm-cheri/include/clang/Basic/TargetBuiltins.h -%%CLANG%%llvm-cheri/include/clang/Basic/TargetCXXABI.h -%%CLANG%%llvm-cheri/include/clang/Basic/TargetInfo.h -%%CLANG%%llvm-cheri/include/clang/Basic/TargetOptions.h -%%CLANG%%llvm-cheri/include/clang/Basic/TemplateKinds.h -%%CLANG%%llvm-cheri/include/clang/Basic/TokenKinds.def -%%CLANG%%llvm-cheri/include/clang/Basic/TokenKinds.h -%%CLANG%%llvm-cheri/include/clang/Basic/TypeTraits.h -%%CLANG%%llvm-cheri/include/clang/Basic/Version.h -%%CLANG%%llvm-cheri/include/clang/Basic/Version.inc -%%CLANG%%llvm-cheri/include/clang/Basic/VersionTuple.h -%%CLANG%%llvm-cheri/include/clang/Basic/VirtualFileSystem.h -%%CLANG%%llvm-cheri/include/clang/Basic/Visibility.h -%%CLANG%%llvm-cheri/include/clang/Basic/arm_neon.inc -%%CLANG%%llvm-cheri/include/clang/CodeGen/BackendUtil.h -%%CLANG%%llvm-cheri/include/clang/CodeGen/CGFunctionInfo.h -%%CLANG%%llvm-cheri/include/clang/CodeGen/CodeGenABITypes.h -%%CLANG%%llvm-cheri/include/clang/CodeGen/CodeGenAction.h -%%CLANG%%llvm-cheri/include/clang/CodeGen/ModuleBuilder.h -%%CLANG%%llvm-cheri/include/clang/CodeGen/ObjectFilePCHContainerOperations.h -%%CLANG%%llvm-cheri/include/clang/Config/config.h -%%CLANG%%llvm-cheri/include/clang/Driver/Action.h -%%CLANG%%llvm-cheri/include/clang/Driver/Compilation.h -%%CLANG%%llvm-cheri/include/clang/Driver/Driver.h -%%CLANG%%llvm-cheri/include/clang/Driver/DriverDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/Driver/Job.h -%%CLANG%%llvm-cheri/include/clang/Driver/Multilib.h -%%CLANG%%llvm-cheri/include/clang/Driver/Options.h -%%CLANG%%llvm-cheri/include/clang/Driver/Options.inc -%%CLANG%%llvm-cheri/include/clang/Driver/Phases.h -%%CLANG%%llvm-cheri/include/clang/Driver/SanitizerArgs.h -%%CLANG%%llvm-cheri/include/clang/Driver/Tool.h -%%CLANG%%llvm-cheri/include/clang/Driver/ToolChain.h -%%CLANG%%llvm-cheri/include/clang/Driver/Types.def -%%CLANG%%llvm-cheri/include/clang/Driver/Types.h -%%CLANG%%llvm-cheri/include/clang/Driver/Util.h -%%CLANG%%llvm-cheri/include/clang/Edit/Commit.h -%%CLANG%%llvm-cheri/include/clang/Edit/EditedSource.h -%%CLANG%%llvm-cheri/include/clang/Edit/EditsReceiver.h -%%CLANG%%llvm-cheri/include/clang/Edit/FileOffset.h -%%CLANG%%llvm-cheri/include/clang/Edit/Rewriters.h -%%CLANG%%llvm-cheri/include/clang/Format/Format.h -%%CLANG%%llvm-cheri/include/clang/Frontend/ASTConsumers.h -%%CLANG%%llvm-cheri/include/clang/Frontend/ASTUnit.h -%%CLANG%%llvm-cheri/include/clang/Frontend/ChainedDiagnosticConsumer.h -%%CLANG%%llvm-cheri/include/clang/Frontend/CodeGenOptions.def -%%CLANG%%llvm-cheri/include/clang/Frontend/CodeGenOptions.h -%%CLANG%%llvm-cheri/include/clang/Frontend/CommandLineSourceLoc.h -%%CLANG%%llvm-cheri/include/clang/Frontend/CompilerInstance.h -%%CLANG%%llvm-cheri/include/clang/Frontend/CompilerInvocation.h -%%CLANG%%llvm-cheri/include/clang/Frontend/DependencyOutputOptions.h -%%CLANG%%llvm-cheri/include/clang/Frontend/DiagnosticRenderer.h -%%CLANG%%llvm-cheri/include/clang/Frontend/FrontendAction.h -%%CLANG%%llvm-cheri/include/clang/Frontend/FrontendActions.h -%%CLANG%%llvm-cheri/include/clang/Frontend/FrontendDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/Frontend/FrontendOptions.h -%%CLANG%%llvm-cheri/include/clang/Frontend/FrontendPluginRegistry.h -%%CLANG%%llvm-cheri/include/clang/Frontend/LangStandard.h -%%CLANG%%llvm-cheri/include/clang/Frontend/LangStandards.def -%%CLANG%%llvm-cheri/include/clang/Frontend/LayoutOverrideSource.h -%%CLANG%%llvm-cheri/include/clang/Frontend/LogDiagnosticPrinter.h -%%CLANG%%llvm-cheri/include/clang/Frontend/MigratorOptions.h -%%CLANG%%llvm-cheri/include/clang/Frontend/MultiplexConsumer.h -%%CLANG%%llvm-cheri/include/clang/Frontend/PCHContainerOperations.h -%%CLANG%%llvm-cheri/include/clang/Frontend/PreprocessorOutputOptions.h -%%CLANG%%llvm-cheri/include/clang/Frontend/SerializedDiagnosticPrinter.h -%%CLANG%%llvm-cheri/include/clang/Frontend/SerializedDiagnosticReader.h -%%CLANG%%llvm-cheri/include/clang/Frontend/SerializedDiagnostics.h -%%CLANG%%llvm-cheri/include/clang/Frontend/TextDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/Frontend/TextDiagnosticBuffer.h -%%CLANG%%llvm-cheri/include/clang/Frontend/TextDiagnosticPrinter.h -%%CLANG%%llvm-cheri/include/clang/Frontend/Utils.h -%%CLANG%%llvm-cheri/include/clang/Frontend/VerifyDiagnosticConsumer.h -%%CLANG%%llvm-cheri/include/clang/FrontendTool/Utils.h -%%CLANG%%llvm-cheri/include/clang/Index/CommentToXML.h -%%CLANG%%llvm-cheri/include/clang/Index/USRGeneration.h -%%CLANG%%llvm-cheri/include/clang/Lex/CodeCompletionHandler.h -%%CLANG%%llvm-cheri/include/clang/Lex/DirectoryLookup.h -%%CLANG%%llvm-cheri/include/clang/Lex/ExternalPreprocessorSource.h -%%CLANG%%llvm-cheri/include/clang/Lex/HeaderMap.h -%%CLANG%%llvm-cheri/include/clang/Lex/HeaderSearch.h -%%CLANG%%llvm-cheri/include/clang/Lex/HeaderSearchOptions.h -%%CLANG%%llvm-cheri/include/clang/Lex/LexDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/Lex/Lexer.h -%%CLANG%%llvm-cheri/include/clang/Lex/LiteralSupport.h -%%CLANG%%llvm-cheri/include/clang/Lex/MacroArgs.h -%%CLANG%%llvm-cheri/include/clang/Lex/MacroInfo.h -%%CLANG%%llvm-cheri/include/clang/Lex/ModuleLoader.h -%%CLANG%%llvm-cheri/include/clang/Lex/ModuleMap.h -%%CLANG%%llvm-cheri/include/clang/Lex/MultipleIncludeOpt.h -%%CLANG%%llvm-cheri/include/clang/Lex/PPCallbacks.h -%%CLANG%%llvm-cheri/include/clang/Lex/PPConditionalDirectiveRecord.h -%%CLANG%%llvm-cheri/include/clang/Lex/PTHLexer.h -%%CLANG%%llvm-cheri/include/clang/Lex/PTHManager.h -%%CLANG%%llvm-cheri/include/clang/Lex/Pragma.h -%%CLANG%%llvm-cheri/include/clang/Lex/PreprocessingRecord.h -%%CLANG%%llvm-cheri/include/clang/Lex/Preprocessor.h -%%CLANG%%llvm-cheri/include/clang/Lex/PreprocessorLexer.h -%%CLANG%%llvm-cheri/include/clang/Lex/PreprocessorOptions.h -%%CLANG%%llvm-cheri/include/clang/Lex/ScratchBuffer.h -%%CLANG%%llvm-cheri/include/clang/Lex/Token.h -%%CLANG%%llvm-cheri/include/clang/Lex/TokenConcatenation.h -%%CLANG%%llvm-cheri/include/clang/Lex/TokenLexer.h -%%CLANG%%llvm-cheri/include/clang/Parse/AttrParserStringSwitches.inc -%%CLANG%%llvm-cheri/include/clang/Parse/ParseAST.h -%%CLANG%%llvm-cheri/include/clang/Parse/ParseDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/Parse/Parser.h -%%CLANG%%llvm-cheri/include/clang/Rewrite/Core/DeltaTree.h -%%CLANG%%llvm-cheri/include/clang/Rewrite/Core/HTMLRewrite.h -%%CLANG%%llvm-cheri/include/clang/Rewrite/Core/RewriteBuffer.h -%%CLANG%%llvm-cheri/include/clang/Rewrite/Core/RewriteRope.h -%%CLANG%%llvm-cheri/include/clang/Rewrite/Core/Rewriter.h -%%CLANG%%llvm-cheri/include/clang/Rewrite/Core/TokenRewriter.h -%%CLANG%%llvm-cheri/include/clang/Rewrite/Frontend/ASTConsumers.h -%%CLANG%%llvm-cheri/include/clang/Rewrite/Frontend/FixItRewriter.h -%%CLANG%%llvm-cheri/include/clang/Rewrite/Frontend/FrontendActions.h -%%CLANG%%llvm-cheri/include/clang/Rewrite/Frontend/Rewriters.h -%%CLANG%%llvm-cheri/include/clang/Sema/AnalysisBasedWarnings.h -%%CLANG%%llvm-cheri/include/clang/Sema/AttrParsedAttrImpl.inc -%%CLANG%%llvm-cheri/include/clang/Sema/AttrParsedAttrKinds.inc -%%CLANG%%llvm-cheri/include/clang/Sema/AttrParsedAttrList.inc -%%CLANG%%llvm-cheri/include/clang/Sema/AttrSpellingListIndex.inc -%%CLANG%%llvm-cheri/include/clang/Sema/AttrTemplateInstantiate.inc -%%CLANG%%llvm-cheri/include/clang/Sema/AttributeList.h -%%CLANG%%llvm-cheri/include/clang/Sema/CXXFieldCollector.h -%%CLANG%%llvm-cheri/include/clang/Sema/CodeCompleteConsumer.h -%%CLANG%%llvm-cheri/include/clang/Sema/CodeCompleteOptions.h -%%CLANG%%llvm-cheri/include/clang/Sema/DeclSpec.h -%%CLANG%%llvm-cheri/include/clang/Sema/DelayedDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/Sema/Designator.h -%%CLANG%%llvm-cheri/include/clang/Sema/ExternalSemaSource.h -%%CLANG%%llvm-cheri/include/clang/Sema/IdentifierResolver.h -%%CLANG%%llvm-cheri/include/clang/Sema/Initialization.h -%%CLANG%%llvm-cheri/include/clang/Sema/LocInfoType.h -%%CLANG%%llvm-cheri/include/clang/Sema/Lookup.h -%%CLANG%%llvm-cheri/include/clang/Sema/LoopHint.h -%%CLANG%%llvm-cheri/include/clang/Sema/MultiplexExternalSemaSource.h -%%CLANG%%llvm-cheri/include/clang/Sema/ObjCMethodList.h -%%CLANG%%llvm-cheri/include/clang/Sema/Overload.h -%%CLANG%%llvm-cheri/include/clang/Sema/Ownership.h -%%CLANG%%llvm-cheri/include/clang/Sema/ParsedTemplate.h -%%CLANG%%llvm-cheri/include/clang/Sema/PrettyDeclStackTrace.h -%%CLANG%%llvm-cheri/include/clang/Sema/Scope.h -%%CLANG%%llvm-cheri/include/clang/Sema/ScopeInfo.h -%%CLANG%%llvm-cheri/include/clang/Sema/Sema.h -%%CLANG%%llvm-cheri/include/clang/Sema/SemaConsumer.h -%%CLANG%%llvm-cheri/include/clang/Sema/SemaDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/Sema/SemaFixItUtils.h -%%CLANG%%llvm-cheri/include/clang/Sema/SemaInternal.h -%%CLANG%%llvm-cheri/include/clang/Sema/SemaLambda.h -%%CLANG%%llvm-cheri/include/clang/Sema/Template.h -%%CLANG%%llvm-cheri/include/clang/Sema/TemplateDeduction.h -%%CLANG%%llvm-cheri/include/clang/Sema/TypoCorrection.h -%%CLANG%%llvm-cheri/include/clang/Sema/Weak.h -%%CLANG%%llvm-cheri/include/clang/Serialization/ASTBitCodes.h -%%CLANG%%llvm-cheri/include/clang/Serialization/ASTDeserializationListener.h -%%CLANG%%llvm-cheri/include/clang/Serialization/ASTReader.h -%%CLANG%%llvm-cheri/include/clang/Serialization/ASTWriter.h -%%CLANG%%llvm-cheri/include/clang/Serialization/AttrPCHRead.inc -%%CLANG%%llvm-cheri/include/clang/Serialization/AttrPCHWrite.inc -%%CLANG%%llvm-cheri/include/clang/Serialization/ContinuousRangeMap.h -%%CLANG%%llvm-cheri/include/clang/Serialization/GlobalModuleIndex.h -%%CLANG%%llvm-cheri/include/clang/Serialization/Module.h -%%CLANG%%llvm-cheri/include/clang/Serialization/ModuleManager.h -%%CLANG%%llvm-cheri/include/clang/Serialization/SerializationDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Checkers/ClangCheckers.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Checkers/ObjCRetainCount.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/Analyses.def -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/BugReporter/BugType.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/Checker.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/CheckerManager.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/CheckerOptInfo.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/CheckerRegistry.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/IssueHash.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/APSIntType.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeMap.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/FunctionSummary.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState_Fwd.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/SVals.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/Store.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/StoreRef.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/SummaryManager.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/SymbolManager.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/TaintManager.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/TaintTag.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Core/PathSensitive/WorkList.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Frontend/AnalysisConsumer.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Frontend/FrontendActions.h -%%CLANG%%llvm-cheri/include/clang/StaticAnalyzer/Frontend/ModelConsumer.h -%%CLANG%%llvm-cheri/include/clang/Tooling/ArgumentsAdjusters.h -%%CLANG%%llvm-cheri/include/clang/Tooling/CommonOptionsParser.h -%%CLANG%%llvm-cheri/include/clang/Tooling/CompilationDatabase.h -%%CLANG%%llvm-cheri/include/clang/Tooling/CompilationDatabasePluginRegistry.h -%%CLANG%%llvm-cheri/include/clang/Tooling/Core/Lookup.h -%%CLANG%%llvm-cheri/include/clang/Tooling/Core/Replacement.h -%%CLANG%%llvm-cheri/include/clang/Tooling/FileMatchTrie.h -%%CLANG%%llvm-cheri/include/clang/Tooling/JSONCompilationDatabase.h -%%CLANG%%llvm-cheri/include/clang/Tooling/Refactoring.h -%%CLANG%%llvm-cheri/include/clang/Tooling/RefactoringCallbacks.h -%%CLANG%%llvm-cheri/include/clang/Tooling/ReplacementsYaml.h -%%CLANG%%llvm-cheri/include/clang/Tooling/Tooling.h -llvm-cheri/include/llvm-c/Analysis.h -llvm-cheri/include/llvm-c/BitReader.h -llvm-cheri/include/llvm-c/BitWriter.h -llvm-cheri/include/llvm-c/Core.h -llvm-cheri/include/llvm-c/Disassembler.h -llvm-cheri/include/llvm-c/ExecutionEngine.h -llvm-cheri/include/llvm-c/IRReader.h -llvm-cheri/include/llvm-c/Initialization.h -llvm-cheri/include/llvm-c/LinkTimeOptimizer.h -llvm-cheri/include/llvm-c/Linker.h -llvm-cheri/include/llvm-c/Object.h -llvm-cheri/include/llvm-c/Support.h -llvm-cheri/include/llvm-c/Target.h -llvm-cheri/include/llvm-c/TargetMachine.h -llvm-cheri/include/llvm-c/Transforms/IPO.h -llvm-cheri/include/llvm-c/Transforms/PassManagerBuilder.h -llvm-cheri/include/llvm-c/Transforms/Scalar.h -llvm-cheri/include/llvm-c/Transforms/Vectorize.h -llvm-cheri/include/llvm-c/lto.h -llvm-cheri/include/llvm/ADT/APFloat.h -llvm-cheri/include/llvm/ADT/APInt.h -llvm-cheri/include/llvm/ADT/APSInt.h -llvm-cheri/include/llvm/ADT/ArrayRef.h -llvm-cheri/include/llvm/ADT/BitVector.h -llvm-cheri/include/llvm/ADT/DAGDeltaAlgorithm.h -llvm-cheri/include/llvm/ADT/DeltaAlgorithm.h -llvm-cheri/include/llvm/ADT/DenseMap.h -llvm-cheri/include/llvm/ADT/DenseMapInfo.h -llvm-cheri/include/llvm/ADT/DenseSet.h -llvm-cheri/include/llvm/ADT/DepthFirstIterator.h -llvm-cheri/include/llvm/ADT/EpochTracker.h -llvm-cheri/include/llvm/ADT/EquivalenceClasses.h -llvm-cheri/include/llvm/ADT/FoldingSet.h -llvm-cheri/include/llvm/ADT/GraphTraits.h -llvm-cheri/include/llvm/ADT/Hashing.h -llvm-cheri/include/llvm/ADT/ImmutableList.h -llvm-cheri/include/llvm/ADT/ImmutableMap.h -llvm-cheri/include/llvm/ADT/ImmutableSet.h -llvm-cheri/include/llvm/ADT/IndexedMap.h -llvm-cheri/include/llvm/ADT/IntEqClasses.h -llvm-cheri/include/llvm/ADT/IntervalMap.h -llvm-cheri/include/llvm/ADT/IntrusiveRefCntPtr.h -llvm-cheri/include/llvm/ADT/MapVector.h -llvm-cheri/include/llvm/ADT/None.h -llvm-cheri/include/llvm/ADT/Optional.h -llvm-cheri/include/llvm/ADT/PackedVector.h -llvm-cheri/include/llvm/ADT/PointerIntPair.h -llvm-cheri/include/llvm/ADT/PointerUnion.h -llvm-cheri/include/llvm/ADT/PostOrderIterator.h -llvm-cheri/include/llvm/ADT/PriorityQueue.h -llvm-cheri/include/llvm/ADT/SCCIterator.h -llvm-cheri/include/llvm/ADT/STLExtras.h -llvm-cheri/include/llvm/ADT/ScopedHashTable.h -llvm-cheri/include/llvm/ADT/SetOperations.h -llvm-cheri/include/llvm/ADT/SetVector.h -llvm-cheri/include/llvm/ADT/SmallBitVector.h -llvm-cheri/include/llvm/ADT/SmallPtrSet.h -llvm-cheri/include/llvm/ADT/SmallSet.h -llvm-cheri/include/llvm/ADT/SmallString.h -llvm-cheri/include/llvm/ADT/SmallVector.h -llvm-cheri/include/llvm/ADT/SparseBitVector.h -llvm-cheri/include/llvm/ADT/SparseMultiSet.h -llvm-cheri/include/llvm/ADT/SparseSet.h -llvm-cheri/include/llvm/ADT/Statistic.h -llvm-cheri/include/llvm/ADT/StringExtras.h -llvm-cheri/include/llvm/ADT/StringMap.h -llvm-cheri/include/llvm/ADT/StringRef.h -llvm-cheri/include/llvm/ADT/StringSet.h -llvm-cheri/include/llvm/ADT/StringSwitch.h -llvm-cheri/include/llvm/ADT/TinyPtrVector.h -llvm-cheri/include/llvm/ADT/Triple.h -llvm-cheri/include/llvm/ADT/Twine.h -llvm-cheri/include/llvm/ADT/UniqueVector.h -llvm-cheri/include/llvm/ADT/VariadicFunction.h -llvm-cheri/include/llvm/ADT/edit_distance.h -llvm-cheri/include/llvm/ADT/ilist.h -llvm-cheri/include/llvm/ADT/ilist_node.h -llvm-cheri/include/llvm/ADT/iterator.h -llvm-cheri/include/llvm/ADT/iterator_range.h -llvm-cheri/include/llvm/Analysis/AliasAnalysis.h -llvm-cheri/include/llvm/Analysis/AliasSetTracker.h -llvm-cheri/include/llvm/Analysis/AssumptionCache.h -llvm-cheri/include/llvm/Analysis/BasicAliasAnalysis.h -llvm-cheri/include/llvm/Analysis/BlockFrequencyInfo.h -llvm-cheri/include/llvm/Analysis/BlockFrequencyInfoImpl.h -llvm-cheri/include/llvm/Analysis/BranchProbabilityInfo.h -llvm-cheri/include/llvm/Analysis/CFG.h -llvm-cheri/include/llvm/Analysis/CFGPrinter.h -llvm-cheri/include/llvm/Analysis/CFLAliasAnalysis.h -llvm-cheri/include/llvm/Analysis/CGSCCPassManager.h -llvm-cheri/include/llvm/Analysis/CallGraph.h -llvm-cheri/include/llvm/Analysis/CallGraphSCCPass.h -llvm-cheri/include/llvm/Analysis/CallPrinter.h -llvm-cheri/include/llvm/Analysis/CaptureTracking.h -llvm-cheri/include/llvm/Analysis/CodeMetrics.h -llvm-cheri/include/llvm/Analysis/ConstantFolding.h -llvm-cheri/include/llvm/Analysis/DOTGraphTraitsPass.h -llvm-cheri/include/llvm/Analysis/DemandedBits.h -llvm-cheri/include/llvm/Analysis/DependenceAnalysis.h -llvm-cheri/include/llvm/Analysis/DivergenceAnalysis.h -llvm-cheri/include/llvm/Analysis/DomPrinter.h -llvm-cheri/include/llvm/Analysis/DominanceFrontier.h -llvm-cheri/include/llvm/Analysis/DominanceFrontierImpl.h -llvm-cheri/include/llvm/Analysis/GlobalsModRef.h -llvm-cheri/include/llvm/Analysis/IVUsers.h -llvm-cheri/include/llvm/Analysis/InlineCost.h -llvm-cheri/include/llvm/Analysis/InstructionSimplify.h -llvm-cheri/include/llvm/Analysis/Interval.h -llvm-cheri/include/llvm/Analysis/IntervalIterator.h -llvm-cheri/include/llvm/Analysis/IntervalPartition.h -llvm-cheri/include/llvm/Analysis/IteratedDominanceFrontier.h -llvm-cheri/include/llvm/Analysis/LazyCallGraph.h -llvm-cheri/include/llvm/Analysis/LazyValueInfo.h -llvm-cheri/include/llvm/Analysis/LibCallSemantics.h -llvm-cheri/include/llvm/Analysis/Lint.h -llvm-cheri/include/llvm/Analysis/Loads.h -llvm-cheri/include/llvm/Analysis/LoopAccessAnalysis.h -llvm-cheri/include/llvm/Analysis/LoopInfo.h -llvm-cheri/include/llvm/Analysis/LoopInfoImpl.h -llvm-cheri/include/llvm/Analysis/LoopIterator.h -llvm-cheri/include/llvm/Analysis/LoopPass.h -llvm-cheri/include/llvm/Analysis/MemoryBuiltins.h -llvm-cheri/include/llvm/Analysis/MemoryDependenceAnalysis.h -llvm-cheri/include/llvm/Analysis/MemoryLocation.h -llvm-cheri/include/llvm/Analysis/ObjCARCAliasAnalysis.h -llvm-cheri/include/llvm/Analysis/ObjCARCAnalysisUtils.h -llvm-cheri/include/llvm/Analysis/ObjCARCInstKind.h -llvm-cheri/include/llvm/Analysis/OrderedBasicBlock.h -llvm-cheri/include/llvm/Analysis/PHITransAddr.h -llvm-cheri/include/llvm/Analysis/Passes.h -llvm-cheri/include/llvm/Analysis/PostDominators.h -llvm-cheri/include/llvm/Analysis/PtrUseVisitor.h -llvm-cheri/include/llvm/Analysis/RegionInfo.h -llvm-cheri/include/llvm/Analysis/RegionInfoImpl.h -llvm-cheri/include/llvm/Analysis/RegionIterator.h -llvm-cheri/include/llvm/Analysis/RegionPass.h -llvm-cheri/include/llvm/Analysis/RegionPrinter.h -llvm-cheri/include/llvm/Analysis/ScalarEvolution.h -llvm-cheri/include/llvm/Analysis/ScalarEvolutionAliasAnalysis.h -llvm-cheri/include/llvm/Analysis/ScalarEvolutionExpander.h -llvm-cheri/include/llvm/Analysis/ScalarEvolutionExpressions.h -llvm-cheri/include/llvm/Analysis/ScalarEvolutionNormalization.h -llvm-cheri/include/llvm/Analysis/ScopedNoAliasAA.h -llvm-cheri/include/llvm/Analysis/SparsePropagation.h -llvm-cheri/include/llvm/Analysis/TargetFolder.h -llvm-cheri/include/llvm/Analysis/TargetLibraryInfo.def -llvm-cheri/include/llvm/Analysis/TargetLibraryInfo.h -llvm-cheri/include/llvm/Analysis/TargetTransformInfo.h -llvm-cheri/include/llvm/Analysis/TargetTransformInfoImpl.h -llvm-cheri/include/llvm/Analysis/Trace.h -llvm-cheri/include/llvm/Analysis/TypeBasedAliasAnalysis.h -llvm-cheri/include/llvm/Analysis/ValueTracking.h -llvm-cheri/include/llvm/Analysis/VectorUtils.h -llvm-cheri/include/llvm/AsmParser/Parser.h -llvm-cheri/include/llvm/AsmParser/SlotMapping.h -llvm-cheri/include/llvm/Bitcode/BitCodes.h -llvm-cheri/include/llvm/Bitcode/BitcodeWriterPass.h -llvm-cheri/include/llvm/Bitcode/BitstreamReader.h -llvm-cheri/include/llvm/Bitcode/BitstreamWriter.h -llvm-cheri/include/llvm/Bitcode/LLVMBitCodes.h -llvm-cheri/include/llvm/Bitcode/ReaderWriter.h -llvm-cheri/include/llvm/CodeGen/Analysis.h -llvm-cheri/include/llvm/CodeGen/AsmPrinter.h -llvm-cheri/include/llvm/CodeGen/AtomicExpandUtils.h -llvm-cheri/include/llvm/CodeGen/BasicTTIImpl.h -llvm-cheri/include/llvm/CodeGen/CalcSpillWeights.h -llvm-cheri/include/llvm/CodeGen/CallingConvLower.h -llvm-cheri/include/llvm/CodeGen/CommandFlags.h -llvm-cheri/include/llvm/CodeGen/DAGCombine.h -llvm-cheri/include/llvm/CodeGen/DFAPacketizer.h -llvm-cheri/include/llvm/CodeGen/DIE.h -llvm-cheri/include/llvm/CodeGen/DIEValue.def -llvm-cheri/include/llvm/CodeGen/DwarfStringPoolEntry.h -llvm-cheri/include/llvm/CodeGen/EdgeBundles.h -llvm-cheri/include/llvm/CodeGen/FastISel.h -llvm-cheri/include/llvm/CodeGen/FaultMaps.h -llvm-cheri/include/llvm/CodeGen/FunctionLoweringInfo.h -llvm-cheri/include/llvm/CodeGen/GCMetadata.h -llvm-cheri/include/llvm/CodeGen/GCMetadataPrinter.h -llvm-cheri/include/llvm/CodeGen/GCStrategy.h -llvm-cheri/include/llvm/CodeGen/GCs.h -llvm-cheri/include/llvm/CodeGen/ISDOpcodes.h -llvm-cheri/include/llvm/CodeGen/IntrinsicLowering.h -llvm-cheri/include/llvm/CodeGen/LatencyPriorityQueue.h -llvm-cheri/include/llvm/CodeGen/LexicalScopes.h -llvm-cheri/include/llvm/CodeGen/LinkAllAsmWriterComponents.h -llvm-cheri/include/llvm/CodeGen/LinkAllCodegenComponents.h -llvm-cheri/include/llvm/CodeGen/LiveInterval.h -llvm-cheri/include/llvm/CodeGen/LiveIntervalAnalysis.h -llvm-cheri/include/llvm/CodeGen/LiveIntervalUnion.h -llvm-cheri/include/llvm/CodeGen/LivePhysRegs.h -llvm-cheri/include/llvm/CodeGen/LiveRangeEdit.h -llvm-cheri/include/llvm/CodeGen/LiveRegMatrix.h -llvm-cheri/include/llvm/CodeGen/LiveStackAnalysis.h -llvm-cheri/include/llvm/CodeGen/LiveVariables.h -llvm-cheri/include/llvm/CodeGen/MIRParser/MIRParser.h -llvm-cheri/include/llvm/CodeGen/MIRYamlMapping.h -llvm-cheri/include/llvm/CodeGen/MachORelocation.h -llvm-cheri/include/llvm/CodeGen/MachineBasicBlock.h -llvm-cheri/include/llvm/CodeGen/MachineBlockFrequencyInfo.h -llvm-cheri/include/llvm/CodeGen/MachineBranchProbabilityInfo.h -llvm-cheri/include/llvm/CodeGen/MachineCombinerPattern.h -llvm-cheri/include/llvm/CodeGen/MachineConstantPool.h -llvm-cheri/include/llvm/CodeGen/MachineDominanceFrontier.h -llvm-cheri/include/llvm/CodeGen/MachineDominators.h -llvm-cheri/include/llvm/CodeGen/MachineFrameInfo.h -llvm-cheri/include/llvm/CodeGen/MachineFunction.h -llvm-cheri/include/llvm/CodeGen/MachineFunctionAnalysis.h -llvm-cheri/include/llvm/CodeGen/MachineFunctionInitializer.h -llvm-cheri/include/llvm/CodeGen/MachineFunctionPass.h -llvm-cheri/include/llvm/CodeGen/MachineInstr.h -llvm-cheri/include/llvm/CodeGen/MachineInstrBuilder.h -llvm-cheri/include/llvm/CodeGen/MachineInstrBundle.h -llvm-cheri/include/llvm/CodeGen/MachineJumpTableInfo.h -llvm-cheri/include/llvm/CodeGen/MachineLoopInfo.h -llvm-cheri/include/llvm/CodeGen/MachineMemOperand.h -llvm-cheri/include/llvm/CodeGen/MachineModuleInfo.h -llvm-cheri/include/llvm/CodeGen/MachineModuleInfoImpls.h -llvm-cheri/include/llvm/CodeGen/MachineOperand.h -llvm-cheri/include/llvm/CodeGen/MachinePassRegistry.h -llvm-cheri/include/llvm/CodeGen/MachinePostDominators.h -llvm-cheri/include/llvm/CodeGen/MachineRegionInfo.h -llvm-cheri/include/llvm/CodeGen/MachineRegisterInfo.h -llvm-cheri/include/llvm/CodeGen/MachineSSAUpdater.h -llvm-cheri/include/llvm/CodeGen/MachineScheduler.h -llvm-cheri/include/llvm/CodeGen/MachineTraceMetrics.h -llvm-cheri/include/llvm/CodeGen/MachineValueType.h -llvm-cheri/include/llvm/CodeGen/PBQP/CostAllocator.h -llvm-cheri/include/llvm/CodeGen/PBQP/Graph.h -llvm-cheri/include/llvm/CodeGen/PBQP/Math.h -llvm-cheri/include/llvm/CodeGen/PBQP/ReductionRules.h -llvm-cheri/include/llvm/CodeGen/PBQP/Solution.h -llvm-cheri/include/llvm/CodeGen/PBQPRAConstraint.h -llvm-cheri/include/llvm/CodeGen/ParallelCG.h -llvm-cheri/include/llvm/CodeGen/Passes.h -llvm-cheri/include/llvm/CodeGen/PseudoSourceValue.h -llvm-cheri/include/llvm/CodeGen/RegAllocPBQP.h -llvm-cheri/include/llvm/CodeGen/RegAllocRegistry.h -llvm-cheri/include/llvm/CodeGen/RegisterClassInfo.h -llvm-cheri/include/llvm/CodeGen/RegisterPressure.h -llvm-cheri/include/llvm/CodeGen/RegisterScavenging.h -llvm-cheri/include/llvm/CodeGen/ResourcePriorityQueue.h -llvm-cheri/include/llvm/CodeGen/RuntimeLibcalls.h -llvm-cheri/include/llvm/CodeGen/ScheduleDAG.h -llvm-cheri/include/llvm/CodeGen/ScheduleDAGInstrs.h -llvm-cheri/include/llvm/CodeGen/ScheduleDFS.h -llvm-cheri/include/llvm/CodeGen/ScheduleHazardRecognizer.h -llvm-cheri/include/llvm/CodeGen/SchedulerRegistry.h -llvm-cheri/include/llvm/CodeGen/ScoreboardHazardRecognizer.h -llvm-cheri/include/llvm/CodeGen/SelectionDAG.h -llvm-cheri/include/llvm/CodeGen/SelectionDAGISel.h -llvm-cheri/include/llvm/CodeGen/SelectionDAGNodes.h -llvm-cheri/include/llvm/CodeGen/SlotIndexes.h -llvm-cheri/include/llvm/CodeGen/StackMaps.h -llvm-cheri/include/llvm/CodeGen/StackProtector.h -llvm-cheri/include/llvm/CodeGen/TargetLoweringObjectFileImpl.h -llvm-cheri/include/llvm/CodeGen/TargetSchedule.h -llvm-cheri/include/llvm/CodeGen/ValueTypes.h -llvm-cheri/include/llvm/CodeGen/ValueTypes.td -llvm-cheri/include/llvm/CodeGen/VirtRegMap.h -llvm-cheri/include/llvm/CodeGen/WinEHFuncInfo.h -llvm-cheri/include/llvm/Config/AsmParsers.def -llvm-cheri/include/llvm/Config/AsmPrinters.def -llvm-cheri/include/llvm/Config/Disassemblers.def -llvm-cheri/include/llvm/Config/Targets.def -llvm-cheri/include/llvm/Config/llvm-config.h -llvm-cheri/include/llvm/DebugInfo/DIContext.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFAbbreviationDeclaration.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFCompileUnit.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFContext.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFDebugAbbrev.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFDebugArangeSet.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFDebugAranges.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFDebugFrame.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFDebugInfoEntry.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFDebugLine.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFDebugLoc.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFDebugRangeList.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFFormValue.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFRelocMap.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFSection.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFTypeUnit.h -llvm-cheri/include/llvm/DebugInfo/DWARF/DWARFUnit.h -llvm-cheri/include/llvm/DebugInfo/PDB/ConcreteSymbolEnumerator.h -llvm-cheri/include/llvm/DebugInfo/PDB/DIA/DIADataStream.h -llvm-cheri/include/llvm/DebugInfo/PDB/DIA/DIAEnumDebugStreams.h -llvm-cheri/include/llvm/DebugInfo/PDB/DIA/DIAEnumLineNumbers.h -llvm-cheri/include/llvm/DebugInfo/PDB/DIA/DIAEnumSourceFiles.h -llvm-cheri/include/llvm/DebugInfo/PDB/DIA/DIAEnumSymbols.h -llvm-cheri/include/llvm/DebugInfo/PDB/DIA/DIALineNumber.h -llvm-cheri/include/llvm/DebugInfo/PDB/DIA/DIARawSymbol.h -llvm-cheri/include/llvm/DebugInfo/PDB/DIA/DIASession.h -llvm-cheri/include/llvm/DebugInfo/PDB/DIA/DIASourceFile.h -llvm-cheri/include/llvm/DebugInfo/PDB/DIA/DIASupport.h -llvm-cheri/include/llvm/DebugInfo/PDB/IPDBDataStream.h -llvm-cheri/include/llvm/DebugInfo/PDB/IPDBEnumChildren.h -llvm-cheri/include/llvm/DebugInfo/PDB/IPDBLineNumber.h -llvm-cheri/include/llvm/DebugInfo/PDB/IPDBRawSymbol.h -llvm-cheri/include/llvm/DebugInfo/PDB/IPDBSession.h -llvm-cheri/include/llvm/DebugInfo/PDB/IPDBSourceFile.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDB.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBContext.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBExtras.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymDumper.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbol.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolAnnotation.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolBlock.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolCompiland.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolCompilandDetails.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolCompilandEnv.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolCustom.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolData.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolExe.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolFunc.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugEnd.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolFuncDebugStart.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolLabel.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolPublicSymbol.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolThunk.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeArray.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeBaseClass.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeBuiltin.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeCustom.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeDimension.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeFriend.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionArg.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeManaged.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypePointer.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTable.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolTypeVTableShape.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolUnknown.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBSymbolUsingNamespace.h -llvm-cheri/include/llvm/DebugInfo/PDB/PDBTypes.h -llvm-cheri/include/llvm/ExecutionEngine/ExecutionEngine.h -llvm-cheri/include/llvm/ExecutionEngine/GenericValue.h -llvm-cheri/include/llvm/ExecutionEngine/Interpreter.h -llvm-cheri/include/llvm/ExecutionEngine/JITEventListener.h -llvm-cheri/include/llvm/ExecutionEngine/JITSymbolFlags.h -llvm-cheri/include/llvm/ExecutionEngine/MCJIT.h -llvm-cheri/include/llvm/ExecutionEngine/OProfileWrapper.h -llvm-cheri/include/llvm/ExecutionEngine/ObjectCache.h -llvm-cheri/include/llvm/ExecutionEngine/ObjectMemoryBuffer.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/CompileUtils.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/ExecutionUtils.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/GlobalMappingLayer.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/IRCompileLayer.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/IRTransformLayer.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/IndirectionUtils.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/JITSymbol.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/LambdaResolver.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/LazyEmittingLayer.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/LogicalDylib.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/NullResolver.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/ObjectLinkingLayer.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/ObjectTransformLayer.h -llvm-cheri/include/llvm/ExecutionEngine/Orc/OrcTargetSupport.h -llvm-cheri/include/llvm/ExecutionEngine/OrcMCJITReplacement.h -llvm-cheri/include/llvm/ExecutionEngine/RTDyldMemoryManager.h -llvm-cheri/include/llvm/ExecutionEngine/RuntimeDyld.h -llvm-cheri/include/llvm/ExecutionEngine/RuntimeDyldChecker.h -llvm-cheri/include/llvm/ExecutionEngine/SectionMemoryManager.h -llvm-cheri/include/llvm/IR/Argument.h -llvm-cheri/include/llvm/IR/AssemblyAnnotationWriter.h -llvm-cheri/include/llvm/IR/Attributes.h -llvm-cheri/include/llvm/IR/AutoUpgrade.h -llvm-cheri/include/llvm/IR/BasicBlock.h -llvm-cheri/include/llvm/IR/CFG.h -llvm-cheri/include/llvm/IR/CallSite.h -llvm-cheri/include/llvm/IR/CallingConv.h -llvm-cheri/include/llvm/IR/Comdat.h -llvm-cheri/include/llvm/IR/Constant.h -llvm-cheri/include/llvm/IR/ConstantFolder.h -llvm-cheri/include/llvm/IR/ConstantRange.h -llvm-cheri/include/llvm/IR/Constants.h -llvm-cheri/include/llvm/IR/DIBuilder.h -llvm-cheri/include/llvm/IR/DataLayout.h -llvm-cheri/include/llvm/IR/DebugInfo.h -llvm-cheri/include/llvm/IR/DebugInfoFlags.def -llvm-cheri/include/llvm/IR/DebugInfoMetadata.h -llvm-cheri/include/llvm/IR/DebugLoc.h -llvm-cheri/include/llvm/IR/DerivedTypes.h -llvm-cheri/include/llvm/IR/DiagnosticInfo.h -llvm-cheri/include/llvm/IR/DiagnosticPrinter.h -llvm-cheri/include/llvm/IR/Dominators.h -llvm-cheri/include/llvm/IR/Function.h -llvm-cheri/include/llvm/IR/FunctionInfo.h -llvm-cheri/include/llvm/IR/GVMaterializer.h -llvm-cheri/include/llvm/IR/GetElementPtrTypeIterator.h -llvm-cheri/include/llvm/IR/GlobalAlias.h -llvm-cheri/include/llvm/IR/GlobalObject.h -llvm-cheri/include/llvm/IR/GlobalValue.h -llvm-cheri/include/llvm/IR/GlobalVariable.h -llvm-cheri/include/llvm/IR/IRBuilder.h -llvm-cheri/include/llvm/IR/IRPrintingPasses.h -llvm-cheri/include/llvm/IR/InlineAsm.h -llvm-cheri/include/llvm/IR/InstIterator.h -llvm-cheri/include/llvm/IR/InstVisitor.h -llvm-cheri/include/llvm/IR/InstrTypes.h -llvm-cheri/include/llvm/IR/Instruction.def -llvm-cheri/include/llvm/IR/Instruction.h -llvm-cheri/include/llvm/IR/Instructions.h -llvm-cheri/include/llvm/IR/IntrinsicInst.h -llvm-cheri/include/llvm/IR/Intrinsics.gen -llvm-cheri/include/llvm/IR/Intrinsics.h -llvm-cheri/include/llvm/IR/Intrinsics.td -llvm-cheri/include/llvm/IR/IntrinsicsAArch64.td -llvm-cheri/include/llvm/IR/IntrinsicsAMDGPU.td -llvm-cheri/include/llvm/IR/IntrinsicsARM.td -llvm-cheri/include/llvm/IR/IntrinsicsBPF.td *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-all@freebsd.org Sun Apr 24 07:39:35 2016 Return-Path: Delivered-To: svn-ports-all@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 F23D3B19D0F; Sun, 24 Apr 2016 07:39:35 +0000 (UTC) (envelope-from pi@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 A53C4145E; Sun, 24 Apr 2016 07:39:35 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O7dYD1011341; Sun, 24 Apr 2016 07:39:34 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O7dYLa011338; Sun, 24 Apr 2016 07:39:34 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201604240739.u3O7dYLa011338@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 24 Apr 2016 07:39:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413923 - in head/devel/libqb: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 07:39:36 -0000 Author: pi Date: Sun Apr 24 07:39:34 2016 New Revision: 413923 URL: https://svnweb.freebsd.org/changeset/ports/413923 Log: devel/libqb: 0.17.2 -> 1.0 Changes: https://github.com/ClusterLabs/libqb/releases PR: 209004 Submitted by: David Shane Holden (maintainer) Deleted: head/devel/libqb/files/ Modified: head/devel/libqb/Makefile head/devel/libqb/distinfo head/devel/libqb/pkg-plist Modified: head/devel/libqb/Makefile ============================================================================== --- head/devel/libqb/Makefile Sun Apr 24 07:14:53 2016 (r413922) +++ head/devel/libqb/Makefile Sun Apr 24 07:39:34 2016 (r413923) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libqb -PORTVERSION= 0.17.2 -PORTREVISION= 1 +PORTVERSION= 1.0 CATEGORIES= devel MASTER_SITES= https://github.com/ClusterLabs/libqb/releases/download/v${PORTVERSION}/ Modified: head/devel/libqb/distinfo ============================================================================== --- head/devel/libqb/distinfo Sun Apr 24 07:14:53 2016 (r413922) +++ head/devel/libqb/distinfo Sun Apr 24 07:39:34 2016 (r413923) @@ -1,2 +1,2 @@ -SHA256 (libqb-0.17.2.tar.xz) = 9a419c649ed51f275dc780da8a15babb8a5d33633567bd9e0cb6193b6e21f4fe -SIZE (libqb-0.17.2.tar.xz) = 373540 +SHA256 (libqb-1.0.tar.xz) = 7ee62e3d0542a39ede943927e1f4c3c9e3b922a175c3b246144ea48166afa01a +SIZE (libqb-1.0.tar.xz) = 424436 Modified: head/devel/libqb/pkg-plist ============================================================================== --- head/devel/libqb/pkg-plist Sun Apr 24 07:14:53 2016 (r413922) +++ head/devel/libqb/pkg-plist Sun Apr 24 07:39:34 2016 (r413923) @@ -15,10 +15,11 @@ include/qb/qbutil.h lib/libqb.a lib/libqb.so lib/libqb.so.0 -lib/libqb.so.0.17.2 +lib/libqb.so.0.18.0 libdata/pkgconfig/libqb.pc %%DOXYGEN%%man/man3/qbarray.h.3.gz %%DOXYGEN%%man/man3/qbatomic.h.3.gz +%%DOXYGEN%%man/man3/qbdefs.h.3.gz %%DOXYGEN%%man/man3/qbhdb.h.3.gz %%DOXYGEN%%man/man3/qbipc_common.h.3.gz %%DOXYGEN%%man/man3/qbipcc.h.3.gz @@ -27,6 +28,7 @@ libdata/pkgconfig/libqb.pc %%DOXYGEN%%man/man3/qblog.h.3.gz %%DOXYGEN%%man/man3/qbloop.h.3.gz %%DOXYGEN%%man/man3/qbmap.h.3.gz +%%DOXYGEN%%man/man3/qbrb.h.3.gz %%DOXYGEN%%man/man3/qbutil.h.3.gz %%DOXYGEN%%man/man8/qb-blackbox.8.gz sbin/qb-blackbox From owner-svn-ports-all@freebsd.org Sun Apr 24 07:44:11 2016 Return-Path: Delivered-To: svn-ports-all@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 69A9DB19FF6; Sun, 24 Apr 2016 07:44:11 +0000 (UTC) (envelope-from pi@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 26D6D19B3; Sun, 24 Apr 2016 07:44:11 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O7iAnm014432; Sun, 24 Apr 2016 07:44:10 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O7iASP014428; Sun, 24 Apr 2016 07:44:10 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201604240744.u3O7iASP014428@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 24 Apr 2016 07:44:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413924 - in head/ftp: filezilla libfilezilla X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 07:44:11 -0000 Author: pi Date: Sun Apr 24 07:44:09 2016 New Revision: 413924 URL: https://svnweb.freebsd.org/changeset/ports/413924 Log: ftp/libfilezilla: 0.4.0.1 -> 0.5.0 ftp/filezilla: 3.16.0 -> 3.17.0 Changes: https://filezilla-project.org/changelog.php PR: 208999, 209000 Submitted by: (maintainer) Modified: head/ftp/filezilla/Makefile head/ftp/filezilla/distinfo head/ftp/libfilezilla/Makefile head/ftp/libfilezilla/distinfo Modified: head/ftp/filezilla/Makefile ============================================================================== --- head/ftp/filezilla/Makefile Sun Apr 24 07:39:34 2016 (r413923) +++ head/ftp/filezilla/Makefile Sun Apr 24 07:44:09 2016 (r413924) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= filezilla -PORTVERSION= 3.16.0 -PORTREVISION= 1 +PORTVERSION= 3.17.0 CATEGORIES= ftp MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION} DISTNAME= FileZilla_${PORTVERSION}_src @@ -19,6 +18,7 @@ LIB_DEPENDS= libfilezilla.so:ftp/libfile libgcrypt.so:security/libgcrypt \ libgnutls.so:security/gnutls \ libidn.so:dns/libidn \ + libnettle.so:security/nettle \ libpugixml.so:textproc/pugixml BROKEN_FreeBSD_9= requires C++14 complier, 9.x lacks C++11 standard library Modified: head/ftp/filezilla/distinfo ============================================================================== --- head/ftp/filezilla/distinfo Sun Apr 24 07:39:34 2016 (r413923) +++ head/ftp/filezilla/distinfo Sun Apr 24 07:44:09 2016 (r413924) @@ -1,2 +1,2 @@ -SHA256 (FileZilla_3.16.0_src.tar.bz2) = 7dbd55a706ac1552ed4a0b86eeb59fcfc58cf6041b581c4dcf9a6cf560279b46 -SIZE (FileZilla_3.16.0_src.tar.bz2) = 4406422 +SHA256 (FileZilla_3.17.0_src.tar.bz2) = 3763cd5cf833b43d9d3da763bfea6561cabf6a63e9fc698f02d101b82ffe656d +SIZE (FileZilla_3.17.0_src.tar.bz2) = 4399584 Modified: head/ftp/libfilezilla/Makefile ============================================================================== --- head/ftp/libfilezilla/Makefile Sun Apr 24 07:39:34 2016 (r413923) +++ head/ftp/libfilezilla/Makefile Sun Apr 24 07:44:09 2016 (r413924) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libfilezilla -PORTVERSION= 0.4.0.1 -PORTREVISION= 1 +PORTVERSION= 0.5.0 CATEGORIES= ftp MASTER_SITES= SF/filezilla/${PORTNAME}/${PORTVERSION} @@ -16,7 +15,7 @@ BROKEN_powerpc64= Does not build BROKEN_FreeBSD_9= requires C++14 complier, 9.x lacks C++11 standard library -USES= compiler:c++14-lang gmake iconv:wchar_t libtool localbase pathfix pkgconfig tar:bzip2 +USES= compiler:c++14-lang gmake iconv libtool localbase pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip Modified: head/ftp/libfilezilla/distinfo ============================================================================== --- head/ftp/libfilezilla/distinfo Sun Apr 24 07:39:34 2016 (r413923) +++ head/ftp/libfilezilla/distinfo Sun Apr 24 07:44:09 2016 (r413924) @@ -1,2 +1,2 @@ -SHA256 (libfilezilla-0.4.0.1.tar.bz2) = 6003689254e9d250bcdefc1414dcc4a0d324fda3d59436a497e249b225f4b1d1 -SIZE (libfilezilla-0.4.0.1.tar.bz2) = 373987 +SHA256 (libfilezilla-0.5.0.tar.bz2) = 8c6a1af13113bbb78e1c66ebbbffa84c0f0ee243c0789e9b92f8e11fcb84c51d +SIZE (libfilezilla-0.5.0.tar.bz2) = 374549 From owner-svn-ports-all@freebsd.org Sun Apr 24 08:05:29 2016 Return-Path: Delivered-To: svn-ports-all@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 86AC9B116CE; Sun, 24 Apr 2016 08:05:29 +0000 (UTC) (envelope-from flo@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 465A11093; Sun, 24 Apr 2016 08:05:29 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O85SOS020427; Sun, 24 Apr 2016 08:05:28 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O85Sp4020425; Sun, 24 Apr 2016 08:05:28 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201604240805.u3O85Sp4020425@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Sun, 24 Apr 2016 08:05:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413925 - head/science/InsightToolkit X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 08:05:29 -0000 Author: flo Date: Sun Apr 24 08:05:28 2016 New Revision: 413925 URL: https://svnweb.freebsd.org/changeset/ports/413925 Log: Update to 4.9.1 PR: 208982 Submitted by: Ben Woods (maintainer) Sponsored by: Essen Linuxhotel Hackathon 2016 Modified: head/science/InsightToolkit/Makefile head/science/InsightToolkit/distinfo Modified: head/science/InsightToolkit/Makefile ============================================================================== --- head/science/InsightToolkit/Makefile Sun Apr 24 07:44:09 2016 (r413924) +++ head/science/InsightToolkit/Makefile Sun Apr 24 08:05:28 2016 (r413925) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= InsightToolkit -PORTVERSION= 4.9.0 -PORTREVISION= 1 +PORTVERSION= 4.9.1 CATEGORIES= science biology MASTER_SITES= SF/itk/itk/4.9 Modified: head/science/InsightToolkit/distinfo ============================================================================== --- head/science/InsightToolkit/distinfo Sun Apr 24 07:44:09 2016 (r413924) +++ head/science/InsightToolkit/distinfo Sun Apr 24 08:05:28 2016 (r413925) @@ -1,2 +1,2 @@ -SHA256 (InsightToolkit-4.9.0.tar.gz) = 4aa26e3cd3503b08e92a16e812d2be474275b218d015143a9e890063eb0f4f5b -SIZE (InsightToolkit-4.9.0.tar.gz) = 18087947 +SHA256 (InsightToolkit-4.9.1.tar.gz) = 4f3f0842bf10a5ba160ac1276f9e8e47e54dcd1fe45b2d93162fe2280eefed0e +SIZE (InsightToolkit-4.9.1.tar.gz) = 18088281 From owner-svn-ports-all@freebsd.org Sun Apr 24 08:09:28 2016 Return-Path: Delivered-To: svn-ports-all@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 C7C66B117B6; Sun, 24 Apr 2016 08:09:28 +0000 (UTC) (envelope-from flo@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 8A9A511D6; Sun, 24 Apr 2016 08:09:28 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O89RvV020697; Sun, 24 Apr 2016 08:09:27 GMT (envelope-from flo@FreeBSD.org) Received: (from flo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O89RTO020692; Sun, 24 Apr 2016 08:09:27 GMT (envelope-from flo@FreeBSD.org) Message-Id: <201604240809.u3O89RTO020692@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: flo set sender to flo@FreeBSD.org using -f From: Florian Smeets Date: Sun, 24 Apr 2016 08:09:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413926 - in head/math/openblas: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 08:09:28 -0000 Author: flo Date: Sun Apr 24 08:09:27 2016 New Revision: 413926 URL: https://svnweb.freebsd.org/changeset/ports/413926 Log: Update to 0.2.18 PR: 208790 Submitted by: phd_kimberlite@yahoo.co.jp (maintainer), dieterich@ogolem.org Sponsored by: Essen Linuxhotel Hackathon 2016 Modified: head/math/openblas/Makefile head/math/openblas/distinfo head/math/openblas/files/patch-driver_others_blas__server.c head/math/openblas/files/patch-driver_others_memory.c Modified: head/math/openblas/Makefile ============================================================================== --- head/math/openblas/Makefile Sun Apr 24 08:05:28 2016 (r413925) +++ head/math/openblas/Makefile Sun Apr 24 08:09:27 2016 (r413926) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= openblas -PORTVERSION= 0.2.15 +PORTVERSION= 0.2.18 DISTVERSIONPREFIX= v -PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= math MASTER_SITES= GH NL/lapack/timing/:lapack_tmg @@ -115,8 +114,8 @@ post-patch: ${WRKSRC}/lapack-netlib/SRC/Makefile \ ${WRKSRC}/lapack-netlib/SRC/VARIANTS/Makefile \ ${WRKSRC}/lapack-netlib/TESTING/MATGEN/Makefile \ - ${WRKSRC}/lapack-netlib/lapacke/src/Makefile \ - ${WRKSRC}/lapack-netlib/lapacke/utils/Makefile \ + ${WRKSRC}/lapack-netlib/LAPACKE/src/Makefile \ + ${WRKSRC}/lapack-netlib/LAPACKE/utils/Makefile \ ${WRKSRC}/reference/Makefile ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \ -e 's+%%LDFLAGS%%+${LDFLAGS}+' \ Modified: head/math/openblas/distinfo ============================================================================== --- head/math/openblas/distinfo Sun Apr 24 08:05:28 2016 (r413925) +++ head/math/openblas/distinfo Sun Apr 24 08:09:27 2016 (r413926) @@ -1,5 +1,5 @@ -SHA256 (openblas/xianyi-OpenBLAS-v0.2.15_GH0.tar.gz) = 73c40ace5978282224e5e122a41c8388c5a19e65a6f2329c2b7c0b61bacc9044 -SIZE (openblas/xianyi-OpenBLAS-v0.2.15_GH0.tar.gz) = 9966585 +SHA256 (openblas/xianyi-OpenBLAS-v0.2.18_GH0.tar.gz) = 7d9f8d4ea4a65ab68088f3bb557f03a7ac9cb5036ef2ba30546c3a28774a4112 +SIZE (openblas/xianyi-OpenBLAS-v0.2.18_GH0.tar.gz) = 10689322 SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1 SIZE (openblas/large.tgz) = 2595 SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af Modified: head/math/openblas/files/patch-driver_others_blas__server.c ============================================================================== --- head/math/openblas/files/patch-driver_others_blas__server.c Sun Apr 24 08:05:28 2016 (r413925) +++ head/math/openblas/files/patch-driver_others_blas__server.c Sun Apr 24 08:09:27 2016 (r413926) @@ -1,11 +1,11 @@ ---- driver/others/blas_server.c.orig 2015-10-27 20:44:50 UTC +--- driver/others/blas_server.c.orig 2016-04-12 19:29:19 UTC +++ driver/others/blas_server.c @@ -70,7 +70,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF /*********************************************************************/ #include "common.h" --#if defined(OS_LINUX) || defined(OS_NETBSD) || defined(OS_DARWIN) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_NETBSD) || defined(OS_DARWIN) || defined(OS_ANDROID) || defined(OS_FREEBSD) +-#if defined(OS_LINUX) || defined(OS_NETBSD) || defined(OS_DARWIN) || defined(OS_ANDROID) || defined(OS_SUNOS) ++#if defined(OS_LINUX) || defined(OS_NETBSD) || defined(OS_DARWIN) || defined(OS_ANDROID) || defined(OS_SUNOS) || defined(OS_FREEBSD) #include #include #include Modified: head/math/openblas/files/patch-driver_others_memory.c ============================================================================== --- head/math/openblas/files/patch-driver_others_memory.c Sun Apr 24 08:05:28 2016 (r413925) +++ head/math/openblas/files/patch-driver_others_memory.c Sun Apr 24 08:09:27 2016 (r413926) @@ -1,13 +1,13 @@ Passing a priority level to constructor/destructor only works on GCC >= 4.3.0; improve the upstream check so that the build works with base GCC. ---- driver/others/memory.c.orig 2015-10-27 20:44:50 UTC +--- driver/others/memory.c.orig 2016-04-12 19:29:19 UTC +++ driver/others/memory.c -@@ -142,7 +142,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF +@@ -144,7 +144,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF #if defined(_MSC_VER) && !defined(__clang__) #define CONSTRUCTOR __cdecl #define DESTRUCTOR __cdecl --#elif defined(OS_DARWIN) && defined(C_GCC) -+#elif defined(OS_DARWIN) || (defined(C_GCC) && ((__GNUC__ == 4) && (__GNUC_MINOR__ < 3))) +-#elif (defined(OS_DARWIN) || defined(OS_SUNOS)) && defined(C_GCC) ++#elif (defined(OS_DARWIN) || defined(OS_SUNOS)) || (defined(C_GCC) && ((__GNUC__ == 4) && (__GNUC_MINOR__ < 3))) #define CONSTRUCTOR __attribute__ ((constructor)) #define DESTRUCTOR __attribute__ ((destructor)) #else From owner-svn-ports-all@freebsd.org Sun Apr 24 09:02:56 2016 Return-Path: Delivered-To: svn-ports-all@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 403FCB12EA2; Sun, 24 Apr 2016 09:02:56 +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 02E3F1329; Sun, 24 Apr 2016 09:02:55 +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 u3O92tDL038557; Sun, 24 Apr 2016 09:02:55 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O92tk5038554; Sun, 24 Apr 2016 09:02:55 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201604240902.u3O92tk5038554@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 24 Apr 2016 09:02:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413927 - in head/security/identify: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 09:02:56 -0000 Author: amdmi3 Date: Sun Apr 24 09:02:54 2016 New Revision: 413927 URL: https://svnweb.freebsd.org/changeset/ports/413927 Log: - Add LICENSE - Switch to options helpers - Regenerate patches with `make makepatch` Modified: head/security/identify/Makefile head/security/identify/files/patch-Makefile head/security/identify/files/patch-identify.c Modified: head/security/identify/Makefile ============================================================================== --- head/security/identify/Makefile Sun Apr 24 08:09:27 2016 (r413926) +++ head/security/identify/Makefile Sun Apr 24 09:02:54 2016 (r413927) @@ -10,6 +10,8 @@ MASTER_SITES= http://ftp.nluug.nl/ftp/pu MAINTAINER= ports@FreeBSD.org COMMENT= Client side ident protocol daemon wrapper +LICENSE= PD + BUILD_DEPENDS= ${LOCALBASE}/lib/libident.a:security/libident PORTDOCS= README @@ -19,6 +21,8 @@ OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/identify ${STAGEDIR}${PREFIX}/libexec + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} Modified: head/security/identify/files/patch-Makefile ============================================================================== --- head/security/identify/files/patch-Makefile Sun Apr 24 08:09:27 2016 (r413926) +++ head/security/identify/files/patch-Makefile Sun Apr 24 09:02:54 2016 (r413927) @@ -1,5 +1,5 @@ ---- Makefile.orig Mon Jul 20 09:01:27 1992 -+++ Makefile Fri Apr 2 10:50:40 1999 +--- Makefile.orig 1992-07-20 16:01:27 UTC ++++ Makefile @@ -1,2 +1,11 @@ -identify: identify.c - $(CC) -o identify identify.c -lauthuser Modified: head/security/identify/files/patch-identify.c ============================================================================== --- head/security/identify/files/patch-identify.c Sun Apr 24 08:09:27 2016 (r413926) +++ head/security/identify/files/patch-identify.c Sun Apr 24 09:02:54 2016 (r413927) @@ -1,5 +1,5 @@ ---- identify.c.orig Tue Feb 2 01:51:57 1993 -+++ identify.c Sun Oct 20 17:53:44 2002 +--- identify.c.orig 1993-02-02 09:51:57 UTC ++++ identify.c @@ -11,7 +11,7 @@ #include #include @@ -9,7 +9,7 @@ #include #include #include -@@ -33,57 +33,43 @@ +@@ -33,57 +33,43 @@ char *force_log = NULL; int noidentify = 0; int bits = 0; int reject_flag = 0; @@ -84,7 +84,7 @@ host[len] = '\0'; } -@@ -91,16 +77,7 @@ +@@ -91,16 +77,7 @@ char *ident_get_identifier(fd, host, len if (noidentify) return NULL; else @@ -102,7 +102,7 @@ } -@@ -128,10 +105,6 @@ +@@ -128,10 +105,6 @@ main(argc,argv) timeout = atoi(argv[i]+2); break; @@ -113,7 +113,7 @@ case 'R': if (!argv[i][2]) reject_flag = 1; -@@ -200,7 +173,7 @@ +@@ -200,7 +173,7 @@ main(argc,argv) { /* In child, let's fork again so we can forget about this child */ if (fork()) @@ -122,7 +122,7 @@ } else { -@@ -241,13 +214,13 @@ +@@ -241,13 +214,13 @@ main(argc,argv) } } From owner-svn-ports-all@freebsd.org Sun Apr 24 09:19:06 2016 Return-Path: Delivered-To: svn-ports-all@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 81FEFB193C6; Sun, 24 Apr 2016 09:19:06 +0000 (UTC) (envelope-from lme@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 415E71C71; Sun, 24 Apr 2016 09:19:06 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O9J5Q1041927; Sun, 24 Apr 2016 09:19:05 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O9J5M1041923; Sun, 24 Apr 2016 09:19:05 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604240919.u3O9J5M1041923@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sun, 24 Apr 2016 09:19:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413928 - in head/textproc/linuxdoc-tools: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 09:19:06 -0000 Author: lme Date: Sun Apr 24 09:19:04 2016 New Revision: 413928 URL: https://svnweb.freebsd.org/changeset/ports/413928 Log: - Update to 0.9.71 - Build DOCS with dvipsk PR: 208983 Submitted by: maintainer Sponsored by: Essen Linuxhotel Hackathon 2016 Added: head/textproc/linuxdoc-tools/files/patch-doc_Makedoc.sh (contents, props changed) Deleted: head/textproc/linuxdoc-tools/files/patch-rtf-fix_rtf2rtf.l Modified: head/textproc/linuxdoc-tools/Makefile head/textproc/linuxdoc-tools/distinfo (contents, props changed) head/textproc/linuxdoc-tools/files/patch-Makefile.in (contents, props changed) Modified: head/textproc/linuxdoc-tools/Makefile ============================================================================== --- head/textproc/linuxdoc-tools/Makefile Sun Apr 24 09:02:54 2016 (r413927) +++ head/textproc/linuxdoc-tools/Makefile Sun Apr 24 09:19:04 2016 (r413928) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= linuxdoc-tools -PORTVERSION= 0.9.69 +PORTVERSION= 0.9.71 CATEGORIES= textproc MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${DISTVERSION}.orig @@ -33,11 +33,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER OPTIONS_DEFINE= DOCS DOCS_BUILD_DEPENDS= bash:shells/bash +DOCS_USE= tex=latex:build tex=pdftex:build tex=dvipsk:build DOCS_USES= makeinfo -DOCS_MAKE_ENV= LANG=C BUILD_DOCS=true - -post-patch: - @${REINPLACE_CMD} -E '/^(CC|CFLAGS)/ s|=|?=|' \ - ${WRKSRC}/rtf-fix/Makefile +DOCS_CONFIGURE_ENABLE= docs +DOCS_MAKE_ENV= LANG=C .include Modified: head/textproc/linuxdoc-tools/distinfo ============================================================================== --- head/textproc/linuxdoc-tools/distinfo Sun Apr 24 09:02:54 2016 (r413927) +++ head/textproc/linuxdoc-tools/distinfo Sun Apr 24 09:19:04 2016 (r413928) @@ -1,2 +1,2 @@ -SHA256 (linuxdoc-tools_0.9.69.orig.tar.gz) = 7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101 -SIZE (linuxdoc-tools_0.9.69.orig.tar.gz) = 604379 +SHA256 (linuxdoc-tools_0.9.71.orig.tar.gz) = 641e4f02ccbe3ee7fad9e866d334f8880a3f621e70c7412a7bd504a777a992ed +SIZE (linuxdoc-tools_0.9.71.orig.tar.gz) = 613067 Modified: head/textproc/linuxdoc-tools/files/patch-Makefile.in ============================================================================== --- head/textproc/linuxdoc-tools/files/patch-Makefile.in Sun Apr 24 09:02:54 2016 (r413927) +++ head/textproc/linuxdoc-tools/files/patch-Makefile.in Sun Apr 24 09:19:04 2016 (r413928) @@ -1,15 +1,14 @@ ---- Makefile.in.orig 2013-04-08 17:11:41 UTC +--- Makefile.in.orig 2016-04-20 23:33:09 UTC +++ Makefile.in -@@ -47,7 +47,7 @@ INCLUDE = - OPTIMIZE = -O - DEBUG = - WARN = --CFLAGS = $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) $(OPTIMIZE) -+CFLAGS += $(DEBUG) $(INCLUDE) $(WARN) $(PROFILE) - LDFLAGS = $(DEBUG) $(PROFILE) - - all: -@@ -113,7 +113,7 @@ ifeq ($(BUILD_ISO_ENTITIES), true) +@@ -83,6 +83,7 @@ ifneq ($(BUILDDOC_FORMATS),) + # -- Build documentation + @echo "Building documentation ..." + (cd doc; \ ++ MAKE=$(MAKE) \ + PREFIX=$(prefix) \ + BUILD_ISO_ENTITIES=$(BUILD_ISO_ENTITIES) \ + BUILD_ENTITY_MAP=$(BUILD_ENTITY_MAP) \ +@@ -121,7 +122,7 @@ ifeq ($(BUILD_ISO_ENTITIES), true) endif # -- Install linuxdoc script @@ -18,19 +17,3 @@ # -- Install auxiliary programs mkdir -p $(auxbin_ddir) -@@ -162,6 +162,7 @@ endif - $(INSTALL_DATA) tex/* $(tex_ddir) - - # -- Build and install documentation -+ifeq ($(BUILD_DOCS), true) - @echo "Installing documentation in $(doc_ddir) ..." - (cd doc; \ - PATH=${PATH}:$(bin_ddir) \ -@@ -177,6 +178,7 @@ endif - rm -f $(doc_ddir)/Makedoc.sh - find $(doc_ddir) -type d -print | xargs chmod 755 - find $(doc_ddir) -type f -print | xargs chmod 644 -+endif - - # what dirs do the targets clean and distclean need? - DDIRS= Added: head/textproc/linuxdoc-tools/files/patch-doc_Makedoc.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/linuxdoc-tools/files/patch-doc_Makedoc.sh Sun Apr 24 09:19:04 2016 (r413928) @@ -0,0 +1,27 @@ +--- doc/Makedoc.sh.orig 2015-10-20 11:22:17 UTC ++++ doc/Makedoc.sh +@@ -33,10 +33,10 @@ if [ "${BUILD_ENTITY_MAP}" = "true" ]; t + # Create a modified EntityMap.pm with entity-map location in doc + # build temporary dir. Need to properly install entity-map there. + mkdir $TMPDIR/Text +- make -C ../entity-map install DESTDIR="$TMPDIR" ++ ${MAKE} -C ../entity-map install DESTDIR="$TMPDIR" + sed < ../entity-map/EntityMap.pm.in > $TMPDIR/Text/EntityMap.pm \ +- -e 's|\@localentitymapdir\@|'${TMPDIR}'/usr/share/entity-map|g' \ +- -e 's|\@entitymapdir\@|'${TMPDIR}'/usr/share/entity-map/0.1.0|g' ++ -e 's|\@localentitymapdir\@|'${TMPDIR}${PREFIX}'/share/entity-map|g' \ ++ -e 's|\@entitymapdir\@|'${TMPDIR}${PREFIX}'/share/entity-map/0.1.0|g' + + # Set ${TMPDIR} first in perl load path (Will put Text dir there + # for modified EntityMap.pm), then our perl5lib +@@ -49,8 +49,8 @@ fi + if [ "${BUILD_ISO_ENTITIES}" = "true" ]; then + # --without-installed-iso-entities: Install iso-entities in + # "$TMPDIR/usr" and set it as iso-entities prefix. +- make -C ../iso-entities install DESTDIR="$TMPDIR" +- ISOENTITIES_PREFIX="${TMPDIR}/usr" ++ ${MAKE} -C ../iso-entities install DESTDIR="$TMPDIR" ++ ISOENTITIES_PREFIX="${TMPDIR}${PREFIX}" + else + # --with-installed-iso-entities: Use system prefix. + ISOENTITIES_PREFIX="${PREFIX}" From owner-svn-ports-all@freebsd.org Sun Apr 24 09:24:05 2016 Return-Path: Delivered-To: svn-ports-all@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 8261DB195DE; Sun, 24 Apr 2016 09:24:05 +0000 (UTC) (envelope-from lme@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 53A211025; Sun, 24 Apr 2016 09:24:05 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O9O4Os044814; Sun, 24 Apr 2016 09:24:04 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O9O4m0044812; Sun, 24 Apr 2016 09:24:04 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604240924.u3O9O4m0044812@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sun, 24 Apr 2016 09:24:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413929 - head/security/dropbear X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 09:24:05 -0000 Author: lme Date: Sun Apr 24 09:24:04 2016 New Revision: 413929 URL: https://svnweb.freebsd.org/changeset/ports/413929 Log: Update to 2016.73 PR: 208962 Submitted by: maintainer Sponsored by: Essen Linuxhotel Hackathon 2016 Modified: head/security/dropbear/Makefile head/security/dropbear/distinfo Modified: head/security/dropbear/Makefile ============================================================================== --- head/security/dropbear/Makefile Sun Apr 24 09:19:04 2016 (r413928) +++ head/security/dropbear/Makefile Sun Apr 24 09:24:04 2016 (r413929) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dropbear -PORTVERSION= 2016.72 +PORTVERSION= 2016.73 CATEGORIES= security ipv6 MASTER_SITES= http://matt.ucc.asn.au/dropbear/releases/ Modified: head/security/dropbear/distinfo ============================================================================== --- head/security/dropbear/distinfo Sun Apr 24 09:19:04 2016 (r413928) +++ head/security/dropbear/distinfo Sun Apr 24 09:24:04 2016 (r413929) @@ -1,2 +1,2 @@ -SHA256 (dropbear-2016.72.tar.bz2) = 9323766d3257699fd7d6e7b282c5a65790864ab32fd09ac73ea3d46c9ca2d681 -SIZE (dropbear-2016.72.tar.bz2) = 1617138 +SHA256 (dropbear-2016.73.tar.bz2) = 5c61a4f69b093b688629cd365be38701485ff63cfb23642dab7a05ad250aefd7 +SIZE (dropbear-2016.73.tar.bz2) = 1621584 From owner-svn-ports-all@freebsd.org Sun Apr 24 09:29:55 2016 Return-Path: Delivered-To: svn-ports-all@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 E852EB197FD; Sun, 24 Apr 2016 09:29:55 +0000 (UTC) (envelope-from lme@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 B5D6C1287; Sun, 24 Apr 2016 09:29:55 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O9TsFs045126; Sun, 24 Apr 2016 09:29:54 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O9Ts71045125; Sun, 24 Apr 2016 09:29:54 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604240929.u3O9Ts71045125@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sun, 24 Apr 2016 09:29:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413930 - head/emulators/simh X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 09:29:56 -0000 Author: lme Date: Sun Apr 24 09:29:54 2016 New Revision: 413930 URL: https://svnweb.freebsd.org/changeset/ports/413930 Log: Pass maintainership to submitter PR: 208924 Submitted by: Bob Eager / Sponsored by: Essen Linuxhotel Hackathon 2016 Modified: head/emulators/simh/Makefile Modified: head/emulators/simh/Makefile ============================================================================== --- head/emulators/simh/Makefile Sun Apr 24 09:24:04 2016 (r413929) +++ head/emulators/simh/Makefile Sun Apr 24 09:29:54 2016 (r413930) @@ -7,7 +7,7 @@ CATEGORIES= emulators MASTER_SITES= http://simh.trailing-edge.com/sources/ DISTNAME= ${PORTNAME}v${PORTVERSION:R:S/.//}-${PORTVERSION:E} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bob@eager.cx COMMENT= Emulates classic DEC, HP, GRI, IBM, Altair, SDS, Honeywell, and others NO_WRKSUBDIR= yes From owner-svn-ports-all@freebsd.org Sun Apr 24 09:32:53 2016 Return-Path: Delivered-To: svn-ports-all@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 7F1ABB199F5; Sun, 24 Apr 2016 09:32:53 +0000 (UTC) (envelope-from pi@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 5AB9B175B; Sun, 24 Apr 2016 09:32:53 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O9Wqnq048009; Sun, 24 Apr 2016 09:32:52 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O9WqpT048004; Sun, 24 Apr 2016 09:32:52 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201604240932.u3O9WqpT048004@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 24 Apr 2016 09:32:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413931 - in head/www: . py-searx py-searx/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 09:32:53 -0000 Author: pi Date: Sun Apr 24 09:32:51 2016 New Revision: 413931 URL: https://svnweb.freebsd.org/changeset/ports/413931 Log: New port: www/py-searx A privacy-respecting, hackable metasearch engine. WWW: https://github.com/asciimoo/searx PR: 208915 Submitted by: Loic BLOT Added: head/www/py-searx/ head/www/py-searx/Makefile (contents, props changed) head/www/py-searx/distinfo (contents, props changed) head/www/py-searx/files/ head/www/py-searx/files/searx.in (contents, props changed) head/www/py-searx/pkg-descr (contents, props changed) Modified: head/www/Makefile Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Sun Apr 24 09:29:54 2016 (r413930) +++ head/www/Makefile Sun Apr 24 09:32:51 2016 (r413931) @@ -1770,6 +1770,7 @@ SUBDIR += py-scriptaculous SUBDIR += py-seafdav SUBDIR += py-seafobj + SUBDIR += py-searx SUBDIR += py-selector SUBDIR += py-selenium SUBDIR += py-slimit Added: head/www/py-searx/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-searx/Makefile Sun Apr 24 09:32:51 2016 (r413931) @@ -0,0 +1,35 @@ +# Created by: Loic Blot +# $FreeBSD$ + +PORTNAME= searx +PORTVERSION= 0.8.1 +DISTVERSIONPREFIX= v +CATEGORIES= www python +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= lblot@unix-experience.fr +COMMENT= Searx / a privacy-respecting, hackable metasearch engine + +LICENSE= AGPLv3 + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil \ + ${PYTHON_PKGNAMEPREFIX}Flask-Babel>0:devel/py-flask-babel \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ + ${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient \ + ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \ + ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \ + ${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \ + ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \ + ${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug + +USE_RC_SUBR= searx + +USE_GITHUB= yes +GH_ACCOUNT= asciimoo +GH_PROJECT= searx + +USES= python +USE_PYTHON= autoplist distutils concurrent + +.include Added: head/www/py-searx/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-searx/distinfo Sun Apr 24 09:32:51 2016 (r413931) @@ -0,0 +1,2 @@ +SHA256 (asciimoo-searx-v0.8.1_GH0.tar.gz) = 62cc8faa4aca47e7099f0cd85eff26f5cdaff4bf4ac0dc8b3f3cd315914d1a7c +SIZE (asciimoo-searx-v0.8.1_GH0.tar.gz) = 1104093 Added: head/www/py-searx/files/searx.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-searx/files/searx.in Sun Apr 24 09:32:51 2016 (r413931) @@ -0,0 +1,47 @@ +#!/bin/sh +# $FreeBSD$ + +# PROVIDE: searx +# REQUIRE: DAEMON NETWORKING +# BEFORE: LOGIN +# KEYWORD: shutdown + +# Add the following lines to /etc/rc.conf to enable searx: +# searx_enable="YES" +# +# searx_enable (bool): Set to YES to enable searx +# Default: NO +# searx_conf (str): searx configuration file +# Default: ${PREFIX}/etc/searx.conf +# searx_user (str): searx daemon user +# Default: searx +# searx_group (str): searx daemon group +# Default: searx +# searx_flags (str): Extra flags passed to searx + +. /etc/rc.subr + +name="searx" +rcvar=searx_enable + +: ${searx_enable:="NO"} +: ${searx_user:="www"} +: ${searx_group:="www"} +: ${searx_flags:=""} + +# daemon +searx_pidfile="/var/run/${name}.pid" +python="%%PREFIX%%/bin/python2.7" +procname="%%PREFIX%%/lib/python2.7/site-packages/${name}/webapp.py" +command=/usr/sbin/daemon +command_args=" -c -f -P ${searx_pidfile} ${python} ${procname}" +start_precmd="searx_precmd" + +searx_precmd() +{ + install -o ${searx_user} /dev/null ${searx_pidfile} +} + +load_rc_config $name +run_rc_command "$1" + Added: head/www/py-searx/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-searx/pkg-descr Sun Apr 24 09:32:51 2016 (r413931) @@ -0,0 +1,3 @@ +A privacy-respecting, hackable metasearch engine. + +WWW: https://github.com/asciimoo/searx From owner-svn-ports-all@freebsd.org Sun Apr 24 09:45:51 2016 Return-Path: Delivered-To: svn-ports-all@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 DFE83B19D9B; Sun, 24 Apr 2016 09:45:51 +0000 (UTC) (envelope-from lme@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 B23DE1D52; Sun, 24 Apr 2016 09:45:51 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3O9jo0C051183; Sun, 24 Apr 2016 09:45:50 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3O9jo9s051182; Sun, 24 Apr 2016 09:45:50 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604240945.u3O9jo9s051182@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sun, 24 Apr 2016 09:45:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413932 - head/games/nsnake X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 09:45:52 -0000 Author: lme Date: Sun Apr 24 09:45:50 2016 New Revision: 413932 URL: https://svnweb.freebsd.org/changeset/ports/413932 Log: - Change LICENSE to ISCL as requested by author - Change to new MASTERSITES PR: 208917 Submitted by: maintainer / author Modified: head/games/nsnake/Makefile Modified: head/games/nsnake/Makefile ============================================================================== --- head/games/nsnake/Makefile Sun Apr 24 09:32:51 2016 (r413931) +++ head/games/nsnake/Makefile Sun Apr 24 09:45:50 2016 (r413932) @@ -5,12 +5,12 @@ PORTNAME= nsnake PORTVERSION= 1.4 PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= http://releases.malikania.fr/nsnake/ +MASTER_SITES= http://releases.malikania.fr/nsnake/1.4.0/ MAINTAINER= demelier.david@gmail.com COMMENT= Snake game written in C and ncurses -LICENSE= MIT +LICENSE= ISCL USES= ncurses tar:tgz From owner-svn-ports-all@freebsd.org Sun Apr 24 10:19:32 2016 Return-Path: Delivered-To: svn-ports-all@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 8D65AB197E2; Sun, 24 Apr 2016 10:19:32 +0000 (UTC) (envelope-from pi@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 500191CE7; Sun, 24 Apr 2016 10:19:32 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OAJVpC060460; Sun, 24 Apr 2016 10:19:31 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OAJVkd060456; Sun, 24 Apr 2016 10:19:31 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201604241019.u3OAJVkd060456@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 24 Apr 2016 10:19:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413933 - in head/net-im: . oysttyer X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 10:19:32 -0000 Author: pi Date: Sun Apr 24 10:19:31 2016 New Revision: 413933 URL: https://svnweb.freebsd.org/changeset/ports/413933 Log: New port: net-im/oysttyer An interactive console text-based command-line Twitter client written in Perl WWW: http://oysttyer.github.io/docs/userGuide.html WWW: https://github.com/oysttyer/oysttyer According to http://www.floodgap.com/software/ttytter/ it is the official next version of net-im/ttytter. Added: head/net-im/oysttyer/ head/net-im/oysttyer/Makefile (contents, props changed) head/net-im/oysttyer/distinfo (contents, props changed) head/net-im/oysttyer/pkg-descr (contents, props changed) Modified: head/net-im/Makefile Modified: head/net-im/Makefile ============================================================================== --- head/net-im/Makefile Sun Apr 24 09:45:50 2016 (r413932) +++ head/net-im/Makefile Sun Apr 24 10:19:31 2016 (r413933) @@ -82,6 +82,7 @@ SUBDIR += mu-conference SUBDIR += naim SUBDIR += openfire + SUBDIR += oysttyer SUBDIR += p5-AnyEvent-XMPP SUBDIR += p5-DJabberd SUBDIR += p5-Jabber-Connection Added: head/net-im/oysttyer/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/oysttyer/Makefile Sun Apr 24 10:19:31 2016 (r413933) @@ -0,0 +1,31 @@ +# $FreeBSD$ + +PORTNAME= oysttyer +PORTVERSION= 2.6.1 +CATEGORIES= net-im + +MAINTAINER= pi@FreeBSD.org +COMMENT= Interactive console text-based command-line Twitter client + +LICENSE= FFSL +LICENSE_NAME= Floodgap Free Software License +LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept + +RUN_DEPENDS= curl:ftp/curl \ + p5-Term-ReadLine>=1.14:devel/p5-Term-ReadLine \ + p5-TimeDate>=2.30:devel/p5-TimeDate + +USES= perl5 shebangfix +USE_GITHUB= yes +GH_ACCOUNT= oysttyer +SHEBANG_FILES= oysttyer.pl +PLIST_FILES= bin/oysttyer + +NO_ARCH= yes +NO_BUILD= yes + +do-install: + ${INSTALL} ${WRKSRC}/oysttyer.pl ${STAGEDIR}${PREFIX}/bin/oysttyer + +.include Added: head/net-im/oysttyer/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/oysttyer/distinfo Sun Apr 24 10:19:31 2016 (r413933) @@ -0,0 +1,2 @@ +SHA256 (oysttyer-oysttyer-2.6.1_GH0.tar.gz) = 8ef2acf18dcec3352bf1628bd58283fb6e696ff4fb1a355f13fb6d80bc2f6573 +SIZE (oysttyer-oysttyer-2.6.1_GH0.tar.gz) = 103540 Added: head/net-im/oysttyer/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/oysttyer/pkg-descr Sun Apr 24 10:19:31 2016 (r413933) @@ -0,0 +1,4 @@ +An interactive console text-based command-line Twitter client written in Perl + +WWW: http://oysttyer.github.io/docs/userGuide.html +WWW: https://github.com/oysttyer/oysttyer From owner-svn-ports-all@freebsd.org Sun Apr 24 10:22:49 2016 Return-Path: Delivered-To: svn-ports-all@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 0A2E8B19991; Sun, 24 Apr 2016 10:22:49 +0000 (UTC) (envelope-from lme@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 CB6BD1FE7; Sun, 24 Apr 2016 10:22:48 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OAMlsn063380; Sun, 24 Apr 2016 10:22:47 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OAMlU1063378; Sun, 24 Apr 2016 10:22:47 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604241022.u3OAMlU1063378@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sun, 24 Apr 2016 10:22:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413934 - in head/www/hiawatha: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 10:22:49 -0000 Author: lme Date: Sun Apr 24 10:22:47 2016 New Revision: 413934 URL: https://svnweb.freebsd.org/changeset/ports/413934 Log: - Add a fix to enable HideProxy function - Bump PORTREVISION PR: 208973 Submitted by: Fred Approved by: maintainer Sponsored by: Essen Linuxhotel Hackathon 2016 Added: head/www/hiawatha/files/patch-src__http.c (contents, props changed) Modified: head/www/hiawatha/Makefile Modified: head/www/hiawatha/Makefile ============================================================================== --- head/www/hiawatha/Makefile Sun Apr 24 10:19:31 2016 (r413933) +++ head/www/hiawatha/Makefile Sun Apr 24 10:22:47 2016 (r413934) @@ -3,6 +3,7 @@ PORTNAME= hiawatha PORTVERSION= 10.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://www.hiawatha-webserver.org/files/ Added: head/www/hiawatha/files/patch-src__http.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/hiawatha/files/patch-src__http.c Sun Apr 24 10:22:47 2016 (r413934) @@ -0,0 +1,13 @@ +--- src/http.c.orig 2015-12-28 15:05:15 UTC ++++ src/http.c +@@ -845,8 +845,8 @@ int last_forwarded_ip(t_http_header *htt + /* Forwarded header + */ + begin = NULL; +- while ((forwarded = strcasestr(forwarded, "for=")) == NULL) { +- begin = forwarded; ++ while ((forwarded = strcasestr(forwarded, "for=")) != NULL) { ++ begin = forwarded + 4; + forwarded++; + } + From owner-svn-ports-all@freebsd.org Sun Apr 24 11:48:29 2016 Return-Path: Delivered-To: svn-ports-all@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 85F61B1B9EA; Sun, 24 Apr 2016 11:48:29 +0000 (UTC) (envelope-from lme@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 4A2071098; Sun, 24 Apr 2016 11:48:29 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OBmSw2087627; Sun, 24 Apr 2016 11:48:28 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OBmQQS087609; Sun, 24 Apr 2016 11:48:26 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604241148.u3OBmQQS087609@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sun, 24 Apr 2016 11:48:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413935 - in head/net-mgmt: zabbix2-server zabbix2-server/files zabbix22-server zabbix22-server/files zabbix24-server zabbix24-server/files zabbix3-server zabbix3-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 11:48:29 -0000 Author: lme Date: Sun Apr 24 11:48:26 2016 New Revision: 413935 URL: https://svnweb.freebsd.org/changeset/ports/413935 Log: - Fixes in {agent,proxy,server} rc start scripts: - SysV IPC leak - Restart race - Allow to specify a custom PATH in rc.conf - Bump PORTREVISION PR: 207896 Submitted by: kbowling Approved by: maintainer MFH: 2016Q2 Sponsored by: Essen Linuxhotel Hackathon 2016 Modified: head/net-mgmt/zabbix2-server/Makefile head/net-mgmt/zabbix2-server/files/zabbix_agentd.in head/net-mgmt/zabbix2-server/files/zabbix_proxy.in head/net-mgmt/zabbix2-server/files/zabbix_server.in head/net-mgmt/zabbix22-server/Makefile head/net-mgmt/zabbix22-server/files/zabbix_agentd.in head/net-mgmt/zabbix22-server/files/zabbix_proxy.in head/net-mgmt/zabbix22-server/files/zabbix_server.in head/net-mgmt/zabbix24-server/Makefile head/net-mgmt/zabbix24-server/files/zabbix_agentd.in head/net-mgmt/zabbix24-server/files/zabbix_proxy.in head/net-mgmt/zabbix24-server/files/zabbix_server.in head/net-mgmt/zabbix3-server/Makefile head/net-mgmt/zabbix3-server/files/zabbix_agentd.in head/net-mgmt/zabbix3-server/files/zabbix_proxy.in head/net-mgmt/zabbix3-server/files/zabbix_server.in Modified: head/net-mgmt/zabbix2-server/Makefile ============================================================================== --- head/net-mgmt/zabbix2-server/Makefile Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix2-server/Makefile Sun Apr 24 11:48:26 2016 (r413935) @@ -3,7 +3,7 @@ PORTNAME= zabbix2 PORTVERSION= 2.0.16 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: head/net-mgmt/zabbix2-server/files/zabbix_agentd.in ============================================================================== --- head/net-mgmt/zabbix2-server/files/zabbix_agentd.in Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix2-server/files/zabbix_agentd.in Sun Apr 24 11:48:26 2016 (r413935) @@ -9,6 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. +# zabbix_agentd_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,33 @@ name="zabbix_agentd" rcvar=zabbix_agentd_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_agentd_enable="NO"} +: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_agentd_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_agentd_paths}" run_rc_command "$1" Modified: head/net-mgmt/zabbix2-server/files/zabbix_proxy.in ============================================================================== --- head/net-mgmt/zabbix2-server/files/zabbix_proxy.in Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix2-server/files/zabbix_proxy.in Sun Apr 24 11:48:26 2016 (r413935) @@ -9,6 +9,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_proxy_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,34 @@ name="zabbix_proxy" rcvar=zabbix_proxy_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_proxy_enable="NO"} +: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_proxy_paths}" run_rc_command "$1" Modified: head/net-mgmt/zabbix2-server/files/zabbix_server.in ============================================================================== --- head/net-mgmt/zabbix2-server/files/zabbix_server.in Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix2-server/files/zabbix_server.in Sun Apr 24 11:48:26 2016 (r413935) @@ -9,6 +9,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_server_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,33 @@ name="zabbix_server" rcvar=zabbix_server_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_server_enable="NO"} +: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_server_paths}" run_rc_command "$1" Modified: head/net-mgmt/zabbix22-server/Makefile ============================================================================== --- head/net-mgmt/zabbix22-server/Makefile Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix22-server/Makefile Sun Apr 24 11:48:26 2016 (r413935) @@ -3,6 +3,7 @@ PORTNAME= zabbix22 PORTVERSION= 2.2.11 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: head/net-mgmt/zabbix22-server/files/zabbix_agentd.in ============================================================================== --- head/net-mgmt/zabbix22-server/files/zabbix_agentd.in Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix22-server/files/zabbix_agentd.in Sun Apr 24 11:48:26 2016 (r413935) @@ -9,6 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. +# zabbix_agentd_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,33 @@ name="zabbix_agentd" rcvar=zabbix_agentd_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_agentd_enable="NO"} +: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_agentd_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_agentd_paths}" run_rc_command "$1" Modified: head/net-mgmt/zabbix22-server/files/zabbix_proxy.in ============================================================================== --- head/net-mgmt/zabbix22-server/files/zabbix_proxy.in Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix22-server/files/zabbix_proxy.in Sun Apr 24 11:48:26 2016 (r413935) @@ -11,6 +11,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_proxy_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_proxy" rcvar=zabbix_proxy_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_proxy_enable="NO"} +: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_proxy_paths}" run_rc_command "$1" Modified: head/net-mgmt/zabbix22-server/files/zabbix_server.in ============================================================================== --- head/net-mgmt/zabbix22-server/files/zabbix_server.in Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix22-server/files/zabbix_server.in Sun Apr 24 11:48:26 2016 (r413935) @@ -11,6 +11,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_server_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_server" rcvar=zabbix_server_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_server_enable="NO"} +: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_server_paths}" run_rc_command "$1" Modified: head/net-mgmt/zabbix24-server/Makefile ============================================================================== --- head/net-mgmt/zabbix24-server/Makefile Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix24-server/Makefile Sun Apr 24 11:48:26 2016 (r413935) @@ -3,7 +3,7 @@ PORTNAME= zabbix24 PORTVERSION= 2.4.7 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: head/net-mgmt/zabbix24-server/files/zabbix_agentd.in ============================================================================== --- head/net-mgmt/zabbix24-server/files/zabbix_agentd.in Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix24-server/files/zabbix_agentd.in Sun Apr 24 11:48:26 2016 (r413935) @@ -9,6 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. +# zabbix_agentd_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,33 @@ name="zabbix_agentd" rcvar=zabbix_agentd_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_agentd_enable="NO"} +: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_agentd_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_agentd_paths}" run_rc_command "$1" Modified: head/net-mgmt/zabbix24-server/files/zabbix_proxy.in ============================================================================== --- head/net-mgmt/zabbix24-server/files/zabbix_proxy.in Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix24-server/files/zabbix_proxy.in Sun Apr 24 11:48:26 2016 (r413935) @@ -11,6 +11,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_proxy_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_proxy" rcvar=zabbix_proxy_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_proxy_enable="NO"} +: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_proxy_paths}" run_rc_command "$1" Modified: head/net-mgmt/zabbix24-server/files/zabbix_server.in ============================================================================== --- head/net-mgmt/zabbix24-server/files/zabbix_server.in Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix24-server/files/zabbix_server.in Sun Apr 24 11:48:26 2016 (r413935) @@ -11,6 +11,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_server_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_server" rcvar=zabbix_server_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_server_enable="NO"} +: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_server_paths}" run_rc_command "$1" Modified: head/net-mgmt/zabbix3-server/Makefile ============================================================================== --- head/net-mgmt/zabbix3-server/Makefile Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix3-server/Makefile Sun Apr 24 11:48:26 2016 (r413935) @@ -3,7 +3,7 @@ PORTNAME= zabbix3 PORTVERSION= 3.0.1 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: head/net-mgmt/zabbix3-server/files/zabbix_agentd.in ============================================================================== --- head/net-mgmt/zabbix3-server/files/zabbix_agentd.in Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix3-server/files/zabbix_agentd.in Sun Apr 24 11:48:26 2016 (r413935) @@ -9,6 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. +# zabbix_agentd_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -22,5 +26,30 @@ required_files="%%ETCDIR%%/${name}.conf" load_rc_config $name : ${zabbix_agentd_enable="NO"} +: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_agentd_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_agentd_paths}" run_rc_command "$1" Modified: head/net-mgmt/zabbix3-server/files/zabbix_proxy.in ============================================================================== --- head/net-mgmt/zabbix3-server/files/zabbix_proxy.in Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix3-server/files/zabbix_proxy.in Sun Apr 24 11:48:26 2016 (r413935) @@ -11,6 +11,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_proxy_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,34 @@ name="zabbix_proxy" rcvar=zabbix_proxy_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_proxy_enable="NO"} +: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_proxy_paths}" run_rc_command "$1" Modified: head/net-mgmt/zabbix3-server/files/zabbix_server.in ============================================================================== --- head/net-mgmt/zabbix3-server/files/zabbix_server.in Sun Apr 24 10:22:47 2016 (r413934) +++ head/net-mgmt/zabbix3-server/files/zabbix_server.in Sun Apr 24 11:48:26 2016 (r413935) @@ -11,6 +11,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_server_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_server" rcvar=zabbix_server_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_server_enable="NO"} +: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_server_paths}" run_rc_command "$1" From owner-svn-ports-all@freebsd.org Sun Apr 24 11:59:40 2016 Return-Path: Delivered-To: svn-ports-all@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 49A49B1BB72; Sun, 24 Apr 2016 11:59:40 +0000 (UTC) (envelope-from lme@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 0E2991658; Sun, 24 Apr 2016 11:59:39 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OBxdPm090948; Sun, 24 Apr 2016 11:59:39 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OBxbqx090932; Sun, 24 Apr 2016 11:59:37 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604241159.u3OBxbqx090932@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sun, 24 Apr 2016 11:59:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413936 - in branches/2016Q2/net-mgmt: zabbix2-server zabbix2-server/files zabbix22-server zabbix22-server/files zabbix24-server zabbix24-server/files zabbix3-server zabbix3-server/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 11:59:40 -0000 Author: lme Date: Sun Apr 24 11:59:37 2016 New Revision: 413936 URL: https://svnweb.freebsd.org/changeset/ports/413936 Log: MFH: r413935 - Fixes in {agent,proxy,server} rc start scripts: - SysV IPC leak - Restart race - Allow to specify a custom PATH in rc.conf - Bump PORTREVISION PR: 207896 Submitted by: kbowling Approved by: maintainer Sponsored by: Essen Linuxhotel Hackathon 2016 Approved by: portmgr (bapt) Modified: branches/2016Q2/net-mgmt/zabbix2-server/Makefile branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_agentd.in branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_proxy.in branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_server.in branches/2016Q2/net-mgmt/zabbix22-server/Makefile branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_agentd.in branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_proxy.in branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_server.in branches/2016Q2/net-mgmt/zabbix24-server/Makefile branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_agentd.in branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_proxy.in branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_server.in branches/2016Q2/net-mgmt/zabbix3-server/Makefile branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_agentd.in branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_proxy.in branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_server.in Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/net-mgmt/zabbix2-server/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/zabbix2-server/Makefile Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix2-server/Makefile Sun Apr 24 11:59:37 2016 (r413936) @@ -3,7 +3,7 @@ PORTNAME= zabbix2 PORTVERSION= 2.0.16 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_agentd.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_agentd.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_agentd.in Sun Apr 24 11:59:37 2016 (r413936) @@ -9,6 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. +# zabbix_agentd_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,33 @@ name="zabbix_agentd" rcvar=zabbix_agentd_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_agentd_enable="NO"} +: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_agentd_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_agentd_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_proxy.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_proxy.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_proxy.in Sun Apr 24 11:59:37 2016 (r413936) @@ -9,6 +9,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_proxy_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,34 @@ name="zabbix_proxy" rcvar=zabbix_proxy_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_proxy_enable="NO"} +: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_proxy_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_server.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_server.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix2-server/files/zabbix_server.in Sun Apr 24 11:59:37 2016 (r413936) @@ -9,6 +9,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_server_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,33 @@ name="zabbix_server" rcvar=zabbix_server_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_server_enable="NO"} +: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_server_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix22-server/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/zabbix22-server/Makefile Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix22-server/Makefile Sun Apr 24 11:59:37 2016 (r413936) @@ -3,6 +3,7 @@ PORTNAME= zabbix22 PORTVERSION= 2.2.11 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_agentd.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_agentd.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_agentd.in Sun Apr 24 11:59:37 2016 (r413936) @@ -9,6 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. +# zabbix_agentd_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,33 @@ name="zabbix_agentd" rcvar=zabbix_agentd_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_agentd_enable="NO"} +: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_agentd_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_agentd_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_proxy.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_proxy.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_proxy.in Sun Apr 24 11:59:37 2016 (r413936) @@ -11,6 +11,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_proxy_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_proxy" rcvar=zabbix_proxy_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_proxy_enable="NO"} +: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_proxy_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_server.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_server.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix22-server/files/zabbix_server.in Sun Apr 24 11:59:37 2016 (r413936) @@ -11,6 +11,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_server_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_server" rcvar=zabbix_server_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_server_enable="NO"} +: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_server_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix24-server/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/zabbix24-server/Makefile Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix24-server/Makefile Sun Apr 24 11:59:37 2016 (r413936) @@ -3,7 +3,7 @@ PORTNAME= zabbix24 PORTVERSION= 2.4.7 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_agentd.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_agentd.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_agentd.in Sun Apr 24 11:59:37 2016 (r413936) @@ -9,6 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. +# zabbix_agentd_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -16,11 +20,33 @@ name="zabbix_agentd" rcvar=zabbix_agentd_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_agentd_enable="NO"} +: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_agentd_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_agentd_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_proxy.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_proxy.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_proxy.in Sun Apr 24 11:59:37 2016 (r413936) @@ -11,6 +11,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_proxy_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_proxy" rcvar=zabbix_proxy_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_proxy_enable="NO"} +: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_proxy_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_server.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_server.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix24-server/files/zabbix_server.in Sun Apr 24 11:59:37 2016 (r413936) @@ -11,6 +11,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_server_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_server" rcvar=zabbix_server_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_server_enable="NO"} +: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_server_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix3-server/Makefile ============================================================================== --- branches/2016Q2/net-mgmt/zabbix3-server/Makefile Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix3-server/Makefile Sun Apr 24 11:59:37 2016 (r413936) @@ -3,7 +3,7 @@ PORTNAME= zabbix3 PORTVERSION= 3.0.1 -PORTREVISION?= 0 +PORTREVISION?= 2 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} PKGNAMESUFFIX?= -server Modified: branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_agentd.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_agentd.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_agentd.in Sun Apr 24 11:59:37 2016 (r413936) @@ -9,6 +9,10 @@ # # zabbix_agentd_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_agentd. +# zabbix_agentd_paths (string): Set to standard path by default. Set a search +# if you have custom userparams that need binaries elsewhere. +# zabbix_agentd_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -22,5 +26,30 @@ required_files="%%ETCDIR%%/${name}.conf" load_rc_config $name : ${zabbix_agentd_enable="NO"} +: ${zabbix_agentd_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_agentd_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_agentd_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_agentd_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_proxy.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_proxy.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_proxy.in Sun Apr 24 11:59:37 2016 (r413936) @@ -11,6 +11,10 @@ # # zabbix_proxy_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_proxy. +# zabbix_proxy_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_proxy_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,34 @@ name="zabbix_proxy" rcvar=zabbix_proxy_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_proxy_enable="NO"} +: ${zabbix_proxy_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_proxy_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_proxy_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_proxy_paths}" run_rc_command "$1" Modified: branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_server.in ============================================================================== --- branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_server.in Sun Apr 24 11:48:26 2016 (r413935) +++ branches/2016Q2/net-mgmt/zabbix3-server/files/zabbix_server.in Sun Apr 24 11:59:37 2016 (r413936) @@ -11,6 +11,10 @@ # # zabbix_server_enable (bool): Set to NO by default. Set it to YES to # enable zabbix_server. +# zabbix_server_paths (string): Set to standard path by default. Set a search +# if you have custom externals that need binaries elsewhere. +# zabbix_server_config (string): Set to the standard config file path by +# default. # . /etc/rc.subr @@ -18,11 +22,33 @@ name="zabbix_server" rcvar=zabbix_server_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%ETCDIR%%/${name}.conf" - load_rc_config $name : ${zabbix_server_enable="NO"} +: ${zabbix_server_paths=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin} +: ${zabbix_server_config="%%ETCDIR%%/${name}.conf"} + +command="%%PREFIX%%/sbin/${name}" +required_files="${zabbix_server_config}" +start_precmd="find_pidfile" +status_precmd="find_pidfile" +stop_precmd="find_pidfile" + +find_pidfile() +{ + if get_pidfile_from_conf PidFile ${zabbix_agentd_config}; then + pidfile="$_pidfile_from_conf" + else + pidfile="/tmp/${name}.pid" + fi + + # This shouldn't be necessary with pidfile, but empirically it was the + # only way to reap the parent PID instead of all PIDs from + # check_process, which may leak SysV IPC objects and prevent restart + # and/or race condition on restart. + rc_pid=$(check_pidfile ${pidfile} ${command}) +} + +export PATH="${zabbix_server_paths}" run_rc_command "$1" From owner-svn-ports-all@freebsd.org Sun Apr 24 12:10:00 2016 Return-Path: Delivered-To: svn-ports-all@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 C90C4B103C9; Sun, 24 Apr 2016 12:10:00 +0000 (UTC) (envelope-from lme@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 99CD91F84; Sun, 24 Apr 2016 12:10:00 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OC9xSD094052; Sun, 24 Apr 2016 12:09:59 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OC9xl5094051; Sun, 24 Apr 2016 12:09:59 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604241209.u3OC9xl5094051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sun, 24 Apr 2016 12:09:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413937 - head/sysutils/cdls X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 12:10:00 -0000 Author: lme Date: Sun Apr 24 12:09:59 2016 New Revision: 413937 URL: https://svnweb.freebsd.org/changeset/ports/413937 Log: - Update MASTERSITES - Update maintainer's e-mail address PR: 208777 Submitted by: maintainer Sponsored by: Essen Linuxhotel Hackathon 2016 Modified: head/sysutils/cdls/Makefile Modified: head/sysutils/cdls/Makefile ============================================================================== --- head/sysutils/cdls/Makefile Sun Apr 24 11:59:37 2016 (r413936) +++ head/sysutils/cdls/Makefile Sun Apr 24 12:09:59 2016 (r413937) @@ -1,13 +1,12 @@ -# Created by: Hans de Hartog +# Created by: Hans de Hartog # $FreeBSD$ PORTNAME= cdls PORTVERSION= 4.2 CATEGORIES= sysutils -MASTER_SITES= ftp://zml12.dyndns.org/ \ - ftp://vps337.directvps.nl/ +MASTER_SITES= ftp://freebsd4ever.xs4all.nl/ ftp://vps337.directvps.nl/ -MAINTAINER= hans@dehartog.nl +MAINTAINER= hansdehartog@xs4all.nl COMMENT= Curses based file manager for system managers PLIST_FILES= bin/cdls From owner-svn-ports-all@freebsd.org Sun Apr 24 12:16:25 2016 Return-Path: Delivered-To: svn-ports-all@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 05C1DB10538; Sun, 24 Apr 2016 12:16:25 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C04A112BC; Sun, 24 Apr 2016 12:16:24 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OCGNcd096964; Sun, 24 Apr 2016 12:16:23 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OCGNCJ096963; Sun, 24 Apr 2016 12:16:23 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201604241216.u3OCGNCJ096963@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sun, 24 Apr 2016 12:16:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413938 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 12:16:25 -0000 Author: rene Date: Sun Apr 24 12:16:23 2016 New Revision: 413938 URL: https://svnweb.freebsd.org/changeset/ports/413938 Log: Mk/bsd.java.mk: unregister expired java/linux-sun-jdk17 PR: 209011 Approved by: portmgr (bapt) Sponsored by: Essen Linuxhotel Hackathon 2016 Modified: head/Mk/bsd.java.mk Modified: head/Mk/bsd.java.mk ============================================================================== --- head/Mk/bsd.java.mk Sun Apr 24 12:09:59 2016 (r413937) +++ head/Mk/bsd.java.mk Sun Apr 24 12:16:23 2016 (r413938) @@ -172,8 +172,6 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_1_7_INFO= VERSION=1.7.0 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_OPENJDK_JDK_1_8_INFO= PORT=java/openjdk8 HOME=${LOCALBASE}/openjdk8 \ VERSION=1.8.0 OS=native VENDOR=openjdk -_JAVA_PORT_LINUX_SUN_JDK_1_7_INFO= PORT=java/linux-sun-jdk17 HOME=${LOCALBASE}/linux-sun-jdk1.7.0 \ - VERSION=1.7.0 OS=linux VENDOR=sun _JAVA_PORT_LINUX_ORACLE_JDK_1_8_INFO= PORT=java/linux-oracle-jdk18 HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \ VERSION=1.8.0 OS=linux VENDOR=oracle @@ -190,7 +188,6 @@ _JAVA_OS_linux= Linux __JAVA_PORTS_ALL= JAVA_PORT_NATIVE_OPENJDK_JDK_1_8 \ JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \ JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \ - JAVA_PORT_LINUX_SUN_JDK_1_7 \ JAVA_PORT_LINUX_ORACLE_JDK_1_8 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ ${__JAVA_PORTS_ALL} From owner-svn-ports-all@freebsd.org Sun Apr 24 12:29:56 2016 Return-Path: Delivered-To: svn-ports-all@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 92946B1097F; Sun, 24 Apr 2016 12:29:56 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4AC941949; Sun, 24 Apr 2016 12:29:56 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OCTtSg000335; Sun, 24 Apr 2016 12:29:55 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OCTtfx000332; Sun, 24 Apr 2016 12:29:55 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201604241229.u3OCTtfx000332@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sun, 24 Apr 2016 12:29:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413939 - in head: . java java/linux-sun-jdk17 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 12:29:56 -0000 Author: rene Date: Sun Apr 24 12:29:55 2016 New Revision: 413939 URL: https://svnweb.freebsd.org/changeset/ports/413939 Log: Remove expired port: 2016-02-29 java/linux-sun-jdk17: Unsupported and known for multiple security vulnerabilities Sponsored by: Essen Linuxhotel Hackathon 2016 Deleted: head/java/linux-sun-jdk17/ Modified: head/LEGAL head/MOVED head/java/Makefile Modified: head/LEGAL ============================================================================== --- head/LEGAL Sun Apr 24 12:16:23 2016 (r413938) +++ head/LEGAL Sun Apr 24 12:29:55 2016 (r413939) @@ -129,7 +129,6 @@ javax_comm-*-solsparc.* comms/java-comma jdk-6*-apidocs.zip java/jdk16-doc This documentation is under license and export control jdk-7*-apidocs.zip java/jdk7-doc This documentation is under license and export control jdk-8*-apidocs.zip java/jdk8-doc This documentation is under license and export control -jdk-7*-i586.tar.gz java/linux-sun-jdk17 Redistribution of repackaged binaries not permitted jdk-8*-i586.tar.gz java/linux-oracle-jdk18 Redistribution of repackaged binaries not permitted jfbuild-* games/jfsw Must be distributed only through the Internet and free of charge jmf-*-alljava.zip java/jmf Redistribution of pre-compiled binaries is not permitted Modified: head/MOVED ============================================================================== --- head/MOVED Sun Apr 24 12:16:23 2016 (r413938) +++ head/MOVED Sun Apr 24 12:29:55 2016 (r413939) @@ -8302,3 +8302,4 @@ www/download-gemist||2016-04-23|Has expi databases/p5-qdbm||2016-04-23|Has expired: Broken for more than 6 months comms/libfec||2016-04-23|Has expired: Broken for more than 6 months deskutils/ladon||2016-04-23|Has expired: Broken for more than 6 months +java/linux-sun-jdk17||2016-04-24|Has expired: Unsupported and known for multiple security vulnerabilities Modified: head/java/Makefile ============================================================================== --- head/java/Makefile Sun Apr 24 12:16:23 2016 (r413938) +++ head/java/Makefile Sun Apr 24 12:29:55 2016 (r413939) @@ -92,7 +92,6 @@ SUBDIR += langspec SUBDIR += linux-oracle-jdk18 SUBDIR += linux-oracle-jre18 - SUBDIR += linux-sun-jdk17 SUBDIR += linux-sun-jre17 SUBDIR += mmake SUBDIR += mx4j From owner-svn-ports-all@freebsd.org Sun Apr 24 12:35:32 2016 Return-Path: Delivered-To: svn-ports-all@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 49BCEB10B89; Sun, 24 Apr 2016 12:35:32 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1718A1E05; Sun, 24 Apr 2016 12:35:32 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OCZVQB003244; Sun, 24 Apr 2016 12:35:31 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OCZVxF003243; Sun, 24 Apr 2016 12:35:31 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201604241235.u3OCZVxF003243@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sun, 24 Apr 2016 12:35:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413940 - head/net/dimes X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 12:35:32 -0000 Author: rene Date: Sun Apr 24 12:35:31 2016 New Revision: 413940 URL: https://svnweb.freebsd.org/changeset/ports/413940 Log: net/dimes: unbreak INDEX by not demanding Sun as Java vendor. IBM is not a Java vendor in the Ports Tree anymore. Approved by: fixit blanket Sponsored by: Essen Linuxhotel Hackathon 2016 Modified: head/net/dimes/Makefile Modified: head/net/dimes/Makefile ============================================================================== --- head/net/dimes/Makefile Sun Apr 24 12:29:55 2016 (r413939) +++ head/net/dimes/Makefile Sun Apr 24 12:35:31 2016 (r413940) @@ -20,8 +20,6 @@ USE_JAVA= yes JAVA_VERSION= 1.6+ #java-linux required JAVA_OS= linux -#all vendors except forbidden: ibm -JAVA_VENDOR= sun DATADIR= ${JAVASHAREDIR}/dimes post-extract: From owner-svn-ports-all@freebsd.org Sun Apr 24 13:24:21 2016 Return-Path: Delivered-To: svn-ports-all@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 2E81FB196E9 for ; Sun, 24 Apr 2016 13:24:21 +0000 (UTC) (envelope-from grzegorz@blach.pl) Received: from 6.mo68.mail-out.ovh.net (6.mo68.mail-out.ovh.net [46.105.63.100]) (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 C1EE41435 for ; Sun, 24 Apr 2016 13:24:20 +0000 (UTC) (envelope-from grzegorz@blach.pl) Received: from mail416.ha.ovh.net (gw6.ovh.net [213.251.189.206]) by mo68.mail-out.ovh.net (Postfix) with SMTP id 55C00FF9CD6 for ; Sun, 24 Apr 2016 14:34:26 +0200 (CEST) Received: from localhost (HELO queueout) (127.0.0.1) by localhost with SMTP; 24 Apr 2016 14:34:25 +0200 Received: from user-46-113-104-123.play-internet.pl (HELO ?10.0.0.101?) (grzegorz@blach.pl@46.113.104.123) by ns0.ovh.net with SMTP; 24 Apr 2016 14:34:24 +0200 Message-ID: <1461501264.71534.4.camel@blach.pl> Subject: Re: svn commit: r413924 - in head/ftp: filezilla libfilezilla From: Grzegorz Blach To: Kurt Jaeger , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Date: Sun, 24 Apr 2016 14:34:24 +0200 In-Reply-To: <201604240744.u3O7iASP014428@repo.freebsd.org> References: <201604240744.u3O7iASP014428@repo.freebsd.org> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.18.5.1 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 13641403273344736939 X-Ovh-Remote: 46.113.104.123 (user-46-113-104-123.play-internet.pl) X-Ovh-Local: 213.186.33.20 (ns0.ovh.net) X-OVH-SPAMSTATE: OK X-OVH-SPAMSCORE: 0 X-OVH-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeekkedrjeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfenuceurghilhhouhhtmecufedttdenuc X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeekkedrjeefgdehudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjnecuuegrihhlohhuthemuceftddtnecu X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 13:24:21 -0000 Why you reverted USES=iconv:wchar_t to USES=iconv in libftpzilla? Without iconv:wchar_t connecting to FTP servers don't work. https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208121 On Sun, 2016-04-24 at 07:44 +0000, Kurt Jaeger wrote: > Author: pi > Date: Sun Apr 24 07:44:09 2016 > New Revision: 413924 > URL: https://svnweb.freebsd.org/changeset/ports/413924 > > Log: >   ftp/libfilezilla: 0.4.0.1 -> 0.5.0 >   ftp/filezilla: 3.16.0 -> 3.17.0 >    >   Changes: >     https://filezilla-project.org/changelog.php >    >   PR: 208999, 209000 >   Submitted by: (maintainer) > > Modified: >   head/ftp/filezilla/Makefile >   head/ftp/filezilla/distinfo >   head/ftp/libfilezilla/Makefile >   head/ftp/libfilezilla/distinfo > > Modified: head/ftp/filezilla/Makefile > ===================================================================== > ========= > --- head/ftp/filezilla/Makefile Sun Apr 24 07:39:34 2016 > (r413923) > +++ head/ftp/filezilla/Makefile Sun Apr 24 07:44:09 2016 > (r413924) > @@ -1,8 +1,7 @@ >  # $FreeBSD$ >   >  PORTNAME= filezilla > -PORTVERSION= 3.16.0 > -PORTREVISION= 1 > +PORTVERSION= 3.17.0 >  CATEGORIES= ftp >  MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION} >  DISTNAME= FileZilla_${PORTVERSION}_src > @@ -19,6 +18,7 @@ LIB_DEPENDS= libfilezilla.so:ftp/libfile >   libgcrypt.so:security/libgcrypt \ >   libgnutls.so:security/gnutls \ >   libidn.so:dns/libidn \ > + libnettle.so:security/nettle \ >   libpugixml.so:textproc/pugixml >   >  BROKEN_FreeBSD_9= requires C++14 complier, 9.x lacks C++11 > standard library > > Modified: head/ftp/filezilla/distinfo > ===================================================================== > ========= > --- head/ftp/filezilla/distinfo Sun Apr 24 07:39:34 2016 > (r413923) > +++ head/ftp/filezilla/distinfo Sun Apr 24 07:44:09 2016 > (r413924) > @@ -1,2 +1,2 @@ > -SHA256 (FileZilla_3.16.0_src.tar.bz2) = > 7dbd55a706ac1552ed4a0b86eeb59fcfc58cf6041b581c4dcf9a6cf560279b46 > -SIZE (FileZilla_3.16.0_src.tar.bz2) = 4406422 > +SHA256 (FileZilla_3.17.0_src.tar.bz2) = > 3763cd5cf833b43d9d3da763bfea6561cabf6a63e9fc698f02d101b82ffe656d > +SIZE (FileZilla_3.17.0_src.tar.bz2) = 4399584 > > Modified: head/ftp/libfilezilla/Makefile > ===================================================================== > ========= > --- head/ftp/libfilezilla/Makefile Sun Apr 24 07:39:34 2016 > (r413923) > +++ head/ftp/libfilezilla/Makefile Sun Apr 24 07:44:09 2016 > (r413924) > @@ -1,8 +1,7 @@ >  # $FreeBSD$ >   >  PORTNAME= libfilezilla > -PORTVERSION= 0.4.0.1 > -PORTREVISION= 1 > +PORTVERSION= 0.5.0 >  CATEGORIES= ftp >  MASTER_SITES= SF/filezilla/${PORTNAME}/${PORTVERSION} >   > @@ -16,7 +15,7 @@ BROKEN_powerpc64= Does not build >   >  BROKEN_FreeBSD_9= requires C++14 complier, 9.x lacks C++11 > standard library >   > -USES= compiler:c++14-lang gmake iconv:wchar_t libtool > localbase pathfix pkgconfig tar:bzip2 > +USES= compiler:c++14-lang gmake iconv libtool > localbase pathfix pkgconfig tar:bzip2 >  USE_LDCONFIG= yes >  GNU_CONFIGURE= yes >  INSTALL_TARGET= install-strip > > Modified: head/ftp/libfilezilla/distinfo > ===================================================================== > ========= > --- head/ftp/libfilezilla/distinfo Sun Apr 24 07:39:34 2016 > (r413923) > +++ head/ftp/libfilezilla/distinfo Sun Apr 24 07:44:09 2016 > (r413924) > @@ -1,2 +1,2 @@ > -SHA256 (libfilezilla-0.4.0.1.tar.bz2) = > 6003689254e9d250bcdefc1414dcc4a0d324fda3d59436a497e249b225f4b1d1 > -SIZE (libfilezilla-0.4.0.1.tar.bz2) = 373987 > +SHA256 (libfilezilla-0.5.0.tar.bz2) = > 8c6a1af13113bbb78e1c66ebbbffa84c0f0ee243c0789e9b92f8e11fcb84c51d > +SIZE (libfilezilla-0.5.0.tar.bz2) = 374549 > From owner-svn-ports-all@freebsd.org Sun Apr 24 13:38:31 2016 Return-Path: Delivered-To: svn-ports-all@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 3EA63B19C44; Sun, 24 Apr 2016 13:38:31 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay116.isp.belgacom.be (mailrelay116.isp.belgacom.be [195.238.20.143]) (using TLSv1.2 with cipher RC4-SHA (128/128 bits)) (Client CN "relay.skynet.be", Issuer "GlobalSign Organization Validation CA - SHA256 - G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 17CAA1C90; Sun, 24 Apr 2016 13:38:29 +0000 (UTC) (envelope-from tijl@freebsd.org) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2B6BgCPyxxX/4pJsVtegzhTbg+5dAENgXUihWYEAgKBEzkUAQEBAQEBAWUnQQEEDQGDbQEBAQMBOhwjBQsLDgYECRoLDyoeBhOIIgwKwAMBAQEBAQEBAQEBAQEBAQEBARUEimyKFQEEmA+FfIgPb4EBjSqGI4kMHgEBQoI2gTc6MAEBgTaDWIRrAQEB Received: from 138.73-177-91.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([91.177.73.138]) by relay.skynet.be with ESMTP; 24 Apr 2016 15:37:15 +0200 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.15.2/8.15.2) with ESMTP id u3ODbEOh002452; Sun, 24 Apr 2016 15:37:15 +0200 (CEST) (envelope-from tijl@FreeBSD.org) Date: Sun, 24 Apr 2016 15:37:14 +0200 From: Tijl Coosemans To: Jan Beich Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r413726 - in head: Mk/Uses www/firefox www/firefox-esr www/firefox-esr-i18n www/firefox-esr/files www/firefox-i18n www/firefox/files www/libxul www/libxul/files www/linux-firefox Message-ID: <20160424153714.78a11f70@kalimero.tijl.coosemans.org> In-Reply-To: <201604211118.u3LBIDqo045010@repo.freebsd.org> References: <201604211118.u3LBIDqo045010@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 13:38:31 -0000 On Thu, 21 Apr 2016 11:18:13 +0000 (UTC) Jan Beich wrote: > Author: jbeich > Date: Thu Apr 21 11:18:13 2016 > New Revision: 413726 > URL: https://svnweb.freebsd.org/changeset/ports/413726 > > Log: > www/firefox{,-esr}: update to 46.0 (rc4) / 45.1esr I don't think you should commit release candidates to the main port. Create www/firefox-beta for that or something. > Changes: https://www.mozilla.org/firefox/46.0/releasenotes/ > Changes: https://www.mozilla.org/firefox/45.1.0/releasenotes/ > Security: 92d44f83-a7bf-41cf-91ee-3d1b8ecf579f What does this number refer to? From owner-svn-ports-all@freebsd.org Sun Apr 24 13:50:54 2016 Return-Path: Delivered-To: svn-ports-all@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 EB4E7B19E22; Sun, 24 Apr 2016 13:50:54 +0000 (UTC) (envelope-from pi@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 BCDB710CB; Sun, 24 Apr 2016 13:50:54 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3ODor6d025097; Sun, 24 Apr 2016 13:50:53 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3ODors5025096; Sun, 24 Apr 2016 13:50:53 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201604241350.u3ODors5025096@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sun, 24 Apr 2016 13:50:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413941 - head/ftp/libfilezilla X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 13:50:55 -0000 Author: pi Date: Sun Apr 24 13:50:53 2016 New Revision: 413941 URL: https://svnweb.freebsd.org/changeset/ports/413941 Log: ftp/libftpzilla: set USES=iconv:wchar_t after last commit PR: 208121 Submitted by: (maintainer), gblach Modified: head/ftp/libfilezilla/Makefile Modified: head/ftp/libfilezilla/Makefile ============================================================================== --- head/ftp/libfilezilla/Makefile Sun Apr 24 12:35:31 2016 (r413940) +++ head/ftp/libfilezilla/Makefile Sun Apr 24 13:50:53 2016 (r413941) @@ -2,6 +2,7 @@ PORTNAME= libfilezilla PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= SF/filezilla/${PORTNAME}/${PORTVERSION} @@ -15,7 +16,7 @@ BROKEN_powerpc64= Does not build BROKEN_FreeBSD_9= requires C++14 complier, 9.x lacks C++11 standard library -USES= compiler:c++14-lang gmake iconv libtool localbase pathfix pkgconfig tar:bzip2 +USES= compiler:c++14-lang gmake iconv:wchar_t libtool localbase pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip From owner-svn-ports-all@freebsd.org Sun Apr 24 13:52:07 2016 Return-Path: Delivered-To: svn-ports-all@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 21C2AB19F82; Sun, 24 Apr 2016 13:52:07 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4]) (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 D8AA912D6; Sun, 24 Apr 2016 13:52:06 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from pi by fc.opsec.eu with local (Exim 4.87 (FreeBSD)) (envelope-from ) id 1auKSA-0009SU-5g; Sun, 24 Apr 2016 15:52:02 +0200 Date: Sun, 24 Apr 2016 15:52:02 +0200 From: Kurt Jaeger To: Grzegorz Blach Cc: Kurt Jaeger , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r413924 - in head/ftp: filezilla libfilezilla Message-ID: <20160424135202.GA87626@fc.opsec.eu> References: <201604240744.u3O7iASP014428@repo.freebsd.org> <1461501264.71534.4.camel@blach.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1461501264.71534.4.camel@blach.pl> X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 13:52:07 -0000 Hi! > Why you reverted USES=iconv:wchar_t to USES=iconv in libftpzilla? > Without iconv:wchar_t connecting to FTP servers don't work. > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208121 I based my commit on the previsous version, by mistake. Sorry for the mixup! Fixed. -- pi@FreeBSD.org +49 171 3101372 4 years to go ! From owner-svn-ports-all@freebsd.org Sun Apr 24 13:54:50 2016 Return-Path: Delivered-To: svn-ports-all@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 03C72B19FCA; Sun, 24 Apr 2016 13:54:50 +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 C81371509; Sun, 24 Apr 2016 13:54:49 +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 u3ODsmWk027895; Sun, 24 Apr 2016 13:54:48 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3ODsmKB027894; Sun, 24 Apr 2016 13:54:48 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201604241354.u3ODsmKB027894@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 24 Apr 2016 13:54:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413942 - head/audio/taglookup/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 13:54:50 -0000 Author: riggs Date: Sun Apr 24 13:54:48 2016 New Revision: 413942 URL: https://svnweb.freebsd.org/changeset/ports/413942 Log: Fix build with libc++ 3.8.0 PR: 208490 Submitted by: dim Approved by: maintainer timeout MFH: 2016Q2 (build fix blanket) Modified: head/audio/taglookup/files/patch-tag.cpp Modified: head/audio/taglookup/files/patch-tag.cpp ============================================================================== --- head/audio/taglookup/files/patch-tag.cpp Sun Apr 24 13:50:53 2016 (r413941) +++ head/audio/taglookup/files/patch-tag.cpp Sun Apr 24 13:54:48 2016 (r413942) @@ -20,3 +20,14 @@ return new_string; } // toUTF8String +@@ -166,8 +167,8 @@ namespace TagLookup + + bool operator() (const FileRefLengthPair &f1, const FileRefLengthPair &f2) + { +- if( abs(f1.second - x_) < +- abs(f2.second - x_) ) ++ if( abs((int)(f1.second - x_)) < ++ abs((int)(f2.second - x_)) ) + return true; + else + return false; From owner-svn-ports-all@freebsd.org Sun Apr 24 13:57:23 2016 Return-Path: Delivered-To: svn-ports-all@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 25E14B1A01F; Sun, 24 Apr 2016 13:57:23 +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 D985B172A; Sun, 24 Apr 2016 13:57:22 +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 u3ODvMXv028184; Sun, 24 Apr 2016 13:57:22 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3ODvMih028183; Sun, 24 Apr 2016 13:57:22 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201604241357.u3ODvMih028183@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 24 Apr 2016 13:57:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r413943 - branches/2016Q2/audio/taglookup/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-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 13:57:23 -0000 Author: riggs Date: Sun Apr 24 13:57:21 2016 New Revision: 413943 URL: https://svnweb.freebsd.org/changeset/ports/413943 Log: MFH: r413942 Fix build with libc++ 3.8.0 PR: 208490 Submitted by: dim Approved by: ports-secteam (build fix blanket), maintainer timeout Modified: branches/2016Q2/audio/taglookup/files/patch-tag.cpp Directory Properties: branches/2016Q2/ (props changed) Modified: branches/2016Q2/audio/taglookup/files/patch-tag.cpp ============================================================================== --- branches/2016Q2/audio/taglookup/files/patch-tag.cpp Sun Apr 24 13:54:48 2016 (r413942) +++ branches/2016Q2/audio/taglookup/files/patch-tag.cpp Sun Apr 24 13:57:21 2016 (r413943) @@ -20,3 +20,14 @@ return new_string; } // toUTF8String +@@ -166,8 +167,8 @@ namespace TagLookup + + bool operator() (const FileRefLengthPair &f1, const FileRefLengthPair &f2) + { +- if( abs(f1.second - x_) < +- abs(f2.second - x_) ) ++ if( abs((int)(f1.second - x_)) < ++ abs((int)(f2.second - x_)) ) + return true; + else + return false; From owner-svn-ports-all@freebsd.org Sun Apr 24 15:11:57 2016 Return-Path: Delivered-To: svn-ports-all@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 89DAAB1BB3E; Sun, 24 Apr 2016 15:11:57 +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 646E413AA; Sun, 24 Apr 2016 15:11:57 +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 u3OFBu7w052017; Sun, 24 Apr 2016 15:11:56 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OFBunV052015; Sun, 24 Apr 2016 15:11:56 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201604241511.u3OFBunV052015@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 24 Apr 2016 15:11:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413944 - head/multimedia/handbrake X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 15:11:57 -0000 Author: riggs Date: Sun Apr 24 15:11:56 2016 New Revision: 413944 URL: https://svnweb.freebsd.org/changeset/ports/413944 Log: Update to upstream version 0.10.5, turning FDK_AAC into an OPTION PR: 208334 Submitted by: woodsb02@gmail.com Reviewed by: riggs, jbeich Differential Revision: https://reviews.freebsd.org/D6077 Modified: head/multimedia/handbrake/Makefile head/multimedia/handbrake/distinfo Modified: head/multimedia/handbrake/Makefile ============================================================================== --- head/multimedia/handbrake/Makefile Sun Apr 24 13:57:21 2016 (r413943) +++ head/multimedia/handbrake/Makefile Sun Apr 24 15:11:56 2016 (r413944) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= handbrake -PORTVERSION= 0.10.2 -PORTREVISION= 2 +PORTVERSION= 0.10.5 CATEGORIES= multimedia MASTER_SITES= http://download.handbrake.fr/releases/${PORTVERSION}/ \ http://download.handbrake.fr/handbrake/contrib/:contrib \ @@ -20,13 +19,14 @@ DISTFILES= HandBrake-${PORTVERSION}.tar. libdvdread-5.0.0-6-gcb1ae87.tar.gz:contrib \ libvpx-v1.3.0.tar.bz2:contrib \ x264-r2479-dd79a61.tar.gz:contrib \ - x265-9329-0d30d2641875-1.5.tar.bz2:contrib + x265_1.9.tar.gz:contrib DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Versatile DVD ripper and video transcoder LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= yasm:devel/yasm \ cmake:devel/cmake @@ -46,12 +46,13 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/ CONFLICTS_BUILD= x265 .if !defined(PACKAGE_BUILDING) -# DVDCSS version hardcoded in contrib/libdvdread/libdvdread/src/dvd_input.c (dlopen'ed) +# DVDCSS version hardcoded in contrib/libdvdread/libdvdread-5.0.0-6-gcb1ae87/src/dvd_input.c (dlopen'ed) LIB_DEPENDS+= libdvdcss.so.2:multimedia/libdvdcss .endif GNU_CONFIGURE= yes -USES= autoreconf:build gmake iconv libtool:build pkgconfig python:build +USES= autoreconf:build compiler:features gmake iconv \ + libtool:build localbase pkgconfig python:build WRKSRC= ${WRKDIR}/HandBrake-${PORTVERSION} PLIST_FILES= bin/HandBrakeCLI @@ -66,10 +67,21 @@ MAKE_JOBS_UNSAFE= yes NOPRECIOUSMAKEVARS= yes # for ffmpeg and x264 -OPTIONS_DEFINE= X11 -X11_DESC= Build GTK+3 based GUI program +# Enforce linking to the system c++ standard lib +LDFLAGS+= -l${COMPILER_FEATURES:Mlib*c++:S/lib//} + +OPTIONS_DEFINE= FDK_AAC X11 OPTIONS_DEFAULT= X11 +FDK_AAC_DESC= Enable non-free Fraunhofer FDK AAC codec +X11_DESC= Build GTK+3 based GUI program + +FDK_AAC_CONFIGURE_ENABLE= fdk-aac +FDK_AAC_VARS= LICENSE+=FDK_AAC LICENSE_COMB=multi +LICENSE_NAME_FDK_AAC= Software License for The Fraunhofer FDK AAC Codec Library for Android +LICENSE_FILE_FDK_AAC= ${BUILD_WRKSRC}/contrib/fdkaac/${DISTFILES:Mfdk*:R:R}/NOTICE +LICENSE_PERMS_FDK_AAC= dist-mirror pkg-mirror auto-accept + .include # Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and @@ -85,8 +97,6 @@ MAKE_ENV+=ACLOCAL=${LOCALBASE}/bin/acloc .if ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+= --disable-gtk-update-checks --disable-gst -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib \ libnotify.so:devel/libnotify USES+= gettext @@ -103,13 +113,6 @@ DESKTOP_ENTRIES="HandBrake" \ CONFIGURE_ARGS+= --disable-gtk .endif -# Enforce linking to the system c++ standard lib -.if ${OSVERSION} >= 1000054 -LDFLAGS+= -lc++ -.else -LDFLAGS+= -lstdc++ -.endif - # HandBrake tries to fetch its dependencies during build phase, which is not # considered good in FreeBSD. Instead, we will prepare everything manually. post-extract: .SILENT @@ -119,24 +122,22 @@ post-extract: .SILENT ${MV} ${WRKDIR}/${d} ${BUILD_WRKSRC}/contrib/${d} .endfor # Others had to be processed one by one due to irregular (versioned) names - cd ${BUILD_WRKSRC}/contrib && ${MKDIR} faac faad2 fdkaac ffmpeg libbluray libdvdnav \ + cd ${BUILD_WRKSRC}/contrib && ${MKDIR} faac faad2 ffmpeg libbluray libdvdnav \ libdvdread libvpx x265 ${MV} ${WRKDIR}/faac-1.28 ${BUILD_WRKSRC}/contrib/faac ${MV} ${WRKDIR}/faad2-2.7 ${BUILD_WRKSRC}/contrib/faad2 - ${MV} ${WRKDIR}/fdk-aac-v0.1.1-6-gbae4553 ${BUILD_WRKSRC}/contrib/fdkaac ${MV} ${WRKDIR}/libav-v10.1 ${BUILD_WRKSRC}/contrib/ffmpeg/libav-v10.1 ${MV} ${WRKDIR}/libbluray-0.5.0 ${BUILD_WRKSRC}/contrib/libbluray ${MV} ${WRKDIR}/libdvdnav-5.0.1-0-gaa3659d ${BUILD_WRKSRC}/contrib/libdvdnav ${MV} ${WRKDIR}/libdvdread-5.0.0-6-gcb1ae87 ${BUILD_WRKSRC}/contrib/libdvdread ${MV} ${WRKDIR}/libvpx-v1.3.0 ${BUILD_WRKSRC}/contrib/libvpx - ${MV} ${WRKDIR}/x265-9329-0d30d2641875-1.5 ${BUILD_WRKSRC}/contrib/x265 + ${MV} ${WRKDIR}/x265_1.9 ${BUILD_WRKSRC}/contrib/x265 # Avoid conflict with `print/harfbuzz' (also installs "hb.h") ${MV} ${WRKSRC}/libhb/hb.h ${WRKSRC}/libhb/hb-of-handbrake.h # Mark all bundled dependencies as extracted ${TOUCH} ${BUILD_WRKSRC}/contrib/a52dec/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/faac/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/faad2/.stamp.extract - ${TOUCH} ${BUILD_WRKSRC}/contrib/fdkaac/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/ffmpeg/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/libbluray/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/libdca/.stamp.extract @@ -146,6 +147,11 @@ post-extract: .SILENT ${TOUCH} ${BUILD_WRKSRC}/contrib/x264/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/x265/.stamp.extract +post-extract-FDK_AAC-on: + ${MKDIR} ${BUILD_WRKSRC}/contrib/fdkaac + ${MV} ${WRKDIR}/fdk-aac-v0.1.1-6-gbae4553 ${BUILD_WRKSRC}/contrib/fdkaac + ${TOUCH} ${BUILD_WRKSRC}/contrib/fdkaac/.stamp.extract + post-patch: @${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|' \ ${BUILD_WRKSRC}/contrib/a52dec/a52dec/libao/audio_out_oss.c @@ -159,7 +165,7 @@ post-patch: -e '/GHB_PACKAGES=/s/gthread-2.0/& gmodule-2.0/' \ -e 's/-lhb/& ${ICONV_LIB}/' \ -e 's/-lhandbrake/& ${ICONV_LIB}/' \ - -e 's:-lxml2:& ../../contrib/lib/libx265.a ../../contrib/lib/libfdk-aac.a:g' \ + -e 's:-lxml2:& ../../contrib/lib/libx265.a:g' \ ${WRKSRC}/gtk/configure.ac @${REINPLACE_CMD} -e 's| ${WRKDIR}/A06-frame-threading-state.patch @${MV} ${WRKDIR}/A06-frame-threading-state.patch ${WRKSRC}/contrib/ffmpeg/ - @${REINPLACE_CMD} -e 's:/lib/cpp:${CPP}:g' ${BUILD_WRKSRC}/contrib/fdkaac/fdk-aac-v0.1.1-6-gbae4553/configure @${REINPLACE_CMD} -E \ -e 's|%%REP_CC%%|${CC}|g' \ -e 's|%%REP_CXX%%|${CXX}|g' \ @@ -180,16 +185,21 @@ post-patch: -e 's|%%REP_ARCHS%%|${CPUTYPE}|g' \ -e 's|%%REP_ICONV%%|${ICONV_LIB:S/-l//}|g' \ ${WRKSRC}/custom.defs -.if !${PORT_OPTIONS:MX11} + +post-patch-X11-off: @${REINPLACE_CMD} -e 's:--enable-libvpx:--disable-libvpx:' ${WRKSRC}/contrib/ffmpeg/module.defs @${REINPLACE_CMD} -e 's| vpx | |' \ ${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs -.endif + +post-patch-FDK_AAC-on: + @${REINPLACE_CMD} -e 's:/lib/cpp:${CPP}:g' ${BUILD_WRKSRC}/contrib/fdkaac/fdk-aac-v0.1.1-6-gbae4553/configure + @${REINPLACE_CMD} -e 's:-lxml2:& ../../contrib/lib/libfdk-aac.a:g' \ + ${WRKSRC}/gtk/configure.ac do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${STAGEDIR}${PREFIX}/bin -.if ${PORT_OPTIONS:MX11} + +do-install-X11-on: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gtk/src/ghb ${STAGEDIR}${PREFIX}/bin/HandBrake -.endif .include Modified: head/multimedia/handbrake/distinfo ============================================================================== --- head/multimedia/handbrake/distinfo Sun Apr 24 13:57:21 2016 (r413943) +++ head/multimedia/handbrake/distinfo Sun Apr 24 15:11:56 2016 (r413944) @@ -1,5 +1,5 @@ -SHA256 (handbrake/HandBrake-0.10.2.tar.bz2) = 4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699 -SIZE (handbrake/HandBrake-0.10.2.tar.bz2) = 10442635 +SHA256 (handbrake/HandBrake-0.10.5.tar.bz2) = fb9230dd121b456f6829d1d25ac8bbf76e503b51c4efc70f0a7fd2bb8607e2f0 +SIZE (handbrake/HandBrake-0.10.5.tar.bz2) = 10452839 SHA256 (handbrake/a52dec-0.7.4.tar.gz) = 54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47 SIZE (handbrake/a52dec-0.7.4.tar.gz) = 242978 SHA256 (handbrake/faac-1.28.tar.gz) = c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df @@ -22,5 +22,5 @@ SHA256 (handbrake/libvpx-v1.3.0.tar.bz2) SIZE (handbrake/libvpx-v1.3.0.tar.bz2) = 2084229 SHA256 (handbrake/x264-r2479-dd79a61.tar.gz) = 7307a83085f4110f8ae690748f00b5acb4882ec34b83ef260fec264c018c49e9 SIZE (handbrake/x264-r2479-dd79a61.tar.gz) = 785781 -SHA256 (handbrake/x265-9329-0d30d2641875-1.5.tar.bz2) = ff9ef4c9aae3b20497b4d1630bd89c1079a7904ac01227ba35366b9c5f9586d4 -SIZE (handbrake/x265-9329-0d30d2641875-1.5.tar.bz2) = 588124 +SHA256 (handbrake/x265_1.9.tar.gz) = 3e4654133ed957a98708fdb4cb9a154d9e80922b84e26e43fc462a101c5b15c8 +SIZE (handbrake/x265_1.9.tar.gz) = 956101 From owner-svn-ports-all@freebsd.org Sun Apr 24 15:32:48 2016 Return-Path: Delivered-To: svn-ports-all@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 A7E1CB19352; Sun, 24 Apr 2016 15:32:48 +0000 (UTC) (envelope-from gerald@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 75902168E; Sun, 24 Apr 2016 15:32:48 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OFWlHv058248; Sun, 24 Apr 2016 15:32:47 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OFWlHm058247; Sun, 24 Apr 2016 15:32:47 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201604241532.u3OFWlHm058247@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Sun, 24 Apr 2016 15:32:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413945 - head/lang/gcc7-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 15:32:48 -0000 Author: gerald Date: Sun Apr 24 15:32:47 2016 New Revision: 413945 URL: https://svnweb.freebsd.org/changeset/ports/413945 Log: Fix packaging list for libjava (conditional on the JAVA option). Modified: head/lang/gcc7-devel/pkg-plist Modified: head/lang/gcc7-devel/pkg-plist ============================================================================== --- head/lang/gcc7-devel/pkg-plist Sun Apr 24 15:11:56 2016 (r413944) +++ head/lang/gcc7-devel/pkg-plist Sun Apr 24 15:32:47 2016 (r413945) @@ -49,7 +49,7 @@ share/gcc-%%GCC_VERSION%%/python/libstdc %%JAVA%%bin/gtnameserv%%SUFFIX%% %%JAVA%%bin/jcf-dump%%SUFFIX%% %%JAVA%%bin/jv-convert%%SUFFIX%% -%%JAVA%%libdata/pkgconfig/libgcj-6.pc +%%JAVA%%libdata/pkgconfig/libgcj-7.pc %%JAVA%%man/man1/aot-compile%%SUFFIX%%.1.gz %%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz %%JAVA%%man/man1/gc-analyze%%SUFFIX%%.1.gz From owner-svn-ports-all@freebsd.org Sun Apr 24 15:39:18 2016 Return-Path: Delivered-To: svn-ports-all@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 740B6B193D0; Sun, 24 Apr 2016 15:39:18 +0000 (UTC) (envelope-from olgeni@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 42ABA17B7; Sun, 24 Apr 2016 15:39:18 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OFdHsq058668; Sun, 24 Apr 2016 15:39:17 GMT (envelope-from olgeni@FreeBSD.org) Received: (from olgeni@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OFdHZ3058666; Sun, 24 Apr 2016 15:39:17 GMT (envelope-from olgeni@FreeBSD.org) Message-Id: <201604241539.u3OFdHZ3058666@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olgeni set sender to olgeni@FreeBSD.org using -f From: Jimmy Olgeni Date: Sun, 24 Apr 2016 15:39:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413946 - head/devel/elixir-decimal X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 15:39:18 -0000 Author: olgeni Date: Sun Apr 24 15:39:17 2016 New Revision: 413946 URL: https://svnweb.freebsd.org/changeset/ports/413946 Log: Update devel/elixir-decimal to version 1.1.2. Modified: head/devel/elixir-decimal/Makefile head/devel/elixir-decimal/distinfo Modified: head/devel/elixir-decimal/Makefile ============================================================================== --- head/devel/elixir-decimal/Makefile Sun Apr 24 15:32:47 2016 (r413945) +++ head/devel/elixir-decimal/Makefile Sun Apr 24 15:39:17 2016 (r413946) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= decimal -PORTVERSION= 1.1.1 +PORTVERSION= 1.1.2 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMEPREFIX= elixir- Modified: head/devel/elixir-decimal/distinfo ============================================================================== --- head/devel/elixir-decimal/distinfo Sun Apr 24 15:32:47 2016 (r413945) +++ head/devel/elixir-decimal/distinfo Sun Apr 24 15:39:17 2016 (r413946) @@ -1,2 +1,2 @@ -SHA256 (ericmj-decimal-v1.1.1_GH0.tar.gz) = fa91ec00f2bcc967fc192646476ef217a4d87ad4d18026a26665f2ee61dc66f4 -SIZE (ericmj-decimal-v1.1.1_GH0.tar.gz) = 14086 +SHA256 (ericmj-decimal-v1.1.2_GH0.tar.gz) = 67041f236ab55be06f0b057c7ed4c6a5215e300383a15b62637acca9f4c7676f +SIZE (ericmj-decimal-v1.1.2_GH0.tar.gz) = 14397 From owner-svn-ports-all@freebsd.org Sun Apr 24 15:45:49 2016 Return-Path: Delivered-To: svn-ports-all@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 04425B195F5; Sun, 24 Apr 2016 15:45:49 +0000 (UTC) (envelope-from bsam@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 CAD9D1CE7; Sun, 24 Apr 2016 15:45:48 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OFjm89061617; Sun, 24 Apr 2016 15:45:48 GMT (envelope-from bsam@FreeBSD.org) Received: (from bsam@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OFjmII061616; Sun, 24 Apr 2016 15:45:48 GMT (envelope-from bsam@FreeBSD.org) Message-Id: <201604241545.u3OFjmII061616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bsam set sender to bsam@FreeBSD.org using -f From: Boris Samorodov Date: Sun, 24 Apr 2016 15:45:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413947 - head/devel/eric6 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 15:45:49 -0000 Author: bsam Date: Sun Apr 24 15:45:47 2016 New Revision: 413947 URL: https://svnweb.freebsd.org/changeset/ports/413947 Log: devel/eric6: Last bit to upgrade to v 6.1.4. Reported by: Mike Harding Modified: head/devel/eric6/Makefile.inc Modified: head/devel/eric6/Makefile.inc ============================================================================== --- head/devel/eric6/Makefile.inc Sun Apr 24 15:39:17 2016 (r413946) +++ head/devel/eric6/Makefile.inc Sun Apr 24 15:45:47 2016 (r413947) @@ -6,7 +6,7 @@ # french/eric6, german/eric6, russian/eric6 PORTNAME= eric6 -PORTVERSION= 6.1.3 +PORTVERSION= 6.1.4 MASTER_SITES= SF/eric-ide/${PORTNAME}/stable/${PORTVERSION} DISTNAME?= ${PORTNAME}-i18n-${I18N_LANG}-${PORTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} From owner-svn-ports-all@freebsd.org Sun Apr 24 16:14:10 2016 Return-Path: Delivered-To: svn-ports-all@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 23192B1B16C; Sun, 24 Apr 2016 16:14:10 +0000 (UTC) (envelope-from brooks@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 E58C61322; Sun, 24 Apr 2016 16:14:09 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OGE9BC071222; Sun, 24 Apr 2016 16:14:09 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OGE8Ib071214; Sun, 24 Apr 2016 16:14:08 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201604241614.u3OGE8Ib071214@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Sun, 24 Apr 2016 16:14:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413948 - in head: . devel devel/compiler-rt-devel devel/llvm-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 16:14:10 -0000 Author: brooks Date: Sun Apr 24 16:14:08 2016 New Revision: 413948 URL: https://svnweb.freebsd.org/changeset/ports/413948 Log: Upgrade to a new snapshot. Build compiler-rt alongside LLVM. It requires clang headers that we don't install because they are incompatible with FreeBSD headers. To make this work, configure and build compiler-rt in the post-build phase against the built, but not yet installed llvm tree. PR: 208900, 208923 Deleted: head/devel/compiler-rt-devel/ Modified: head/MOVED head/devel/Makefile head/devel/llvm-devel/Makefile head/devel/llvm-devel/Makefile.snapshot head/devel/llvm-devel/distinfo head/devel/llvm-devel/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Sun Apr 24 15:45:47 2016 (r413947) +++ head/MOVED Sun Apr 24 16:14:08 2016 (r413948) @@ -8303,3 +8303,4 @@ databases/p5-qdbm||2016-04-23|Has expire comms/libfec||2016-04-23|Has expired: Broken for more than 6 months deskutils/ladon||2016-04-23|Has expired: Broken for more than 6 months java/linux-sun-jdk17||2016-04-24|Has expired: Unsupported and known for multiple security vulnerabilities +devel/compiler-rt-devel|devel/llvm-devel/2016-04-24|Folded back in to devel/llvm-devel Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Sun Apr 24 15:45:47 2016 (r413947) +++ head/devel/Makefile Sun Apr 24 16:14:08 2016 (r413948) @@ -292,7 +292,6 @@ SUBDIR += commit-patch SUBDIR += commoncpp SUBDIR += compiler-rt - SUBDIR += compiler-rt-devel SUBDIR += compiz-bcop SUBDIR += concurrencykit SUBDIR += configkit Modified: head/devel/llvm-devel/Makefile ============================================================================== --- head/devel/llvm-devel/Makefile Sun Apr 24 15:45:47 2016 (r413947) +++ head/devel/llvm-devel/Makefile Sun Apr 24 16:14:08 2016 (r413948) @@ -32,11 +32,15 @@ GH_TAGNAME= ${LLVM_COMMIT} .include "Makefile.snapshot" OPTIONS_DEFINE= CLANG DOCS EXTRAS GOLD LIT LLD LLDB -OPTIONS_DEFINE_amd64= OPENMP +OPTIONS_DEFINE_amd64= COMPILER_RT OPENMP +OPTIONS_DEFINE_i386= COMPILER_RT OPTIONS_DEFAULT= CLANG EXTRAS GOLD LIT LLD LLDB -OPTIONS_DEFAULT_amd64= OPENMP +OPTIONS_DEFAULT_amd64= COMPILER_RT OPENMP +OPTIONS_DEFAULT_i386= COMPILER_RT OPTIONS_SUB= yes +PLIST_FILES= + CLANG_DESC= Build clang CLANG_EXTRA_PATCHES= \ ${PATCHDIR}/clang-patch-fformat_extensions.diff \ @@ -46,6 +50,10 @@ CLANG_GH_PROJECT= clang:clang CLANG_GH_TAGNAME= ${CLANG_COMMIT}:clang CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp CLANG_PORTDOCS= clang +COMPILER_RT_DESC= Sanitizer libraries +COMPILER_RT_GH_PROJECT= compiler-rt:compiler_rt +COMPILER_RT_GH_TAGNAME= ${COMPILER_RT_COMMIT}:compiler_rt +COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} DOCS_PORTDOCS= llvm DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ -DSPHINX_WARNINGS_AS_ERRORS=OFF \ @@ -184,6 +192,47 @@ NOT_FOR_ARCH= ia64 .include +_CRTLIBDIR= ${LLVM_PREFIX:S|${PREFIX}/||}/lib/freebsd +.if ${ARCH} == "amd64" +_COMPILER_RT_LIBS= \ + libclang_rt.asan-preinit-x86_64.a \ + libclang_rt.asan-x86_64.a \ + libclang_rt.asan-x86_64.a.syms \ + libclang_rt.asan-x86_64.so \ + libclang_rt.asan_cxx-x86_64.a \ + libclang_rt.asan_cxx-x86_64.a.syms \ + libclang_rt.builtins-x86_64.a \ + libclang_rt.dd-x86_64.a \ + libclang_rt.dyndd-x86_64.so \ + libclang_rt.lsan-x86_64.a \ + libclang_rt.profile-x86_64.a \ + libclang_rt.safestack-x86_64.a \ + libclang_rt.stats-x86_64.a \ + libclang_rt.stats_client-x86_64.a \ + libclang_rt.tsan-x86_64.a \ + libclang_rt.tsan-x86_64.a.syms \ + libclang_rt.tsan_cxx-x86_64.a \ + libclang_rt.tsan_cxx-x86_64.a.syms \ + libclang_rt.ubsan_standalone-x86_64.a \ + libclang_rt.ubsan_standalone-x86_64.a.syms \ + libclang_rt.ubsan_standalone_cxx-x86_64.a \ + libclang_rt.ubsan_standalone_cxx-x86_64.a.syms +.endif +.if ${ARCH} == "i386" || ${ARCH} == "amd64" +_COMPILER_RT_LIBS+= \ + libclang_rt.asan-i386.a \ + libclang_rt.asan-i386.so \ + libclang_rt.asan-preinit-i386.a \ + libclang_rt.asan_cxx-i386.a \ + libclang_rt.builtins-i386.a \ + libclang_rt.profile-i386.a \ + libclang_rt.safestack-i386.a \ + libclang_rt.stats-i386.a \ + libclang_rt.stats_client-i386.a \ + libclang_rt.ubsan_standalone-i386.a \ + libclang_rt.ubsan_standalone_cxx-i386.a +.endif + .if ${PORT_OPTIONS:MEXTRAS} COMMANDS+= ${EXTRAS_COMMANDS} MAN1SRCS+= extraclangtools.1 @@ -225,6 +274,14 @@ post-patch: -e 's|lit\.|lit${LLVM_SUFFIX}.|' \ ${WRKSRC}/utils/lit/lit.py ${WRKSRC}/utils/lit/lit/*.py +post-build-COMPILER_RT-on: + ${MKDIR} ${WRKSRC}/compiler-rt-build + cd ${WRKSRC}/compiler-rt-build && \ + ${CMAKE_BIN} ${CMAKE_ARGS} \ + -DLLVM_CONFIG_PATH=${CONFIGURE_WRKSRC}/bin/llvm-config \ + ${WRKSRC_compiler_rt} && \ + ${MAKE_ENV} ${MAKE_CMD} + post-install: ${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \ ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} @@ -250,6 +307,10 @@ post-install-CLANG-on: ${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \ ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp +post-install-COMPILER_RT-on: + cd ${WRKSRC}/compiler-rt-build && \ + ${MAKE_ENV} ${MAKE_CMD} ${INSTALL_TARGET} + post-install-LIT-on: ${INSTALL_SCRIPT} ${PATCH_WRKSRC}/utils/lit/lit.py \ ${STAGEDIR}${LLVM_PREFIX}/bin/lit @@ -295,7 +356,9 @@ build-plist: ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' | \ ${SORT} >> ${PLIST}.tmp awk '{ \ - if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /omp.h|${EXTRAS_PATTERN}/) {printf "%%%%CLANG%%%%"} \ + if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /omp.h|${EXTRAS_PATTERN}|libclang_rt/) {printf "%%%%CLANG%%%%"} \ + if ($$0 ~ /asan_blacklist.txt|sanitizer/) \ + {printf "%%%%COMPILER_RT%%%%"} \ if ($$0 ~ /lld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ @@ -305,6 +368,7 @@ build-plist: }' ${PLIST}.tmp >> ${PLIST} ${RM} -f ${PLIST}.tmp + check-commands: .for command in ${COMMANDS} test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command} Modified: head/devel/llvm-devel/Makefile.snapshot ============================================================================== --- head/devel/llvm-devel/Makefile.snapshot Sun Apr 24 15:45:47 2016 (r413947) +++ head/devel/llvm-devel/Makefile.snapshot Sun Apr 24 16:14:08 2016 (r413948) @@ -6,12 +6,12 @@ # LLVM_MAJOR= 3.9 LLVM_RELEASE= ${LLVM_MAJOR}.0 -SNAPDATE= 20160418 +SNAPDATE= 20160424 -LLVM_COMMIT= 6320b788a291bf1b1d24d5619c47c106cad1333d -CLANG_COMMIT= 86a3fc0fb95b653579aabf38588b96635d159b9c -COMPILER_RT_COMMIT= 82cd9449dfb3fe89012fd2294133dc93e6aa5cb5 -EXTRAS_COMMIT= 5778510702e0b009ade08b80c01fd730d9544328 -LLD_COMMIT= 5feae6211a2448e7e3e0d34d467c9b3bc91f6663 -LLDB_COMMIT= b3ce9c850ed2b0a5c76e0408ac67038bd21bc86a -OPENMP_COMMIT= c87f146dfd04c0478c8609b0158d77865a65a588 +LLVM_COMMIT= 028b451b44aefae091f5221f67973587e8715c6b +CLANG_COMMIT= 102c3e12543ad484452934b22c7805553497da09 +COMPILER_RT_COMMIT= 5d4cf0cc374036478e6227110f022fed3fe4df52 +EXTRAS_COMMIT= 46f563960f119f8ff3760f4df35f7f0081b71ad9 +LLD_COMMIT= 5d4a5f79d0a9d205f70eac103e546f04d214dd5a +LLDB_COMMIT= e7c932b408a4552264477e462ebef0c53cb52cf3 +OPENMP_COMMIT= 43ffd469908d01f0ff94d0d3325384c09de6d3b3 Modified: head/devel/llvm-devel/distinfo ============================================================================== --- head/devel/llvm-devel/distinfo Sun Apr 24 15:45:47 2016 (r413947) +++ head/devel/llvm-devel/distinfo Sun Apr 24 16:14:08 2016 (r413948) @@ -1,12 +1,14 @@ -SHA256 (llvm-mirror-llvm-3.9.d20160418-6320b788a291bf1b1d24d5619c47c106cad1333d_GH0.tar.gz) = a6537f48129d19c72bbfe36281b4d26ece213aa03a01624b965cd437e8735673 -SIZE (llvm-mirror-llvm-3.9.d20160418-6320b788a291bf1b1d24d5619c47c106cad1333d_GH0.tar.gz) = 25070292 -SHA256 (llvm-mirror-clang-86a3fc0fb95b653579aabf38588b96635d159b9c_GH0.tar.gz) = 48cbb1758bfeb48092bdb6ee842d6fd53e047b6e471ea920d4f0b0be2a5e1530 -SIZE (llvm-mirror-clang-86a3fc0fb95b653579aabf38588b96635d159b9c_GH0.tar.gz) = 13762731 -SHA256 (llvm-mirror-clang-tools-extra-5778510702e0b009ade08b80c01fd730d9544328_GH0.tar.gz) = b6f2c01aa20278fc50cec3463c6d1324f599552e249ef72a0826e4cd178dc57a -SIZE (llvm-mirror-clang-tools-extra-5778510702e0b009ade08b80c01fd730d9544328_GH0.tar.gz) = 520587 -SHA256 (llvm-mirror-lld-5feae6211a2448e7e3e0d34d467c9b3bc91f6663_GH0.tar.gz) = 8460cc0a6de7ec167bc208f4894ed3096f23487ad6eef7771cf84c155074aa0b -SIZE (llvm-mirror-lld-5feae6211a2448e7e3e0d34d467c9b3bc91f6663_GH0.tar.gz) = 572955 -SHA256 (llvm-mirror-lldb-b3ce9c850ed2b0a5c76e0408ac67038bd21bc86a_GH0.tar.gz) = 023dd1dcdeea338c40294f71a10054c922c5210e52cf36d10850e4b73e127d5a -SIZE (llvm-mirror-lldb-b3ce9c850ed2b0a5c76e0408ac67038bd21bc86a_GH0.tar.gz) = 17235486 -SHA256 (llvm-mirror-openmp-c87f146dfd04c0478c8609b0158d77865a65a588_GH0.tar.gz) = 5b8c5ba9a961847aa57b1244a16cfe700d7c3e2453bb52c7b88307c6318d5a36 -SIZE (llvm-mirror-openmp-c87f146dfd04c0478c8609b0158d77865a65a588_GH0.tar.gz) = 2810835 +SHA256 (llvm-mirror-llvm-3.9.d20160424-028b451b44aefae091f5221f67973587e8715c6b_GH0.tar.gz) = 3efdb96090c55bc133eb34df8baa758f962829a9e8ef68749bb3bd0904a24f2b +SIZE (llvm-mirror-llvm-3.9.d20160424-028b451b44aefae091f5221f67973587e8715c6b_GH0.tar.gz) = 25185772 +SHA256 (llvm-mirror-clang-102c3e12543ad484452934b22c7805553497da09_GH0.tar.gz) = 2b62bbaf65af0526628f2f91490a32bba500c1308d105098e54f24335745c1b2 +SIZE (llvm-mirror-clang-102c3e12543ad484452934b22c7805553497da09_GH0.tar.gz) = 13795746 +SHA256 (llvm-mirror-compiler-rt-5d4cf0cc374036478e6227110f022fed3fe4df52_GH0.tar.gz) = 60ea92e219bed1a74a4e14190bc5ebe2f31000d8fba05fcf0923a0acc8ed2a6b +SIZE (llvm-mirror-compiler-rt-5d4cf0cc374036478e6227110f022fed3fe4df52_GH0.tar.gz) = 2283693 +SHA256 (llvm-mirror-clang-tools-extra-46f563960f119f8ff3760f4df35f7f0081b71ad9_GH0.tar.gz) = b906bb093d69fa82f577d33ac32ac275564af846ffb7a059a649eca0ddb338f7 +SIZE (llvm-mirror-clang-tools-extra-46f563960f119f8ff3760f4df35f7f0081b71ad9_GH0.tar.gz) = 532683 +SHA256 (llvm-mirror-lld-5d4a5f79d0a9d205f70eac103e546f04d214dd5a_GH0.tar.gz) = 6640276913b2f25533655c3138af9e5f83fb394d661b72b557515ea327f081a4 +SIZE (llvm-mirror-lld-5d4a5f79d0a9d205f70eac103e546f04d214dd5a_GH0.tar.gz) = 581001 +SHA256 (llvm-mirror-lldb-e7c932b408a4552264477e462ebef0c53cb52cf3_GH0.tar.gz) = 9f5d15d5760a621ff5d6ab994a74028b9e94b2eb39f6b2eb7a109439e378e66b +SIZE (llvm-mirror-lldb-e7c932b408a4552264477e462ebef0c53cb52cf3_GH0.tar.gz) = 17241829 +SHA256 (llvm-mirror-openmp-43ffd469908d01f0ff94d0d3325384c09de6d3b3_GH0.tar.gz) = b0f9cba4c807e0e58462820ca574b86e045de238fc6a7458a58c38f437f340e3 +SIZE (llvm-mirror-openmp-43ffd469908d01f0ff94d0d3325384c09de6d3b3_GH0.tar.gz) = 2810976 Modified: head/devel/llvm-devel/pkg-plist ============================================================================== --- head/devel/llvm-devel/pkg-plist Sun Apr 24 15:45:47 2016 (r413947) +++ head/devel/llvm-devel/pkg-plist Sun Apr 24 16:14:08 2016 (r413948) @@ -54,6 +54,7 @@ bin/sancov-devel %%LIT%%llvm-devel/bin/llvm-lit %%LIT%%bin/FileCheck-devel %%LIT%%llvm-devel/bin/FileCheck +%%COMPILER_RT%%llvm-devel/asan_blacklist.txt llvm-devel/bin/bugpoint %%CLANG%%llvm-devel/bin/c-index-test %%CLANG%%llvm-devel/bin/clang @@ -1574,6 +1575,7 @@ llvm-devel/include/llvm/IR/ModuleSummary llvm-devel/include/llvm/IR/NoFolder.h llvm-devel/include/llvm/IR/OperandTraits.h llvm-devel/include/llvm/IR/Operator.h +llvm-devel/include/llvm/IR/OptBisect.h llvm-devel/include/llvm/IR/PassManager.h llvm-devel/include/llvm/IR/PassManagerInternal.h llvm-devel/include/llvm/IR/PatternMatch.h @@ -1895,11 +1897,13 @@ llvm-devel/include/llvm/Transforms/Instr llvm-devel/include/llvm/Transforms/ObjCARC.h llvm-devel/include/llvm/Transforms/Scalar.h llvm-devel/include/llvm/Transforms/Scalar/ADCE.h +llvm-devel/include/llvm/Transforms/Scalar/DCE.h llvm-devel/include/llvm/Transforms/Scalar/EarlyCSE.h llvm-devel/include/llvm/Transforms/Scalar/GVN.h llvm-devel/include/llvm/Transforms/Scalar/LowerExpectIntrinsic.h llvm-devel/include/llvm/Transforms/Scalar/SROA.h llvm-devel/include/llvm/Transforms/Scalar/SimplifyCFG.h +llvm-devel/include/llvm/Transforms/Scalar/Sink.h llvm-devel/include/llvm/Transforms/Utils/ASanStackFrameLayout.h llvm-devel/include/llvm/Transforms/Utils/BasicBlockUtils.h llvm-devel/include/llvm/Transforms/Utils/BuildLibCalls.h @@ -1929,6 +1933,15 @@ llvm-devel/include/llvm/Transforms/Utils llvm-devel/include/llvm/Transforms/Utils/UnrollLoop.h llvm-devel/include/llvm/Transforms/Utils/ValueMapper.h llvm-devel/include/llvm/Transforms/Vectorize.h +%%COMPILER_RT%%llvm-devel/include/sanitizer/allocator_interface.h +%%COMPILER_RT%%llvm-devel/include/sanitizer/asan_interface.h +%%COMPILER_RT%%llvm-devel/include/sanitizer/common_interface_defs.h +%%COMPILER_RT%%llvm-devel/include/sanitizer/coverage_interface.h +%%COMPILER_RT%%llvm-devel/include/sanitizer/dfsan_interface.h +%%COMPILER_RT%%llvm-devel/include/sanitizer/linux_syscall_hooks.h +%%COMPILER_RT%%llvm-devel/include/sanitizer/lsan_interface.h +%%COMPILER_RT%%llvm-devel/include/sanitizer/msan_interface.h +%%COMPILER_RT%%llvm-devel/include/sanitizer/tsan_interface_atomic.h llvm-devel/lib/BugpointPasses.so llvm-devel/lib/LLVMHello.so %%GOLD%%llvm-devel/lib/LLVMgold.so @@ -1952,6 +1965,7 @@ llvm-devel/lib/LLVMHello.so %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512fintrin.h %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512ifmaintrin.h %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512ifmavlintrin.h +%%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512pfintrin.h %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vbmiintrin.h %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vbmivlintrin.h %%CLANG%%llvm-devel/lib/clang/3.9.0/include/avx512vlbwintrin.h @@ -2166,6 +2180,7 @@ llvm-devel/lib/libLTO.so %%CLANG%%llvm-devel/lib/libclangFormat.a %%CLANG%%llvm-devel/lib/libclangFrontend.a %%CLANG%%llvm-devel/lib/libclangFrontendTool.a +%%CLANG%%llvm-devel/lib/libclangIncludeFixer.a %%CLANG%%llvm-devel/lib/libclangIndex.a %%CLANG%%llvm-devel/lib/libclangLex.a %%CLANG%%llvm-devel/lib/libclangParse.a From owner-svn-ports-all@freebsd.org Sun Apr 24 16:45:16 2016 Return-Path: Delivered-To: svn-ports-all@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 72A51B1B920 for ; Sun, 24 Apr 2016 16:45:16 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: from vfemail.net (onethreetwo.vfemail.net [199.16.11.132]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18D1F1710 for ; Sun, 24 Apr 2016 16:45:15 +0000 (UTC) (envelope-from jbeich@freebsd.org) Received: (qmail 31214 invoked by uid 89); 24 Apr 2016 16:38:32 -0000 Received: from localhost (HELO freequeue.vfemail.net) (127.0.0.1) by localhost with (DHE-RSA-AES256-SHA encrypted) SMTP; 24 Apr 2016 16:38:32 -0000 Received: (qmail 31202 invoked by uid 89); 24 Apr 2016 16:38:14 -0000 Received: by simscan 1.3.1 ppid: 31194, pid: 31198, t: 0.0045s scanners:none Received: from unknown (HELO smtp102-2.vfemail.net) (172.16.100.62) by FreeQueue with SMTP; 24 Apr 2016 16:38:14 -0000 Received: (qmail 29833 invoked by uid 89); 24 Apr 2016 16:38:14 -0000 Received: by simscan 1.4.0 ppid: 29811, pid: 29825, t: 0.5988s scanners:none Received: from unknown (HELO nil) (amJlaWNoQHZmZW1haWwubmV0@172.16.100.27) by mail.vfemail.net with ESMTPA; 24 Apr 2016 16:38:14 -0000 From: Jan Beich To: Tijl Coosemans Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r413726 - in head: Mk/Uses www/firefox www/firefox-esr www/firefox-esr-i18n www/firefox-esr/files www/firefox-i18n www/firefox/files www/libxul www/libxul/files www/linux-firefox References: <201604211118.u3LBIDqo045010@repo.freebsd.org> <20160424153714.78a11f70@kalimero.tijl.coosemans.org> Date: Sun, 24 Apr 2016 18:38:04 +0200 In-Reply-To: <20160424153714.78a11f70@kalimero.tijl.coosemans.org> (Tijl Coosemans's message of "Sun, 24 Apr 2016 15:37:14 +0200") Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 16:45:16 -0000 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Tijl Coosemans writes: > On Thu, 21 Apr 2016 11:18:13 +0000 (UTC) Jan Beich w= rote: > >> Author: jbeich >> Date: Thu Apr 21 11:18:13 2016 >> New Revision: 413726 >> URL: https://svnweb.freebsd.org/changeset/ports/413726 >>=20 >> Log: >> www/firefox{,-esr}: update to 46.0 (rc4) / 45.1esr > > I don't think you should commit release candidates to the main port. Firefox release candidates are not of beta quality, especially less than a week before the (scheduled) announcement. At this point anything not found during beta lifecycle is likely specific to FreeBSD or the port (e.g. patches, configure options). For one, OMTC crashes weren't noticed before firefox 40.0 merged to /head. If you fear stability issues switch to www/firefox-esr. There's also a vulnerability window 1-2 weeks before each release when security fixes have landed but not yet propagated to users. One way to find them is to look for commits associated with "access denied" bugs, except those hiding corporate details. Mozilla wants downstream to get the fixes on the release day but given FreeBSD is Tier3 platform (i.e. regressions don't block) we won't get them unless pkg.freebsd.org is given a few days to build. OTOH, Tier1 platforms can just ignore downstream e.g., https://blog.mozilla.org/futurereleases/2016/04/21/firefox-default-browser-= for-linux-users-ubuntu-new-snap-format-coming-soon/ > Create www/firefox-beta for that or something. Who is going to use it? Why should I care about the rest of gecko@ then? www/firefox-nightly would be more interesting but I've burnt out maintaining it once and not confident this won't repeat. > >> Changes: https://www.mozilla.org/firefox/46.0/releasenotes/ >> Changes: https://www.mozilla.org/firefox/45.1.0/releasenotes/ >> Security: 92d44f83-a7bf-41cf-91ee-3d1b8ecf579f > > What does this number refer to? "Reserved" in the spirit of CVEs. ;) That VuXML entry will be populated once the new batch of MFSAs is published with 46.0 release announcement. =2D- Not sure what's the issue here other than maintainer has to be careful in order to avoid churn of too many release candidates and annoy users. If the candidate is promoted to release there's nothing to do. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQF8BAEBCgBmBQJXHPZtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3bcTEH/RDJ2RjbclXs2AgenczFziUg FuyHxyMQJ6tnD6L9TK6Zjt5Rh+BmhO7w+Z+nvv7x9zPXO1bTSNYBypmFOexnYzBR eYcdhGlM6sGQ/rCvS9DGREJc/ttOGat3/APuNj+UIWMnnkIbLUfa/UrFhJM+Kotw SSjoe80THJWTFnt08jMC5uECgFdAQocR9qD5gVZ/Ehj5PI9i2i2hkoPGCcmkGsFO 0jHZbyjsNe1k53KkNnt3oGtIn/MDegtpz9zLRBFhRlp5TtnBZCI4ENO4fubez0m4 r+XNhjxIG6oB153Pjqo258FmuqdZKyKC9gUqtvHvG9FyNXZqg7KSaCO6uQOSvO0= =NHcB -----END PGP SIGNATURE----- --=-=-=-- From owner-svn-ports-all@freebsd.org Sun Apr 24 16:51:37 2016 Return-Path: Delivered-To: svn-ports-all@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 C9794B1BA48; Sun, 24 Apr 2016 16:51:37 +0000 (UTC) (envelope-from danilo@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 9B8811A1F; Sun, 24 Apr 2016 16:51:37 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OGpaRA082863; Sun, 24 Apr 2016 16:51:36 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OGpaOm082861; Sun, 24 Apr 2016 16:51:36 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201604241651.u3OGpaOm082861@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Sun, 24 Apr 2016 16:51:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413949 - head/editors/tea X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 16:51:37 -0000 Author: danilo Date: Sun Apr 24 16:51:36 2016 New Revision: 413949 URL: https://svnweb.freebsd.org/changeset/ports/413949 Log: - Update to 41.1.1 Modified: head/editors/tea/Makefile head/editors/tea/distinfo Modified: head/editors/tea/Makefile ============================================================================== --- head/editors/tea/Makefile Sun Apr 24 16:14:08 2016 (r413948) +++ head/editors/tea/Makefile Sun Apr 24 16:51:36 2016 (r413949) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tea -PORTVERSION= 41.1.0 +PORTVERSION= 41.1.1 CATEGORIES= editors MASTER_SITES= http://semiletov.org/tea/dloads/ Modified: head/editors/tea/distinfo ============================================================================== --- head/editors/tea/distinfo Sun Apr 24 16:14:08 2016 (r413948) +++ head/editors/tea/distinfo Sun Apr 24 16:51:36 2016 (r413949) @@ -1,2 +1,2 @@ -SHA256 (tea-41.1.0.tar.bz2) = 65ea128739802b7626a5a59de12b0e885dcef7a83f7bcd06b6d3aea830ed8717 -SIZE (tea-41.1.0.tar.bz2) = 381370 +SHA256 (tea-41.1.1.tar.bz2) = 5f17a1f190c7a31f326273f5c987378f9fdbc3fc34a7d0a97529bc926492bef9 +SIZE (tea-41.1.1.tar.bz2) = 382592 From owner-svn-ports-all@freebsd.org Sun Apr 24 16:58:59 2016 Return-Path: Delivered-To: svn-ports-all@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 94EA4B1BAB0; Sun, 24 Apr 2016 16:58:59 +0000 (UTC) (envelope-from lme@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 576E21C0F; Sun, 24 Apr 2016 16:58:59 +0000 (UTC) (envelope-from lme@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OGwwD8084062; Sun, 24 Apr 2016 16:58:58 GMT (envelope-from lme@FreeBSD.org) Received: (from lme@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OGwwL8084058; Sun, 24 Apr 2016 16:58:58 GMT (envelope-from lme@FreeBSD.org) Message-Id: <201604241658.u3OGwwL8084058@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lme set sender to lme@FreeBSD.org using -f From: Lars Engels Date: Sun, 24 Apr 2016 16:58:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413950 - in head: . net-mgmt/icinga2 net-mgmt/icinga2/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 16:58:59 -0000 Author: lme Date: Sun Apr 24 16:58:58 2016 New Revision: 413950 URL: https://svnweb.freebsd.org/changeset/ports/413950 Log: - Update to 2.4.7 - Introduce new rc.conf variable "icinga2_mkvar" defaulting to "NO". The variable controls the creation and chown'ing of missing files and directories in /var. [1] - Add an UPDATING entry for this PR: 206022 [1] Submitted by: Oliver Hartmann Sponsored by: Essen Linuxhotel Hackathon 2016 Modified: head/UPDATING head/net-mgmt/icinga2/Makefile head/net-mgmt/icinga2/distinfo head/net-mgmt/icinga2/files/icinga2.in Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Apr 24 16:51:36 2016 (r413949) +++ head/UPDATING Sun Apr 24 16:58:58 2016 (r413950) @@ -5,6 +5,16 @@ 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. +20160414: + AFFECTS: Users of net-mgmt/icinga2 + AUTHOR: lme@FreeBSD.org + + The creation of Icinga2 directories and files in /var is now controlled + by the /etc/rc.conf variable icinga2_mkvar. Earlier ports always + created the /var entries, but could slow startup significantly when /var + was a normal disk rather than a RAM disk. icinga2_mkvar defaults to + "NO". + 20160415: AFFECTS: users of audio/chromaprint AUTHOR: jhale@FreeBSD.org @@ -31,7 +41,6 @@ you update your ports collection, before ttrssd_local_db="NO" in your /etc/rc.conf . - 20160414: AFFECTS: Users of graphics/kipi-plugin-googledrive and graphics/kipi-plugin-picasaweb AUTHOR: kde@FreeBSD.org Modified: head/net-mgmt/icinga2/Makefile ============================================================================== --- head/net-mgmt/icinga2/Makefile Sun Apr 24 16:51:36 2016 (r413949) +++ head/net-mgmt/icinga2/Makefile Sun Apr 24 16:58:58 2016 (r413950) @@ -2,7 +2,7 @@ PORTNAME= icinga2 DISTVERSIONPREFIX= v -DISTVERSION= 2.4.4 +DISTVERSION= 2.4.7 CATEGORIES= net-mgmt MAINTAINER= lme@FreeBSD.org Modified: head/net-mgmt/icinga2/distinfo ============================================================================== --- head/net-mgmt/icinga2/distinfo Sun Apr 24 16:51:36 2016 (r413949) +++ head/net-mgmt/icinga2/distinfo Sun Apr 24 16:58:58 2016 (r413950) @@ -1,2 +1,2 @@ -SHA256 (icinga-icinga2-v2.4.4_GH0.tar.gz) = ce19ed52c447929f5f9dae11b75d080b76b7aa680ee930c59db4202a2218d6b5 -SIZE (icinga-icinga2-v2.4.4_GH0.tar.gz) = 1361983 +SHA256 (icinga-icinga2-v2.4.7_GH0.tar.gz) = db00c3bf1be5b18a477953f39df467039521d4f00826951d5c6de43cef96acd9 +SIZE (icinga-icinga2-v2.4.7_GH0.tar.gz) = 1763118 Modified: head/net-mgmt/icinga2/files/icinga2.in ============================================================================== --- head/net-mgmt/icinga2/files/icinga2.in Sun Apr 24 16:51:36 2016 (r413949) +++ head/net-mgmt/icinga2/files/icinga2.in Sun Apr 24 16:58:58 2016 (r413950) @@ -12,6 +12,9 @@ # Set it to "YES" to enable icinga2. # icinga2_flags (str): Set to "" by default. # icinga2_configfile (str): Set to "%%PREFIX%%/etc/icinga2/icinga2.cfg" by default. +# icinga2_mkvar (bool): Set to "NO" by default. +# Set it to "YES" to have the rc script create all +# directories in /var (needed when /var is on a ramdisk) # . /etc/rc.subr @@ -27,6 +30,7 @@ load_rc_config "${name}" : ${icinga2_enable:="NO"} : ${icinga2_configfile="%%PREFIX%%/etc/${name}/${name}.conf"} +: ${icinga2_mkvar:="NO"} command="%%PREFIX%%/sbin/${name}" procname="/usr/local/lib/icinga2/sbin/icinga2" @@ -79,26 +83,28 @@ reload_precmd() { } start_precmd() { - # Create necessary directories / change ownership - # - # While this is also done through pkg-plist, /var might be on a ramdisk, - # so make sure all needed files and directories are created before starting - # Icinga. - for d in "${icinga2_logdir}" "${icinga2_logdir}/compat" \ - "${icinga2_logdir}/compat/archives" "${icinga2_libdir}" \ - "${icinga2_spooldir}" "${icinga2_spooldir}/tmp" \ - "${icinga2_rundir}" "${icinga2_cachedir}"; do - if [ ! -d "${d}" ]; then - install -d -o ${icinga2_user} -g ${icinga2_group} "${d}" - else - chown ${icinga2_user}:${icinga2_group} "${d}" - fi - done + if checkyesno "icinga2_mkvar"; then + # Create necessary directories / change ownership + # + # While this is also done through pkg-plist, /var might be on a ramdisk, + # so make sure all needed files and directories are created before starting + # Icinga. + for d in "${icinga2_logdir}" "${icinga2_logdir}/compat" \ + "${icinga2_logdir}/compat/archives" "${icinga2_libdir}" \ + "${icinga2_spooldir}" "${icinga2_spooldir}/tmp" \ + "${icinga2_rundir}" "${icinga2_cachedir}"; do + if [ ! -d "${d}" ]; then + install -d -o ${icinga2_user} -g ${icinga2_group} "${d}" + else + chown ${icinga2_user}:${icinga2_group} "${d}" + fi + done - install -d -o ${icinga2_user} -g %%WWWGRP%% "${icinga2_rundir}/cmd" + install -d -o ${icinga2_user} -g %%WWWGRP%% "${icinga2_rundir}/cmd" - chown -R ${icinga2_user}:${icinga2_user} "${icinga2_libdir}" - chown -R ${icinga2_user}:${icinga2_user} "${icinga2_spooldir}" + chown -R ${icinga2_user}:${icinga2_user} "${icinga2_libdir}" + chown -R ${icinga2_user}:${icinga2_user} "${icinga2_spooldir}" + fi if ! icinga2_checkconfig; then return 1 From owner-svn-ports-all@freebsd.org Sun Apr 24 17:19:47 2016 Return-Path: Delivered-To: svn-ports-all@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 80CDCB1B0F2; Sun, 24 Apr 2016 17:19:47 +0000 (UTC) (envelope-from danilo@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 5316117F0; Sun, 24 Apr 2016 17:19:47 +0000 (UTC) (envelope-from danilo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OHJki1090453; Sun, 24 Apr 2016 17:19:46 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OHJkLW090450; Sun, 24 Apr 2016 17:19:46 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201604241719.u3OHJkLW090450@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Sun, 24 Apr 2016 17:19:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413951 - head/math/armadillo X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 17:19:47 -0000 Author: danilo Date: Sun Apr 24 17:19:46 2016 New Revision: 413951 URL: https://svnweb.freebsd.org/changeset/ports/413951 Log: - Update to 6.700.5 Modified: head/math/armadillo/Makefile head/math/armadillo/distinfo head/math/armadillo/pkg-plist Modified: head/math/armadillo/Makefile ============================================================================== --- head/math/armadillo/Makefile Sun Apr 24 16:58:58 2016 (r413950) +++ head/math/armadillo/Makefile Sun Apr 24 17:19:46 2016 (r413951) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= armadillo -PORTVERSION= 6.700.4 -PORTREVISION= 1 +PORTVERSION= 6.700.5 CATEGORIES= math MASTER_SITES= SF/arma Modified: head/math/armadillo/distinfo ============================================================================== --- head/math/armadillo/distinfo Sun Apr 24 16:58:58 2016 (r413950) +++ head/math/armadillo/distinfo Sun Apr 24 17:19:46 2016 (r413951) @@ -1,2 +1,2 @@ -SHA256 (armadillo-6.700.4.tar.gz) = e9f1201cef34554de42e83d8237f56ced988c061399742c08356d0a22f934d37 -SIZE (armadillo-6.700.4.tar.gz) = 5470215 +SHA256 (armadillo-6.700.5.tar.gz) = d5817a8ff07da3bd8753b1e037ef39e7a6c81d88bb7119a2a8e6c3dc93b48db1 +SIZE (armadillo-6.700.5.tar.gz) = 5470242 Modified: head/math/armadillo/pkg-plist ============================================================================== --- head/math/armadillo/pkg-plist Sun Apr 24 16:58:58 2016 (r413950) +++ head/math/armadillo/pkg-plist Sun Apr 24 17:19:46 2016 (r413951) @@ -455,7 +455,7 @@ include/armadillo_bits/xvec_htrans_bones include/armadillo_bits/xvec_htrans_meat.hpp lib/libarmadillo.so lib/libarmadillo.so.6 -lib/libarmadillo.so.6.700.4 +lib/libarmadillo.so.6.700.5 share/Armadillo/CMake/ArmadilloConfig.cmake share/Armadillo/CMake/ArmadilloConfigVersion.cmake share/Armadillo/CMake/ArmadilloLibraryDepends-release.cmake From owner-svn-ports-all@freebsd.org Sun Apr 24 17:44:34 2016 Return-Path: Delivered-To: svn-ports-all@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 91521B1B502; Sun, 24 Apr 2016 17:44:34 +0000 (UTC) (envelope-from brnrd@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 5CD3012E2; Sun, 24 Apr 2016 17:44:34 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OHiX1C099349; Sun, 24 Apr 2016 17:44:33 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OHiXO0099346; Sun, 24 Apr 2016 17:44:33 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201604241744.u3OHiXO0099346@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 24 Apr 2016 17:44:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413952 - in head/security/openssl-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2016 17:44:34 -0000 Author: brnrd Date: Sun Apr 24 17:44:33 2016 New Revision: 413952 URL: https://svnweb.freebsd.org/changeset/ports/413952 Log: security/openssl-devel: Update to 1.1 BETA2 (1.1.0-pre5) - Update to first BETA of OpenSSL 1.1 - Bump SHLIB_VERSION for 1.1 to 9 - Add missing libressl-devel conflict - Mark jobs-safe - Add upstream clang fix (Issue 888) - Fix renamed shared engines (remove 'lib' prefix) - Remove "overwrite base" check - Do not install html docs Reviewed by: feld (mentor), koobs (mentor) Approved by: feld (mentor) Differential Revision: D5900 Deleted: head/security/openssl-devel/files/patch-nextprotoneg Modified: head/security/openssl-devel/Makefile head/security/openssl-devel/distinfo head/security/openssl-devel/pkg-plist Modified: head/security/openssl-devel/Makefile ============================================================================== --- head/security/openssl-devel/Makefile Sun Apr 24 17:19:46 2016 (r413951) +++ head/security/openssl-devel/Makefile Sun Apr 24 17:44:33 2016 (r413952) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openssl -DISTVERSION= 1.1.0-pre3 +DISTVERSION= 1.1.0-pre5 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ ftp://ftp.openssl.org/source/ \ @@ -15,11 +15,11 @@ COMMENT= SSL and crypto library (1.1.x) LICENSE= OpenSSL LICENSE_FILE= ${WRKSRC}/LICENSE -CONFLICTS= libressl-[0-9]* openssl-[0-9]* +CONFLICTS= libressl-[0-9]* libressl-devel-[0-9]* openssl-[0-9]* OPTIONS_GROUP= CIPHERS HASHES OPTIMIZE PROTOCOLS OPTIONS_GROUP_CIPHERS= IDEA JPAKE RC2 RC4 RC5 -OPTIONS_GROUP_HASHES= MD2 MD4 MDC2 MD_GHOST94 RMD160 +OPTIONS_GROUP_HASHES= MD2 MD4 MDC2 RMD160 OPTIONS_GROUP_OPTIMIZE= ASM SSE2 OPTIONS_GROUP_PROTOCOLS= NEXTPROTONEG SCTP SSL3 @@ -65,7 +65,6 @@ OPTIONS_SUB= yes HAS_CONFIGURE= yes CONFIGURE_SCRIPT= config -MAKE_JOBS_UNSAFE= yes NOPRECIOUSMAKEVARS= Too many _MLINKS for fetch NOPRECIOUSSOFTMAKEVARS= Too many _MLINKS for fetch @@ -103,24 +102,13 @@ CONFIGURE_ARGS+= --openssldir=${OPENSSLD OPENSSL_BASE_SONAME!= readlink ${DESTDIR}/usr/lib/libcrypto.so || true OPENSSL_SHLIBVER_BASE= ${OPENSSL_BASE_SONAME:E} OPENSSL_BASE_SOPATH= ${OPENSSL_BASE_SONAME:H} -OPENSSL_SHLIBVER?= 8 +OPENSSL_SHLIBVER?= 9 .if ${ARCH} == "i386" OPTIONS_GROUP_OPTIMIZE+= I386 .endif I386_CONFIGURE_ON= 386 -.if ${OPENSSL_SHLIBVER_BASE} > ${OPENSSL_SHLIBVER} -pre-everything:: - @${ECHO_CMD} "#" - @${ECHO_CMD} "# this ports conflicts with your base system" - @${ECHO_CMD} "# please undefine OPENSSL_OVERWRITE_PORT" - @${ECHO_CMD} "# and use WITH_OPENSSL_BASE=yes instead." - @${ECHO_CMD} "#" - @${FALSE} - -.endif - post-patch: ${REINPLACE_CMD} -e 's|m4 -B 8192|m4|g' \ ${WRKSRC}/crypto/des/Makefile.in @@ -130,9 +118,14 @@ post-patch: post-configure: ${REINPLACE_CMD} \ -e 's|^MANDIR=.*$$|MANDIR=$$(PREFIX)/man|' \ - -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \ -e 's|LIBVERSION=[^ ]* |LIBVERSION=$(OPENSSL_SHLIBVER) |' \ + -e 's|$$(SHLIB_MAJOR).$$(SHLIB_MINOR)|$(OPENSSL_SHLIBVER)|g' \ + -e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \ + -e 's| install_html_docs$$||' \ ${WRKSRC}/Makefile + ${REINPLACE_CMD} \ + -e 's|^LIBVERSION=$$|LIBVERSION=$(OPENSSL_SHLIBVER) |' \ + ${WRKSRC}/Makefile.shared post-install-SHARED-on: .for i in libcrypto libssl @@ -140,7 +133,7 @@ post-install-SHARED-on: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/$i.so.${OPENSSL_SHLIBVER} ${LN} -sf $i.so.${OPENSSL_SHLIBVER} ${STAGEDIR}${PREFIX}/lib/$i.so .endfor -.for i in libcapi libdasync libpadlock +.for i in capi dasync padlock ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/engines/${i}.so .endfor Modified: head/security/openssl-devel/distinfo ============================================================================== --- head/security/openssl-devel/distinfo Sun Apr 24 17:19:46 2016 (r413951) +++ head/security/openssl-devel/distinfo Sun Apr 24 17:44:33 2016 (r413952) @@ -1,2 +1,2 @@ -SHA256 (openssl-1.1.0-pre3.tar.gz) = bb0ead36155dcf6122bfb0555205ba562ad5a82bb6067f2bfc9111ca4a4e6442 -SIZE (openssl-1.1.0-pre3.tar.gz) = 5024305 +SHA256 (openssl-1.1.0-pre5.tar.gz) = 25acbdfa5e0259ed20159670e88ddb4257970f80ce923427bd201133e6e580db +SIZE (openssl-1.1.0-pre5.tar.gz) = 5289112 Modified: head/security/openssl-devel/pkg-plist ============================================================================== --- head/security/openssl-devel/pkg-plist Sun Apr 24 17:19:46 2016 (r413951) +++ head/security/openssl-devel/pkg-plist Sun Apr 24 17:44:33 2016 (r413952) @@ -18,10 +18,10 @@ include/openssl/comp.h include/openssl/conf.h include/openssl/conf_api.h include/openssl/crypto.h +include/openssl/ct.h include/openssl/des.h include/openssl/dh.h include/openssl/dsa.h -include/openssl/dso.h include/openssl/dtls1.h include/openssl/e_os2.h include/openssl/ebcdic.h @@ -75,9 +75,9 @@ include/openssl/whrlpool.h include/openssl/x509.h include/openssl/x509_vfy.h include/openssl/x509v3.h -%%SHARED%%lib/engines/libcapi.so -%%SHARED%%lib/engines/libdasync.so -%%SHARED%%lib/engines/libpadlock.so +%%SHARED%%lib/engines/capi.so +%%SHARED%%lib/engines/dasync.so +%%SHARED%%lib/engines/padlock.so lib/libcrypto.a %%SHARED%%lib/libcrypto.so %%SHARED%%lib/libcrypto.so.%%SHLIBVER%% @@ -89,6 +89,8 @@ libdata/pkgconfig/libssl.pc libdata/pkgconfig/openssl.pc man/man1/CA.pl.1.gz man/man1/asn1parse.1.gz +man/man1/blake2b.1.gz +man/man1/blake2s.1.gz man/man1/c_rehash.1.gz man/man1/ca.1.gz man/man1/ciphers.1.gz @@ -102,6 +104,7 @@ man/man1/dsaparam.1.gz man/man1/ec.1.gz man/man1/ecparam.1.gz man/man1/enc.1.gz +man/man1/engine.1.gz man/man1/errstr.1.gz man/man1/gendsa.1.gz man/man1/genpkey.1.gz @@ -120,6 +123,7 @@ man/man1/pkey.1.gz man/man1/pkeyparam.1.gz man/man1/pkeyutl.1.gz man/man1/rand.1.gz +man/man1/rehash.1.gz man/man1/req.1.gz man/man1/ripemd160.1.gz man/man1/rsa.1.gz @@ -142,6 +146,16 @@ man/man1/tsget.1.gz man/man1/verify.1.gz man/man1/version.1.gz man/man1/x509.1.gz +man/man3/ASN1_ENUMERATED_get.3.gz +man/man3/ASN1_ENUMERATED_get_int64.3.gz +man/man3/ASN1_ENUMERATED_set.3.gz +man/man3/ASN1_ENUMERATED_set_int64.3.gz +man/man3/ASN1_ENUMERATED_to_BN.3.gz +man/man3/ASN1_INTEGER_get.3.gz +man/man3/ASN1_INTEGER_get_int64.3.gz +man/man3/ASN1_INTEGER_set.3.gz +man/man3/ASN1_INTEGER_set_int64.3.gz +man/man3/ASN1_INTEGER_to_BN.3.gz man/man3/ASN1_OBJECT_free.3.gz man/man3/ASN1_OBJECT_new.3.gz man/man3/ASN1_STRING_cmp.3.gz @@ -164,9 +178,34 @@ man/man3/ASN1_TIME_diff.3.gz man/man3/ASN1_TIME_print.3.gz man/man3/ASN1_TIME_set.3.gz man/man3/ASN1_TIME_set_string.3.gz +man/man3/ASN1_TYPE_cmp.3.gz +man/man3/ASN1_TYPE_get.3.gz +man/man3/ASN1_TYPE_pack_sequence.3.gz +man/man3/ASN1_TYPE_set.3.gz +man/man3/ASN1_TYPE_set1.3.gz +man/man3/ASN1_TYPE_unpack_sequence.3.gz man/man3/ASN1_add_oid_module.3.gz man/man3/ASN1_generate_nconf.3.gz man/man3/ASN1_generate_v3.3.gz +man/man3/ASYNC_WAIT_CTX_clear_fd.3.gz +man/man3/ASYNC_WAIT_CTX_free.3.gz +man/man3/ASYNC_WAIT_CTX_get_all_fds.3.gz +man/man3/ASYNC_WAIT_CTX_get_changed_fds.3.gz +man/man3/ASYNC_WAIT_CTX_get_fd.3.gz +man/man3/ASYNC_WAIT_CTX_new.3.gz +man/man3/ASYNC_WAIT_CTX_set_wait_fd.3.gz +man/man3/ASYNC_block_pause.3.gz +man/man3/ASYNC_cleanup_thread.3.gz +man/man3/ASYNC_clear_wait_fd.3.gz +man/man3/ASYNC_get_current_job.3.gz +man/man3/ASYNC_get_wait_fd.3.gz +man/man3/ASYNC_in_job.3.gz +man/man3/ASYNC_init_thread.3.gz +man/man3/ASYNC_is_capable.3.gz +man/man3/ASYNC_pause_job.3.gz +man/man3/ASYNC_set_wait_fd.3.gz +man/man3/ASYNC_start_job.3.gz +man/man3/ASYNC_unblock_pause.3.gz man/man3/BF_cbc_encrypt.3.gz man/man3/BF_cfb64_encrypt.3.gz man/man3/BF_decrypt.3.gz @@ -175,8 +214,32 @@ man/man3/BF_encrypt.3.gz man/man3/BF_ofb64_encrypt.3.gz man/man3/BF_options.3.gz man/man3/BF_set_key.3.gz +man/man3/BIO_ADDR.3.gz +man/man3/BIO_ADDRINFO.3.gz +man/man3/BIO_ADDRINFO_address.3.gz +man/man3/BIO_ADDRINFO_family.3.gz +man/man3/BIO_ADDRINFO_free.3.gz +man/man3/BIO_ADDRINFO_lookup.3.gz +man/man3/BIO_ADDRINFO_next.3.gz +man/man3/BIO_ADDRINFO_protocol.3.gz +man/man3/BIO_ADDRINFO_sockaddr.3.gz +man/man3/BIO_ADDRINFO_sockaddr_size.3.gz +man/man3/BIO_ADDRINFO_socktype.3.gz +man/man3/BIO_ADDR_clear.3.gz +man/man3/BIO_ADDR_family.3.gz +man/man3/BIO_ADDR_free.3.gz +man/man3/BIO_ADDR_hostname_string.3.gz +man/man3/BIO_ADDR_new.3.gz +man/man3/BIO_ADDR_path_string.3.gz +man/man3/BIO_ADDR_rawaddress.3.gz +man/man3/BIO_ADDR_rawmake.3.gz +man/man3/BIO_ADDR_rawport.3.gz +man/man3/BIO_ADDR_service_string.3.gz +man/man3/BIO_accept_ex.3.gz man/man3/BIO_append_filename.3.gz man/man3/BIO_callback_ctrl.3.gz +man/man3/BIO_closesocket.3.gz +man/man3/BIO_connect.3.gz man/man3/BIO_ctrl.3.gz man/man3/BIO_ctrl_get_read_request.3.gz man/man3/BIO_ctrl_get_write_guarantee.3.gz @@ -209,9 +272,13 @@ man/man3/BIO_get_conn_hostname.3.gz man/man3/BIO_get_conn_int_port.3.gz man/man3/BIO_get_conn_ip.3.gz man/man3/BIO_get_conn_port.3.gz +man/man3/BIO_get_data.3.gz +man/man3/BIO_get_ex_data.3.gz +man/man3/BIO_get_ex_new_index.3.gz man/man3/BIO_get_fd.3.gz man/man3/BIO_get_fp.3.gz man/man3/BIO_get_info_callback.3.gz +man/man3/BIO_get_init.3.gz man/man3/BIO_get_md.3.gz man/man3/BIO_get_md_ctx.3.gz man/man3/BIO_get_mem_data.3.gz @@ -220,12 +287,32 @@ man/man3/BIO_get_num_renegotiates.3.gz man/man3/BIO_get_read_request.3.gz man/man3/BIO_get_retry_BIO.3.gz man/man3/BIO_get_retry_reason.3.gz +man/man3/BIO_get_shutdown.3.gz man/man3/BIO_get_ssl.3.gz man/man3/BIO_get_write_buf_size.3.gz man/man3/BIO_get_write_guarantee.3.gz man/man3/BIO_gets.3.gz man/man3/BIO_int_ctrl.3.gz +man/man3/BIO_listen.3.gz man/man3/BIO_make_bio_pair.3.gz +man/man3/BIO_meth_free.3.gz +man/man3/BIO_meth_get_callback_ctrl.3.gz +man/man3/BIO_meth_get_create.3.gz +man/man3/BIO_meth_get_ctrl.3.gz +man/man3/BIO_meth_get_destroy.3.gz +man/man3/BIO_meth_get_gets.3.gz +man/man3/BIO_meth_get_puts.3.gz +man/man3/BIO_meth_get_read.3.gz +man/man3/BIO_meth_get_write.3.gz +man/man3/BIO_meth_new.3.gz +man/man3/BIO_meth_set_callback_ctrl.3.gz +man/man3/BIO_meth_set_create.3.gz +man/man3/BIO_meth_set_ctrl.3.gz +man/man3/BIO_meth_set_destroy.3.gz +man/man3/BIO_meth_set_gets.3.gz +man/man3/BIO_meth_set_puts.3.gz +man/man3/BIO_meth_set_read.3.gz +man/man3/BIO_meth_set_write.3.gz man/man3/BIO_method_type.3.gz man/man3/BIO_new.3.gz man/man3/BIO_new_CMS.3.gz @@ -241,6 +328,7 @@ man/man3/BIO_new_socket.3.gz man/man3/BIO_new_ssl.3.gz man/man3/BIO_new_ssl_connect.3.gz man/man3/BIO_next.3.gz +man/man3/BIO_parse_hostserv.3.gz man/man3/BIO_pending.3.gz man/man3/BIO_pop.3.gz man/man3/BIO_ptr_ctrl.3.gz @@ -272,14 +360,20 @@ man/man3/BIO_set_conn_hostname.3.gz man/man3/BIO_set_conn_int_port.3.gz man/man3/BIO_set_conn_ip.3.gz man/man3/BIO_set_conn_port.3.gz +man/man3/BIO_set_data.3.gz +man/man3/BIO_set_ex_data.3.gz man/man3/BIO_set_fd.3.gz man/man3/BIO_set_fp.3.gz man/man3/BIO_set_info_callback.3.gz +man/man3/BIO_set_init.3.gz man/man3/BIO_set_md.3.gz man/man3/BIO_set_mem_buf.3.gz man/man3/BIO_set_mem_eof_return.3.gz man/man3/BIO_set_nbio.3.gz man/man3/BIO_set_nbio_accept.3.gz +man/man3/BIO_set_next.3.gz +man/man3/BIO_set_retry_reason.3.gz +man/man3/BIO_set_shutdown.3.gz man/man3/BIO_set_ssl.3.gz man/man3/BIO_set_ssl_mode.3.gz man/man3/BIO_set_ssl_renegotiate_bytes.3.gz @@ -290,9 +384,11 @@ man/man3/BIO_should_read.3.gz man/man3/BIO_should_retry.3.gz man/man3/BIO_should_write.3.gz man/man3/BIO_shutdown_wr.3.gz +man/man3/BIO_socket.3.gz man/man3/BIO_ssl_copy_session_id.3.gz man/man3/BIO_ssl_shutdown.3.gz man/man3/BIO_tell.3.gz +man/man3/BIO_up_ref.3.gz man/man3/BIO_vfree.3.gz man/man3/BIO_wpending.3.gz man/man3/BIO_write.3.gz @@ -302,21 +398,26 @@ man/man3/BN_BLINDING_convert_ex.3.gz man/man3/BN_BLINDING_create_param.3.gz man/man3/BN_BLINDING_free.3.gz man/man3/BN_BLINDING_get_flags.3.gz -man/man3/BN_BLINDING_get_thread_id.3.gz man/man3/BN_BLINDING_invert.3.gz man/man3/BN_BLINDING_invert_ex.3.gz +man/man3/BN_BLINDING_is_current_thread.3.gz +man/man3/BN_BLINDING_lock.3.gz man/man3/BN_BLINDING_new.3.gz +man/man3/BN_BLINDING_set_current_thread.3.gz man/man3/BN_BLINDING_set_flags.3.gz -man/man3/BN_BLINDING_set_thread_id.3.gz -man/man3/BN_BLINDING_thread_id.3.gz +man/man3/BN_BLINDING_unlock.3.gz man/man3/BN_BLINDING_update.3.gz man/man3/BN_CTX_end.3.gz man/man3/BN_CTX_free.3.gz man/man3/BN_CTX_get.3.gz man/man3/BN_CTX_init.3.gz man/man3/BN_CTX_new.3.gz +man/man3/BN_CTX_secure_new.3.gz man/man3/BN_CTX_start.3.gz man/man3/BN_GENCB_call.3.gz +man/man3/BN_GENCB_free.3.gz +man/man3/BN_GENCB_get_arg.3.gz +man/man3/BN_GENCB_new.3.gz man/man3/BN_GENCB_set.3.gz man/man3/BN_GENCB_set_old.3.gz man/man3/BN_MONT_CTX_copy.3.gz @@ -334,6 +435,7 @@ man/man3/BN_bin2bn.3.gz man/man3/BN_bn2bin.3.gz man/man3/BN_bn2dec.3.gz man/man3/BN_bn2hex.3.gz +man/man3/BN_bn2lebinpad.3.gz man/man3/BN_bn2mpi.3.gz man/man3/BN_clear.3.gz man/man3/BN_clear_bit.3.gz @@ -362,6 +464,7 @@ man/man3/BN_is_prime_fasttest.3.gz man/man3/BN_is_prime_fasttest_ex.3.gz man/man3/BN_is_word.3.gz man/man3/BN_is_zero.3.gz +man/man3/BN_lebin2bn.3.gz man/man3/BN_lshift.3.gz man/man3/BN_lshift1.3.gz man/man3/BN_mask_bits.3.gz @@ -398,9 +501,12 @@ man/man3/BN_sqr.3.gz man/man3/BN_sub.3.gz man/man3/BN_sub_word.3.gz man/man3/BN_swap.3.gz +man/man3/BN_to_ASN1_ENUMERATED.3.gz +man/man3/BN_to_ASN1_INTEGER.3.gz man/man3/BN_to_montgomery.3.gz man/man3/BN_ucmp.3.gz man/man3/BN_value_one.3.gz +man/man3/BN_with_flags.3.gz man/man3/BN_zero.3.gz man/man3/BUF_MEM_free.3.gz man/man3/BUF_MEM_grow.3.gz @@ -454,22 +560,38 @@ man/man3/CONF_modules_free.3.gz man/man3/CONF_modules_load.3.gz man/man3/CONF_modules_load_file.3.gz man/man3/CONF_modules_unload.3.gz -man/man3/CRYPTO_THREADID_cmp.3.gz -man/man3/CRYPTO_THREADID_cpy.3.gz -man/man3/CRYPTO_THREADID_current.3.gz -man/man3/CRYPTO_THREADID_get_callback.3.gz -man/man3/CRYPTO_THREADID_hash.3.gz -man/man3/CRYPTO_THREADID_set_callback.3.gz -man/man3/CRYPTO_destroy_dynlockid.3.gz +man/man3/CRYPTO_THREAD_lock_free.3.gz +man/man3/CRYPTO_THREAD_lock_new.3.gz +man/man3/CRYPTO_THREAD_read_lock.3.gz +man/man3/CRYPTO_THREAD_unlock.3.gz +man/man3/CRYPTO_THREAD_write_lock.3.gz +man/man3/CRYPTO_atomic_add.3.gz +man/man3/CRYPTO_clear_free.3.gz +man/man3/CRYPTO_clear_realloc.3.gz +man/man3/CRYPTO_free.3.gz +man/man3/CRYPTO_free_ex_data.3.gz +man/man3/CRYPTO_free_ex_index.3.gz man/man3/CRYPTO_get_ex_data.3.gz -man/man3/CRYPTO_get_new_dynlockid.3.gz -man/man3/CRYPTO_lock.3.gz -man/man3/CRYPTO_num_locks.3.gz -man/man3/CRYPTO_set_dynlock_create_callback.3.gz -man/man3/CRYPTO_set_dynlock_destroy_callback.3.gz -man/man3/CRYPTO_set_dynlock_lock_callback.3.gz +man/man3/CRYPTO_get_ex_new_index.3.gz +man/man3/CRYPTO_get_mem_functions.3.gz +man/man3/CRYPTO_malloc.3.gz +man/man3/CRYPTO_mem_ctrl.3.gz +man/man3/CRYPTO_mem_debug_pop.3.gz +man/man3/CRYPTO_mem_debug_push.3.gz +man/man3/CRYPTO_mem_leaks.3.gz +man/man3/CRYPTO_mem_leaks_fp.3.gz +man/man3/CRYPTO_realloc.3.gz +man/man3/CRYPTO_secure_free.3.gz +man/man3/CRYPTO_secure_malloc.3.gz +man/man3/CRYPTO_secure_malloc_done.3.gz +man/man3/CRYPTO_secure_malloc_init.3.gz +man/man3/CRYPTO_secure_malloc_initialized.3.gz +man/man3/CRYPTO_secure_zalloc.3.gz man/man3/CRYPTO_set_ex_data.3.gz -man/man3/CRYPTO_set_locking_callback.3.gz +man/man3/CRYPTO_set_mem_debug.3.gz +man/man3/CRYPTO_set_mem_functions.3.gz +man/man3/CRYPTO_zalloc.3.gz +man/man3/CYRPTO_secure_malloc_used.3.gz man/man3/DES_cbc_cksum.3.gz man/man3/DES_cfb64_encrypt.3.gz man/man3/DES_cfb_encrypt.3.gz @@ -502,26 +624,59 @@ man/man3/DES_string_to_2keys.3.gz man/man3/DES_string_to_key.3.gz man/man3/DES_xcbc_encrypt.3.gz man/man3/DH_OpenSSL.3.gz +man/man3/DH_bits.3.gz man/man3/DH_check.3.gz +man/man3/DH_clear_flags.3.gz man/man3/DH_compute_key.3.gz man/man3/DH_free.3.gz man/man3/DH_generate_key.3.gz man/man3/DH_generate_parameters.3.gz man/man3/DH_generate_parameters_ex.3.gz +man/man3/DH_get0_engine.3.gz +man/man3/DH_get0_key.3.gz +man/man3/DH_get0_pqg.3.gz man/man3/DH_get_default_method.3.gz man/man3/DH_get_ex_data.3.gz man/man3/DH_get_ex_new_index.3.gz +man/man3/DH_get_length.3.gz +man/man3/DH_meth_dup.3.gz +man/man3/DH_meth_free.3.gz +man/man3/DH_meth_get0_app_data.3.gz +man/man3/DH_meth_get0_name.3.gz +man/man3/DH_meth_get_bn_mod_exp.3.gz +man/man3/DH_meth_get_compute_key.3.gz +man/man3/DH_meth_get_finish.3.gz +man/man3/DH_meth_get_flags.3.gz +man/man3/DH_meth_get_generate_key.3.gz +man/man3/DH_meth_get_generate_params.3.gz +man/man3/DH_meth_get_init.3.gz +man/man3/DH_meth_new.3.gz +man/man3/DH_meth_set0_app_data.3.gz +man/man3/DH_meth_set1_name.3.gz +man/man3/DH_meth_set_bn_mod_exp.3.gz +man/man3/DH_meth_set_compute_key.3.gz +man/man3/DH_meth_set_finish.3.gz +man/man3/DH_meth_set_flags.3.gz +man/man3/DH_meth_set_generate_key.3.gz +man/man3/DH_meth_set_generate_params.3.gz +man/man3/DH_meth_set_init.3.gz man/man3/DH_new.3.gz man/man3/DH_new_method.3.gz +man/man3/DH_set0_key.3.gz +man/man3/DH_set0_pqg.3.gz man/man3/DH_set_default_method.3.gz man/man3/DH_set_ex_data.3.gz +man/man3/DH_set_flags.3.gz +man/man3/DH_set_length.3.gz man/man3/DH_set_method.3.gz man/man3/DH_size.3.gz +man/man3/DH_test_flags.3.gz man/man3/DHparams_print.3.gz man/man3/DHparams_print_fp.3.gz man/man3/DSA_OpenSSL.3.gz man/man3/DSA_SIG_free.3.gz man/man3/DSA_SIG_new.3.gz +man/man3/DSA_clear_flags.3.gz man/man3/DSA_do_sign.3.gz man/man3/DSA_do_verify.3.gz man/man3/DSA_dup_DH.3.gz @@ -529,27 +684,77 @@ man/man3/DSA_free.3.gz man/man3/DSA_generate_key.3.gz man/man3/DSA_generate_parameters.3.gz man/man3/DSA_generate_parameters_ex.3.gz +man/man3/DSA_get0_engine.3.gz +man/man3/DSA_get0_key.3.gz +man/man3/DSA_get0_pqg.3.gz man/man3/DSA_get_default_metho