SPEC: v2.6.39-100.0.22

Signed-off-by: Guru Anbalagane <guru.anbalagane@oracle.com>

diff --git a/uek-rpm/ol5/kernel-uek.spec b/uek-rpm/ol5/kernel-uek.spec
index b7b060ce4ead720695bbb63a0c02f168789f06d3..606fd9385d6f77a209714ee27d220f0ee44be1db 100644 (file)
--- a/uek-rpm/ol5/kernel-uek.spec
+++ b/uek-rpm/ol5/kernel-uek.spec
@@ -190,7 +190,7 @@ Summary: The Linux kernel
 %endif
 
 %if %{rhel}
-%define pkg_release %{distro_build}.0.21%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.0.22%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}
 
@@ -440,7 +440,7 @@ Summary: The Linux kernel
 # scripts use them.
 #
 ##%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 6.0.61-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg, mkinitrd >= 5.1.19.6-71.0.10, kexec-tools >= 1.102pre-96.1.1.el5_5.2, device-mapper-multipath >= 0.4.9-23.0.1.el5, ql2xxx-firmware, oraclelinux-release
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware = %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg, mkinitrd >= 5.1.19.6-71.0.10, kexec-tools >= 1.102pre-96.1.1.el5_5.2, device-mapper-multipath >= 0.4.9-23.0.1.el5, ql2xxx-firmware, oraclelinux-release
 
 #
 # This macro does requires, provides, conflicts, obsoletes for a kernel package.
@@ -1659,6 +1659,13 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 31 2012 Guru Anbalagane <guru.anbalagane@oracle.com> [2.6.39-100.0.22.el5uek]
+- xfs: fix acl count validation in xfs_acl_from_disk() (Dan Carpenter)
+  CVE-2012-0038
+- Updated driver version to 5.02.00.00.06.02-uek2 (Tej Parkash)
+- ocfs2: use spinlock irqsave for downconvert lock.patch (Srinivas Eeda)
+- dm-nfs-for-uek2 (Adnan Misherfi)
+
 * Thu Jan 26 2012 Guru Anbalagane <guru.anbalagane@oracle.com> [2.6.39-100.0.21.el5uek]
 - git-changelog: add Orabug and CVE (Maxim Uvarov) [Add parsing Orabug and
   CVE.]

diff --git a/uek-rpm/ol5/update-el b/uek-rpm/ol5/update-el
index 760606e1ffff82566e95fa1bfa840ca7d1024dd5..3659ea2fa3a7771c8641de0cdbf8c0a02e47e49c 100644 (file)
--- a/uek-rpm/ol5/update-el
+++ b/uek-rpm/ol5/update-el
@@ -1 +1 @@
-5.7
+5.8

diff --git a/uek-rpm/ol6/kernel-uek.spec b/uek-rpm/ol6/kernel-uek.spec
index a998e1fdd22886c901b97a2195ad8223b82586a2..51414d6908551d6e374e2620aaa09823910faefc 100644 (file)
--- a/uek-rpm/ol6/kernel-uek.spec
+++ b/uek-rpm/ol6/kernel-uek.spec
@@ -198,7 +198,7 @@ Summary: The Linux kernel
 %endif
 
 %if %{rhel}
-%define pkg_release %{distro_build}.0.21%{?dist}uek%{?buildid}
+%define pkg_release %{distro_build}.0.22%{?dist}uek%{?buildid}
 %endif
 %define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
 
@@ -442,7 +442,7 @@ Summary: The Linux kernel
 # Packages that need to be installed before the kernel is, because the %post
 # scripts use them.
 #
-%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-uek-firmware >= %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg, ql23xx-firmware
+%define kernel_prereq  fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-uek-firmware = %{rpmversion}-%{pkg_release}, /sbin/new-kernel-pkg, ql23xx-firmware
 %define initrd_prereq  dracut-kernel >= 004-242.0.3
 
 #
@@ -1675,6 +1675,13 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Jan 31 2012 Guru Anbalagane <guru.anbalagane@oracle.com> [2.6.39-100.0.22.el6uek]
+- xfs: fix acl count validation in xfs_acl_from_disk() (Dan Carpenter)
+  CVE-2012-0038
+- Updated driver version to 5.02.00.00.06.02-uek2 (Tej Parkash)
+- ocfs2: use spinlock irqsave for downconvert lock.patch (Srinivas Eeda)
+- dm-nfs-for-uek2 (Adnan Misherfi)
+
 * Thu Jan 26 2012 Guru Anbalagane <guru.anbalagane@oracle.com> [2.6.39-100.0.21.el6uek]
 - git-changelog: add Orabug and CVE (Maxim Uvarov) [Add parsing Orabug and
   CVE.]

diff --git a/uek-rpm/ol6/update-el b/uek-rpm/ol6/update-el
index a435f5a56faa6e29186dab89b1fa66313aebbe87..0cda48ac61e44f699a1d03998ae51baef9cb01be 100644 (file)
--- a/uek-rpm/ol6/update-el
+++ b/uek-rpm/ol6/update-el
@@ -1 +1 @@
-6.1
+6.2