From 4f11f33caaa1dc49c4bfd4ec7e791deab903ef99 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sat, 11 Feb 2017 00:01:51 +0000
Subject: [PATCH] file: bump to 5.30.

---
 .../file/{file-5.29.recipe => file-5.30.recipe}  |  4 ++--
 .../{file-5.29.patchset => file-5.30.patchset}   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename sys-apps/file/{file-5.29.recipe => file-5.30.recipe} (95%)
 rename sys-apps/file/patches/{file-5.29.patchset => file-5.30.patchset} (89%)

diff --git a/sys-apps/file/file-5.29.recipe b/sys-apps/file/file-5.30.recipe
similarity index 95%
rename from sys-apps/file/file-5.29.recipe
rename to sys-apps/file/file-5.30.recipe
index c26e17505..cda531d65 100644
--- a/sys-apps/file/file-5.29.recipe
+++ b/sys-apps/file/file-5.30.recipe
@@ -6,11 +6,11 @@ standard 'file' command for Linux, *BSD, and other systems. (See \
 'patchlevel.h' for the exact release number)."
 HOMEPAGE="ftp://ftp.astron.com/pub/file/"
 COPYRIGHT="1986-1999 Ian F. Darwin
-	1994-2016 Christos Zoulas"
+	1994-2017 Christos Zoulas"
 LICENSE="BSD (2-clause)"
 REVISION="1"
 SOURCE_URI="ftp://ftp.astron.com/pub/file/file-$portVersion.tar.gz"
-CHECKSUM_SHA256="ea661277cd39bf8f063d3a83ee875432cc3680494169f952787e002bdd3884c0"
+CHECKSUM_SHA256="694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214"
 PATCHES="file-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
diff --git a/sys-apps/file/patches/file-5.29.patchset b/sys-apps/file/patches/file-5.30.patchset
similarity index 89%
rename from sys-apps/file/patches/file-5.29.patchset
rename to sys-apps/file/patches/file-5.30.patchset
index dc07596a7..86ef5e3e7 100644
--- a/sys-apps/file/patches/file-5.29.patchset
+++ b/sys-apps/file/patches/file-5.30.patchset
@@ -5,7 +5,7 @@ Subject: Haiku patch
 
 
 diff --git a/configure.ac b/configure.ac
-index da2fbbf..0e6d9c4 100644
+index bee25dc..1aee006 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -135,14 +135,14 @@ else
@@ -26,10 +26,10 @@ index da2fbbf..0e6d9c4 100644
     WARNINGS=
     AC_MSG_RESULT(no)
 diff --git a/src/der.c b/src/der.c
-index 8ae638f..c9ae6f7 100644
+index 40dd1c5..23501ad 100644
 --- a/src/der.c
 +++ b/src/der.c
-@@ -201,6 +201,7 @@ static int
+@@ -219,6 +219,7 @@ static int
  der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len)
  {
  	const uint8_t *d = CAST(const uint8_t *, q);
@@ -37,7 +37,7 @@ index 8ae638f..c9ae6f7 100644
  	switch (tag) {
  	case DER_TAG_PRINTABLE_STRING:
  	case DER_TAG_UTF8_STRING:
-@@ -211,7 +212,7 @@ der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len)
+@@ -229,7 +230,7 @@ der_data(char *buf, size_t blen, uint32_t tag, const void *q, uint32_t len)
  		break;
  	}
  		
@@ -46,7 +46,7 @@ index 8ae638f..c9ae6f7 100644
  		uint32_t z = i << 1;
  		if (z < blen - 2)
  			snprintf(buf + z, blen - z, "%.2x", d[i]);
-@@ -224,12 +225,13 @@ der_offs(struct magic_set *ms, struct magic *m, size_t nbytes)
+@@ -242,12 +243,13 @@ der_offs(struct magic_set *ms, struct magic *m, size_t nbytes)
  {
  	const uint8_t *b = RCAST(const uint8_t *, ms->search.s);
  	size_t offs = 0, len = ms->search.s_len ? ms->search.s_len : nbytes;
@@ -61,7 +61,7 @@ index 8ae638f..c9ae6f7 100644
  	if (tlen == DER_BAD)
  		return -1;
  	DPRINTF(("%s2: %d %zu %u\n", __func__, ms->offset, offs, tlen));
-@@ -258,6 +260,7 @@ der_cmp(struct magic_set *ms, struct magic *m)
+@@ -276,6 +278,7 @@ der_cmp(struct magic_set *ms, struct magic *m)
  	size_t offs = 0, len = ms->search.s_len;
  	uint32_t tag, tlen;
  	char buf[128];
@@ -69,7 +69,7 @@ index 8ae638f..c9ae6f7 100644
  
  	tag = gettag(b, &offs, len);
  	if (tag == DER_BAD)
-@@ -271,7 +274,7 @@ der_cmp(struct magic_set *ms, struct magic *m)
+@@ -289,7 +292,7 @@ der_cmp(struct magic_set *ms, struct magic *m)
  	if ((ms->flags & MAGIC_DEBUG) != 0)
  		fprintf(stderr, "%s: tag %p got=%s exp=%s\n", __func__, b,
  		    buf, s);
@@ -79,7 +79,7 @@ index 8ae638f..c9ae6f7 100644
  	if (strncmp(buf, s, slen) != 0)
  		return 0;
 diff --git a/src/readelf.c b/src/readelf.c
-index 90dae39..1e2f4db 100644
+index 6738942..810151e 100644
 --- a/src/readelf.c
 +++ b/src/readelf.c
 @@ -923,6 +923,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,