Browse Source

2014-10-24 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* file, nas: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9019 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
8772a7231b
2 changed files with 83 additions and 29 deletions
  1. 54 1
      f/file/file-vl.spec
  2. 29 28
      n/nas/nas-vl.spec

+ 54 - 1
f/file/file-vl.spec

@@ -6,7 +6,7 @@ Summary: A utility for determining file types.
 Summary(ja): ファイルの種類を判別するユーティリティー
 Name: file
 Version: 5.14
-Release: 2%{?_dist_release}
+Release: 7%{?_dist_release}
 License: BSD
 Group: Applications/System
 Obsoletes: file-static
@@ -35,6 +35,21 @@ Patch13: file-5.14-magic_load.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
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 #BuildRequires: automake
@@ -103,6 +118,21 @@ file(1) command.
 
 #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
 
 cat %{SOURCE10} >> ./magic/Localstuff
 
@@ -192,6 +222,29 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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
+  - drop patch230 (moved to patch320)
+  - add Patch240 for fix CVE-2014-0207
+  - add Patch250 for fix CVE-2014-0237
+  - add Patch260 for fix CVE-2014-0238
+  - add Patch270 for fix CVE-2014-3478
+  - add Patch280 for fix CVE-2014-3479
+  - add Patch290 for fix CVE-2014-3480
+  - add Patch300 for fix CVE-2014-3487
+  - add Patch310 for fix CVE-2014-3538
+  - add Patch320 for fix CVE-2014-3587
+    These patches are from debian/ubuntu, thanks.
+  * Thu Aug 28 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 5.14-5
+  - add patch230 for fix CVE-2014-3587 (cdf_read_property_info)
+  * Thu Mar 27 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 5.14-4
+  - add patch110,220 for fix regression of CVE-2014-2270
+  * Wed Mar 12 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 5.14-3
+  - add patch210 for fix CVE-2014-2270
+  * Thu Feb 20 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 5.14-2
+  - add patch200 for fix CVE-2014-1943 
+
 * Sun Jul 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 5.14-2
 - rebuild with VineSeed environment
 

+ 29 - 28
n/nas/nas-vl.spec

@@ -2,12 +2,12 @@ Name:		nas
 Summary:	The Network Audio System (NAS)
 Summary(ja):	ネットワークオーディオシステム (NAS)
 Version:	1.9.3
-Release:	2%{?_dist_release}
+Release:	4%{?_dist_release}
 
 URL:		http://radscan.com/nas.html
 
 License: 	Public Domain
-Group: 		Development/Libraries
+Group: 		System Environment/Daemons
 Source0: 	http://nas.codebrilliance.com/nas/nas-%{version}.src.tar.gz
 Source1:	http://apt.kde-redhat.org/apt/kde-redhat/SOURCES/nas/nasd.init
 Source2:	http://apt.kde-redhat.org/apt/kde-redhat/SOURCES/nas/nasd.sysconfig
@@ -28,29 +28,6 @@ Requires:	%{name}-libs = %{version}-%{release}
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
-
-%package devel
-Summary:	Development and doc files for the NAS 
-Summary(ja):	NAS 用開発ファイルとドキュメント
-Group:		Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-
-%description devel
-Development files and the documentation
-
-%description devel -l ja
-NAS 用開発ファイルとドキュメント
-
-
-%package libs
-Summary: Runtime libraries for NAS
-Group:   System Environment/Libraries
-
-
-%description libs
-%{summary}.
-
-
 %description
 In a nutshell, NAS is the audio equivalent of an X display server.
 The Network Audio System (NAS) was developed by NCD for playing,
@@ -87,6 +64,27 @@ NAS の特徴は以下の通りです:
 	o  コンパクトで小さなサイズ
 	o  フリーです!面倒なライセンス条件はありません
 
+%package devel
+Summary:	Development and doc files for the NAS 
+Summary(ja):	NAS 用開発ファイルとドキュメント
+Group:		Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description devel
+Development files and the documentation
+
+%description devel -l ja
+NAS 用開発ファイルとドキュメント
+
+
+%package libs
+Summary: Runtime libraries for NAS
+Summary(ja): NAS のランタイムライブラリ
+Group:   System Environment/Libraries
+
+%description libs
+%{summary}.
+
 
 %prep
 %setup -q
@@ -133,7 +131,6 @@ fi
 
 %post libs -p /sbin/ldconfig
 
-
 %postun libs -p /sbin/ldconfig
 
 
@@ -151,14 +148,12 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
-
 %files libs
 %defattr(-,root,root,-)
 %doc README FAQ HISTORY TODO
 %{_libdir}/libaudio.so.*
 %{_datadir}/X11/AuErrorDB
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/audio/
@@ -167,6 +162,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 24 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.9.3-4
+- moved nas to System Environment/Daemons Group
+
+* Sun May 27 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.9.3-3
+- add Japanese summary and description to libs subpackage
+
 * Fri Mar 23 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.9.3-2
 - add Japanese summary and description