From d8a6abb33f1592ab25126d357b8d408b9db0e1db Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 25 Jul 2018 12:03:09 +0000
Subject: [PATCH] file: bump to 5.34.

---
 sys-apps/file/{file-5.33.recipe => file-5.34.recipe} |  2 +-
 .../{file-5.33.patchset => file-5.34.patchset}       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename sys-apps/file/{file-5.33.recipe => file-5.34.recipe} (96%)
 rename sys-apps/file/patches/{file-5.33.patchset => file-5.34.patchset} (92%)

diff --git a/sys-apps/file/file-5.33.recipe b/sys-apps/file/file-5.34.recipe
similarity index 96%
rename from sys-apps/file/file-5.33.recipe
rename to sys-apps/file/file-5.34.recipe
index 80257c4f7..9ee6d5e37 100644
--- a/sys-apps/file/file-5.33.recipe
+++ b/sys-apps/file/file-5.34.recipe
@@ -10,7 +10,7 @@ COPYRIGHT="1986-1999 Ian F. Darwin
 LICENSE="BSD (2-clause)"
 REVISION="1"
 SOURCE_URI="ftp://ftp.astron.com/pub/file/file-$portVersion.tar.gz"
-CHECKSUM_SHA256="1c52c8c3d271cd898d5511c36a68059cda94036111ab293f01f83c3525b737c6"
+CHECKSUM_SHA256="f15a50dbbfa83fec0bd1161e8e191b092ec832720e30cd14536e044ac623b20a"
 PATCHES="file-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
diff --git a/sys-apps/file/patches/file-5.33.patchset b/sys-apps/file/patches/file-5.34.patchset
similarity index 92%
rename from sys-apps/file/patches/file-5.33.patchset
rename to sys-apps/file/patches/file-5.34.patchset
index a4744555e..0a10fc97f 100644
--- a/sys-apps/file/patches/file-5.33.patchset
+++ b/sys-apps/file/patches/file-5.34.patchset
@@ -5,7 +5,7 @@ Subject: Haiku patch
 
 
 diff --git a/configure.ac b/configure.ac
-index 4edd98e..c7151bc 100644
+index ab4f6fc..dbff3c0 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -140,14 +140,14 @@ else
@@ -26,7 +26,7 @@ index 4edd98e..c7151bc 100644
     WARNINGS=
     AC_MSG_RESULT(no)
 diff --git a/src/der.c b/src/der.c
-index 4e22caf..1704092 100644
+index d017b63..a550ac0 100644
 --- a/src/der.c
 +++ b/src/der.c
 @@ -219,6 +219,7 @@ static int
@@ -79,10 +79,10 @@ index 4e22caf..1704092 100644
  	if (strncmp(buf, s, slen) != 0)
  		return 0;
 diff --git a/src/readelf.c b/src/readelf.c
-index 3df0836..b0faeb8 100644
+index db0b35a..ecd8893 100644
 --- a/src/readelf.c
 +++ b/src/readelf.c
-@@ -925,6 +925,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
+@@ -950,6 +950,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
  	const char *tag;
  	int is_string;
  	size_t nval;
@@ -90,13 +90,13 @@ index 3df0836..b0faeb8 100644
  
  	if ((*flags & (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE)) !=
  	    (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE))
-@@ -952,7 +953,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
+@@ -977,7 +978,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
  	*flags |= FLAGS_DID_AUXV;
  
  	nval = 0;
 -	for (size_t off = 0; off + elsize <= descsz; off += elsize) {
 +	for (off = 0; off + elsize <= descsz; off += elsize) {
- 		(void)memcpy(xauxv_addr, &nbuf[doff + off], xauxv_sizeof);
+ 		memcpy(xauxv_addr, &nbuf[doff + off], xauxv_sizeof);
  		/* Limit processing to 50 vector entries to prevent DoS */
  		if (nval++ >= 50) {
 --