gentoo auto-resync : 07:05:2024 - 00:00:56

3 files changed, 52 insertions, 3 deletions

diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index 94fb82d21031..97ff734add79 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,4 +1,5 @@
+AUX 0001-fix-broken-function-signatures-for-5-argument-functi.patch 1601 BLAKE2B 2e10e2dd3b031458ac6ae05771a992a7d0f5a786809bdeadd2b16c4968df936f1f7a29123cd2e792ccd31e10896d09a9b1c69ba4d34d672aaf672ff5a381f411 SHA512 9d18d3c4aaaf6ed732503d4e12191019f36e8dd867e5a556908ef33a7134d305fc239617328cafa026d89a35d2cea80d4531ff12b7baaa54cbf2899b95abaad4
 AUX crm114-20100106-fix-makefile.patch 1796 BLAKE2B 370bc77608f77960be4c4ecb88e3729eb62fb9e46e15fcca673ae8f4e4efcaf4425f30cd6beada25d8eb9fdf741dfa449c4e2a5c3ca9d06eab9ea25524e38136 SHA512 3011a85116510fce131bd3c13b5ec1e4faeefdb1eebf114782d417fb9ce8050ce15cae05f8b651728335233641be1e870fe48702fa620b542a8f1c963853b81c
 DIST crm114-20100106-BlameMichelson.src.tar.gz 724672 BLAKE2B ce5c3078030f2c4e78833edfb107d78e134a02c339d28411f2f60d4a67c333904d2ed0cf32a087997a72d961cbc5dabef46fb6c692d99fb509abd4161bd0094b SHA512 bb95fa50d6feef1a127e39e4005c4964b0096c3c7059f63bbf2293042351cf5ceeb7590fd1bedc64291ba556dfba96856dba8554f2f52a6cbaa3ad65012809c6
-EBUILD crm114-20100106-r1.ebuild 1622 BLAKE2B f0590ead962e413258f25ee026422bb11f38da38f125a0df6c3be6b9702260064b90ffba67145ee3558fa69f16b948d204b14e52293cca6003253da0f8b27f92 SHA512 240852e8a29705ad4057cf3ce6566ab0736bebb8f68bb3cadfbe693d6edb39b845d99b83bb7fcb85fc76ec03a5dc9fdf85d09a4deb5d03886b33cadf14c74a1a
+EBUILD crm114-20100106-r2.ebuild 1804 BLAKE2B f59dc03489074c0f977cc762b51dcd9b5ccb9efa82c9628f8cc82a0a2d5c756db6972869625af215432770e3e22788d8cfbc757abc1c8fb1ea5be68f49ae5574 SHA512 1385f67ad31d9c0c493c1d9311feedd5f8e61b11a9c08200cabf1c71517f55308f967551d61db837a2412d27488de140fe5b7e59cf93a174134a092033a07a13
 MISC metadata.xml 574 BLAKE2B 9ae0b84d7b91d7b8ad87452e924538b3e1a2a90ed743bb62dd5e25795bbbce36d6e1034f5f92cac4320e6a19f07d4f98936c1c98ad705215d3f2dc40555c44f5 SHA512 e83f328a8aea7edf064290209aa35f16238cccce2ce5a27710cf4cbd24509ac8b8f11e3d0cb1d7a64ff0aa2e3b124ffa6c820386c3f63823996ae70d9e633ca1
diff --git a/app-text/crm114/crm114-20100106-r1.ebuild b/app-text/crm114/crm114-20100106-r2.ebuild
index 97d0d5c39cc0..a5d4a7b851d4 100644
--- a/app-text/crm114/crm114-20100106-r1.ebuild
+++ b/app-text/crm114/crm114-20100106-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -25,7 +25,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-makefile.patch
+	# https://bugs.gentoo.org/854897
+	# Upstream is dead since 2009 so no point submitting this to them.
+	"${FILESDIR}"/0001-fix-broken-function-signatures-for-5-argument-functi.patch
+)
 
 src_prepare() {
 	default
diff --git a/app-text/crm114/files/0001-fix-broken-function-signatures-for-5-argument-functi.patch b/app-text/crm114/files/0001-fix-broken-function-signatures-for-5-argument-functi.patch
new file mode 100644
index 000000000000..ab2ebcaa368d
--- /dev/null
+++ b/app-text/crm114/files/0001-fix-broken-function-signatures-for-5-argument-functi.patch
@@ -0,0 +1,43 @@
+From c0cb641ec6c1ab960df91c23b726836add0ca3a5 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Mon, 6 May 2024 00:26:18 -0400
+Subject: [PATCH] fix broken function signatures for 5-argument functions
+
+These are always called before exit() so presumably no one noticed that
+these "log error and exit(-1)" functions were prone to "exiting with an
+error" (our new term for "hello how would you like to have some UB").
+
+However, the LTO optimizer noticed what was being done and died in
+painful agony. Bring it back to life and soothe its hurts.
+---
+ crm_util_errorhandlers.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/crm_util_errorhandlers.c b/crm_util_errorhandlers.c
+index 1f64f3c..cba9d89 100644
+--- a/crm_util_errorhandlers.c
++++ b/crm_util_errorhandlers.c
+@@ -23,17 +23,17 @@ long untrappableerror ( char *str1, char *str2)
+   fprintf (stderr, "ERROR: %s%s \n", str1, str2);
+   exit (-1);
+ }
+-long fatalerror5 ( char *str1, char *str2)
++long fatalerror5 ( char *str1, char *str2, char* myfile, char* myfunction, unsigned myline)
+ {
+   fprintf (stderr, "ERROR: %s%s \n", str1, str2);
+   exit (-1);
+ }
+-long nonfatalerror5 ( char *str1, char *str2)
++long nonfatalerror5 ( char *str1, char *str2, char* myfile, char* myfunction, unsigned myline)
+ {
+   fprintf (stderr, "ERROR: %s%s \n", str1, str2);
+   exit (-1);
+ }
+-long untrappableerror5 ( char *str1, char *str2)
++long untrappableerror5 ( char *str1, char *str2, char* myfile, char* myfunction, unsigned myline)
+ {
+   fprintf (stderr, "ERROR: %s%s \n", str1, str2);
+   exit (-1);
+-- 
+2.43.2
+