Attachment 154778 Details for Bug 198886 – Patch for updating to Piwik 2.12.0.

Patch for updating to Piwik 2.12.0.

piwik-2-12-0.patch (text/plain), 14.11 KB, created by Hans Fredrik Nordhaug on 2015-03-24 23:02:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans Fredrik Nordhaug

Created: 2015-03-24 23:02:35 UTC

Size: 14.11 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN ../piwik.orig/Makefile ./Makefile
>--- ../piwik.orig/Makefile	2015-03-24 23:43:51.000000000 +0100
>+++ ./Makefile	2015-03-24 23:44:02.000000000 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/www/piwik/Makefile 380580 2015-03-06 10:05:28Z arved $
> 
> PORTNAME=	piwik
>-PORTVERSION=	2.11.2
>+PORTVERSION=	2.12.0
> CATEGORIES=	www
> MASTER_SITES=	http://builds.piwik.org/
> 
>diff -ruN ../piwik.orig/distinfo ./distinfo
>--- ../piwik.orig/distinfo	2015-03-24 23:43:51.000000000 +0100
>+++ ./distinfo	2015-03-24 23:44:09.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (piwik-2.11.2.tar.gz) = 5649f7abc821444d72cf09a7cf7ac6ee976784ab95e2a246540acd3c60da26f1
>-SIZE (piwik-2.11.2.tar.gz) = 9847489
>+SHA256 (piwik-2.12.0.tar.gz) = 0b7ef33e437eac2650394349b3ab8bba946a4f018a9daca0fbf2c07af094dcf5
>+SIZE (piwik-2.12.0.tar.gz) = 9930046
>diff -ruN ../piwik.orig/pkg-plist ./pkg-plist
>--- ../piwik.orig/pkg-plist	2015-03-24 23:43:51.000000000 +0100
>+++ ./pkg-plist	2015-03-24 23:49:50.000000000 +0100
>@@ -1,7 +1,6 @@
> %%WWWDIR%%/.bowerrc
> %%WWWDIR%%/.gitignore
> %%WWWDIR%%/.gitmodules
>-%%WWWDIR%%/.scrutinizer.yml
> %%WWWDIR%%/CHANGELOG.md
> %%WWWDIR%%/CONTRIBUTING.md
> %%WWWDIR%%/LEGALNOTICE
>@@ -32,6 +31,8 @@
> %%WWWDIR%%/core/API/ResponseBuilder.php
> %%WWWDIR%%/core/Access.php
> %%WWWDIR%%/core/Archive.php
>+%%WWWDIR%%/core/Archive/ArchiveInvalidator.php
>+%%WWWDIR%%/core/Archive/ArchivePurger.php
> %%WWWDIR%%/core/Archive/DataCollection.php
> %%WWWDIR%%/core/Archive/DataTableFactory.php
> %%WWWDIR%%/core/Archive/Parameters.php
>@@ -68,7 +69,9 @@
> %%WWWDIR%%/core/Columns/Updater.php
> %%WWWDIR%%/core/Common.php
> %%WWWDIR%%/core/Composer/ScriptHandler.php
>+%%WWWDIR%%/core/Concurrency/DistributedList.php
> %%WWWDIR%%/core/Config.php
>+%%WWWDIR%%/core/Config/ConfigNotFoundException.php
> %%WWWDIR%%/core/Console.php
> %%WWWDIR%%/core/Container/ContainerFactory.php
> %%WWWDIR%%/core/Container/IniConfigDefinitionSource.php
>@@ -76,17 +79,17 @@
> %%WWWDIR%%/core/Cookie.php
> %%WWWDIR%%/core/CronArchive.php
> %%WWWDIR%%/core/CronArchive/FixedSiteIds.php
>+%%WWWDIR%%/core/CronArchive/SegmentArchivingRequestUrlProvider.php
> %%WWWDIR%%/core/CronArchive/SharedSiteIds.php
>+%%WWWDIR%%/core/CronArchive/SitesToReprocessDistributedList.php
> %%WWWDIR%%/core/DataAccess/Actions.php
>-%%WWWDIR%%/core/DataAccess/ArchiveInvalidator.php
>-%%WWWDIR%%/core/DataAccess/ArchivePurger.php
> %%WWWDIR%%/core/DataAccess/ArchiveSelector.php
> %%WWWDIR%%/core/DataAccess/ArchiveTableCreator.php
> %%WWWDIR%%/core/DataAccess/ArchiveWriter.php
>-%%WWWDIR%%/core/DataAccess/InvalidatedReports.php
> %%WWWDIR%%/core/DataAccess/LogAggregator.php
> %%WWWDIR%%/core/DataAccess/LogQueryBuilder.php
> %%WWWDIR%%/core/DataAccess/Model.php
>+%%WWWDIR%%/core/DataAccess/RawLogDao.php
> %%WWWDIR%%/core/DataAccess/TableMetadata.php
> %%WWWDIR%%/core/DataArray.php
> %%WWWDIR%%/core/DataFiles/Providers.php
>@@ -178,6 +181,7 @@
> %%WWWDIR%%/core/Filesystem.php
> %%WWWDIR%%/core/FrontController.php
> %%WWWDIR%%/core/Http.php
>+%%WWWDIR%%/core/Http/ControllerResolver.php
> %%WWWDIR%%/core/Http/Router.php
> %%WWWDIR%%/core/IP.php
> %%WWWDIR%%/core/Intl/Data/Provider/CurrencyDataProvider.php
>@@ -323,6 +327,7 @@
> %%WWWDIR%%/core/Unzip.php
> %%WWWDIR%%/core/UpdateCheck.php
> %%WWWDIR%%/core/Updater.php
>+%%WWWDIR%%/core/Updater/UpdateObserver.php
> %%WWWDIR%%/core/Updates.php
> %%WWWDIR%%/core/Updates/0.2.10.php
> %%WWWDIR%%/core/Updates/0.2.12.php
>@@ -567,11 +572,6 @@
> %%WWWDIR%%/libs/MaxMindGeoIP/geoip.inc
> %%WWWDIR%%/libs/MaxMindGeoIP/geoipcity.inc
> %%WWWDIR%%/libs/MaxMindGeoIP/geoipregionvars.php
>-%%WWWDIR%%/libs/PEAR.php
>-%%WWWDIR%%/libs/PEAR/Exception.php
>-%%WWWDIR%%/libs/PEAR/FixPHP5PEARWarnings.php
>-%%WWWDIR%%/libs/PEAR/LICENSE
>-%%WWWDIR%%/libs/PEAR5.php
> %%WWWDIR%%/libs/PiwikTracker/.git
> %%WWWDIR%%/libs/PiwikTracker/.gitignore
> %%WWWDIR%%/libs/PiwikTracker/LICENSE
>@@ -1449,6 +1449,8 @@
> %%WWWDIR%%/misc/cron/updatetoken.php
> %%WWWDIR%%/misc/gpl-3.0.txt
> %%WWWDIR%%/misc/internal-docs/content-tracking.md
>+%%WWWDIR%%/misc/log-analytics/.git
>+%%WWWDIR%%/misc/log-analytics/.gitignore
> %%WWWDIR%%/misc/log-analytics/README.md
> %%WWWDIR%%/misc/log-analytics/import_logs.py
> %%WWWDIR%%/misc/others/ExamplePiwikTracker.php
>@@ -1569,6 +1571,7 @@
> %%WWWDIR%%/plugins/Actions/Columns/VisitTotalActions.php
> %%WWWDIR%%/plugins/Actions/Columns/VisitTotalSearches.php
> %%WWWDIR%%/plugins/Actions/Controller.php
>+%%WWWDIR%%/plugins/Actions/DataTable/Filter/Actions.php
> %%WWWDIR%%/plugins/Actions/Menu.php
> %%WWWDIR%%/plugins/Actions/Metrics.php
> %%WWWDIR%%/plugins/Actions/Reports/Base.php
>@@ -1745,6 +1748,7 @@
> %%WWWDIR%%/plugins/Contents/stylesheets/datatable.less
> %%WWWDIR%%/plugins/CoreAdminHome/API.php
> %%WWWDIR%%/plugins/CoreAdminHome/Commands/FixDuplicateLogActions.php
>+%%WWWDIR%%/plugins/CoreAdminHome/Commands/PurgeOldArchiveData.php
> %%WWWDIR%%/plugins/CoreAdminHome/Commands/RunScheduledTasks.php
> %%WWWDIR%%/plugins/CoreAdminHome/Controller.php
> %%WWWDIR%%/plugins/CoreAdminHome/CoreAdminHome.php
>@@ -1752,6 +1756,7 @@
> %%WWWDIR%%/plugins/CoreAdminHome/Menu.php
> %%WWWDIR%%/plugins/CoreAdminHome/Model/DuplicateActionRemover.php
> %%WWWDIR%%/plugins/CoreAdminHome/Tasks.php
>+%%WWWDIR%%/plugins/CoreAdminHome/Tasks/ArchivesToPurgeDistributedList.php
> %%WWWDIR%%/plugins/CoreAdminHome/javascripts/generalSettings.js
> %%WWWDIR%%/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js
> %%WWWDIR%%/plugins/CoreAdminHome/javascripts/pluginSettings.js
>@@ -1844,6 +1849,7 @@
> %%WWWDIR%%/plugins/CoreHome/Columns/Metrics/ActionsPerVisit.php
> %%WWWDIR%%/plugins/CoreHome/Columns/Metrics/AverageTimeOnSite.php
> %%WWWDIR%%/plugins/CoreHome/Columns/Metrics/BounceRate.php
>+%%WWWDIR%%/plugins/CoreHome/Columns/Metrics/CallableProcessedMetric.php
> %%WWWDIR%%/plugins/CoreHome/Columns/Metrics/ConversionRate.php
> %%WWWDIR%%/plugins/CoreHome/Columns/Metrics/EvolutionMetric.php
> %%WWWDIR%%/plugins/CoreHome/Columns/Metrics/VisitsPercent.php
>@@ -2137,13 +2143,23 @@
> %%WWWDIR%%/plugins/CorePluginsAdmin/templates/themes.twig
> %%WWWDIR%%/plugins/CorePluginsAdmin/templates/updatePlugin.twig
> %%WWWDIR%%/plugins/CorePluginsAdmin/templates/uploadPlugin.twig
>+%%WWWDIR%%/plugins/CoreUpdater/ArchiveDownloadException.php
> %%WWWDIR%%/plugins/CoreUpdater/Commands/Update.php
>+%%WWWDIR%%/plugins/CoreUpdater/Commands/Update/CliUpdateObserver.php
> %%WWWDIR%%/plugins/CoreUpdater/Controller.php
> %%WWWDIR%%/plugins/CoreUpdater/CoreUpdater.php
> %%WWWDIR%%/plugins/CoreUpdater/Model.php
> %%WWWDIR%%/plugins/CoreUpdater/NoUpdatesFoundException.php
> %%WWWDIR%%/plugins/CoreUpdater/Tasks.php
>+%%WWWDIR%%/plugins/CoreUpdater/Test/Fixtures/DbUpdaterTestFixture.php
>+%%WWWDIR%%/plugins/CoreUpdater/Test/Fixtures/FailUpdateHttpsFixture.php
>+%%WWWDIR%%/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php
>+%%WWWDIR%%/plugins/CoreUpdater/Test/Mock/UpdaterMock.php
>+%%WWWDIR%%/plugins/CoreUpdater/Test/Unit/ModelTest.php
> %%WWWDIR%%/plugins/CoreUpdater/UpdateCommunication.php
>+%%WWWDIR%%/plugins/CoreUpdater/Updater.php
>+%%WWWDIR%%/plugins/CoreUpdater/UpdaterException.php
>+%%WWWDIR%%/plugins/CoreUpdater/config/config.php
> %%WWWDIR%%/plugins/CoreUpdater/javascripts/updateLayout.js
> %%WWWDIR%%/plugins/CoreUpdater/lang/am.json
> %%WWWDIR%%/plugins/CoreUpdater/lang/ar.json
>@@ -2199,9 +2215,7 @@
> %%WWWDIR%%/plugins/CoreUpdater/templates/newVersionAvailable.twig
> %%WWWDIR%%/plugins/CoreUpdater/templates/oneClickResults.twig
> %%WWWDIR%%/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
>-%%WWWDIR%%/plugins/CoreUpdater/templates/runUpdaterAndExit_done_cli.twig
> %%WWWDIR%%/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
>-%%WWWDIR%%/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome_cli.twig
> %%WWWDIR%%/plugins/CoreVisualizations/CoreVisualizations.php
> %%WWWDIR%%/plugins/CoreVisualizations/JqplotDataGenerator.php
> %%WWWDIR%%/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php
>@@ -2214,6 +2228,7 @@
> %%WWWDIR%%/plugins/CoreVisualizations/Visualizations/HtmlTable.php
> %%WWWDIR%%/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php
> %%WWWDIR%%/plugins/CoreVisualizations/Visualizations/HtmlTable/Config.php
>+%%WWWDIR%%/plugins/CoreVisualizations/Visualizations/HtmlTable/PivotBy.php
> %%WWWDIR%%/plugins/CoreVisualizations/Visualizations/HtmlTable/RequestConfig.php
> %%WWWDIR%%/plugins/CoreVisualizations/Visualizations/JqplotGraph.php
> %%WWWDIR%%/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php
>@@ -2241,6 +2256,7 @@
> %%WWWDIR%%/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php
> %%WWWDIR%%/plugins/CustomVariables/Controller.php
> %%WWWDIR%%/plugins/CustomVariables/CustomVariables.php
>+%%WWWDIR%%/plugins/CustomVariables/DataTable/Filter/CustomVariablesValuesFromNameId.php
> %%WWWDIR%%/plugins/CustomVariables/Model.php
> %%WWWDIR%%/plugins/CustomVariables/Reports/Base.php
> %%WWWDIR%%/plugins/CustomVariables/Reports/GetCustomVariables.php
>@@ -2939,6 +2955,7 @@
> %%WWWDIR%%/plugins/Events/Columns/Metrics/AverageEventValue.php
> %%WWWDIR%%/plugins/Events/Columns/TotalEvents.php
> %%WWWDIR%%/plugins/Events/Controller.php
>+%%WWWDIR%%/plugins/Events/DataTable/Filter/ReplaceEventNameNotSet.php
> %%WWWDIR%%/plugins/Events/Events.php
> %%WWWDIR%%/plugins/Events/Menu.php
> %%WWWDIR%%/plugins/Events/Reports/Base.php
>@@ -3492,6 +3509,7 @@
> %%WWWDIR%%/plugins/Live/Live.php
> %%WWWDIR%%/plugins/Live/Model.php
> %%WWWDIR%%/plugins/Live/Reports/Base.php
>+%%WWWDIR%%/plugins/Live/Reports/GetLastVisits.php
> %%WWWDIR%%/plugins/Live/Reports/GetLastVisitsDetails.php
> %%WWWDIR%%/plugins/Live/Reports/GetSimpleLastVisitCount.php
> %%WWWDIR%%/plugins/Live/Visitor.php
>@@ -4123,6 +4141,11 @@
> %%WWWDIR%%/plugins/Referrers/Columns/Website.php
> %%WWWDIR%%/plugins/Referrers/Columns/WebsitePage.php
> %%WWWDIR%%/plugins/Referrers/Controller.php
>+%%WWWDIR%%/plugins/Referrers/DataTable/Filter/KeywordNotDefined.php
>+%%WWWDIR%%/plugins/Referrers/DataTable/Filter/KeywordsFromSearchEngineId.php
>+%%WWWDIR%%/plugins/Referrers/DataTable/Filter/SearchEnginesFromKeywordId.php
>+%%WWWDIR%%/plugins/Referrers/DataTable/Filter/UrlsForSocial.php
>+%%WWWDIR%%/plugins/Referrers/DataTable/Filter/UrlsFromWebsiteId.php
> %%WWWDIR%%/plugins/Referrers/Menu.php
> %%WWWDIR%%/plugins/Referrers/Referrers.php
> %%WWWDIR%%/plugins/Referrers/Reports/Base.php
>@@ -4822,6 +4845,7 @@
> %%WWWDIR%%/plugins/SitesManager/templates/index.html
> %%WWWDIR%%/plugins/SitesManager/templates/index.twig
> %%WWWDIR%%/plugins/SitesManager/templates/loading.html
>+%%WWWDIR%%/plugins/SitesManager/templates/siteWithoutData.twig
> %%WWWDIR%%/plugins/SitesManager/templates/sites-list/add-site-link.html
> %%WWWDIR%%/plugins/SitesManager/templates/sites-list/alias-urls-field.html
> %%WWWDIR%%/plugins/SitesManager/templates/sites-list/site-fields.html
>@@ -4878,6 +4902,7 @@
> %%WWWDIR%%/plugins/UserCountry/Columns/Longitude.php
> %%WWWDIR%%/plugins/UserCountry/Columns/Provider.php
> %%WWWDIR%%/plugins/UserCountry/Columns/Region.php
>+%%WWWDIR%%/plugins/UserCountry/Commands/AttributeHistoricalDataWithLocations.php
> %%WWWDIR%%/plugins/UserCountry/Controller.php
> %%WWWDIR%%/plugins/UserCountry/GeoIPAutoUpdater.php
> %%WWWDIR%%/plugins/UserCountry/LocationProvider.php
>@@ -4896,6 +4921,7 @@
> %%WWWDIR%%/plugins/UserCountry/Tasks.php
> %%WWWDIR%%/plugins/UserCountry/UserCountry.php
> %%WWWDIR%%/plugins/UserCountry/Visitor.php
>+%%WWWDIR%%/plugins/UserCountry/VisitorGeolocator.php
> %%WWWDIR%%/plugins/UserCountry/functions.php
> %%WWWDIR%%/plugins/UserCountry/images/flags/a1.png
> %%WWWDIR%%/plugins/UserCountry/images/flags/a2.png
>@@ -5944,6 +5970,7 @@
> %%WWWDIR%%/vendor/composer/autoload_namespaces.php
> %%WWWDIR%%/vendor/composer/autoload_psr4.php
> %%WWWDIR%%/vendor/composer/autoload_real.php
>+%%WWWDIR%%/vendor/composer/include_paths.php
> %%WWWDIR%%/vendor/composer/installed.json
> %%WWWDIR%%/vendor/container-interop/container-interop/.gitignore
> %%WWWDIR%%/vendor/container-interop/container-interop/LICENSE
>@@ -6219,6 +6246,39 @@
> %%WWWDIR%%/vendor/myclabs/php-enum/README.md
> %%WWWDIR%%/vendor/myclabs/php-enum/composer.json
> %%WWWDIR%%/vendor/myclabs/php-enum/src/Enum.php
>+%%WWWDIR%%/vendor/pear/archive_tar/.gitignore
>+%%WWWDIR%%/vendor/pear/archive_tar/.travis.sh
>+%%WWWDIR%%/vendor/pear/archive_tar/.travis.yml
>+%%WWWDIR%%/vendor/pear/archive_tar/Archive/Tar.php
>+%%WWWDIR%%/vendor/pear/archive_tar/README.md
>+%%WWWDIR%%/vendor/pear/archive_tar/composer.json
>+%%WWWDIR%%/vendor/pear/archive_tar/docs/Archive_Tar.txt
>+%%WWWDIR%%/vendor/pear/archive_tar/package.xml
>+%%WWWDIR%%/vendor/pear/archive_tar/scripts/phptar.in
>+%%WWWDIR%%/vendor/pear/archive_tar/sync-php4
>+%%WWWDIR%%/vendor/pear/console_getopt/.gitignore
>+%%WWWDIR%%/vendor/pear/console_getopt/.travis.yml
>+%%WWWDIR%%/vendor/pear/console_getopt/Console/Getopt.php
>+%%WWWDIR%%/vendor/pear/console_getopt/LICENSE
>+%%WWWDIR%%/vendor/pear/console_getopt/README.rst
>+%%WWWDIR%%/vendor/pear/console_getopt/composer.json
>+%%WWWDIR%%/vendor/pear/console_getopt/package.xml
>+%%WWWDIR%%/vendor/pear/pear-core-minimal/.gitignore
>+%%WWWDIR%%/vendor/pear/pear-core-minimal/README.rst
>+%%WWWDIR%%/vendor/pear/pear-core-minimal/composer.json
>+%%WWWDIR%%/vendor/pear/pear-core-minimal/src/OS/Guess.php
>+%%WWWDIR%%/vendor/pear/pear-core-minimal/src/PEAR.php
>+%%WWWDIR%%/vendor/pear/pear-core-minimal/src/PEAR/Error.php
>+%%WWWDIR%%/vendor/pear/pear-core-minimal/src/PEAR/ErrorStack.php
>+%%WWWDIR%%/vendor/pear/pear-core-minimal/src/PEAR/ErrorStack5.php
>+%%WWWDIR%%/vendor/pear/pear-core-minimal/src/PEAR5.php
>+%%WWWDIR%%/vendor/pear/pear-core-minimal/src/System.php
>+%%WWWDIR%%/vendor/pear/pear_exception/.gitignore
>+%%WWWDIR%%/vendor/pear/pear_exception/.travis.yml
>+%%WWWDIR%%/vendor/pear/pear_exception/LICENSE
>+%%WWWDIR%%/vendor/pear/pear_exception/PEAR/Exception.php
>+%%WWWDIR%%/vendor/pear/pear_exception/composer.json
>+%%WWWDIR%%/vendor/pear/pear_exception/package.xml
> %%WWWDIR%%/vendor/piwik/cache/.gitignore
> %%WWWDIR%%/vendor/piwik/cache/.travis.yml
> %%WWWDIR%%/vendor/piwik/cache/README.md
>@@ -6241,9 +6301,6 @@
> %%WWWDIR%%/vendor/piwik/decompress/.travis.yml
> %%WWWDIR%%/vendor/piwik/decompress/README.md
> %%WWWDIR%%/vendor/piwik/decompress/composer.json
>-%%WWWDIR%%/vendor/piwik/decompress/libs/Archive_Tar/Tar.php
>-%%WWWDIR%%/vendor/piwik/decompress/libs/PEAR.php
>-%%WWWDIR%%/vendor/piwik/decompress/libs/PEAR5.php
> %%WWWDIR%%/vendor/piwik/decompress/libs/PclZip/lgpl-2.1.txt
> %%WWWDIR%%/vendor/piwik/decompress/libs/PclZip/pclzip.lib.php
> %%WWWDIR%%/vendor/piwik/decompress/libs/README.md
>====> Cleaning up
>===> Done

Actions: View

Attachments on bug 198886: 154778 | 154955