From owner-svn-ports-branches@freebsd.org Sun Sep 3 13:27:51 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BDC21E0B6B7; Sun, 3 Sep 2017 13:27:51 +0000 (UTC) (envelope-from tota@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 8CD486BB64; Sun, 3 Sep 2017 13:27:51 +0000 (UTC) (envelope-from tota@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v83DRobF000988; Sun, 3 Sep 2017 13:27:50 GMT (envelope-from tota@FreeBSD.org) Received: (from tota@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v83DRoY0000987; Sun, 3 Sep 2017 13:27:50 GMT (envelope-from tota@FreeBSD.org) Message-Id: <201709031327.v83DRoY0000987@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tota set sender to tota@FreeBSD.org using -f From: TAKATSU Tomonari Date: Sun, 3 Sep 2017 13:27:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449203 - branches/2017Q3/net-im/mikutter X-SVN-Group: ports-branches X-SVN-Commit-Author: tota X-SVN-Commit-Paths: branches/2017Q3/net-im/mikutter X-SVN-Commit-Revision: 449203 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Sep 2017 13:27:51 -0000 Author: tota Date: Sun Sep 3 13:27:50 2017 New Revision: 449203 URL: https://svnweb.freebsd.org/changeset/ports/449203 Log: - Fix RUN_DEPENDS Approved by: ports-secteam (delphij) Modified: branches/2017Q3/net-im/mikutter/Makefile Modified: branches/2017Q3/net-im/mikutter/Makefile ============================================================================== --- branches/2017Q3/net-im/mikutter/Makefile Sun Sep 3 13:27:39 2017 (r449202) +++ branches/2017Q3/net-im/mikutter/Makefile Sun Sep 3 13:27:50 2017 (r449203) @@ -14,7 +14,7 @@ COMMENT= Simple, powerful, and moeful Twitter client LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-gtk2>=3.1.8:x11-toolkits/rubygem-gtk2 \ +RUN_DEPENDS= rubygem-gtk2>=3.1.4:x11-toolkits/rubygem-gtk2 \ rubygem-cairo>=1.12.9:graphics/rubygem-cairo \ rubygem-addressable>=2.5.1:www/rubygem-addressable \ rubygem-delayer>=0.0.2:devel/rubygem-delayer \ From owner-svn-ports-branches@freebsd.org Sun Sep 3 16:26:44 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 037F1E13327; Sun, 3 Sep 2017 16:26:44 +0000 (UTC) (envelope-from blackend@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 CE36270B2F; Sun, 3 Sep 2017 16:26:43 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v83GQgx1073943; Sun, 3 Sep 2017 16:26:42 GMT (envelope-from blackend@FreeBSD.org) Received: (from blackend@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v83GQfO7073931; Sun, 3 Sep 2017 16:26:41 GMT (envelope-from blackend@FreeBSD.org) Message-Id: <201709031626.v83GQfO7073931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: blackend set sender to blackend@FreeBSD.org using -f From: Marc Fonvieille Date: Sun, 3 Sep 2017 16:26:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449208 - in branches/2017Q3/misc: freebsd-doc-all freebsd-doc-en freebsd-doc-ja freebsd-doc-zh_cn X-SVN-Group: ports-branches X-SVN-Commit-Author: blackend X-SVN-Commit-Paths: in branches/2017Q3/misc: freebsd-doc-all freebsd-doc-en freebsd-doc-ja freebsd-doc-zh_cn X-SVN-Commit-Revision: 449208 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Sep 2017 16:26:44 -0000 Author: blackend (doc committer) Date: Sun Sep 3 16:26:41 2017 New Revision: 449208 URL: https://svnweb.freebsd.org/changeset/ports/449208 Log: MFH: r449128 Update to r50775 from the FreeBSD docset (a.k.a. 10.4-R version) Approved by: portmgr (blanket), doceng (implicit) Modified: branches/2017Q3/misc/freebsd-doc-all/Makefile branches/2017Q3/misc/freebsd-doc-en/Makefile branches/2017Q3/misc/freebsd-doc-en/distinfo branches/2017Q3/misc/freebsd-doc-en/pkg-plist.html-split branches/2017Q3/misc/freebsd-doc-ja/pkg-plist.html-split branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.html branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.html-common branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.html-split branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.pdf branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.ps branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.txt Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/misc/freebsd-doc-all/Makefile ============================================================================== --- branches/2017Q3/misc/freebsd-doc-all/Makefile Sun Sep 3 16:23:04 2017 (r449207) +++ branches/2017Q3/misc/freebsd-doc-all/Makefile Sun Sep 3 16:26:41 2017 (r449208) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc-all -PORTVERSION= 50402 +PORTVERSION= 50775 PORTEPOCH= 1 CATEGORIES= misc docs Modified: branches/2017Q3/misc/freebsd-doc-en/Makefile ============================================================================== --- branches/2017Q3/misc/freebsd-doc-en/Makefile Sun Sep 3 16:23:04 2017 (r449207) +++ branches/2017Q3/misc/freebsd-doc-en/Makefile Sun Sep 3 16:26:41 2017 (r449208) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= freebsd-doc -PORTVERSION= 50402 +PORTVERSION= 50775 PORTEPOCH= 1 CATEGORIES= misc docs MASTER_SITES= LOCAL/blackend Modified: branches/2017Q3/misc/freebsd-doc-en/distinfo ============================================================================== --- branches/2017Q3/misc/freebsd-doc-en/distinfo Sun Sep 3 16:23:04 2017 (r449207) +++ branches/2017Q3/misc/freebsd-doc-en/distinfo Sun Sep 3 16:26:41 2017 (r449208) @@ -1,3 +1,3 @@ -TIMESTAMP = 1498297052 -SHA256 (freebsd-doc-50402.tar.gz) = 5c7df6eac72878750a9500acd7a85ff59660b390948de337176a2156385ae476 -SIZE (freebsd-doc-50402.tar.gz) = 54132026 +TIMESTAMP = 1504183447 +SHA256 (freebsd-doc-50775.tar.gz) = 4b9e602d4dfc6aa247b07c3e941705f4aa07390cb06eba44e4043fc16cb8a664 +SIZE (freebsd-doc-50775.tar.gz) = 54231421 Modified: branches/2017Q3/misc/freebsd-doc-en/pkg-plist.html-split ============================================================================== --- branches/2017Q3/misc/freebsd-doc-en/pkg-plist.html-split Sun Sep 3 16:23:04 2017 (r449207) +++ branches/2017Q3/misc/freebsd-doc-en/pkg-plist.html-split Sun Sep 3 16:26:41 2017 (r449208) @@ -107,6 +107,7 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-prep.html %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-stable.html %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-terms.html +%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-website.html %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-wrapup.html %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/trademarks.html %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/Configuration.html @@ -950,6 +951,17 @@ %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-checksum.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-dads.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-desc.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-broken.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-depends.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-license.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-maintainer.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-options.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-patch.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-rest.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-targets.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-uses.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-variables.html +%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-portlint.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-prefix.html %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-restrictions.html Modified: branches/2017Q3/misc/freebsd-doc-ja/pkg-plist.html-split ============================================================================== --- branches/2017Q3/misc/freebsd-doc-ja/pkg-plist.html-split Sun Sep 3 16:23:04 2017 (r449207) +++ branches/2017Q3/misc/freebsd-doc-ja/pkg-plist.html-split Sun Sep 3 16:26:41 2017 (r449208) @@ -154,7 +154,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-web.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/floppies.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/freebsd-glossary.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/fs-acl.html @@ -251,7 +250,6 @@ %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn.html -%%DOCSDIR%%/%%DOCLANG%%/books/handbook/synching.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tcpwrappers.html %%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html Modified: branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.html ============================================================================== --- branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.html Sun Sep 3 16:23:04 2017 (r449207) +++ branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.html Sun Sep 3 16:26:41 2017 (r449208) @@ -1,4 +1,5 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.html Modified: branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.html-common ============================================================================== --- branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.html-common Sun Sep 3 16:23:04 2017 (r449207) +++ branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.html-common Sun Sep 3 16:26:41 2017 (r449208) @@ -1,4 +1,5 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/1.png Modified: branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.html-split ============================================================================== --- branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.html-split Sun Sep 3 16:23:04 2017 (r449207) +++ branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.html-split Sun Sep 3 16:26:41 2017 (r449208) @@ -2,6 +2,11 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ix01.html %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/index.html +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-cautions.html +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-conclusion.html +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-posix.html +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-testing.html %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html Modified: branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.pdf ============================================================================== --- branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.pdf Sun Sep 3 16:23:04 2017 (r449207) +++ branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.pdf Sun Sep 3 16:26:41 2017 (r449208) @@ -1,4 +1,5 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.pdf Modified: branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.ps ============================================================================== --- branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.ps Sun Sep 3 16:23:04 2017 (r449207) +++ branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.ps Sun Sep 3 16:26:41 2017 (r449208) @@ -1,4 +1,5 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.ps Modified: branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.txt ============================================================================== --- branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.txt Sun Sep 3 16:23:04 2017 (r449207) +++ branches/2017Q3/misc/freebsd-doc-zh_cn/pkg-plist.txt Sun Sep 3 16:26:41 2017 (r449208) @@ -1,4 +1,5 @@ %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt +%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.txt From owner-svn-ports-branches@freebsd.org Tue Sep 5 05:54:35 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0924E1BBFA; Tue, 5 Sep 2017 05:54:35 +0000 (UTC) (envelope-from jbeich@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 7F0A977136; Tue, 5 Sep 2017 05:54:35 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v855sYJO087760; Tue, 5 Sep 2017 05:54:34 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v855sY8a087759; Tue, 5 Sep 2017 05:54:34 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201709050554.v855sY8a087759@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 5 Sep 2017 05:54:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449271 - branches/2017Q3/graphics/colmap/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2017Q3/graphics/colmap/files X-SVN-Commit-Revision: 449271 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Sep 2017 05:54:35 -0000 Author: jbeich Date: Tue Sep 5 05:54:34 2017 New Revision: 449271 URL: https://svnweb.freebsd.org/changeset/ports/449271 Log: MFH: r449270 graphics/colmap: try#2 to unbreak on non-x86 ../ext/VLFeat/libvlfeat.a(host.c.o): In function `_vl_x86cpu_info_init': host.c:(.text+0x1c): undefined reference to `_vl_cpuid' host.c:(.text+0x40): undefined reference to `_vl_cpuid' collect2: error: ld returned 1 exit status Reported by: pkg-fallout (aarch64, armv6) Approved by: ports-secteam blanket Added: branches/2017Q3/graphics/colmap/files/patch-src_ext_VLFeat_host.c - copied unchanged from r449270, head/graphics/colmap/files/patch-src_ext_VLFeat_host.c Modified: Directory Properties: branches/2017Q3/ (props changed) Copied: branches/2017Q3/graphics/colmap/files/patch-src_ext_VLFeat_host.c (from r449270, head/graphics/colmap/files/patch-src_ext_VLFeat_host.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/graphics/colmap/files/patch-src_ext_VLFeat_host.c Tue Sep 5 05:54:34 2017 (r449271, copy of r449270, head/graphics/colmap/files/patch-src_ext_VLFeat_host.c) @@ -0,0 +1,20 @@ +vlfeat: don't try to use CPUID on non-x86 + +--- src/ext/VLFeat/host.c.orig 2017-06-15 14:32:01 UTC ++++ src/ext/VLFeat/host.c +@@ -441,6 +441,7 @@ _vl_cpuid (vl_int32* info, int function) + + #endif + ++#if defined(VL_ARCH_IX86) || defined(VL_ARCH_X64) || defined(VL_ARCH_IA64) + void + _vl_x86cpu_info_init (VlX86CpuInfo *self) + { +@@ -487,6 +488,7 @@ _vl_x86cpu_info_to_string_copy (VlX86CpuInfo const *se + } + return string ; + } ++#endif + + /** ------------------------------------------------------------------ + ** @brief Human readable static library configuration From owner-svn-ports-branches@freebsd.org Wed Sep 6 09:26:52 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A28FFE1CD72; Wed, 6 Sep 2017 09:26:52 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5555B66E52; Wed, 6 Sep 2017 09:26:52 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v869QpmS064846; Wed, 6 Sep 2017 09:26:51 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v869QpQ5064844; Wed, 6 Sep 2017 09:26:51 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201709060926.v869QpQ5064844@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 6 Sep 2017 09:26:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449333 - in branches/2017Q3/net-mgmt/nrpe: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in branches/2017Q3/net-mgmt/nrpe: . files X-SVN-Commit-Revision: 449333 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Sep 2017 09:26:53 -0000 Author: mat Date: Wed Sep 6 09:26:51 2017 New Revision: 449333 URL: https://svnweb.freebsd.org/changeset/ports/449333 Log: MFH: r449332 Fix not starting after crash. When nrpe quits ungracefully, for example, if the box was rebooted, it often does not start because the pid file is still there, and the pid in it exists and the pid in it is in use by some other process. The dubious code is in src/nrpe.c in write_pid_file() around line 1756 that could be axed. But I think the easiest way to fix this is with the attached patch. precmd is run just before starting the daemon and after checking that it is not already running. With this, it starts just fine, and still refuses to start if it is really already running, but starts fine if the pid file contains a pid that exists but is not nrpe. PR: 221740 Submitted by: mat Approved by: maintainer timeout, ports-secteam blanket Sponsored by: Absolight Modified: branches/2017Q3/net-mgmt/nrpe/Makefile branches/2017Q3/net-mgmt/nrpe/files/nrpe2.in Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/net-mgmt/nrpe/Makefile ============================================================================== --- branches/2017Q3/net-mgmt/nrpe/Makefile Wed Sep 6 09:24:10 2017 (r449332) +++ branches/2017Q3/net-mgmt/nrpe/Makefile Wed Sep 6 09:26:51 2017 (r449333) @@ -3,7 +3,7 @@ PORTNAME= nrpe DISTVERSION= 2.15 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-mgmt MASTER_SITES= SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION} Modified: branches/2017Q3/net-mgmt/nrpe/files/nrpe2.in ============================================================================== --- branches/2017Q3/net-mgmt/nrpe/files/nrpe2.in Wed Sep 6 09:24:10 2017 (r449332) +++ branches/2017Q3/net-mgmt/nrpe/files/nrpe2.in Wed Sep 6 09:26:51 2017 (r449333) @@ -48,6 +48,7 @@ nrpe2_prestart() { find_pidfile install -d -o ${nrpe_user:-nagios} ${pidfile%/*} + rm -f ${pidfile} } run_rc_command "$1"