diff --git a/sys-apps/file/file-5.30.recipe b/sys-apps/file/file-5.31.recipe similarity index 96% rename from sys-apps/file/file-5.30.recipe rename to sys-apps/file/file-5.31.recipe index cda531d65..e959ba888 100644 --- a/sys-apps/file/file-5.30.recipe +++ b/sys-apps/file/file-5.31.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="694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214" +CHECKSUM_SHA256="09c588dac9cff4baa054f51a36141793bcf64926edc909594111ceae60fce4ee" PATCHES="file-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/sys-apps/file/patches/file-5.30.patchset b/sys-apps/file/patches/file-5.31.patchset similarity index 90% rename from sys-apps/file/patches/file-5.30.patchset rename to sys-apps/file/patches/file-5.31.patchset index 86ef5e3e7..eedfb03e8 100644 --- a/sys-apps/file/patches/file-5.30.patchset +++ b/sys-apps/file/patches/file-5.31.patchset @@ -1,11 +1,11 @@ -From 7dd472c907c0ec240c6ab74c435d937fc7311552 Mon Sep 17 00:00:00 2001 +From 39340b187428922537dbe2a98c12cc249e86b5ae Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 12 May 2016 19:46:43 +0000 Subject: Haiku patch diff --git a/configure.ac b/configure.ac -index bee25dc..1aee006 100644 +index 8d0c581..3db6602 100644 --- a/configure.ac +++ b/configure.ac @@ -135,14 +135,14 @@ else @@ -26,7 +26,7 @@ index bee25dc..1aee006 100644 WARNINGS= AC_MSG_RESULT(no) diff --git a/src/der.c b/src/der.c -index 40dd1c5..23501ad 100644 +index 4e22caf..1704092 100644 --- a/src/der.c +++ b/src/der.c @@ -219,6 +219,7 @@ static int @@ -79,7 +79,7 @@ index 40dd1c5..23501ad 100644 if (strncmp(buf, s, slen) != 0) return 0; diff --git a/src/readelf.c b/src/readelf.c -index 6738942..810151e 100644 +index c6b10f9..287e911 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, @@ -88,9 +88,9 @@ index 6738942..810151e 100644 size_t nval; + size_t off; - if (type != NT_AUXV || (*flags & FLAGS_IS_CORE) == 0) - return 0; -@@ -930,7 +931,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, + if ((*flags & (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE)) != + (FLAGS_IS_CORE|FLAGS_DID_CORE_STYLE)) +@@ -950,7 +951,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, *flags |= FLAGS_DID_AUXV; nval = 0; @@ -100,5 +100,5 @@ index 6738942..810151e 100644 /* Limit processing to 50 vector entries to prevent DoS */ if (nval++ >= 50) { -- -2.7.0 +2.12.2