开源软件构建与测试

Changes of Revision 2

_service:tar_scm:elfutils.spec Changed

@@ -1,15 +1,15 @@
 # -*- rpm-spec from http://elfutils.org/ -*-
 Name: elfutils
 Version: 0.189
-Release: 1
+Release: 3
 Summary: A collection of utilities and DSOs to handle ELF files and DWARF data
 URL: http://elfutils.org/
 License: GPLv3+ and (GPLv2+ or LGPLv3+)
 Source: ftp://sourceware.org/pub/elfutils/%{version}/elfutils-%{version}.tar.bz2
 
 Patch0: Fix-segfault-in-eu-ar-m.patch
-Patch1: Fix-error-of-parsing-object-file-perms.patch
-Patch2: Fix-issue-of-moving-files-by-ar-or-br.patch
+Patch1: Fix-issue-of-moving-files-by-ar-or-br.patch
+Patch2: backport-elfcompress-Don-t-compress-if-section-already-compre.patch
 
 Requires: elfutils-libelf = %{version}-%{release}
 Requires: elfutils-libs = %{version}-%{release}
@@ -325,6 +325,18 @@
 %systemd_postun_with_restart debuginfod.service
 
 %changelog
+* Fri Sep 01 2023 fuanan <fuanan3@h-partners.com> - 0.189-3
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:Remove unnecessary patch because this patch is contained in elfutils-0.189.tar
+
+* Tue Aug 29 2023 zhangruifang <zhangruifang1@h-partners.com> - 0.189-2
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:Don not compress if section already compressed unless forced
+
 * Thu Jul 13 2023 fuanan <fuanan3@h-partners.com> - 0.189-1
 - Type:enhancement
 - CVE:NA

_service:tar_scm:Fix-error-of-parsing-object-file-perms.patch Deleted

@@ -1,46 +0,0 @@
-From 9e18fcfeb2c8ff471c11da58b05215e219be20fd Mon Sep 17 00:00:00 2001
-From: yixiangzhike <yixiangzhike007@163.com>
-Date: Tue, 16 Aug 2022 09:49:35 +0800
-Subject: PATCH fix error of parsing object file perms
-
----
- libelf/elf_begin.c | 20 +++++++++++++++++++-
- 1 file changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c
-index 17d9b1f..581d8ef 100644
---- a/libelf/elf_begin.c
-+++ b/libelf/elf_begin.c
-@@ -997,10 +997,28 @@ __libelf_next_arhdr_wrlock (Elf *elf)
-     }									      \
-   while (0)
- 
-+#define INT_FIELD_HN(FIELD, HN)						      \
-+  do									      \
-+    {									      \
-+      char bufsizeof (ar_hdr->FIELD) + 1;				      \
-+      const char *string = ar_hdr->FIELD;				      \
-+      if (ar_hdr->FIELDsizeof (ar_hdr->FIELD) - 1 != ' ')		      \
-+	{								      \
-+	  *((char *) mempcpy (buf, ar_hdr->FIELD, sizeof (ar_hdr->FIELD)))  \
-+	    = '\0';							      \
-+	  string = buf;							      \
-+	}								      \
-+      if (sizeof (elf_ar_hdr->FIELD) <= sizeof (long int))		      \
-+	elf_ar_hdr->FIELD = (__typeof (elf_ar_hdr->FIELD)) strtol (string, NULL, HN);     \
-+      else								      \
-+	elf_ar_hdr->FIELD = (__typeof (elf_ar_hdr->FIELD)) strtoll (string, NULL, HN);    \
-+    }									      \
-+  while (0)
-+
-   INT_FIELD (ar_date);
-   INT_FIELD (ar_uid);
-   INT_FIELD (ar_gid);
--  OCT_FIELD (ar_mode);
-+  INT_FIELD_HN (ar_mode, 8);
-   INT_FIELD (ar_size);
- 
-   if (elf_ar_hdr->ar_size < 0)
--- 
-2.27.0
-

_service:tar_scm:backport-elfcompress-Don-t-compress-if-section-already-compre.patch Added

@@ -0,0 +1,95 @@
+From 6cad4e56a930034765f8e79ba2eaa2ff1cd8394f Mon Sep 17 00:00:00 2001
+From: Mark Wielaard <mark@klomp.org>
+Date: Sat, 22 Apr 2023 01:45:43 +0200
+Subject: PATCH elfcompress: Don't compress if section already compressed
+ unless forced
+
+Before commit a5b07cdf9 "support ZSTD compression algorithm"
+elfcompress would not try to compress a section if it already
+had the requested compression type (or was already uncompressed)
+unless the --force flag was given. An else if construct was changed
+to an if in the commit causing elfcompress to warn (in verbose mode)
+but then still try to (re)compress the section.
+
+Add an explicit check so if nothing needs (un)compressing, the file
+isn't changed.
+
+The diff looks large, but git diff -b -w is just:
+
++     if (force || type != schtype)
++       {
+          if (shdr->sh_type != SHT_NOBITS
+              && (shdr->sh_flags & SHF_ALLOC) == 0)
+            {
+@@ -554,6 +556,7 @@ process_file (const char *fname)
+              printf ("%zd %s ignoring %s section\n", ndx, sname,
+                      (shdr->sh_type == SHT_NOBITS ? "no bits" : "allocated"));
+        }
++   }
+
+Signed-off-by: Mark Wielaard <mark@klomp.org>
+---
+ src/elfcompress.c | 43 +++++++++++++++++++++++--------------------
+ 1 file changed, 23 insertions(+), 20 deletions(-)
+
+diff --git a/src/elfcompress.c b/src/elfcompress.c
+index 18ade66f..f771b92a 100644
+--- a/src/elfcompress.c
++++ b/src/elfcompress.c
+@@ -529,30 +529,33 @@ process_file (const char *fname)
+ 		  }
+ 	    }
+ 
+-	  if (shdr->sh_type != SHT_NOBITS
+-	      && (shdr->sh_flags & SHF_ALLOC) == 0)
++	  if (force || type != schtype)
+ 	    {
+-	      set_section (sections, ndx);
+-	      /* Check if we might want to change this section name.  */
+-	      if (! adjust_names
+-		  && ((type != ZLIB_GNU
+-		       && startswith (sname, ".zdebug"))
+-		      || (type == ZLIB_GNU
+-			  && startswith (sname, ".debug"))))
+-		adjust_names = true;
+-
+-	      /* We need a buffer this large if we change the names.  */
+-	      if (adjust_names)
++	      if (shdr->sh_type != SHT_NOBITS
++		  && (shdr->sh_flags & SHF_ALLOC) == 0)
+ 		{
+-		  size_t slen = strlen (sname);
+-		  if (slen > maxnamelen)
+-		    maxnamelen = slen;
++		  set_section (sections, ndx);
++		  /* Check if we might want to change this section name.  */
++		  if (! adjust_names
++		      && ((type != ZLIB_GNU
++			   && startswith (sname, ".zdebug"))
++			  || (type == ZLIB_GNU
++			      && startswith (sname, ".debug"))))
++		    adjust_names = true;
++
++		  /* We need a buffer this large if we change the names.  */
++		  if (adjust_names)
++		    {
++		      size_t slen = strlen (sname);
++		      if (slen > maxnamelen)
++			maxnamelen = slen;
++		    }
+ 		}
++	      else
++		if (verbose >= 0)
++		  printf ("%zd %s ignoring %s section\n", ndx, sname,
++			  (shdr->sh_type == SHT_NOBITS ? "no bits" : "allocated"));
+ 	    }
+-	  else
+-	    if (verbose >= 0)
+-	      printf ("%zd %s ignoring %s section\n", ndx, sname,
+-		      (shdr->sh_type == SHT_NOBITS ? "no bits" : "allocated"));
+ 	}
+ 
+       if (shdr->sh_type == SHT_SYMTAB)
+-- 
+2.27.0
+