[packages/elfutils] - rediffed

[hawk]

commit 8c7040e4c3ab08b2884a41611beb7b15c6de4ce3
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Wed May 5 21:02:55 2021 +0200

    - rediffed

 elfutils-paxflags.patch | 51 ++++++++++++++++++++++++++-----------------------
 x32.patch               | 17 +++++++++--------
 2 files changed, 36 insertions(+), 32 deletions(-)
---
diff --git a/elfutils-paxflags.patch b/elfutils-paxflags.patch
index de557f2..c2e17fa 100644
--- a/elfutils-paxflags.patch
+++ b/elfutils-paxflags.patch
@@ -1,27 +1,7 @@
---- elfutils-0.179/src/elflint.c.orig	2020-04-30 19:57:32.691481687 +0200
-+++ elfutils-0.179/src/elflint.c	2020-04-30 19:58:43.287765900 +0200
-@@ -4493,7 +4493,7 @@
- 
-       if (phdr->p_type >= PT_NUM && phdr->p_type != PT_GNU_EH_FRAME
- 	  && phdr->p_type != PT_GNU_STACK && phdr->p_type != PT_GNU_RELRO
--	  && phdr->p_type != PT_GNU_PROPERTY
-+	  && phdr->p_type != PT_GNU_PROPERTY && phdr->p_type != PT_PAX_FLAGS
- 	  /* Check for a known machine-specific type.  */
- 	  && ebl_segment_type_name (ebl, phdr->p_type, NULL, 0) == NULL)
- 	ERROR (gettext ("\
---- elfutils-0.181/libelf/elf.h.orig	2020-10-16 19:17:55.185201231 +0200
-+++ elfutils-0.181/libelf/elf.h	2020-10-16 19:19:57.797870314 +0200
-@@ -722,6 +722,7 @@
- #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
- #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
- #define PT_GNU_PROPERTY	0x6474e553	/* GNU property */
-+#define PT_PAX_FLAGS	0x65041580	/* PaX flags */
- #define PT_LOSUNW	0x6ffffffa
- #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
- #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
---- elfutils-0.179/libebl/eblsegmenttypename.c.orig	2020-04-30 19:57:32.728148155 +0200
-+++ elfutils-0.179/libebl/eblsegmenttypename.c	2020-04-30 19:59:30.120845517 +0200
-@@ -71,6 +71,8 @@
+diff -urNp -x '*.orig' elfutils-0.183.org/libebl/eblsegmenttypename.c elfutils-0.183/libebl/eblsegmenttypename.c
+--- elfutils-0.183.org/libebl/eblsegmenttypename.c	2021-02-07 18:54:39.000000000 +0100
++++ elfutils-0.183/libebl/eblsegmenttypename.c	2021-05-05 21:02:25.910006052 +0200
+@@ -67,6 +67,8 @@ ebl_segment_type_name (Ebl *ebl, int seg
  	res = "GNU_RELRO";
        else if (segment == PT_GNU_PROPERTY)
  	res = "GNU_PROPERTY";
@@ -30,3 +10,26 @@
        else if (segment == PT_SUNWBSS)
  	res = "SUNWBSS";
        else if (segment == PT_SUNWSTACK)
+diff -urNp -x '*.orig' elfutils-0.183.org/libelf/elf.h elfutils-0.183/libelf/elf.h
+--- elfutils-0.183.org/libelf/elf.h	2021-02-07 18:54:39.000000000 +0100
++++ elfutils-0.183/libelf/elf.h	2021-05-05 21:02:25.910006052 +0200
+@@ -719,6 +719,7 @@ typedef struct
+ #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
+ #define PT_GNU_RELRO	0x6474e552	/* Read-only after relocation */
+ #define PT_GNU_PROPERTY	0x6474e553	/* GNU property */
++#define PT_PAX_FLAGS	0x65041580	/* PaX flags */
+ #define PT_LOSUNW	0x6ffffffa
+ #define PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
+ #define PT_SUNWSTACK	0x6ffffffb	/* Stack segment */
+diff -urNp -x '*.orig' elfutils-0.183.org/src/elflint.c elfutils-0.183/src/elflint.c
+--- elfutils-0.183.org/src/elflint.c	2021-02-07 18:54:39.000000000 +0100
++++ elfutils-0.183/src/elflint.c	2021-05-05 21:02:25.909005552 +0200
+@@ -4510,7 +4510,7 @@ only executables, shared objects, and co
+ 
+       if (phdr->p_type >= PT_NUM && phdr->p_type != PT_GNU_EH_FRAME
+ 	  && phdr->p_type != PT_GNU_STACK && phdr->p_type != PT_GNU_RELRO
+-	  && phdr->p_type != PT_GNU_PROPERTY
++	  && phdr->p_type != PT_GNU_PROPERTY && phdr->p_type != PT_PAX_FLAGS
+ 	  /* Check for a known machine-specific type.  */
+ 	  && ebl_segment_type_name (ebl, phdr->p_type, NULL, 0) == NULL)
+ 	ERROR (_("\
diff --git a/x32.patch b/x32.patch
index 7212b9e..4ad8fce 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,6 +1,7 @@
---- elfutils-0.181/debuginfod/debuginfod-client.c.orig	2020-09-08 13:45:06.000000000 +0200
-+++ elfutils-0.181/debuginfod/debuginfod-client.c	2020-10-16 19:21:30.944032365 +0200
-@@ -222,7 +222,11 @@
+diff -urNp -x '*.orig' elfutils-0.183.org/debuginfod/debuginfod-client.c elfutils-0.183/debuginfod/debuginfod-client.c
+--- elfutils-0.183.org/debuginfod/debuginfod-client.c	2021-02-07 18:54:39.000000000 +0100
++++ elfutils-0.183/debuginfod/debuginfod-client.c	2021-05-05 21:02:38.910503052 +0200
+@@ -229,7 +229,11 @@ debuginfod_init_cache (char *cache_path,
    if (fd < 0)
      return -errno;
  
@@ -12,8 +13,8 @@
      return -errno;
  
    /* init max age config file.  */
-@@ -230,7 +234,11 @@
-       && (fd = open(maxage_path, O_CREAT | O_RDWR, 0666)) < 0)
+@@ -237,7 +241,11 @@ debuginfod_init_cache (char *cache_path,
+       && (fd = open(maxage_path, O_CREAT | O_RDWR, DEFFILEMODE)) < 0)
      return -errno;
  
 +#if defined(__x86_64__) && defined(__ILP32__)
@@ -24,7 +25,7 @@
      return -errno;
  
    return 0;
-@@ -256,7 +264,11 @@
+@@ -263,7 +271,11 @@ debuginfod_clean_cache(debuginfod_client
        if (interval_file == NULL)
          return -errno;
  
@@ -36,7 +37,7 @@
        fclose(interval_file);
  
        if (rc < 0)
-@@ -268,7 +280,11 @@
+@@ -275,7 +287,11 @@ debuginfod_clean_cache(debuginfod_client
    interval_file = fopen(interval_path, "r");
    if (interval_file)
      {
@@ -48,7 +49,7 @@
          clean_interval = cache_clean_default_interval_s;
        fclose(interval_file);
      }
-@@ -284,7 +300,11 @@
+@@ -291,7 +307,11 @@ debuginfod_clean_cache(debuginfod_client
    max_unused_file = fopen(max_unused_path, "r");
    if (max_unused_file)
      {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/elfutils.git/commitdiff/8c7040e4c3ab08b2884a41611beb7b15c6de4ce3