Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1513048311155460"
MIME-Version: 1.0
Date: Tue, 12 Dec 2017 03:11:51 +0000
From: "Ryo ONODERA" <ryoon@netbsd.org>
Subject: CVS commit: pkgsrc/sysutils/file
To: pkgsrc-changes@NetBSD.org
Reply-To: ryoon@netbsd.org
Message-Id: <20171212031151.976FAFB40@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1513048311155460
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	ryoon
Date:		Tue Dec 12 03:11:51 UTC 2017

Modified Files:
	pkgsrc/sysutils/file: Makefile distinfo
Added Files:
	pkgsrc/sysutils/file/patches: patch-src_softmagic.c

Log Message:
Fix functionality under NetBSD-current. Taken from NetBSD src

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/sysutils/file/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/sysutils/file/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/sysutils/file/patches/patch-src_softmagic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1513048311155460
Content-Disposition: inline
Content-Length: 2211
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/sysutils/file/Makefile
diff -u pkgsrc/sysutils/file/Makefile:1.40 pkgsrc/sysutils/file/Makefile:1.41
--- pkgsrc/sysutils/file/Makefile:1.40	Mon Sep  4 12:13:28 2017
+++ pkgsrc/sysutils/file/Makefile	Tue Dec 12 03:11:51 2017
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2017/09/04 12:13:28 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2017/12/12 03:11:51 ryoon Exp $
 
 DISTNAME=		file-5.32
+PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.astron.com/pub/file/
 

Index: pkgsrc/sysutils/file/distinfo
diff -u pkgsrc/sysutils/file/distinfo:1.29 pkgsrc/sysutils/file/distinfo:1.30
--- pkgsrc/sysutils/file/distinfo:1.29	Mon Sep  4 12:13:28 2017
+++ pkgsrc/sysutils/file/distinfo	Tue Dec 12 03:11:51 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2017/09/04 12:13:28 wiz Exp $
+$NetBSD: distinfo,v 1.30 2017/12/12 03:11:51 ryoon Exp $
 
 SHA1 (file-5.32.tar.gz) = c2858a8043387d1229d8768ad42762a803d017db
 RMD160 (file-5.32.tar.gz) = b7d41a4c6b2c28d9f202d740e353416e2036c1ef
@@ -6,3 +6,4 @@ SHA512 (file-5.32.tar.gz) = 315343229fa1
 Size (file-5.32.tar.gz) = 797025 bytes
 SHA1 (patch-aa) = dc787ea0d77d7ba88bcb1e17d38b26b13153a1c5
 SHA1 (patch-src_fsmagic.c) = ee770cf37dfdfbc5a7c123d2691312610b76e76e
+SHA1 (patch-src_softmagic.c) = bd8871c9050ca521f02b62066d0023a5fbb2d168

Added files:

Index: pkgsrc/sysutils/file/patches/patch-src_softmagic.c
diff -u /dev/null pkgsrc/sysutils/file/patches/patch-src_softmagic.c:1.3
--- /dev/null	Tue Dec 12 03:11:51 2017
+++ pkgsrc/sysutils/file/patches/patch-src_softmagic.c	Tue Dec 12 03:11:51 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_softmagic.c,v 1.3 2017/12/12 03:11:51 ryoon Exp $
+
+Fix functionality under NetBSD-current after format check change
+https://mail-index.netbsd.org/source-changes/2017/12/11/msg090400.html
+
+--- src/softmagic.c.orig	2017-07-21 10:29:00.000000000 +0000
++++ src/softmagic.c
+@@ -121,6 +121,8 @@ private const char * __attribute__((__fo
+ file_fmtcheck(struct magic_set *ms, const struct magic *m, const char *def,
+ 	const char *file, size_t line)
+ {
++	if (strchr(m->desc, '%') == NULL)
++		return m->desc;
+ 	const char *ptr = fmtcheck(m->desc, def);
+ 	if (ptr == def)
+ 		file_magerror(ms,


--_----------=_1513048311155460--