X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=2ee7a92fec88b766a3fa6d9a8e90496d25d14048;hb=c13fd26a344e42537b2086c3db8cb96ef5d636b9;hp=cfb68b76444a198021c5cab4de140af97375235f;hpb=d1681496c48340b05e3132c4d2b54eefa0e58695;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index cfb68b764..2ee7a92fe 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -10,7 +10,7 @@ URL: %{SCMURL} %define name linux-2.6 %define module_version_varname sublevel -%define taglevel 12 +%define taglevel 15 %define sublevel 32 @@ -665,8 +665,7 @@ Source79: config-debug-rhel Source80: config-generic-rhel Source81: config-powerpc64 -Patch1: patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.4.diff -Patch2: linux-2.6-220-delta-ptrace-fix01.patch +Patch1: patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.6.diff Patch3: linux-2.6-250-ipsets.patch Patch4: linux-2.6-510-ipod.patch Patch5: linux-2.6-521-packet-tagging.patch @@ -961,8 +960,7 @@ cp %{SOURCE15} %{SOURCE1} %{SOURCE16} %{SOURCE17} %{SOURCE18} . make -f %{SOURCE20} VERSION=%{version} configs #### Planet-Lab #### -ApplyPatch patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.4.diff -ApplyPatch linux-2.6-220-delta-ptrace-fix01.patch +ApplyPatch patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.6.diff ApplyPatch linux-2.6-250-ipsets.patch ApplyPatch linux-2.6-510-ipod.patch ApplyPatch linux-2.6-521-packet-tagging.patch @@ -1784,6 +1782,15 @@ fi %endif %changelog +* Wed Mar 30 2011 S.Çağlar Onur - linux-2.6-32-15 +- refresh vs patch against latest upstream release (aka. vs2.3.0.36.29.4 --> vs2.3.0.36.29.6) + +* Wed Mar 16 2011 S.Çağlar Onur - linux-2.6-32-14 +- Do not enable CONFIG_SYSFS_DEPRECATED* options for Scientific Linux + +* Thu Mar 10 2011 S.Çağlar Onur - linux-2.6-32-13 +- bump to 2.6.32-71.18.2.el6, see https://rhn.redhat.com/errata/RHSA-2011-0329.html + * Wed Mar 2 2011 Frantisek Hrbata [2.6.32-71.18.2.el6] - [fs] sunrpc: Correct a misapplied patch (J. Bruce Fields) [678094 678146]