rpm/file
SHA256
1
0
Fork 0
forked from pool/file
Code Pull Requests Activity

Accepting request 501318 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/501318
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/file?expand=0&rev=101
This commit is contained in:
Dominique Leuenberger 2017-06-12 13:10:36 +00:00 committed by Git OBS Bridge
commit 487776d3ec
4 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
file-5.28-btrfs-image.dif
View File

@ -13,10 +13,11 @@ contained within the image.
magic/Magdir/filesystems | 37 +++++++++++++++++++++++-------------- magic/Magdir/filesystems | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-) 1 file changed, 23 insertions(+), 14 deletions(-)
diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems Index: file-5.31/magic/Magdir/filesystems
--- a/magic/Magdir/filesystems ===================================================================
+++ b/magic/Magdir/filesystems --- file-5.31.orig/magic/Magdir/filesystems
@@ -2229,20 +2229,29 @@ +++ file-5.31/magic/Magdir/filesystems
@@ -2246,20 +2246,29 @@
>>0x10060 string >\0 lockproto %s) >>0x10060 string >\0 lockproto %s)
# Russell Coker <russell@coker.com.au> # Russell Coker <russell@coker.com.au>

38
file-5.31-fix-tga.dif Normal file
View File

@ -0,0 +1,38 @@
From bb421c437d406760fb9f70f49e2eb5c504528450 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 5 Jun 2017 17:40:31 +0000
Subject: [PATCH] use default to avoid dup printing (Stephan Kulow)
---
magic/Magdir/images | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
Index: file-5.31/magic/Magdir/images
===================================================================
--- file-5.31.orig/magic/Magdir/images
+++ file-5.31/magic/Magdir/images
@@ -35,11 +35,6 @@
>>>16 ubyte <33
# skip more by looking for pixel size 0Fh 10h 18h 20h
>>>>16 ubyte&0xC0 0x00
-# skip 260-16.ico by looking for no color map
->>>>>1 ubyte 0
-# implies no first map entry
->>>>>>3 uleshort 0
->>>>>>>0 use tga-image
# Color Map
>>>>>1 belong&0xfff7ffff 0x01010000
>>>>>>0 use tga-image
@@ -47,6 +42,12 @@
>>>>>>0 use tga-image
>>>>>1 belong&0xfff7ffff 0x00030000
>>>>>>0 use tga-image
+>>>>>1 default x
+# skip 260-16.ico by looking for no color map
+>>>>>>1 ubyte 0
+# implies no first map entry
+>>>>>>>3 uleshort 0
+>>>>>>>>0 use tga-image
# display tga bitmap image information
0 name tga-image
>2 ubyte <34 Targa image data

6
file.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 5 18:48:22 UTC 2017 - coolo@suse.com
- add file-5.31-fix-tga.dif upstream commited after I reported
a failure in File::Unpack's test suite
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 24 10:54:28 UTC 2017 - werner@suse.de Wed May 24 10:54:28 UTC 2017 - werner@suse.de

2
file.spec
View File

@ -64,6 +64,7 @@ Patch35: file-5.24-nitpick.dif
Patch36: file-5.15-clear-invalid.patch Patch36: file-5.15-clear-invalid.patch
Patch37: file-secure_getenv.patch Patch37: file-secure_getenv.patch
Patch39: file-5.28-btrfs-image.dif Patch39: file-5.28-btrfs-image.dif
Patch40: file-5.31-fix-tga.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global _sysconfdir /etc %global _sysconfdir /etc
%global _miscdir %{_datadir}/misc %global _miscdir %{_datadir}/misc
@ -132,6 +133,7 @@ to develop applications that require the magic "file" interface.
%patch36 -p1 -b .clear %patch36 -p1 -b .clear
%patch37 -p1 -b .getenv %patch37 -p1 -b .getenv
%patch39 -p1 -b .btrfs %patch39 -p1 -b .btrfs
%patch40 -p1 -b .tga
%patch -b .0 %patch -b .0
test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in
rm -fv src/magic.h rm -fv src/magic.h