Attachment 199966 Details for Bug 233876 – patch

[patch] patch

zone.diff (text/plain), 5.41 KB, created by Kurt Jaeger on 2018-12-08 22:41:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2018-12-08 22:41:02 UTC

Size: 5.41 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 486990)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	zoneminder
>-PORTVERSION=	1.32.2
>+PORTVERSION=	1.32.3
> CATEGORIES=	multimedia
> 
> MAINTAINER=	bsd@abinet.ru
>Index: distinfo
>===================================================================
>--- distinfo	(revision 486990)
>+++ distinfo	(working copy)
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1541609433
>-SHA256 (zoneminder-zoneminder-1.32.2_GH0.tar.gz) = cf72cbd45d91ef0232c123dac5f908993f8941a62b9ae96975c4e6043bd4b9a9
>-SIZE (zoneminder-zoneminder-1.32.2_GH0.tar.gz) = 10639207
>+TIMESTAMP = 1544308211
>+SHA256 (zoneminder-zoneminder-1.32.3_GH0.tar.gz) = 9a7e61c529a6269ff0344403369b160b8c8da48615c4172377c465da0b0074b1
>+SIZE (zoneminder-zoneminder-1.32.3_GH0.tar.gz) = 10656921
> SHA256 (zoneminder-crud-0bd63fb_GH0.tar.gz) = d4c82d714ea74606726d11be973b17d3f9b57ad6c6559e1a29affa60c6f3a579
> SIZE (zoneminder-crud-0bd63fb_GH0.tar.gz) = 73129
> SHA256 (zoneminder-CakePHP-Enum-Behavior-ea90c0c_GH0.tar.gz) = 3a9006c7c59f2b864ce628df4725b241fc23cfd9abc56e746acbd22d850f5ab1
>Index: files/patch-src_zm__monitor.cpp
>===================================================================
>--- files/patch-src_zm__monitor.cpp	(revision 486990)
>+++ files/patch-src_zm__monitor.cpp	(nonexistent)
>@@ -1,20 +0,0 @@
>---- src/zm_monitor.cpp.orig	2018-10-13 18:36:15 UTC
>-+++ src/zm_monitor.cpp
>-@@ -2110,6 +2110,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zone
>-   Camera *camera = 0;
>-   if ( type == "Local" ) {
>- 
>-+#if ZM_HAS_V4L
>-     int extras = (deinterlacing>>24)&0xff;
>- 
>-     camera = new LocalCamera(
>-@@ -2132,6 +2133,9 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zone
>-         record_audio,
>-         extras
>-         );
>-+#else
>-+    Fatal("ZoneMinder not built with Local Camera support");
>-+#endif
>-   } else if ( type == "Remote" ) {
>-     if ( protocol == "http" ) {
>-       camera = new RemoteCameraHttp(
>
>Property changes on: files/patch-src_zm__monitor.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-ON
>\ No newline at end of property
>Index: files/patch-src_zm__stream.cpp
>===================================================================
>--- files/patch-src_zm__stream.cpp	(revision 486990)
>+++ files/patch-src_zm__stream.cpp	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/zm_stream.cpp.orig	2018-11-07 16:33:47 UTC
>-+++ src/zm_stream.cpp
>-@@ -325,7 +325,7 @@ void StreamBase::openComms() {
>-     strncpy(loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path));
>-     loc_addr.sun_family = AF_UNIX;
>- 		Debug(3, "Binding to %s", loc_sock_path);
>--    if ( bind(sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1) < 0 ) {
>-+    if ( ::bind(sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1) < 0 ) {
>-       Fatal("Can't bind: %s", strerror(errno));
>-     }
>- 
>
>Property changes on: files/patch-src_zm__stream.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 486990)
>+++ pkg-plist	(working copy)
>@@ -6175,6 +6175,7 @@
> %%DATADIR%%/db/zm_update-1.32.0.sql
> %%DATADIR%%/db/zm_update-1.32.1.sql
> %%DATADIR%%/db/zm_update-1.32.2.sql
>+%%DATADIR%%/db/zm_update-1.32.3.sql
> %%DATADIR%%/icons/16x16/icon.xpm
> %%WWWDIR%%/ajax/add_monitors.php
> %%WWWDIR%%/ajax/alarm.php
>@@ -6236,6 +6237,7 @@
> %%WWWDIR%%/api/app/Model/Host.php
> %%WWWDIR%%/api/app/Model/Log.php
> %%WWWDIR%%/api/app/Model/Monitor.php
>+%%WWWDIR%%/api/app/Model/Monitor_Status.php
> %%WWWDIR%%/api/app/Model/Server.php
> %%WWWDIR%%/api/app/Model/State.php
> %%WWWDIR%%/api/app/Model/Storage.php
>@@ -7532,11 +7534,13 @@
> %%WWWDIR%%/includes/lang.php
> %%WWWDIR%%/includes/logger.php
> %%WWWDIR%%/index.php
>+%%WWWDIR%%/js/Server.js
> %%WWWDIR%%/js/logger.js
> %%WWWDIR%%/js/mootools.ext.js
> %%WWWDIR%%/js/overlay.js
> %%WWWDIR%%/js/videojs.zoomrotate.js
> %%WWWDIR%%/lang/big5_big5.php
>+%%WWWDIR%%/lang/ba_ba.php
> %%WWWDIR%%/lang/cn_zh.php
> %%WWWDIR%%/lang/cs_cz.php
> %%WWWDIR%%/lang/de_de.php
>@@ -7561,7 +7565,6 @@
> %%WWWDIR%%/lang/updateLangs.php
> %%WWWDIR%%/robots.txt
> %%WWWDIR%%/skins/classic/css/base/export.css
>-%%WWWDIR%%/skins/classic/css/base/jquery-ui-theme.css
> %%WWWDIR%%/skins/classic/css/base/skin.css
> %%WWWDIR%%/skins/classic/css/base/views/console.css
> %%WWWDIR%%/skins/classic/css/base/views/control.css
>@@ -7598,7 +7601,6 @@
> %%WWWDIR%%/skins/classic/css/base/views/zone.css
> %%WWWDIR%%/skins/classic/css/base/views/zones.css
> %%WWWDIR%%/skins/classic/css/classic/export.css
>-%%WWWDIR%%/skins/classic/css/classic/jquery-ui-theme.css
> %%WWWDIR%%/skins/classic/css/classic/skin.css
> %%WWWDIR%%/skins/classic/css/classic/views/console.css
> %%WWWDIR%%/skins/classic/css/classic/views/control.css
>@@ -7633,7 +7635,6 @@
> %%WWWDIR%%/skins/classic/css/classic/views/zone.css
> %%WWWDIR%%/skins/classic/css/classic/views/zones.css
> %%WWWDIR%%/skins/classic/css/dark/export.css
>-%%WWWDIR%%/skins/classic/css/dark/jquery-ui-theme.css
> %%WWWDIR%%/skins/classic/css/dark/skin.css
> %%WWWDIR%%/skins/classic/css/dark/views/console.css
> %%WWWDIR%%/skins/classic/css/dark/views/control.css

Actions: View | Diff

Attachments on bug 233876: 199966