sys-apps/file/file-5.27.recipe → sys-apps/file/file-5.28.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="c2e7d509b1167c4915901ecd257ee924d229a348bf988df6d1934ef0fa34a1a7"
+CHECKSUM_SHA256="0ecb5e146b8655d1fa84159a847ee619fc102575205a0ff9c6cc60fc5ee2e012"
 PATCHES="file-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -48,6 +48,12 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libz$secondaryArchSuffix
 	"
+if [ -n "$secondaryArchSuffix" ]; then
+	BUILD_REQUIRES="$BUILD_REQUIRES
+		file_data == $portVersion
+		"
+fi
+
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf

sys-apps/file/patches/file-5.27.patchset → sys-apps/file/patches/file-5.28.patchset

@@ -5,10 +5,10 @@ Subject: Haiku patch
 
 
 diff --git a/configure.ac b/configure.ac
-index 3c5f922..31cef67 100644
+index 9c38b69..572a1dc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -128,14 +128,14 @@ else
+@@ -135,14 +135,14 @@ else
     WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
         -Wmissing-declarations -Wredundant-decls -Wnested-externs \
         -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
@@ -26,7 +26,7 @@ index 3c5f922..31cef67 100644
     WARNINGS=
     AC_MSG_RESULT(no)
 diff --git a/src/der.c b/src/der.c
-index af5f149..3fc57fd 100644
+index f36606b..5bf4af7 100644
 --- a/src/der.c
 +++ b/src/der.c
 @@ -199,6 +199,7 @@ static int
@@ -49,7 +49,7 @@ index af5f149..3fc57fd 100644
 @@ -222,12 +223,13 @@ der_offs(struct magic_set *ms, struct magic *m, size_t nbytes)
  {
  	const uint8_t *b = CAST(const void *, ms->search.s);
- 	size_t offs = 0, len = ms->search.rm_len ? ms->search.rm_len : nbytes;
+ 	size_t offs = 0, len = ms->search.s_len ? ms->search.s_len : nbytes;
 +	uint32_t tlen;
 
  	if (gettag(b, &offs, len) == DER_BAD)