|
|
@@ -5,8 +5,8 @@
|
|
|
Summary: A utility for determining file types.
|
|
|
Summary(ja): ファイルの種類を判別するユーティリティー
|
|
|
Name: file
|
|
|
-Version: 5.14
|
|
|
-Release: 7%{?_dist_release}
|
|
|
+Version: 5.20
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: BSD
|
|
|
Group: Applications/System
|
|
|
Obsoletes: file-static
|
|
|
@@ -20,36 +20,19 @@ Source10: magic.printer-j
|
|
|
Patch0: file-localmagic.patch
|
|
|
# sent upstream - should be included in next upstream release
|
|
|
Patch1: file-5.10-strength.patch
|
|
|
-Patch2: file-5.10-sticky-bit.patch
|
|
|
Patch3: file-4.17-rpm-name.patch
|
|
|
Patch4: file-5.04-volume_key.patch
|
|
|
Patch5: file-5.04-man-return-code.patch
|
|
|
Patch6: file-5.04-generic-msdos.patch
|
|
|
Patch7: file-5.14-x86boot.patch
|
|
|
Patch8: file-5.14-perl.patch
|
|
|
-Patch9: file-5.14-elfspace.patch
|
|
|
-Patch10: file-5.14-bad-fsmagic-space.patch
|
|
|
-Patch11: file-5.14-no-magic.patch
|
|
|
-Patch12: file-5.14-journald.patch
|
|
|
-Patch13: file-5.14-magic_load.patch
|
|
|
+Patch14: file-5.19-cafebabe.patch
|
|
|
|
|
|
#Vine
|
|
|
Patch100: file-5.14-magicbuild-fix.patch
|
|
|
-Patch110: limit-repetitions-in-awk-detection.patch
|
|
|
|
|
|
#Security
|
|
|
-Patch200: file-5.14_CVE-2014-1943.patch
|
|
|
-Patch210: file-5.14_CVE-2014-2270.patch
|
|
|
-Patch220: DSA-2873-1-regression.patch
|
|
|
-Patch240: CVE-2014-0207.patch
|
|
|
-Patch250: CVE-2014-0237.patch
|
|
|
-Patch260: CVE-2014-0238.patch
|
|
|
-Patch270: file-5.14_CVE-2014-3478.patch
|
|
|
-Patch280: file-5.14_CVE-2014-3479.patch
|
|
|
-Patch290: CVE-2014-3480.patch
|
|
|
-Patch300: CVE-2014-3487.patch
|
|
|
-Patch310: file-5.14_CVE-2014-3538.patch
|
|
|
-Patch320: file-5.14_CVE-2014-3587.patch
|
|
|
+Patch200: file-5.20-CVE-2014-3710.patch
|
|
|
|
|
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
|
#BuildRequires: automake
|
|
|
@@ -100,39 +83,22 @@ file(1) command.
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-# Don't use -b -- it will lead to poblems when compiling magic file!
|
|
|
+# Don't use -b -- it will lead to problems when compiling magic file!
|
|
|
%patch0 -p1
|
|
|
%patch1 -p1
|
|
|
-%patch2 -p1
|
|
|
%patch3 -p1
|
|
|
%patch4 -p1
|
|
|
%patch5 -p1
|
|
|
%patch6 -p1
|
|
|
%patch7 -p1
|
|
|
%patch8 -p1
|
|
|
-%patch9 -p1
|
|
|
-%patch10 -p1
|
|
|
-%patch11 -p1
|
|
|
-%patch12 -p1
|
|
|
-%patch13 -p1
|
|
|
+%patch14 -p1
|
|
|
|
|
|
#Vine
|
|
|
%patch100 -p1
|
|
|
-%patch110 -p1 -b .limit-repetitions-in-awk-detection
|
|
|
|
|
|
#Security
|
|
|
-%patch200 -p1 -b .CVE-2014-1943
|
|
|
-%patch210 -p1 -b .CVE-2014-2270
|
|
|
-%patch220 -p1 -b .DSA-2873-1-regression
|
|
|
-%patch240 -p1 -b .CVE-2014-0207
|
|
|
-%patch250 -p1 -b .CVE-2014-0237
|
|
|
-%patch260 -p1 -b .CVE-2014-0238
|
|
|
-%patch270 -p1 -b .CVE-2014-3478
|
|
|
-%patch280 -p1 -b .CVE-2014-3479
|
|
|
-%patch290 -p1 -b .CVE-2014-3480
|
|
|
-%patch300 -p1 -b .CVE-2014-3487
|
|
|
-%patch310 -p1 -b .CVE-2014-3538
|
|
|
-%patch320 -p1 -b .CVE-2014-3587
|
|
|
+%patch200 -p1 -b .CVE-2014-3587
|
|
|
|
|
|
cat %{SOURCE10} >> ./magic/Localstuff
|
|
|
|
|
|
@@ -222,6 +188,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Nov 15 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 5.20-1
|
|
|
+- new upstream release
|
|
|
+- update/drop patches based on fc22
|
|
|
+
|
|
|
* Fri Oct 24 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 5.14-7
|
|
|
- reflected 6.0 updates and bumped release
|
|
|
* Thu Sep 11 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 5.14-6
|
iwamoto