From owner-svn-ports-branches@freebsd.org Sun Aug 27 05:19:05 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 E0AD0DE7A6A; Sun, 27 Aug 2017 05:19:05 +0000 (UTC) (envelope-from tobik@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 7D4B465CD3; Sun, 27 Aug 2017 05:19:05 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7R5J41V065081; Sun, 27 Aug 2017 05:19:04 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7R5J42c065078; Sun, 27 Aug 2017 05:19:04 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201708270519.v7R5J42c065078@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 27 Aug 2017 05:19:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448803 - branches/2017Q3/www/kanboard X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: branches/2017Q3/www/kanboard X-SVN-Commit-Revision: 448803 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, 27 Aug 2017 05:19:06 -0000 Author: tobik Date: Sun Aug 27 05:19:04 2017 New Revision: 448803 URL: https://svnweb.freebsd.org/changeset/ports/448803 Log: MFH: r448769 www/kanboard: Update to 1.0.46 Changes: https://github.com/kanboard/kanboard/blob/master/ChangeLog PR: 221826 Submitted by: Bart Wrobel (maintainer) Security: CVE-2017-12850 Security: CVE-2017-12851 Approved by: ports-secteam (delphij) Modified: branches/2017Q3/www/kanboard/Makefile branches/2017Q3/www/kanboard/distinfo branches/2017Q3/www/kanboard/pkg-plist Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/www/kanboard/Makefile ============================================================================== --- branches/2017Q3/www/kanboard/Makefile Sun Aug 27 04:33:39 2017 (r448802) +++ branches/2017Q3/www/kanboard/Makefile Sun Aug 27 05:19:04 2017 (r448803) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= kanboard -PORTVERSION= 1.0.44 +PORTVERSION= 1.0.46 CATEGORIES= www MASTER_SITES= http://kanboard.net/ \ https://bitbucket.org/if0/kanboard-archives/downloads/ \ Modified: branches/2017Q3/www/kanboard/distinfo ============================================================================== --- branches/2017Q3/www/kanboard/distinfo Sun Aug 27 04:33:39 2017 (r448802) +++ branches/2017Q3/www/kanboard/distinfo Sun Aug 27 05:19:04 2017 (r448803) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496172935 -SHA256 (kanboard-1.0.44.zip) = ea6bbc7c4ff05148f204074e73b48f374bb9d466fe1891401cac3e5a1d5dc970 -SIZE (kanboard-1.0.44.zip) = 7064312 +TIMESTAMP = 1503733357 +SHA256 (kanboard-1.0.46.zip) = 34b3477dbbda0941941318dda6ca591c96f265c3b056d98e3a04e7f021ace449 +SIZE (kanboard-1.0.46.zip) = 7082302 Modified: branches/2017Q3/www/kanboard/pkg-plist ============================================================================== --- branches/2017Q3/www/kanboard/pkg-plist Sun Aug 27 04:33:39 2017 (r448802) +++ branches/2017Q3/www/kanboard/pkg-plist Sun Aug 27 05:19:04 2017 (r448803) @@ -18,6 +18,7 @@ %%WWWDIR%%/app/Action/TaskAssignColorPriority.php %%WWWDIR%%/app/Action/TaskAssignColorSwimlane.php %%WWWDIR%%/app/Action/TaskAssignColorUser.php +%%WWWDIR%%/app/Action/TaskAssignCreator.php %%WWWDIR%%/app/Action/TaskAssignCurrentUser.php %%WWWDIR%%/app/Action/TaskAssignCurrentUserColumn.php %%WWWDIR%%/app/Action/TaskAssignDueDateOnCreation.php @@ -988,6 +989,7 @@ %%WWWDIR%%/assets/img/touch-icon-iphone.png %%WWWDIR%%/assets/js/app.min.js %%WWWDIR%%/assets/js/components/accordion.js +%%WWWDIR%%/assets/js/components/autocomplete-email.js %%WWWDIR%%/assets/js/components/board-task-click.js %%WWWDIR%%/assets/js/components/chart-project-avg-time-column.js %%WWWDIR%%/assets/js/components/chart-project-burndown.js @@ -2243,301 +2245,6 @@ %%WWWDIR%%/vendor/fguillot/picodb/lib/PicoDb/StatementHandler.php %%WWWDIR%%/vendor/fguillot/picodb/lib/PicoDb/Table.php %%WWWDIR%%/vendor/fguillot/picodb/lib/PicoDb/UrlParser.php -%%WWWDIR%%/vendor/fguillot/picofeed/LICENSE -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Base.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/Client.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/ClientException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/Curl.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/ForbiddenException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/HttpHeaders.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/InvalidCertificateException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/InvalidUrlException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/MaxRedirectException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/MaxSizeException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/Stream.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/TimeoutException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/UnauthorizedException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Client/Url.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Config/Config.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Encoding/Encoding.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Attribute.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Filter.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Html.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Filter/Tag.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Generator/ContentGeneratorInterface.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Generator/FileContentGenerator.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Generator/YoutubeContentGenerator.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Logging/Logger.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/DateParser.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Feed.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Item.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/MalformedXmlException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Parser.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/ParserException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/ParserInterface.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss10.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss20.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss91.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Rss92.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/XmlEntityException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Parser/XmlParser.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/PicoFeedException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Processor/ContentFilterProcessor.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Processor/ContentGeneratorProcessor.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Processor/ItemPostProcessor.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Processor/ItemProcessorInterface.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Processor/ScraperProcessor.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Favicon.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Reader/ReaderException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Reader/SubscriptionNotFoundException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Reader/UnsupportedFeedFormatException.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.blog.lemonde.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.blogs.nytimes.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.igen.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.nytimes.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.over-blog.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.phoronix.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.slate.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.theguardian.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.wikipedia.org.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.wired.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/.wsj.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/01net.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/abstrusegoose.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/adventuregamers.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/alainonline.net.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/aljazeera.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/allafrica.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/allgemeine-zeitung.de.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/amazingsuperpowers.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/anythingcomic.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ap.org.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/areadvd.de.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/arstechnica.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/awkwardzombie.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bangkokpost.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bgr.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bigfootjustice.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bigpicture.ru.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bizjournals.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/blog.fefe.de.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/blog.mapillary.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/buenosairesherald.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/bunicomic.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/buttersafe.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cad-comic.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/chaoslife.findchaos.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cliquerefresh.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cnet.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/consomac.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/cowbirdsinlove.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/csmonitor.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailyjs.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailyreporter.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dailytech.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/degroupnews.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/derstandard.at.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dilbert.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/discovermagazine.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/distrowatch.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/dozodomo.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/drawingboardcomic.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/e-w-e.ru.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/encyclopedie.naheulbeuk.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/endlessorigami.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/engadget.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/escapistmagazine.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/espn.go.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/exocomics.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/explosm.net.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/extrafabulouscomics.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/factroom.ru.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcodesign.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcoexist.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fastcompany.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ffworld.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/foreignpolicy.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fossbytes.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fototelegraf.ru.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/fowllanguagecomics.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/geek.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/gerbilwithajetpack.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/giantitp.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/github.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/gocomics.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/golem.de.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/gorabbit.ru.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/happletea.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/hardware.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/heise.de.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/hotshowlife.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/huffingtonpost.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/imogenquest.net.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/indiehaven.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ing.dk.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/invisiblebread.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/ir.amd.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/japantimes.co.jp.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/japantoday.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/journaldugeek.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/jsonline.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/justcoolidea.ru.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/kanpai.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/karriere.jobfinder.dk.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/koreaherald.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/koreatimes.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lastplacecomics.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/legorafi.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lejapon.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lesjoiesducode.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lfg.co.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lifehacker.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lifehacker.ru.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linux.org.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/linuxinsider.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lists.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/loadingartist.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/loldwell.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/lukesurl.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/macg.co.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marc.info.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marriedtothesea.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/marycagle.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/maximumble.thebookofbiff.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/medium.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mercworks.net.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/metronieuws.nl.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/milwaukeenns.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mlb.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mokepon.smackjeeves.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/monandroid.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/monwindows.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/moya-planeta.ru.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/mrlovenstein.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/muckrock.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nat-geo.ru.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nationaljournal.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nature.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nba.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nedroid.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/networkworld.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/neustadt-ticker.de.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nextinpact.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/niceteethcomic.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/nichtlustig.de.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/oglaf.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/onhax.net.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/onmilwaukee.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/openrightsgroup.org.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/opensource.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/optipess.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/osnews.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/pastebin.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/peebleslab.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/penny-arcade.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/pixelbeat.org.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/plus.google.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/popstrip.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/publy.ru.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/putaindecode.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/recode.net.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/retractionwatch.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/rockpapershotgun.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/rue89.nouvelobs.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/rugbyrama.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/satwcomic.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/scrumalliance.org.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/securityfocus.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sentfromthemoon.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sitepoint.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/slashdot.org.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smallhousebliss.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smarthomewelt.de.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smashingmagazine.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/smbc-comics.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/soundandvision.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/spiegel.de.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stereophile.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/stupidfox.net.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/subtraction.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/sz.de.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/takprosto.cc.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/techcrunch.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/the-ebook-reader.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theatlantic.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theawkwardyeti.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thecodinglove.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thedoghousediaries.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thegamercat.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thehindu.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thelocal.se.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themerepublic.net.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/themoscowtimes.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thenewslens.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theodd1sout.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/theonion.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/thestandard.com.hk.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/threepanelsoul.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/timesofindia.indiatimes.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/travel-dealz.de.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/treehugger.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/treelobsters.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/twogag.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/twokinds.keenspot.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/undeadly.org.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/upi.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/version2.dk.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/vgcats.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/vuxml.org.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.bbc.co.uk.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.bdgest.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.bgr.in.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.businessweek.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.cnn.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.developpez.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.egscomics.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.fakingnews.firstpost.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.forbes.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.franceculture.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.futura-sciences.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.geekculture.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.howtogeek.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.lepoint.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.lesnumeriques.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.mac4ever.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.makeuseof.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.monsieur-le-chien.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.npr.org.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.numerama.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.oneindia.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.pseudo-sciences.org.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.sciencemag.org.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.slate.fr.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.universfreebox.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/www.zeit.de.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/xkcd.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Rules/zdnet.com.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/CandidateParser.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/ParserInterface.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/RuleLoader.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/RuleParser.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Scraper/Scraper.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/Subscription.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/SubscriptionList.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/SubscriptionListBuilder.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/SubscriptionListParser.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Serialization/SubscriptionParser.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/AtomFeedBuilder.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/AtomHelper.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/AtomItemBuilder.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/FeedBuilder.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/ItemBuilder.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Rss20FeedBuilder.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Rss20Helper.php -%%WWWDIR%%/vendor/fguillot/picofeed/lib/PicoFeed/Syndication/Rss20ItemBuilder.php -%%WWWDIR%%/vendor/fguillot/picofeed/picofeed %%WWWDIR%%/vendor/fguillot/simple-queue/LICENSE %%WWWDIR%%/vendor/fguillot/simple-queue/src/Adapter/AmqpQueueAdapter.php %%WWWDIR%%/vendor/fguillot/simple-queue/src/Adapter/AwsSqsQueueAdapter.php @@ -2596,6 +2303,321 @@ %%WWWDIR%%/vendor/gregwar/captcha/demo/index.php %%WWWDIR%%/vendor/gregwar/captcha/demo/ocr.php %%WWWDIR%%/vendor/gregwar/captcha/demo/output.php +%%WWWDIR%%/vendor/miniflux/picofeed/LICENSE +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Base.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/Client.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/ClientException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/Curl.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/ForbiddenException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/HttpHeaders.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/InvalidCertificateException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/InvalidUrlException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/MaxRedirectException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/MaxSizeException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/Stream.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/TimeoutException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/UnauthorizedException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Client/Url.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Config/Config.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Encoding/Encoding.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Filter/Attribute.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Filter/Filter.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Filter/Html.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Filter/Tag.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Generator/ContentGeneratorInterface.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Generator/FileContentGenerator.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Generator/YoutubeContentGenerator.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Logging/Logger.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/Atom.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/DateParser.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/Feed.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/Item.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/MalformedXmlException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/Parser.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/ParserException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/ParserInterface.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/Rss10.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/Rss20.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/Rss91.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/Rss92.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/XmlEntityException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Parser/XmlParser.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/PicoFeedException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Processor/ContentFilterProcessor.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Processor/ContentGeneratorProcessor.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Processor/ItemPostProcessor.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Processor/ItemProcessorInterface.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Processor/ScraperProcessor.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Reader/Favicon.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Reader/Reader.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Reader/ReaderException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Reader/SubscriptionNotFoundException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Reader/UnsupportedFeedFormatException.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/.blog.lemonde.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/.blogs.nytimes.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/.igen.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/.nytimes.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/.over-blog.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/.phoronix.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/.slate.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/.theguardian.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/.wikipedia.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/.wired.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/.wsj.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/01net.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/abstrusegoose.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/adventuregamers.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/alainonline.net.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/aljazeera.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/allafrica.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/allgemeine-zeitung.de.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/amazingsuperpowers.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/anythingcomic.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/ap.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/areadvd.de.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/arstechnica.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/awkwardzombie.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/backchannel.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/bangkokpost.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/bgr.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/bigfootjustice.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/bigpicture.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/bizjournals.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/biztimes.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/bleepingcomputer.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/blog.fefe.de.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/blog.mapillary.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/brewers.mlb.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/buenosairesherald.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/bunicomic.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/buttersafe.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/cad-comic.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/chaoslife.findchaos.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/chinafile.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/cliquerefresh.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/cnet.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/consomac.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/cowbirdsinlove.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/crash.net.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/csmonitor.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/dailyjs.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/dailyreporter.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/dailytech.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/degroupnews.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/derstandard.at.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/dilbert.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/discovermagazine.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/distrowatch.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/dozodomo.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/drawingboardcomic.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/e-w-e.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/economist.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/encyclopedie.naheulbeuk.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/endlessorigami.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/engadget.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/escapistmagazine.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/espn.go.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/exocomics.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/explosm.net.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/extrafabulouscomics.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/factroom.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/fastcodesign.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/fastcoexist.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/fastcompany.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/ffworld.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/foreignpolicy.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/fossbytes.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/fototelegraf.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/fowllanguagecomics.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/geek.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/geektimes.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/gerbilwithajetpack.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/giantitp.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/github.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/gocomics.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/golem.de.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/gorabbit.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/habrahabr.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/happletea.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/hardware.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/heise.de.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/hotshowlife.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/huffingtonpost.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/imogenquest.net.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/indiehaven.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/ing.dk.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/invisiblebread.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/ir.amd.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/japantimes.co.jp.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/japantoday.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/journaldugeek.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/jsonline.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/justcoolidea.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/kanpai.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/karriere.jobfinder.dk.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/kodi.tv.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/koreaherald.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/koreatimes.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/lastplacecomics.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/legorafi.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/lejapon.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/lesjoiesducode.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/lfg.co.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/lifehacker.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/lifehacker.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/linux.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/linux.org.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/linuxinsider.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/lists.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/loadingartist.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/loldwell.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/lukesurl.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/macg.co.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/marc.info.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/marriedtothesea.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/marycagle.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/maximumble.thebookofbiff.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/medium.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/mercworks.net.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/metronieuws.nl.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/milwaukeenns.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/mokepon.smackjeeves.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/monandroid.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/monwindows.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/moya-planeta.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/mrlovenstein.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/muckrock.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/mynorthshorenow.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/nakedCapitalism.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/nasa.gov.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/nat-geo.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/nationaljournal.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/nature.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/nba.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/nedroid.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/networkworld.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/neustadt-ticker.de.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/nextinpact.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/niceteethcomic.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/nichtlustig.de.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/oglaf.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/onhax.net.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/onmilwaukee.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/openculture.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/opennet.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/openrightsgroup.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/opensource.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/optipess.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/osnews.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/pastebin.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/peebleslab.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/penny-arcade.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/pixelbeat.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/plus.google.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/popstrip.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/publicpolicyforum.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/publy.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/putaindecode.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/recode.net.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/retractionwatch.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/rockpapershotgun.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/rue89.nouvelobs.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/rugbyrama.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/satwcomic.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/scrumalliance.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/securityfocus.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/sentfromthemoon.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/sitepoint.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/slashdot.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/smallhousebliss.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/smarthomewelt.de.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/smashingmagazine.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/smbc-comics.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/snopes.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/soundandvision.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/spiegel.de.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/stereophile.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/stupidfox.net.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/subtraction.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/sz.de.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/takprosto.cc.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/techcrunch.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/the-ebook-reader.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/theatlantic.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/theawkwardyeti.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/thecodinglove.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/thedoghousediaries.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/thegamercat.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/thehindu.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/thelocal.se.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/themerepublic.net.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/themoscowtimes.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/thenewslens.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/theodd1sout.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/theonion.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/thestandard.com.hk.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/threepanelsoul.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/timesofindia.indiatimes.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/travel-dealz.de.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/treehugger.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/treelobsters.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/twogag.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/twokinds.keenspot.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/undeadly.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/upi.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/usatoday.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/version2.dk.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/vgcats.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/vuxml.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/wausaudailyherald.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.bbc.co.uk.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.bdgest.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.bgr.in.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.businessweek.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.cnn.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.developpez.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.egscomics.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.fakingnews.firstpost.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.forbes.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.franceculture.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.futura-sciences.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.geekculture.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.howtogeek.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.lepoint.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.lesnumeriques.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.mac4ever.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.makeuseof.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.monsieur-le-chien.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.npr.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.numerama.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.oneindia.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.pseudo-sciences.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.sciencemag.org.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.slate.fr.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.universfreebox.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/www.zeit.de.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/xkcd.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/ymatuhin.ru.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Rules/zdnet.com.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Scraper/CandidateParser.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Scraper/ParserInterface.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Scraper/RuleLoader.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Scraper/RuleParser.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Scraper/Scraper.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Serialization/Subscription.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Serialization/SubscriptionList.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Serialization/SubscriptionListBuilder.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Serialization/SubscriptionListParser.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Serialization/SubscriptionParser.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Syndication/AtomFeedBuilder.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Syndication/AtomHelper.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Syndication/AtomItemBuilder.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Syndication/FeedBuilder.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Syndication/ItemBuilder.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Syndication/Rss20FeedBuilder.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Syndication/Rss20Helper.php +%%WWWDIR%%/vendor/miniflux/picofeed/lib/PicoFeed/Syndication/Rss20ItemBuilder.php +%%WWWDIR%%/vendor/miniflux/picofeed/picofeed %%WWWDIR%%/vendor/paragonie/random_compat/CHANGELOG.md %%WWWDIR%%/vendor/paragonie/random_compat/ERRATA.md %%WWWDIR%%/vendor/paragonie/random_compat/LICENSE From owner-svn-ports-branches@freebsd.org Sun Aug 27 11:34:57 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 AA880DEDB1E; Sun, 27 Aug 2017 11:34:57 +0000 (UTC) (envelope-from girgen@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 812C96F19A; Sun, 27 Aug 2017 11:34:57 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7RBYuVj020035; Sun, 27 Aug 2017 11:34:56 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7RBYtVl020021; Sun, 27 Aug 2017 11:34:55 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <201708271134.v7RBYtVl020021@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Sun, 27 Aug 2017 11:34:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448818 - in branches/2017Q3: Mk databases/postgresql92-server databases/postgresql93-server databases/postgresql94-server databases/postgresql95-server databases/postgresql96-docs data... X-SVN-Group: ports-branches X-SVN-Commit-Author: girgen X-SVN-Commit-Paths: in branches/2017Q3: Mk databases/postgresql92-server databases/postgresql93-server databases/postgresql94-server databases/postgresql95-server databases/postgresql96-docs databases/postgresql96-server X-SVN-Commit-Revision: 448818 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, 27 Aug 2017 11:34:57 -0000 Author: girgen Date: Sun Aug 27 11:34:55 2017 New Revision: 448818 URL: https://svnweb.freebsd.org/changeset/ports/448818 Log: MFH: r447678 r448010 r448012 The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 9.6.4, 9.5.8, 9.4.13, 9.3.18, and 9.2.22. This release fixes three security issues. It also patches over 50 other bugs reported over the last three months. Users who are affected by the below security issues should update as soon as possible. Users affected by CVE-2017-7547 (https://access.redhat.com/security/cve/CVE-2017-7547) will need to perform additional steps after upgrading to resolve the issue. Other users should plan to update at the next convenient downtime. URL: https://www.postgresql.org/about/news/1772/ Security: CVE-2017-7546, CVE-2017-7547, CVE-2017-7548 FTP sites are shut down. WWW: https://www.postgresql.org/message-id/09fd5ea6-7e09-3101-07ba-2c1d9f2d0aec%40joeconway.com Approved by: ports-secteam Modified: branches/2017Q3/Mk/bsd.sites.mk branches/2017Q3/databases/postgresql92-server/Makefile branches/2017Q3/databases/postgresql92-server/distinfo branches/2017Q3/databases/postgresql93-server/Makefile branches/2017Q3/databases/postgresql93-server/distinfo branches/2017Q3/databases/postgresql94-server/Makefile branches/2017Q3/databases/postgresql94-server/distinfo branches/2017Q3/databases/postgresql95-server/Makefile branches/2017Q3/databases/postgresql95-server/distinfo branches/2017Q3/databases/postgresql96-docs/Makefile branches/2017Q3/databases/postgresql96-server/Makefile branches/2017Q3/databases/postgresql96-server/distinfo branches/2017Q3/databases/postgresql96-server/pkg-plist-client Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/Mk/bsd.sites.mk ============================================================================== --- branches/2017Q3/Mk/bsd.sites.mk Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/Mk/bsd.sites.mk Sun Aug 27 11:34:55 2017 (r448818) @@ -937,9 +937,7 @@ _PERL_CPAN_ID= ${MASTER_SITE_SUBDIR:C/^CPAN:(.)(.)(.*) # .if !defined(IGNORE_MASTER_SITE_PGSQL) MASTER_SITE_PGSQL+= \ - http://ftp.postgresql.org/pub/%SUBDIR%/ \ - https://ftp.postgresql.org/pub/%SUBDIR%/ \ - ftp://ftp.postgresql.org/pub/%SUBDIR%/ + https://ftp.postgresql.org/pub/%SUBDIR%/ .endif .if !defined(IGNORE_MASTER_SITE_PHP) Modified: branches/2017Q3/databases/postgresql92-server/Makefile ============================================================================== --- branches/2017Q3/databases/postgresql92-server/Makefile Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/databases/postgresql92-server/Makefile Sun Aug 27 11:34:55 2017 (r448818) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= postgresql -DISTVERSION?= 9.2.21 +DISTVERSION?= 9.2.22 PORTREVISION?= 1 CATEGORIES?= databases MASTER_SITES= PGSQL/source/v${DISTVERSION} @@ -61,7 +61,7 @@ INSTALL_TARGET?=install-strip SERVER_ONLY= yes COMPONENT= -server USE_RC_SUBR= postgresql -USES+= pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g} +USES+= pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g} USERS= ${PG_USER} GROUPS= ${PG_GROUP} SUB_FILES+= 502.pgsql @@ -83,9 +83,11 @@ DTRACE_DESC= Build with DTrace probes TZDATA_DESC= Use internal timezone database XML_DESC= Build with XML data type +.if ${DISTVERSION:C/([0-9]*).*/\1/} != 10 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info OPTIONS_DEFINE+= ICU ICU_DESC= Use ICU for unicode collation +.endif # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info # (requires dump/restore if modified.) @@ -96,8 +98,10 @@ OPTIONS_DEFAULT+= XML TZDATA INTDATE .if !defined(SLAVE_ONLY) OPTIONS_DEFINE+= NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG -OPTIONS_RADIO= KRB5 -OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5 +. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3 + OPTIONS_RADIO= KRB5 + OPTIONS_RADIO_KRB5= MIT_KRB5 HEIMDAL_KRB5 +. endif KRB5_DESC= Build with kerberos provider support NLS_DESC= Use internationalized messages Modified: branches/2017Q3/databases/postgresql92-server/distinfo ============================================================================== --- branches/2017Q3/databases/postgresql92-server/distinfo Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/databases/postgresql92-server/distinfo Sun Aug 27 11:34:55 2017 (r448818) @@ -1,5 +1,5 @@ -TIMESTAMP = 1494282359 -SHA256 (postgresql/postgresql-9.2.21.tar.bz2) = 0697e843523ee60c563f987f9c65bc4201294b18525d6e5e4b2c50c6d4058ef9 -SIZE (postgresql/postgresql-9.2.21.tar.bz2) = 16508040 +TIMESTAMP = 1502191515 +SHA256 (postgresql/postgresql-9.2.22.tar.bz2) = a70e94fa58776b559a8f7b5301371ac4922c9e3ed313ccbef20862514de7c192 +SIZE (postgresql/postgresql-9.2.22.tar.bz2) = 16531224 SHA256 (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 2f9c831b3dff866f0b2f6f2a9ef771a4045486bc252a851aadc73c50d376319d SIZE (postgresql/pg-9218-icu-2016-08-10.diff.gz) = 5587 Modified: branches/2017Q3/databases/postgresql93-server/Makefile ============================================================================== --- branches/2017Q3/databases/postgresql93-server/Makefile Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/databases/postgresql93-server/Makefile Sun Aug 27 11:34:55 2017 (r448818) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.3.17 +DISTVERSION?= 9.3.18 PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT} MAINTAINER?= pgsql@FreeBSD.org Modified: branches/2017Q3/databases/postgresql93-server/distinfo ============================================================================== --- branches/2017Q3/databases/postgresql93-server/distinfo Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/databases/postgresql93-server/distinfo Sun Aug 27 11:34:55 2017 (r448818) @@ -1,5 +1,5 @@ -TIMESTAMP = 1494282359 -SHA256 (postgresql/postgresql-9.3.17.tar.bz2) = 9c03e5f280cfe9bd202fa01af773eb146abd8ab3065f7279d574c568f6948dbe -SIZE (postgresql/postgresql-9.3.17.tar.bz2) = 17158802 +TIMESTAMP = 1502191516 +SHA256 (postgresql/postgresql-9.3.18.tar.bz2) = ad60d12a5a3dd0f6f5904c41b87e43eff49d3f74e45129fe52c5744366ff2fe0 +SIZE (postgresql/postgresql-9.3.18.tar.bz2) = 17194269 SHA256 (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 4be31ad9899d5caf9f57ad7ebfc0d14f0fcf58ad539c82fb353b016fb76c0c30 SIZE (postgresql/pg-9314-icu-2016-08-10.diff.gz) = 5583 Modified: branches/2017Q3/databases/postgresql94-server/Makefile ============================================================================== --- branches/2017Q3/databases/postgresql94-server/Makefile Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/databases/postgresql94-server/Makefile Sun Aug 27 11:34:55 2017 (r448818) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.4.12 +DISTVERSION?= 9.4.13 MAINTAINER?= pgsql@FreeBSD.org Modified: branches/2017Q3/databases/postgresql94-server/distinfo ============================================================================== --- branches/2017Q3/databases/postgresql94-server/distinfo Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/databases/postgresql94-server/distinfo Sun Aug 27 11:34:55 2017 (r448818) @@ -1,5 +1,5 @@ -TIMESTAMP = 1494282360 -SHA256 (postgresql/postgresql-9.4.12.tar.bz2) = fca055481875d1c49e31c28443f56472a1474b3fbe25b7ae64440c6118f82e64 -SIZE (postgresql/postgresql-9.4.12.tar.bz2) = 17833119 +TIMESTAMP = 1502191519 +SHA256 (postgresql/postgresql-9.4.13.tar.bz2) = 0080f55d65194de8b96a2dab153443f8248ff2b2b10e6ab4cda2dcadcac7f2ab +SIZE (postgresql/postgresql-9.4.13.tar.bz2) = 17867502 SHA256 (postgresql/pg-949-icu-2016-10-02.diff.gz) = 34612e685a79874db04bc6b66c700bfc6412042840c532eef0da7832d1f70d43 SIZE (postgresql/pg-949-icu-2016-10-02.diff.gz) = 5289 Modified: branches/2017Q3/databases/postgresql95-server/Makefile ============================================================================== --- branches/2017Q3/databases/postgresql95-server/Makefile Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/databases/postgresql95-server/Makefile Sun Aug 27 11:34:55 2017 (r448818) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.5.7 +DISTVERSION?= 9.5.8 MAINTAINER?= pgsql@FreeBSD.org Modified: branches/2017Q3/databases/postgresql95-server/distinfo ============================================================================== --- branches/2017Q3/databases/postgresql95-server/distinfo Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/databases/postgresql95-server/distinfo Sun Aug 27 11:34:55 2017 (r448818) @@ -1,5 +1,5 @@ -TIMESTAMP = 1494282360 -SHA256 (postgresql/postgresql-9.5.7.tar.bz2) = 8b1e936f82109325decc0f5575e846b93fb4fd384e8c4bde83ff5e7f87fc6cad -SIZE (postgresql/postgresql-9.5.7.tar.bz2) = 18639775 +TIMESTAMP = 1502191520 +SHA256 (postgresql/postgresql-9.5.8.tar.bz2) = ade57068f134f36710fa953e1ef79185abd96572f8098741413132f79ed37202 +SIZE (postgresql/postgresql-9.5.8.tar.bz2) = 18670910 SHA256 (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5fa083ec38087d6a0961642208f012e902221270708b919b92e9eedaa755e365 SIZE (postgresql/pg-954-icu-2016-08-10.diff.gz) = 5952 Modified: branches/2017Q3/databases/postgresql96-docs/Makefile ============================================================================== --- branches/2017Q3/databases/postgresql96-docs/Makefile Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/databases/postgresql96-docs/Makefile Sun Aug 27 11:34:55 2017 (r448818) @@ -9,8 +9,6 @@ MAINTAINER= pgsql@FreeBSD.org COMMENT= The PostgreSQL documentation set MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server - -USES+= pgsql:${WANT_PGSQL_VER} WANT_PGSQL_VER?=9.6 SLAVE_ONLY= YES @@ -27,6 +25,8 @@ BUILD_DEPENDS+= onsgmls:textproc/opensp \ ${sgmldir}/iso8879/catalog:textproc/iso8879 \ ${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \ docbook-sgml>0:textproc/docbook-sgml +CONFIGURE_ARGS= --without-readline +NO_ARCH= yes do-build: ${MAKE_CMD} -C ${WRKSRC} html Modified: branches/2017Q3/databases/postgresql96-server/Makefile ============================================================================== --- branches/2017Q3/databases/postgresql96-server/Makefile Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/databases/postgresql96-server/Makefile Sun Aug 27 11:34:55 2017 (r448818) @@ -1,7 +1,7 @@ # Created by: Marc G. Fournier # $FreeBSD$ -DISTVERSION?= 9.6.3 +DISTVERSION?= 9.6.4 MAINTAINER?= pgsql@FreeBSD.org Modified: branches/2017Q3/databases/postgresql96-server/distinfo ============================================================================== --- branches/2017Q3/databases/postgresql96-server/distinfo Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/databases/postgresql96-server/distinfo Sun Aug 27 11:34:55 2017 (r448818) @@ -1,5 +1,5 @@ -TIMESTAMP = 1494282361 -SHA256 (postgresql/postgresql-9.6.3.tar.bz2) = 1645b3736901f6d854e695a937389e68ff2066ce0cde9d73919d6ab7c995b9c6 -SIZE (postgresql/postgresql-9.6.3.tar.bz2) = 19534323 +TIMESTAMP = 1502191482 +SHA256 (postgresql/postgresql-9.6.4.tar.bz2) = 2b3ab16d82e21cead54c08b95ce3ac480696944a68603b6c11b3205b7376ce13 +SIZE (postgresql/postgresql-9.6.4.tar.bz2) = 19566875 SHA256 (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 85f81baa0fc8f692bcf802c8645196d9e3afdef4f760cef712d940b87655486e SIZE (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 5998 Modified: branches/2017Q3/databases/postgresql96-server/pkg-plist-client ============================================================================== --- branches/2017Q3/databases/postgresql96-server/pkg-plist-client Sun Aug 27 10:44:40 2017 (r448817) +++ branches/2017Q3/databases/postgresql96-server/pkg-plist-client Sun Aug 27 11:34:55 2017 (r448818) @@ -1019,6 +1019,7 @@ man/man7/WITH.7.gz %%NLS%%share/locale/ru/LC_MESSAGES/psql-9.6.mo %%NLS%%share/locale/sv/LC_MESSAGES/pg_config-9.6.mo %%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-9.6.mo +%%NLS%%share/locale/sv/LC_MESSAGES/psql-9.6.mo %%NLS%%share/locale/ta/LC_MESSAGES/pg_config-9.6.mo %%NLS%%share/locale/tr/LC_MESSAGES/ecpg-9.6.mo %%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-9.6.mo From owner-svn-ports-branches@freebsd.org Sun Aug 27 20:33:37 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 DF75DDF7A3C; Sun, 27 Aug 2017 20:33:37 +0000 (UTC) (envelope-from madpilot@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 9028581BCF; Sun, 27 Aug 2017 20:33:37 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7RKXafc042243; Sun, 27 Aug 2017 20:33:36 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7RKXaKR042237; Sun, 27 Aug 2017 20:33:36 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201708272033.v7RKXaKR042237@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 27 Aug 2017 20:33:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448841 - in branches/2017Q3/finance: gnucash gnucash-docs gnucash/files X-SVN-Group: ports-branches X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in branches/2017Q3/finance: gnucash gnucash-docs gnucash/files X-SVN-Commit-Revision: 448841 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, 27 Aug 2017 20:33:38 -0000 Author: madpilot Date: Sun Aug 27 20:33:36 2017 New Revision: 448841 URL: https://svnweb.freebsd.org/changeset/ports/448841 Log: MFH: r445055 r446961 - Update finance/gnucash to 2.6.17 - Update finance/gnucash-docs to 2.6.17 - Fully convert to option/target helpers and USES localbase Apply patch submitted upstream to better emulate the USG UNIX daylight global variable as implemented in glibc. Obtained from: https://github.com/Gnucash/gnucash/pull/116 Approved by: ports-secteam (delphij) Modified: branches/2017Q3/finance/gnucash-docs/Makefile branches/2017Q3/finance/gnucash-docs/distinfo branches/2017Q3/finance/gnucash-docs/pkg-plist branches/2017Q3/finance/gnucash/Makefile branches/2017Q3/finance/gnucash/distinfo branches/2017Q3/finance/gnucash/files/patch-src_import-export_ofx_gnc-ofx-import.c Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/finance/gnucash-docs/Makefile ============================================================================== --- branches/2017Q3/finance/gnucash-docs/Makefile Sun Aug 27 20:02:54 2017 (r448840) +++ branches/2017Q3/finance/gnucash-docs/Makefile Sun Aug 27 20:33:36 2017 (r448841) @@ -3,7 +3,7 @@ # $MCom: ports/finance/gnucash-docs/Makefile,v 1.7 2007/08/04 03:51:29 marcus Exp $ PORTNAME= gnucash-docs -PORTVERSION= 2.6.16 +PORTVERSION= 2.6.17 CATEGORIES= finance gnome MASTER_SITES= SF/gnucash/${PORTNAME}/${PORTVERSION} \ http://www.gnucash.org/pub/gnucash/sources/stable/ \ @@ -17,11 +17,10 @@ LIB_DEPENDS= librarian.so:textproc/rarian RUN_DEPENDS= yelp:x11/yelp INSTALLS_OMF= yes -USES= autoreconf gmake +USES= autoreconf localbase gmake USE_GNOME= libxml2 GNU_CONFIGURE= yes NO_ARCH= yes -CPPFLAGS+= -I${LOCALBASE}/include post-patch: @${REINPLACE_CMD} -e '/scrollkeeper-preinstall/s|$$(docdir)|$$(gnomehelpdir)|' \ Modified: branches/2017Q3/finance/gnucash-docs/distinfo ============================================================================== --- branches/2017Q3/finance/gnucash-docs/distinfo Sun Aug 27 20:02:54 2017 (r448840) +++ branches/2017Q3/finance/gnucash-docs/distinfo Sun Aug 27 20:33:36 2017 (r448841) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490595775 -SHA256 (gnucash-docs-2.6.16.tar.gz) = dad213032651eaef485d919030ec4e2a30cfec5cdcfb7505f94502fffec2dabe -SIZE (gnucash-docs-2.6.16.tar.gz) = 81516817 +TIMESTAMP = 1499107148 +SHA256 (gnucash-docs-2.6.17.tar.gz) = 79646c60b1cbc3dd6da817e2546af7baa72497ab846939d3565711044825cb35 +SIZE (gnucash-docs-2.6.17.tar.gz) = 92073384 Modified: branches/2017Q3/finance/gnucash-docs/pkg-plist ============================================================================== --- branches/2017Q3/finance/gnucash-docs/pkg-plist Sun Aug 27 20:02:54 2017 (r448840) +++ branches/2017Q3/finance/gnucash-docs/pkg-plist Sun Aug 27 20:33:36 2017 (r448841) @@ -1007,6 +1007,216 @@ share/gnome/help/gnucash-guide/pt/figures/txns_sxn_led share/gnome/help/gnucash-guide/pt/figures/txns_sxn_ledger4.png share/gnome/help/gnucash-guide/pt/gnucash-guide.xml share/gnome/help/gnucash-guide/pt/legal.xml +share/gnome/help/gnucash-guide/ru/appendixa.xml +share/gnome/help/gnucash-guide/ru/appendixb.xml +share/gnome/help/gnucash-guide/ru/appendixc.xml +share/gnome/help/gnucash-guide/ru/appendixd.xml +share/gnome/help/gnucash-guide/ru/ch_accts.xml +share/gnome/help/gnucash-guide/ru/ch_basics.xml +share/gnome/help/gnucash-guide/ru/ch_budgets.xml +share/gnome/help/gnucash-guide/ru/ch_bus_features.xml +share/gnome/help/gnucash-guide/ru/ch_capgain.xml +share/gnome/help/gnucash-guide/ru/ch_cbook.xml +share/gnome/help/gnucash-guide/ru/ch_cc.xml +share/gnome/help/gnucash-guide/ru/ch_currency.xml +share/gnome/help/gnucash-guide/ru/ch_dep.xml +share/gnome/help/gnucash-guide/ru/ch_expenses.xml +share/gnome/help/gnucash-guide/ru/ch_import_business_data.xml +share/gnome/help/gnucash-guide/ru/ch_invest.xml +share/gnome/help/gnucash-guide/ru/ch_loans.xml +share/gnome/help/gnucash-guide/ru/ch_oth_assets.xml +share/gnome/help/gnucash-guide/ru/ch_oview.xml +share/gnome/help/gnucash-guide/ru/ch_python_bindings.xml +share/gnome/help/gnucash-guide/ru/ch_reports.xml +share/gnome/help/gnucash-guide/ru/ch_txns.xml +share/gnome/help/gnucash-guide/ru/fdl-appendix.xml +share/gnome/help/gnucash-guide/ru/figures/accts_CreateAssetsAccount.png +share/gnome/help/gnucash-guide/ru/figures/accts_DefaultExpenseAccounts.png +share/gnome/help/gnucash-guide/ru/figures/accts_DefaultIncomeAccounts.png +share/gnome/help/gnucash-guide/ru/figures/accts_toplevel.png +share/gnome/help/gnucash-guide/ru/figures/accts_tree.png +share/gnome/help/gnucash-guide/ru/figures/basics_AccountRelationships.png +share/gnome/help/gnucash-guide/ru/figures/basics_Accounts.png +share/gnome/help/gnucash-guide/ru/figures/basics_AccountsSampleQIF.png +share/gnome/help/gnucash-guide/ru/figures/basics_CheckAccount.png +share/gnome/help/gnucash-guide/ru/figures/basics_DoubleEntryIntro_SalarySplit.png +share/gnome/help/gnucash-guide/ru/figures/basics_DoubleEntryIntro_compact.png +share/gnome/help/gnucash-guide/ru/figures/basics_DoubleEntryIntro_expanded.png +share/gnome/help/gnucash-guide/ru/figures/basics_DoubleEntryIntro_groceries.png +share/gnome/help/gnucash-guide/ru/figures/basics_DoubleEntryIntro_salary.png +share/gnome/help/gnucash-guide/ru/figures/basics_EmptyAccounts.png +share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup.png +share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_Accounts.png +share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_Finish.png +share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_Setup.png +share/gnome/help/gnucash-guide/ru/figures/basics_NewAccountHierarchySetup_currency.png +share/gnome/help/gnucash-guide/ru/figures/basics_NewBookOpts.png +share/gnome/help/gnucash-guide/ru/figures/basics_QIF_Import_welcome.png +share/gnome/help/gnucash-guide/ru/figures/basics_SaveSQL.png +share/gnome/help/gnucash-guide/ru/figures/basics_SaveXML.png +share/gnome/help/gnucash-guide/ru/figures/basics_TipOfDay.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_billedit.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_billnew.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_billpost.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_jobnew.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_payment.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_vendorfind.png +share/gnome/help/gnucash-guide/ru/figures/bus_ap_vendornew.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_custfind.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_custnew.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoicechange1.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoicechange2.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoicechange3.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoiceedit.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoicenew.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoicepost.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_invoiceprint.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_jobnew.png +share/gnome/help/gnucash-guide/ru/figures/bus_ar_payment.png +share/gnome/help/gnucash-guide/ru/figures/bus_co_reg.png +share/gnome/help/gnucash-guide/ru/figures/bus_pay_ex1.png +share/gnome/help/gnucash-guide/ru/figures/bus_pay_ex2.png +share/gnome/help/gnucash-guide/ru/figures/bus_pay_ex3.png +share/gnome/help/gnucash-guide/ru/figures/bus_pay_ex4.png +share/gnome/help/gnucash-guide/ru/figures/bus_tax_main.png +share/gnome/help/gnucash-guide/ru/figures/bus_tax_new.png +share/gnome/help/gnucash-guide/ru/figures/bus_terms_main.png +share/gnome/help/gnucash-guide/ru/figures/bus_terms_new.png +share/gnome/help/gnucash-guide/ru/figures/capgain_app2main.png +share/gnome/help/gnucash-guide/ru/figures/capgain_app3main.png +share/gnome/help/gnucash-guide/ru/figures/capgain_appmain.png +share/gnome/help/gnucash-guide/ru/figures/cbook_CashFlow.png +share/gnome/help/gnucash-guide/ru/figures/cbook_TransactionRptAssets.png +share/gnome/help/gnucash-guide/ru/figures/cbook_TransactionRptExpenses.png +share/gnome/help/gnucash-guide/ru/figures/cbook_atm.png +share/gnome/help/gnucash-guide/ru/figures/cbook_bankstmt.png +share/gnome/help/gnucash-guide/ru/figures/cbook_chartaccts5.png +share/gnome/help/gnucash-guide/ru/figures/cbook_checkexamp.png +share/gnome/help/gnucash-guide/ru/figures/cbook_gcashdata4.png +share/gnome/help/gnucash-guide/ru/figures/cbook_reconciledCheckAct.png +share/gnome/help/gnucash-guide/ru/figures/cbook_reconexamp.png +share/gnome/help/gnucash-guide/ru/figures/cbook_servch.png +share/gnome/help/gnucash-guide/ru/figures/cbook_transferin.png +share/gnome/help/gnucash-guide/ru/figures/cc_CashFlow.png +share/gnome/help/gnucash-guide/ru/figures/cc_Reversing_Transaction_1.png +share/gnome/help/gnucash-guide/ru/figures/cc_Reversing_Transaction_2.png +share/gnome/help/gnucash-guide/ru/figures/cc_TransactionRptExpenses.png +share/gnome/help/gnucash-guide/ru/figures/cc_TransactionRptVisa.png +share/gnome/help/gnucash-guide/ru/figures/cc_accounts.png +share/gnome/help/gnucash-guide/ru/figures/cc_final.png +share/gnome/help/gnucash-guide/ru/figures/cc_interest.png +share/gnome/help/gnucash-guide/ru/figures/cc_payment.png +share/gnome/help/gnucash-guide/ru/figures/cc_purchases.png +share/gnome/help/gnucash-guide/ru/figures/cc_reconcile.png +share/gnome/help/gnucash-guide/ru/figures/cc_reconcile_init.png +share/gnome/help/gnucash-guide/ru/figures/cc_refund.png +share/gnome/help/gnucash-guide/ru/figures/currency_AfterGetOnlineQuotes.png +share/gnome/help/gnucash-guide/ru/figures/currency_BeforeGetOnlineQuotes.png +share/gnome/help/gnucash-guide/ru/figures/currency_PutTogether_AfterMoney.png +share/gnome/help/gnucash-guide/ru/figures/currency_PutTogether_AfterStocks.png +share/gnome/help/gnucash-guide/ru/figures/currency_PutTogether_AussieHouse.png +share/gnome/help/gnucash-guide/ru/figures/currency_addcurr.png +share/gnome/help/gnucash-guide/ru/figures/currency_main1.png +share/gnome/help/gnucash-guide/ru/figures/currency_main2.png +share/gnome/help/gnucash-guide/ru/figures/currency_main3.png +share/gnome/help/gnucash-guide/ru/figures/currency_peditor.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_AfterBoat.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_AfterStocks.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_BeforeBoat.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_BeforeStocks.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_Commodities.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_MoveMoney.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_SetExchangeRate.png +share/gnome/help/gnucash-guide/ru/figures/currency_purchase_ToAmount.png +share/gnome/help/gnucash-guide/ru/figures/dep_assetmain.png +share/gnome/help/gnucash-guide/ru/figures/dep_assetreg.png +share/gnome/help/gnucash-guide/ru/figures/dep_example.png +share/gnome/help/gnucash-guide/ru/figures/invest2Lots0RegB4Scrub.png +share/gnome/help/gnucash-guide/ru/figures/invest2Lots1B4Scrub.png +share/gnome/help/gnucash-guide/ru/figures/invest2Lots2LotsAftScrubAcct.png +share/gnome/help/gnucash-guide/ru/figures/invest2Lots3RegAftScrubAcct.png +share/gnome/help/gnucash-guide/ru/figures/investLots0_RegB4Scrub.png +share/gnome/help/gnucash-guide/ru/figures/investLots1_BeforeCreateLot.png +share/gnome/help/gnucash-guide/ru/figures/investLots2_BeforeScrub1Lot.png +share/gnome/help/gnucash-guide/ru/figures/investLots2_RegAfterScrub1Lot.png +share/gnome/help/gnucash-guide/ru/figures/investLotsSplitLot0.png +share/gnome/help/gnucash-guide/ru/figures/investLotsSplitLot1.png +share/gnome/help/gnucash-guide/ru/figures/investLotsSplitReg.png +share/gnome/help/gnucash-guide/ru/figures/invest_AccountsPredef.png +share/gnome/help/gnucash-guide/ru/figures/invest_SetupPortfolio2.png +share/gnome/help/gnucash-guide/ru/figures/invest_SetupPortfolio3.png +share/gnome/help/gnucash-guide/ru/figures/invest_dividendcash.png +share/gnome/help/gnucash-guide/ru/figures/invest_dividendreinvest1.png +share/gnome/help/gnucash-guide/ru/figures/invest_int1.png +share/gnome/help/gnucash-guide/ru/figures/invest_int2-1.png +share/gnome/help/gnucash-guide/ru/figures/invest_int2.png +share/gnome/help/gnucash-guide/ru/figures/invest_int3.png +share/gnome/help/gnucash-guide/ru/figures/invest_merge2.png +share/gnome/help/gnucash-guide/ru/figures/invest_merge3.png +share/gnome/help/gnucash-guide/ru/figures/invest_newaccount.png +share/gnome/help/gnucash-guide/ru/figures/invest_newsecurity.png +share/gnome/help/gnucash-guide/ru/figures/invest_peditor.png +share/gnome/help/gnucash-guide/ru/figures/invest_peditor2.png +share/gnome/help/gnucash-guide/ru/figures/invest_ret_of_cap.png +share/gnome/help/gnucash-guide/ru/figures/invest_selectsecurity.png +share/gnome/help/gnucash-guide/ru/figures/invest_sellstock.png +share/gnome/help/gnucash-guide/ru/figures/invest_sellstock2.png +share/gnome/help/gnucash-guide/ru/figures/invest_sellstockLoss2.png +share/gnome/help/gnucash-guide/ru/figures/invest_sellstockManProfCombNet.png +share/gnome/help/gnucash-guide/ru/figures/invest_sellstockManProfSep.png +share/gnome/help/gnucash-guide/ru/figures/invest_sellstockManProfSepNet.png +share/gnome/help/gnucash-guide/ru/figures/invest_setup_current.png +share/gnome/help/gnucash-guide/ru/figures/invest_setup_portfolio1.png +share/gnome/help/gnucash-guide/ru/figures/invest_simplesplit1.png +share/gnome/help/gnucash-guide/ru/figures/invest_split1.png +share/gnome/help/gnucash-guide/ru/figures/invest_split2.png +share/gnome/help/gnucash-guide/ru/figures/invest_split3.png +share/gnome/help/gnucash-guide/ru/figures/invest_split4.png +share/gnome/help/gnucash-guide/ru/figures/invest_split5.png +share/gnome/help/gnucash-guide/ru/figures/invest_stockmerge1.png +share/gnome/help/gnucash-guide/ru/figures/invest_stockvalue.png +share/gnome/help/gnucash-guide/ru/figures/invest_stockvalue_report.png +share/gnome/help/gnucash-guide/ru/figures/invest_stockvalue_report_options.png +share/gnome/help/gnucash-guide/ru/figures/loans_PrivateLoanCalculation.png +share/gnome/help/gnucash-guide/ru/figures/loans_PrivateLoanFirstPayment.png +share/gnome/help/gnucash-guide/ru/figures/loans_PrivateLoanInitial.png +share/gnome/help/gnucash-guide/ru/figures/loans_PrivateLoanSecondPayment.png +share/gnome/help/gnucash-guide/ru/figures/loans_PrivateLoanSecondPaymentAccounts.png +share/gnome/help/gnucash-guide/ru/figures/loans_fcalc.png +share/gnome/help/gnucash-guide/ru/figures/loans_mortgage1.png +share/gnome/help/gnucash-guide/ru/figures/loans_mortgage2.png +share/gnome/help/gnucash-guide/ru/figures/loans_mortgage3.png +share/gnome/help/gnucash-guide/ru/figures/oview_intro.png +share/gnome/help/gnucash-guide/ru/figures/txns_CashFlow.png +share/gnome/help/gnucash-guide/ru/figures/txns_TransactionRptChecking.png +share/gnome/help/gnucash-guide/ru/figures/txns_TransactionRptExpenses.png +share/gnome/help/gnucash-guide/ru/figures/txns_puttoget_Charts.png +share/gnome/help/gnucash-guide/ru/figures/txns_puttoget_Charts1.png +share/gnome/help/gnucash-guide/ru/figures/txns_puttoget_Charts2.png +share/gnome/help/gnucash-guide/ru/figures/txns_reconcile_window1.png +share/gnome/help/gnucash-guide/ru/figures/txns_reconcile_window2.png +share/gnome/help/gnucash-guide/ru/figures/txns_reconcile_window3.png +share/gnome/help/gnucash-guide/ru/figures/txns_register_2account.png +share/gnome/help/gnucash-guide/ru/figures/txns_register_2account2.png +share/gnome/help/gnucash-guide/ru/figures/txns_register_multiaccount.png +share/gnome/help/gnucash-guide/ru/figures/txns_registersplit2.png +share/gnome/help/gnucash-guide/ru/figures/txns_registersplit3.png +share/gnome/help/gnucash-guide/ru/figures/txns_registersplit4.png +share/gnome/help/gnucash-guide/ru/figures/txns_registersplit5.png +share/gnome/help/gnucash-guide/ru/figures/txns_registersplit6.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_editor-2.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_editor-3-frequency.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_editor-3-overview.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_editor-3-template.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_editor-4.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_editor_slr.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_ledger1.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_ledger2.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_ledger3.png +share/gnome/help/gnucash-guide/ru/figures/txns_sxn_ledger4.png +share/gnome/help/gnucash-guide/ru/gnc-glossary.xml +share/gnome/help/gnucash-guide/ru/gnucash-guide.xml +share/gnome/help/gnucash-guide/ru/legal.xml share/gnome/help/gnucash-help/C/Help_ch_Account-Actions.xml share/gnome/help/gnucash-help/C/Help_ch_Business.xml share/gnome/help/gnucash-help/C/Help_ch_Customize.xml Modified: branches/2017Q3/finance/gnucash/Makefile ============================================================================== --- branches/2017Q3/finance/gnucash/Makefile Sun Aug 27 20:02:54 2017 (r448840) +++ branches/2017Q3/finance/gnucash/Makefile Sun Aug 27 20:33:36 2017 (r448841) @@ -2,7 +2,7 @@ # $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $ PORTNAME= gnucash -PORTVERSION= 2.6.16 +PORTVERSION= 2.6.17 PORTREVISION= 1 CATEGORIES= finance gnome MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} @@ -42,8 +42,10 @@ AQBANKING_CONFIGURE_ENABLE=aqbanking AQBANKING_LIB_DEPENDS= libgwengui-gtk2.so:devel/gwenhywfar-gtk2 \ libktoblzcheck.so:finance/ktoblzcheck \ libaqbanking.so:finance/aqbanking +AQBANKING_VARS= GLIB_SCHEMAS+=org.gnucash.dialogs.import.hbci.gschema.xml OFX_CONFIGURE_ENABLE= ofx OFX_LIB_DEPENDS= libofx.so:finance/libofx +OFX_VARS= GLIB_SCHEMAS+=org.gnucash.dialogs.import.ofx.gschema.xml DATABASE_CONFIGURE_ENABLE=dbi DATABASE_BUILD_DEPENDS= libdbi-drivers>=0:databases/libdbi-drivers DATABASE_LIB_DEPENDS= libdbi.so:databases/libdbi @@ -65,6 +67,7 @@ GUILE2_RUN_DEPENDS= slib-guile2>0:lang/slib-guile2 USE_XORG= x11 USES= compiler:c++11-lib desktop-file-utils gettext gmake libtool localbase \ perl5 pkgconfig shebangfix tar:bzip2 +USE_CXXSTD= c++11 INSTALLS_ICONS= yes USE_GNOME+= cairo gtk20 intltool libgnomecanvas libxml2 libxslt GNU_CONFIGURE= yes @@ -90,24 +93,13 @@ GLIB_SCHEMAS= org.gnucash.dialogs.business.gschema.xml org.gnucash.window.pages.account.tree.gschema.xml \ org.gnucash.window.pages.gschema.xml -.include - -.if ${PORT_OPTIONS:MAQBANKING} -GLIB_SCHEMAS+= org.gnucash.dialogs.import.hbci.gschema.xml -.endif - -.if ${PORT_OPTIONS:MOFX} -GLIB_SCHEMAS+= org.gnucash.dialogs.import.ofx.gschema.xml -.endif - .include .if ${CHOSEN_COMPILER_TYPE} == gcc LDFLAGS+= -lstdc++ .endif -post-install: -.if ${PORT_OPTIONS:MPYTHON} +post-install-PYTHON-on: @(cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME}) @@ -115,7 +107,8 @@ post-install: && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PORTNAME}) @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gnucash/_gnucash_core_c.so -.endif + +post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*so* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gnucash/lib*.so Modified: branches/2017Q3/finance/gnucash/distinfo ============================================================================== --- branches/2017Q3/finance/gnucash/distinfo Sun Aug 27 20:02:54 2017 (r448840) +++ branches/2017Q3/finance/gnucash/distinfo Sun Aug 27 20:33:36 2017 (r448841) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490595521 -SHA256 (gnucash-2.6.16.tar.bz2) = 2c556299a6a610fc93dd2ea8d432357e3d43d4630d66d7f888fcf5f4b4ce0881 -SIZE (gnucash-2.6.16.tar.bz2) = 13447266 +TIMESTAMP = 1499106917 +SHA256 (gnucash-2.6.17.tar.bz2) = db965f39b6c5181810a064a1d1f5bb719722ac3b54dfce0cecf43ee7b38e593c +SIZE (gnucash-2.6.17.tar.bz2) = 13508462 Modified: branches/2017Q3/finance/gnucash/files/patch-src_import-export_ofx_gnc-ofx-import.c ============================================================================== --- branches/2017Q3/finance/gnucash/files/patch-src_import-export_ofx_gnc-ofx-import.c Sun Aug 27 20:02:54 2017 (r448840) +++ branches/2017Q3/finance/gnucash/files/patch-src_import-export_ofx_gnc-ofx-import.c Sun Aug 27 20:33:36 2017 (r448841) @@ -1,12 +1,26 @@ --- src/import-export/ofx/gnc-ofx-import.c.orig 2016-12-15 21:46:51 UTC +++ src/import-export/ofx/gnc-ofx-import.c -@@ -337,7 +337,11 @@ fix_ofx_bug_39 (time64 t) +@@ -336,8 +336,25 @@ fix_ofx_bug_39 (time64 t) + { #if HAVE_OFX_BUG_39 struct tm stm; - gnc_localtime_r(&t, &stm); ++ +#ifdef __FreeBSD__ -+ if (!stm.tm_isdst) ++ time64 now; ++ /* ++ * FreeBSD has it's own libc implementation which differs from glibc. In particular: ++ * There is no daylight global ++ * tzname members are set to the string " " (three spaces) when not explicitly populated ++ * ++ * To check that the current timezone does not observe DST I check if tzname[1] starts with a space. ++ */ ++ now = gnc_time (NULL); ++ gnc_localtime_r(&now, &stm); ++ tzset(); ++ ++ if (tzname[1][0] != ' ' && !stm.tm_isdst) +#else + gnc_localtime_r(&t, &stm); if (daylight && !stm.tm_isdst) +#endif t += 3600; From owner-svn-ports-branches@freebsd.org Sun Aug 27 20:35:40 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 4178EDF7AB4; Sun, 27 Aug 2017 20:35:40 +0000 (UTC) (envelope-from madpilot@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 1C05381CBD; Sun, 27 Aug 2017 20:35:40 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7RKZdbD042530; Sun, 27 Aug 2017 20:35:39 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7RKZcg9042524; Sun, 27 Aug 2017 20:35:38 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201708272035.v7RKZcg9042524@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 27 Aug 2017 20:35:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448842 - in branches/2017Q3/net: asterisk11 asterisk11/files asterisk13 asterisk13/files X-SVN-Group: ports-branches X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in branches/2017Q3/net: asterisk11 asterisk11/files asterisk13 asterisk13/files X-SVN-Commit-Revision: 448842 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, 27 Aug 2017 20:35:40 -0000 Author: madpilot Date: Sun Aug 27 20:35:38 2017 New Revision: 448842 URL: https://svnweb.freebsd.org/changeset/ports/448842 Log: MFH: r448520 Make the provided rc script more robust. Also add an asterisk_stopsleep knob (disabled by default) to allow users to work around a possible race condition when asterisk is sent a stop command just after launching, but before it's startup is actually completed. PR: 221271 Submitted by: O. Hartmann Approved by: ports-secteam (delphij) Modified: branches/2017Q3/net/asterisk11/Makefile branches/2017Q3/net/asterisk11/files/asterisk.in branches/2017Q3/net/asterisk13/Makefile branches/2017Q3/net/asterisk13/files/asterisk.in Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/net/asterisk11/Makefile ============================================================================== --- branches/2017Q3/net/asterisk11/Makefile Sun Aug 27 20:33:36 2017 (r448841) +++ branches/2017Q3/net/asterisk11/Makefile Sun Aug 27 20:35:38 2017 (r448842) @@ -2,7 +2,7 @@ PORTNAME= asterisk PORTVERSION= 11.25.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ Modified: branches/2017Q3/net/asterisk11/files/asterisk.in ============================================================================== --- branches/2017Q3/net/asterisk11/files/asterisk.in Sun Aug 27 20:33:36 2017 (r448841) +++ branches/2017Q3/net/asterisk11/files/asterisk.in Sun Aug 27 20:35:38 2017 (r448842) @@ -17,6 +17,8 @@ # Default is "-n" # asterisk_pidfile (string): Location of the asterisk pid file # Default is /var/run/asterisk/asterisk.pid +# asterisk_stopsleep (int): Number of seconds to sleep before sending stop command +# Default is 0, which disables it # . /etc/rc.subr @@ -31,6 +33,7 @@ load_rc_config $name : ${asterisk_user:=%%ASTERISK_USER%%} : ${asterisk_args=-n} : ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} +: ${asterisk_stopsleep:=0} extra_commands=reload @@ -52,13 +55,26 @@ asterisk_precmd() asterisk_stop() { - echo 'Stopping asterisk' + if [ -z "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + _run_rc_notrunning + return 1 + fi + echo 'Stopping asterisk.' + if [ ${asterisk_stopsleep} > 0 ]; then + sleep ${asterisk_stopsleep} + fi $command -nqrx 'core stop now' + wait_for_pids $rc_pid } asterisk_reload() { - echo 'Reloading asterisk' + if [ -z "$rc_pid" ]; then + _run_rc_notrunning + return 1 + fi + echo 'Reloading asterisk.' $command -nqrx 'reload' } Modified: branches/2017Q3/net/asterisk13/Makefile ============================================================================== --- branches/2017Q3/net/asterisk13/Makefile Sun Aug 27 20:33:36 2017 (r448841) +++ branches/2017Q3/net/asterisk13/Makefile Sun Aug 27 20:35:38 2017 (r448842) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.16.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ Modified: branches/2017Q3/net/asterisk13/files/asterisk.in ============================================================================== --- branches/2017Q3/net/asterisk13/files/asterisk.in Sun Aug 27 20:33:36 2017 (r448841) +++ branches/2017Q3/net/asterisk13/files/asterisk.in Sun Aug 27 20:35:38 2017 (r448842) @@ -17,6 +17,8 @@ # Default is "-n" # asterisk_pidfile (string): Location of the asterisk pid file # Default is /var/run/asterisk/asterisk.pid +# asterisk_stopsleep (int): Number of seconds to sleep before sending stop command +# Default is 0, which disables it # . /etc/rc.subr @@ -31,6 +33,7 @@ load_rc_config $name : ${asterisk_user:=%%ASTERISK_USER%%} : ${asterisk_args=-n} : ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} +: ${asterisk_stopsleep:=0} extra_commands=reload @@ -52,13 +55,26 @@ asterisk_precmd() asterisk_stop() { - echo 'Stopping asterisk' + if [ -z "$rc_pid" ]; then + [ -n "$rc_fast" ] && return 0 + _run_rc_notrunning + return 1 + fi + echo 'Stopping asterisk.' + if [ ${asterisk_stopsleep} > 0 ]; then + sleep ${asterisk_stopsleep} + fi $command -nqrx 'core stop now' + wait_for_pids $rc_pid } asterisk_reload() { - echo 'Reloading asterisk' + if [ -z "$rc_pid" ]; then + _run_rc_notrunning + return 1 + fi + echo 'Reloading asterisk.' $command -nqrx 'reload' } From owner-svn-ports-branches@freebsd.org Sun Aug 27 20:59:53 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 1D315DF7FDE; Sun, 27 Aug 2017 20:59:53 +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 E0149825D6; Sun, 27 Aug 2017 20:59:52 +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 v7RKxpGs050932; Sun, 27 Aug 2017 20:59:51 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7RKxpvs050930; Sun, 27 Aug 2017 20:59:51 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201708272059.v7RKxpvs050930@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 27 Aug 2017 20:59:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448845 - branches/2017Q3/audio/musicpd X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2017Q3/audio/musicpd X-SVN-Commit-Revision: 448845 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, 27 Aug 2017 20:59:53 -0000 Author: riggs Date: Sun Aug 27 20:59:51 2017 New Revision: 448845 URL: https://svnweb.freebsd.org/changeset/ports/448845 Log: MFH: r448823 Update to upstream version 0.20.10 (bugfix release) Approved by: ports-secteam (delphij) Modified: branches/2017Q3/audio/musicpd/Makefile branches/2017Q3/audio/musicpd/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/audio/musicpd/Makefile ============================================================================== --- branches/2017Q3/audio/musicpd/Makefile Sun Aug 27 20:57:26 2017 (r448844) +++ branches/2017Q3/audio/musicpd/Makefile Sun Aug 27 20:59:51 2017 (r448845) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= musicpd -PORTVERSION= 0.20.9 +PORTVERSION= 0.20.10 CATEGORIES= audio ipv6 MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/ DISTNAME= mpd-${PORTVERSION} Modified: branches/2017Q3/audio/musicpd/distinfo ============================================================================== --- branches/2017Q3/audio/musicpd/distinfo Sun Aug 27 20:57:26 2017 (r448844) +++ branches/2017Q3/audio/musicpd/distinfo Sun Aug 27 20:59:51 2017 (r448845) @@ -1,3 +1,3 @@ -TIMESTAMP = 1497078447 -SHA256 (mpd-0.20.9.tar.xz) = cd77a2869e32354b004cc6b34fcb0bee56114caa2d9ed862aaa8071441e34eb7 -SIZE (mpd-0.20.9.tar.xz) = 773404 +TIMESTAMP = 1503840715 +SHA256 (mpd-0.20.10.tar.xz) = 52fbc1125cdba41ba999add2820d45f3ce7cf493006bb04d8f0b2937204d3121 +SIZE (mpd-0.20.10.tar.xz) = 778828 From owner-svn-ports-branches@freebsd.org Tue Aug 29 10:28:48 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 2AB53DD5F7B; Tue, 29 Aug 2017 10:28:48 +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 010C980231; Tue, 29 Aug 2017 10:28:47 +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 v7TASlld069773; Tue, 29 Aug 2017 10:28:47 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7TASk8S069763; Tue, 29 Aug 2017 10:28:46 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201708291028.v7TASk8S069763@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 29 Aug 2017 10:28:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448900 - in branches/2017Q3/dns: bind910 bind910/files bind911 bind911/files bind99 bind99/files X-SVN-Group: ports-branches X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in branches/2017Q3/dns: bind910 bind910/files bind911 bind911/files bind99 bind99/files X-SVN-Commit-Revision: 448900 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, 29 Aug 2017 10:28:48 -0000 Author: mat Date: Tue Aug 29 10:28:45 2017 New Revision: 448900 URL: https://svnweb.freebsd.org/changeset/ports/448900 Log: MFH: r446860 Update BIND9 ports to 9.{9.11,10.6,11.2}. Fixes related to LMDB usage: https://kb.isc.org/article/AA-01497/0/Operational-Notification%3A-LMDB-integration-problems-with-BIND-9.11.0-and-9.11.1.html Sponsored by: Absolight Modified: branches/2017Q3/dns/bind910/Makefile branches/2017Q3/dns/bind910/distinfo branches/2017Q3/dns/bind910/files/patch-configure branches/2017Q3/dns/bind911/Makefile branches/2017Q3/dns/bind911/distinfo branches/2017Q3/dns/bind911/files/extrapatch-bind-min-override-ttl branches/2017Q3/dns/bind911/files/patch-configure branches/2017Q3/dns/bind99/Makefile branches/2017Q3/dns/bind99/distinfo branches/2017Q3/dns/bind99/files/patch-configure Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/dns/bind910/Makefile ============================================================================== --- branches/2017Q3/dns/bind910/Makefile Tue Aug 29 09:36:27 2017 (r448899) +++ branches/2017Q3/dns/bind910/Makefile Tue Aug 29 10:28:45 2017 (r448900) @@ -16,7 +16,7 @@ LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.5-P3 +ISCVERSION= 9.10.6 USES= cpe libedit @@ -228,8 +228,8 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ \ - ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ* \ + ${WRKSRC}/HISTORY* ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR} # Can't use USE_PYTHON=autoplist post-install-PYTHON-on: Modified: branches/2017Q3/dns/bind910/distinfo ============================================================================== --- branches/2017Q3/dns/bind910/distinfo Tue Aug 29 09:36:27 2017 (r448899) +++ branches/2017Q3/dns/bind910/distinfo Tue Aug 29 10:28:45 2017 (r448900) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499711579 -SHA256 (bind-9.10.5-P3.tar.gz) = 8d7e96b5b0bbac7b900d4c4bbb82e0956b4e509433c5fa392bb72a929b96606a -SIZE (bind-9.10.5-P3.tar.gz) = 9413321 +TIMESTAMP = 1501282039 +SHA256 (bind-9.10.6.tar.gz) = 17bbcd2bd7b1d32f5ba4b30d5dbe8a39bce200079048073d1e0d050fdf47e69d +SIZE (bind-9.10.6.tar.gz) = 9449394 Modified: branches/2017Q3/dns/bind910/files/patch-configure ============================================================================== --- branches/2017Q3/dns/bind910/files/patch-configure Tue Aug 29 09:36:27 2017 (r448899) +++ branches/2017Q3/dns/bind910/files/patch-configure Tue Aug 29 10:28:45 2017 (r448900) @@ -1,6 +1,6 @@ ---- configure.orig 2017-04-14 03:54:11 UTC +--- configure.orig 2017-07-24 05:31:21 UTC +++ configure -@@ -14347,27 +14347,9 @@ done +@@ -14348,27 +14348,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -30,7 +30,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -14410,47 +14392,7 @@ $as_echo "no" >&6; } ;; +@@ -14411,47 +14393,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -79,7 +79,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -21960,7 +21902,7 @@ $as_echo "" >&6; } +@@ -22036,7 +21978,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: branches/2017Q3/dns/bind911/Makefile ============================================================================== --- branches/2017Q3/dns/bind911/Makefile Tue Aug 29 09:36:27 2017 (r448899) +++ branches/2017Q3/dns/bind911/Makefile Tue Aug 29 10:28:45 2017 (r448900) @@ -30,7 +30,7 @@ LICENSE= MPL LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.1-P3 +ISCVERSION= 9.11.2 USES= cpe libedit @@ -271,8 +271,8 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ \ - ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGES \ + ${WRKSRC}/HISTORY* ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR} .endif # BIND_TOOLS_SLAVE # Can't use USE_PYTHON=autoplist Modified: branches/2017Q3/dns/bind911/distinfo ============================================================================== --- branches/2017Q3/dns/bind911/distinfo Tue Aug 29 09:36:27 2017 (r448899) +++ branches/2017Q3/dns/bind911/distinfo Tue Aug 29 10:28:45 2017 (r448900) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499711607 -SHA256 (bind-9.11.1-P3.tar.gz) = 52426e75432e46996dc90f24fca027805a341c38fbbb022b60dc9acd2677ccf4 -SIZE (bind-9.11.1-P3.tar.gz) = 9749095 +TIMESTAMP = 1501282074 +SHA256 (bind-9.11.2.tar.gz) = 7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a +SIZE (bind-9.11.2.tar.gz) = 9782180 Modified: branches/2017Q3/dns/bind911/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2017Q3/dns/bind911/files/extrapatch-bind-min-override-ttl Tue Aug 29 09:36:27 2017 (r448899) +++ branches/2017Q3/dns/bind911/files/extrapatch-bind-min-override-ttl Tue Aug 29 10:28:45 2017 (r448900) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2017-04-14 03:58:25 UTC +--- bin/named/config.c.orig 2017-07-24 05:36:50 UTC +++ bin/named/config.c @@ -154,6 +154,8 @@ options {\n\ lame-ttl 600;\n\ @@ -9,9 +9,9 @@ max-cache-ttl 604800; /* 1 week */\n\ transfer-format many-answers;\n\ max-cache-size 90%;\n\ ---- bin/named/server.c.orig 2017-04-14 03:58:25 UTC +--- bin/named/server.c.orig 2017-07-24 05:36:50 UTC +++ bin/named/server.c -@@ -3693,6 +3693,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3713,6 +3713,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -28,7 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2017-04-14 03:58:25 UTC +--- lib/dns/include/dns/view.h.orig 2017-07-24 05:36:50 UTC +++ lib/dns/include/dns/view.h @@ -146,6 +146,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -39,7 +39,7 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2017-04-14 03:58:25 UTC +--- lib/dns/resolver.c.orig 2017-07-24 05:36:50 UTC +++ lib/dns/resolver.c @@ -5439,6 +5439,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } @@ -60,9 +60,9 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2017-04-14 03:58:25 UTC +--- lib/isccfg/namedconf.c.orig 2017-07-24 05:36:50 UTC +++ lib/isccfg/namedconf.c -@@ -1759,6 +1759,8 @@ view_clauses[] = { +@@ -1765,6 +1765,8 @@ view_clauses[] = { { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, { "max-acache-size", &cfg_type_sizenodefault, 0 }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, Modified: branches/2017Q3/dns/bind911/files/patch-configure ============================================================================== --- branches/2017Q3/dns/bind911/files/patch-configure Tue Aug 29 09:36:27 2017 (r448899) +++ branches/2017Q3/dns/bind911/files/patch-configure Tue Aug 29 10:28:45 2017 (r448900) @@ -1,6 +1,6 @@ ---- configure.orig 2017-04-14 03:58:25 UTC +--- configure.orig 2017-07-24 05:36:50 UTC +++ configure -@@ -14401,27 +14401,9 @@ done +@@ -14402,27 +14402,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -30,7 +30,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -14464,47 +14446,7 @@ $as_echo "no" >&6; } ;; +@@ -14465,47 +14447,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -79,7 +79,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -22666,7 +22608,7 @@ $as_echo "" >&6; } +@@ -22825,7 +22767,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: branches/2017Q3/dns/bind99/Makefile ============================================================================== --- branches/2017Q3/dns/bind99/Makefile Tue Aug 29 09:36:27 2017 (r448899) +++ branches/2017Q3/dns/bind99/Makefile Tue Aug 29 10:28:45 2017 (r448900) @@ -16,7 +16,7 @@ LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.10-P3 +ISCVERSION= 9.9.11 USES= cpe libedit @@ -211,8 +211,8 @@ post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ \ - ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ* \ + ${WRKSRC}/HISTORY* ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR} # Can't use USE_PYTHON=autoplist post-install-PYTHON-on: Modified: branches/2017Q3/dns/bind99/distinfo ============================================================================== --- branches/2017Q3/dns/bind99/distinfo Tue Aug 29 09:36:27 2017 (r448899) +++ branches/2017Q3/dns/bind99/distinfo Tue Aug 29 10:28:45 2017 (r448900) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499711508 -SHA256 (bind-9.9.10-P3.tar.gz) = a116a32bd4f558912418444127949a0ab0861ce98a29ee26f00767a84b0bd003 -SIZE (bind-9.9.10-P3.tar.gz) = 8841873 +TIMESTAMP = 1501282004 +SHA256 (bind-9.9.11.tar.gz) = 995395d540b6dd8eb77d737824f47dc10917c864ba4ab450a703b8c6179dc8ba +SIZE (bind-9.9.11.tar.gz) = 8867109 Modified: branches/2017Q3/dns/bind99/files/patch-configure ============================================================================== --- branches/2017Q3/dns/bind99/files/patch-configure Tue Aug 29 09:36:27 2017 (r448899) +++ branches/2017Q3/dns/bind99/files/patch-configure Tue Aug 29 10:28:45 2017 (r448900) @@ -1,6 +1,6 @@ ---- configure.orig 2017-04-14 03:50:56 UTC +--- configure.orig 2017-07-24 05:26:01 UTC +++ configure -@@ -14508,27 +14508,9 @@ done +@@ -14509,27 +14509,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -30,7 +30,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5 $as_echo_n "checking linking as $TRY_LIBS... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -14571,47 +14553,7 @@ $as_echo "no" >&6; } ;; +@@ -14572,47 +14554,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -79,7 +79,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -20735,7 +20677,7 @@ $as_echo "" >&6; } +@@ -20809,7 +20751,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). From owner-svn-ports-branches@freebsd.org Tue Aug 29 15:19:53 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 CC967DDE207; Tue, 29 Aug 2017 15:19:53 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A613266236; Tue, 29 Aug 2017 15:19:53 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7TFJqUl090173; Tue, 29 Aug 2017 15:19:52 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7TFJpT5090162; Tue, 29 Aug 2017 15:19:51 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201708291519.v7TFJpT5090162@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 29 Aug 2017 15:19:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448926 - in branches/2017Q3/net-mgmt/cacti: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2017Q3/net-mgmt/cacti: . files X-SVN-Commit-Revision: 448926 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, 29 Aug 2017 15:19:53 -0000 Author: feld Date: Tue Aug 29 15:19:51 2017 New Revision: 448926 URL: https://svnweb.freebsd.org/changeset/ports/448926 Log: MFH: r447324 r447970 r448430 r448588 - Update to 1.1.16 PR: 221205 Submitted by: freebsd-ports@dan.me.uk(maintainer) net-mgmt/cacti: Update to 1.1.17 - Regenerate patches Changes: https://www.cacti.net/release_notes.php?version=1.1.17 PR: 221499 Submitted by: Daniel Austin (maintainer) net-mgmt/cacti: Update to 1.1.18 Changes: https://www.cacti.net/release_notes.php?version=1.1.18 PR: 221669 Submitted by: Daniel Austin (maintainer) net-mgmt/cacti: Update to 1.1.19 Changes: https://www.cacti.net/release_notes.php?version=1.1.19 PR: 221693 Submitted by: Submitted by: Daniel Austin (maintainer) Approved by: ports-secteam (with hat) Modified: branches/2017Q3/net-mgmt/cacti/Makefile branches/2017Q3/net-mgmt/cacti/distinfo branches/2017Q3/net-mgmt/cacti/files/patch-include__global.php branches/2017Q3/net-mgmt/cacti/files/patch-include__global_settings.php branches/2017Q3/net-mgmt/cacti/files/patch-install__functions.php branches/2017Q3/net-mgmt/cacti/files/patch-lib__clog_webapi.php branches/2017Q3/net-mgmt/cacti/files/patch-lib__functions.php branches/2017Q3/net-mgmt/cacti/files/patch-poller_maintenance.php branches/2017Q3/net-mgmt/cacti/files/patch-utilities.php branches/2017Q3/net-mgmt/cacti/pkg-plist Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/net-mgmt/cacti/Makefile ============================================================================== --- branches/2017Q3/net-mgmt/cacti/Makefile Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/Makefile Tue Aug 29 15:19:51 2017 (r448926) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cacti -PORTVERSION= 1.1.15 +PORTVERSION= 1.1.19 CATEGORIES= net-mgmt www MASTER_SITES= http://www.cacti.net/downloads/ \ ftp://ftpmirror.uk/freebsd-ports/cacti/ Modified: branches/2017Q3/net-mgmt/cacti/distinfo ============================================================================== --- branches/2017Q3/net-mgmt/cacti/distinfo Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/distinfo Tue Aug 29 15:19:51 2017 (r448926) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501116016 -SHA256 (cacti-1.1.15.tar.gz) = 5f0c5a1b7afd0d62fbc4f36f0017d485b8eb71d49b712d01c1ba2999ca7af9ac -SIZE (cacti-1.1.15.tar.gz) = 8892187 +TIMESTAMP = 1503450536 +SHA256 (cacti-1.1.19.tar.gz) = 525c7d797df1361d921c99ab92b53725b9a40b8f2fb557f95958f0744acd5daf +SIZE (cacti-1.1.19.tar.gz) = 8906595 Modified: branches/2017Q3/net-mgmt/cacti/files/patch-include__global.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-include__global.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-include__global.php Tue Aug 29 15:19:51 2017 (r448926) @@ -1,6 +1,6 @@ ---- include/global.php.orig 2017-04-26 00:30:09 UTC +--- include/global.php.orig 2017-08-13 04:06:37 UTC +++ include/global.php -@@ -131,7 +131,7 @@ if ($config['cacti_server_os'] == 'win32 +@@ -139,7 +139,7 @@ if ($config['cacti_server_os'] == 'win32') { $config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__)); } $config['include_path'] = dirname(__FILE__); Modified: branches/2017Q3/net-mgmt/cacti/files/patch-include__global_settings.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-include__global_settings.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-include__global_settings.php Tue Aug 29 15:19:51 2017 (r448926) @@ -1,6 +1,6 @@ ---- include/global_settings.php.orig 2017-04-26 00:30:09 UTC +--- include/global_settings.php.orig 2017-08-13 04:06:37 UTC +++ include/global_settings.php -@@ -135,9 +135,9 @@ $settings = array( +@@ -144,9 +144,9 @@ $settings = array( ), 'path_cactilog' => array( 'friendly_name' => __('Cacti Log Path'), Modified: branches/2017Q3/net-mgmt/cacti/files/patch-install__functions.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-install__functions.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-install__functions.php Tue Aug 29 15:19:51 2017 (r448926) @@ -1,6 +1,6 @@ ---- install/functions.php.orig 2017-04-26 00:30:09 UTC +--- install/functions.php.orig 2017-08-13 04:06:37 UTC +++ install/functions.php -@@ -421,7 +421,7 @@ function install_file_paths () { +@@ -432,7 +432,7 @@ function install_file_paths () { if (config_value_exists('path_cactilog')) { $input['path_cactilog']['default'] = read_config_option('path_cactilog'); } else { Modified: branches/2017Q3/net-mgmt/cacti/files/patch-lib__clog_webapi.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-lib__clog_webapi.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-lib__clog_webapi.php Tue Aug 29 15:19:51 2017 (r448926) @@ -1,15 +1,15 @@ ---- lib/clog_webapi.php.orig 2017-06-05 03:49:49 UTC +--- lib/clog_webapi.php.orig 2017-08-13 04:06:37 UTC +++ lib/clog_webapi.php -@@ -40,7 +40,7 @@ function clog_purge_logfile() { - $logfile = read_config_option('path_cactilog'); +@@ -42,7 +42,7 @@ function clog_purge_logfile() { + $logfile = read_config_option('path_cactilog'); if ($logfile == '') { - $logfile = $config['base_path'] . '/log/cacti.log'; + $logfile = '/var/log/cacti/log'; } - if (file_exists($logfile)) { -@@ -70,7 +70,7 @@ function clog_view_logfile() { + $purgefile = dirname($logfile) . '/' . get_nfilter_request_var('filename'); +@@ -85,7 +85,7 @@ function clog_view_logfile() { $logfile = $requestedFile; } } elseif ($logfile == '') { Modified: branches/2017Q3/net-mgmt/cacti/files/patch-lib__functions.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-lib__functions.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-lib__functions.php Tue Aug 29 15:19:51 2017 (r448926) @@ -1,6 +1,6 @@ ---- lib/functions.php.orig 2017-04-26 00:30:09 UTC +--- lib/functions.php.orig 2017-08-13 04:06:37 UTC +++ lib/functions.php -@@ -594,7 +594,7 @@ function cacti_log($string, $output = fa +@@ -615,7 +615,7 @@ function cacti_log($string, $output = false, $environ /* Log to Logfile */ if (($logdestination == 1 || $logdestination == 2) && read_config_option('log_verbosity') != POLLER_VERBOSITY_NONE) { if ($logfile == '') { Modified: branches/2017Q3/net-mgmt/cacti/files/patch-poller_maintenance.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-poller_maintenance.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-poller_maintenance.php Tue Aug 29 15:19:51 2017 (r448926) @@ -1,6 +1,6 @@ ---- poller_maintenance.php.orig 2017-04-26 00:30:09 UTC +--- poller_maintenance.php.orig 2017-08-13 04:06:37 UTC +++ poller_maintenance.php -@@ -175,13 +175,13 @@ function logrotate_rotatenow () { +@@ -197,14 +197,14 @@ function logrotate_rotatenow () { $log = read_config_option('path_cactilog'); if ($log == '') { @@ -9,6 +9,7 @@ } set_config_option('logrotate_lastrun', time()); + clearstatcache(); - if (is_writable(dirname($log) . '/') && is_writable($log)) { Modified: branches/2017Q3/net-mgmt/cacti/files/patch-utilities.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-utilities.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-utilities.php Tue Aug 29 15:19:51 2017 (r448926) @@ -1,15 +1,15 @@ ---- utilities.php.orig 2017-06-05 03:49:49 UTC +--- utilities.php.orig 2017-08-13 04:06:37 UTC +++ utilities.php @@ -877,7 +877,7 @@ function utilities_view_logfile() { - $logfile = $requestedFile; - } - } elseif ($logfile == '') { + } + + if ($logfile == '') { - $logfile = $config['base_path'] . '/log/cacti.log'; + $logfile = '/var/log/cacti/log'; } /* ================= input validation and session storage ================= */ -@@ -1194,7 +1194,7 @@ function utilities_clear_logfile() { +@@ -1199,7 +1199,7 @@ function utilities_clear_logfile() { $logfile = read_config_option('path_cactilog'); if ($logfile == '') { Modified: branches/2017Q3/net-mgmt/cacti/pkg-plist ============================================================================== --- branches/2017Q3/net-mgmt/cacti/pkg-plist Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/pkg-plist Tue Aug 29 15:19:51 2017 (r448926) @@ -1094,6 +1094,7 @@ %%CACTIDIR%%/install/upgrades/1_1_8.php %%CACTIDIR%%/install/upgrades/1_1_11.php %%CACTIDIR%%/install/upgrades/1_1_14.php +%%CACTIDIR%%/install/upgrades/1_1_17.php %%CACTIDIR%%/install/upgrades/index.php %%CACTIDIR%%/lib/aggregate.php %%CACTIDIR%%/lib/api_aggregate.php From owner-svn-ports-branches@freebsd.org Wed Aug 30 05:21:00 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 948B6DEF79C; Wed, 30 Aug 2017 05:21:00 +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 5D67A83A71; Wed, 30 Aug 2017 05:21:00 +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 v7U5KxIZ037319; Wed, 30 Aug 2017 05:20:59 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7U5Kxf3037318; Wed, 30 Aug 2017 05:20:59 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201708300520.v7U5Kxf3037318@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Wed, 30 Aug 2017 05:20:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448959 - branches/2017Q3/security/softether X-SVN-Group: ports-branches X-SVN-Commit-Author: pi X-SVN-Commit-Paths: branches/2017Q3/security/softether X-SVN-Commit-Revision: 448959 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, 30 Aug 2017 05:21:00 -0000 Author: pi Date: Wed Aug 30 05:20:59 2017 New Revision: 448959 URL: https://svnweb.freebsd.org/changeset/ports/448959 Log: MFH: r445992 security/softether: Add conflict with softether-devel PR: 219136 Submitted by: Franco Fichtner Approved by: net@arrishq.net (maintainer) Approved by: portmgr (blanket approval) Modified: branches/2017Q3/security/softether/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/security/softether/Makefile ============================================================================== --- branches/2017Q3/security/softether/Makefile Wed Aug 30 03:40:04 2017 (r448958) +++ branches/2017Q3/security/softether/Makefile Wed Aug 30 05:20:59 2017 (r448959) @@ -12,6 +12,8 @@ COMMENT= Softether VPN solution LICENSE= GPLv2 +CONFLICTS_INSTALL= softether-devel + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib From owner-svn-ports-branches@freebsd.org Wed Aug 30 13:46:23 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 97DE6E028B6; Wed, 30 Aug 2017 13:46:23 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 66EE66DE7E; Wed, 30 Aug 2017 13:46:23 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7UDkMhw046616; Wed, 30 Aug 2017 13:46:22 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7UDkMSd046614; Wed, 30 Aug 2017 13:46:22 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201708301346.v7UDkMSd046614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Wed, 30 Aug 2017 13:46:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448982 - branches/2017Q3/www/py-django X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: branches/2017Q3/www/py-django X-SVN-Commit-Revision: 448982 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, 30 Aug 2017 13:46:23 -0000 Author: feld Date: Wed Aug 30 13:46:22 2017 New Revision: 448982 URL: https://svnweb.freebsd.org/changeset/ports/448982 Log: MFH: r445516 r448688 Remove DJANGO19 option: upstream support for 1.9.x has ended - Update WWW Reference: https://www.djangoproject.com/download/#supported-versions Update to 1.11.4 to match www/py-django111 - While I'm here, change indent PR: 221746 Submitted by: dvl Approved by: ports-secteam (with hat) Modified: branches/2017Q3/www/py-django/Makefile branches/2017Q3/www/py-django/pkg-descr Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/www/py-django/Makefile ============================================================================== --- branches/2017Q3/www/py-django/Makefile Wed Aug 30 13:29:43 2017 (r448981) +++ branches/2017Q3/www/py-django/Makefile Wed Aug 30 13:46:22 2017 (r448982) @@ -3,7 +3,7 @@ PORTNAME= django CATEGORIES= www python -PORTVERSION= 1.11.1 +PORTVERSION= 1.11.4 PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= python@FreeBSD.org @@ -12,12 +12,11 @@ COMMENT= High-level Python Web Framework (meta port) LICENSE= BSD3CLAUSE OPTIONS_SINGLE= DJANGO -OPTIONS_SINGLE_DJANGO= DJANGO111 DJANGO110 DJANGO19 DJANGO18 -OPTIONS_DEFAULT= DJANGO111 -DJANGO18_DESC= Use Django 1.8.x -DJANGO19_DESC= Use Django 1.9.x -DJANGO110_DESC= Use Django 1.10.x -DJANGO111_DESC= Use Django 1.11.x +OPTIONS_SINGLE_DJANGO= DJANGO111 DJANGO110 DJANGO18 +OPTIONS_DEFAULT=DJANGO111 +DJANGO18_DESC= Use Django 1.8.x +DJANGO110_DESC= Use Django 1.10.x +DJANGO111_DESC= Use Django 1.11.x PORTSCOUT= ignore:1 @@ -26,7 +25,6 @@ USES= cpe metaport python:run CPE_VENDOR= djangoproject DJANGO18_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18 -DJANGO19_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django19>=0:www/py-django19 DJANGO110_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django110>=0:www/py-django110 DJANGO111_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django111>=0:www/py-django111 Modified: branches/2017Q3/www/py-django/pkg-descr ============================================================================== --- branches/2017Q3/www/py-django/pkg-descr Wed Aug 30 13:29:43 2017 (r448981) +++ branches/2017Q3/www/py-django/pkg-descr Wed Aug 30 13:46:22 2017 (r448982) @@ -9,4 +9,4 @@ intensive deadlines of a newsroom and the stringent re Web developers. It has convenient niceties for developing content-management systems, but it's an excellent tool for building any Web site. -WWW: http://www.djangoproject.com +WWW: https://www.djangoproject.com/ From owner-svn-ports-branches@freebsd.org Wed Aug 30 14:35:02 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 4D230E0369A; Wed, 30 Aug 2017 14:35:02 +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 11DC26F7A7; Wed, 30 Aug 2017 14:35:01 +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 v7UEZ1eo068604; Wed, 30 Aug 2017 14:35:01 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7UEZ0Ac068594; Wed, 30 Aug 2017 14:35:00 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201708301435.v7UEZ0Ac068594@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 30 Aug 2017 14:35:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448984 - in branches/2017Q3/net-mgmt: monitoring-plugins monitoring-plugins/files nagios-plugins nagios-plugins/files X-SVN-Group: ports-branches X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in branches/2017Q3/net-mgmt: monitoring-plugins monitoring-plugins/files nagios-plugins nagios-plugins/files X-SVN-Commit-Revision: 448984 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, 30 Aug 2017 14:35:02 -0000 Author: mat Date: Wed Aug 30 14:35:00 2017 New Revision: 448984 URL: https://svnweb.freebsd.org/changeset/ports/448984 Log: MFH: r448907 r448913 r448920 r448923 r448927 r448983 Add jail support to check_procs, restore check_http's -C option to its former glory. Sponsored by: Absolight Added: branches/2017Q3/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c - copied unchanged from r448920, head/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c branches/2017Q3/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c - copied unchanged from r448920, head/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c branches/2017Q3/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c - copied unchanged from r448983, head/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c branches/2017Q3/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c - copied unchanged from r448913, head/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c branches/2017Q3/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c - copied unchanged from r448907, head/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c branches/2017Q3/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c - copied unchanged from r448983, head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c Modified: branches/2017Q3/net-mgmt/monitoring-plugins/Makefile branches/2017Q3/net-mgmt/monitoring-plugins/files/patch-configure branches/2017Q3/net-mgmt/nagios-plugins/Makefile branches/2017Q3/net-mgmt/nagios-plugins/files/patch-configure Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/net-mgmt/monitoring-plugins/Makefile ============================================================================== --- branches/2017Q3/net-mgmt/monitoring-plugins/Makefile Wed Aug 30 14:32:09 2017 (r448983) +++ branches/2017Q3/net-mgmt/monitoring-plugins/Makefile Wed Aug 30 14:35:00 2017 (r448984) @@ -3,7 +3,7 @@ PORTNAME= monitoring-plugins PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME} Modified: branches/2017Q3/net-mgmt/monitoring-plugins/files/patch-configure ============================================================================== --- branches/2017Q3/net-mgmt/monitoring-plugins/files/patch-configure Wed Aug 30 14:32:09 2017 (r448983) +++ branches/2017Q3/net-mgmt/monitoring-plugins/files/patch-configure Wed Aug 30 14:35:00 2017 (r448984) @@ -1,11 +1,19 @@ --- configure.orig 2016-11-29 08:48:11 UTC +++ configure -@@ -16748,7 +16748,7 @@ then +@@ -16747,6 +16747,16 @@ then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 $as_echo "$ac_cv_ps_command" >&6; } ++elif ps -axwo 'stat comm vsz rss user uid pid ppid args jid' 2>/dev/null | \ ++ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND +JID" > /dev/null ++then ++ ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procjid,&procvsz,&procrss,&procpcpu,procprog,&pos" ++ ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid jid vsz rss pcpu comm args'" ++ ac_cv_ps_format="%s %d %d %d %d %d %d %f %s %n" ++ ac_cv_ps_cols=10 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 ++$as_echo "$ac_cv_ps_command" >&6; } ++ elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ -- egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null -+ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null + egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null then - ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" - ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'" Copied: branches/2017Q3/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c (from r448920, head/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c Wed Aug 30 14:35:00 2017 (r448984, copy of r448920, head/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c) @@ -0,0 +1,10 @@ +--- plugins/check_nagios.c.orig 2016-11-29 08:45:08 UTC ++++ plugins/check_nagios.c +@@ -64,6 +64,7 @@ main (int argc, char **argv) + int procuid = 0; + int procpid = 0; + int procppid = 0; ++ int procjid = 0; + int procvsz = 0; + int procrss = 0; + float procpcpu = 0; Copied: branches/2017Q3/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c (from r448920, head/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c Wed Aug 30 14:35:00 2017 (r448984, copy of r448920, head/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c) @@ -0,0 +1,107 @@ +--- plugins/check_procs.c.orig 2016-11-29 08:45:08 UTC ++++ plugins/check_procs.c +@@ -70,6 +70,7 @@ int options = 0; /* bitmask of filter cr + #define PCPU 256 + #define ELAPSED 512 + #define EREG_ARGS 1024 ++#define JID 2048 + + #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads: + ppid of procs are compared to pid of this proc*/ +@@ -101,6 +102,7 @@ char *fails; + char tmp[MAX_INPUT_BUFFER]; + int kthread_filter = 0; + int usepid = 0; /* whether to test for pid or /proc/pid/exe */ ++int jid; + + FILE *ps_input = NULL; + +@@ -130,6 +132,7 @@ main (int argc, char **argv) + int procuid = 0; + pid_t procpid = 0; + pid_t procppid = 0; ++ int procjid = 0; + pid_t kthread_ppid = 0; + int procvsz = 0; + int procrss = 0; +@@ -230,9 +233,9 @@ main (int argc, char **argv) + procseconds = convert_to_seconds(procetime); + + if (verbose >= 3) +- printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", ++ printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", + procs, procuid, procvsz, procrss, +- procpid, procppid, procpcpu, procstat, ++ procpid, procppid, procjid, procpcpu, procstat, + procetime, procprog, procargs); + + /* Ignore self */ +@@ -275,6 +278,8 @@ main (int argc, char **argv) + resultsum |= PROG; + if ((options & PPID) && (procppid == ppid)) + resultsum |= PPID; ++ if ((options & JID) && (procjid == jid)) ++ resultsum |= JID; + if ((options & USER) && (procuid == uid)) + resultsum |= USER; + if ((options & VSZ) && (procvsz >= vsz)) +@@ -292,9 +297,9 @@ main (int argc, char **argv) + + procs++; + if (verbose >= 2) { +- printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", ++ printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", + procuid, procvsz, procrss, +- procpid, procppid, procpcpu, procstat, ++ procpid, procppid, procjid, procpcpu, procstat, + procetime, procprog, procargs); + } + +@@ -409,6 +414,7 @@ process_arguments (int argc, char **argv + {"input-file", required_argument, 0, CHAR_MAX+2}, + {"no-kthreads", required_argument, 0, 'k'}, + {"traditional-filter", no_argument, 0, 'T'}, ++ {"jid", required_argument, 0, 'j'}, + {0, 0, 0, 0} + }; + +@@ -417,7 +423,7 @@ process_arguments (int argc, char **argv + strcpy (argv[c], "-t"); + + while (1) { +- c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T", ++ c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tj:", + longopts, &option); + + if (c == -1 || c == EOF) +@@ -451,6 +457,12 @@ process_arguments (int argc, char **argv + break; + } + usage4 (_("Parent Process ID must be an integer!")); ++ case 'j': /* jail id */ ++ if (sscanf (optarg, "%d%[^0-9]", &jid, tmp) == 1) { ++ asprintf (&fmt, "%s%sJID = %d", (fmt ? fmt : "") , (options ? ", " : ""), jid); ++ options |= JID; ++ break; ++ } + case 's': /* status */ + if (statopts) + break; +@@ -731,6 +743,8 @@ print_help (void) + printf (" %s\n", _("RSZDT, plus others based on the output of your 'ps' command).")); + printf (" %s\n", "-p, --ppid=PPID"); + printf (" %s\n", _("Only scan for children of the parent process ID indicated.")); ++ printf (" %s\n", "-j, --jid=JID"); ++ printf (" %s\n", _("Only scan for process running in jail which ID is JID.")); + printf (" %s\n", "-z, --vsz=VSZ"); + printf (" %s\n", _("Only scan for processes with VSZ higher than indicated.")); + printf (" %s\n", "-r, --rss=RSS"); +@@ -779,7 +793,7 @@ void + print_usage (void) + { + printf ("%s\n", _("Usage:")); +- printf ("%s -w -c [-m metric] [-s state] [-p ppid]\n", progname); ++ printf ("%s -w -c [-m metric] [-s state] [-p ppid] [-j jid]\n", progname); + printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n"); + printf (" [-C command] [-k] [-t timeout] [-v]\n"); + } Modified: branches/2017Q3/net-mgmt/nagios-plugins/Makefile ============================================================================== --- branches/2017Q3/net-mgmt/nagios-plugins/Makefile Wed Aug 30 14:32:09 2017 (r448983) +++ branches/2017Q3/net-mgmt/nagios-plugins/Makefile Wed Aug 30 14:35:00 2017 (r448984) @@ -3,7 +3,7 @@ PORTNAME= nagios-plugins PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://www.nagios-plugins.org/download/ \ Modified: branches/2017Q3/net-mgmt/nagios-plugins/files/patch-configure ============================================================================== --- branches/2017Q3/net-mgmt/nagios-plugins/files/patch-configure Wed Aug 30 14:32:09 2017 (r448983) +++ branches/2017Q3/net-mgmt/nagios-plugins/files/patch-configure Wed Aug 30 14:35:00 2017 (r448984) @@ -1,15 +1,22 @@ ---- configure.orig 2017-04-19 18:03:27.000000000 +0200 -+++ configure -@@ -22004,7 +22004,7 @@ - $as_echo "$ac_cv_ps_command" >&6; } +--- configure.orig 2017-04-19 16:03:27 UTC ++++ configure +@@ -21973,6 +21973,15 @@ $as_echo "$as_me: error: I don't know ho + fi - elif ps -axwwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ -- egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null -+ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null + ++elif ps -axwo 'stat comm vsz rss user uid pid ppid jid args' 2>/dev/null | \ ++ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +JID +COMMAND" > /dev/null ++then ++ ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procjid,&procvsz,&procrss,&procpcpu,procprog,&pos" ++ ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid jid vsz rss pcpu comm args'" ++ ac_cv_ps_format="%s %d %d %d %d %d %d %f %s %n" ++ ac_cv_ps_cols=10 ++ { $as_echo "$as_me:$LINENO: result: $ac_cv_ps_command" >&5 ++ $as_echo "$ac_cv_ps_command" >&6; } + elif ps axwwo 'stat comm vsz rss user uid pid ppid args cgroup:256' 2>/dev/null | \ + egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND +CGROUP" > /dev/null then - ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" - ac_cv_ps_command="$PATH_TO_PS -axwwo 'stat uid pid ppid vsz rss pcpu comm args'" -@@ -23798,7 +23798,7 @@ +@@ -23798,7 +23807,7 @@ then if $PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null then Copied: branches/2017Q3/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c (from r448983, head/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c Wed Aug 30 14:35:00 2017 (r448984, copy of r448983, head/net-mgmt/nagios-plugins/files/patch-plugins_check__http.c) @@ -0,0 +1,17 @@ +--- plugins/check_http.c.orig 2017-04-19 16:03:12 UTC ++++ plugins/check_http.c +@@ -1026,11 +1026,9 @@ check_http (void) + elapsed_time_ssl = (double)microsec_ssl / 1.0e6; + if (check_cert == TRUE) { + result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit); +- if (result != STATE_OK) { +- np_net_ssl_cleanup(); +- if (sd) close(sd); +- return result; +- } ++ np_net_ssl_cleanup(); ++ if (sd) close(sd); ++ return result; + } + } + #endif /* HAVE_SSL */ Copied: branches/2017Q3/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c (from r448913, head/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c Wed Aug 30 14:35:00 2017 (r448984, copy of r448913, head/net-mgmt/nagios-plugins/files/patch-plugins_check__nagios.c) @@ -0,0 +1,10 @@ +--- plugins/check_nagios.c.orig 2017-01-19 16:01:31 UTC ++++ plugins/check_nagios.c +@@ -64,6 +64,7 @@ main (int argc, char **argv) + int procuid = 0; + int procpid = 0; + int procppid = 0; ++ int procjid = 0; + int procvsz = 0; + int procrss = 0; + char proc_cgroup_hierarchy[MAX_INPUT_BUFFER]; Copied: branches/2017Q3/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c (from r448907, head/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c Wed Aug 30 14:35:00 2017 (r448984, copy of r448907, head/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c) @@ -0,0 +1,107 @@ +--- plugins/check_procs.c.orig 2017-01-16 17:24:03 UTC ++++ plugins/check_procs.c +@@ -71,6 +71,7 @@ int options = 0; /* bitmask of filter cr + #define ELAPSED 512 + #define EREG_ARGS 1024 + #define CGROUP_HIERARCHY 2048 ++#define JID 4096 + + #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads: + ppid of procs are compared to pid of this proc*/ +@@ -103,6 +104,7 @@ char *fails; + char tmp[MAX_INPUT_BUFFER]; + int kthread_filter = 0; + int usepid = 0; /* whether to test for pid or /proc/pid/exe */ ++int jid; + + FILE *ps_input = NULL; + +@@ -133,6 +135,7 @@ main (int argc, char **argv) + int procuid = 0; + pid_t procpid = 0; + pid_t procppid = 0; ++ int procjid = 0; + pid_t kthread_ppid = 0; + int procvsz = 0; + int procrss = 0; +@@ -236,9 +239,9 @@ main (int argc, char **argv) + procseconds = convert_to_seconds(procetime); + + if (verbose >= 3) { +- printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s", +++ printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", + procs, procuid, procvsz, procrss, +- procpid, procppid, procpcpu, procstat, ++ procpid, procppid, procjid, procpcpu, procstat, + procetime, procprog, procargs); + if (strstr(PS_COMMAND, "cgroup") != NULL) { + printf(" proc_cgroup_hierarchy=%s\n", proc_cgroup_hierarchy); +@@ -287,6 +290,8 @@ main (int argc, char **argv) + resultsum |= PROG; + if ((options & PPID) && (procppid == ppid)) + resultsum |= PPID; ++ if ((options & JID) && (procjid == jid)) ++ resultsum |= JID; + if ((options & USER) && (procuid == uid)) + resultsum |= USER; + if ((options & VSZ) && (procvsz >= vsz)) +@@ -315,9 +320,9 @@ main (int argc, char **argv) + + procs++; + if (verbose >= 2) { +- printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s", +++ printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", + procuid, procvsz, procrss, +- procpid, procppid, procpcpu, procstat, ++ procpid, procppid, procjid, procpcpu, procstat, + procetime, procprog, procargs); + if (strstr(PS_COMMAND, "cgroup") != NULL) { + printf(" cgroup_hierarchy=%s\n", cgroup_hierarchy); +@@ -438,6 +443,7 @@ process_arguments (int argc, char **argv + {"no-kthreads", required_argument, 0, 'k'}, + {"traditional-filter", no_argument, 0, 'T'}, + {"cgroup-hierarchy", required_argument, 0, 'g'}, ++ {"jid", required_argument, 0, 'j'}, + {0, 0, 0, 0} + }; + +@@ -446,7 +452,7 @@ process_arguments (int argc, char **argv + strcpy (argv[c], "-t"); + + while (1) { +- c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tg:", ++ c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tg:j:", + longopts, &option); + + if (c == -1 || c == EOF) +@@ -477,6 +483,12 @@ process_arguments (int argc, char **argv + break; + } + usage4 (_("Parent Process ID must be an integer!")); ++ case 'j': /* jail id */ ++ if (sscanf (optarg, "%d%[^0-9]", &jid, tmp) == 1) { ++ asprintf (&fmt, "%s%sJID = %d", (fmt ? fmt : "") , (options ? ", " : ""), jid); ++ options |= JID; ++ break; ++ } + case 's': /* status */ + if (statopts) + break; +@@ -766,6 +778,8 @@ print_help (void) + printf (" %s\n", _("RSZDT, plus others based on the output of your 'ps' command).")); + printf (" %s\n", "-p, --ppid=PPID"); + printf (" %s\n", _("Only scan for children of the parent process ID indicated.")); ++ printf (" %s\n", "-j, --jid=JID"); ++ printf (" %s\n", _("Only scan for process running in jail which ID is JID.")); + printf (" %s\n", "-z, --vsz=VSZ"); + printf (" %s\n", _("Only scan for processes with VSZ higher than indicated.")); + printf (" %s\n", "-r, --rss=RSS"); +@@ -818,7 +832,7 @@ void + print_usage (void) + { + printf ("%s\n", _("Usage:")); +- printf ("%s -w -c [-m metric] [-s state] [-p ppid]\n", progname); ++ printf ("%s -w -c [-m metric] [-s state] [-p ppid] [-j jid]\n", progname); + printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n"); + printf (" [-C command] [-k] [-t timeout] [-v]\n"); + } Copied: branches/2017Q3/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c (from r448983, head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c Wed Aug 30 14:35:00 2017 (r448984, copy of r448983, head/net-mgmt/nagios-plugins/files/patch-plugins_sslutils.c) @@ -0,0 +1,21 @@ +--- plugins/sslutils.c.orig 2017-04-19 16:03:12 UTC ++++ plugins/sslutils.c +@@ -211,9 +211,6 @@ int np_net_ssl_check_cert(int days_till_ + int time_remaining; + time_t tm_t; + +- // Prefix whatever we're about to print with SSL +- printf("SSL "); +- + certificate=SSL_get_peer_certificate(s); + if (!certificate) { + printf("%s\n",_("CRITICAL - Cannot retrieve server certificate.")); +@@ -304,7 +301,7 @@ int np_net_ssl_check_cert(int days_till_ + else + status = STATE_CRITICAL; + } else { +- printf(_("OK - Certificate '%s' will expire on %s. "), cn, timestamp); ++ printf(_("OK - Certificate '%s' will expire on %s.\n"), cn, timestamp); + status = STATE_OK; + } + X509_free(certificate); From owner-svn-ports-branches@freebsd.org Wed Aug 30 15:24:19 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 573B3E0425E; Wed, 30 Aug 2017 15:24:19 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D907E70DC4; Wed, 30 Aug 2017 15:24:18 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7UFOIMT091383; Wed, 30 Aug 2017 15:24:18 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7UFOFVI091360; Wed, 30 Aug 2017 15:24:15 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201708301524.v7UFOFVI091360@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Wed, 30 Aug 2017 15:24:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448987 - in branches/2017Q3/www/chromium: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: cpm X-SVN-Commit-Paths: in branches/2017Q3/www/chromium: . files X-SVN-Commit-Revision: 448987 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, 30 Aug 2017 15:24:19 -0000 Author: cpm Date: Wed Aug 30 15:24:15 2017 New Revision: 448987 URL: https://svnweb.freebsd.org/changeset/ports/448987 Log: MFH: r448637 www/chromium: update to 60.0.3112.101 - Update LICENSE - Drop USE_GNOME=gtk20 dependency because chromium uses gtk3 - Use freetype2 bundled to avoid more issues related to the freetype library - Fix typo in the comment of pre-configure section - Update comment in SNDIO section Changelog: https://chromium.googlesource.com/chromium/src/+log/59.0.3071.115..60.0.3112.101?pretty=fuller&n=10000 Security: https://vuxml.freebsd.org/freebsd/7d138476-7710-11e7-88a1-e8e0b747a45a.html Approved by: ports-secteam (delphij) Added: branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace.h - copied unchanged from r448637, head/www/chromium/files/patch-base_debug_stack__trace.h branches/2017Q3/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc - copied unchanged from r448637, head/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc branches/2017Q3/www/chromium/files/patch-base_process_internal__linux.cc - copied unchanged from r448637, head/www/chromium/files/patch-base_process_internal__linux.cc branches/2017Q3/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc - copied unchanged from r448637, head/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc branches/2017Q3/www/chromium/files/patch-base_test_test__file__util__linux.cc - copied unchanged from r448637, head/www/chromium/files/patch-base_test_test__file__util__linux.cc branches/2017Q3/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc - copied unchanged from r448637, head/www/chromium/files/patch-base_trace__event_malloc_dump_provider.cc branches/2017Q3/www/chromium/files/patch-chrome_app_mash_embedded_services.cc - copied unchanged from r448637, head/www/chromium/files/patch-chrome_app_mash_embedded_services.cc branches/2017Q3/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc - copied unchanged from r448637, head/www/chromium/files/patch-chrome_browser_devtools_devtools_eye_dropper.cc branches/2017Q3/www/chromium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc - copied unchanged from r448637, head/www/chromium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc branches/2017Q3/www/chromium/files/patch-components_autofill_strings.grdp - copied unchanged from r448637, head/www/chromium/files/patch-components_autofill_strings.grdp branches/2017Q3/www/chromium/files/patch-components_new_or_sad_tab_strings.grdp - copied unchanged from r448637, head/www/chromium/files/patch-components_new_or_sad_tab_strings.grdp branches/2017Q3/www/chromium/files/patch-content_browser_gpu_gpu__feature__checker__impl.cc - copied unchanged from r448637, head/www/chromium/files/patch-content_browser_gpu_gpu__feature__checker__impl.cc branches/2017Q3/www/chromium/files/patch-content_browser_memory_swap_metrics_observer_linux.cc - copied unchanged from r448637, head/www/chromium/files/patch-content_browser_memory_swap_metrics_observer_linux.cc branches/2017Q3/www/chromium/files/patch-content_browser_renderer__host_media_in_process_video_capture_device_launcher.cc - copied unchanged from r448637, head/www/chromium/files/patch-content_browser_renderer__host_media_in_process_video_capture_device_launcher.cc branches/2017Q3/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h - copied unchanged from r448637, head/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h branches/2017Q3/www/chromium/files/patch-gpu_ipc_client_gpu_memory_buffer_impl.cc - copied unchanged from r448637, head/www/chromium/files/patch-gpu_ipc_client_gpu_memory_buffer_impl.cc branches/2017Q3/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc - copied unchanged from r448637, head/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc branches/2017Q3/www/chromium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc - copied unchanged from r448637, head/www/chromium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc branches/2017Q3/www/chromium/files/patch-ipc_ipc__channel_common.cc - copied unchanged from r448637, head/www/chromium/files/patch-ipc_ipc__channel_common.cc branches/2017Q3/www/chromium/files/patch-ipc_ipc__channel_mojo.cc - copied unchanged from r448637, head/www/chromium/files/patch-ipc_ipc__channel_mojo.cc branches/2017Q3/www/chromium/files/patch-remoting_base_chromoting_event.cc - copied unchanged from r448637, head/www/chromium/files/patch-remoting_base_chromoting_event.cc branches/2017Q3/www/chromium/files/patch-remoting_client_display_sys_opengl.h - copied unchanged from r448637, head/www/chromium/files/patch-remoting_client_display_sys_opengl.h branches/2017Q3/www/chromium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc - copied unchanged from r448637, head/www/chromium/files/patch-remoting_host_it2me_it2me_native_messaging_host_main.cc branches/2017Q3/www/chromium/files/patch-remoting_host_me2me_desktop_environment.cc - copied unchanged from r448637, head/www/chromium/files/patch-remoting_host_me2me_desktop_environment.cc branches/2017Q3/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc - copied unchanged from r448637, head/www/chromium/files/patch-remoting_host_remoting_me2me_host.cc branches/2017Q3/www/chromium/files/patch-remoting_host_setup_me2me_native_messaging_host_main.cc - copied unchanged from r448637, head/www/chromium/files/patch-remoting_host_setup_me2me_native_messaging_host_main.cc branches/2017Q3/www/chromium/files/patch-remoting_webapp_base_js_platform.js - copied unchanged from r448637, head/www/chromium/files/patch-remoting_webapp_base_js_platform.js branches/2017Q3/www/chromium/files/patch-sandbox_BUILD.gn - copied unchanged from r448637, head/www/chromium/files/patch-sandbox_BUILD.gn branches/2017Q3/www/chromium/files/patch-sandbox_linux_BUILD.gn - copied unchanged from r448637, head/www/chromium/files/patch-sandbox_linux_BUILD.gn branches/2017Q3/www/chromium/files/patch-services_device_battery_BUILD.gn - copied unchanged from r448637, head/www/chromium/files/patch-services_device_battery_BUILD.gn branches/2017Q3/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp - copied unchanged from r448637, head/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp branches/2017Q3/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp - copied unchanged from r448637, head/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_gl_renderergl_utils.cpp branches/2017Q3/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.cpp - copied unchanged from r448637, head/www/chromium/files/patch-third__party_skia_src_ports_SkOSFile_stdio.cpp branches/2017Q3/www/chromium/files/patch-third__party_vulkan-validation-layers_src_loader_vk_loader_platform.h - copied unchanged from r448637, head/www/chromium/files/patch-third__party_vulkan-validation-layers_src_loader_vk_loader_platform.h branches/2017Q3/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.cc - copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.cc branches/2017Q3/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h - copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_gpu_memory_buffer.h branches/2017Q3/www/chromium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.h - copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_ipc_gfx_param_traits_macros.h branches/2017Q3/www/chromium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.cc - copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_linux_client_native_pixmap_dmabuf.cc branches/2017Q3/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc - copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.cc branches/2017Q3/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h - copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_mojo_buffer_types_struct_traits.h branches/2017Q3/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc - copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_native_pixmap_handle.cc branches/2017Q3/www/chromium/files/patch-ui_gfx_native_pixmap_handle.h - copied unchanged from r448637, head/www/chromium/files/patch-ui_gfx_native_pixmap_handle.h Deleted: branches/2017Q3/www/chromium/files/patch-build__overrides_pdfium.gni branches/2017Q3/www/chromium/files/patch-build_config_freetype_BUILD.gn branches/2017Q3/www/chromium/files/patch-chrome_app_mash_mash__runner.cc branches/2017Q3/www/chromium/files/patch-chrome_browser_resources_vulcanize.gni branches/2017Q3/www/chromium/files/patch-chrome_browser_ui_libgtkui_gtk_ui.cc branches/2017Q3/www/chromium/files/patch-chrome_chrome__paks.gni branches/2017Q3/www/chromium/files/patch-content_browser_devtools_protocol_color__picker.cc branches/2017Q3/www/chromium/files/patch-device_battery_BUILD.gn branches/2017Q3/www/chromium/files/patch-mash_package_mash__packaged__service.cc branches/2017Q3/www/chromium/files/patch-media_ffmpeg_ffmpeg__common.h branches/2017Q3/www/chromium/files/patch-media_filters_ffmpeg__demuxer.cc branches/2017Q3/www/chromium/files/patch-remoting_host_BUILD.gn branches/2017Q3/www/chromium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc branches/2017Q3/www/chromium/files/patch-services_service__manager_standalone_context.cc branches/2017Q3/www/chromium/files/patch-testing_gtest_src_gtest.cc branches/2017Q3/www/chromium/files/patch-third__party_angle_gni_angle.gni branches/2017Q3/www/chromium/files/patch-third__party_harfbuzz-ng_BUILD.gn branches/2017Q3/www/chromium/files/patch-third__party_libxml_BUILD.gn branches/2017Q3/www/chromium/files/patch-third__party_skia_src_ports_SkFontHost_FreeType_common.cpp Modified: branches/2017Q3/www/chromium/Makefile branches/2017Q3/www/chromium/distinfo branches/2017Q3/www/chromium/files/audio_manager_openbsd.cc branches/2017Q3/www/chromium/files/audio_manager_openbsd.h branches/2017Q3/www/chromium/files/patch-BUILD.gn branches/2017Q3/www/chromium/files/patch-base_BUILD.gn branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace__posix.cc branches/2017Q3/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h branches/2017Q3/www/chromium/files/patch-base_files_file__util.h branches/2017Q3/www/chromium/files/patch-base_native__library__posix.cc branches/2017Q3/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc branches/2017Q3/www/chromium/files/patch-base_process_memory.h branches/2017Q3/www/chromium/files/patch-base_process_process__metrics.h branches/2017Q3/www/chromium/files/patch-base_process_process__posix.cc branches/2017Q3/www/chromium/files/patch-base_sys__info__posix.cc branches/2017Q3/www/chromium/files/patch-base_third__party_libevent_BUILD.gn branches/2017Q3/www/chromium/files/patch-base_threading_platform__thread__linux.cc branches/2017Q3/www/chromium/files/patch-base_trace__event_trace__log.cc branches/2017Q3/www/chromium/files/patch-build_config_BUILD.gn branches/2017Q3/www/chromium/files/patch-build_config_BUILDCONFIG.gn branches/2017Q3/www/chromium/files/patch-build_config_allocator.gni branches/2017Q3/www/chromium/files/patch-build_config_compiler_BUILD.gn branches/2017Q3/www/chromium/files/patch-chrome_app_chrome__main.cc branches/2017Q3/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html branches/2017Q3/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc branches/2017Q3/www/chromium/files/patch-chrome_common_chrome__switches.cc branches/2017Q3/www/chromium/files/patch-chrome_common_chrome__switches.h branches/2017Q3/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc branches/2017Q3/www/chromium/files/patch-components_tracing_common_process__metrics__memory__dump__provider.cc branches/2017Q3/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc branches/2017Q3/www/chromium/files/patch-content_browser_memory_memory__coordinator__impl.cc branches/2017Q3/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc branches/2017Q3/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc branches/2017Q3/www/chromium/files/patch-content_browser_utility__process__host__impl.cc branches/2017Q3/www/chromium/files/patch-device_usb_usb__device__impl.cc branches/2017Q3/www/chromium/files/patch-gpu_ipc_client_BUILD.gn branches/2017Q3/www/chromium/files/patch-gpu_ipc_service_BUILD.gn branches/2017Q3/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc branches/2017Q3/www/chromium/files/patch-net_dns_address__sorter__posix.cc branches/2017Q3/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc branches/2017Q3/www/chromium/files/patch-net_proxy_proxy__service.cc branches/2017Q3/www/chromium/files/patch-net_url__request_url__request__context__builder.cc branches/2017Q3/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc branches/2017Q3/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc branches/2017Q3/www/chromium/files/patch-remoting_host_host__details.cc branches/2017Q3/www/chromium/files/patch-skia_BUILD.gn branches/2017Q3/www/chromium/files/patch-third__party_WebKit_Source_platform_wtf_Assertions.cpp branches/2017Q3/www/chromium/files/patch-third__party_node_node.py branches/2017Q3/www/chromium/files/patch-third__party_widevine_cdm_BUILD.gn branches/2017Q3/www/chromium/files/patch-tools_gn_bootstrap_bootstrap.py branches/2017Q3/www/chromium/files/patch-ui_base_BUILD.gn branches/2017Q3/www/chromium/files/patch-ui_gfx_font__render__params.h branches/2017Q3/www/chromium/files/patch-ui_gl_BUILD.gn branches/2017Q3/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc branches/2017Q3/www/chromium/pkg-plist Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/www/chromium/Makefile ============================================================================== --- branches/2017Q3/www/chromium/Makefile Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/Makefile Wed Aug 30 15:24:15 2017 (r448987) @@ -2,18 +2,15 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 59.0.3071.115 -PORTREVISION= 2 +PORTVERSION= 60.0.3112.101 CATEGORIES= www -MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:source1 \ - LOCAL/cpm:source2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:source1 \ - ${PORTNAME}-freetype2${EXTRACT_SUFX}:source2 +MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit -LICENSE= BSD3CLAUSE LGPL21 MPL +LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi BUILD_DEPENDS= gperf:devel/gperf \ @@ -48,7 +45,6 @@ LIB_DEPENDS= libspeechd.so:accessibility/speech-dispat libwebp.so:graphics/webp \ libavcodec.so:multimedia/ffmpeg \ libcups.so:print/cups \ - libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libharfbuzz-icu.so:print/harfbuzz-icu \ libgcrypt.so:security/libgcrypt \ @@ -71,7 +67,7 @@ USE_LDCONFIG= ${DATADIR} USE_PERL5= build USE_XORG= scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xproto xrandr xrender xscrnsaver xtst -USE_GNOME= atk dconf glib20 gtk20 gtk30 libxml2 libxslt +USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt MAKE_ARGS= -C out/${BUILDTYPE} SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome @@ -88,7 +84,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ - enable_media_router=true \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ @@ -98,9 +93,9 @@ GN_ARGS+= clang_use_chrome_plugins=false \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ + use_allocator_shim=false \ use_aura=true \ use_cups=true \ - use_experimental_allocator_shim=false \ use_gtk3=true \ use_lld=true \ use_sysroot=false \ @@ -169,8 +164,7 @@ PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false # With SNDIO=on we exclude audio_manager_linux from the build (see # media/audio/BUILD.gn) and use audio_manager_openbsd which does not -# support falling back to ALSA. In theory it supports falling back to -# PulseAudio, but this is untested. +# support falling back to ALSA or PulseAudio. SNDIO_PREVENTS= ALSA PULSEAUDIO SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_VARS= GN_ARGS+=use_sndio=true @@ -178,7 +172,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .include "Makefile.tests" TEST_ALL_TARGET= ${TEST_TARGETS} -TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}:source1 +TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} .include @@ -198,9 +192,6 @@ pre-everything:: @${ECHO_MSG} "and ${WANTSPACE}." @${ECHO_MSG} -post-extract: - @${MV} ${WRKDIR}/freetype2 ${WRKSRC}/third_party/freetype/src - post-patch-SNDIO-on: @${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd @${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio @@ -209,7 +200,7 @@ post-patch-SNDIO-on: pre-configure: # We used to remove bundled libraries to be sure that chromium uses - # system libraries and not shippen ones. + # system libraries and not shipped ones. # cd ${WRKSRC} && ${PYTHON_CMD} \ #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${PYTHON_CMD} \ @@ -225,8 +216,8 @@ do-configure: gen --args='${GN_ARGS}' out/${BUILDTYPE} # Setup nodejs dependency - @${MKDIR} ${WRKSRC}/third_party/node/linux/node-linux-x64/bin - ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/linux/node-linux-x64/bin/node + @${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin + ${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node do-test-TEST-on: .for t in ${TEST_TARGETS} Modified: branches/2017Q3/www/chromium/distinfo ============================================================================== --- branches/2017Q3/www/chromium/distinfo Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/distinfo Wed Aug 30 15:24:15 2017 (r448987) @@ -1,7 +1,5 @@ -TIMESTAMP = 1498576960 -SHA256 (chromium-59.0.3071.115.tar.xz) = 37cbc9955ae3b25cd4e9851a82ea97a0035021cc90658902938ad1c20f263170 -SIZE (chromium-59.0.3071.115.tar.xz) = 530808448 -SHA256 (chromium-freetype2.tar.xz) = 5bcb3d3da82905b2077ae0dcca52b99a25344c7e8dbdcd52691d69ab269356e3 -SIZE (chromium-freetype2.tar.xz) = 22847212 -SHA256 (chromium-59.0.3071.115-testdata.tar.xz) = a66e7b4a8f6002fe64b2b5609deb6eff2a0da442cb68e22ce404023021f20852 -SIZE (chromium-59.0.3071.115-testdata.tar.xz) = 124229320 +TIMESTAMP = 1502990445 +SHA256 (chromium-60.0.3112.101.tar.xz) = 0bfb6318af1c3cf82e8ac872e3da34cd3c013aadaab446d5097228101cec065e +SIZE (chromium-60.0.3112.101.tar.xz) = 537528240 +SHA256 (chromium-60.0.3112.101-testdata.tar.xz) = c22a3aa43af83b6ab3e97bbf9e44b4b00c6d7a9b50d3a528cfd8726b845f1f7e +SIZE (chromium-60.0.3112.101-testdata.tar.xz) = 124655656 Modified: branches/2017Q3/www/chromium/files/audio_manager_openbsd.cc ============================================================================== --- branches/2017Q3/www/chromium/files/audio_manager_openbsd.cc Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/audio_manager_openbsd.cc Wed Aug 30 15:24:15 2017 (r448987) @@ -3,14 +3,12 @@ // found in the LICENSE file. #include "base/metrics/histogram_macros.h" +#include "base/memory/ptr_util.h" #include "media/audio/openbsd/audio_manager_openbsd.h" #include "media/audio/audio_device_description.h" #include "media/audio/audio_output_dispatcher.h" -#if defined(USE_PULSEAUDIO) -#include "media/audio/pulse/audio_manager_pulse.h" -#endif #if defined(USE_SNDIO) #include "media/audio/sndio/sndio_input.h" #include "media/audio/sndio/sndio_output.h" @@ -82,12 +80,9 @@ AudioParameters AudioManagerOpenBSD::GetInputStreamPar kDefaultSampleRate, 16, buffer_size); } -AudioManagerOpenBSD::AudioManagerOpenBSD( - scoped_refptr task_runner, - scoped_refptr worker_task_runner, - AudioLogFactory* audio_log_factory) - : AudioManagerBase(std::move(task_runner), - std::move(worker_task_runner), +AudioManagerOpenBSD::AudioManagerOpenBSD(std::unique_ptr audio_thread, + AudioLogFactory* audio_log_factory) + : AudioManagerBase(std::move(audio_thread), audio_log_factory) { DLOG(WARNING) << "AudioManagerOpenBSD"; SetMaxOutputStreamsAllowed(kMaxOutputStreams); @@ -170,34 +165,17 @@ AudioOutputStream* AudioManagerOpenBSD::MakeOutputStre } #endif -ScopedAudioManagerPtr CreateAudioManager( - scoped_refptr task_runner, - scoped_refptr worker_task_runner, +std::unique_ptr CreateAudioManager( + std::unique_ptr audio_thread, AudioLogFactory* audio_log_factory) { DLOG(WARNING) << "CreateAudioManager"; -#if defined(USE_PULSEAUDIO) - // Do not move task runners when creating AudioManagerPulse. - // If the creation fails, we need to use the task runners to create other - // AudioManager implementations. - std::unique_ptr manager( - new AudioManagerPulse(task_runner, worker_task_runner, - audio_log_factory)); - if (manager->Init()) { - UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kPulse, kAudioIOMax + 1); - return std::move(manager); - } - DVLOG(1) << "PulseAudio is not available on the OS"; -#endif - #if defined(USE_SNDIO) UMA_HISTOGRAM_ENUMERATION("Media.OpenBSDAudioIO", kSndio, kAudioIOMax + 1); - return ScopedAudioManagerPtr( - new AudioManagerOpenBSD(std::move(task_runner), - std::move(worker_task_runner),audio_log_factory)); + return base::MakeUnique(std::move(audio_thread), + audio_log_factory); #else - return ScopedAudioManagerPtr( - new FakeAudioManager(std::move(task_runner), - std::move(worker_task_runner), audio_log_factory)); + return base::MakeUnique(std::move(audio_thread), + audio_log_factory); #endif } Modified: branches/2017Q3/www/chromium/files/audio_manager_openbsd.h ============================================================================== --- branches/2017Q3/www/chromium/files/audio_manager_openbsd.h Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/audio_manager_openbsd.h Wed Aug 30 15:24:15 2017 (r448987) @@ -17,10 +17,9 @@ namespace media { class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase { public: - AudioManagerOpenBSD( - scoped_refptr task_runner, - scoped_refptr worker_task_runner, - AudioLogFactory* audio_log_factory); + AudioManagerOpenBSD(std::unique_ptr audio_thread, + AudioLogFactory* audio_log_factory); + ~AudioManagerOpenBSD() override; // Implementation of AudioManager. bool HasAudioOutputDevices() override; @@ -50,8 +49,6 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioM const LogCallback& log_callback) override; protected: - ~AudioManagerOpenBSD() override; - AudioParameters GetPreferredOutputStreamParameters( const std::string& output_device_id, const AudioParameters& input_params) override; Modified: branches/2017Q3/www/chromium/files/patch-BUILD.gn ============================================================================== --- branches/2017Q3/www/chromium/files/patch-BUILD.gn Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-BUILD.gn Wed Aug 30 15:24:15 2017 (r448987) @@ -1,42 +1,33 @@ ---- BUILD.gn.orig 2017-06-05 19:03:00 UTC -+++ BUILD.gn -@@ -95,7 +95,7 @@ group("gn_all") { +--- BUILD.gn.orig 2017-07-25 21:04:48.000000000 +0200 ++++ BUILD.gn 2017-07-29 00:52:25.378843000 +0200 +@@ -92,7 +92,7 @@ ] } -- if (!is_ios && !is_android && !is_chromecast) { -+ if (!is_ios && !is_android && !is_bsd && !is_chromecast) { +- if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { ++ if (!is_ios && !is_android && !is_bsd && !is_chromecast && !is_fuchsia) { deps += [ "//chrome", "//chrome/test:browser_tests", -@@ -153,7 +153,7 @@ group("gn_all") { +@@ -151,7 +151,7 @@ ] } -- if (!is_ios) { -+ if (!is_ios && !is_bsd) { - # TODO(GYP): Figure out which of these should actually build on iOS, - # and whether there should be other targets that are iOS-only and missing. +- if (!is_ios && !is_fuchsia) { ++ if (!is_ios && !is_bsd && !is_fuchsia) { deps += [ -@@ -199,7 +199,7 @@ group("gn_all") { - "//ui/touch_selection:ui_touch_selection_unittests", - "//url/ipc:url_ipc_unittests", + "//cc:cc_unittests", + "//chrome/test:telemetry_perf_unittests", +@@ -363,7 +363,7 @@ ] -- } else { -+ } else if (!is_bsd) { - deps += [ "//ios:all" ] } -@@ -359,7 +359,7 @@ group("gn_all") { - ] - } - - if (is_linux) { + if (is_linux || is_bsd) { # The following are definitely linux-only. deps += [ "//chrome:manpage", -@@ -382,9 +382,16 @@ group("gn_all") { +@@ -386,9 +386,16 @@ # TODO(dpranke): add the linux_dump_symbols flag? deps += [ "//chrome:linux_symbols" ] } @@ -54,7 +45,7 @@ deps += [ "//base:base_i18n_perftests", "//base:base_perftests", -@@ -455,7 +462,7 @@ group("gn_all") { +@@ -459,7 +466,7 @@ if (enable_nacl) { deps += [ "//components/nacl/loader:nacl_loader_unittests" ] @@ -63,16 +54,16 @@ # TODO(dpranke): Figure out what platforms should actually have this. deps += [ "//components/nacl/loader:nacl_helper" ] -@@ -557,7 +564,7 @@ group("gn_all") { +@@ -557,7 +564,7 @@ deps += [ "//chrome/installer/mini_installer:next_version_mini_installer" ] } -- } else if (!is_android && !is_ios) { -+ } else if (!is_android && !is_ios && !is_bsd) { +- } else if (!is_android && !is_ios && !is_fuchsia) { ++ } else if (!is_android && !is_ios && !is_bsd && !is_fuchsia) { deps += [ "//breakpad:symupload($host_toolchain)" ] } -@@ -595,7 +602,7 @@ group("gn_all") { +@@ -588,7 +595,7 @@ deps += [ "//components/proximity_auth:proximity_auth_unittests" ] } @@ -81,7 +72,7 @@ deps += [ "//mash:all", "//media/mojo/services:media_service_unittests", -@@ -620,7 +627,7 @@ group("gn_all") { +@@ -606,7 +613,7 @@ } } @@ -90,7 +81,7 @@ # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps += [ -@@ -659,7 +666,7 @@ group("gn_all") { +@@ -644,7 +651,7 @@ } if (target_cpu == "x86" || target_cpu == "x64") { @@ -99,7 +90,7 @@ deps += [ "//chrome/test:load_library_perf_tests" ] } deps += [ -@@ -667,7 +674,7 @@ group("gn_all") { +@@ -652,13 +659,13 @@ "//third_party/libjpeg_turbo:simd_asm", ] } @@ -108,8 +99,6 @@ deps += [ "//v8:v8_shell" ] } } -@@ -677,7 +684,7 @@ group("gn_all") { - } if ((is_linux && !is_chromeos && !is_chromecast) || (is_win && use_drfuzz) || - (use_libfuzzer && is_mac)) { @@ -117,25 +106,25 @@ deps += [ "//testing/libfuzzer/fuzzers", "//testing/libfuzzer/tests:libfuzzer_tests", -@@ -828,7 +835,7 @@ if (is_chromeos) { +@@ -677,7 +684,7 @@ + deps += [ "//native_client_sdk/src:nacl_core_sdk" ] + } - group("gn_mojo_targets") { - testonly = true -- if (is_linux && !is_chromeos) { -+ if ((is_linux || is_bsd) && !is_chromeos) { - # TODO(GYP): Figure out if any of these should be in gn_all - # and figure out how cross-platform they are - deps = [ -@@ -854,7 +861,7 @@ group("gn_visibility") { +- if (is_linux && use_ozone) { ++ if ((is_linux || is_bsd ) && use_ozone) { + deps += [ + "//headless", + "//headless:headless_tests", +@@ -811,7 +818,7 @@ } } --if (!is_ios) { -+if (!is_ios || !is_bsd) { +-if (!is_ios && !is_fuchsia) { ++if (!is_ios && !is_bsd && !is_fuchsia) { # This group includes all of the targets needed to build and test Blink, # including running the layout tests (see below). group("blink_tests") { -@@ -921,7 +928,7 @@ if (!is_ios) { +@@ -879,7 +886,7 @@ data_deps += [ "//content/shell:content_shell_crash_service" ] } @@ -144,7 +133,7 @@ data_deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -929,7 +936,7 @@ if (!is_ios) { +@@ -887,7 +894,7 @@ data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } @@ -153,16 +142,16 @@ data_deps += [ "//breakpad:dump_syms($host_toolchain)" ] } -@@ -979,7 +986,7 @@ group("chromium_swarm_tests") { +@@ -941,7 +948,7 @@ group("chromium_builder_perf") { testonly = true -- if (!is_ios && !is_android && !is_chromecast) { -+ if (!is_ios && !is_android && !is_chromecast && !is_bsd) { +- if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { ++ if (!is_ios && !is_android && !is_bsd && !is_chromecast && !is_fuchsia) { data_deps = [ "//cc:cc_perftests", "//chrome/test:load_library_perf_tests", -@@ -1009,7 +1016,7 @@ group("chromium_builder_perf") { +@@ -975,7 +982,7 @@ "//chrome/installer/mini_installer:mini_installer", "//chrome/test:angle_perftests", ] Modified: branches/2017Q3/www/chromium/files/patch-base_BUILD.gn ============================================================================== --- branches/2017Q3/www/chromium/files/patch-base_BUILD.gn Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-base_BUILD.gn Wed Aug 30 15:24:15 2017 (r448987) @@ -1,6 +1,6 @@ ---- base/BUILD.gn.orig 2017-06-05 21:03:00.000000000 +0200 -+++ base/BUILD.gn 2017-06-13 19:23:34.211227000 +0200 -@@ -1098,7 +1098,7 @@ +--- base/BUILD.gn.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/BUILD.gn 2017-08-02 22:12:25.442369000 +0200 +@@ -1106,7 +1106,7 @@ "base_paths_win.h", ] @@ -9,17 +9,25 @@ sources += [ "base_paths_posix.cc" ] } } -@@ -1157,6 +1157,9 @@ +@@ -1142,7 +1142,7 @@ + # Needed for if using newer C++ library than sysroot, except if + # building inside the cros_sdk environment - use host_toolchain as a + # more robust check for this. +- if (!use_sysroot && (is_android || (is_linux && !is_chromecast)) && ++ if (!use_sysroot && (is_android || (is_linux && !is_chromecast) && !is_clang) && + host_toolchain != "//build/toolchain/cros:host") { + libs = [ "atomic" ] + } +@@ -1168,7 +1168,7 @@ + "allocator/allocator_shim_override_glibc_weak_symbols.h", + ] deps += [ "//base/allocator:tcmalloc" ] - } else if (is_linux && use_allocator == "none") { +- } else if (is_linux && use_allocator == "none") { ++ } else if (is_linux && !is_bsd && use_allocator == "none") { sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] -+ } else if (is_bsd && use_allocator == "none") { -+ # TODO move the code to "allocator_shim_default_dispatch_to_glibc.cc" -+ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ - "allocator/allocator_shim_default_dispatch_to_linker_wrapped_symbols.cc", -@@ -1172,6 +1175,33 @@ +@@ -1185,6 +1185,31 @@ } } @@ -32,8 +40,6 @@ + "process/process_metrics_linux.cc", + "process/process_handle_linux.cc", + "sys_info_linux.cc", -+ "trace_event/malloc_dump_provider.cc", -+ "trace_event/malloc_dump_provider.h", + ] + sources += [ + "files/file_path_watcher_stub.cc", @@ -53,7 +59,7 @@ # Allow more direct string conversions on platforms with native utf8 # strings if (is_mac || is_ios || is_chromeos || is_chromecast) { -@@ -1469,7 +1499,7 @@ +@@ -1520,7 +1545,7 @@ } # Linux. @@ -62,7 +68,7 @@ if (is_asan || is_lsan || is_msan || is_tsan) { # For llvm-sanitizer. data += [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] -@@ -1494,7 +1524,7 @@ +@@ -1545,7 +1570,7 @@ "//base/third_party/xdg_user_dirs", ] } else { @@ -71,7 +77,7 @@ sources -= [ "nix/mime_util_xdg.cc", "nix/mime_util_xdg.h", -@@ -2325,6 +2355,12 @@ +@@ -2392,6 +2417,12 @@ "trace_event/trace_event_android_unittest.cc", ] set_sources_assignment_filter(sources_assignment_filter) Copied: branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace.h (from r448637, head/www/chromium/files/patch-base_debug_stack__trace.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace.h Wed Aug 30 15:24:15 2017 (r448987, copy of r448637, head/www/chromium/files/patch-base_debug_stack__trace.h) @@ -0,0 +1,10 @@ +--- base/debug/stack_trace.h.orig 2017-08-02 19:09:58.400190000 +0200 ++++ base/debug/stack_trace.h 2017-08-02 19:10:33.950334000 +0200 +@@ -16,6 +16,7 @@ + #include "build/build_config.h" + + #if defined(OS_POSIX) ++#include + #include + #endif + Modified: branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace__posix.cc ============================================================================== --- branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace__posix.cc Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-base_debug_stack__trace__posix.cc Wed Aug 30 15:24:15 2017 (r448987) @@ -1,5 +1,5 @@ ---- base/debug/stack_trace_posix.cc.orig 2017-04-19 19:06:28 UTC -+++ base/debug/stack_trace_posix.cc +--- base/debug/stack_trace_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/debug/stack_trace_posix.cc 2017-08-02 18:45:42.071358000 +0200 @@ -34,7 +34,7 @@ #include #endif @@ -9,18 +9,19 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -575,6 +575,10 @@ class SandboxSymbolizeHelper { +@@ -574,6 +574,11 @@ // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { -+#if defined(OS_FREEBSD) ++#if defined(OS_BSD) + // TODO (rene) avoid link error, implement something? ++ NOTIMPLEMENTED(); + return false; +#else // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -590,6 +594,7 @@ class SandboxSymbolizeHelper { +@@ -589,6 +594,7 @@ is_initialized_ = true; return true; @@ -28,3 +29,12 @@ } // Opens all object files and caches their file descriptors. +@@ -721,7 +727,7 @@ + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. + +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if !defined(__UCLIBC__) && !defined(_AIX) && !defined(OS_BSD) + count = std::min(arraysize(trace_), count); + + // Though the backtrace API man page does not list any possible negative Modified: branches/2017Q3/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h ============================================================================== --- branches/2017Q3/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h Wed Aug 30 15:24:15 2017 (r448987) @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_kqueue.h.orig 2017-04-19 19:06:28 UTC +--- base/files/file_path_watcher_kqueue.h.orig 2017-06-05 19:03:00 UTC +++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ Modified: branches/2017Q3/www/chromium/files/patch-base_files_file__util.h ============================================================================== --- branches/2017Q3/www/chromium/files/patch-base_files_file__util.h Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-base_files_file__util.h Wed Aug 30 15:24:15 2017 (r448987) @@ -1,11 +1,11 @@ ---- base/files/file_util.h.orig 2017-06-05 19:03:00 UTC -+++ base/files/file_util.h -@@ -406,7 +406,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +--- base/files/file_util.h.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/files/file_util.h 2017-07-29 00:57:11.269678000 +0200 +@@ -406,7 +406,7 @@ // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) // Broad categories of file systems as returned by statfs() on Linux. enum FileSystemType { FILE_SYSTEM_UNKNOWN, // statfs failed. Copied: branches/2017Q3/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc (from r448637, head/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc Wed Aug 30 15:24:15 2017 (r448987, copy of r448637, head/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc) @@ -0,0 +1,11 @@ +--- base/files/memory_mapped_file_posix.cc.orig 2017-08-02 18:42:44.932652000 +0200 ++++ base/files/memory_mapped_file_posix.cc 2017-08-02 18:42:59.362655000 +0200 +@@ -114,7 +114,7 @@ + + #if defined(OS_ANDROID) && __ANDROID_API__ < 21 + do_manual_extension = true; +-#elif !defined(OS_MACOSX) ++#elif !defined(OS_MACOSX) && !defined(OS_BSD) + if (posix_fallocate(file_.GetPlatformFile(), region.offset, + region.size) != 0) { + DPLOG(ERROR) << "posix_fallocate " << file_.GetPlatformFile(); Modified: branches/2017Q3/www/chromium/files/patch-base_native__library__posix.cc ============================================================================== --- branches/2017Q3/www/chromium/files/patch-base_native__library__posix.cc Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-base_native__library__posix.cc Wed Aug 30 15:24:15 2017 (r448987) @@ -1,11 +1,11 @@ ---- base/native_library_posix.cc.orig 2017-06-05 19:03:00 UTC -+++ base/native_library_posix.cc -@@ -35,7 +35,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP +--- base/native_library_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/native_library_posix.cc 2017-08-02 21:02:05.991380000 +0200 +@@ -30,7 +30,7 @@ + // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, + // and http://crbug.com/40794. + int flags = RTLD_LAZY; +-#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) ++#if defined(OS_ANDROID) || !defined(RTLD_DEEPBIND) || defined(OS_BSD) + // Certain platforms don't define RTLD_DEEPBIND. Android dlopen() requires // further investigation, as it might vary across versions. Crash here to // warn developers that they're trying to rely on uncertain behavior. - CHECK(!options.prefer_own_symbols); --#else -+#elif !defined(OS_BSD) - if (options.prefer_own_symbols) - flags |= RTLD_DEEPBIND; - #endif Modified: branches/2017Q3/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc ============================================================================== --- branches/2017Q3/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc Wed Aug 30 15:24:15 2017 (r448987) @@ -1,45 +1,49 @@ ---- base/posix/unix_domain_socket_linux.cc.orig 2017-06-05 19:03:00 UTC -+++ base/posix/unix_domain_socket_linux.cc -@@ -23,6 +23,15 @@ +--- base/posix/unix_domain_socket_linux.cc.orig 2017-08-03 00:05:03.000000000 +0200 ++++ base/posix/unix_domain_socket_linux.cc 2017-08-10 00:44:31.627900000 +0200 +@@ -5,7 +5,10 @@ + #include "base/posix/unix_domain_socket_linux.h" - namespace base { + #include ++#include ++#include + #include ++#include + #include -+#if defined(OS_BSD) -+// Port over Linux ucred structure -+struct ucred { -+ pid_t pid; // process ID of the sending process -+ uid_t uid; // user ID of the sending process -+ gid_t gid; // group ID of the sending process -+}; -+#endif -+ + #include +@@ -25,6 +28,14 @@ + const size_t UnixDomainSocket::kMaxFileDescriptors = 16; - #if !defined(OS_NACL_NONSFI) -@@ -37,8 +46,14 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { - - // static - bool UnixDomainSocket::EnableReceiveProcessId(int fd) { -+#if defined(OS_BSD) -+ // XXX(rene) do this? : -+ // taken from dbus, Academic Free License 2.1 / GPL 2+ -+ return 0; // fake OK -+#else - const int enable = 1; - return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; ++#ifndef SCM_CREDENTIALS ++# define SCM_CREDENTIALS 0X9001 +#endif - } - #endif // !defined(OS_NACL_NONSFI) - -@@ -144,7 +159,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, - // The PNaCl toolchain for Non-SFI binary build does not support ++ ++#ifndef SO_PASSCRED ++# define SO_PASSCRED 0x9002 ++#endif ++ + #if !defined(OS_NACL_NONSFI) + bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { + int raw_socks[2]; +@@ -114,7 +125,7 @@ + CMSG_SPACE(sizeof(int) * kMaxFileDescriptors) + #if !defined(OS_NACL_NONSFI) + // The PNaCl toolchain for Non-SFI binary build does not support ucred. +- + CMSG_SPACE(sizeof(struct ucred)) ++ + CMSG_SPACE(sizeof(struct sockcred)) + #endif + ; + char control_buffer[kControlBufferSize]; +@@ -145,9 +156,9 @@ // SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && -+#if defined(OS_BSD) -+ 1) { // XXX(rene) carpet getting full ... -+#else cmsg->cmsg_type == SCM_CREDENTIALS) { -+#endif - DCHECK_EQ(payload_len, sizeof(struct ucred)); +- DCHECK_EQ(payload_len, sizeof(struct ucred)); ++ DCHECK_EQ(payload_len, sizeof(struct sockcred)); DCHECK_EQ(pid, -1); - pid = reinterpret_cast(CMSG_DATA(cmsg))->pid; +- pid = reinterpret_cast(CMSG_DATA(cmsg))->pid; ++ pid = getpid(); + } + #endif + } Copied: branches/2017Q3/www/chromium/files/patch-base_process_internal__linux.cc (from r448637, head/www/chromium/files/patch-base_process_internal__linux.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/www/chromium/files/patch-base_process_internal__linux.cc Wed Aug 30 15:24:15 2017 (r448987, copy of r448637, head/www/chromium/files/patch-base_process_internal__linux.cc) @@ -0,0 +1,16 @@ +--- base/process/internal_linux.cc.orig 2017-08-10 00:00:17.842158000 +0200 ++++ base/process/internal_linux.cc 2017-08-10 00:02:37.838081000 +0200 +@@ -60,10 +60,13 @@ + // Synchronously reading files in /proc is safe. + ThreadRestrictions::ScopedAllowIO allow_io; + ++#if !defined(OS_BSD) + if (!ReadFileToString(file, buffer)) { + DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII(); + return false; + } ++#endif ++ + return !buffer->empty(); + } + Modified: branches/2017Q3/www/chromium/files/patch-base_process_memory.h ============================================================================== --- branches/2017Q3/www/chromium/files/patch-base_process_memory.h Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-base_process_memory.h Wed Aug 30 15:24:15 2017 (r448987) @@ -1,11 +1,11 @@ ---- base/process/memory.h.orig 2017-06-05 19:03:00 UTC -+++ base/process/memory.h -@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); +--- base/process/memory.h.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/process/memory.h 2017-07-29 01:01:15.601297000 +0200 +@@ -32,7 +32,7 @@ // Crash reporting classifies such crashes as OOM. BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_ANDROID) +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) BASE_EXPORT extern size_t g_oom_size; // The maximum allowed value for the OOM score. Modified: branches/2017Q3/www/chromium/files/patch-base_process_process__metrics.h ============================================================================== --- branches/2017Q3/www/chromium/files/patch-base_process_process__metrics.h Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-base_process_process__metrics.h Wed Aug 30 15:24:15 2017 (r448987) @@ -1,5 +1,5 @@ ---- base/process/process_metrics.h.orig 2017-06-05 19:03:00 UTC -+++ base/process/process_metrics.h +--- base/process/process_metrics.h.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/process/process_metrics.h 2017-08-01 22:08:56.153263000 +0200 @@ -22,6 +22,12 @@ #include "base/values.h" #include "build/build_config.h" @@ -13,48 +13,46 @@ #if defined(OS_MACOSX) #include #include "base/process/port_provider_mac.h" -@@ -205,7 +211,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -215,7 +221,7 @@ // otherwise. bool GetIOCounters(IoCounters* io_counters) const; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) // Returns the number of file descriptors currently open by the process, or // -1 on error. int GetOpenFdCount() const; -@@ -213,7 +219,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -223,12 +229,12 @@ // Returns the soft limit of file descriptors that can be opened by the // process, or -1 on error. int GetOpenFdSoftLimit() const; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_AIX) ++#endif // defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // Bytes of swap as reported by /proc/[pid]/status. + uint64_t GetVmSwapBytes() const; +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + private: #if !defined(OS_MACOSX) || defined(OS_IOS) -@@ -289,7 +295,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto +@@ -304,7 +310,7 @@ #endif // defined(OS_POSIX) #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) +- defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) ++ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -383,13 +389,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK - // CPU-related ticks. Returns -1 on parse error. - // Exposed for testing. - BASE_EXPORT int ParseProcStatCPU(const std::string& input); -+#endif +@@ -352,7 +358,7 @@ + #endif -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) - // Get the number of threads of |process| as available in /proc//stat. - // This should be used with care as no synchronization with running threads is - // done. This is mostly useful to guarantee being single-threaded. - // Returns 0 on failure. - BASE_EXPORT int GetNumberOfThreads(ProcessHandle process); -+#endif - -+#if defined(OS_LINUX) || defined(OS_ANDROID) - // /proc/self/exe refers to the current executable. - BASE_EXPORT extern const char kProcSelfExe[]; - + #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ +- defined(OS_FUCHSIA) ++ defined(OS_FUCHSIA) || defined(OS_BSD) + int buffers = 0; + int cached = 0; + int active_anon = 0; Modified: branches/2017Q3/www/chromium/files/patch-base_process_process__posix.cc ============================================================================== --- branches/2017Q3/www/chromium/files/patch-base_process_process__posix.cc Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-base_process_process__posix.cc Wed Aug 30 15:24:15 2017 (r448987) @@ -1,6 +1,6 @@ ---- base/process/process_posix.cc.orig 2017-06-15 21:03:00.000000000 +0200 -+++ base/process/process_posix.cc 2017-06-19 15:25:27.760111000 +0200 -@@ -21,8 +21,18 @@ +--- base/process/process_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/process/process_posix.cc 2017-08-02 19:38:18.657740000 +0200 +@@ -22,8 +22,18 @@ #include #endif @@ -19,9 +19,9 @@ #if !defined(OS_NACL_NONSFI) bool WaitpidWithTimeout(base::ProcessHandle handle, -@@ -184,13 +194,13 @@ - base::ProcessHandle parent_pid = base::GetParentProcessId(handle); +@@ -186,13 +196,13 @@ base::ProcessHandle our_pid = base::GetCurrentProcessHandle(); + if (parent_pid != our_pid) { -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(OS_BSD) @@ -36,26 +36,26 @@ } int status; -@@ -256,12 +266,16 @@ +@@ -258,12 +268,16 @@ return Process(handle); } --#if !defined(OS_LINUX) && !defined(OS_MACOSX) -+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) +-#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) ++#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) && !defined(OS_BSD) // static bool Process::CanBackgroundProcesses() { return false; } --#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) +-#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) +#elif defined(OS_FREEBSD) +bool Process::CanBackgroundProcesses() { + return true; +} -+#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) ++#endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) && !defined(OS_BSD) // static void Process::TerminateCurrentProcessImmediately(int exit_code) { -@@ -369,15 +383,31 @@ +@@ -371,15 +385,31 @@ bool Process::IsProcessBackgrounded() const { // See SetProcessBackgrounded(). DCHECK(IsValid()); @@ -85,5 +85,5 @@ + return result == 0; +#endif // !defined(OS_FREEBSD) } - #endif // !defined(OS_LINUX) && !defined(OS_MACOSX) + #endif // !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_AIX) Modified: branches/2017Q3/www/chromium/files/patch-base_sys__info__posix.cc ============================================================================== --- branches/2017Q3/www/chromium/files/patch-base_sys__info__posix.cc Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-base_sys__info__posix.cc Wed Aug 30 15:24:15 2017 (r448987) @@ -1,20 +1,20 @@ ---- base/sys_info_posix.cc.orig 2017-06-05 19:03:00 UTC -+++ base/sys_info_posix.cc +--- base/sys_info_posix.cc.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/sys_info_posix.cc 2017-08-02 21:19:06.172695000 +0200 @@ -35,7 +35,7 @@ namespace { --#if !defined(OS_OPENBSD) -+#if !defined(OS_BSD) +-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) ++#if !defined(OS_BSD) && !defined(OS_FUCHSIA) int NumberOfProcessors() { // sysconf returns the number of "logical" (not "physical") processors on both // Mac and Linux. So we get the number of max available "logical" processors. -@@ -128,7 +128,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, +@@ -128,7 +128,7 @@ namespace base { --#if !defined(OS_OPENBSD) -+#if !defined(OS_BSD) +-#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) ++#if !defined(OS_BSD) && !defined(OS_FUCHSIA) int SysInfo::NumberOfProcessors() { return g_lazy_number_of_processors.Get().value(); } Copied: branches/2017Q3/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc (from r448637, head/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc Wed Aug 30 15:24:15 2017 (r448987, copy of r448637, head/www/chromium/files/patch-base_task_scheduler_delayed_task_manager.cc) @@ -0,0 +1,12 @@ +--- base/task_scheduler/delayed_task_manager.cc.orig 2017-08-10 23:52:26.912451000 +0200 ++++ base/task_scheduler/delayed_task_manager.cc 2017-08-11 00:22:09.125479000 +0200 +@@ -70,9 +70,6 @@ + if (started_.IsSet()) { + AddDelayedTaskNow(std::move(task), delay, + std::move(post_task_now_callback)); +- } else { +- tasks_added_before_start_.push_back( +- {std::move(task), std::move(post_task_now_callback)}); + } + } + } Copied: branches/2017Q3/www/chromium/files/patch-base_test_test__file__util__linux.cc (from r448637, head/www/chromium/files/patch-base_test_test__file__util__linux.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q3/www/chromium/files/patch-base_test_test__file__util__linux.cc Wed Aug 30 15:24:15 2017 (r448987, copy of r448637, head/www/chromium/files/patch-base_test_test__file__util__linux.cc) @@ -0,0 +1,13 @@ +--- base/test/test_file_util_linux.cc.orig 2017-08-10 16:14:03.505570000 +0200 ++++ base/test/test_file_util_linux.cc 2017-08-10 16:14:43.299690000 +0200 +@@ -20,8 +20,10 @@ + return false; + if (fdatasync(fd.get()) != 0) + return false; ++#if !defined(OS_BSD) + if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0) + return false; ++#endif + return true; + } + Modified: branches/2017Q3/www/chromium/files/patch-base_third__party_libevent_BUILD.gn ============================================================================== --- branches/2017Q3/www/chromium/files/patch-base_third__party_libevent_BUILD.gn Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-base_third__party_libevent_BUILD.gn Wed Aug 30 15:24:15 2017 (r448987) @@ -1,11 +1,15 @@ ---- base/third_party/libevent/BUILD.gn.orig 2017-04-19 19:06:28 UTC -+++ base/third_party/libevent/BUILD.gn -@@ -50,6 +50,9 @@ static_library("libevent") { +--- base/third_party/libevent/BUILD.gn.orig 2017-08-03 00:05:03.000000000 +0200 ++++ base/third_party/libevent/BUILD.gn 2017-08-03 14:47:35.196280000 +0200 +@@ -50,6 +50,13 @@ "linux/event-config.h", ] include_dirs = [ "linux" ] + } else if (is_bsd) { -+ sources += [ "kqueue.c" ] ++ sources += [ ++ "kqueue.c", ++ "freebsd/config.h", ++ "freebsd/event-config.h", ++ ] + include_dirs = [ "freebsd" ] } else if (is_android) { sources += [ Modified: branches/2017Q3/www/chromium/files/patch-base_threading_platform__thread__linux.cc ============================================================================== --- branches/2017Q3/www/chromium/files/patch-base_threading_platform__thread__linux.cc Wed Aug 30 15:12:44 2017 (r448986) +++ branches/2017Q3/www/chromium/files/patch-base_threading_platform__thread__linux.cc Wed Aug 30 15:24:15 2017 (r448987) @@ -1,8 +1,8 @@ ---- base/threading/platform_thread_linux.cc.orig 2017-06-05 19:03:01 UTC -+++ base/threading/platform_thread_linux.cc +--- base/threading/platform_thread_linux.cc.orig 2017-07-25 21:04:48.000000000 +0200 ++++ base/threading/platform_thread_linux.cc 2017-08-01 22:36:09.953380000 +0200 @@ -19,7 +19,9 @@ - #if !defined(OS_NACL) + #if !defined(OS_NACL) && !defined(OS_AIX) #include +#if !defined(OS_BSD) #include @@ -10,21 +10,12 @@ #include #include #include -@@ -130,7 +132,7 @@ void PlatformThread::SetName(const std::string& name) +@@ -130,7 +132,7 @@ ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name); tracked_objects::ThreadData::InitializeThreadContext(name); --#if !defined(OS_NACL) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Wed Aug 30 17:35:50 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 825C0E0682C; Wed, 30 Aug 2017 17:35:50 +0000 (UTC) (envelope-from mmokhi@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 4F64674A82; Wed, 30 Aug 2017 17:35:50 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7UHZnjG044616; Wed, 30 Aug 2017 17:35:49 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7UHZnPR044614; Wed, 30 Aug 2017 17:35:49 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201708301735.v7UHZnPR044614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Wed, 30 Aug 2017 17:35:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448993 - branches/2017Q3/databases/mysql56-server X-SVN-Group: ports-branches X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: branches/2017Q3/databases/mysql56-server X-SVN-Commit-Revision: 448993 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, 30 Aug 2017 17:35:50 -0000 Author: mmokhi Date: Wed Aug 30 17:35:49 2017 New Revision: 448993 URL: https://svnweb.freebsd.org/changeset/ports/448993 Log: MFH: r446148 databases/mysql56-{server client}: Update to latest 5.6.37 This release contains features: * The mysql client now supports a --binary-as-hex option for binary data (Bug #25340722, Bug #84391) * mysqlaccess now looks for its configuration file only in the SYSCONFDIR directory and /etc. (Bug #25043674) And bugfixes: * mysqld: failed to start the server if the --datadir option was specified with a relative path name. (Bug #25364806) * InnoDB: The server allocated memory unnecessarily for an operation that rebuilt the table. (Bug #25573565, Bug #85043) * mysqldump: could write database names in USE statements incorrectly. (Bug #25998635) Reviewed by: mat (mentor) Approved by: mat (mentor) Sponsored by: Netzkommune GmbH Differential Revision: https://reviews.freebsd.org/D11638 Approved by: ports-secteam (feld) Modified: branches/2017Q3/databases/mysql56-server/Makefile branches/2017Q3/databases/mysql56-server/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/databases/mysql56-server/Makefile ============================================================================== --- branches/2017Q3/databases/mysql56-server/Makefile Wed Aug 30 16:25:09 2017 (r448992) +++ branches/2017Q3/databases/mysql56-server/Makefile Wed Aug 30 17:35:49 2017 (r448993) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.36 +PORTVERSION= 5.6.37 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.6 PKGNAMESUFFIX?= 56-server Modified: branches/2017Q3/databases/mysql56-server/distinfo ============================================================================== --- branches/2017Q3/databases/mysql56-server/distinfo Wed Aug 30 16:25:09 2017 (r448992) +++ branches/2017Q3/databases/mysql56-server/distinfo Wed Aug 30 17:35:49 2017 (r448993) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492102457 -SHA256 (mysql-5.6.36.tar.gz) = 0af81a5538fc7fe2b747295dfa96589ace8831d2a7d4a26660fca456babeb147 -SIZE (mysql-5.6.36.tar.gz) = 32192348 +TIMESTAMP = 1500392788 +SHA256 (mysql-5.6.37.tar.gz) = 59c4ed39047279ddccd1bed9e247830d2bfad27d56dc2eb48d0b5695c94a1fbd +SIZE (mysql-5.6.37.tar.gz) = 32200158 From owner-svn-ports-branches@freebsd.org Wed Aug 30 22:34:19 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 94AB2E0BD6E; Wed, 30 Aug 2017 22:34:19 +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 542E482FC3; Wed, 30 Aug 2017 22:34:19 +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 v7UMYIl9068202; Wed, 30 Aug 2017 22:34:18 GMT (envelope-from tota@FreeBSD.org) Received: (from tota@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7UMYINp068200; Wed, 30 Aug 2017 22:34:18 GMT (envelope-from tota@FreeBSD.org) Message-Id: <201708302234.v7UMYINp068200@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tota set sender to tota@FreeBSD.org using -f From: TAKATSU Tomonari Date: Wed, 30 Aug 2017 22:34:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449006 - 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: 449006 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, 30 Aug 2017 22:34:19 -0000 Author: tota Date: Wed Aug 30 22:34:17 2017 New Revision: 449006 URL: https://svnweb.freebsd.org/changeset/ports/449006 Log: MFH: r448429 - Update to 3.5.9 PR: 221165 Submitted by: Koichiro IWAO Approved by: ports-secteam (delphij) Modified: branches/2017Q3/net-im/mikutter/Makefile branches/2017Q3/net-im/mikutter/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/net-im/mikutter/Makefile ============================================================================== --- branches/2017Q3/net-im/mikutter/Makefile Wed Aug 30 21:10:28 2017 (r449005) +++ branches/2017Q3/net-im/mikutter/Makefile Wed Aug 30 22:34:17 2017 (r449006) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mikutter -PORTVERSION= 3.5.7 +PORTVERSION= 3.5.9 CATEGORIES= net-im ruby MASTER_SITES= http://mikutter.hachune.net/bin/ \ LOCAL/tota/${PORTNAME} @@ -14,22 +14,23 @@ COMMENT= Simple, powerful, and moeful Twitter client LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-gtk2>=3.0.8:x11-toolkits/rubygem-gtk2 \ +RUN_DEPENDS= rubygem-gtk2>=3.1.8:x11-toolkits/rubygem-gtk2 \ rubygem-cairo>=1.12.9:graphics/rubygem-cairo \ - rubygem-addressable>=2.5.0:www/rubygem-addressable \ + rubygem-addressable>=2.5.1:www/rubygem-addressable \ rubygem-delayer>=0.0.2:devel/rubygem-delayer \ rubygem-delayer-deferred>=1.0.4:devel/rubygem-delayer-deferred \ rubygem-gettext>=3.0.9:devel/rubygem-gettext \ rubygem-gio2>=3.1.0:devel/rubygem-gio2 \ rubygem-httpclient>=2.7.1:www/rubygem-httpclient \ rubygem-instance_storage>=1.0.0:devel/rubygem-instance_storage \ - rubygem-json_pure1>=1.8:devel/rubygem-json_pure1 \ + rubygem-json_pure1>=1.8.6:devel/rubygem-json_pure1 \ rubygem-locale>=2.1.1:devel/rubygem-locale \ - rubygem-memoist>=0.15.0:devel/rubygem-memoist \ + rubygem-memoist>=0.16.0:devel/rubygem-memoist \ rubygem-moneta>=0.7:devel/rubygem-moneta \ rubygem-nokogiri>=1.6.7:textproc/rubygem-nokogiri \ - rubygem-oauth>=0.5.1:net/rubygem-oauth \ + rubygem-oauth>=0.5.3:net/rubygem-oauth \ rubygem-pluggaloid>=1.1.1:devel/rubygem-pluggaloid \ + rubygem-public_suffix>=2.0.5:dns/rubygem-public_suffix \ rubygem-ruby-hmac>=0.4.0:security/rubygem-ruby-hmac \ rubygem-text>=1.3.1:textproc/rubygem-text \ rubygem-totoridipjp>=0.1.0:www/rubygem-totoridipjp \ Modified: branches/2017Q3/net-im/mikutter/distinfo ============================================================================== --- branches/2017Q3/net-im/mikutter/distinfo Wed Aug 30 21:10:28 2017 (r449005) +++ branches/2017Q3/net-im/mikutter/distinfo Wed Aug 30 22:34:17 2017 (r449006) @@ -1,3 +1,3 @@ -TIMESTAMP = 1492063964 -SHA256 (mikutter.3.5.7.tar.gz) = 1c89ca2fda075f66c06e58933ac16d953a45a3b27fd50a9391c9202cd25505ee -SIZE (mikutter.3.5.7.tar.gz) = 3743921 +TIMESTAMP = 1502612392 +SHA256 (mikutter.3.5.9.tar.gz) = 7ca631240a179ffbce8a7739f7c1258d117ea8361f1ab02862a5547d6d6df6cf +SIZE (mikutter.3.5.9.tar.gz) = 2734179 From owner-svn-ports-branches@freebsd.org Thu Aug 31 12:47:14 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 DE542E1E171; Thu, 31 Aug 2017 12:47:14 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1B1D76BE4; Thu, 31 Aug 2017 12:47:14 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7VClD7V017459; Thu, 31 Aug 2017 12:47:13 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7VClDSj017456; Thu, 31 Aug 2017 12:47:13 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201708311247.v7VClDSj017456@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Thu, 31 Aug 2017 12:47:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449030 - branches/2017Q3/mail/phpmailer X-SVN-Group: ports-branches X-SVN-Commit-Author: tz X-SVN-Commit-Paths: branches/2017Q3/mail/phpmailer X-SVN-Commit-Revision: 449030 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: Thu, 31 Aug 2017 12:47:15 -0000 Author: tz Date: Thu Aug 31 12:47:13 2017 New Revision: 449030 URL: https://svnweb.freebsd.org/changeset/ports/449030 Log: MFH: r448607 mail/phpmailer: Update from 5.2.23 to 5.2.24 Changelog: - SECURITY Fix: XSS vulnerability in one of the code examples, CVE-2017-11503. The code_generator.phps example did not filter user input prior to output. This file is distributed with a .phps extension, so it it not normally executable unless it is explicitly renamed, so it is safe by default. There was also an undisclosed potential XSS vulnerability in the default exception handler (unused by default). Patches for both issues kindly provided by Patrick Monnerat of the Fedora Project. - Handle bare codes (an RFC contravention) in SMTP server responses - Make message timestamps more dynamic - calculate the date separately for each message - Include timestamps in HTML-format debug output - Improve Turkish, Norwegian, Serbian, Brazilian Portuguese & simplified Chinese translations - Correction of Serbian ISO language code from sr to rs - Fix matching of multiple entries in Host to match IPv6 literals without breaking port selection (see #1094, caused by a3b4f6b) - Better capture and reporting of SMTP connection errors Reported by: Ken J. Approved by: ports-secteam (delphij) Modified: branches/2017Q3/mail/phpmailer/Makefile branches/2017Q3/mail/phpmailer/distinfo branches/2017Q3/mail/phpmailer/pkg-plist Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/mail/phpmailer/Makefile ============================================================================== --- branches/2017Q3/mail/phpmailer/Makefile Thu Aug 31 12:36:12 2017 (r449029) +++ branches/2017Q3/mail/phpmailer/Makefile Thu Aug 31 12:47:13 2017 (r449030) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpmailer -PORTVERSION= 5.2.23 +PORTVERSION= 5.2.24 DISTVERSIONPREFIX= v CATEGORIES= mail Modified: branches/2017Q3/mail/phpmailer/distinfo ============================================================================== --- branches/2017Q3/mail/phpmailer/distinfo Thu Aug 31 12:36:12 2017 (r449029) +++ branches/2017Q3/mail/phpmailer/distinfo Thu Aug 31 12:47:13 2017 (r449030) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491811936 -SHA256 (PHPMailer-PHPMailer-v5.2.23_GH0.tar.gz) = 6bd8caf379e7d821aa1074b5f793f3b17a1b92ca953221fc61b7941ae34f5bbe -SIZE (PHPMailer-PHPMailer-v5.2.23_GH0.tar.gz) = 157335 +TIMESTAMP = 1503492344 +SHA256 (PHPMailer-PHPMailer-v5.2.24_GH0.tar.gz) = 88a1aec68ce0fbe272f90e813c185d0421c405fe20cf9c410eba4bc53d4b3672 +SIZE (PHPMailer-PHPMailer-v5.2.24_GH0.tar.gz) = 157773 Modified: branches/2017Q3/mail/phpmailer/pkg-plist ============================================================================== --- branches/2017Q3/mail/phpmailer/pkg-plist Thu Aug 31 12:36:12 2017 (r449029) +++ branches/2017Q3/mail/phpmailer/pkg-plist Thu Aug 31 12:47:13 2017 (r449030) @@ -90,10 +90,10 @@ %%DATADIR%%/language/phpmailer.lang-pt.php %%DATADIR%%/language/phpmailer.lang-pt_br.php %%DATADIR%%/language/phpmailer.lang-ro.php +%%DATADIR%%/language/phpmailer.lang-rs.php %%DATADIR%%/language/phpmailer.lang-ru.php %%DATADIR%%/language/phpmailer.lang-sk.php %%DATADIR%%/language/phpmailer.lang-sl.php -%%DATADIR%%/language/phpmailer.lang-sr.php %%DATADIR%%/language/phpmailer.lang-sv.php %%DATADIR%%/language/phpmailer.lang-tr.php %%DATADIR%%/language/phpmailer.lang-uk.php From owner-svn-ports-branches@freebsd.org Thu Aug 31 19:29:20 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 4E7E5E04667; Thu, 31 Aug 2017 19:29:20 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 17193647AD; Thu, 31 Aug 2017 19:29:20 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7VJTJnL082617; Thu, 31 Aug 2017 19:29:19 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7VJTJfo082616; Thu, 31 Aug 2017 19:29:19 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201708311929.v7VJTJfo082616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 31 Aug 2017 19:29:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449051 - branches/2017Q3/net-mgmt/tcpreplay X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: branches/2017Q3/net-mgmt/tcpreplay X-SVN-Commit-Revision: 449051 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: Thu, 31 Aug 2017 19:29:20 -0000 Author: feld Date: Thu Aug 31 19:29:19 2017 New Revision: 449051 URL: https://svnweb.freebsd.org/changeset/ports/449051 Log: MFH: r448998 r449000 r449020 Add base/port options for libpcap PR: 221923 Approved by: ehaupt (maintainer) Correctly define the _DESC values Reported by: ehaupt,mat Fix OPTIONS_SINGLE logic. The two options (LIBPCAP_BASE and LIBPCAP_PORTS) need to be mutually exclusive. If LIBPCAP_BASE is selected, make sure the binary is linked against the libpcap from base, even if net/libpcap is present. Bump PORTREVISION to make sure the OPTIONS change is tracked. Reported by: jbeich Approved by: ports-secteam (with hat) Modified: branches/2017Q3/net-mgmt/tcpreplay/Makefile Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/net-mgmt/tcpreplay/Makefile ============================================================================== --- branches/2017Q3/net-mgmt/tcpreplay/Makefile Thu Aug 31 18:26:32 2017 (r449050) +++ branches/2017Q3/net-mgmt/tcpreplay/Makefile Thu Aug 31 19:29:19 2017 (r449051) @@ -4,6 +4,7 @@ PORTNAME= tcpreplay PORTVERSION= 4.2.6 DISTVERSIONPREFIX= v +PORTREVISION= 3 CATEGORIES= net-mgmt MAINTAINER= ehaupt@FreeBSD.org @@ -26,6 +27,17 @@ CONFIGURE_ARGS= --program-transform-name='s|.*\(tcp.*\ # required when using autogen CONFIGURE_ARGS+= --disable-local-libopts --disable-libopts-install + +LIBPCAP_BASE_DESC= Build with libpcap from the base OS +LIBPCAP_PORTS_DESC= Build with net/libpcap + +OPTIONS_SINGLE= LIBPCAP +OPTIONS_SINGLE_LIBPCAP= LIBPCAP_BASE LIBPCAP_PORTS + +OPTIONS_DEFAULT= LIBPCAP_BASE + +LIBPCAP_BASE_CONFIGURE_ON= --with-libpcap=/usr/lib +LIBPCAP_PORTS_LIB_DEPENDS= libpcap.so:net/libpcap post-patch: @${REINPLACE_CMD} -e 's|-Wall -O3||' ${WRKSRC}/${CONFIGURE_SCRIPT}.ac From owner-svn-ports-branches@freebsd.org Fri Sep 1 21:51:11 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 6CCEDE09271; Fri, 1 Sep 2017 21:51:11 +0000 (UTC) (envelope-from antoine@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 3A21D654CF; Fri, 1 Sep 2017 21:51:11 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v81LpA2T030278; Fri, 1 Sep 2017 21:51:10 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v81LpAMS030277; Fri, 1 Sep 2017 21:51:10 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201709012151.v81LpAMS030277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 1 Sep 2017 21:51:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449107 - branches/2017Q3/www/chromium X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: branches/2017Q3/www/chromium X-SVN-Commit-Revision: 449107 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: Fri, 01 Sep 2017 21:51:11 -0000 Author: antoine Date: Fri Sep 1 21:51:10 2017 New Revision: 449107 URL: https://svnweb.freebsd.org/changeset/ports/449107 Log: MPL11 license doesn't exist in 2017Q3 Modified: branches/2017Q3/www/chromium/Makefile Modified: branches/2017Q3/www/chromium/Makefile ============================================================================== --- branches/2017Q3/www/chromium/Makefile Fri Sep 1 21:45:20 2017 (r449106) +++ branches/2017Q3/www/chromium/Makefile Fri Sep 1 21:51:10 2017 (r449107) @@ -10,7 +10,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit -LICENSE= BSD3CLAUSE LGPL21 MPL11 +LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi BUILD_DEPENDS= gperf:devel/gperf \ From owner-svn-ports-branches@freebsd.org Fri Sep 1 21:55:27 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 BC9C2E096D8; Fri, 1 Sep 2017 21:55:27 +0000 (UTC) (envelope-from cjpm@gmx.us) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 28652657B9; Fri, 1 Sep 2017 21:55:26 +0000 (UTC) (envelope-from cjpm@gmx.us) Received: from [192.168.1.35] ([88.7.226.114]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0M92ZJ-1ddlR73AXV-00CQvy; Fri, 01 Sep 2017 23:55:24 +0200 Date: Fri, 01 Sep 2017 23:55:08 +0200 User-Agent: K-9 Mail for Android In-Reply-To: <201709012151.v81LpAMS030277@repo.freebsd.org> References: <201709012151.v81LpAMS030277@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: svn commit: r449107 - branches/2017Q3/www/chromium To: Antoine Brodin , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org From: "Carlos J. Puga Medina" Message-ID: X-Provags-ID: V03:K0:HBfULHfAJbVoj8rfOVc4NGBSzKpsYTTwF9GU46g89WaiAl8DbFq n8DelJxA7Rs09hgJmzupjTa4I9Gw45BphyUEPGGvH7luex5T3XYuQmMQJd4kMifeRWkw3s8 06mRVmTjsPAT+7Atn+/51AV1aQDsChmn2bIXXgMeV5THXr8UvFELOJ6d62B2UHKsPr/a6OE 0JS4aaXooccy1Y2z8UqaA== X-UI-Out-Filterresults: notjunk:1;V01:K0:gRYgPmEYWto=:nNHErVfpASytQ1v5vWJBgc RnQca9lhT2vkJwdRM27RxjSsXW4HlJn7qGQEawfdJyxYG4w8MhDc0/T1WjJ61cVfrANxxVLoh jX9J/DeOHhkBu/PIDOMt6RaaEBlJnsx4zuJj5zMom35rvO4HwZWuhZGCXdUMXrvynBA/5o9Ly 8OKGYcviTEeb74oCFheamv20h/pgXCPlO6DnIM7Jhv6n2KFnPTF+1CWmFDaNVSY2nGBvF2ful tEM0JNrYzHPtta/Fh44r+zNjevTxxx7ZwuzON2zX8E3iSERw+O5s4gPajbAzcwzgaKb3kDeP3 Ck3SQlP1eVhxHOJzW/aqNEpo3arMV1WilW8U9NzvCadzaNwoBFmDfPFyz0mM7Kgcqsks9b3nb r8XvR7bZbL9XWVzmbM7bi8cyE+zKctdSmfVTOkAh/C5EWxN3OwRI2Is8Mlp0o1rTJyGWsojqz YeEzbddVI/fLO9i9YTQgNrxbRT/Sa9KfU9GtwONm55XeOTHtJJGjVv738oyjBpbCLuR6LifA7 MXlC4ej72vhYZMyzu+O5b+Psg4HNTITGabw43hytE76/jiHQ4yv38Vb4gViyqWlyp2hAY/9Ws L9kMh/+Mm0VVotDCdXf5V4w1d7S2kvLBZJIB78xXxuMNgLlbAA1ffzrXOlp9uq6rqA/EdpeEu 4yUNfBMz0AVfOkKgWL4DQckes5gQoN2DsCDknWWUgKzRz9PnggwrU+UHvDPMxuSf+MzRDHtyR hNcWKhgIWRaoiY11TCZcnNMXkhscZRdX65qXWe9Xhz450vxApqI20Uam8sMvsjXImtpIYIxoR Bv3aMsXFlOInMBp9E5g0oM08IyyDS/bClzvLFSlopOKbuqMCDk= 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: Fri, 01 Sep 2017 21:55:27 -0000 On September 1, 2017 11:51:10 PM GMT+02:00, Antoine Brodin wrote: >Author: antoine >Date: Fri Sep 1 21:51:10 2017 >New Revision: 449107 >URL: https://svnweb=2Efreebsd=2Eorg/changeset/ports/449107 > >Log: > MPL11 license doesn't exist in 2017Q3 > >Modified: > branches/2017Q3/www/chromium/Makefile > >Modified: branches/2017Q3/www/chromium/Makefile >=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >--- branches/2017Q3/www/chromium/Makefile Fri Sep 1 21:45:20 >2017 (r449106) >+++ branches/2017Q3/www/chromium/Makefile Fri Sep 1 21:51:10 >2017 (r449107) >@@ -10,7 +10,7 @@ DISTFILES=3D ${DISTNAME}${EXTRACT_SUFX} > MAINTAINER=3D chromium@FreeBSD=2Eorg > COMMENT=3D Google web browser based on WebKit >=20 >-LICENSE=3D BSD3CLAUSE LGPL21 MPL11 >+LICENSE=3D BSD3CLAUSE LGPL21 MPL > LICENSE_COMB=3D multi >=20 > BUILD_DEPENDS=3D gperf:devel/gperf \ Thank you, Antoine! Cheers --=20 Enviado desde mi dispositivo Android con K-9 Mail=2E Por favor, disculpa m= i brevedad=2E From owner-svn-ports-branches@freebsd.org Sat Sep 2 09:59:46 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 8CF74E0A51A; Sat, 2 Sep 2017 09:59:46 +0000 (UTC) (envelope-from rodrigo@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 4CE2F7FCCF; Sat, 2 Sep 2017 09:59:46 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v829xjQj024556; Sat, 2 Sep 2017 09:59:45 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v829xj9r024554; Sat, 2 Sep 2017 09:59:45 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <201709020959.v829xj9r024554@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio Date: Sat, 2 Sep 2017 09:59:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449116 - branches/2017Q3/irc/cgiirc X-SVN-Group: ports-branches X-SVN-Commit-Author: rodrigo X-SVN-Commit-Paths: branches/2017Q3/irc/cgiirc X-SVN-Commit-Revision: 449116 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: Sat, 02 Sep 2017 09:59:46 -0000 Author: rodrigo Date: Sat Sep 2 09:59:45 2017 New Revision: 449116 URL: https://svnweb.freebsd.org/changeset/ports/449116 Log: MFH: r447182 Update port to 0.5.12 Fix CVE-2017-8920: XSS in 'R' parameter Security: CVE-2017-8920 Approved by: ports-secteam (feld) Modified: branches/2017Q3/irc/cgiirc/Makefile branches/2017Q3/irc/cgiirc/distinfo Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/irc/cgiirc/Makefile ============================================================================== --- branches/2017Q3/irc/cgiirc/Makefile Sat Sep 2 09:38:21 2017 (r449115) +++ branches/2017Q3/irc/cgiirc/Makefile Sat Sep 2 09:59:45 2017 (r449116) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cgiirc -PORTVERSION= 0.5.11 +PORTVERSION= 0.5.12 CATEGORIES= irc www perl5 MASTER_SITES= http://cgiirc.org/releases/ \ SF/${PORTNAME}/cgi-irc/${PORTVERSION} Modified: branches/2017Q3/irc/cgiirc/distinfo ============================================================================== --- branches/2017Q3/irc/cgiirc/distinfo Sat Sep 2 09:38:21 2017 (r449115) +++ branches/2017Q3/irc/cgiirc/distinfo Sat Sep 2 09:59:45 2017 (r449116) @@ -1,2 +1,3 @@ -SHA256 (cgiirc-0.5.11.tar.gz) = d774a2a5922fe44a043c0af29f55dc526a7498bb729f1193c5e9b9f10089680c -SIZE (cgiirc-0.5.11.tar.gz) = 138840 +TIMESTAMP = 1501713271 +SHA256 (cgiirc-0.5.12.tar.gz) = 89debb823acaf2be4816bf289ad5cc59ca991c002d7be6c327e3207febea4728 +SIZE (cgiirc-0.5.12.tar.gz) = 140379 From owner-svn-ports-branches@freebsd.org Sat Sep 2 15:03:55 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 03801E178ED; Sat, 2 Sep 2017 15:03:55 +0000 (UTC) (envelope-from adamw@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 C4BB565A6A; Sat, 2 Sep 2017 15:03:54 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v82F3r34053746; Sat, 2 Sep 2017 15:03:53 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v82F3r8M053744; Sat, 2 Sep 2017 15:03:53 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201709021503.v82F3r8M053744@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sat, 2 Sep 2017 15:03:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r449149 - branches/2017Q3/mail/spamd X-SVN-Group: ports-branches X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: branches/2017Q3/mail/spamd X-SVN-Commit-Revision: 449149 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: Sat, 02 Sep 2017 15:03:55 -0000 Author: adamw Date: Sat Sep 2 15:03:53 2017 New Revision: 449149 URL: https://svnweb.freebsd.org/changeset/ports/449149 Log: MFH: r449108 Disable the pkg-deinstall script. spamd's pkg-install adds spamd stuff to /etc/services, and pkg-deinstall removed it. The problem is that pkg doesn't run DEINSTALL before INSTALL when upgrading/reinstalling. As a result, when spamd is restarted, /etc/services winds up lacking the spamd entries, causing spamd to fail to start. The ideal solution is pkg running those targets in the predicted order, or pkg gaining a @services keyword. In the meantime, this commit just disables the pkg-deinstall. If you are uninstalling spamd you can remove those /etc/services entries by hand. PR: 212335 Approved by: maintainer timeout (~ 1 yr) Approved by: ports-secteam (delphij) Modified: branches/2017Q3/mail/spamd/Makefile branches/2017Q3/mail/spamd/pkg-deinstall Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/mail/spamd/Makefile ============================================================================== --- branches/2017Q3/mail/spamd/Makefile Sat Sep 2 14:24:32 2017 (r449148) +++ branches/2017Q3/mail/spamd/Makefile Sat Sep 2 15:03:53 2017 (r449149) @@ -3,7 +3,7 @@ PORTNAME= spamd PORTVERSION= 4.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= SF/freebsdspamd/spamd Modified: branches/2017Q3/mail/spamd/pkg-deinstall ============================================================================== --- branches/2017Q3/mail/spamd/pkg-deinstall Sat Sep 2 14:24:32 2017 (r449148) +++ branches/2017Q3/mail/spamd/pkg-deinstall Sat Sep 2 15:03:53 2017 (r449149) @@ -5,7 +5,9 @@ # # $FreeBSD$ -if [ "$2" = "DEINSTALL" ]; then +#if [ "$2" = "DEINSTALL" ]; then +# Disabled until pkg runs DEINSTALL before INSTALL in upgrades +if false; then FILE="/etc/services" echo "===> Removing spamd entries from ${FILE}" sed -i '' \