[zsnes] Again fix SIGABRT with FORTIFY_SOURCE
by Mamoru Tasaka
commit f48ed526b587320cab8e1b3a30168ab64cd65e9f
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Sat Aug 17 12:36:22 2024 +0900
Again fix SIGABRT with FORTIFY_SOURCE
zsnes-1.51-FORTIFY_SOURCE_4.patch | 57 +++++++++++++++++++++++++++++++++++++++
zsnes.spec | 8 +++++-
2 files changed, 64 insertions(+), 1 deletion(-)
---
diff --git a/zsnes-1.51-FORTIFY_SOURCE_4.patch b/zsnes-1.51-FORTIFY_SOURCE_4.patch
new file mode 100644
index 0000000..e9d09fc
--- /dev/null
+++ b/zsnes-1.51-FORTIFY_SOURCE_4.patch
@@ -0,0 +1,57 @@
+From dd0c1da2f2d8bc5df11cc9b443bf3e7c79926ac7 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
+Date: Sat, 17 Aug 2024 12:31:15 +0900
+Subject: [PATCH] Fix the size of pal16bxcl
+
+With Fedora 41, zsnes again causes SIGABRT with FORTIFY_SOURCE
+as:
+
+```
+*** buffer overflow detected ***: terminated
+
+Program received signal SIGABRT, Aborted.
+gdb) bt
+#0 0xf7fc5589 in __kernel_vsyscall ()
+#1 0xf7930ecf in __pthread_kill_implementation () from /lib/libc.so.6
+#2 0xf78d7061 in raise () from /lib/libc.so.6
+#3 0xf78be298 in abort () from /lib/libc.so.6
+#4 0xf78bf2de in __libc_message_impl.cold () from /lib/libc.so.6
+#5 0xf79c414f in __fortify_fail () from /lib/libc.so.6
+#6 0xf79c3b7b in __chk_fail () from /lib/libc.so.6
+#7 0x5656248d in memset (__dest=0x569a8eb0, __ch=255, __len=2) at /usr/include/bits/string_fortified.h:59
+#8 clearmem () at initc.c:1460
+#9 0x5655e0ec in init[rbackupl] () at init.asm:119
+#10 0xf7ffcb60 in ?? () from /lib/ld-linux.so.2
+#11 0xf78bfd43 in __libc_start_call_main () from /lib/libc.so.6
+#12 0xcae6f600 in ?? ()
+(gdb) up 8
+#8 clearmem () at initc.c:1460
+1460 memset(pal16bxcl+i, 255, 2);
+```
+
+This is because gcc/glibc sees that pal16bxcl[] has the size of
+1024, and clearmem() function exceeds this size.
+endmem.asm declares pal16bxcl as "resd 256", which has actually
+256*4 = 1024 bytes.
+
+Correctly declare the size of pal16bxcl.
+---
+ src/initc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/initc.c b/src/initc.c
+index a1c80bc..568ec9b 100644
+--- a/src/initc.c
++++ b/src/initc.c
+@@ -1389,7 +1389,7 @@ extern unsigned char vidmemch8[4096];
+ extern unsigned char pal16b[1024];
+ extern unsigned char pal16bcl[1024];
+ extern unsigned char pal16bclha[1024];
+-extern unsigned char pal16bxcl[256];
++extern unsigned char pal16bxcl[1024];
+ extern unsigned char SPCRAM[];
+
+ extern unsigned char *sram;
+--
+2.46.0
+
diff --git a/zsnes.spec b/zsnes.spec
index c4aa658..175b8bc 100644
--- a/zsnes.spec
+++ b/zsnes.spec
@@ -4,7 +4,7 @@
Summary: A Super Nintendo emulator
Name: zsnes
Version: 1.51
-Release: 40%{?dist}
+Release: 41%{?dist}
License: GPLv2
URL: http://www.zsnes.com/
Source: http://dl.sf.net/%{name}/%{name}%{pkgversion}src.tar.bz2
@@ -41,6 +41,8 @@ Patch11: zsnes-1.51-gcc10.patch
Patch12: zsnes-1.51-FORTIFY_SOURCE_2.patch
# Again FORTIFY_SOURCE, this time with LTO
Patch13: zsnes-1.51-FORTIFY_SOURCE_3.patch
+# Again FORTIFY_SOURCE, for pal16bxcl
+Patch14: zsnes-1.51-FORTIFY_SOURCE_4.patch
# This is to build only for ix86 on plague
#ExclusiveArch: %{ix86}
@@ -82,6 +84,7 @@ and to save the game state, even network play is possible.
%patch -P11 -p1
%patch -P12 -p2
%patch -P13 -p2
+%patch -P14 -p2
# Remove hardcoded CFLAGS and LDFLAGS
sed -i \
@@ -156,6 +159,9 @@ done
%changelog
+* Sat Aug 17 2024 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 1.51-41
+- Again fix SIGABRT with FORTIFY_SOURCE
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.51-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
3 months, 1 week
[vdr-markad/f40] Update to 4.1.2
by Martin Gansser
commit 19d3fc85802c80f29fd36fae3f7e6c06483530f3
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Fri Aug 16 18:36:34 2024 +0200
Update to 4.1.2
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2e2260b..88358ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,3 +101,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-4.0.4.tar.gz
/vdr-markad-4.1.0.tar.gz
/vdr-markad-4.1.1.tar.gz
+/vdr-markad-4.1.2.tar.gz
diff --git a/sources b/sources
index 570b1fb..2c7c595 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-4.1.1.tar.gz) = 41ba9a63327d9d79a404fb2676de4725974b2b71242bb2dbbd797579eeb337105734bcb991f43a0e740d14d2ded7f86e4d03b6ca6a5c1317d335f14c0062036d
+SHA512 (vdr-markad-4.1.2.tar.gz) = d5c55c7ec66aa97f352c0462fdb28ca2874b3007ac33d393f8d94c91e8bbc7de3c215dacc15ed3178b27a483391eba1f765d2dd86e230b912eea51fac3c65558
diff --git a/vdr-markad.spec b/vdr-markad.spec
index 7f19ccd..9be173f 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -5,7 +5,7 @@
%endif
Name: vdr-markad
-Version: 4.1.1
+Version: 4.1.2
Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
@@ -72,6 +72,9 @@ fi
%doc html
%changelog
+* Fri Aug 16 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 4.1.2-1
+- Update to 4.1.2
+
* Tue Aug 13 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 4.1.1-1
- Update to 4.1.1
3 months, 1 week
[vdr-markad] Update to 4.1.2
by Martin Gansser
commit 6ecf32460066b83b3bde30ea495f3e3f8f6adaaa
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Fri Aug 16 18:34:35 2024 +0200
Update to 4.1.2
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 78c685c..54ff7b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-4.0.4.tar.gz
/vdr-markad-4.1.0.tar.gz
/vdr-markad-4.1.1.tar.gz
+/vdr-markad-4.1.2.tar.gz
diff --git a/sources b/sources
index 570b1fb..2c7c595 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-4.1.1.tar.gz) = 41ba9a63327d9d79a404fb2676de4725974b2b71242bb2dbbd797579eeb337105734bcb991f43a0e740d14d2ded7f86e4d03b6ca6a5c1317d335f14c0062036d
+SHA512 (vdr-markad-4.1.2.tar.gz) = d5c55c7ec66aa97f352c0462fdb28ca2874b3007ac33d393f8d94c91e8bbc7de3c215dacc15ed3178b27a483391eba1f765d2dd86e230b912eea51fac3c65558
diff --git a/vdr-markad.spec b/vdr-markad.spec
index 7f19ccd..9be173f 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -5,7 +5,7 @@
%endif
Name: vdr-markad
-Version: 4.1.1
+Version: 4.1.2
Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
@@ -72,6 +72,9 @@ fi
%doc html
%changelog
+* Fri Aug 16 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 4.1.2-1
+- Update to 4.1.2
+
* Tue Aug 13 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 4.1.1-1
- Update to 4.1.1
3 months, 1 week
[zoneminder] 1.36.34 release
by Andrew Bauer
commit 86a88529c5957ffacb7d7b59137f01da36e3ad26
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Fri Aug 16 07:58:13 2024 -0500
1.36.34 release
remove el7 support
.gitignore | 2 ++
sources | 4 ++--
zoneminder.spec | 39 ++++++++++++---------------------------
3 files changed, 16 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4fbad71..15f52af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,5 @@
/zoneminder-1.36.31.tar.gz
/zoneminder-1.36.32.tar.gz
/zoneminder-1.36.33.tar.gz
+/RtspServer-055d81fe1293429e496b19104a9ed3360755a440.tar.gz
+/zoneminder-1.36.34.tar.gz
diff --git a/sources b/sources
index daeca15..25af4b3 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (cakephp-enum-behavior-1.0-zm.tar.gz) = 26b4fa4e4b53b6add69df506d68cee06c7c153ddb6facb76ff1156c5f558b9a7704e99b54361771195092ae7ab4f493c24135fa5a3f59fae84b6dc33ff3e0bd1
SHA512 (crud-3.2.0.tar.gz) = 57e80ced18ab0810941bae43790ba67e399e1299e3c56d3785247195883640ef4e89d1cf0c67f1886cd3ed8f858e88f6af8632b181ce0912dd92c78c53757748
-SHA512 (RtspServer-eab32851421ffe54fec0229c3efc44c642bc8d46.tar.gz) = 245012f634b6039f819ac2fb512313797dd514e160a9d0dbfd7e03e8d957b73846746ce5b5575341628a3e7aac0085891f01bb1d0e709b804ffaf27541e76f53
-SHA512 (zoneminder-1.36.33.tar.gz) = 7afd25d3fa5dd170bad552332dab5425b664e41d430f1514f2b038ec7391dae6fab165050b541cad50a6904341f77605fde845cc02e4d7ee10f42650cb9e8707
+SHA512 (RtspServer-055d81fe1293429e496b19104a9ed3360755a440.tar.gz) = 2f3bbd449269cba5afda3135e54cca114342956da3ce8fbfb05533ec7b1c3f75767d8b5f3d9b415254ad7b39817bc343b0790c591ef3cc64d2863819ab3a7551
+SHA512 (zoneminder-1.36.34.tar.gz) = f1428505ed2924f6e2e58d37b10e2028347e6c6ee99692b7c014b4d54660b7f6df719c1bef2028a185b3854c548eeb984b97df6242017091451792cc57c2ccff
diff --git a/zoneminder.spec b/zoneminder.spec
index 61b61bd..5a107a7 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -9,7 +9,7 @@
%global ceb_version 1.0-zm
# RtspServer is configured as a git submodule
-%global rtspserver_commit eab32851421ffe54fec0229c3efc44c642bc8d46
+%global rtspserver_commit 055d81fe1293429e496b19104a9ed3360755a440
%global sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
%global sslkey %{_sysconfdir}/pki/tls/private/localhost.key
@@ -17,29 +17,9 @@
# This will tell zoneminder's cmake process we are building against a known distro
%global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
-# Newer php's keep json functions in a subpackage
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%global with_php_json 1
-%endif
-
-# el7 uses cmake3 package and macros
-%if 0%{?rhel} == 7
-%global cmake %{cmake3}
-%global cmake_build %{cmake3_build}
-%global cmake_install %{cmake3_install}
-%global cmake_pkg_name cmake3
-%global mariadevel mariadb-devel
-%else
-%global cmake_pkg_name cmake
-%global mariadevel mariadb-connector-c-devel
-%endif
-
-# The default for everything but el7 these days
-%global _hardened_build 1
-
Name: zoneminder
-Version: 1.36.33
-Release: 7%{?dist}
+Version: 1.36.34
+Release: 1%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
# jQuery is under the MIT license: https://jquery.org/license/
@@ -60,10 +40,10 @@ Source3: https://github.com/ZoneMinder/RtspServer/archive/%{rtspserver_commit}.t
%{?rhel:BuildRequires: epel-rpm-macros}
BuildRequires: systemd-devel
-BuildRequires: %{mariadevel}
+BuildRequires: mariadb-devel
BuildRequires: perl-podlators
BuildRequires: polkit-devel
-BuildRequires: %{cmake_pkg_name}
+BuildRequires: cmake
BuildRequires: gnutls-devel
BuildRequires: bzip2-devel
BuildRequires: pcre-devel
@@ -124,7 +104,7 @@ Requires: php-common
Requires: php-gd
Requires: php-intl
Requires: php-process
-%{?with_php_json:Requires: php-json}
+Requires: php-json
Requires: cambozola
Requires: php-pecl-apcu
Requires: net-tools
@@ -228,7 +208,8 @@ mv -f RtspServer-%{rtspserver_commit} ./dep/RtspServer
%cmake \
-DZM_WEB_USER="%{zmuid_final}" \
-DZM_WEB_GROUP="%{zmgid_final}" \
- -DZM_TARGET_DISTRO="%{zmtargetdistro}"
+ -DZM_TARGET_DISTRO="%{zmtargetdistro}" \
+ .
%cmake_build
@@ -433,6 +414,10 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
%dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
%changelog
+* Fri Aug 16 2024 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.34-1
+- 1.36.34 release
+- remove el7 support
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.36.33-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
3 months, 1 week
[ffmpeg/f39: 2/2] Merge branch 'f40' into f39
by Leigh Scott
commit f4192559fe25585405e3c7646060b4b3d83da2ec
Merge: 91437b6 983b080
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Aug 16 09:45:44 2024 +0100
Merge branch 'f40' into f39
backport_hevecdec_fix.patch | 24 ++++++++++++++++++++++++
ffmpeg.spec | 6 +++++-
2 files changed, 29 insertions(+), 1 deletion(-)
---
3 months, 1 week
