X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=99acf8cb0bcd629515c789a3b8378be6dde4364f;hb=d8b145b86f6f4b685b56ccaef7e9f5a6d4e21a9f;hp=51df7fdcc62b8702c81b88d7adc08fabd44d3ce9;hpb=899a87c65cb708a36ca5570cb496550017b0883b;p=linux-2.6.git diff --git a/kernel-2.6.spec b/kernel-2.6.spec index 51df7fdcc..99acf8cb0 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -4,13 +4,13 @@ Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} %{!?pldistro:%global pldistro planetlab} %define name linux-2.6 %define module_version_varname sublevel -%define taglevel 3 +%define taglevel 10 %define sublevel 32 #### Planet-Lab #### @@ -34,7 +34,7 @@ Summary: The Linux kernel %define rhel 1 %if %{rhel} -%define distro_build 71.7.1 +%define distro_build 71.14.1 #### Planet-Lab #### %define signmodules 0 #### Planet-Lab #### @@ -51,7 +51,7 @@ Summary: The Linux kernel # Don't stare at the awk too long, you'll go blind. %define fedora_cvs_origin 1462 %define fedora_cvs_revision() %2 -%global distro_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision: 1.18.2.7 $} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }') +%global distro_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision: 1.18.2.14 $} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }') %define distro_build %{fedora_build} %define signmodules 0 %endif @@ -111,7 +111,7 @@ Summary: The Linux kernel # kernel-kdump %define with_kdump %{?_without_kdump: 0} %{?!_without_kdump: 1} # kernel-debug -%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1} +%define with_debug %{?_without_debug: 1} %{?!_without_debug: 0} # kernel-doc %define with_doc %{?_without_doc: 0} %{?!_without_doc: 1} # kernel-headers @@ -124,8 +124,10 @@ Summary: The Linux kernel %define with_perftool %{?_without_perftool: 0} %{?!_without_perftool: 1} # perf noarch subpkg %define with_perf %{?_without_perf: 0} %{?!_without_perf: 1} +#### Planet-Lab #### # kernel-debuginfo -%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} +%define with_debuginfo %{?_without_debuginfo: 1} %{?!_without_debuginfo: 0} +#### Planet-Lab #### # kernel-bootwrapper (for creating zImages from kernel + initrd) %define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1} # Want to build a the vsdo directories installed @@ -197,7 +199,7 @@ Summary: The Linux kernel %endif # The kernel tarball/base version -%define kversion 2.6.32-71.7.1.el6 +%define kversion 2.6.32-71.14.1.el6 %define make_target bzImage @@ -491,9 +493,9 @@ Summary: The Linux kernel # #### Planet-Lab #### %if "%{distro}" == "Fedora" && %{distrorelease} >= 12 -%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release}, grubby >= 7.0.4-1 +%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, grubby >= 7.0.4-1 %else -%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, kernel-firmware >= %{rpmversion}-%{pkg_release} +%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, %endif #### Planet-Lab #### @@ -504,7 +506,7 @@ Summary: The Linux kernel %if "%{distro}" == "Fedora" && %{distrorelease} >= 12 %define initrd_prereq mkinitrd >= 6.0.61-1 %else -%define initrd_prereq mkinitrd >= 6.0.19-1 +%define initrd_prereq mkinitrd >= 5.1 %endif #### Planet-Lab #### %endif @@ -601,7 +603,7 @@ BuildConflicts: rhbuildsys(DiskFree) < 7Gb %define debuginfo_args --strict-build-id %endif -Source0: linux-2.6.32-71.7.1.el6.tar.bz2 +Source0: linux-2.6.32-71.14.1.el6.tar.bz2 Source1: Makefile.common @@ -661,7 +663,7 @@ Source79: config-debug-rhel Source80: config-generic-rhel Source81: config-powerpc64 -Patch1: patch-2.6.32-71.7.1.el6-vs2.3.0.36.29.4.diff +Patch1: patch-2.6.32-71.14.1.el6-vs2.3.0.36.29.4.diff Patch2: linux-2.6-220-delta-ptrace-fix01.patch Patch3: linux-2.6-250-ipsets.patch Patch4: linux-2.6-510-ipod.patch @@ -682,6 +684,7 @@ Patch18: linux-2.6-650-hangcheck-reboot.patch Patch19: linux-2.6-660-nmi-watchdog-default.patch Patch20: linux-2.6-680-htb-hysteresis-tso.patch +Patch10000: linux-2.6-10000-gcc-4.5.patch # empty final patch file to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch @@ -956,7 +959,7 @@ cp %{SOURCE15} %{SOURCE1} %{SOURCE16} %{SOURCE17} %{SOURCE18} . make -f %{SOURCE20} VERSION=%{version} configs #### Planet-Lab #### -ApplyPatch patch-2.6.32-71.7.1.el6-vs2.3.0.36.29.4.diff +ApplyPatch patch-2.6.32-71.14.1.el6-vs2.3.0.36.29.4.diff ApplyPatch linux-2.6-220-delta-ptrace-fix01.patch ApplyPatch linux-2.6-250-ipsets.patch ApplyPatch linux-2.6-510-ipod.patch @@ -977,6 +980,7 @@ ApplyPatch linux-2.6-640-netlink-audit-hack.patch ApplyPatch linux-2.6-650-hangcheck-reboot.patch ApplyPatch linux-2.6-660-nmi-watchdog-default.patch ApplyPatch linux-2.6-680-htb-hysteresis-tso.patch +ApplyPatch linux-2.6-10000-gcc-4.5.patch #### Planet-Lab #### ApplyOptionalPatch linux-kernel-test.patch @@ -1552,7 +1556,11 @@ fi\ %if %{with_dracut}\ /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --mkinitrd --dracut --depmod --update %{KVERREL}%{?1:.%{1}} $NEWKERNARGS || exit $?\ %else\ +%if "%{distro}" == "Fedora" && %{distrorelease} >= 12\ /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --mkinitrd --depmod --update %{KVERREL}%{?1:.%{1}} $NEWKERNARGS || exit $?\ +%else\ +/sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}%{?1:.%{1}} || exit $?\ +%endif\ %endif}\ %if "%{distro}" == "Fedora" && %{distrorelease} >= 12\ /sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --rpmposttrans %{KVERREL}%{?1:.%{1}} || exit $?\ @@ -1658,12 +1666,14 @@ fi /usr/include/* %endif +%if 0 %if %{with_firmware} %files firmware %defattr(-,root,root) /lib/firmware/* %doc linux-%{kversion}.%{_target_cpu}/firmware/WHENCE %endif +%endif %if %{with_bootwrapper} %files bootwrapper @@ -1727,6 +1737,7 @@ fi /etc/ld.so.conf.d/kernel-%{KVERREL}%{?2:.%{2}}.conf\ %endif\ /lib/modules/%{KVERREL}%{?2:.%{2}}/modules.*\ +/lib/firmware/*\ %if %{with_dracut}\ %ghost /boot/initramfs-%{KVERREL}%{?2:.%{2}}.img\ %else\ @@ -1771,6 +1782,30 @@ fi %endif %changelog +* Tue Jan 25 2011 S.Çağlar Onur - linux-2.6-32-10 +- disable debug and debuginfo packages for all flavors. Also incorporate kernel-firmware package's content into kernel RPM. + +* Wed Jan 12 2011 S.Çağlar Onur - linux-2.6-32-9 +- bump to kernel-2.6.32-71.14.1.el6, see https://rhn.redhat.com/errata/RHSA-2011-0007.html for details + +* Mon Jan 10 2011 S.Çağlar Onur - linux-2.6-32-8 +- Fix override: reassigning to symbol SYSFS_DEPRECATED_V2 build warning + +* Thu Jan 06 2011 S.Çağlar Onur - linux-2.6-32-7 +- Adjust mkinitrd requirement for CentOS 5 + +* Wed Jan 05 2011 S.Çağlar Onur - linux-2.6-32-6 +- Disable debuginfo packages for CentOS 5 + +* Wed Jan 5 2011 Frantisek Hrbata [2.6.32-71.14.1.el6] +- [kvm] x86: zero kvm_vcpu_events->interrupt.pad (Marcelo Tosatti) [665471 665409] {CVE-2010-4525} + +* Wed Dec 22 2010 S.Çağlar Onur - linux-2.6-32-5 +- Fix problems caused by gcc 4.5.1 on F14 + +* Fri Dec 17 2010 S.Çağlar Onur - linux-2.6-32-4 +- Fix build problems for Fedora 8 and 12 + * Thu Dec 16 2010 S.Çağlar Onur - linux-2.6-32-3 - Tweak vserver configs based on Daniel's suggestions - Add appropriate postinstall steps required by PL nodes @@ -1779,9 +1814,63 @@ fi * Fri Dec 10 2010 S.Çağlar Onur - linux-2.6-32-2 - Fix F14 build problems +* Thu Dec 9 2010 Frantisek Hrbata [2.6.32-71.13.1.el6] +- [scsi] lpfc: Fixed crashes for NULL pnode dereference (Rob Evers) [660589 635733] + * Wed Dec 08 2010 S.Çağlar Onur - linux-2.6-32-1 - Bump to latest RHEL6 kernel +* Wed Dec 8 2010 Frantisek Hrbata [2.6.32-71.12.1.el6] +- [netdrv] igb: only use vlan_gro_receive if vlans are registered (Stefan Assmann) [652804 660192] {CVE-2010-4263} +- [net] core: neighbour update Oops (Jiri Pirko) [660591 658518] +- [scsi] lpfc: Set heartbeat timer off by default (Rob Evers) [660244 655935] +- [scsi] lpfc: Fixed crashes for BUG_ONs hit in the lpfc_abort_handler (Rob Evers) [659611 645882] + +* Mon Dec 6 2010 Frantisek Hrbata [2.6.32-71.11.1.el6] +- [kernel] posix-cpu-timers: workaround to suppress the problems with mt exec (Oleg Nesterov) [656267 656268] {CVE-2010-4248} +- [fs] bio: take care not overflow page count when mapping/copying user data (Danny Feng) [652530 652531] {CVE-2010-4162} +- [net] can-bcm: fix minor heap overflow (Danny Feng) [651846 651847] {CVE-2010-3874} +- [net] filter: make sure filters dont read uninitialized memory (Jiri Pirko) [651704 651705] {CVE-2010-4158} +- [net] inet_diag: Make sure we actually run the same bytecode we audited (Jiri Pirko) [651268 651269] {CVE-2010-3880} +- [v4l] ivtvfb: prevent reading uninitialized stack memory (Mauro Carvalho Chehab) [648832 648833] {CVE-2010-4079} +- [drm] via/ioctl.c: prevent reading uninitialized stack memory (Dave Airlie) [648718 648719] {CVE-2010-4082} +- [char] nozomi: clear data before returning to userspace on TIOCGICOUNT (Mauro Carvalho Chehab) [648705 648706] {CVE-2010-4077} +- [serial] clean data before filling it on TIOCGICOUNT (Mauro Carvalho Chehab) [648702 648703] {CVE-2010-4075} +- [net] af_unix: limit unix_tot_inflight (Neil Horman) [656761 656762] {CVE-2010-4249} +- [block] check for proper length of iov entries in blk_rq_map_user_iov() (Danny Feng) [652958 652959] {CVE-2010-4163} +- [net] Limit sendto()/recvfrom()/iovec total length to INT_MAX (Jiri Pirko) [651894 651895] {CVE-2010-4160} +- [netdrv] mlx4: Add OFED-1.5.2 patch to increase log_mtts_per_seg (Jay Fenlason) [643815 637284] +- [kernel] kbuild: fix external module compiling (Aristeu Rozanski) [658879 655231] +- [net] bluetooth: Fix missing NULL check (Jarod Wilson) [655667 655668] {CVE-2010-4242} +- [kernel] ipc: initialize structure memory to zero for compat functions (Danny Feng) [648694 648695] {CVE-2010-4073} +- [kernel] shm: fix information leak to userland (Danny Feng) [648688 648689] {CVE-2010-4072} +- [md] dm: remove extra locking when changing device size (Mike Snitzer) [653900 644380] +- [block] read i_size with i_size_read() (Mike Snitzer) [653900 644380] +- [kbuild] don't sign out-of-tree modules (Aristeu Rozanski) [655122 653507] + +* Mon Nov 29 2010 Frantisek Hrbata [2.6.32-71.10.1.el6] +- [fs] xfs: prevent reading uninitialized stack memory (Dave Chinner) [630808 630809] {CVE-2010-3078} +- [net] fix rds_iovec page count overflow (Jiri Pirko) [647423 647424] {CVE-2010-3865} +- [scsi] Fix megaraid_sas driver SLAB memory leak detected with CONFIG_DEBUG_SLAB (Shyam Iyer) [649436 633836] +- [usb] serial/mos*: prevent reading uninitialized stack memory (Don Zickus) [648697 648698] {CVE-2010-4074} +- [kernel] ecryptfs_uid_hash() buffer overflow (Jerome Marchand) [626320 611388] {CVE-2010-2492} +- [sound] seq/oss - Fix double-free at error path of snd_seq_oss_open() (Jaroslav Kysela) [630554 630555] {CVE-2010-3080} +- [virt] virtio-net: init link state correctly (Jason Wang) [653340 646369] +- [netdrv] prevent reading uninitialized memory in hso driver (Thomas Graf) [633143 633144] {CVE-2010-3298} + +* Sun Nov 21 2010 Frantisek Hrbata [2.6.32-71.9.1.el6] +- [fs] Do not mix FMODE_ and O_ flags with break_lease() and may_open() (Harshula Jayasuriya) [648408 642677] +- [fs] aio: check for multiplication overflow in do_io_submit (Jeff Moyer) [629450 629451] {CVE-2010-3067} +- [net] fix info leak from kernel in ethtool operation (Neil Horman) [646727 646728] {CVE-2010-3861} +- [net] packet: fix information leak to userland (Jiri Pirko) [649899 649900] {CVE-2010-3876} +- [net] clean up info leak in act_police (Neil Horman) [636393 636394] {CVE-2010-3477} +- [kernel] sys_semctl: fix kernel stack leakage (Danny Feng) [648723 648724] {CVE-2010-4083} +- [sound] sound/pci/rme9652: prevent reading uninitialized stack memory (Stanislaw Gruszka) [648710 648715 648711 648716] {CVE-2010-4080 CVE-2010-4081} +- [mm] Prevent Out Of Memory when changing cpuset's mems on NUMA (Larry Woodman) [651996 597127] + +* Thu Oct 28 2010 Frantisek Hrbata [2.6.32-71.8.1.el6] +- [mm] remove false positive THP pmd_present BUG_ON (Andrea Arcangeli) [647391 646384] + * Wed Oct 27 2010 Frantisek Hrbata [2.6.32-71.7.1.el6] - [drm] ttm: fix regression introduced in dfb4a4250168008c5ac61e90ab2b86f074a83a6c (Dave Airlie) [646994 644896]