Prep for RC7 release

debian/changelog

@@ -2,6 +2,10 @@ bluecherry (3:3.1.0-rc7) focal bionic buster groovy hirsute bullseye; urgency=lo
 
   * FIX: Web UI freezes (#544)
   * FIX: Upgrade from Ubuntu 18.04 v2 to v3 fails (#b44969fe9a3e4fd5718dd3fd8d8fd7c26a33975c) 
+  * FIX: Fix issues with installation on Ubuntu 20.04 Desktop
+  * Feature: Install pip3 from bootstrap.pypa.io (https://bootstrap.pypa.io/), resolves issue with older python packages required for our intergration with Lets Encrypt
+
+ -- Curtis Hall <[email protected]>  Sat, 21 Jan 2022 14:19:08 -0600
 
 bluecherry (3:3.1.0-rc6) focal bionic buster groovy hirsute bullseye; urgency=low
 

debian/control.in

@@ -26,7 +26,7 @@ Depends: ${shlibs:Depends}, ssl-cert, ucf, curl, sysstat,
  v4l-utils,
  vainfo,
  i965-va-driver,
- python3-pip,
+# 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

misc/postinstall.sh

@@ -79,6 +79,13 @@ function stop_nginx
 	fi
 }
 
+function install_pip
+{
+
+	  wget --output-document=/tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py 
+	  python3 /tmp/get-pip.py
+}
+
 function start_apache
 {
 	if [[ $IN_DEB ]]
@@ -396,11 +403,15 @@ case "$1" in
 		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
+
+# Install pip from bootstrap	
+
+		install_pip
 
 		# Install pip3 dependencies
-		pip3 install --user setuptools_rust certbot certbot-dns-subdomain-provider
-		pip3 install --user --upgrade pip
-		pip3 install --user --upgrade cryptography
+		/usr/local/bin/pip3 install --user setuptools_rust certbot certbot-dns-subdomain-provider
+		/usr/local/bin/pip3 install --user --upgrade pip
+		/usr/local/bin/pip3 install --user --upgrade cryptography
 
 		# Install crontabs for subdomain renewal and SSL renewal using certbot
 		crontab -l 2>/dev/null || true; printf "* * */5 * * certbot renew --config-dir=/usr/share/bluecherry/nginx-includes/letsencrypt/ >/dev/null 2>&1\n*/5 * * * * curl -k https://localhost:7001/subdomainprovidercron >/dev/null 2>&1\n" | crontab -

server/v3license_processor.h

@@ -7,7 +7,7 @@
 #define PRODUCT_DATA "QzU4N0M0RTIyODBBM0MwQTRFQUFCOTE4NEZFOTdFQTE=.SzSitGIsOm3pefjCKHT3D/TjeyRhHp+QkMmazr/Vj741Kkyp8VQ/qERM4IniLJBENBLBqs2W83FYhfu5VNyj1PKsovsuiPc85qaPS8bPafH6SL7hVV2Q9OMNJp0nxBqT/eEkGl0zwsqE5Lv9A7j4HyA1BucL/aCiQNJehnKxrZ4EoYcE6n6j9HlTy94DLfTtyCy63UcSqoWEGUOp9acMYzs9FGSDY0pJVtIRSgu5bT7Cule4HLepvu4qV5TJbJrywJ2S6pXKY1vdtOsCgVLHou4y50Q5lp5AQUQu3uaA1I46rippMoXOR/Nv9TAOWmn6LVc5Yy22GspQ2VOhIBfASK1KLAn+roqmWYQOs7d0vzkroRsHv4aaYa2mStvfRqaVXu7H2O5F7XRR4eaRwmQbXY1vmpK8jCtxWfpZaTWP6Mjopdrmle3if8NygASZWZiFw2XIaq55qyDknX9eGZ/sqGfxHHPRh3KDca3Be99amZT0/SiM3fCL6WAAoObE4uoPfGaNJwUczb8x3iQSJ3sS07cfATw5cPTulNt1rp+4QfaPljzwN0T6WBZe2f3c/krpcHUb5NsnyPizCTveLsOUPlz+k+QyPvQaiBMrzMP5X39Zyw8cA9q8WtIBxcWYpmQSBND5rxcdAZwSCUvUCU8UKcTmu8/qmc23j1qX2MUP1qE2LWwcdaqnN6PmZt3xqTZtHB8qzHDvnOqxevPjev/RcsDZFBIS1/ilPJ4dlTPXwYiZC41QLl/aplQ2IDJCtDileRWcH9XkmOPmtU+ItMMLdM8urKg3lffBccJdYQrqY+Y="
 
 #define PRODUCT_ID "9c5dcb22-b7a8-4f0c-9deb-c5426bfe6ae6"
-#define PRODUCT_VERSION "3.1.0-rc6"
+#define PRODUCT_VERSION "3.1.0-rc7"
 
 #define METADATA_KEY "streams"