[zoneminder/el7: 2/2] Merge branch 'master' into el7
by Andrew Bauer
commit 1f5a2bb2f5634244be267705027cd4c9921853bb
Merge: f0bdda5 f4a9e7e
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sun Jan 31 16:40:28 2021 -0600
Merge branch 'master' into el7
zoneminder.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
3 years, 10 months
[zoneminder] 1.34.23 Release create ssl cert in all cases, not just nginx
by Andrew Bauer
commit f4a9e7eb9a6774b908118d753762929c3b26122d
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sun Jan 31 16:25:41 2021 -0600
1.34.23 Release
create ssl cert in all cases, not just nginx
zoneminder.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/zoneminder.spec b/zoneminder.spec
index 58a5989..0a74166 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -425,7 +425,7 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
%dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload
%changelog
-* Sun Jan 31 2020 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.34.23-1
+* Sun Jan 31 2021 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.34.23-1
- 1.34.23 Release
- create ssl cert in all cases, not just nginx
3 years, 10 months
[zoneminder/el7: 4/4] Merge branch 'master' into el7
by Andrew Bauer
commit f0bdda5b3744c88b341aa660d3b6412f407eada5
Merge: 636ed7b 5d1140e
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sun Jan 31 16:24:36 2021 -0600
Merge branch 'master' into el7
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 64 +++++++++++++++++++++++++++++++++------------------------
3 files changed, 39 insertions(+), 28 deletions(-)
---
3 years, 10 months
[zoneminder/el7] (4 commits) ...Merge branch 'master' into el7
by Andrew Bauer
Summary of changes:
5259a4b... Mass rebuild for x264-0.161 (*)
6386b98... Rebuilt for new ffmpeg snapshot (*)
5d1140e... 1.34.23 Release create ssl cert in all cases, not just ngin (*)
f0bdda5... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
3 years, 10 months