file: bump to 5.33, add debuginfo. (#2456)

sys-apps/file/file-5.33.recipe

@@ -6,20 +6,24 @@ 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-2017 Christos Zoulas"
+	1994-2018 Christos Zoulas"
 LICENSE="BSD (2-clause)"
 REVISION="1"
 SOURCE_URI="ftp://ftp.astron.com/pub/file/file-$portVersion.tar.gz"
-CHECKSUM_SHA256="8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50"
+CHECKSUM_SHA256="1c52c8c3d271cd898d5511c36a68059cda94036111ab293f01f83c3525b737c6"
 PATCHES="file-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+libVersion="1.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVersionCompat="$portVersion compat >= 5"
+
 PROVIDES="
-	file$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:file$secondaryArchSuffix = $portVersion compat >= 5
-	lib:libmagic$secondaryArchSuffix = 1.0.0 compat >= 0
+	file$secondaryArchSuffix = $portVersion
+	cmd:file$secondaryArchSuffix = $portVersionCompat
+	lib:libmagic$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -37,8 +41,8 @@ if [ -z "$secondaryArchSuffix" ]; then
 fi
 
 PROVIDES_devel="
-	file${secondaryArchSuffix}_devel = $portVersion compat >= 0
-	devel:libmagic$secondaryArchSuffix = $portVersion compat >= 0
+	file${secondaryArchSuffix}_devel = $portVersion
+	devel:libmagic$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	file$secondaryArchSuffix == $portVersion base
@@ -56,17 +60,21 @@ fi
 
 BUILD_PREREQUIRES="
 	cmd:aclocal
-	cmd:autoconf
-	cmd:autom4te
 	cmd:automake
+	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
 
+defineDebugInfoPackage file$secondaryArchSuffix \
+	"$binDir"/file \
+	"$libDir"/libmagic.so.$libVersion
+
 BUILD()
 {
+	autoreconf
 	runConfigure ./configure
 	make
 }

sys-apps/file/patches/file-5.33.patchset

@@ -5,10 +5,10 @@ Subject: Haiku patch
 
 
 diff --git a/configure.ac b/configure.ac
-index 8d0c581..3db6602 100644
+index 4edd98e..c7151bc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -135,14 +135,14 @@ else
+@@ -140,14 +140,14 @@ else
     WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
         -Wmissing-declarations -Wredundant-decls -Wnested-externs \
         -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
@@ -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 c6b10f9..287e911 100644
+index 3df0836..b0faeb8 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,
+@@ -925,6 +925,7 @@ do_auxv_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
  	const char *tag;
  	int is_string;
  	size_t nval;
@@ -90,7 +90,7 @@ index c6b10f9..287e911 100644
  
  	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,
+@@ -952,7 +953,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 c6b10f9..287e911 100644
  		/* Limit processing to 50 vector entries to prevent DoS */
  		if (nval++ >= 50) {
 -- 
-2.12.2
+2.17.0