Bug 26026

Summary: minor change to /usr/share/misc/magic -> add encodings
Product: Base System Reporter: e <e>
Component: miscAssignee: freebsd-bugs (Nobody) <bugs>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: 4.2-STABLE   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description e 2001-03-23 10:50:01 UTC
	file(1) was not able to detect any RIFF audio encoding but
	Microsoft PCM.  Several types added to /usr/share/misc/magic
Comment 1 e 2001-03-23 11:13:05 UTC
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
Comment 2 Peter Pentchev 2001-03-23 11:31:37 UTC
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 -----
Comment 3 Kris Kennaway freebsd_committer freebsd_triage 2001-03-26 01:43:34 UTC
State Changed
From-To: open->closed

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.