From e2b7f4ec8ad3bc19dd639288b400d08ac807e12f Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Fri, 17 May 2019 12:10:14 +0200 Subject: [PATCH] update to new version 5.37 --- file-5.36-apple.patch | 168 ------------------------------------------ file-5.36.tar.gz.asc | 6 -- file-5.37.tar.gz.asc | 6 ++ file.spec | 10 +-- sources | 2 +- 5 files changed, 12 insertions(+), 180 deletions(-) delete mode 100644 file-5.36-apple.patch delete mode 100644 file-5.36.tar.gz.asc create mode 100644 file-5.37.tar.gz.asc diff --git a/file-5.36-apple.patch b/file-5.36-apple.patch deleted file mode 100644 index dab5c5a..0000000 --- a/file-5.36-apple.patch +++ /dev/null @@ -1,168 +0,0 @@ -From 9a4e136372fc586a1eb31555b9445612d09c1811 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Thu, 28 Feb 2019 00:52:57 +0000 -Subject: [PATCH 1/2] More and fixes to existing apple formats from Greg - Wildman - -Upstream-commit: 640752ca17c34f7c0fc9a654213b354553dedbe2 -Signed-off-by: Kamil Dudka ---- - magic/Magdir/apple | 103 +++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 89 insertions(+), 14 deletions(-) - -diff --git a/magic/Magdir/apple b/magic/Magdir/apple -index 39e838b..4cc2448 100644 ---- a/magic/Magdir/apple -+++ b/magic/Magdir/apple -@@ -11,22 +11,97 @@ - 0 belong 0x00051600 AppleSingle encoded Macintosh file - 0 belong 0x00051607 AppleDouble encoded Macintosh file - -+# Type: Apple Emulator WOZ format -+# From: Greg Wildman -+# Ref: https://applesaucefdc.com/woz/reference/ -+# Ref: https://applesaucefdc.com/woz/reference2/ -+# -+# Note: The following test are mostly identical. I would rather not -+# use a regex to identify the WOZ format number. -+0 string WOZ1 -+>4 string \xFF\x0A\x0D\x0A Apple ][ WOZ 1.0 Disk Image -+>12 string INFO -+>>21 byte 01 \b, 5.25 inch -+>>21 byte 02 \b, 3.5 inch -+>>22 byte 01 \b, write protected -+>>23 byte 01 \b, cross track synchronized -+>>25 string/T x \b, %.32s -+0 string WOZ2 -+>4 string \xFF\x0A\x0D\x0A Apple ][ WOZ 2.0 Disk Image -+>12 string INFO -+>>21 byte 01 \b, 5.25 inch -+>>21 byte 02 \b, 3.5 inch -+>>22 byte 01 \b, write protected -+>>23 byte 01 \b, cross track synchronized -+>>25 string/T x \b, %.32s -+ -+# Type: Apple Emulator disk images -+# From: Greg Wildman -+# ProDOS boot loader? -+0 string \x01\x38\xB0\x03\x4C Apple ProDOS Image -+# Detect Volume Directory block ($02) -+>0x400 string \x00\x00\x03\x00 -+>>0x404 byte &0xF0 -+>>>0x405 string x \b, Volume /%s -+>>>0x429 leshort x \b, %u Blocks -+# ProDOS ordered ? -+>0xb00 string \x00\x00\x03\x00 -+>>0xb04 byte &0xF0 -+>>>0xb05 string x \b, Volume /%s -+>>>0xb29 leshort x \b, %u Blocks -+# -+# DOS3.3 boot loader? -+0 string \x01\xA5\x27\xC9\x09\xD0\x18\xA5\x2B -+>0x11001 string \x11\x0F\x03 Apple DOS 3.3 Image -+>>0x11006 byte x \b, Volume %u -+>>0x11034 byte x \b, %u Tracks -+>>0x11035 byte x \b, %u Sectors -+>>0x11036 leshort x \b, %u bytes per sector -+# DOS3.2 ? -+>0x11001 string \x11\x0C\x02 Apple DOS 3.2 Image -+>>0x11006 byte x \b, Volume %u -+>>0x11034 byte x \b, %u Tracks -+>>0x11035 byte x \b, %u Sectors -+>>0x11036 leshort x \b, %u bytes per sector -+# DOS3.1 ? -+>0x11001 string \x11\x0C\x01 -+>>0x11c00 string \x00\x11\x0B Apple DOS 3.1 Image -+# -+# Pascal boot loader? -+0 string \x01\xE0\x60\xF0\x03\x4C\xE3\x08\xAD -+>0xd6 pstring SYSTEM.APPLE -+>>0xb00 leshort 0x0000 -+>>>0xb04 leshort 0x0000 Apple Pascal Image -+>>>>0xb06 pstring x \b, Volume %s: -+>>>>0xb0e leshort x \b, %u Blocks -+>>>>0xb10 leshort x \b, %u Files -+ - # Type: Apple Emulator 2IMG format - # From: Radek Vokal --0 string 2IMG Apple ][ 2IMG Disk Image -->4 string XGS! \b, XGS -->4 string CTKG \b, Catakig -->4 string ShIm \b, Sheppy's ImageMaker -->4 string WOOF \b, Sweet 16 -->4 string B2TR \b, Bernie ][ the Rescue -->4 string !nfc \b, ASIMOV2 -->4 string x \b, Unknown Format -->0xc byte 00 \b, DOS 3.3 sector order -->>0x10 byte 00 \b, Volume 254 -->>0x10 byte&0x7f x \b, Volume %u -->0xc byte 01 \b, ProDOS sector order -->>0x14 short x \b, %u Blocks -->0xc byte 02 \b, NIB data -+# Update: Greg Wildman -+0 string 2IMG Apple ][ 2IMG Disk Image -+>4 clear -+>4 string XGS! \b, XGS -+>4 string CTKG \b, Catakig -+>4 string ShIm \b, Sheppy's ImageMaker -+>4 string SHEP \b, Sheppy's ImageMaker -+>4 string WOOF \b, Sweet 16 -+>4 string B2TR \b, Bernie ][ the Rescue -+>4 string \!nfc \b, ASIMOV2 -+>4 string \>BD\< \b, Brutal Deluxe's Cadius -+>4 string CdrP \b, CiderPress -+>4 string Vi\]\[ \b, Virtual ][ -+>4 string PRFS \b, ProFUSE -+>4 string FISH \b, FishWings -+>4 string RVLW \b, Revival for Windows -+>4 default x -+>>4 string x \b, Creator tag "%-4.4s" -+>0xc byte 00 \b, DOS 3.3 sector order -+>>0x10 byte 00 \b, Volume 254 -+>>0x10 byte&0x7f x \b, Volume %u -+>0xc byte 01 \b, ProDOS sector order -+>>0x14 short x \b, %u Blocks -+>0xc byte 02 \b, NIB data - - # magic for Newton PDA package formats - # from Ruda Moura --- -2.17.2 - - -From 51187272ba3490474f2709d3488a219c28316794 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Thu, 28 Feb 2019 00:53:41 +0000 -Subject: [PATCH 2/2] fix syntax - -Upstream-commit: 4c41a4b6f9fbb95959edda00a2fd3d80e32a914a -Signed-off-by: Kamil Dudka ---- - magic/Magdir/apple | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/magic/Magdir/apple b/magic/Magdir/apple -index 4cc2448..9498cb7 100644 ---- a/magic/Magdir/apple -+++ b/magic/Magdir/apple -@@ -80,7 +80,7 @@ - # From: Radek Vokal - # Update: Greg Wildman - 0 string 2IMG Apple ][ 2IMG Disk Image -->4 clear -+>4 clear x - >4 string XGS! \b, XGS - >4 string CTKG \b, Catakig - >4 string ShIm \b, Sheppy's ImageMaker -@@ -90,7 +90,7 @@ - >4 string \!nfc \b, ASIMOV2 - >4 string \>BD\< \b, Brutal Deluxe's Cadius - >4 string CdrP \b, CiderPress -->4 string Vi\]\[ \b, Virtual ][ -+>4 string Vi][ \b, Virtual ][ - >4 string PRFS \b, ProFUSE - >4 string FISH \b, FishWings - >4 string RVLW \b, Revival for Windows --- -2.17.2 - diff --git a/file-5.36.tar.gz.asc b/file-5.36.tar.gz.asc deleted file mode 100644 index 6daaa2b..0000000 --- a/file-5.36.tar.gz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iEYEABECAAYFAlxtcFoACgkQcREqsWyzOzp+cQCg1EKjv0nl2ecPjbh4wHffQ+Gz -Y2kAn2eyPWcbVtM1rER2qBS7NSaRzhrW -=J7wy ------END PGP SIGNATURE----- diff --git a/file-5.37.tar.gz.asc b/file-5.37.tar.gz.asc new file mode 100644 index 0000000..20cadb8 --- /dev/null +++ b/file-5.37.tar.gz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iEYEABECAAYFAlzeHJcACgkQcREqsWyzOzrudwCg6X2ESwogvW+LinRPNULUDrZV +bE4An2pcK2m7rmImJ3TBoFEH+osRFwyO +=AZbT +-----END PGP SIGNATURE----- diff --git a/file.spec b/file.spec index 40b7aae..76acb75 100644 --- a/file.spec +++ b/file.spec @@ -14,8 +14,8 @@ Summary: A utility for determining file types Name: file -Version: 5.36 -Release: 2%{?dist} +Version: 5.37 +Release: 1%{?dist} License: BSD Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -26,9 +26,6 @@ Patch0: file-localmagic.patch Patch1: file-4.17-rpm-name.patch Patch2: file-5.04-volume_key.patch -# improve support for Apple formats (#1679455) -Patch3: file-5.36-apple.patch - URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -205,6 +202,9 @@ cd %{py3dir} %endif %changelog +* Fri May 17 2019 Kamil Dudka - 5.37-1 +- update to new version 5.37 + * Fri Mar 01 2019 Kamil Dudka - 5.36-2 - improve support for Apple formats (#1679455) diff --git a/sources b/sources index fc80b20..4d9e5bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (file-5.36.tar.gz) = 3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751 +SHA512 (file-5.37.tar.gz) = bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d