Browse Source

glibc: add patches from rhel6

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4312 ec354946-7b23-47d6-9f5a-488ba84defc7
iwamoto 13 years ago
parent
commit
fc540afc58
1 changed files with 24 additions and 1 deletions
  1. 24 1
      g/glibc/glibc-vl.spec

+ 24 - 1
g/glibc/glibc-vl.spec

@@ -35,7 +35,7 @@ Summary: The GNU libc libraries
 Summary(ja): GNU libc ライブラリ
 Name: glibc
 Version: %{glibcversion}
-Release: 8%{?_dist_release}
+Release: 9%{?_dist_release}
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -50,6 +50,13 @@ Source10: find_provides_glibc.sh
 Source11: find_requires_glibc.sh
 Patch0: %{name}-fedora.patch
 Patch1: %{name}-ia64-lib64.patch
+# updates or security fix
+Patch100: glibc-rh643822.patch
+Patch101: glibc-rh667974.patch 
+Patch102: glibc-rh625893.patch 
+Patch103: glibc-rh681054.patch 
+Patch104: glibc-rh645672.patch 
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: glibc-profile < 2.4
 Provides: ldconfig
@@ -100,6 +107,9 @@ BuildRequires: rpm >= 4.2-0.56
 %define __find_requires %{SOURCE11}
 %define _filter_GLIBC_PRIVATE 1
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 %description
 The glibc package contains standard libraries which are used by
 multiple programs on the system. In order to save disk space and
@@ -401,6 +411,12 @@ package or when debugging this package.
 %endif
 %endif
 
+%patch100 -p1 -b .CVE-2011-0536-1
+%patch101 -p1 -b .CVE-2011-0536-2
+%patch102 -p1 -b .CVE-2011-1095
+%patch103 -p1 -b .CVE-2011-1071
+%patch104 -p1 -b .CVE-2010-3856
+
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
 # all.
@@ -1240,6 +1256,13 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Sun Jul 10 2011 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 2.11.1-9
+- add patch100,101 for fix CVE-2011-0536
+- add patch102 for fix CVE-2011-1095
+- add patch103 for fix CVE-2011-1071
+- add patch104 for fix CVE-2010-3856
+- add Vendor/Distri tags
+
 * Wed Mar 23 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.11.1-8
 - add compat32-glibc-static