Merge pull request #552 from bluecherrydvr/rc6

Prep for RC6

Author: curtishall

debian/bluecherry.init

@@ -15,7 +15,7 @@ DESC="Bluecherry DVR Server"
 NAME=bc-server
 DAEMON=/usr/sbin/$NAME
 DAEMONUSER=bluecherry
-DAEMONGROUP=www-data
+DAEMONGROUP=bluecherry
 DAEMON_ARGS="-s -u $DAEMONUSER -g $DAEMONGROUP"
 PIDDIR=/var/run/bluecherry
 PIDFILE=$PIDDIR/pid

debian/bluecherry.postrm

@@ -35,7 +35,7 @@ function purge_files() {
 function drop_db() {
 	echo "Dropping database $dbname"
 	echo "DROP DATABASE $dbname" | mysql -h"${host:-localhost}" -D"$dbname" -u"$user" -p"$password"
-	# echo "DROP USER '$user'@'localhost'" | mysql -h"${host:-localhost}" -D"$dbname" -u"$user" -p"$password"
+#	echo "DROP USER '$user'@'localhost'" | mysql -h"${host:-localhost}" -D"$dbname" -u"$user" -p"$password"
 }
 
 case "$1" in
@@ -83,3 +83,13 @@ cronfile=/etc/cron.d/bluecherry
 if test -f $cronfile; then
 	rm $cronfile
 fi
+
+function warn_user_db() {
+var_command='Warning!\n\nYou must run this command to finish the removal process or else you will not be able to reinstall Bluechery again\n***\necho DROP USER '$user'@'localhost' | mysql -h'${host:-localhost}' -u root -p\n***\n\n'
+printf "\x1b[31m$var_command\x1b[0m\n";
+}
+
+warn_user_db
+
+
+

debian/changelog

@@ -1,3 +1,14 @@
+bluecherry (3:3.1.0-rc6) focal bionic buster groovy hirsute bullseye; urgency=low
+
+  * FIX: Thumbnails are blank (#550)
+  * FIX: Onvif triggering does not work (#547)
+  * FIX: Onvif scanning does not work (#548)
+  * FIX: Web UI freezes (#550)
+  * FIX: Pulling snapshots via API returns no thumbnails (#551)
+
+ -- Curtis Hall <chall@corp.bluecherry.net>  Sat, 09 Jun 2022 12:34:08 -0600
+
+
 bluecherry (3:3.1.0-rc5) focal bionic buster groovy hirsute bullseye; urgency=low
 
   * FIX: Frame based motion randomly stops in the middle of a motion event #(500)

misc/postinstall.sh

@@ -392,7 +392,7 @@ case "$1" in
 		fi
 
 		# If subdomain.conf exists don't use snakeoil
-		
+#		mkdir -p /usr/share/bluecherry/nginx-includes
 		if test -f "/usr/share/bluecherry/nginx-includes/subdomain.conf"; then
 		sed -i 's/snakeoil.conf/subdomain.conf/g' /etc/nginx/sites-enabled/bluecherry.conf
 		fi

server/v3license_processor.h

@@ -7,7 +7,7 @@
 #define PRODUCT_DATA "MDM1MTY5MzZBN0VDRkQ3OTkxOEE4MEI5Nzk0NjQ0NDA=.Ir5Mm6ni/AAkaG7njv2SCTFATNsdqPcAeWWhj2AIAbKu5Tutp76zHNKMdtsjHCv77Frr9G8M8IuptUzsShaey8BbJnSCRItGvllojohTgWH0/qA3jtm4nnhoVhpeaaTc2cYUeAfuk3mbH9sDPJDkrSE6Oy/EhxQVQVyqK5N/ke3VBXomKfmWAwlVXys+OWi3hKIUynvTPHgMiZgpJJFG1I3iaCCmv7hkBPff+Lfwi4ZARKWDlvSJbXNeWiQLczhH/BVR5g9YPn0QmhcxIKd6AKRjk5GnLr1vlAVVbfPFmuC5SUaSrIEruTzjxZM0INmwLRpA5ND0C4ELgsw7Iez7W82RA+uiM8/CUdaSUxYDhLngv2iDG+inhV5STN9WCs41fpndtDBurIu0CGTk9F5G2zBhMcxzL2vZmwXOoyu4XvDd22p7jhuZnX+Pq0tHmW5/f9Ue+bMvzeiqSJQ7+apjqUDWBe9ZoBh7kM433vOjLb//WUK/HjNRC0KUop+Nq6z7aJRG867Yy56lN2hNa/9nCOFcHkZKBJThSovGbHysUW0g7IzpDrhmXXEAstNWiT4+oasT7xpYBrn2yFvwwmDjiA+Q52b4acs73U33IYocP2YmU0pmJZQfGJbn+4TLoPLCKSL+aqJgvpPPxdMLfqF6f51jAMkxHrmZedribNs+kwsLZY/jImeAfSCW1nv2YrZmVmu4Qt4gFT8HX+VBm+7V4P/NGa1jMUgLX1PpzlpwfC8="
 
 #define PRODUCT_ID "9c5dcb22-b7a8-4f0c-9deb-c5426bfe6ae6"
-#define PRODUCT_VERSION "3.1.0-rc4"
+#define PRODUCT_VERSION "3.1.0-rc6"
 
 #define METADATA_KEY "streams"
 

utils/onvif_tool

@@ -27,8 +27,8 @@ public function getData()
         	$event = $event[0];
 		!empty($event['filepath']) or requestError('E: No media is associated with this event.');
 
-        	$path_to_image = str_replace('mkv', 'jpg', $event['filepath']);
-			$path_to_image = str_replace('mp4', 'jpg', $event['filepath']);
+//        	$path_to_image = str_replace('mkv', 'jpg', $event['filepath']);
+		$path_to_image = str_replace('mp4', 'jpg', $event['filepath']);
 		file_exists($path_to_image) or requestError('E: Screenshot for this event was not found');
         	header('content-type:image/jpeg');
         	readfile($path_to_image);

www/ajax/media/mediaRequest.php

@@ -209,7 +209,7 @@ function webhook_trigger($eventName, $deviceId = null, $payload = array()) {
 
     if ($argv[1] == "motion_event") {
         #get path to image
-        $path_to_image = str_replace('mkv', 'jpg', $event[0]['filepath']);
+        $path_to_image = str_replace('mp4', 'jpg', $event[0]['filepath']);
 
         # Check the case of such short recording that snapshotting delay hasn't
         # come, so making a snapshot afterwards