[zoneminder] 1.34.23 Release create ssl cert in all cases, not just nginx

commit 5d1140e41526860424d79174c50bf6705e5c24bc Author: Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; Date: Sun Jan 31 16:23:25 2021 -0600 1.34.23 Release create ssl cert in all cases, not just nginx .gitignore | 1 + sources | 2 +- zoneminder.spec | 60 ++++++++++++++++++++++++++++++--------------------------- 3 files changed, 34 insertions(+), 29 deletions(-) --- diff --git a/.gitignore b/.gitignore index c7582f6..99ab99d 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /zoneminder-1.34.20.tar.gz /zoneminder-1.34.21.tar.gz /zoneminder-1.34.22.tar.gz +/zoneminder-1.34.23.tar.gz diff --git a/sources b/sources index 0460e0c..b244df6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (cakephp-enum-behavior-1.0-zm.tar.gz) = 26b4fa4e4b53b6add69df506d68cee06c7c153ddb6facb76ff1156c5f558b9a7704e99b54361771195092ae7ab4f493c24135fa5a3f59fae84b6dc33ff3e0bd1 SHA512 (crud-3.1.0-zm.tar.gz) = 03b641454ad070a729e45f592c6c01bf2c80c53f00e085eb48380ba96e88d8c1410b2a0c58607f85d6536375d789b022b9e6b7de5bda8886ec17c3bdb07a68fc -SHA512 (zoneminder-1.34.22.tar.gz) = 70d4dfc3a9c2d709a452b81cadaf93851f4f93e643cde8812e0d262672507a443f2faa53f6075a188fb9898166bce581f4b41f419b180a28579c9f3104d0137d +SHA512 (zoneminder-1.34.23.tar.gz) = 23921fe3459a8edb8e565305d632c545da0de32fa4b67855719308ee5619262bdbee51187dbae3377aeb12128ac06f0bbbb16f218447d17881aea152787ff7e0 diff --git a/zoneminder.spec b/zoneminder.spec index 8271cad..58a5989 100644 --- a/zoneminder.spec +++ b/zoneminder.spec @@ -28,8 +28,8 @@ %global _hardened_build 1 Name: zoneminder -Version: 1.34.22 -Release: 3%{?dist} +Version: 1.34.23 +Release: 1%{?dist} Summary: A camera monitoring and analysis tool Group: System Environment/Daemons # Mootools is under the MIT license: http://mootools.net/ @@ -264,6 +264,32 @@ fi echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, you must read the README file\nto finish the installation or upgrade!" echo -e "\nThe README file is located here: %{_pkgdocdir}-common/README\n" +# Neither the Apache nor Nginx packages create an SSL certificate anymore, so lets do that here +if [ -f %{sslkey} -o -f %{sslcert} ]; then + exit 0 +fi + +umask 077 +%{_bindir}/openssl genrsa -rand /proc/cpuinfo:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/uptime 2048 > %{sslkey} 2> /dev/null + +FQDN=`hostname` +# A >59 char FQDN means "root@FQDN" exceeds 64-char max length for emailAddress +if [ "x${FQDN}" = "x" -o ${#FQDN} -gt 59 ]; then + FQDN=localhost.localdomain +fi + +cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \ + -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req \ + -out %{sslcert} 2>/dev/null +-- +SomeState +SomeCity +SomeOrganization +SomeOrganizationalUnit +${FQDN} +root@${FQDN} +EOF + %post httpd # For the case of changing from nginx <-> httpd, files in these folders must change ownership if they exist %{_bindir}/chown -R %{zmuid_final}:%{zmgid_final} %{_sharedstatedir}/php/session/* >/dev/null 2>&1 || : @@ -295,32 +321,6 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin %{_bindir}/gpasswd -a nginx video >/dev/null 2>&1 || : %{_bindir}/gpasswd -a nginx dialout >/dev/null 2>&1 || : -# Nginx does not create an SSL certificate like the apache package does so lets do that here -if [ -f %{sslkey} -o -f %{sslcert} ]; then - exit 0 -fi - -umask 077 -%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 2048 > %{sslkey} 2> /dev/null - -FQDN=`hostname` -# A >59 char FQDN means "root@FQDN" exceeds 64-char max length for emailAddress -if [ "x${FQDN}" = "x" -o ${#FQDN} -gt 59 ]; then - FQDN=localhost.localdomain -fi - -cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \ - -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req \ - -out %{sslcert} 2>/dev/null --- -SomeState -SomeCity -SomeOrganization -SomeOrganizationalUnit -${FQDN} -root@${FQDN} -EOF - %preun %systemd_preun %{name}.service @@ -425,6 +425,10 @@ EOF %dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload %changelog +* Sun Jan 31 2020 Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; - 1.34.23-1 +- 1.34.23 Release +- create ssl cert in all cases, not just nginx + * Fri Jan 1 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.34.22-3 - Rebuilt for new ffmpeg snapshot