diff -ruN /usr/ports/multimedia/zoneminder/Makefile /usr/local/poudriere/ports/default/multimedia/zoneminder/Makefile --- /usr/ports/multimedia/zoneminder/Makefile 2017-03-12 19:41:42.000000000 +0000 +++ /usr/local/poudriere/ports/default/multimedia/zoneminder/Makefile 2017-04-01 19:03:53.390922000 +0000 @@ -1,9 +1,7 @@ # $FreeBSD: head/multimedia/zoneminder/Makefile 436017 2017-03-12 19:41:42Z pi $ PORTNAME= zoneminder -PORTVERSION= 1.30.0 -DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTVERSION= 1.30.2 CATEGORIES= multimedia MAINTAINER= bsd@abinet.ru diff -ruN /usr/ports/multimedia/zoneminder/distinfo /usr/local/poudriere/ports/default/multimedia/zoneminder/distinfo --- /usr/ports/multimedia/zoneminder/distinfo 2017-01-03 18:12:13.000000000 +0000 +++ /usr/local/poudriere/ports/default/multimedia/zoneminder/distinfo 2017-04-01 18:55:09.378380000 +0000 @@ -1,5 +1,5 @@ -TIMESTAMP = 1483465871 -SHA256 (zoneminder-ZoneMinder-v1.30.0_GH0.tar.gz) = e7c964c339305f42a044ca8e34fa4e6a33c452fdaf33642458735daf8b864325 -SIZE (zoneminder-ZoneMinder-v1.30.0_GH0.tar.gz) = 9757409 +TIMESTAMP = 1491072909 +SHA256 (zoneminder-ZoneMinder-1.30.2_GH0.tar.gz) = 499277b295bdcc2bb38b562a9061fac171236536b88b590f948f4f41ad1f7b5c +SIZE (zoneminder-ZoneMinder-1.30.2_GH0.tar.gz) = 9931753 SHA256 (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 7dfa29dd6dd95f05bca61bb05033f813828b7ab66f9d8793d306df0dd72471ce SIZE (FriendsOfCake-crud-c3976f1_GH0.tar.gz) = 72961 diff -ruN /usr/ports/multimedia/zoneminder/pkg-plist /usr/local/poudriere/ports/default/multimedia/zoneminder/pkg-plist --- /usr/ports/multimedia/zoneminder/pkg-plist 2016-07-27 08:01:04.000000000 +0000 +++ /usr/local/poudriere/ports/default/multimedia/zoneminder/pkg-plist 2017-04-01 19:47:59.343106000 +0000 @@ -2974,6 +2974,7 @@ %%SITE_PERL%%/ZoneMinder/Base.pm %%SITE_PERL%%/ZoneMinder/Config.pm %%SITE_PERL%%/ZoneMinder/ConfigData.pm +%%SITE_PERL%%/ZoneMinder/ConfigData.pm.in.bak %%SITE_PERL%%/ZoneMinder/Control.pm %%SITE_PERL%%/ZoneMinder/Control/3S.pm %%SITE_PERL%%/ZoneMinder/Control/AxisV2.pm @@ -2983,7 +2984,9 @@ %%SITE_PERL%%/ZoneMinder/Control/FI8918W.pm %%SITE_PERL%%/ZoneMinder/Control/FI9821W_Y2k.pm %%SITE_PERL%%/ZoneMinder/Control/FI9831W.pm +%%SITE_PERL%%/ZoneMinder/Control/HikVision.pm %%SITE_PERL%%/ZoneMinder/Control/IPCC7210W.pm +%%SITE_PERL%%/ZoneMinder/Control/Keekoon.pm %%SITE_PERL%%/ZoneMinder/Control/LoftekSentinel.pm %%SITE_PERL%%/ZoneMinder/Control/M8640.pm %%SITE_PERL%%/ZoneMinder/Control/Ncs370.pm @@ -6091,6 +6094,8 @@ %%DATADIR%%/db/zm_update-1.29.0.sql %%DATADIR%%/db/zm_update-1.29.1.sql %%DATADIR%%/db/zm_update-1.30.0.sql +%%DATADIR%%/db/zm_update-1.30.1.sql +%%DATADIR%%/db/zm_update-1.30.2.sql %%WWWDIR%%/ajax/alarm.php %%WWWDIR%%/ajax/control.php %%WWWDIR%%/ajax/event.php @@ -6121,8 +6126,6 @@ %%WWWDIR%%/api/app/Config/email.php.default %%WWWDIR%%/api/app/Config/routes.php %%WWWDIR%%/api/app/Console/Command/AppShell.php -%%WWWDIR%%/api/app/Console/Command/Task/empty -%%WWWDIR%%/api/app/Console/Templates/empty %%WWWDIR%%/api/app/Console/cake %%WWWDIR%%/api/app/Console/cake.bat %%WWWDIR%%/api/app/Console/cake.php @@ -6131,7 +6134,6 @@ %%WWWDIR%%/api/app/Controller/Component/FilterComponent.php %%WWWDIR%%/api/app/Controller/Component/ImageComponent.php %%WWWDIR%%/api/app/Controller/Component/ScalerComponent.php -%%WWWDIR%%/api/app/Controller/Component/empty %%WWWDIR%%/api/app/Controller/ConfigsController.php %%WWWDIR%%/api/app/Controller/ControlsController.php %%WWWDIR%%/api/app/Controller/EventsController.php @@ -6144,13 +6146,9 @@ %%WWWDIR%%/api/app/Controller/StatesController.php %%WWWDIR%%/api/app/Controller/ZonePresetsController.php %%WWWDIR%%/api/app/Controller/ZonesController.php -%%WWWDIR%%/api/app/Lib/empty -%%WWWDIR%%/api/app/Locale/eng/LC_MESSAGES/empty %%WWWDIR%%/api/app/Model/AppModel.php -%%WWWDIR%%/api/app/Model/Behavior/empty %%WWWDIR%%/api/app/Model/Config.php %%WWWDIR%%/api/app/Model/Control.php -%%WWWDIR%%/api/app/Model/Datasource/empty %%WWWDIR%%/api/app/Model/Event.php %%WWWDIR%%/api/app/Model/Frame.php %%WWWDIR%%/api/app/Model/Host.php @@ -6223,18 +6221,11 @@ %%WWWDIR%%/api/app/Plugin/Crud/View/CrudXmlView.php %%WWWDIR%%/api/app/Plugin/Crud/View/Elements/crud_panel.ctp %%WWWDIR%%/api/app/Plugin/Crud/composer.json -%%WWWDIR%%/api/app/Plugin/empty -%%WWWDIR%%/api/app/Test/Case/Controller/Component/empty -%%WWWDIR%%/api/app/Test/Case/Model/Behavior/empty -%%WWWDIR%%/api/app/Test/Case/View/Helper/empty -%%WWWDIR%%/api/app/Test/Fixture/empty -%%WWWDIR%%/api/app/Vendor/empty %%WWWDIR%%/api/app/View/Configs/json/edit.ctp %%WWWDIR%%/api/app/View/Configs/json/index.ctp %%WWWDIR%%/api/app/View/Configs/json/view.ctp %%WWWDIR%%/api/app/View/Configs/xml/index.ctp %%WWWDIR%%/api/app/View/Configs/xml/view.ctp -%%WWWDIR%%/api/app/View/Elements/empty %%WWWDIR%%/api/app/View/Emails/html/default.ctp %%WWWDIR%%/api/app/View/Emails/text/default.ctp %%WWWDIR%%/api/app/View/Errors/error400.ctp @@ -6265,7 +6256,6 @@ %%WWWDIR%%/api/app/View/Monitors/xml/index.ctp %%WWWDIR%%/api/app/View/Monitors/xml/view.ctp %%WWWDIR%%/api/app/View/Pages/home.ctp -%%WWWDIR%%/api/app/View/Scaffolds/empty %%WWWDIR%%/api/app/View/Servers/json/edit.ctp %%WWWDIR%%/api/app/View/Servers/json/index.ctp %%WWWDIR%%/api/app/View/Servers/json/view.ctp @@ -6277,7 +6267,6 @@ %%WWWDIR%%/api/app/View/View/Configs/json/view.ctp %%WWWDIR%%/api/app/View/View/Configs/xml/index.ctp %%WWWDIR%%/api/app/View/View/Configs/xml/view.ctp -%%WWWDIR%%/api/app/View/View/Elements/empty %%WWWDIR%%/api/app/View/View/Emails/html/default.ctp %%WWWDIR%%/api/app/View/View/Emails/text/default.ctp %%WWWDIR%%/api/app/View/View/Errors/error400.ctp @@ -6304,7 +6293,6 @@ %%WWWDIR%%/api/app/View/View/Monitors/xml/index.ctp %%WWWDIR%%/api/app/View/View/Monitors/xml/view.ctp %%WWWDIR%%/api/app/View/View/Pages/home.ctp -%%WWWDIR%%/api/app/View/View/Scaffolds/empty %%WWWDIR%%/api/app/View/Zones/json/index.ctp %%WWWDIR%%/api/app/View/Zones/json/view.ctp %%WWWDIR%%/api/app/View/Zones/xml/index.ctp @@ -6396,7 +6384,6 @@ %%WWWDIR%%/api/app/webroot/.htaccess %%WWWDIR%%/api/app/webroot/css/cake.generic.css %%WWWDIR%%/api/app/webroot/favicon.ico -%%WWWDIR%%/api/app/webroot/files/empty %%WWWDIR%%/api/app/webroot/img/cake.icon.png %%WWWDIR%%/api/app/webroot/img/cake.power.gif %%WWWDIR%%/api/app/webroot/img/test-error-icon.png @@ -6404,7 +6391,6 @@ %%WWWDIR%%/api/app/webroot/img/test-pass-icon.png %%WWWDIR%%/api/app/webroot/img/test-skip-icon.png %%WWWDIR%%/api/app/webroot/index.php -%%WWWDIR%%/api/app/webroot/js/empty %%WWWDIR%%/api/app/webroot/test.php %%WWWDIR%%/api/build.properties %%WWWDIR%%/api/build.xml @@ -6504,28 +6490,14 @@ %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/email.php.default %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Config/routes.php %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/Command/AppShell.php -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/Command/Task/empty -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/Templates/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/cake %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/cake.bat %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Console/cake.php %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Controller/AppController.php -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Controller/Component/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Controller/PagesController.php -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Lib/empty -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Locale/eng/LC_MESSAGES/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Model/AppModel.php -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Model/Behavior/empty -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Model/Datasource/empty -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Plugin/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/AllTestsTest.php -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/Controller/Component/empty -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/Model/Behavior/empty -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Case/View/Helper/empty -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Test/Fixture/empty -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/Vendor/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Elements/Flash/default.ctp -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Elements/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Emails/text/default.ctp %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Errors/error400.ctp @@ -6541,12 +6513,10 @@ %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Layouts/rss/default.ctp %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Layouts/xml/default.ctp %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Pages/home.ctp -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/View/Scaffolds/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/index.php %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/.htaccess %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/favicon.ico -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/files/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/cake.icon.png %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/cake.power.gif %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/test-error-icon.png @@ -6554,7 +6524,6 @@ %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/test-pass-icon.png %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/img/test-skip-icon.png %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/index.php -%%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/js/empty %%WWWDIR%%/api/lib/Cake/Console/Templates/skel/webroot/test.php %%WWWDIR%%/api/lib/Cake/Console/cake %%WWWDIR%%/api/lib/Cake/Console/cake.bat @@ -7013,11 +6982,9 @@ %%WWWDIR%%/api/lib/Cake/Test/test_app/Config/var_test.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Config/var_test2.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Command/SampleShell.php -%%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Command/Task/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Templates/test/classes/test_object.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/Console/Templates/test/views/admin_edit.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/AppController.php -%%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/Component/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/PagesController.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/TestAppsErrorController.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Controller/TestConfigsController.php @@ -7131,7 +7098,6 @@ %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/ExampleShell.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/Task/OtherTaskTask.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Command/TestPluginShell.php -%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Console/Templates/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/OtherComponent.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/PluginsComponent.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/Controller/Component/TestPluginComponent.php @@ -7189,9 +7155,7 @@ %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPlugin/webroot/root.js %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Config/bootstrap.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/ExampleShell.php -%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/Task/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Command/WelcomeShell.php -%%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/Console/Templates/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/Plugin/TestPluginTwo/View/Layouts/Emails/text/default.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/Utility/TestAppEngine.php %%WWWDIR%%/api/lib/Cake/Test/test_app/Vendor/Test/MyTest.php @@ -7275,7 +7239,6 @@ %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Posts/sequencial_nocache.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Posts/test_nocache_tags.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Posts/xml/index.ctp -%%WWWDIR%%/api/lib/Cake/Test/test_app/View/Scaffolds/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/View/TestsApps/index.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/View/TestsApps/json/index.ctp %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/Elements/test_element.ctp @@ -7296,7 +7259,6 @@ %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/js/theme.js %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/pdfs/theme_test.pdf %%WWWDIR%%/api/lib/Cake/Test/test_app/View/Themed/TestTheme/webroot/space image.text -%%WWWDIR%%/api/lib/Cake/Test/test_app/tmp/empty %%WWWDIR%%/api/lib/Cake/Test/test_app/webroot/img/cake.power.gif %%WWWDIR%%/api/lib/Cake/Test/test_app/webroot/theme/test_theme/css/theme_webroot.css %%WWWDIR%%/api/lib/Cake/Test/test_app/webroot/theme/test_theme/css/webroot_test.css @@ -7395,9 +7357,15 @@ %%WWWDIR%%/api/lib/Cake/bootstrap.php %%WWWDIR%%/cgi-bin/nph-zms %%WWWDIR%%/cgi-bin/zms +%%WWWDIR%%/css/bootstrap.min.css %%WWWDIR%%/css/overlay.css %%WWWDIR%%/css/reset.css %%WWWDIR%%/css/spinner.css +%%WWWDIR%%/fonts/glyphicons-halflings-regular.eot +%%WWWDIR%%/fonts/glyphicons-halflings-regular.svg +%%WWWDIR%%/fonts/glyphicons-halflings-regular.ttf +%%WWWDIR%%/fonts/glyphicons-halflings-regular.woff +%%WWWDIR%%/fonts/glyphicons-halflings-regular.woff2 %%WWWDIR%%/graphics/favicon.ico %%WWWDIR%%/graphics/spinner.gif %%WWWDIR%%/graphics/transparent.gif @@ -7409,6 +7377,11 @@ %%WWWDIR%%/includes/actions.php %%WWWDIR%%/includes/config.php %%WWWDIR%%/includes/control_functions.php +%%WWWDIR%%/includes/csrf/LICENSE.txt +%%WWWDIR%%/includes/csrf/NEWS.txt +%%WWWDIR%%/includes/csrf/README.txt +%%WWWDIR%%/includes/csrf/csrf-magic.js +%%WWWDIR%%/includes/csrf/csrf-magic.php %%WWWDIR%%/includes/database.php %%WWWDIR%%/includes/functions.php %%WWWDIR%%/includes/lang.php @@ -7454,6 +7427,7 @@ %%WWWDIR%%/skins/classic/css/classic/views/frames.css %%WWWDIR%%/skins/classic/css/classic/views/groups.css %%WWWDIR%%/skins/classic/css/classic/views/log.css +%%WWWDIR%%/skins/classic/css/classic/views/login.css %%WWWDIR%%/skins/classic/css/classic/views/monitor.css %%WWWDIR%%/skins/classic/css/classic/views/montage.css %%WWWDIR%%/skins/classic/css/classic/views/montage_2wide.css @@ -7554,7 +7528,6 @@ %%WWWDIR%%/skins/classic/includes/control_functions.php %%WWWDIR%%/skins/classic/includes/export_functions.php %%WWWDIR%%/skins/classic/includes/functions.php -%%WWWDIR%%/skins/classic/includes/init.php %%WWWDIR%%/skins/classic/includes/timeline_functions.php %%WWWDIR%%/skins/classic/js/classic.js %%WWWDIR%%/skins/classic/js/dark.js @@ -7591,6 +7564,7 @@ %%WWWDIR%%/skins/classic/views/js/console.js %%WWWDIR%%/skins/classic/views/js/console.js.php %%WWWDIR%%/skins/classic/views/js/control.js +%%WWWDIR%%/skins/classic/views/js/controlcap.js %%WWWDIR%%/skins/classic/views/js/controlpreset.js %%WWWDIR%%/skins/classic/views/js/controlpreset.js.php %%WWWDIR%%/skins/classic/views/js/cycle.js @@ -7610,6 +7584,7 @@ %%WWWDIR%%/skins/classic/views/js/groups.js %%WWWDIR%%/skins/classic/views/js/log.js %%WWWDIR%%/skins/classic/views/js/login.js +%%WWWDIR%%/skins/classic/views/js/login.js.php %%WWWDIR%%/skins/classic/views/js/monitor.js %%WWWDIR%%/skins/classic/views/js/monitor.js.php %%WWWDIR%%/skins/classic/views/js/monitorpreset.js @@ -7619,7 +7594,6 @@ %%WWWDIR%%/skins/classic/views/js/onvifprobe.js %%WWWDIR%%/skins/classic/views/js/options.js.php %%WWWDIR%%/skins/classic/views/js/plugin.js -%%WWWDIR%%/skins/classic/views/js/plugin.js.php %%WWWDIR%%/skins/classic/views/js/postlogin.js.php %%WWWDIR%%/skins/classic/views/js/server.js %%WWWDIR%%/skins/classic/views/js/state.js @@ -7646,7 +7620,6 @@ %%WWWDIR%%/skins/classic/views/montage.php %%WWWDIR%%/skins/classic/views/montagereview.php %%WWWDIR%%/skins/classic/views/none.php -%%WWWDIR%%/skins/classic/views/nph-zms %%WWWDIR%%/skins/classic/views/onvifprobe.php %%WWWDIR%%/skins/classic/views/optionhelp.php %%WWWDIR%%/skins/classic/views/options.php @@ -7668,7 +7641,6 @@ %%WWWDIR%%/tools/mootools/mootools-core.js %%WWWDIR%%/tools/mootools/mootools-more-1.5.1.js %%WWWDIR%%/tools/mootools/mootools-more.js -%%WWWDIR%%/views/file.php %%WWWDIR%%/views/image.php @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/api/app/tmp @dir(%%WWWOWN%%,%%WWWGRP%%,) %%WWWDIR%%/events