From edwinm@serv0.ilse.nl  Fri Mar 23 02:49:22 2001
Return-Path: <edwinm@serv0.ilse.nl>
Received: from serv1.ilse.nl (serv1.ilse.nl [212.189.131.11])
	by hub.freebsd.org (Postfix) with ESMTP id A941B37B71B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 23 Mar 2001 02:49:19 -0800 (PST)
	(envelope-from edwinm@serv0.ilse.nl)
Received: from serv0.ilse.nl (intra.ilse.nl [10.1.8.249])
	by serv1.ilse.nl (8.11.0/8.10.2) with ESMTP id f2NAn5X16173
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 23 Mar 2001 11:49:06 +0100 (MET)
Received: (from edwinm@localhost)
	by serv0.ilse.nl (8.11.1/8.11.1) id f2NAn4O88319;
	Fri, 23 Mar 2001 11:49:04 +0100 (CET)
	(envelope-from edwinm)
Message-Id: <200103231049.f2NAn4O88319@serv0.ilse.nl>
Date: Fri, 23 Mar 2001 11:49:04 +0100 (CET)
From: Edwin Mons <e@ik.nu>
Reply-To: e@ik.nu
To: FreeBSD-gnats-submit@freebsd.org
Subject: minor change to /usr/share/misc/magic - add encodings
X-Send-Pr-Version: 3.2

>Number:         26026
>Category:       misc
>Synopsis:       minor change to /usr/share/misc/magic -> add encodings
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 23 02:50:01 PST 2001
>Closed-Date:    Sun Mar 25 16:43:34 PST 2001
>Last-Modified:  Sun Mar 25 16:44:19 PST 2001
>Originator:     Edwin Mons
>Release:        FreeBSD 4.2-STABLE i386
>Organization:
>Environment:

	At least FreeBSD 4.2-STABLE, 4.2-RELEASE and 4.1-RELEASE

>Description:

	file(1) was not able to detect any RIFF audio encoding but
	Microsoft PCM.  Several types added to /usr/share/misc/magic

>How-To-Repeat:

	

>Fix:

--- /usr/share/misc/magic.orig	Fri Mar 23 10:41:55 2001
+++ /usr/share/misc/magic	Fri Mar 23 11:37:07 2001
@@ -4971,6 +4971,15 @@
 >8	string		WAVE		\b, WAVE audio
 >>20	leshort		1		\b, Microsoft PCM
 >>>34	leshort		>0		\b, %d bit
+>>20	leshort		2		\b, Microsoft ADPCM
+>>20	leshort		6		\b, ITU G.711 a-law
+>>20	leshort		7		\b, ITU G.711 u-law
+>>20	leshort		17		\b, IMA ADPCM
+>>20	leshort		20		\b, ITU G.723 ADPCM (Yamaha)
+>>20	leshort		49		\b, GSM 6.10
+>>20	leshort		64		\b, ITU G.721 ADPCM
+>>20	leshort		80		\b, MPEG
+>>20	leshort         85              \b, MPEG Layer 3
 >>22	leshort		=1		\b, mono
 >>22	leshort		=2		\b, stereo
 >>22	leshort		>2		\b, %d channels
>Release-Note:
>Audit-Trail:

From: Edwin Mons <e@ik.nu>
To: freebsd-gnats-submit@freebsd.org, e@ik.nu
Cc:  
Subject: Re: misc/26026: minor change to /usr/share/misc/magic -> add encodings
Date: Fri, 23 Mar 2001 12:13:05 +0100

 Whoops, mixup at my account.  Ofcourse, the real patch should be the 
 following, committed to /usr/src/usr.bin/file/Magdir/riff:
 
 --- /usr/src/usr.bin/file/Magdir/riff.orig	Fri Mar 23 12:08:48 2001
 +++ /usr/src/usr.bin/file/Magdir/riff	Fri Mar 23 12:08:53 2001
 @@ -39,6 +39,15 @@
  >8	string		WAVE		\b, WAVE audio
  >>20	leshort		1		\b, Microsoft PCM
  >>>34	leshort		>0		\b, %d bit
 +>>20	leshort		2		\b, Microsoft ADPCM
 +>>20	leshort		6		\b, ITU G.711 a-law
 +>>20	leshort		7		\b, ITU G.711 u-law
 +>>20	leshort		17		\b, IMA ADPCM
 +>>20	leshort		20		\b, ITU G.723 ADPCM (Yamaha)
 +>>20	leshort		49		\b, GSM 6.10
 +>>20	leshort		64		\b, ITU G.721 ADPCM
 +>>20	leshort		80		\b, MPEG
 +>>20	leshort		85		\b, MPEG Layer 3
  >>22	leshort		=1		\b, mono
  >>22	leshort		=2		\b, stereo
  >>22	leshort		>2		\b, %d channels

From: Peter Pentchev <roam@orbitel.bg>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: [roam@orbitel.bg: Re: misc/26026: minor change to /usr/share/misc/magic -> add encodings]
Date: Fri, 23 Mar 2001 13:31:37 +0200

 Er.  This is where this should have gone.  Please CC any replies
 to freebsd-gnats-submit, so that they make it to the audit trail,
 not directly to freebsd-bugs.
 
 G'luck,
 Peter
 
 -- 
 This sentence is false.
 
 ----- Forwarded message from Peter Pentchev <roam@orbitel.bg> -----
 
 Date: Fri, 23 Mar 2001 13:30:34 +0200
 From: Peter Pentchev <roam@orbitel.bg>
 To: Edwin Mons <e@ik.nu>
 Cc: freebsd-bugs@FreeBSD.org
 Subject: Re: misc/26026: minor change to /usr/share/misc/magic -> add encodings
 Mail-Followup-To: Edwin Mons <e@ik.nu>, freebsd-bugs@FreeBSD.org
 
 On Fri, Mar 23, 2001 at 03:20:04AM -0800, Edwin Mons wrote:
 > The following reply was made to PR misc/26026; it has been noted by GNATS.
 > 
 > From: Edwin Mons <e@ik.nu>
 > To: freebsd-gnats-submit@freebsd.org, e@ik.nu
 > Cc:  
 > Subject: Re: misc/26026: minor change to /usr/share/misc/magic -> add encodings
 > Date: Fri, 23 Mar 2001 12:13:05 +0100
 > 
 >  Whoops, mixup at my account.  Ofcourse, the real patch should be the 
 >  following, committed to /usr/src/usr.bin/file/Magdir/riff:
 
 Hmm.  Seems that there was another mixup :)  There is no such file
 in the FreeBSD source tree - the file(1) sources live in src/contrib.
 As a matter of fact, the file name you specified is exactly correct
 once you substitute contrib for usr.bin - which points to another
 problem: FreeBSD does not do such changes to contributed software.
 For more information, read src/contrib/file/MAINT to find out how
 the current file(1) maintainer, Christos Zoulas, would like you to
 submit this patch to him for inclusion in the official release :)
 
 ----- End forwarded message -----
State-Changed-From-To: open->closed 
State-Changed-By: kris 
State-Changed-When: Sun Mar 25 16:43:34 PST 2001 
State-Changed-Why:  
Thanks for the submission, but please submit this to the 
file maintainer, Christos Zoulas <christos@zoulas.com> so 
it will be included in the next vendor release of file, 
and imported into FreeBSD thereafter. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=26026 
>Unformatted:
