Remove bluecherry.init

.gitmodules

@@ -14,3 +14,6 @@
 [submodule "misc/libconfig"]
 	path = misc/libconfig
 	url = https://github.com/hyperrealm/libconfig.git
+#[submodule "utils/onvif_tool"]
+#	path = utils/onvif_tool
+#	url = https://github.com/bluecherrydvr/onvif_tool.git

BCMK.conf

@@ -1,8 +1,9 @@
 CC		:= ccache gcc -std=c99
 CXX		:= ccache g++ -std=c++0x
 LD		:= $(CC)
+STRIP		:= strip
 
-CFLAGS		= -Wall -g -ggdb3 -O2 -isystem $(STAGE)/include -iquote $(TOPDIR)/lib -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS
+CFLAGS		= -Wall -g3 -ggdb -O3 -isystem $(STAGE)/include -iquote $(TOPDIR)/lib -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS
 CFLAGS		+= -I /usr/include/opencv4
 CXXFLAGS	= $(CFLAGS)
 LDFLAGS		= -L$(TOPDIR)/lib -L$(STAGE)/lib -Wl,-rpath=$(libexec_dir) \

README.md

@@ -1,6 +1,6 @@
 ## Building from source
 
-[![Join the chat at https://gitter.im/bluecherrydvr/dev-server](https://badges.gitter.im/bluecherrydvr/dev-server.svg)](https://gitter.im/bluecherrydvr/dev-server?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/bluecherrydvr/dev-server](https://badges.gitter.im/bluecherrydvr/dev-server.svg)](https://gitter.im/bluecherrydvr/dev-server?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)[![Join our Slack!](https://img.shields.io/static/v1?message=join%20chat&color=9cf&logo=slack&label=slack)](https://join.slack.com/t/bluecherry-public/shared_invite/zt-rhxb117k-m5sCsp_FF0l8cToB56HeYA) 
 
 Currently building from source requires running pre-configured scripts to generate some of the required files for a build.  In the past we used chroots for build environments, however it is possible to build for your specific distributions using the following command:
 

debian/bluecherry.apparmor

@@ -16,6 +16,7 @@
   /dev/video* rw,
 
   /usr/lib/libbluecherry.so.0 mr,
+  /usr/lib/libLexActivator.so mr,
   /usr/lib/bluecherry/ r,
   /usr/lib/bluecherry/* mr,
 }

debian/bluecherry.cron

@@ -1,2 +1,3 @@
 # m h dom mon dow user          command
 0   0  *   *   *  bluecherry    /usr/share/bluecherry/backup_db.sh
+30   0  *   *   *  bluecherry    curl -k https://localhost:7001/subdomainprovidercron

debian/bluecherry.postrm

@@ -35,6 +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"
 }
 
 case "$1" in
@@ -76,3 +77,19 @@ esac
 #DEBHELPER#
 
 db_stop
+
+# Remove cron file
+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/bluecherry.preinst.template

@@ -3,6 +3,18 @@
 # Note: this template file is prepended with misc/sql/load_db_creds.sh at packaging stage.
 # So "$dbname", "$user", "$password" variables are available.
 
+if [[ $(cat /etc/os-release | grep "^ID=" | grep centos) ]]
+then 
+    systemctl stop httpd.service
+else
+	if [ ! -z `which service` ]
+	then
+		service apache2 stop || true
+	else
+		invoke-rc.d apache2 stop || true
+	fi
+fi
+
 if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt "1:2.0.3"; then
 	echo "UPGRADES WILL NOT WORK!!"
 	echo "Please 'dpkg -P bluecherry' before installing this new package"

debian/changelog

@@ -1,3 +1,88 @@
+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)
+  * FIX: Constant recordings stop after several seconds (#523)
+  * FIX: Add cronscripts for domain and SSL renewal
+  * FIX: Only send webhook trigger on motion, not constant video (#515) -- Thanks to @mcnelson for this fix
+  * FIX: Increase Media.size limit to fix SQL errors with 1hr+ record segments (0294eef8f22708526b03bd94d8b676954e5d857b) -- Thanks to @mcnelson for this fix
+  * FIX: Web UI fix: can't delete webhooks when there are multiple webhooks configured (b384096819205e5008dd26f02d7e83f7b6abaa85) -- Thanks to @enp6s0 for this fix
+
+ -- Curtis Hall <chall@corp.bluecherry.net>  Tue, 01 Mar 2022 15:52:42 -0600   
+
+bluecherry (3:3.1.0-rc4) focal bionic buster groovy hirsute bullseye; urgency=low
+
+  * FIX: Most reported crashes in RC3 (one still remains outstanding)
+  * FIX: Don't overwrite subdomain SSL certificate include in nginx on upgrade (57bea75ac9b1d692b20ed742d69bcd5ecb101be6)
+  * FIX: Add cronscript to check for new IP address and report changes to subdomain API (#507)
+  * FIX: Available licensed ports show -1 (#504)
+  * FIX: HLS stream is unstable (#487)
+  * FIX: Failed to init muxer for output file $filepath invalid argument
+  * FIX: apt-get remove --purge remove does not truncate (remove) the user, prevents reinstallation (2b3d199f814430eb21221525301d077be3b6bc27)
+  * FEATURE: Update devices.xml to show device name (needed in mobile app) (00e2fc1462cc82eb51ec47e1c425685d6f8110fc)
+  * FEATURE: Finished monitoring threads and high performance statistic collector with backend API (#506)
+
+ -- Curtis Hall <chall@corp.bluecherry.net>  Fri, 17 Sep 2021 20:07:00 -0600   
+
+bluecherry (3:3.1.0-rc3) focal bionic buster groovy hirsute bullseye; urgency=low
+
+  * FIX: All reported crashes in RC2.
+  * FIX: Firefox UblockOrigin blocks certain menu item clicks (#474)
+  * FIX: Web: 504 Gateway Time-out fix (#470)
+  * FIX: 30 day trial should allow unlimited cameras, however currently limited to 4 (#475)
+  * FIX: Adding a user without an email address causes the web interface to become unresponsive (#484)
+
+ -- Curtis Hall <chall@corp.bluecherry.net>  Wed, 11 Jul 2021 14:50:00 -0600   
+
+bluecherry (3:3.1.0-rc2) focal bionic buster groovy hirsute bullseye; urgency=low
+
+  * FIX: Resolve large memory leak, causing OOM failure sometimes as soon as 1 hour. (https://github.com/bluecherrydvr/bluecherry-apps/commit/01328270cba757fd853c84826402d44dc0d3eb61) / #01328270cba757fd853c84826402d44dc0d3eb61
+  * FIX: Resolve buffer append crash (#6bc8ceed0b5bd6385991bd1dea65f36bffeea782)
+
+ -- Curtis Hall <chall@corp.bluecherry.net>  Wed, 12 Jun 2021 15:52:04 -0600   
+
+bluecherry (3:3.1.0-rc1) focal bionic buster groovy; urgency=low
+
+  * FEATURE: Migrate completely to nginx instead of Apache (#436)
+  * FEATURE: Support HLS web streaming for live view (#437)
+  * FEATURE: Allow trial licenses
+  * FEATURE: Start initial work to support Lets Encrypt SSL (will be fully added in -RC2) -- Requires paid license.
+
+ -- Curtis Hall <chall@corp.bluecherry.net>  Wed, 6 Jun 2021 19:25:00 -0600   
+
+bluecherry (3:3.0.6) focal bionic buster groovy; urgency=low
+
+  * FIX: Lack of string etiquette in the trigger server, resolve buffer overrun (#434)
+  * FIX: Nasty storage deletion routine bug where old videos may not be deleted, resulting in 100% disk usage and failure to compontents (#433)
+  * FIX: Web: Layout problem when cameras are disabled (#227)
+  * FEATURE: Auto-expand IP Cameras in Devices page (#430)
+
+ -- Curtis Hall <chall@corp.bluecherry.net>  Mon, 10 May 2021 13:21:52 -0600 
+
+bluecherry (3:3.0.5) focal bionic buster groovy; urgency=low
+
+  * FIX: Web playback - AJAX error caused by the wrong time format (#388)
+  * FIX: Fixed segment violation bug in recording schedule (#425)
+  * FIX: Change VAAPI to 'None' by default (#421)
+  * FIX: Web backup / restore - Fixed problem where backup and restore would always fail (#414 / #409)
+  * FIX: Fix mailer.php (attachments were broken) (#405)
+  * FIX: TLS / SASL improvements (#366)
+  * FEATURE: Support systemd (allowing for newer Ubuntu distributions) (#406)
+  * FEATURE: Adds temporal-based motion detection algorithm - Added by Kyle Mallory <kylemallory@yahoo.com>
+  * FEATURE: Minor improvements to Experimental motion detection algorithm, specifically support for "max motion area". - Added by Kyle Mallory <kylemallory@yahoo.com>
+
+ -- Curtis Hall <chall@corp.bluecherry.net>  Wed, 28 Apr 2021 12:57:28 -0600 
+
 bluecherry (3:3.0.4) focal bionic buster; urgency=low
 
   * Restart subscription to ONVIF events if connection is lost

debian/control

@@ -0,0 +1,38 @@
+Source: bluecherry
+Section: admin
+Priority: optional
+Maintainer: Bluecherry <maintainers@bluecherrydvr.com>
+Build-Depends: debhelper (>= 7),
+ libidn11-dev, libbsd-dev, yasm, libudev-dev, libopencv-dev,
+ libva-dev
+Standards-Version: 3.8.4
+
+Package: bluecherry
+Architecture: any
+Pre-Depends: adduser
+Depends: ${shlibs:Depends}, ssl-cert, ucf, curl, sysstat,
+ mkvtoolnix, php-mail, php-mail-mime, php-net-smtp, sqlite3, nmap,
+ nginx,
+ php-fpm,
+ php-mysql,
+ php-sqlite3,
+ v4l-utils,
+ vainfo,
+ i965-va-driver,
+ python3-pip,
+ php7.4-fpm, php7.4-sqlite3, php7.4-curl, php7.4-mysql, php7.4-gd
+
+Recommends: mysql-server
+Suggests: monit, mail-transport-agent
+Conflicts: solo6010-dkms
+Replaces: solo6010-dkms
+Description: Bluecherry DVR Server
+ This package contains the server components for the Bluecherry DVR system.
+
+Package: bluecherry-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: bluecherry (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for Bluecherry DVR Server
+

debian/control.in

@@ -19,20 +19,25 @@ Architecture: any
 Pre-Depends: adduser
 Depends: ${shlibs:Depends}, ssl-cert, ucf, curl, sysstat,
  mkvtoolnix, php-mail, php-mail-mime, php-net-smtp, sqlite3, nmap,
- apache2,
+ nginx,
+ php-fpm,
+ php-mysql,
+ php-sqlite3,
  v4l-utils,
  vainfo,
  i965-va-driver,
-#focal   php-sqlite3, libapache2-mod-php, php-gd, php-curl, php-mysql
-#xenial  php-sqlite3, libapache2-mod-php, php-gd, php-curl, php-mysql
-#bionic  php-sqlite3, libapache2-mod-php, php-gd, php-curl, php-mysql
-#buster  php-sqlite3, libapache2-mod-php, php-gd, php-curl, php-mysql
-#stretch php-sqlite3, libapache2-mod-php, php-gd, php-curl, php-mysql
-#precise php5-sqlite, libapache2-mod-php5, php5-gd, php5-curl, php5-mysqlnd
-#trusty  php5-sqlite, libapache2-mod-php5, php5-gd, php5-curl, php5-mysqlnd
-#wily    php5-sqlite, libapache2-mod-php5, php5-gd, php5-curl, php5-mysqlnd
-#wheezy  php5-sqlite, libapache2-mod-php5, php5-gd, php5-curl, php5-mysqlnd
-#jessie  php5-sqlite, libapache2-mod-php5, php5-gd, php5-curl, php5-mysqlnd
+ python3-pip,
+#focal   php-sqlite3, php-gd, php-curl, php-mysql
+#xenial  php-sqlite3, php-gd, php-curl, php-mysql
+#bionic  php-sqlite3, php-gd, php-curl, php-mysql
+#buster  php-sqlite3, php-gd, php-curl, php-mysql
+#stretch php-sqlite3, php-gd, php-curl, php-mysql
+#precise php5-sqlite, php5-gd, php5-curl, php5-mysqlnd
+#trusty  php5-sqlite, php5-gd, php5-curl, php5-mysqlnd
+#wily    php5-sqlite, php5-gd, php5-curl, php5-mysqlnd
+#wheezy  php5-sqlite, php5-gd, php5-curl, php5-mysqlnd
+#jessie  php5-sqlite, php5-gd, php5-curl, php5-mysqlnd
+#groovy libapache2-mod-php7.4, mariadb-server, php-mysql, php-curl, php-gd, php-sqlite3
 Recommends: mysql-server
 Suggests: monit, mail-transport-agent
 Conflicts: solo6010-dkms

debian/templates

@@ -42,3 +42,8 @@ Description: Leftover data notice
  database and recorded media files. If you want to remove this data, consider
  purging package data with "apt-get remove --purge bluecherry", this will
  remove config file, database and all recordings
+
+Template: bluecherry/major_upgrade
+Type: string
+Default: N
+Description: It appears that you currently have Version 2 installed. Version 3 is a PAID upgrade, however you can try Version 3 out for free for 30 days. Optionally Bluecherry offers 50% discounts on upgrades from Version 2 to Version 3. Contact Bluecherry for a discount code. By continuing a backup of your Version 2 database will be saved to (/tmp/bluecherry_backup.sql.gz), it is recommend you copy this database to a safe location. Do you want to continue? (Y/N):