summaryrefslogtreecommitdiffstats
path: root/source/d/binutils/patches/binutils-filename-in-error-messages.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-08-29 18:23:50 +0000
committer Eric Hameleers <alien@slackware.com>2021-08-30 08:59:55 +0200
commit34ba4d05d9d2b7f5d72aded4eb35aa617cb8629d (patch)
treefd24e6dc296552ed8ce520e595a71eea78e88e9c /source/d/binutils/patches/binutils-filename-in-error-messages.patch
parenta685863802fc9764aefd5b07106f3e3e54b210a3 (diff)
downloadcurrent-34ba4d05d9d2b7f5d72aded4eb35aa617cb8629d.tar.gz
current-34ba4d05d9d2b7f5d72aded4eb35aa617cb8629d.tar.xz
Sun Aug 29 18:23:50 UTC 202120210829182350
ap/man-pages-5.13-noarch-1.txz: Upgraded. d/binutils-2.37-x86_64-1.txz: Upgraded. With a few upstream patches to fix some regressions in the release, we no longer get any new FTBFS with this, so we'll take it. d/oprofile-1.4.0-x86_64-8.txz: Rebuilt. Recompiled against binutils-2.37. kde/sddm-0.19.0-x86_64-8.txz: Rebuilt. Patched to fix build. l/libcap-2.54-x86_64-1.txz: Upgraded. l/libssh-0.9.6-x86_64-1.txz: Upgraded. Fix possible heap-buffer overflow when rekeying with different key exchange mechanism. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3634 (* Security fix *) l/qt5-5.15.3_20210826_21ea9c12-x86_64-1.txz: Upgraded. Switched to the patched qt5 from https://invent.kde.org/qt/qt/qt5.git. Huge thanks to Heinz Wiesinger for the script to create a release tarball. Likely this fixes many security issues. (* Security fix *) x/libglvnd-1.3.3-x86_64-1.txz: Upgraded. Reverted to this version because changes to the header files won't allow the EGL portions of Qt to properly compile.
Diffstat (limited to 'source/d/binutils/patches/binutils-filename-in-error-messages.patch')
-rw-r--r--source/d/binutils/patches/binutils-filename-in-error-messages.patch134
1 files changed, 134 insertions, 0 deletions
diff --git a/source/d/binutils/patches/binutils-filename-in-error-messages.patch b/source/d/binutils/patches/binutils-filename-in-error-messages.patch
new file mode 100644
index 000000000..e23d3ecca
--- /dev/null
+++ b/source/d/binutils/patches/binutils-filename-in-error-messages.patch
@@ -0,0 +1,134 @@
+--- binutils.orig/binutils/readelf.c 2021-07-19 12:39:14.206556025 +0100
++++ binutils-2.37/binutils/readelf.c 2021-07-19 12:44:37.712728732 +0100
+@@ -21873,45 +21873,52 @@ process_file (char * file_name)
+ struct stat statbuf;
+ char armag[SARMAG];
+ bool ret = true;
++ char * name;
++ char * saved_program_name;
++
++ /* Overload program_name to include file_name. Doing this means
++ that warning/error messages will positively identify the file
++ concerned even when multiple instances of readelf are running. */
++ name = xmalloc (strlen (program_name) + strlen (file_name) + 3);
++ sprintf (name, "%s: %s", program_name, file_name);
++ saved_program_name = program_name;
++ program_name = name;
+
+ if (stat (file_name, &statbuf) < 0)
+ {
+ if (errno == ENOENT)
+- error (_("'%s': No such file\n"), file_name);
++ error (_("No such file\n"));
+ else
+- error (_("Could not locate '%s'. System error message: %s\n"),
+- file_name, strerror (errno));
+- return false;
++ error (_("Could not locate file. System error message: %s\n"),
++ strerror (errno));
++ goto done;
+ }
+
+ if (! S_ISREG (statbuf.st_mode))
+ {
+- error (_("'%s' is not an ordinary file\n"), file_name);
+- return false;
++ error (_("Not an ordinary file\n"));
++ goto done;
+ }
+
+ filedata = calloc (1, sizeof * filedata);
+ if (filedata == NULL)
+ {
+ error (_("Out of memory allocating file data structure\n"));
+- return false;
++ goto done;
+ }
+
+ filedata->file_name = file_name;
+ filedata->handle = fopen (file_name, "rb");
+ if (filedata->handle == NULL)
+ {
+- error (_("Input file '%s' is not readable.\n"), file_name);
+- free (filedata);
+- return false;
++ error (_("Not readable\n"));
++ goto done;
+ }
+
+ if (fread (armag, SARMAG, 1, filedata->handle) != 1)
+ {
+- error (_("%s: Failed to read file's magic number\n"), file_name);
+- fclose (filedata->handle);
+- free (filedata);
+- return false;
++ error (_("Failed to read file's magic number\n"));
++ goto done;
+ }
+
+ filedata->file_size = (bfd_size_type) statbuf.st_size;
+@@ -21919,33 +21926,39 @@ process_file (char * file_name)
+
+ if (memcmp (armag, ARMAG, SARMAG) == 0)
+ {
+- if (! process_archive (filedata, false))
+- ret = false;
++ if (process_archive (filedata, false))
++ ret = true;
+ }
+ else if (memcmp (armag, ARMAGT, SARMAG) == 0)
+ {
+- if ( ! process_archive (filedata, true))
+- ret = false;
++ if (process_archive (filedata, true))
++ ret = true;
+ }
+ else
+ {
+ if (do_archive_index && !check_all)
+- error (_("File %s is not an archive so its index cannot be displayed.\n"),
+- file_name);
++ error (_("Not an archive so its index cannot be displayed.\n"));
+
+ rewind (filedata->handle);
+ filedata->archive_file_size = filedata->archive_file_offset = 0;
+
+- if (! process_object (filedata))
+- ret = false;
++ if (process_object (filedata))
++ ret = true;
+ }
+
+- fclose (filedata->handle);
+- free (filedata->section_headers);
+- free (filedata->program_headers);
+- free (filedata->string_table);
+- free (filedata->dump.dump_sects);
+- free (filedata);
++ done:
++ if (filedata)
++ {
++ if (filedata->handle != NULL)
++ fclose (filedata->handle);
++ free (filedata->section_headers);
++ free (filedata->program_headers);
++ free (filedata->string_table);
++ free (filedata->dump.dump_sects);
++ free (filedata);
++ }
++ free (program_name);
++ program_name = saved_program_name;
+
+ free (ba_cache.strtab);
+ ba_cache.strtab = NULL;
+--- binutils.orig/binutils/readelf.c 2021-08-10 10:15:22.088016072 +0100
++++ binutils-2.37/binutils/readelf.c 2021-08-10 10:15:55.567907891 +0100
+@@ -21884,7 +21884,7 @@ process_file (char * file_name)
+ Filedata * filedata = NULL;
+ struct stat statbuf;
+ char armag[SARMAG];
+- bool ret = true;
++ bool ret = false;
+ char * name;
+ char * saved_program_name;
+