detect names of RPM packages

- detect swap on ia64 architecture
This commit is contained in:
Jan Kaluza 2012-06-21 09:23:10 +02:00
parent ef9450e2ef
commit df874cf339
3 changed files with 34 additions and 2 deletions

12
file-4.17-rpm-name.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/magic/Magdir/rpm b/magic/Magdir/rpm
index 4eb5556..fe22b3d 100644
--- a/magic/Magdir/rpm
+++ b/magic/Magdir/rpm
@@ -28,6 +28,7 @@
>>8 beshort 17 SuperH
>>8 beshort 18 Xtensa
>>8 beshort 255 noarch
+>>10 string x %s
#delta RPM Daniel Novotny (dnovotny@redhat.com)
0 string drpm Delta RPM

12
file-5.11-ia64-swap.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/magic/Magdir/linux b/magic/Magdir/linux
index 8d4c60a..aa8d1aa 100644
--- a/magic/Magdir/linux
+++ b/magic/Magdir/linux
@@ -88,6 +88,7 @@
# From Daniel Novotny <dnovotny@redhat.com>
# swap file for PowerPC
65526 string SWAPSPACE2 Linux/ppc swap file
+16374 string SWAPSPACE2 Linux/ia64 swap file
#
# Linux kernel boot images, from Albert Cahalan <acahalan@cs.uml.edu>
# and others such as Axel Kohlmeyer <akohlmey@rincewind.chemie.uni-ulm.de>

View File

@ -5,18 +5,20 @@
Summary: A utility for determining file types
Name: file
Version: 5.11
Release: 1%{?dist}
Release: 2%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
# Upstream says it's up to distributions to add a way to support local-magic.
Patch0: file-localmagic.patch
# sent upstream
# sent upstream - should be included in next upstream release
Patch1: file-tnef.patch
Patch2: file-5.10-strength.patch
Patch3: file-5.10-sticky-bit.patch
Patch4: file-python-func.patch
Patch5: file-qed-vdi-image.patch
Patch6: file-5.11-ia64-swap.patch
Patch7: file-4.17-rpm-name.patch
URL: http://www.darwinsys.com/file/
Requires: file-libs = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -76,6 +78,8 @@ file(1) command.
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_
touch -r doc/libmagic.man doc/libmagic.man_
@ -160,6 +164,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Tue Jun 21 2012 Jan Kaluza <jkaluza@redhat.com> - 5.11-2
- detect names of RPM packages
- detect swap on ia64 architecture
* Mon Feb 27 2012 Jan Kaluza <jkaluza@redhat.com> - 5.11-1
- fix #796130 - update to file-5.11
- fix #796209 - recognize VDI images