Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More enhancements for 3.1.8 #718

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> 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)
Expand Down
13 changes: 10 additions & 3 deletions installer/v3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -62,6 +62,7 @@ mantic_install()
}

# Ubuntu 24.04
# Ubuntu 24.10
noble_install()
{
mantic_install
Expand Down Expand Up @@ -128,16 +129,22 @@ 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;
elif [[ "$ID" == "linuxmint" && "$VERSION_ID" == "21.1" && "$VERSION_CODENAME" == "vera" ]]; then jammy_install; # based on Ubuntu 22.04 Jammy
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
1 change: 1 addition & 0 deletions misc/postinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion server/signals.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down