From 5cccb820336188120550d1205c82e6c06b4bebdc Mon Sep 17 00:00:00 2001 From: Andriy Utkin Date: Wed, 11 Dec 2024 18:24:43 +0000 Subject: [PATCH 1/5] Update changelog for 3.1.8 --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index c1c073fa..3a2e7b87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +bluecherry (3:3.1.8) bookworm bullseye buster focal jammy mantic noble; urgency=low + + * FIX: Improve timestamps handling at recording muxing (https://github.com/bluecherrydvr/bluecherry-apps/pull/714) + * FIX: Fix crash related to motion processor (https://github.com/bluecherrydvr/bluecherry-apps/pull/715) + * FIX: Orderly shutdown (https://github.com/bluecherrydvr/bluecherry-apps/pull/716) + * FIX: Misc (https://github.com/bluecherrydvr/bluecherry-apps/pull/717) + + -- Andriy Utkin Wed, 11 Dec 2024 18:30:00 +0000 + bluecherry (3:3.1.7) bookworm bullseye buster focal jammy mantic noble; urgency=low * FIX: handling of special characters in RTSP credentials (https://github.com/bluecherrydvr/bluecherry-apps/pull/711) From a81fd1d3dacd03d7808bc8ac70444c6854786e26 Mon Sep 17 00:00:00 2001 From: Andriy Utkin Date: Wed, 11 Dec 2024 18:13:39 +0000 Subject: [PATCH 2/5] misc/postinstall.sh: enable bash strict mode --- misc/postinstall.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/postinstall.sh b/misc/postinstall.sh index de52d762..3bd6bada 100755 --- a/misc/postinstall.sh +++ b/misc/postinstall.sh @@ -4,6 +4,7 @@ # This file is common for debian and centos (called at package postinstall stage) set -x # trace +set -euo pipefail for x in /etc/*-release do From 03a70d2140985cb90285c6ed143bed8d74e2b8e4 Mon Sep 17 00:00:00 2001 From: Andriy Utkin Date: Thu, 12 Dec 2024 12:26:11 +0000 Subject: [PATCH 3/5] installer: directly create sources.list file for ondrej ppa On Mint Victoria add-apt-repository sets up an entry in a way which doesn't work. # apt update ... Get:12 https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy InRelease [24.6 kB] Err:12 https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy InRelease The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 71DAEAAB4AD4CAB6 NO_PUBKEY 4F4EA0AAE5267A6C Reading package lists... Done W: GPG error: https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 71DAEAAB4AD4CAB6 NO_PUBKEY 4F4EA0AAE5267A6C E: The repository 'https://ppa.launchpadcontent.net/ondrej/php/ubuntu jammy InRelease' is not signed. N: Updating from such a repository can't be done securely, and is therefore disabled by default. N: See apt-secure(8) manpage for repository creation and user configuration details. root@mint-victoria-p:~# echo $? 100 --- installer/v3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/v3.sh b/installer/v3.sh index 5d16dd12..a87c35f7 100644 --- a/installer/v3.sh +++ b/installer/v3.sh @@ -38,7 +38,7 @@ jammy_install() VERSION_CODENAME=jammy # don't say "vera" for Linux Mint at this point : "${SRCLIST_URL:=https://dl.bluecherrydvr.com/sources.list.d/bluecherry-"$VERSION_CODENAME".list}" wget --output-document=/etc/apt/sources.list.d/bluecherry-"$VERSION_CODENAME".list "$SRCLIST_URL" - add-apt-repository ppa:ondrej/php -y + echo "deb [trusted=yes] https://ppa.launchpadcontent.net/ondrej/php/ubuntu/ jammy main" > /etc/apt/sources.list.d/ondrej-ubuntu-php-jammy.list apt -y update apt -y install php7.4-fpm php7.4-sqlite3 php7.4-curl php7.4-mysql php7.4-gd php-mail php-mail-mime php-mysql php7.4-fpm php7.4-mysql apt -y install bluecherry From 8360ee9e434e31467c6556ff388de173fc6ddeab Mon Sep 17 00:00:00 2001 From: Andriy Utkin Date: Thu, 12 Dec 2024 13:56:09 +0000 Subject: [PATCH 4/5] Fix setting SIG_IGN handler for SIGCHLD, SIGPIPE Caught thanks to Ubuntu 24.10 giving compilation error: ccache gcc -std=c99 -Wall -g3 -ggdb -O3 -isystem /build/source/stage/include -iquote /build/source/lib -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -I /usr/include/opencv4 -pthread -MMD -DV3_LICENSING -I//build/source/server/lexapi -DBC_VERSION='"3.1.8"' -Wdate-time -D_FORTIFY_SOURCE=3 -c -o signals.o signals.c signals.c: In function 'signals_setup': signals.c:61:25: error: assignment to 'void (*)(int, siginfo_t *, void *)' from incompatible pointer type 'void (*)(int)' [-Wincompatible-pointer-types] 61 | sa.sa_sigaction = SIG_IGN; | ^ make[2]: *** [: signals.o] Error 1 --- server/signals.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/signals.c b/server/signals.c index 64ee60db..7a5ee28e 100644 --- a/server/signals.c +++ b/server/signals.c @@ -58,7 +58,9 @@ void signals_setup() } // these signals are ignored: - sa.sa_sigaction = SIG_IGN; + memset(&sa, 0, sizeof(sa)); + sa.sa_flags = SA_NOCLDWAIT; + sa.sa_handler = SIG_IGN; ret = sigaction(SIGCHLD, &sa, NULL); assert(!ret); ret = sigaction(SIGPIPE, &sa, NULL); From 83b069731f1fdbfca248ef9c3c814564c06e43b4 Mon Sep 17 00:00:00 2001 From: Andriy Utkin Date: Thu, 12 Dec 2024 14:34:20 +0000 Subject: [PATCH 5/5] installer: add support for 24.10, drop 23.10 --- installer/v3.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/installer/v3.sh b/installer/v3.sh index a87c35f7..c61955f5 100644 --- a/installer/v3.sh +++ b/installer/v3.sh @@ -62,6 +62,7 @@ mantic_install() } # Ubuntu 24.04 +# Ubuntu 24.10 noble_install() { mantic_install @@ -128,10 +129,15 @@ check_distro() } check_distro +if [[ "$ID" == "ubuntu" && "$VERSION_ID" == "23.10" && "$VERSION_CODENAME" == "mantic" ]]; then + echo "This distribution release has reached its End Of Life and is not supported anymore. All users should upgrade." + exit 1 +fi + if [[ "$ID" == "ubuntu" && "$VERSION_ID" == "20.04" && "$VERSION_CODENAME" == "focal" ]]; then focal_install; elif [[ "$ID" == "ubuntu" && "$VERSION_ID" == "22.04" && "$VERSION_CODENAME" == "jammy" ]]; then jammy_install; -elif [[ "$ID" == "ubuntu" && "$VERSION_ID" == "23.10" && "$VERSION_CODENAME" == "mantic" ]]; then mantic_install; elif [[ "$ID" == "ubuntu" && "$VERSION_ID" == "24.04" && "$VERSION_CODENAME" == "noble" ]]; then noble_install; +elif [[ "$ID" == "ubuntu" && "$VERSION_ID" == "24.10" && "$VERSION_CODENAME" == "oracular" ]]; then noble_install; elif [[ "$ID" == "debian" && "$VERSION_ID" == "10" && "$VERSION_CODENAME" == "buster" ]]; then buster_install; elif [[ "$ID" == "debian" && "$VERSION_ID" == "11" && "$VERSION_CODENAME" == "bullseye" ]]; then bullseye_install; elif [[ "$ID" == "debian" && "$VERSION_ID" == "12" && "$VERSION_CODENAME" == "bookworm" ]]; then bookworm_install; @@ -139,5 +145,6 @@ elif [[ "$ID" == "linuxmint" && "$VERSION_ID" == "21.1" && "$VERSION_CODENAME" = elif [[ "$ID" == "linuxmint" && "$VERSION_ID" == "21.2" && "$VERSION_CODENAME" == "victoria" ]]; then jammy_install; # based on Ubuntu 22.04 Jammy elif [[ "$ID" == "linuxmint" && "$VERSION_ID" == "21.3" && "$VERSION_CODENAME" == "virginia" ]]; then jammy_install; # based on Ubuntu 22.04 Jammy else - echo "Currently we only support Ubuntu 20.04 (Focal), Ubuntu 22.04 (Jammy), Ubuntu 23.10 (Mantic), Ubuntu 24.04 (Noble) and Debian 10 (Buster), 11 (Bullseye), 12 (Bookworm), Linux Mint 21.1 (Vera), 21.2 (Victoria), 21.3 (Virginia) for unstable testing" + echo "Currently we only support up to date Ubuntu, Debian and Mint Linux distributions." + exit 1 fi