Merge pull request #5581 from Duncaen/elfutils

elfutils: update to 0.168.

srcpkgs/elfutils/patches/fix-system_h.patch

@@ -0,0 +1,21 @@
+--- lib/crc32_file.c.orig
++++ lib/crc32_file.c
+@@ -35,6 +35,7 @@
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
++#include "system.h"
+ 
+ int
+ crc32_file (int fd, uint32_t *resp)
+--- lib/system.h.orig
++++ lib/system.h
+@@ -81,7 +81,7 @@
+      do \
+        __res = expression; \
+      while (__res == -1 && errno == EINTR); \
+-     __res; });
++     __res; })
+ #endif
+ 
+ static inline ssize_t __attribute__ ((unused))

srcpkgs/elfutils/patches/musl-cdefs.patch

@@ -18,3 +18,13 @@
  __BEGIN_DECLS
  
  /* Standard ELF types.  */
+--- lib/fixedsizehash.h.orig
++++ lib/fixedsizehash.h
+@@ -30,7 +30,6 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/cdefs.h>
+ 
+ #include <system.h>
+ 

srcpkgs/elfutils/patches/musl-concat.patch

@@ -1,17 +0,0 @@
---- lib/fixedsizehash.h	2015-08-21 14:22:37.000000000 +0200
-+++ lib/fixedsizehash.h	2015-11-20 05:05:45.648028916 +0100
-@@ -30,12 +30,12 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/cdefs.h>
- #include <sys/param.h>
- 
- #include <system.h>
- 
--#define CONCAT(t1,t2) __CONCAT (t1,t2)
-+#define CONCAT1(x,y) x##y
-+#define CONCAT(x,y) CONCAT1(x,y)
- 
- /* Before including this file the following macros must be defined:
- 

srcpkgs/elfutils/patches/musl-fts-obstack.patch

@@ -88,15 +88,15 @@
 +size_LDADD = $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)
 +strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl
 +elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl
-+findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)
++findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)
-+addr2line_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(demanglelib)
++addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) $(demanglelib)
-+elfcmp_LDADD = $(libebl) $(libelf) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl
++elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD) -ldl
 -size_LDADD = $(libelf) $(libeu) $(argp_LDADD)
 -strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl
 -elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
--findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD)
+-findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD)
--addr2line_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(demanglelib)
+-addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib)
--elfcmp_LDADD = $(libebl) $(libelf) $(argp_LDADD) -ldl
+-elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
  objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl
 +ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)
 +strings_LDADD = $(libelf) $(libeu) $(argp_LDADD) $(fts_LDADD) $(obstack_LDADD)

srcpkgs/elfutils/patches/musl-rawmemchr.patch

@@ -1,11 +0,0 @@
---- libelf/elf_getarsym.c	2015-10-12 12:22:58.000000000 +0200
-+++ libelf/elf_getarsym.c	2015-11-20 05:01:57.762046695 +0100
-@@ -297,7 +297,7 @@
- 		arsym[cnt].as_off = (*u32)[cnt];
- 
- 	      arsym[cnt].as_hash = _dl_elf_hash (str_data);
--	      str_data = rawmemchr (str_data, '\0') + 1;
-+	      str_data = memchr (str_data, '\0', SIZE_MAX) + 1;
- 	    }
- 
- 	  /* At the end a special entry.  */

srcpkgs/elfutils/patches/musl-ssize_t.patch

@@ -1,31 +0,0 @@
---- lib/system.h	2015-08-21 14:22:37.000000000 +0200
-+++ lib/system.h	2015-11-20 04:36:49.563164363 +0100
-@@ -35,6 +35,7 @@
- #include <endian.h>
- #include <byteswap.h>
- #include <unistd.h>
-+#include <fcntl.h>
- 
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- # define LE32(n)	(n)
-@@ -50,6 +50,20 @@
- # error "Unknown byte order"
- #endif
- 
-+#if !defined(__GLIBC__)
-+
-+/* Evaluate EXPRESSION, and repeat as long as it returns -1 with `errno'
-+   set to EINTR.  */
-+
-+# define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+
-+#endif
-+
- extern void *xmalloc (size_t) __attribute__ ((__malloc__));
- extern void *xcalloc (size_t, size_t) __attribute__ ((__malloc__));
- extern void *xrealloc (void *, size_t) __attribute__ ((__malloc__));

srcpkgs/elfutils/template

@@ -1,7 +1,7 @@
 # Template file for 'elfutils'
 pkgname=elfutils
-version=0.167
+version=0.168
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--program-prefix=eu-"
 hostmakedepends="automake libtool"
@@ -9,9 +9,9 @@ makedepends="zlib-devel bzip2-devel liblzma-devel"
 short_desc="Utilities to handle ELF object files"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
-homepage="https://fedorahosted.org/elfutils/"
+homepage="https://sourceware.org/elfutils/"
-distfiles="https://fedorahosted.org/releases/e/l/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
+distfiles="https://sourceware.org/${pkgname}/ftp/${version}/${pkgname}-${version}.tar.bz2"
-checksum=3f300087c42b6f35591163b48246b4098ce39c4c6f5d55a83023c903c5776553
+checksum=b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276
 
 # Suppress certain warnings to not fail for -Werror
 CFLAGS="-Wno-unused-result -Wno-format-nonliteral"