- openSUSE Commits

commit OpenOffice_org-artwork for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package OpenOffice_org-artwork for openSUSE:Factory checked in at Fri Jan 29 14:31:01 CET 2010. -------- --- OpenOffice_org-artwork/OpenOffice_org-artwork.changes 2009-12-07 22:18:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org-artwork/OpenOffice_org-artwork.changes 2010-01-27 20:53:52.000000000 +0100 @@ -1,0 +2,18 @@ +Wed Jan 27 20:29:22 CET 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m11 (3.2-rc4) +- updated ooo-build to version 3.2.0.4 (3.2-rc4) + +------------------------------------------------------------------- +Wed Jan 13 19:32:02 CET 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m9 +- updated ooo-build to version 3.2.0.2 (3.2-rc2) + +------------------------------------------------------------------- +Sun Dec 20 19:38:12 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m8 +- updated ooo-build to version 3.2.0.1 (3.2-rc1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo320-m7-artwork.tar.bz2 New: ---- ooo320-m11-artwork.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-artwork.spec ++++++ --- /var/tmp/diff_new_pack.wlOJQl/_old 2010-01-29 14:30:39.000000000 +0100 +++ /var/tmp/diff_new_pack.wlOJQl/_new 2010-01-29 14:30:39.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package OpenOffice_org-artwork (Version 3.1.99.4) +# spec file for package OpenOffice_org-artwork (Version 3.2.0.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,16 @@ Name: OpenOffice_org-artwork -Version: 3.1.99.4 +Version: 3.2.0.4 Release: 1 -%define ooo_build_version 3.1.99.4 +%define ooo_build_version 3.2.0.4 %define piece artwork #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-bootstrap = %version BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib python-devel recode unixODBC-devel unzip xml-commons-apis xorg-x11 zip %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m7 +%define ooo_build_tag ooo320-m11 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m7-artwork.tar.bz2 -> ooo320-m11-artwork.tar.bz2 ++++++ OpenOffice_org-artwork/ooo320-m7-artwork.tar.bz2 /mounts/work_src_done/STABLE/OpenOffice_org-artwork/ooo320-m11-artwork.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenOffice_org for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package OpenOffice_org for openSUSE:Factory checked in at Fri Jan 29 14:30:12 CET 2010. -------- --- OpenOffice_org/OpenOffice_org.changes 2009-12-07 22:16:02.000000000 +0100 +++ /mounts/work_src_done/STABLE/OpenOffice_org/OpenOffice_org.changes 2010-01-27 20:53:44.000000000 +0100 @@ -1,0 +2,86 @@ +Wed Jan 27 20:29:22 CET 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m11 (3.2-rc4) +- updated ooo-build to version 3.2.0.4 (3.2-rc4): + * Common bits: + * valgrind warnings + * increase the default java stack size to 1MB (bnc#572372) + * Calc bits: + * CSV dialog parameters storing (i#108645) + * hidden rows heights XLS export (bnc#573938) + * pagenation when printing selected cells (bnc#569328) + * drilling down on field member crasher (i#103347, bnc#573456) + * Write bits: + * bullets RTF export (bnc#569266) + * create style via API (i#108426) + * VBA bits: + * library location so VBA services work for Windows + * l10n bits: + * Spanish translations fix + * build bits: + * presenter screen extension build + * localize framework improvements + +------------------------------------------------------------------- +Wed Jan 13 19:32:02 CET 2010 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m9 +- updated ooo-build to version 3.2.0.2 (3.2-rc2): + * performance: + * faster XLSX export (bnc#558577) + * Common bits: + * fixes from valgrind test + * SVG import crasher (bnc#560255) + * AFM parser crasher (bnc#535485) + * Base bits: + * Table wizard does not start (i#107917) [upstream, Rene] + * Calc bits: + * correctly query last flagged row (bnc#568146) + * error when saving ODS document as XLSX (bnc#566581) + * dis-joint ranges highlighting while in chart mode (bnc#568016) + * Writer bits: + * fields DOC import crasher (bnc#569348) + * KDE4 bits: + * override existing files + * multiple auto-extension checkboxes + * 3rd party plugin should not cause crash (bnc#548354) + * VBA bits: + * 'exe' checkbox under Load/Save|VBA Properties options + * build bits: + * update the prebuilt gdocs version to 2.1.0 (bnc#568399) + +------------------------------------------------------------------- +Sun Dec 20 19:38:12 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo320-m8 +- updated ooo-build to version 3.2.0.1 (3.2-rc1): + * performance: + * DBF import performance by 75% (bnc#558505) + * string intern optimization for PC 850 code pages + * do not load any VBA crap from non MSO documents + * do not always load presenter screen (i#107568) + * Common bits: + * layout dialogs crashers + * few WMF/EMF+ import fixes [upstream, Radek] + * file read from sftp-folder (bnc#465102) + * pasting from Firefox crashers (bnc#553819) + * unnecessary exceptions in sfx2 (i#107512) + * better wording of the always save option check box + * saving when locking is not supported (bnc#560877, i#107511) + * Calc bits: + * Lotus import crasher (bnc#565184) + * connector styles XLS import (bnc#559393) + * minor bugs in datapilot ODS import/export + * line count of move-copy sheet dialog (bnc#559438) + * random ListBox::CalcMinimumSize() results (bnc#557230) + * support XLSX export for more that 65536 rows (bnc#504623) + * conflict between formula and decimal separators (bnc#556142) + * number of the sheet in the "Insert Sheet" dialog (bnc#559445) + * Writer bits: + * image position in DOC import + * update table format when pasting a value (bnc#564789) + * VBA bits: + * macro properties fixup (bnc#566030) + * listindex, radiobutton, listbox events (bnc#560355, bnc#561639) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- minmem ooo320-m7-postprocess.tar.bz2 New: ---- ooo320-m11-postprocess.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.OGiNGa/_old 2010-01-29 14:27:54.000000000 +0100 +++ /var/tmp/diff_new_pack.OGiNGa/_new 2010-01-29 14:27:54.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package OpenOffice_org (Version 3.1.99.4) +# spec file for package OpenOffice_org (Version 3.2.0.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,9 +21,9 @@ Name: OpenOffice_org # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -Version: 3.1.99.4 +Version: 3.2.0.4 Release: 1 -%define ooo_build_version 3.1.99.4 +%define ooo_build_version 3.2.0.4 %define piece postprocess BuildRequires: ImageMagick ant ant-apache-regexp bison boost-devel ccache cups-devel curl-devel db-devel flac-devel flex gnome-vfs2-devel gperf gtk2-devel icu java-devel kdelibs3-devel krb5 libexif mono-devel neon-devel openldap2-devel pam-devel perl-Archive-Zip perl-Compress-Zlib postgresql-devel python-devel python-xml recode unixODBC-devel unzip update-desktop-files xml-commons-apis xorg-x11 zip # mozilla stuff @@ -79,7 +79,7 @@ BuildRequires: OpenOffice_org-filters-devel = %version %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo320-m7 +%define ooo_build_tag ooo320-m11 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite AutoReqProv: on ++++++ ooo320-m7-postprocess.tar.bz2 -> ooo320-m11-postprocess.tar.bz2 ++++++ ++++ 5080 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kernel-source for openSUSE:Factory
by root＠Hilbert.suse.de 29 Jan '10

29 Jan '10

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at Fri Jan 29 14:26:56 CET 2010. -------- --- kernel-source/kernel-debug.changes 2009-12-04 04:05:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2010-01-27 20:12:59.000000000 +0100 @@ -1,0 +2,2210 @@ +Wed Jan 27 14:55:29 CET 2010 - jkosina(a)suse.cz + +- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch: + pci: fix nested spinlock hang in aer_inject (bnc#573578). + +------------------------------------------------------------------- +Wed Jan 27 14:34:07 CET 2010 - mmarek(a)suse.cz + +- Update config files: disable generic_serial users. +- patches.drivers/reenable-generic_serial: Delete. +- rpm/generic_serial-blacklist: Delete (bnc#569676). + +------------------------------------------------------------------- +Wed Jan 27 12:57:31 CET 2010 - jengelh(a)medozas.de + +- remove patches.suse/netfilter-ipv4options [bnc#490142] + +------------------------------------------------------------------- +Wed Jan 27 00:14:42 CET 2010 - jeffm(a)suse.com + +- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh. + +------------------------------------------------------------------- +Tue Jan 26 07:00:33 CET 2010 - knikanth(a)suse.de + +- supported.conf: Fix misspelt dm-region-hash and mark it supported + correctly (bnc#565962) + +------------------------------------------------------------------- +Mon Jan 25 21:55:49 CET 2010 - gregkh(a)suse.de + +- Update to 2.6.32.6 + - security fixes + - bugfixes + - obsoletes: + - patches.drivers/8250_pnp-wacom-add + - patches.drivers/staging-hv-fix-smp-problems-in-the-hyperv-core-code.patch + - patches.kernel.org/scsi-enclosure-fix-oops-while-iterating-enclosure_status… + - patches.kernel.org/x86-msr-cpuid-register-enough-minors-for-the-msr-and-cpu… + +------------------------------------------------------------------- +Mon Jan 25 20:43:56 CET 2010 - jeffm(a)suse.com + +- supported.conf: Added sparse_keymap (eeepc_laptop depends on it) + +------------------------------------------------------------------- +Mon Jan 25 20:07:23 CET 2010 - npiggin(a)suse.de + +- patches.suse/slab-handle-memoryless-nodes-v2a.patch: slab - + handle memoryless nodes V2a (bnc#436025, bnc#570492). + +------------------------------------------------------------------- +Mon Jan 25 17:54:26 CET 2010 - jeffm(a)suse.com + +- Updated to 2.6.33-rc5. + - Eliminated 2 patches. + +------------------------------------------------------------------- +Mon Jan 25 16:46:19 CET 2010 - trenn(a)suse.de + +- Update config files. +- patches.arch/x86_mce_intel_decode_physical_address.patch: x86, + mce: Xeon75xx specific interface to get corrected memory error + information (bnc#573380, fate#307738). +- patches.arch/x86_mce_intel_decode_physical_address_compile_fix.patch: + x86, mce: Xeon75xx specific interface to get corrected memory + error information (bnc#573380, fate#307738). +- patches.arch/x86_mce_intel_decode_physical_address_rename_fix.patch: + x86, mce: Rename cpu_specific_poll to mce_cpu_specific_poll + (bnc#573380, fate#307738). +- patches.xen/xen3-auto-arch-x86.diff: Refresh. + +------------------------------------------------------------------- +Mon Jan 25 14:13:08 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-57-cx5051-toshiba-quirk: + ALSA: hda - Add support for Toshiba Satellite M300 + (bnc#492233,bnc#565904). +- patches.drivers/alsa-sp1-hda-58-cx5051-lenovo-mute-fix: ALSA: + hda - Change headphone pin control with master volume on cx5051 + (bnc#573050). + +------------------------------------------------------------------- +Mon Jan 25 12:30:14 CET 2010 - trenn(a)suse.de + +- patches.arch/x86_enable_tsc_sync_check_again.patch: x86: + Reenable TSC sync check at boot, even with NONSTOP_TSC + (bnc#573379). + +------------------------------------------------------------------- +Mon Jan 25 12:22:55 CET 2010 - trenn(a)suse.de + +- patches.arch/x86_node_hotplug_parse_srat_fix_2nd_ver.patch: + x86: Set hotpluggable nodes in nodes_possible_map (bnc#567216). +- patches.arch/x86_node_hotplug_parse_srat_fix.patch: Delete. + +------------------------------------------------------------------- +Mon Jan 25 11:45:39 CET 2010 - trenn(a)suse.de + +- supported.conf: + Add mce-inject and hwpoison-inject so that Intel can easier test + this. As these are debug drivers, they might get reverted from + support.conf again if kernel-extra package gets fixed for SLES, + only seem to exist for SLED because "NCC is not yet working for SP1". + (bnc#572552). + +------------------------------------------------------------------- +Sat Jan 23 02:54:31 CET 2010 - bphilips(a)suse.de + +- patches.drivers/tg3-updates-from-f4188d-to-ba5b0bf.patch: tg3: + updates from f4188d to ba5b0bf (bnc#573237). + +------------------------------------------------------------------- +Sat Jan 23 01:57:20 CET 2010 - rjw(a)suse.de + +- patches.arch/x86-irq-check-move_in_progress-before-freeing-the-vector-mapping.patch: + x86, irq: Check move_in_progress before freeing the vector + mapping (bnc#558247). + +------------------------------------------------------------------- +Sat Jan 23 01:36:27 CET 2010 - rjw(a)suse.de + +- patches.arch/x86-apic-use-logical-flat-for-systems-with-8-or-fewer-logical-cpus.patch: + x86, apic: use logical flat for systems with <= 8 logical cpus + (bnc#567510). +- patches.arch/x86-revert-apic-Use-logical-flat-on-intel-with-8-or-fewer-logical-cpus.patch: + x86: Revert "apic: Use logical flat on intel with <= 8 logical + cpus" (bnc#567510). + +------------------------------------------------------------------- +Sat Jan 23 00:52:57 CET 2010 - gregkh(a)suse.de + +- Update to 2.6.32.5: + - security fixes + - bug fixes + - obsoletes: + - patches.drivers/alsa-sp1-hda-54-alc861-capture-fix + - patches.fixes/hid-add-device-ids-for-new-model-of-apple-wireless-keyboard + - patches.fixes/megaraid_sas-fix-permissions-on-poll_mode_io + - patches.fixes/reiserfs-truncate-blocks-not-used-by-a-write.patch + +------------------------------------------------------------------- +Fri Jan 22 21:11:54 CET 2010 - tonyj(a)suse.de + +- Update config files: drop UTRACE from default s390 configs + as per communication from Ihno. + +------------------------------------------------------------------- +Fri Jan 22 19:48:25 CET 2010 - gregkh(a)suse.de + +- patches.kernel.org/x86-msr-cpuid-register-enough-minors-for-the-msr-and-cpu…: + x86, msr/cpuid: Register enough minors for the MSR and CPUID + drivers (bnc#572720). + +------------------------------------------------------------------- +Fri Jan 22 18:54:28 CET 2010 - gregkh(a)suse.de + +- patches.kernel.org/scsi-enclosure-fix-oops-while-iterating-enclosure_status…: + SCSI: enclosure: fix oops while iterating enclosure_status array + (bnc#572818). +- patches.fixes/enclosure-fix-oops-while-iterating-enclosure_status-array: + Delete. + +------------------------------------------------------------------- +Fri Jan 22 15:50:12 CET 2010 - duwe(a)suse.de + +- Update config files. +- patches.arch/ppc-extended_h_cede-update-to-mainline: Incremental + patch set to sync H_CEDE with actual mainline (bnc#550447, + FATE#307059). + +------------------------------------------------------------------- +Fri Jan 22 15:30:21 CET 2010 - trenn(a)suse.de + +- Update config files. + Add DMAR to -trace flavor -> get in sync with -default + +------------------------------------------------------------------- +Fri Jan 22 09:17:21 CET 2010 - hare(a)suse.de + +- patches.fixes/qla2xxx-restore-pci-state-after-eeh-recovery: + Re-save PCI state after EEH recovery (bnc#570233). + +------------------------------------------------------------------- +Fri Jan 22 07:38:23 CET 2010 - jjolly(a)suse.de + +- patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch: + zfcp: introduce BSG timeout callback (BNC#572659). +- patches.arch/s390-06-02-zfcp-set-hw-timeout-requested-by-bsg.patch: + zfcp: set HW timeout requested by BSG request (BNC#572659). + +------------------------------------------------------------------- +Fri Jan 22 03:20:49 CET 2010 - bphilips(a)suse.de + +- patches.drivers/netxen-8f9b3f-to-c651a8.patch: netxen: 8f9b3f + to c651a8 (bnc#572832). + ++++ 2013 more lines (skipped) ++++ between kernel-source/kernel-debug.changes ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes kernel-default.changes: same change kernel-desktop.changes: same change New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-docs.changes 2010-01-27 20:13:04.000000000 +0100 @@ -0,0 +1,19262 @@ +------------------------------------------------------------------- +Wed Jan 27 14:55:29 CET 2010 - jkosina(a)suse.cz + +- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch: + pci: fix nested spinlock hang in aer_inject (bnc#573578). + +------------------------------------------------------------------- +Wed Jan 27 14:34:07 CET 2010 - mmarek(a)suse.cz + +- Update config files: disable generic_serial users. +- patches.drivers/reenable-generic_serial: Delete. +- rpm/generic_serial-blacklist: Delete (bnc#569676). + +------------------------------------------------------------------- +Wed Jan 27 12:57:31 CET 2010 - jengelh(a)medozas.de + +- remove patches.suse/netfilter-ipv4options [bnc#490142] + +------------------------------------------------------------------- +Wed Jan 27 00:14:42 CET 2010 - jeffm(a)suse.com + +- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh. + +------------------------------------------------------------------- +Tue Jan 26 07:00:33 CET 2010 - knikanth(a)suse.de + +- supported.conf: Fix misspelt dm-region-hash and mark it supported + correctly (bnc#565962) + +------------------------------------------------------------------- +Mon Jan 25 21:55:49 CET 2010 - gregkh(a)suse.de + +- Update to 2.6.32.6 + - security fixes + - bugfixes + - obsoletes: + - patches.drivers/8250_pnp-wacom-add + - patches.drivers/staging-hv-fix-smp-problems-in-the-hyperv-core-code.patch + - patches.kernel.org/scsi-enclosure-fix-oops-while-iterating-enclosure_status… + - patches.kernel.org/x86-msr-cpuid-register-enough-minors-for-the-msr-and-cpu… + +------------------------------------------------------------------- +Mon Jan 25 20:43:56 CET 2010 - jeffm(a)suse.com + +- supported.conf: Added sparse_keymap (eeepc_laptop depends on it) + +------------------------------------------------------------------- +Mon Jan 25 20:07:23 CET 2010 - npiggin(a)suse.de + +- patches.suse/slab-handle-memoryless-nodes-v2a.patch: slab - + handle memoryless nodes V2a (bnc#436025, bnc#570492). + +------------------------------------------------------------------- +Mon Jan 25 17:54:26 CET 2010 - jeffm(a)suse.com + +- Updated to 2.6.33-rc5. + - Eliminated 2 patches. + +------------------------------------------------------------------- +Mon Jan 25 16:46:19 CET 2010 - trenn(a)suse.de + +- Update config files. +- patches.arch/x86_mce_intel_decode_physical_address.patch: x86, + mce: Xeon75xx specific interface to get corrected memory error + information (bnc#573380, fate#307738). +- patches.arch/x86_mce_intel_decode_physical_address_compile_fix.patch: + x86, mce: Xeon75xx specific interface to get corrected memory + error information (bnc#573380, fate#307738). +- patches.arch/x86_mce_intel_decode_physical_address_rename_fix.patch: + x86, mce: Rename cpu_specific_poll to mce_cpu_specific_poll + (bnc#573380, fate#307738). +- patches.xen/xen3-auto-arch-x86.diff: Refresh. + +------------------------------------------------------------------- +Mon Jan 25 14:13:08 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-57-cx5051-toshiba-quirk: + ALSA: hda - Add support for Toshiba Satellite M300 + (bnc#492233,bnc#565904). +- patches.drivers/alsa-sp1-hda-58-cx5051-lenovo-mute-fix: ALSA: + hda - Change headphone pin control with master volume on cx5051 + (bnc#573050). + +------------------------------------------------------------------- +Mon Jan 25 12:30:14 CET 2010 - trenn(a)suse.de + +- patches.arch/x86_enable_tsc_sync_check_again.patch: x86: + Reenable TSC sync check at boot, even with NONSTOP_TSC + (bnc#573379). + +------------------------------------------------------------------- +Mon Jan 25 12:22:55 CET 2010 - trenn(a)suse.de + +- patches.arch/x86_node_hotplug_parse_srat_fix_2nd_ver.patch: + x86: Set hotpluggable nodes in nodes_possible_map (bnc#567216). +- patches.arch/x86_node_hotplug_parse_srat_fix.patch: Delete. + +------------------------------------------------------------------- +Mon Jan 25 11:45:39 CET 2010 - trenn(a)suse.de + +- supported.conf: + Add mce-inject and hwpoison-inject so that Intel can easier test + this. As these are debug drivers, they might get reverted from + support.conf again if kernel-extra package gets fixed for SLES, + only seem to exist for SLED because "NCC is not yet working for SP1". + (bnc#572552). + +------------------------------------------------------------------- +Sat Jan 23 02:54:31 CET 2010 - bphilips(a)suse.de + +- patches.drivers/tg3-updates-from-f4188d-to-ba5b0bf.patch: tg3: + updates from f4188d to ba5b0bf (bnc#573237). + +------------------------------------------------------------------- +Sat Jan 23 01:57:20 CET 2010 - rjw(a)suse.de + +- patches.arch/x86-irq-check-move_in_progress-before-freeing-the-vector-mapping.patch: + x86, irq: Check move_in_progress before freeing the vector + mapping (bnc#558247). + +------------------------------------------------------------------- +Sat Jan 23 01:36:27 CET 2010 - rjw(a)suse.de + +- patches.arch/x86-apic-use-logical-flat-for-systems-with-8-or-fewer-logical-cpus.patch: + x86, apic: use logical flat for systems with <= 8 logical cpus + (bnc#567510). +- patches.arch/x86-revert-apic-Use-logical-flat-on-intel-with-8-or-fewer-logical-cpus.patch: + x86: Revert "apic: Use logical flat on intel with <= 8 logical + cpus" (bnc#567510). + +------------------------------------------------------------------- +Sat Jan 23 00:52:57 CET 2010 - gregkh(a)suse.de + +- Update to 2.6.32.5: + - security fixes + - bug fixes + - obsoletes: + - patches.drivers/alsa-sp1-hda-54-alc861-capture-fix + - patches.fixes/hid-add-device-ids-for-new-model-of-apple-wireless-keyboard + - patches.fixes/megaraid_sas-fix-permissions-on-poll_mode_io + - patches.fixes/reiserfs-truncate-blocks-not-used-by-a-write.patch + +------------------------------------------------------------------- +Fri Jan 22 21:11:54 CET 2010 - tonyj(a)suse.de + +- Update config files: drop UTRACE from default s390 configs + as per communication from Ihno. + +------------------------------------------------------------------- +Fri Jan 22 19:48:25 CET 2010 - gregkh(a)suse.de + +- patches.kernel.org/x86-msr-cpuid-register-enough-minors-for-the-msr-and-cpu…: + x86, msr/cpuid: Register enough minors for the MSR and CPUID + drivers (bnc#572720). + +------------------------------------------------------------------- +Fri Jan 22 18:54:28 CET 2010 - gregkh(a)suse.de + +- patches.kernel.org/scsi-enclosure-fix-oops-while-iterating-enclosure_status…: + SCSI: enclosure: fix oops while iterating enclosure_status array + (bnc#572818). +- patches.fixes/enclosure-fix-oops-while-iterating-enclosure_status-array: + Delete. + +------------------------------------------------------------------- +Fri Jan 22 15:50:12 CET 2010 - duwe(a)suse.de + +- Update config files. +- patches.arch/ppc-extended_h_cede-update-to-mainline: Incremental + patch set to sync H_CEDE with actual mainline (bnc#550447, + FATE#307059). + +------------------------------------------------------------------- +Fri Jan 22 15:30:21 CET 2010 - trenn(a)suse.de + +- Update config files. + Add DMAR to -trace flavor -> get in sync with -default + +------------------------------------------------------------------- +Fri Jan 22 09:17:21 CET 2010 - hare(a)suse.de + +- patches.fixes/qla2xxx-restore-pci-state-after-eeh-recovery: + Re-save PCI state after EEH recovery (bnc#570233). + +------------------------------------------------------------------- +Fri Jan 22 07:38:23 CET 2010 - jjolly(a)suse.de + +- patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch: + zfcp: introduce BSG timeout callback (BNC#572659). +- patches.arch/s390-06-02-zfcp-set-hw-timeout-requested-by-bsg.patch: + zfcp: set HW timeout requested by BSG request (BNC#572659). + +------------------------------------------------------------------- +Fri Jan 22 03:20:49 CET 2010 - bphilips(a)suse.de + +- patches.drivers/netxen-8f9b3f-to-c651a8.patch: netxen: 8f9b3f + to c651a8 (bnc#572832). ++++ 19065 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-docs.changes --- kernel-source/kernel-pae.changes 2009-12-04 04:06:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-pae.changes 2010-01-27 20:13:05.000000000 +0100 @@ -1,0 +2,2210 @@ +Wed Jan 27 14:55:29 CET 2010 - jkosina(a)suse.cz + +- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch: + pci: fix nested spinlock hang in aer_inject (bnc#573578). + +------------------------------------------------------------------- +Wed Jan 27 14:34:07 CET 2010 - mmarek(a)suse.cz + +- Update config files: disable generic_serial users. +- patches.drivers/reenable-generic_serial: Delete. +- rpm/generic_serial-blacklist: Delete (bnc#569676). + +------------------------------------------------------------------- +Wed Jan 27 12:57:31 CET 2010 - jengelh(a)medozas.de + +- remove patches.suse/netfilter-ipv4options [bnc#490142] + +------------------------------------------------------------------- +Wed Jan 27 00:14:42 CET 2010 - jeffm(a)suse.com + +- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh. + +------------------------------------------------------------------- +Tue Jan 26 07:00:33 CET 2010 - knikanth(a)suse.de + +- supported.conf: Fix misspelt dm-region-hash and mark it supported + correctly (bnc#565962) + +------------------------------------------------------------------- +Mon Jan 25 21:55:49 CET 2010 - gregkh(a)suse.de + +- Update to 2.6.32.6 + - security fixes + - bugfixes + - obsoletes: + - patches.drivers/8250_pnp-wacom-add + - patches.drivers/staging-hv-fix-smp-problems-in-the-hyperv-core-code.patch + - patches.kernel.org/scsi-enclosure-fix-oops-while-iterating-enclosure_status… + - patches.kernel.org/x86-msr-cpuid-register-enough-minors-for-the-msr-and-cpu… + +------------------------------------------------------------------- +Mon Jan 25 20:43:56 CET 2010 - jeffm(a)suse.com + +- supported.conf: Added sparse_keymap (eeepc_laptop depends on it) + +------------------------------------------------------------------- +Mon Jan 25 20:07:23 CET 2010 - npiggin(a)suse.de + +- patches.suse/slab-handle-memoryless-nodes-v2a.patch: slab - + handle memoryless nodes V2a (bnc#436025, bnc#570492). + +------------------------------------------------------------------- +Mon Jan 25 17:54:26 CET 2010 - jeffm(a)suse.com + +- Updated to 2.6.33-rc5. + - Eliminated 2 patches. + +------------------------------------------------------------------- +Mon Jan 25 16:46:19 CET 2010 - trenn(a)suse.de + +- Update config files. +- patches.arch/x86_mce_intel_decode_physical_address.patch: x86, + mce: Xeon75xx specific interface to get corrected memory error + information (bnc#573380, fate#307738). +- patches.arch/x86_mce_intel_decode_physical_address_compile_fix.patch: + x86, mce: Xeon75xx specific interface to get corrected memory + error information (bnc#573380, fate#307738). +- patches.arch/x86_mce_intel_decode_physical_address_rename_fix.patch: + x86, mce: Rename cpu_specific_poll to mce_cpu_specific_poll + (bnc#573380, fate#307738). +- patches.xen/xen3-auto-arch-x86.diff: Refresh. + +------------------------------------------------------------------- +Mon Jan 25 14:13:08 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-57-cx5051-toshiba-quirk: + ALSA: hda - Add support for Toshiba Satellite M300 + (bnc#492233,bnc#565904). +- patches.drivers/alsa-sp1-hda-58-cx5051-lenovo-mute-fix: ALSA: + hda - Change headphone pin control with master volume on cx5051 + (bnc#573050). + +------------------------------------------------------------------- +Mon Jan 25 12:30:14 CET 2010 - trenn(a)suse.de + +- patches.arch/x86_enable_tsc_sync_check_again.patch: x86: + Reenable TSC sync check at boot, even with NONSTOP_TSC + (bnc#573379). + +------------------------------------------------------------------- +Mon Jan 25 12:22:55 CET 2010 - trenn(a)suse.de + +- patches.arch/x86_node_hotplug_parse_srat_fix_2nd_ver.patch: + x86: Set hotpluggable nodes in nodes_possible_map (bnc#567216). +- patches.arch/x86_node_hotplug_parse_srat_fix.patch: Delete. + +------------------------------------------------------------------- +Mon Jan 25 11:45:39 CET 2010 - trenn(a)suse.de + +- supported.conf: + Add mce-inject and hwpoison-inject so that Intel can easier test + this. As these are debug drivers, they might get reverted from + support.conf again if kernel-extra package gets fixed for SLES, + only seem to exist for SLED because "NCC is not yet working for SP1". + (bnc#572552). + +------------------------------------------------------------------- +Sat Jan 23 02:54:31 CET 2010 - bphilips(a)suse.de + +- patches.drivers/tg3-updates-from-f4188d-to-ba5b0bf.patch: tg3: + updates from f4188d to ba5b0bf (bnc#573237). + +------------------------------------------------------------------- +Sat Jan 23 01:57:20 CET 2010 - rjw(a)suse.de + +- patches.arch/x86-irq-check-move_in_progress-before-freeing-the-vector-mapping.patch: + x86, irq: Check move_in_progress before freeing the vector + mapping (bnc#558247). + +------------------------------------------------------------------- +Sat Jan 23 01:36:27 CET 2010 - rjw(a)suse.de + +- patches.arch/x86-apic-use-logical-flat-for-systems-with-8-or-fewer-logical-cpus.patch: + x86, apic: use logical flat for systems with <= 8 logical cpus + (bnc#567510). +- patches.arch/x86-revert-apic-Use-logical-flat-on-intel-with-8-or-fewer-logical-cpus.patch: + x86: Revert "apic: Use logical flat on intel with <= 8 logical + cpus" (bnc#567510). + +------------------------------------------------------------------- +Sat Jan 23 00:52:57 CET 2010 - gregkh(a)suse.de + +- Update to 2.6.32.5: + - security fixes + - bug fixes + - obsoletes: + - patches.drivers/alsa-sp1-hda-54-alc861-capture-fix + - patches.fixes/hid-add-device-ids-for-new-model-of-apple-wireless-keyboard + - patches.fixes/megaraid_sas-fix-permissions-on-poll_mode_io + - patches.fixes/reiserfs-truncate-blocks-not-used-by-a-write.patch + +------------------------------------------------------------------- +Fri Jan 22 21:11:54 CET 2010 - tonyj(a)suse.de + +- Update config files: drop UTRACE from default s390 configs + as per communication from Ihno. + +------------------------------------------------------------------- +Fri Jan 22 19:48:25 CET 2010 - gregkh(a)suse.de + +- patches.kernel.org/x86-msr-cpuid-register-enough-minors-for-the-msr-and-cpu…: + x86, msr/cpuid: Register enough minors for the MSR and CPUID + drivers (bnc#572720). + +------------------------------------------------------------------- +Fri Jan 22 18:54:28 CET 2010 - gregkh(a)suse.de + +- patches.kernel.org/scsi-enclosure-fix-oops-while-iterating-enclosure_status…: + SCSI: enclosure: fix oops while iterating enclosure_status array + (bnc#572818). +- patches.fixes/enclosure-fix-oops-while-iterating-enclosure_status-array: + Delete. + +------------------------------------------------------------------- +Fri Jan 22 15:50:12 CET 2010 - duwe(a)suse.de + +- Update config files. +- patches.arch/ppc-extended_h_cede-update-to-mainline: Incremental + patch set to sync H_CEDE with actual mainline (bnc#550447, + FATE#307059). + +------------------------------------------------------------------- +Fri Jan 22 15:30:21 CET 2010 - trenn(a)suse.de + +- Update config files. + Add DMAR to -trace flavor -> get in sync with -default + +------------------------------------------------------------------- +Fri Jan 22 09:17:21 CET 2010 - hare(a)suse.de + +- patches.fixes/qla2xxx-restore-pci-state-after-eeh-recovery: + Re-save PCI state after EEH recovery (bnc#570233). + +------------------------------------------------------------------- +Fri Jan 22 07:38:23 CET 2010 - jjolly(a)suse.de + +- patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch: + zfcp: introduce BSG timeout callback (BNC#572659). +- patches.arch/s390-06-02-zfcp-set-hw-timeout-requested-by-bsg.patch: + zfcp: set HW timeout requested by BSG request (BNC#572659). + +------------------------------------------------------------------- +Fri Jan 22 03:20:49 CET 2010 - bphilips(a)suse.de + +- patches.drivers/netxen-8f9b3f-to-c651a8.patch: netxen: 8f9b3f + to c651a8 (bnc#572832). + ++++ 2013 more lines (skipped) ++++ between kernel-source/kernel-pae.changes ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-pae.changes kernel-ppc64.changes: same change kernel-ps3.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-trace.changes: same change kernel-vanilla.changes: same change New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-vmi.changes 2010-01-27 20:13:17.000000000 +0100 @@ -0,0 +1,19262 @@ +------------------------------------------------------------------- +Wed Jan 27 14:55:29 CET 2010 - jkosina(a)suse.cz + +- patches.fixes/pci-fix-nested-spinlock-hang-in-aer_inject.patch: + pci: fix nested spinlock hang in aer_inject (bnc#573578). + +------------------------------------------------------------------- +Wed Jan 27 14:34:07 CET 2010 - mmarek(a)suse.cz + +- Update config files: disable generic_serial users. +- patches.drivers/reenable-generic_serial: Delete. +- rpm/generic_serial-blacklist: Delete (bnc#569676). + +------------------------------------------------------------------- +Wed Jan 27 12:57:31 CET 2010 - jengelh(a)medozas.de + +- remove patches.suse/netfilter-ipv4options [bnc#490142] + +------------------------------------------------------------------- +Wed Jan 27 00:14:42 CET 2010 - jeffm(a)suse.com + +- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh. + +------------------------------------------------------------------- +Tue Jan 26 07:00:33 CET 2010 - knikanth(a)suse.de + +- supported.conf: Fix misspelt dm-region-hash and mark it supported + correctly (bnc#565962) + +------------------------------------------------------------------- +Mon Jan 25 21:55:49 CET 2010 - gregkh(a)suse.de + +- Update to 2.6.32.6 + - security fixes + - bugfixes + - obsoletes: + - patches.drivers/8250_pnp-wacom-add + - patches.drivers/staging-hv-fix-smp-problems-in-the-hyperv-core-code.patch + - patches.kernel.org/scsi-enclosure-fix-oops-while-iterating-enclosure_status… + - patches.kernel.org/x86-msr-cpuid-register-enough-minors-for-the-msr-and-cpu… + +------------------------------------------------------------------- +Mon Jan 25 20:43:56 CET 2010 - jeffm(a)suse.com + +- supported.conf: Added sparse_keymap (eeepc_laptop depends on it) + +------------------------------------------------------------------- +Mon Jan 25 20:07:23 CET 2010 - npiggin(a)suse.de + +- patches.suse/slab-handle-memoryless-nodes-v2a.patch: slab - + handle memoryless nodes V2a (bnc#436025, bnc#570492). + +------------------------------------------------------------------- +Mon Jan 25 17:54:26 CET 2010 - jeffm(a)suse.com + +- Updated to 2.6.33-rc5. + - Eliminated 2 patches. + +------------------------------------------------------------------- +Mon Jan 25 16:46:19 CET 2010 - trenn(a)suse.de + +- Update config files. +- patches.arch/x86_mce_intel_decode_physical_address.patch: x86, + mce: Xeon75xx specific interface to get corrected memory error + information (bnc#573380, fate#307738). +- patches.arch/x86_mce_intel_decode_physical_address_compile_fix.patch: + x86, mce: Xeon75xx specific interface to get corrected memory + error information (bnc#573380, fate#307738). +- patches.arch/x86_mce_intel_decode_physical_address_rename_fix.patch: + x86, mce: Rename cpu_specific_poll to mce_cpu_specific_poll + (bnc#573380, fate#307738). +- patches.xen/xen3-auto-arch-x86.diff: Refresh. + +------------------------------------------------------------------- +Mon Jan 25 14:13:08 CET 2010 - tiwai(a)suse.de + +- patches.drivers/alsa-sp1-hda-57-cx5051-toshiba-quirk: + ALSA: hda - Add support for Toshiba Satellite M300 + (bnc#492233,bnc#565904). +- patches.drivers/alsa-sp1-hda-58-cx5051-lenovo-mute-fix: ALSA: + hda - Change headphone pin control with master volume on cx5051 + (bnc#573050). + +------------------------------------------------------------------- +Mon Jan 25 12:30:14 CET 2010 - trenn(a)suse.de + +- patches.arch/x86_enable_tsc_sync_check_again.patch: x86: + Reenable TSC sync check at boot, even with NONSTOP_TSC + (bnc#573379). + +------------------------------------------------------------------- +Mon Jan 25 12:22:55 CET 2010 - trenn(a)suse.de + +- patches.arch/x86_node_hotplug_parse_srat_fix_2nd_ver.patch: + x86: Set hotpluggable nodes in nodes_possible_map (bnc#567216). +- patches.arch/x86_node_hotplug_parse_srat_fix.patch: Delete. + +------------------------------------------------------------------- +Mon Jan 25 11:45:39 CET 2010 - trenn(a)suse.de + +- supported.conf: + Add mce-inject and hwpoison-inject so that Intel can easier test + this. As these are debug drivers, they might get reverted from + support.conf again if kernel-extra package gets fixed for SLES, + only seem to exist for SLED because "NCC is not yet working for SP1". + (bnc#572552). + +------------------------------------------------------------------- +Sat Jan 23 02:54:31 CET 2010 - bphilips(a)suse.de + +- patches.drivers/tg3-updates-from-f4188d-to-ba5b0bf.patch: tg3: + updates from f4188d to ba5b0bf (bnc#573237). + +------------------------------------------------------------------- +Sat Jan 23 01:57:20 CET 2010 - rjw(a)suse.de + +- patches.arch/x86-irq-check-move_in_progress-before-freeing-the-vector-mapping.patch: + x86, irq: Check move_in_progress before freeing the vector + mapping (bnc#558247). + +------------------------------------------------------------------- +Sat Jan 23 01:36:27 CET 2010 - rjw(a)suse.de + +- patches.arch/x86-apic-use-logical-flat-for-systems-with-8-or-fewer-logical-cpus.patch: + x86, apic: use logical flat for systems with <= 8 logical cpus + (bnc#567510). +- patches.arch/x86-revert-apic-Use-logical-flat-on-intel-with-8-or-fewer-logical-cpus.patch: + x86: Revert "apic: Use logical flat on intel with <= 8 logical + cpus" (bnc#567510). + +------------------------------------------------------------------- +Sat Jan 23 00:52:57 CET 2010 - gregkh(a)suse.de + +- Update to 2.6.32.5: + - security fixes + - bug fixes + - obsoletes: + - patches.drivers/alsa-sp1-hda-54-alc861-capture-fix + - patches.fixes/hid-add-device-ids-for-new-model-of-apple-wireless-keyboard + - patches.fixes/megaraid_sas-fix-permissions-on-poll_mode_io + - patches.fixes/reiserfs-truncate-blocks-not-used-by-a-write.patch + +------------------------------------------------------------------- +Fri Jan 22 21:11:54 CET 2010 - tonyj(a)suse.de + +- Update config files: drop UTRACE from default s390 configs + as per communication from Ihno. + +------------------------------------------------------------------- +Fri Jan 22 19:48:25 CET 2010 - gregkh(a)suse.de + +- patches.kernel.org/x86-msr-cpuid-register-enough-minors-for-the-msr-and-cpu…: + x86, msr/cpuid: Register enough minors for the MSR and CPUID + drivers (bnc#572720). + +------------------------------------------------------------------- +Fri Jan 22 18:54:28 CET 2010 - gregkh(a)suse.de + +- patches.kernel.org/scsi-enclosure-fix-oops-while-iterating-enclosure_status…: + SCSI: enclosure: fix oops while iterating enclosure_status array + (bnc#572818). +- patches.fixes/enclosure-fix-oops-while-iterating-enclosure_status-array: + Delete. + +------------------------------------------------------------------- +Fri Jan 22 15:50:12 CET 2010 - duwe(a)suse.de + +- Update config files. +- patches.arch/ppc-extended_h_cede-update-to-mainline: Incremental + patch set to sync H_CEDE with actual mainline (bnc#550447, + FATE#307059). + +------------------------------------------------------------------- +Fri Jan 22 15:30:21 CET 2010 - trenn(a)suse.de + +- Update config files. + Add DMAR to -trace flavor -> get in sync with -default + +------------------------------------------------------------------- +Fri Jan 22 09:17:21 CET 2010 - hare(a)suse.de + +- patches.fixes/qla2xxx-restore-pci-state-after-eeh-recovery: + Re-save PCI state after EEH recovery (bnc#570233). + +------------------------------------------------------------------- +Fri Jan 22 07:38:23 CET 2010 - jjolly(a)suse.de + +- patches.arch/s390-06-01-zfcp-introduce-bsg-timeout-callback.patch: + zfcp: introduce BSG timeout callback (BNC#572659). +- patches.arch/s390-06-02-zfcp-set-hw-timeout-requested-by-bsg.patch: + zfcp: set HW timeout requested by BSG request (BNC#572659). + +------------------------------------------------------------------- +Fri Jan 22 03:20:49 CET 2010 - bphilips(a)suse.de + +- patches.drivers/netxen-8f9b3f-to-c651a8.patch: netxen: 8f9b3f + to c651a8 (bnc#572832). ++++ 19065 more lines (skipped) ++++ between /dev/null ++++ and /mounts/work_src_done/STABLE/kernel-source/kernel-vmi.changes calling whatdependson for head-i586 Old: ---- kernel-ec2.changes kernel-ec2.spec kernel-xen.changes kernel-xen.spec New: ---- kernel-docs.changes kernel-docs.spec kernel-docs.spec.in kernel-vmi.changes kernel-vmi.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:24.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:24.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kernel-debug (Version 2.6.32) +# spec file for package kernel-debug (Version 2.6.33) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.32 +%define patchversion 2.6.33-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor debug @@ -48,8 +48,8 @@ Name: kernel-debug Summary: A Debug Version of the Kernel -Version: 2.6.32 -Release: 3 +Version: 2.6.33 +Release: 1 %if %using_buildservice %else %endif @@ -83,8 +83,10 @@ BuildRequires: python %endif %ifarch s390 s390x +%if %build_vanilla BuildRequires: dwarfextract %endif +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" @@ -193,7 +195,7 @@ # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" -%define __find_provides %_sourcedir/find-provides %name +%define __find_provides %_sourcedir/find-provides %my_builddir %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -321,19 +323,18 @@ mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor -%define extract_vmlinux_debuginfo 0 -%if 0%{?__debug_package:1} -%ifnarch ppc ppc64 -%define extract_vmlinux_debuginfo 1 -%endif -%endif add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor -%if %extract_vmlinux_debuginfo + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then + compressed=true + fi + cp vmlinux %buildroot/$vmlinux + >%my_builddir/vmlinux.debug.files +%if 0%{?__debug_package:1} + if $compressed; then local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) - cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux # FIXME: create and package build-id symlinks @@ -349,17 +350,22 @@ find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files -%else - cp vmlinux %buildroot/$vmlinux + else + # make vmlinux executable so that find-debuginfo.sh picks it up + # (TODO: fix find-debuginfo.sh instead) + chmod +x %buildroot/$vmlinux + # exctact the provided symbols before they are stripped away + echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \ + %my_builddir/$(basename $vmlinux).provides + fi %endif - if [ "$1" = --compressed ]; then + if $compressed; then gzip -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } %if %build_kdump add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %else # architecture specifics @@ -380,7 +386,6 @@ %endif %ifarch ppc ppc64 add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %endif %ifarch ia64 @@ -393,7 +398,9 @@ add_vmlinux --compressed cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image - if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then + if test -e arch/s390/boot/kerntypes.o; then + cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + elif test -x "$(which dwarfextract 2>/dev/null)"; then dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" @@ -401,9 +408,6 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif - if [ -e init/kerntypes.o ]; then - cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor - fi # end of build_kdump %endif for sub in '-base' '' '-extra'; do @@ -454,8 +458,10 @@ echo "Consistency check error: please update supported.conf." fi %ifarch s390 s390x - if [ -x "$(which dwarfextract 2>/dev/null)" -a \ - -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then + if test -e arch/s390/boot/kerntypes.o; then + : + elif test -x "$(which dwarfextract 2>/dev/null)" -a \ + -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi @@ -535,24 +541,19 @@ # Replace the absolute with a relative path sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile - link=%rpm_install_dir/%cpu_arch_flavor/include2/asm - target=$(readlink "$link") - target=${target#%build_src_dir/} - rm "$link" - ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi add_dirs_to_filelist() { sed -rn ' # print file name p # remove filelist macros - s:%%%%[a-z]+($[^)]+$)? ?::g - # add %%%%dir prefix - s:^:%%%%dir : + s:%%[a-z]+($[^)]+$)? ?::g + # add %%dir prefix + s:^:%%dir : # print all parents :a # skip directories owned by other packages - s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: + s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: s:/[^/]+$::p ta ' "$@" | sort -u @@ -567,17 +568,19 @@ done { cd %buildroot find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%%%%%ghost /%%p\n' -o \ + $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ + -type f -name 'vmlinux-*.provides' -prune -o \ + -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. - echo '%%%%ghost /boot/initrd-%kernelrelease-kdump' + echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ - ! -path '*/modules.builtin' $ -printf '%%%%%%%%ghost /%%p\n' \ + ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ -o -name '*.ko' -prune -o -printf '/%%p\n' cat %my_builddir/base-modules fi @@ -586,7 +589,7 @@ -type d -o \ -printf '/%%p\n' if [ -e .%_docdir/%name ]; then - echo "%%%%doc %_docdir/%name" + echo "%%doc %_docdir/%name" fi } | sort -u >%my_builddir/tmp cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ @@ -759,9 +762,6 @@ %source_timestamp -%if %extract_vmlinux_debuginfo - %files devel-debuginfo -f vmlinux.debug.files -%endif %changelog ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:24.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:24.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kernel-default (Version 2.6.32) +# spec file for package kernel-default (Version 2.6.33) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.32 +%define patchversion 2.6.33-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor default @@ -48,8 +48,8 @@ Name: kernel-default Summary: The Standard Kernel -Version: 2.6.32 -Release: 3 +Version: 2.6.33 +Release: 1 %if %using_buildservice %else %endif @@ -83,8 +83,10 @@ BuildRequires: python %endif %ifarch s390 s390x +%if %build_vanilla BuildRequires: dwarfextract %endif +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" @@ -209,7 +211,7 @@ # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" -%define __find_provides %_sourcedir/find-provides %name +%define __find_provides %_sourcedir/find-provides %my_builddir %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -336,19 +338,18 @@ mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor -%define extract_vmlinux_debuginfo 0 -%if 0%{?__debug_package:1} -%ifnarch ppc ppc64 -%define extract_vmlinux_debuginfo 1 -%endif -%endif add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor -%if %extract_vmlinux_debuginfo + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then + compressed=true + fi + cp vmlinux %buildroot/$vmlinux + >%my_builddir/vmlinux.debug.files +%if 0%{?__debug_package:1} + if $compressed; then local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) - cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux # FIXME: create and package build-id symlinks @@ -364,17 +365,22 @@ find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files -%else - cp vmlinux %buildroot/$vmlinux + else + # make vmlinux executable so that find-debuginfo.sh picks it up + # (TODO: fix find-debuginfo.sh instead) + chmod +x %buildroot/$vmlinux + # exctact the provided symbols before they are stripped away + echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \ + %my_builddir/$(basename $vmlinux).provides + fi %endif - if [ "$1" = --compressed ]; then + if $compressed; then gzip -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } %if %build_kdump add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %else # architecture specifics @@ -395,7 +401,6 @@ %endif %ifarch ppc ppc64 add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %endif %ifarch ia64 @@ -408,7 +413,9 @@ add_vmlinux --compressed cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image - if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then + if test -e arch/s390/boot/kerntypes.o; then + cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + elif test -x "$(which dwarfextract 2>/dev/null)"; then dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" @@ -416,9 +423,6 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif - if [ -e init/kerntypes.o ]; then - cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor - fi # end of build_kdump %endif for sub in '-base' '' '-extra'; do @@ -469,8 +473,10 @@ echo "Consistency check error: please update supported.conf." fi %ifarch s390 s390x - if [ -x "$(which dwarfextract 2>/dev/null)" -a \ - -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then + if test -e arch/s390/boot/kerntypes.o; then + : + elif test -x "$(which dwarfextract 2>/dev/null)" -a \ + -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi @@ -550,24 +556,19 @@ # Replace the absolute with a relative path sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile - link=%rpm_install_dir/%cpu_arch_flavor/include2/asm - target=$(readlink "$link") - target=${target#%build_src_dir/} - rm "$link" - ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi add_dirs_to_filelist() { sed -rn ' # print file name p # remove filelist macros - s:%%%%[a-z]+($[^)]+$)? ?::g - # add %%%%dir prefix - s:^:%%%%dir : + s:%%[a-z]+($[^)]+$)? ?::g + # add %%dir prefix + s:^:%%dir : # print all parents :a # skip directories owned by other packages - s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: + s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: s:/[^/]+$::p ta ' "$@" | sort -u @@ -582,17 +583,19 @@ done { cd %buildroot find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%%%%%ghost /%%p\n' -o \ + $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ + -type f -name 'vmlinux-*.provides' -prune -o \ + -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. - echo '%%%%ghost /boot/initrd-%kernelrelease-kdump' + echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ - ! -path '*/modules.builtin' $ -printf '%%%%%%%%ghost /%%p\n' \ + ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ -o -name '*.ko' -prune -o -printf '/%%p\n' cat %my_builddir/base-modules fi @@ -601,7 +604,7 @@ -type d -o \ -printf '/%%p\n' if [ -e .%_docdir/%name ]; then - echo "%%%%doc %_docdir/%name" + echo "%%doc %_docdir/%name" fi } | sort -u >%my_builddir/tmp cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ @@ -772,9 +775,6 @@ %source_timestamp -%if %extract_vmlinux_debuginfo - %files devel-debuginfo -f vmlinux.debug.files -%endif %changelog ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:24.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:24.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kernel-desktop (Version 2.6.32) +# spec file for package kernel-desktop (Version 2.6.33) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.32 +%define patchversion 2.6.33-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor desktop @@ -48,8 +48,8 @@ Name: kernel-desktop Summary: Kernel optimized for the desktop -Version: 2.6.32 -Release: 3 +Version: 2.6.33 +Release: 1 %if %using_buildservice %else %endif @@ -83,8 +83,10 @@ BuildRequires: python %endif %ifarch s390 s390x +%if %build_vanilla BuildRequires: dwarfextract %endif +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" @@ -189,7 +191,7 @@ # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" -%define __find_provides %_sourcedir/find-provides %name +%define __find_provides %_sourcedir/find-provides %my_builddir %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -327,19 +329,18 @@ mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor -%define extract_vmlinux_debuginfo 0 -%if 0%{?__debug_package:1} -%ifnarch ppc ppc64 -%define extract_vmlinux_debuginfo 1 -%endif -%endif add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor -%if %extract_vmlinux_debuginfo + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then + compressed=true + fi + cp vmlinux %buildroot/$vmlinux + >%my_builddir/vmlinux.debug.files +%if 0%{?__debug_package:1} + if $compressed; then local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) - cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux # FIXME: create and package build-id symlinks @@ -355,17 +356,22 @@ find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files -%else - cp vmlinux %buildroot/$vmlinux + else + # make vmlinux executable so that find-debuginfo.sh picks it up + # (TODO: fix find-debuginfo.sh instead) + chmod +x %buildroot/$vmlinux + # exctact the provided symbols before they are stripped away + echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \ + %my_builddir/$(basename $vmlinux).provides + fi %endif - if [ "$1" = --compressed ]; then + if $compressed; then gzip -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } %if %build_kdump add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %else # architecture specifics @@ -386,7 +392,6 @@ %endif %ifarch ppc ppc64 add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %endif %ifarch ia64 @@ -399,7 +404,9 @@ add_vmlinux --compressed cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image - if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then + if test -e arch/s390/boot/kerntypes.o; then + cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + elif test -x "$(which dwarfextract 2>/dev/null)"; then dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" @@ -407,9 +414,6 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif - if [ -e init/kerntypes.o ]; then - cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor - fi # end of build_kdump %endif for sub in '-base' '' '-extra'; do @@ -460,8 +464,10 @@ echo "Consistency check error: please update supported.conf." fi %ifarch s390 s390x - if [ -x "$(which dwarfextract 2>/dev/null)" -a \ - -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then + if test -e arch/s390/boot/kerntypes.o; then + : + elif test -x "$(which dwarfextract 2>/dev/null)" -a \ + -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi @@ -541,24 +547,19 @@ # Replace the absolute with a relative path sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile - link=%rpm_install_dir/%cpu_arch_flavor/include2/asm - target=$(readlink "$link") - target=${target#%build_src_dir/} - rm "$link" - ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi add_dirs_to_filelist() { sed -rn ' # print file name p # remove filelist macros - s:%%%%[a-z]+($[^)]+$)? ?::g - # add %%%%dir prefix - s:^:%%%%dir : + s:%%[a-z]+($[^)]+$)? ?::g + # add %%dir prefix + s:^:%%dir : # print all parents :a # skip directories owned by other packages - s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: + s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: s:/[^/]+$::p ta ' "$@" | sort -u @@ -573,17 +574,19 @@ done { cd %buildroot find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%%%%%ghost /%%p\n' -o \ + $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ + -type f -name 'vmlinux-*.provides' -prune -o \ + -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. - echo '%%%%ghost /boot/initrd-%kernelrelease-kdump' + echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ - ! -path '*/modules.builtin' $ -printf '%%%%%%%%ghost /%%p\n' \ + ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ -o -name '*.ko' -prune -o -printf '/%%p\n' cat %my_builddir/base-modules fi @@ -592,7 +595,7 @@ -type d -o \ -printf '/%%p\n' if [ -e .%_docdir/%name ]; then - echo "%%%%doc %_docdir/%name" + echo "%%doc %_docdir/%name" fi } | sort -u >%my_builddir/tmp cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ @@ -783,9 +786,6 @@ %source_timestamp -%if %extract_vmlinux_debuginfo - %files devel-debuginfo -f vmlinux.debug.files -%endif %changelog ++++++ kernel-docs.spec ++++++ # # spec file for package kernel-docs (Version 2.6.33) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %include %_sourcedir/kernel-spec-macros Name: kernel-docs BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source = 2.6.33 Url: http://www.kernel.org/ License: GPLv2+ Group: Documentation/Man AutoReqProv: on Version: 2.6.33 Release: 1 %if %using_buildservice %else %endif Summary: Kernel Documentation BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: kernel-spec-macros %description These are the PDF documents and man pages (section 9) built from thecurrent kernel sources. %prep cp -av /etc/texmf/web2c/texmf.cnf . cat << EOF >> texmf.cnf main_memory.pdfjadetex = 2500000 hash_extra.pdfjadetex = 70000 max_strings.pdfjadetex = 120000 save_size.pdfjadetex = 10000 EOF %setup -T -c %build # use texmf.cnf from local source export TEXMFCNF=$RPM_BUILD_DIR export LANG=en_US make -C /usr/src/linux-%{version}-%{release_major} O=$PWD -k -i mandocs %{?jobs:-j%jobs} make -C /usr/src/linux-%{version}-%{release_major} O=$PWD -k -i pdfdocs %{?jobs:-j%jobs} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/%{_mandir}/man9 # filter out obscure device drivers - they clutter up the rpm and don't add any real value find Documentation/DocBook/ -name '*.9.gz' | egrep -v 'man/(sis[69]|rio|fsl|struct_rio|RIO|mpc85|set_rx_mode|mdio_(read|write)|mii_ioctl|mca_|z8530|nand|sppp|piix|(read|write)_zs)' | while read i ; do cp $i $RPM_BUILD_ROOT/%{_mandir}/man9 done install -d $RPM_BUILD_ROOT/usr/share/doc/kernel cp -a Documentation/DocBook/*.pdf $RPM_BUILD_ROOT/usr/share/doc/kernel || true if [ -d Documentation/kdb ] ; then for i in Documentation/kdb/*.m* ; do k=`basename $i` k=${k/man/9} k=${k/mm/9} cp $i $RPM_BUILD_ROOT/%{_mandir}/man9/$k done fi ln -s /usr/share/man/man9/request_threaded_irq.9.gz $RPM_BUILD_ROOT/usr/share/man/man9/request_irq.9.gz cp -a /usr/src/linux-%{version}-%{release_major}/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} . %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING CREDITS MAINTAINERS README REPORTING-BUGS %{_mandir}/man9/* %docdir /usr/share/doc/kernel /usr/share/doc/kernel %changelog ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:24.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:24.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kernel-pae (Version 2.6.32) +# spec file for package kernel-pae (Version 2.6.33) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.32 +%define patchversion 2.6.33-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor pae @@ -48,8 +48,8 @@ Name: kernel-pae Summary: Kernel with PAE Support -Version: 2.6.32 -Release: 3 +Version: 2.6.33 +Release: 1 %if %using_buildservice %else %endif @@ -83,8 +83,10 @@ BuildRequires: python %endif %ifarch s390 s390x +%if %build_vanilla BuildRequires: dwarfextract %endif +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" @@ -193,7 +195,7 @@ # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" -%define __find_provides %_sourcedir/find-provides %name +%define __find_provides %_sourcedir/find-provides %my_builddir %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -327,19 +329,18 @@ mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor -%define extract_vmlinux_debuginfo 0 -%if 0%{?__debug_package:1} -%ifnarch ppc ppc64 -%define extract_vmlinux_debuginfo 1 -%endif -%endif add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor -%if %extract_vmlinux_debuginfo + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then + compressed=true + fi + cp vmlinux %buildroot/$vmlinux + >%my_builddir/vmlinux.debug.files +%if 0%{?__debug_package:1} + if $compressed; then local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) - cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux # FIXME: create and package build-id symlinks @@ -355,17 +356,22 @@ find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files -%else - cp vmlinux %buildroot/$vmlinux + else + # make vmlinux executable so that find-debuginfo.sh picks it up + # (TODO: fix find-debuginfo.sh instead) + chmod +x %buildroot/$vmlinux + # exctact the provided symbols before they are stripped away + echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \ + %my_builddir/$(basename $vmlinux).provides + fi %endif - if [ "$1" = --compressed ]; then + if $compressed; then gzip -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } %if %build_kdump add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %else # architecture specifics @@ -386,7 +392,6 @@ %endif %ifarch ppc ppc64 add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %endif %ifarch ia64 @@ -399,7 +404,9 @@ add_vmlinux --compressed cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image - if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then + if test -e arch/s390/boot/kerntypes.o; then + cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + elif test -x "$(which dwarfextract 2>/dev/null)"; then dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" @@ -407,9 +414,6 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif - if [ -e init/kerntypes.o ]; then - cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor - fi # end of build_kdump %endif for sub in '-base' '' '-extra'; do @@ -460,8 +464,10 @@ echo "Consistency check error: please update supported.conf." fi %ifarch s390 s390x - if [ -x "$(which dwarfextract 2>/dev/null)" -a \ - -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then + if test -e arch/s390/boot/kerntypes.o; then + : + elif test -x "$(which dwarfextract 2>/dev/null)" -a \ + -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi @@ -541,24 +547,19 @@ # Replace the absolute with a relative path sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile - link=%rpm_install_dir/%cpu_arch_flavor/include2/asm - target=$(readlink "$link") - target=${target#%build_src_dir/} - rm "$link" - ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi add_dirs_to_filelist() { sed -rn ' # print file name p # remove filelist macros - s:%%%%[a-z]+($[^)]+$)? ?::g - # add %%%%dir prefix - s:^:%%%%dir : + s:%%[a-z]+($[^)]+$)? ?::g + # add %%dir prefix + s:^:%%dir : # print all parents :a # skip directories owned by other packages - s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: + s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: s:/[^/]+$::p ta ' "$@" | sort -u @@ -573,17 +574,19 @@ done { cd %buildroot find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%%%%%ghost /%%p\n' -o \ + $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ + -type f -name 'vmlinux-*.provides' -prune -o \ + -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. - echo '%%%%ghost /boot/initrd-%kernelrelease-kdump' + echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ - ! -path '*/modules.builtin' $ -printf '%%%%%%%%ghost /%%p\n' \ + ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ -o -name '*.ko' -prune -o -printf '/%%p\n' cat %my_builddir/base-modules fi @@ -592,7 +595,7 @@ -type d -o \ -printf '/%%p\n' if [ -e .%_docdir/%name ]; then - echo "%%%%doc %_docdir/%name" + echo "%%doc %_docdir/%name" fi } | sort -u >%my_builddir/tmp cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ @@ -777,9 +780,6 @@ %source_timestamp -%if %extract_vmlinux_debuginfo - %files devel-debuginfo -f vmlinux.debug.files -%endif %changelog ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:24.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:24.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kernel-ppc64 (Version 2.6.32) +# spec file for package kernel-ppc64 (Version 2.6.33) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.32 +%define patchversion 2.6.33-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor ppc64 @@ -48,8 +48,8 @@ Name: kernel-ppc64 Summary: Kernel for ppc64 Systems -Version: 2.6.32 -Release: 3 +Version: 2.6.33 +Release: 1 %if %using_buildservice %else %endif @@ -83,8 +83,10 @@ BuildRequires: python %endif %ifarch s390 s390x +%if %build_vanilla BuildRequires: dwarfextract %endif +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" @@ -197,7 +199,7 @@ # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" -%define __find_provides %_sourcedir/find-provides %name +%define __find_provides %_sourcedir/find-provides %my_builddir %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -331,19 +333,18 @@ mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor -%define extract_vmlinux_debuginfo 0 -%if 0%{?__debug_package:1} -%ifnarch ppc ppc64 -%define extract_vmlinux_debuginfo 1 -%endif -%endif add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor -%if %extract_vmlinux_debuginfo + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then + compressed=true + fi + cp vmlinux %buildroot/$vmlinux + >%my_builddir/vmlinux.debug.files +%if 0%{?__debug_package:1} + if $compressed; then local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) - cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux # FIXME: create and package build-id symlinks @@ -359,17 +360,22 @@ find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files -%else - cp vmlinux %buildroot/$vmlinux + else + # make vmlinux executable so that find-debuginfo.sh picks it up + # (TODO: fix find-debuginfo.sh instead) + chmod +x %buildroot/$vmlinux + # exctact the provided symbols before they are stripped away + echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \ + %my_builddir/$(basename $vmlinux).provides + fi %endif - if [ "$1" = --compressed ]; then + if $compressed; then gzip -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } %if %build_kdump add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %else # architecture specifics @@ -390,7 +396,6 @@ %endif %ifarch ppc ppc64 add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %endif %ifarch ia64 @@ -403,7 +408,9 @@ add_vmlinux --compressed cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image - if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then + if test -e arch/s390/boot/kerntypes.o; then + cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + elif test -x "$(which dwarfextract 2>/dev/null)"; then dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" @@ -411,9 +418,6 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif - if [ -e init/kerntypes.o ]; then - cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor - fi # end of build_kdump %endif for sub in '-base' '' '-extra'; do @@ -464,8 +468,10 @@ echo "Consistency check error: please update supported.conf." fi %ifarch s390 s390x - if [ -x "$(which dwarfextract 2>/dev/null)" -a \ - -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then + if test -e arch/s390/boot/kerntypes.o; then + : + elif test -x "$(which dwarfextract 2>/dev/null)" -a \ + -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi @@ -545,24 +551,19 @@ # Replace the absolute with a relative path sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile - link=%rpm_install_dir/%cpu_arch_flavor/include2/asm - target=$(readlink "$link") - target=${target#%build_src_dir/} - rm "$link" - ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi add_dirs_to_filelist() { sed -rn ' # print file name p # remove filelist macros - s:%%%%[a-z]+($[^)]+$)? ?::g - # add %%%%dir prefix - s:^:%%%%dir : + s:%%[a-z]+($[^)]+$)? ?::g + # add %%dir prefix + s:^:%%dir : # print all parents :a # skip directories owned by other packages - s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: + s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: s:/[^/]+$::p ta ' "$@" | sort -u @@ -577,17 +578,19 @@ done { cd %buildroot find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%%%%%ghost /%%p\n' -o \ + $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ + -type f -name 'vmlinux-*.provides' -prune -o \ + -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. - echo '%%%%ghost /boot/initrd-%kernelrelease-kdump' + echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ - ! -path '*/modules.builtin' $ -printf '%%%%%%%%ghost /%%p\n' \ + ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ -o -name '*.ko' -prune -o -printf '/%%p\n' cat %my_builddir/base-modules fi @@ -596,7 +599,7 @@ -type d -o \ -printf '/%%p\n' if [ -e .%_docdir/%name ]; then - echo "%%%%doc %_docdir/%name" + echo "%%doc %_docdir/%name" fi } | sort -u >%my_builddir/tmp cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ @@ -781,9 +784,6 @@ %source_timestamp -%if %extract_vmlinux_debuginfo - %files devel-debuginfo -f vmlinux.debug.files -%endif %changelog ++++++ kernel-ps3.spec ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:24.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:24.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kernel-ps3 (Version 2.6.32) +# spec file for package kernel-ps3 (Version 2.6.33) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.32 +%define patchversion 2.6.33-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor ps3 @@ -48,8 +48,8 @@ Name: kernel-ps3 Summary: kernel for ps3 bootloader -Version: 2.6.32 -Release: 3 +Version: 2.6.33 +Release: 1 %if %using_buildservice %else %endif @@ -83,8 +83,10 @@ BuildRequires: python %endif %ifarch s390 s390x +%if %build_vanilla BuildRequires: dwarfextract %endif +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" @@ -189,7 +191,7 @@ # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" -%define __find_provides %_sourcedir/find-provides %name +%define __find_provides %_sourcedir/find-provides %my_builddir %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -319,19 +321,18 @@ mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor -%define extract_vmlinux_debuginfo 0 -%if 0%{?__debug_package:1} -%ifnarch ppc ppc64 -%define extract_vmlinux_debuginfo 1 -%endif -%endif add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor -%if %extract_vmlinux_debuginfo + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then + compressed=true + fi + cp vmlinux %buildroot/$vmlinux + >%my_builddir/vmlinux.debug.files +%if 0%{?__debug_package:1} + if $compressed; then local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) - cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux # FIXME: create and package build-id symlinks @@ -347,17 +348,22 @@ find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files -%else - cp vmlinux %buildroot/$vmlinux + else + # make vmlinux executable so that find-debuginfo.sh picks it up + # (TODO: fix find-debuginfo.sh instead) + chmod +x %buildroot/$vmlinux + # exctact the provided symbols before they are stripped away + echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \ + %my_builddir/$(basename $vmlinux).provides + fi %endif - if [ "$1" = --compressed ]; then + if $compressed; then gzip -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } %if %build_kdump add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %else # architecture specifics @@ -378,7 +384,6 @@ %endif %ifarch ppc ppc64 add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %endif %ifarch ia64 @@ -391,7 +396,9 @@ add_vmlinux --compressed cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image - if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then + if test -e arch/s390/boot/kerntypes.o; then + cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + elif test -x "$(which dwarfextract 2>/dev/null)"; then dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" @@ -399,9 +406,6 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif - if [ -e init/kerntypes.o ]; then - cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor - fi # end of build_kdump %endif for sub in '-base' '' '-extra'; do @@ -452,8 +456,10 @@ echo "Consistency check error: please update supported.conf." fi %ifarch s390 s390x - if [ -x "$(which dwarfextract 2>/dev/null)" -a \ - -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then + if test -e arch/s390/boot/kerntypes.o; then + : + elif test -x "$(which dwarfextract 2>/dev/null)" -a \ + -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi @@ -533,24 +539,19 @@ # Replace the absolute with a relative path sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile - link=%rpm_install_dir/%cpu_arch_flavor/include2/asm - target=$(readlink "$link") - target=${target#%build_src_dir/} - rm "$link" - ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi add_dirs_to_filelist() { sed -rn ' # print file name p # remove filelist macros - s:%%%%[a-z]+($[^)]+$)? ?::g - # add %%%%dir prefix - s:^:%%%%dir : + s:%%[a-z]+($[^)]+$)? ?::g + # add %%dir prefix + s:^:%%dir : # print all parents :a # skip directories owned by other packages - s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: + s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: s:/[^/]+$::p ta ' "$@" | sort -u @@ -565,17 +566,19 @@ done { cd %buildroot find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%%%%%ghost /%%p\n' -o \ + $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ + -type f -name 'vmlinux-*.provides' -prune -o \ + -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. - echo '%%%%ghost /boot/initrd-%kernelrelease-kdump' + echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ - ! -path '*/modules.builtin' $ -printf '%%%%%%%%ghost /%%p\n' \ + ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ -o -name '*.ko' -prune -o -printf '/%%p\n' cat %my_builddir/base-modules fi @@ -584,7 +587,7 @@ -type d -o \ -printf '/%%p\n' if [ -e .%_docdir/%name ]; then - echo "%%%%doc %_docdir/%name" + echo "%%doc %_docdir/%name" fi } | sort -u >%my_builddir/tmp cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ @@ -761,9 +764,6 @@ %source_timestamp -%if %extract_vmlinux_debuginfo - %files devel-debuginfo -f vmlinux.debug.files -%endif %changelog ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:25.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:25.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kernel-s390 (Version 2.6.32) +# spec file for package kernel-s390 (Version 2.6.33) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.32 +%define patchversion 2.6.33-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor s390 @@ -48,8 +48,8 @@ Name: kernel-s390 Summary: The Standard Kernel -Version: 2.6.32 -Release: 3 +Version: 2.6.33 +Release: 1 %if %using_buildservice %else %endif @@ -83,8 +83,10 @@ BuildRequires: python %endif %ifarch s390 s390x +%if %build_vanilla BuildRequires: dwarfextract %endif +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" @@ -193,7 +195,7 @@ # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" -%define __find_provides %_sourcedir/find-provides %name +%define __find_provides %_sourcedir/find-provides %my_builddir %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -320,19 +322,18 @@ mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor -%define extract_vmlinux_debuginfo 0 -%if 0%{?__debug_package:1} -%ifnarch ppc ppc64 -%define extract_vmlinux_debuginfo 1 -%endif -%endif add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor -%if %extract_vmlinux_debuginfo + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then + compressed=true + fi + cp vmlinux %buildroot/$vmlinux + >%my_builddir/vmlinux.debug.files +%if 0%{?__debug_package:1} + if $compressed; then local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) - cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux # FIXME: create and package build-id symlinks @@ -348,17 +349,22 @@ find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files -%else - cp vmlinux %buildroot/$vmlinux + else + # make vmlinux executable so that find-debuginfo.sh picks it up + # (TODO: fix find-debuginfo.sh instead) + chmod +x %buildroot/$vmlinux + # exctact the provided symbols before they are stripped away + echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \ + %my_builddir/$(basename $vmlinux).provides + fi %endif - if [ "$1" = --compressed ]; then + if $compressed; then gzip -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } %if %build_kdump add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %else # architecture specifics @@ -379,7 +385,6 @@ %endif %ifarch ppc ppc64 add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %endif %ifarch ia64 @@ -392,7 +397,9 @@ add_vmlinux --compressed cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image - if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then + if test -e arch/s390/boot/kerntypes.o; then + cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + elif test -x "$(which dwarfextract 2>/dev/null)"; then dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" @@ -400,9 +407,6 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif - if [ -e init/kerntypes.o ]; then - cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor - fi # end of build_kdump %endif for sub in '-base' '' '-extra'; do @@ -453,8 +457,10 @@ echo "Consistency check error: please update supported.conf." fi %ifarch s390 s390x - if [ -x "$(which dwarfextract 2>/dev/null)" -a \ - -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then + if test -e arch/s390/boot/kerntypes.o; then + : + elif test -x "$(which dwarfextract 2>/dev/null)" -a \ + -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi @@ -534,24 +540,19 @@ # Replace the absolute with a relative path sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile - link=%rpm_install_dir/%cpu_arch_flavor/include2/asm - target=$(readlink "$link") - target=${target#%build_src_dir/} - rm "$link" - ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi add_dirs_to_filelist() { sed -rn ' # print file name p # remove filelist macros - s:%%%%[a-z]+($[^)]+$)? ?::g - # add %%%%dir prefix - s:^:%%%%dir : + s:%%[a-z]+($[^)]+$)? ?::g + # add %%dir prefix + s:^:%%dir : # print all parents :a # skip directories owned by other packages - s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: + s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: s:/[^/]+$::p ta ' "$@" | sort -u @@ -566,17 +567,19 @@ done { cd %buildroot find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%%%%%ghost /%%p\n' -o \ + $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ + -type f -name 'vmlinux-*.provides' -prune -o \ + -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. - echo '%%%%ghost /boot/initrd-%kernelrelease-kdump' + echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ - ! -path '*/modules.builtin' $ -printf '%%%%%%%%ghost /%%p\n' \ + ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ -o -name '*.ko' -prune -o -printf '/%%p\n' cat %my_builddir/base-modules fi @@ -585,7 +588,7 @@ -type d -o \ -printf '/%%p\n' if [ -e .%_docdir/%name ]; then - echo "%%%%doc %_docdir/%name" + echo "%%doc %_docdir/%name" fi } | sort -u >%my_builddir/tmp cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ @@ -756,9 +759,6 @@ %source_timestamp -%if %extract_vmlinux_debuginfo - %files devel-debuginfo -f vmlinux.debug.files -%endif %changelog ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:25.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:25.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kernel-source (Version 2.6.32) +# spec file for package kernel-source (Version 2.6.33) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ # icecream 0 %define srcversion 2.6.32 -%define patchversion 2.6.32 +%define patchversion 2.6.33-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define src_install_dir usr/src/linux-%kernelrelease%variant @@ -28,8 +28,8 @@ Name: kernel-source Summary: The Linux Kernel Sources -Version: 2.6.32 -Release: 3 +Version: 2.6.33 +Release: 1 %if %using_buildservice %else %endif @@ -73,12 +73,13 @@ Source53: kernel-source.spec.in Source54: kernel-binary.spec.in Source55: kernel-syms.spec.in -Source56: config.sh -Source57: compute-PATCHVERSION.sh -Source58: old-packages.conf -Source59: arch-symbols -Source60: package-descriptions -Source61: kernel-spec-macros +Source56: kernel-docs.spec.in +Source60: config.sh +Source61: compute-PATCHVERSION.sh +Source62: old-packages.conf +Source63: arch-symbols +Source64: package-descriptions +Source65: kernel-spec-macros Source100: config.tar.bz2 Source101: patches.arch.tar.bz2 Source102: patches.drivers.tar.bz2 ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:25.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:25.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kernel-syms (Version 2.6.32) +# spec file for package kernel-syms (Version 2.6.33) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,8 +22,8 @@ Name: kernel-syms Summary: Kernel Symbol Versions (modversions) -Version: 2.6.32 -Release: 3 +Version: 2.6.33 +Release: 1 %if %using_buildservice %else %define kernel_source_release %(LC_ALL=C rpm -q kernel-source%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0) @@ -48,9 +48,6 @@ %ifarch s390 Requires: kernel-s390-devel = %version-%source_rel %endif -%ifarch %ix86 x86_64 -Requires: kernel-xen-devel = %version-%source_rel -%endif Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-source%variant = %version-%source_rel ++++++ kernel-trace.spec ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:25.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:25.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kernel-trace (Version 2.6.32) +# spec file for package kernel-trace (Version 2.6.33) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.32 +%define patchversion 2.6.33-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor trace @@ -48,8 +48,8 @@ Name: kernel-trace Summary: The Realtime Linux Kernel -Version: 2.6.32 -Release: 3 +Version: 2.6.33 +Release: 1 %if %using_buildservice %else %endif @@ -83,8 +83,10 @@ BuildRequires: python %endif %ifarch s390 s390x +%if %build_vanilla BuildRequires: dwarfextract %endif +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" @@ -113,6 +115,18 @@ Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel +%ifarch ppc64 +Provides: kernel-kdump +Obsoletes: kernel-kdump +%endif +%ifarch s390 +Provides: kernel-32bit +Obsoletes: kernel-32bit +%endif +%ifarch s390x +Provides: kernel-64bit +Obsoletes: kernel-64bit +%endif Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%srcversion.tar.bz2 Source10: preun.sh Source11: postun.sh @@ -145,7 +159,7 @@ Source113: patches.kabi.tar.bz2 Source120: kabi.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: %ix86 ia64 x86_64 +ExclusiveArch: %ix86 ia64 ppc64 s390 s390x x86_64 # These files are found in the kernel-source package: NoSource: 0 NoSource: 100 @@ -189,7 +203,7 @@ # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" -%define __find_provides %_sourcedir/find-provides %name +%define __find_provides %_sourcedir/find-provides %my_builddir %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -316,19 +330,18 @@ mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor -%define extract_vmlinux_debuginfo 0 -%if 0%{?__debug_package:1} -%ifnarch ppc ppc64 -%define extract_vmlinux_debuginfo 1 -%endif -%endif add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor -%if %extract_vmlinux_debuginfo + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then + compressed=true + fi + cp vmlinux %buildroot/$vmlinux + >%my_builddir/vmlinux.debug.files +%if 0%{?__debug_package:1} + if $compressed; then local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) - cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux # FIXME: create and package build-id symlinks @@ -344,17 +357,22 @@ find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files -%else - cp vmlinux %buildroot/$vmlinux + else + # make vmlinux executable so that find-debuginfo.sh picks it up + # (TODO: fix find-debuginfo.sh instead) + chmod +x %buildroot/$vmlinux + # exctact the provided symbols before they are stripped away + echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \ + %my_builddir/$(basename $vmlinux).provides + fi %endif - if [ "$1" = --compressed ]; then + if $compressed; then gzip -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } %if %build_kdump add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %else # architecture specifics @@ -375,7 +393,6 @@ %endif %ifarch ppc ppc64 add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %endif %ifarch ia64 @@ -388,7 +405,9 @@ add_vmlinux --compressed cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image - if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then + if test -e arch/s390/boot/kerntypes.o; then + cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + elif test -x "$(which dwarfextract 2>/dev/null)"; then dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" @@ -396,9 +415,6 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif - if [ -e init/kerntypes.o ]; then - cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor - fi # end of build_kdump %endif for sub in '-base' '' '-extra'; do @@ -449,8 +465,10 @@ echo "Consistency check error: please update supported.conf." fi %ifarch s390 s390x - if [ -x "$(which dwarfextract 2>/dev/null)" -a \ - -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then + if test -e arch/s390/boot/kerntypes.o; then + : + elif test -x "$(which dwarfextract 2>/dev/null)" -a \ + -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi @@ -530,24 +548,19 @@ # Replace the absolute with a relative path sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile - link=%rpm_install_dir/%cpu_arch_flavor/include2/asm - target=$(readlink "$link") - target=${target#%build_src_dir/} - rm "$link" - ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi add_dirs_to_filelist() { sed -rn ' # print file name p # remove filelist macros - s:%%%%[a-z]+($[^)]+$)? ?::g - # add %%%%dir prefix - s:^:%%%%dir : + s:%%[a-z]+($[^)]+$)? ?::g + # add %%dir prefix + s:^:%%dir : # print all parents :a # skip directories owned by other packages - s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: + s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: s:/[^/]+$::p ta ' "$@" | sort -u @@ -562,17 +575,19 @@ done { cd %buildroot find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%%%%%ghost /%%p\n' -o \ + $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ + -type f -name 'vmlinux-*.provides' -prune -o \ + -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. - echo '%%%%ghost /boot/initrd-%kernelrelease-kdump' + echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ - ! -path '*/modules.builtin' $ -printf '%%%%%%%%ghost /%%p\n' \ + ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ -o -name '*.ko' -prune -o -printf '/%%p\n' cat %my_builddir/base-modules fi @@ -581,7 +596,7 @@ -type d -o \ -printf '/%%p\n' if [ -e .%_docdir/%name ]; then - echo "%%%%doc %_docdir/%name" + echo "%%doc %_docdir/%name" fi } | sort -u >%my_builddir/tmp cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ @@ -752,9 +767,6 @@ %source_timestamp -%if %extract_vmlinux_debuginfo - %files devel-debuginfo -f vmlinux.debug.files -%endif %changelog ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:25.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:25.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kernel-vanilla (Version 2.6.32) +# spec file for package kernel-vanilla (Version 2.6.33) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ # norootforbuild %define srcversion 2.6.32 -%define patchversion 2.6.32 +%define patchversion 2.6.33-rc5 %define variant %{nil} %include %_sourcedir/kernel-spec-macros %define build_flavor vanilla @@ -48,8 +48,8 @@ Name: kernel-vanilla Summary: The Standard Kernel - without any SUSE patches -Version: 2.6.32 -Release: 3 +Version: 2.6.33 +Release: 1 %if %using_buildservice %else %endif @@ -83,8 +83,10 @@ BuildRequires: python %endif %ifarch s390 s390x +%if %build_vanilla BuildRequires: dwarfextract %endif +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" @@ -197,7 +199,7 @@ # 11.1 Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" -%define __find_provides %_sourcedir/find-provides %name +%define __find_provides %_sourcedir/find-provides %my_builddir %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -324,19 +326,18 @@ mkdir -p %buildroot/boot # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor -%define extract_vmlinux_debuginfo 0 -%if 0%{?__debug_package:1} -%ifnarch ppc ppc64 -%define extract_vmlinux_debuginfo 1 -%endif -%endif add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor -%if %extract_vmlinux_debuginfo + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + if test $1 == "--compressed"; then + compressed=true + fi + cp vmlinux %buildroot/$vmlinux + >%my_builddir/vmlinux.debug.files +%if 0%{?__debug_package:1} + if $compressed; then local vmlinux_debug=usr/lib/debug/$vmlinux.debug mkdir -p $(dirname %buildroot/$vmlinux_debug) - cp vmlinux %buildroot/$vmlinux /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ -l vmlinux.sourcefiles %buildroot/$vmlinux # FIXME: create and package build-id symlinks @@ -352,17 +353,22 @@ find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files -%else - cp vmlinux %buildroot/$vmlinux + else + # make vmlinux executable so that find-debuginfo.sh picks it up + # (TODO: fix find-debuginfo.sh instead) + chmod +x %buildroot/$vmlinux + # exctact the provided symbols before they are stripped away + echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \ + %my_builddir/$(basename $vmlinux).provides + fi %endif - if [ "$1" = --compressed ]; then + if $compressed; then gzip -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi } %if %build_kdump add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %else # architecture specifics @@ -383,7 +389,6 @@ %endif %ifarch ppc ppc64 add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %endif %ifarch ia64 @@ -396,7 +401,9 @@ add_vmlinux --compressed cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image - if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then + if test -e arch/s390/boot/kerntypes.o; then + cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + elif test -x "$(which dwarfextract 2>/dev/null)"; then dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" @@ -404,9 +411,6 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif - if [ -e init/kerntypes.o ]; then - cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor - fi # end of build_kdump %endif for sub in '-base' '' '-extra'; do @@ -457,8 +461,10 @@ echo "Consistency check error: please update supported.conf." fi %ifarch s390 s390x - if [ -x "$(which dwarfextract 2>/dev/null)" -a \ - -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then + if test -e arch/s390/boot/kerntypes.o; then + : + elif test -x "$(which dwarfextract 2>/dev/null)" -a \ + -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi @@ -538,24 +544,19 @@ # Replace the absolute with a relative path sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile - link=%rpm_install_dir/%cpu_arch_flavor/include2/asm - target=$(readlink "$link") - target=${target#%build_src_dir/} - rm "$link" - ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi add_dirs_to_filelist() { sed -rn ' # print file name p # remove filelist macros - s:%%%%[a-z]+($[^)]+$)? ?::g - # add %%%%dir prefix - s:^:%%%%dir : + s:%%[a-z]+($[^)]+$)? ?::g + # add %%dir prefix + s:^:%%dir : # print all parents :a # skip directories owned by other packages - s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: + s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: s:/[^/]+$::p ta ' "$@" | sort -u @@ -570,17 +571,19 @@ done { cd %buildroot find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%%%%%ghost /%%p\n' -o \ + $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ + -type f -name 'vmlinux-*.provides' -prune -o \ + -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. - echo '%%%%ghost /boot/initrd-%kernelrelease-kdump' + echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ - ! -path '*/modules.builtin' $ -printf '%%%%%%%%ghost /%%p\n' \ + ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ -o -name '*.ko' -prune -o -printf '/%%p\n' cat %my_builddir/base-modules fi @@ -589,7 +592,7 @@ -type d -o \ -printf '/%%p\n' if [ -e .%_docdir/%name ]; then - echo "%%%%doc %_docdir/%name" + echo "%%doc %_docdir/%name" fi } | sort -u >%my_builddir/tmp cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ @@ -760,9 +763,6 @@ %source_timestamp -%if %extract_vmlinux_debuginfo - %files devel-debuginfo -f vmlinux.debug.files -%endif %changelog ++++++ kernel-vmi.spec ++++++ ++++ 763 lines (skipped) ++++++ config.conf ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:25.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:25.000000000 +0100 @@ -11,9 +11,10 @@ +i386 i386/default +i386 i386/desktop +i386 i386/pae ++i386 -syms i386/vmi +i386 -syms i386/debug -+i386 i386/xen -+i386 -syms i386/ec2 +#+i386 i386/xen +#+i386 -syms i386/ec2 +i386 i386/vanilla +i386 -syms i386/trace @@ -24,8 +25,8 @@ +x86_64 x86_64/default +x86_64 x86_64/desktop -+x86_64 x86_64/xen -+x86_64 -syms x86_64/ec2 +#+x86_64 x86_64/xen +#+x86_64 -syms x86_64/ec2 +x86_64 -syms x86_64/debug +x86_64 x86_64/vanilla +x86_64 -syms x86_64/trace @@ -48,11 +49,14 @@ +ppc64 ppc64/default # G5 pSeries +ppc64 ppc64/ppc64 ++ppc64 -syms ppc64/trace +ppc64 -syms ppc64/debug # maybe the kernels above were patched to death? +ppc64 ppc64/vanilla +s390 s390/s390 ++s390 -syms s390/trace +s390 s390/vanilla +s390x s390x/default ++s390x -syms s390x/trace +s390x s390x/vanilla ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:25.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:25.000000000 +0100 @@ -2,3 +2,6 @@ SRCVERSION=2.6.32 # variant of the kernel-source package, either empty or "-rt" VARIANT= +# buildservice projects to build the kernel against +OBS_PROJECT=openSUSE:Factory +IBS_PROJECT=SUSE:Factory:Head ++++++ config.tar.bz2 ++++++ ++++ 50238 lines of diff (skipped) ++++++ find-provides ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:26.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:26.000000000 +0100 @@ -5,11 +5,17 @@ grep -v '/kernel/drivers/staging/.*\.ko$' >"$filelist" shopt -s nullglob +builddir=$1 +shift + # pretend that /boot/vmlinux-* is in the -base package and not in -devel if grep -q '/boot/System\.map\>' "$filelist"; then prefix=$(sed -rn 's:(.*)/boot/System\.map\>.*:\1:p; T; q' "$filelist") for f in "$prefix"/boot/vmlinux*; do echo "$f" >>"$filelist" + if test -e "$builddir/$(basename "$f").provides"; then + cat "$_" + fi done else perl -ni -e 'next if /\/boot\/vmlinux/ && !/\.debug$/; print' "$filelist" ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:26.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:26.000000000 +0100 @@ -92,8 +92,10 @@ BuildRequires: python %endif %ifarch s390 s390x +%if %build_vanilla BuildRequires: dwarfextract %endif +%endif %if %build_xen %ifarch %ix86 %if %build_flavor != "ec2" @@ -204,7 +206,7 @@ Obsoletes: quickcam-kmp-%build_flavor < 0.6.7 # Provide the exported symbols as "ksym(symbol) = hash" -%define __find_provides %_sourcedir/find-provides %name +%define __find_provides %_sourcedir/find-provides %my_builddir %name # Will modules not listed in supported.conf abort the kernel build (0/1)? %define supported_modules_check 0 @@ -358,39 +360,44 @@ # (Could strip out non-public symbols.) cp -p System.map %buildroot/boot/System.map-%kernelrelease-%build_flavor -%define extract_vmlinux_debuginfo 0 -%if 0%{?__debug_package:1} -%ifnarch ppc ppc64 -%define extract_vmlinux_debuginfo 1 -%endif -%endif - add_vmlinux() { - local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor -%if %extract_vmlinux_debuginfo - local vmlinux_debug=usr/lib/debug/$vmlinux.debug - mkdir -p $(dirname %buildroot/$vmlinux_debug) - cp vmlinux %buildroot/$vmlinux - /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ - -l vmlinux.sourcefiles %buildroot/$vmlinux - # FIXME: create and package build-id symlinks - objcopy --only-keep-debug \ - %buildroot/$vmlinux \ - %buildroot/$vmlinux_debug || : - objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ - --strip-debug \ - %buildroot/$vmlinux || : - mkdir -p %buildroot/usr/src/debug - LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ - | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) - find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 - find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 - echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files -%else + local vmlinux=boot/vmlinux-%kernelrelease-%build_flavor compressed=false + + if test $1 == "--compressed"; then + compressed=true + fi cp vmlinux %buildroot/$vmlinux + >%my_builddir/vmlinux.debug.files +%if 0%{?__debug_package:1} + if $compressed; then + local vmlinux_debug=usr/lib/debug/$vmlinux.debug + mkdir -p $(dirname %buildroot/$vmlinux_debug) + /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug \ + -l vmlinux.sourcefiles %buildroot/$vmlinux + # FIXME: create and package build-id symlinks + objcopy --only-keep-debug \ + %buildroot/$vmlinux \ + %buildroot/$vmlinux_debug || : + objcopy --add-gnu-debuglink=%buildroot/$vmlinux_debug \ + --strip-debug \ + %buildroot/$vmlinux || : + mkdir -p %buildroot/usr/src/debug + LANG=C sort -z -u vmlinux.sourcefiles | grep -Ezv "<(built-in|stdin)>" \ + | ( cd %_builddir && cpio -pd0m %buildroot/usr/src/debug ) + find %buildroot/usr/src/debug -type d -print0 | xargs -0 -r chmod 0755 + find %buildroot/usr/src/debug -type f -print0 | xargs -0 -r chmod 0644 + echo -e "%%defattr(-, root, root)\\n/$vmlinux_debug" >%my_builddir/vmlinux.debug.files + else + # make vmlinux executable so that find-debuginfo.sh picks it up + # (TODO: fix find-debuginfo.sh instead) + chmod +x %buildroot/$vmlinux + # exctact the provided symbols before they are stripped away + echo %buildroot/$vmlinux | /usr/lib/rpm/find-provides.ksyms %name > \ + %my_builddir/$(basename $vmlinux).provides + fi %endif - if [ "$1" = --compressed ]; then + if $compressed; then gzip -9 %buildroot/$vmlinux chmod a-x %buildroot/$vmlinux.gz fi @@ -398,7 +405,6 @@ %if %build_kdump add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %else @@ -420,7 +426,6 @@ %endif %ifarch ppc ppc64 add_vmlinux - chmod 644 %buildroot/boot/vmlinux-%kernelrelease-%build_flavor image=vmlinux %endif %ifarch ia64 @@ -433,7 +438,9 @@ add_vmlinux --compressed cp -p arch/s390/boot/image %buildroot/boot/image-%kernelrelease-%build_flavor image=image - if [ -x "$(which dwarfextract 2>/dev/null)" ] ; then + if test -e arch/s390/boot/kerntypes.o; then + cp -p arch/s390/boot/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor + elif test -x "$(which dwarfextract 2>/dev/null)"; then dwarfextract vmlinux %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor || echo "dwarfextract failed ($?)" fi %if %CONFIG_KMSG_IDS == "y" @@ -441,9 +448,6 @@ find man -name '*.9' -exec install -m 644 -D '{}' %buildroot/usr/share/man/man9/ ';' %endif %endif - if [ -e init/kerntypes.o ]; then - cp init/kerntypes.o %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor - fi # end of build_kdump %endif @@ -506,8 +510,10 @@ fi %ifarch s390 s390x - if [ -x "$(which dwarfextract 2>/dev/null)" -a \ - -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor ] ; then + if test -e arch/s390/boot/kerntypes.o; then + : + elif test -x "$(which dwarfextract 2>/dev/null)" -a \ + -f %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor; then find %buildroot -name "*.ko" > kofiles.list dwarfextract %buildroot/boot/Kerntypes-%kernelrelease-%build_flavor -C kofiles.list || echo "dwarfextract failed ($?)" fi @@ -596,11 +602,6 @@ # Replace the absolute with a relative path sed -i "s,%build_src_dir,../../../linux-%kernelrelease%variant,g" \ %rpm_install_dir/%cpu_arch_flavor/Makefile - link=%rpm_install_dir/%cpu_arch_flavor/include2/asm - target=$(readlink "$link") - target=${target#%build_src_dir/} - rm "$link" - ln -s ../../../../linux-%kernelrelease%variant/"$target" "$link" fi add_dirs_to_filelist() { @@ -608,13 +609,13 @@ # print file name p # remove filelist macros - s:%%%%[a-z]+($[^)]+$)? ?::g - # add %%%%dir prefix - s:^:%%%%dir : + s:%%[a-z]+($[^)]+$)? ?::g + # add %%dir prefix + s:^:%%dir : # print all parents :a # skip directories owned by other packages - s:^%%%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: + s:^%%dir (/boot|/etc|/lib/(modules|firmware)|/usr/src)/[^/]+$:: s:/[^/]+$::p ta ' "$@" | sort -u @@ -631,19 +632,21 @@ { cd %buildroot find boot \ - $ -type l -o -name 'initrd-*' $ -printf '%%%%%%%%ghost /%%p\n' -o \ + $ -type l -o -name 'initrd-*' $ -printf '%%%%ghost /%%p\n' -o \ + -type f -name 'vmlinux-*.provides' -prune -o \ + -type f -name 'vmlinux-*' -printf '%%%%attr(0644, root, root) /%%p\n' -o \ -type f -printf '/%%p\n' # Add the auto-generated (by mkdumprd) kdump initrd to %ghost so that # the file gets removed when uninstalling the kernel. - echo '%%%%ghost /boot/initrd-%kernelrelease-kdump' + echo '%%ghost /boot/initrd-%kernelrelease-kdump' touch $RPM_BUILD_ROOT/boot/initrd-%kernelrelease-kdump if [ %CONFIG_MODULES = y ]; then find lib/modules/%kernelrelease-%build_flavor \ -type d -o \ $ -path '*/modules.*' ! -path '*/modules.order' \ - ! -path '*/modules.builtin' $ -printf '%%%%%%%%ghost /%%p\n' \ + ! -path '*/modules.builtin' \) -printf '%%%%ghost /%%p\n' \ -o -name '*.ko' -prune -o -printf '/%%p\n' cat %my_builddir/base-modules fi @@ -652,7 +655,7 @@ -type d -o \ -printf '/%%p\n' if [ -e .%_docdir/%name ]; then - echo "%%%%doc %_docdir/%name" + echo "%%doc %_docdir/%name" fi } | sort -u >%my_builddir/tmp cat %my_builddir/tmp %my_builddir/kernel-devel.files | sort | uniq -u | \ @@ -813,8 +816,6 @@ %source_timestamp -%if %extract_vmlinux_debuginfo %files devel-debuginfo -f vmlinux.debug.files -%endif %changelog ++++++ kernel-docs.spec.in ++++++ # # spec file for package kernel-docs@VARIANT@ (Version @RPMVERSION@) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild %include %_sourcedir/kernel-spec-macros Name: kernel-docs BuildRequires: docbook-toys docbook-utils ghostscript_any libjpeg-devel texlive transfig xmlto xorg-x11-devel BuildRequires: kernel-source = @RPMVERSION@ Url: http://www.kernel.org/ License: GPL v2 or later Group: Documentation/Man AutoReqProv: on Version: @RPMVERSION@ %if %using_buildservice Release: @RELEASE_PREFIX@<RELEASE> %else Release: @RELEASE_PREFIX@0 %endif Summary: Kernel Documentation BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: kernel-spec-macros %description These are the PDF documents and man pages (section 9) built from thecurrent kernel sources. %prep cp -av /etc/texmf/web2c/texmf.cnf . cat << EOF >> texmf.cnf main_memory.pdfjadetex = 2500000 hash_extra.pdfjadetex = 70000 max_strings.pdfjadetex = 120000 save_size.pdfjadetex = 10000 EOF %setup -T -c %build # use texmf.cnf from local source export TEXMFCNF=$RPM_BUILD_DIR export LANG=en_US make -C /usr/src/linux-%{version}-%{release_major} O=$PWD -k -i mandocs %{?jobs:-j%jobs} make -C /usr/src/linux-%{version}-%{release_major} O=$PWD -k -i pdfdocs %{?jobs:-j%jobs} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/%{_mandir}/man9 # filter out obscure device drivers - they clutter up the rpm and don't add any real value find Documentation/DocBook/ -name '*.9.gz' | egrep -v 'man/(sis[69]|rio|fsl|struct_rio|RIO|mpc85|set_rx_mode|mdio_(read|write)|mii_ioctl|mca_|z8530|nand|sppp|piix|(read|write)_zs)' | while read i ; do cp $i $RPM_BUILD_ROOT/%{_mandir}/man9 done install -d $RPM_BUILD_ROOT/usr/share/doc/kernel cp -a Documentation/DocBook/*.pdf $RPM_BUILD_ROOT/usr/share/doc/kernel || true if [ -d Documentation/kdb ] ; then for i in Documentation/kdb/*.m* ; do k=`basename $i` k=${k/man/9} k=${k/mm/9} cp $i $RPM_BUILD_ROOT/%{_mandir}/man9/$k done fi ln -s /usr/share/man/man9/request_threaded_irq.9.gz $RPM_BUILD_ROOT/usr/share/man/man9/request_irq.9.gz cp -a /usr/src/linux-%{version}-%{release_major}/{COPYING,CREDITS,MAINTAINERS,README,REPORTING-BUGS} . %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc COPYING CREDITS MAINTAINERS README REPORTING-BUGS %{_mandir}/man9/* %docdir /usr/share/doc/kernel /usr/share/doc/kernel %changelog ++++++ kernel-source.spec.in ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:26.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:26.000000000 +0100 @@ -76,12 +76,13 @@ Source53: kernel-source.spec.in Source54: kernel-binary.spec.in Source55: kernel-syms.spec.in -Source56: config.sh -Source57: compute-PATCHVERSION.sh -Source58: old-packages.conf -Source59: arch-symbols -Source60: package-descriptions -Source61: kernel-spec-macros +Source56: kernel-docs.spec.in +Source60: config.sh +Source61: compute-PATCHVERSION.sh +Source62: old-packages.conf +Source63: arch-symbols +Source64: package-descriptions +Source65: kernel-spec-macros Source100: config.tar.bz2 Source101: patches.arch.tar.bz2 Source102: patches.drivers.tar.bz2 ++++++ minmem ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:27.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:27.000000000 +0100 @@ -1 +1 @@ -2096000 +1048576 ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:27.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:27.000000000 +0100 @@ -82,6 +82,9 @@ # kernel-source.spec do_spec('source', "kernel-source$variant.spec", %macros); +# kernel-docs.spec +do_spec('docs', "kernel-docs$variant.spec", %macros); + # kernel-syms.spec { my $requires = ""; @@ -128,7 +131,7 @@ sub read_spec_templates { my %res; - for my $template qw(binary source syms) { + for my $template qw(binary source syms docs) { xopen(my $fh, '<', "$dir/kernel-$template.spec.in"); my @lines = <$fh>; $res{$template} = join("", @lines); ++++++ needed_space_in_mb ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:27.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:27.000000000 +0100 @@ -1 +1 @@ -6000 +6144 ++++++ package-descriptions ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:27.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:27.000000000 +0100 @@ -109,3 +109,8 @@ This kernel can only be used both as an unprivileged ("xenU") kernel (for Amazon EC2). +=== kernel-vmi === +VMI-enabled kernel + +The Linux Kernel designed to run on top of a virtual machine +interface layer (VMI). ++++++ patches.apparmor.tar.bz2 ++++++ ++++ 16674 lines of diff (skipped) ++++++ patches.arch.tar.bz2 ++++++ ++++ 7282 lines of diff (skipped) ++++++ patches.drivers.tar.bz2 ++++++ ++++ 18617 lines of diff (skipped) ++++++ patches.fixes.tar.bz2 ++++++ ++++ 4755 lines of diff (skipped) ++++++ patches.kernel.org.tar.bz2 ++++++ kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: byte 11, line 1 ++++++ patches.rpmify.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/arch-include-asm-fixes new/patches.rpmify/arch-include-asm-fixes --- old/patches.rpmify/arch-include-asm-fixes 2009-12-03 16:01:42.000000000 +0100 +++ new/patches.rpmify/arch-include-asm-fixes 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: [PATCH] kbuild: Properly handle arch/$arch/include/asm -References: bnc#427473 - - Some architectures have moved include/asm-$arch to arch/$arch/include/asm, - but were still placing new files in include/asm-$arch. This causes build - problems with out-of-tree modules. - - This patch properly handles the new locations. - -Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> ---- - Makefile | 23 +++++++++++++++-------- - arch/ia64/Makefile | 2 +- - arch/ia64/include/asm/irq.h | 2 +- - arch/ia64/kernel/Makefile | 6 +++--- - 4 files changed, 20 insertions(+), 13 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -992,8 +992,10 @@ define check-symlink - set -e; \ - if [ -L include/asm ]; then \ - asmlink=`readlink include/asm | cut -d '-' -f 2`; \ -- if [ "$$asmlink" != "$(SRCARCH)" ]; then \ -- echo "ERROR: the symlink $@ points to asm-$$asmlink but asm-$(SRCARCH) was expected"; \ -+ archlink=`readlink include/asm | cut -d '/' -f 3`; \ -+ if [ "$$asmlink" != "$(SRCARCH)" -a \ -+ "$$archlink" != "$(SRCARCH)" ]; then \ -+ echo "ERROR: the symlink $@ points to asm-$$asmlink but asm-$(SRCARCH) or ../arch/$(SRCARCH)/include/asm was expected"; \ - echo " set ARCH or save .config and run 'make mrproper' to fix it"; \ - exit 1; \ - fi; \ -@@ -1008,12 +1010,17 @@ endef - # not exist so the test in check-symlink works and we have a - # directory for generated filesas used by some architectures. - define create-symlink -- if [ ! -L include/asm ]; then \ -- $(kecho) ' SYMLINK $@ -> include/asm-$(SRCARCH)'; \ -- if [ ! -d include/asm-$(SRCARCH) ]; then \ -- mkdir -p include/asm-$(SRCARCH); \ -- fi; \ -- ln -fsn asm-$(SRCARCH) $@; \ -+ if [ ! -L include/asm ]; then \ -+ if [ -d arch/$(SRCARCH)/include/asm ]; then \ -+ echo ' SYMLINK $@ -> arch/$(SRCARCH)/include/asm'; \ -+ ln -fsn ../arch/$(SRCARCH)/include/asm $@; \ -+ else \ -+ echo ' SYMLINK $@ -> include/asm-$(SRCARCH)'; \ -+ if [ ! -d include/asm-$(SRCARCH) ]; then \ -+ mkdir -p include/asm-$(SRCARCH); \ -+ fi; \ -+ ln -fsn asm-$(SRCARCH) $@; \ -+ fi; \ - fi - endef - ---- a/arch/ia64/Makefile -+++ b/arch/ia64/Makefile -@@ -103,4 +103,4 @@ archprepare: make_nr_irqs_h FORCE - PHONY += make_nr_irqs_h FORCE - - make_nr_irqs_h: FORCE -- $(Q)$(MAKE) $(build)=arch/ia64/kernel include/asm-ia64/nr-irqs.h -+ $(Q)$(MAKE) $(build)=arch/ia64/kernel arch/ia64/include/asm/nr-irqs.h ---- a/arch/ia64/include/asm/irq.h -+++ b/arch/ia64/include/asm/irq.h -@@ -13,7 +13,7 @@ - - #include <linux/types.h> - #include <linux/cpumask.h> --#include <asm-ia64/nr-irqs.h> -+#include <asm/nr-irqs.h> - - static __inline__ int - irq_canonicalize (int irq) ---- a/arch/ia64/kernel/Makefile -+++ b/arch/ia64/kernel/Makefile -@@ -82,15 +82,15 @@ endef - - # We use internal kbuild rules to avoid the "is up to date" message from make - arch/$(SRCARCH)/kernel/nr-irqs.s: $(srctree)/arch/$(SRCARCH)/kernel/nr-irqs.c \ -- $(wildcard $(srctree)/include/asm-ia64/*/irq.h) -+ $(wildcard $(srctree)/arch/ia64/include/asm/*/irq.h) - $(Q)mkdir -p $(dir $@) - $(call if_changed_dep,cc_s_c) - --include/asm-ia64/nr-irqs.h: arch/$(SRCARCH)/kernel/nr-irqs.s -+arch/ia64/include/asm/nr-irqs.h: arch/$(SRCARCH)/kernel/nr-irqs.s - $(Q)mkdir -p $(dir $@) - $(call cmd,nr_irqs) - --clean-files += $(objtree)/include/asm-ia64/nr-irqs.h -+clean-files += $(objtree)/arch/ia64/include/asm/nr-irqs.h - - # - # native ivt.S, entry.S and fsys.S diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/arm-arch_include_asm-fix.diff new/patches.rpmify/arm-arch_include_asm-fix.diff --- old/patches.rpmify/arm-arch_include_asm-fix.diff 2009-12-03 16:01:42.000000000 +0100 +++ new/patches.rpmify/arm-arch_include_asm-fix.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -From: Jan Blunck <jblunck(a)suse.de> -Subject: ARM: move mach-types.h to arch/include/asm - -Although all other architecture specific includes where already moved to -arch/include/asm the mach-types.h header was still generated in the old -location. - -Signed-off-by: Jan Blunck <jblunck(a)suse.de> ---- - arch/arm/Makefile | 4 ++-- - arch/arm/tools/Makefile | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - ---- a/arch/arm/Makefile -+++ b/arch/arm/Makefile -@@ -247,7 +247,7 @@ archprepare: maketools - - PHONY += maketools FORCE - maketools: include/linux/version.h FORCE -- $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h -+ $(Q)$(MAKE) $(build)=arch/arm/tools arch/arm/include/asm/mach-types.h - - # Convert bzImage to zImage - bzImage: zImage -@@ -258,7 +258,7 @@ zImage Image xipImage bootpImage uImage: - zinstall install: vmlinux - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ - --CLEAN_FILES += include/asm-arm/mach-types.h \ -+CLEAN_FILES += arch/arm/include/asm/mach-types.h \ - include/asm-arm/arch include/asm-arm/.arch - - # We use MRPROPER_FILES and CLEAN_FILES now ---- a/arch/arm/tools/Makefile -+++ b/arch/arm/tools/Makefile -@@ -4,7 +4,7 @@ - # Copyright (C) 2001 Russell King - # - --include/asm-arm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types -+arch/arm/include/asm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types - @echo ' Generating $@' - @mkdir -p $(dir $@) - $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/dmar-fix-section-mismatch new/patches.rpmify/dmar-fix-section-mismatch --- old/patches.rpmify/dmar-fix-section-mismatch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/dmar-fix-section-mismatch 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,23 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: dmar: Fix section mismatch + + dmar_ir_support uses dmar_tbl, which is __initdata. dmar_ir_support is + only called by intr_remapping_supported, which is __init. So, we mark + dmar_ir_support as __init as well. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + drivers/pci/dmar.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/pci/dmar.c ++++ b/drivers/pci/dmar.c +@@ -1456,7 +1456,7 @@ int dmar_reenable_qi(struct intel_iommu + /* + * Check interrupt remapping support in DMAR table description. + */ +-int dmar_ir_support(void) ++int __init dmar_ir_support(void) + { + struct acpi_table_dmar *dmar; + dmar = (struct acpi_table_dmar *)dmar_tbl; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/gdth-section-conflict new/patches.rpmify/gdth-section-conflict --- old/patches.rpmify/gdth-section-conflict 2009-12-03 16:01:42.000000000 +0100 +++ new/patches.rpmify/gdth-section-conflict 1970-01-01 01:00:00.000000000 +0100 @@ -1,78 +0,0 @@ -Subject: gdth: Fixup section annotations -From: Hannes Reinecke <hare(a)suse.de> -Date: Tue Sep 30 12:33:53 2008 +0200: -Git: 833d622ac5002b5bcbcaae4dee335d3e80b84f28 - -Fixup section annotations so that kbuild doesn't complain anymore. - -Signed-off-by: Hannes Reinecke <hare(a)suse.de> - ---- - drivers/scsi/gdth.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - ---- a/drivers/scsi/gdth.c -+++ b/drivers/scsi/gdth.c -@@ -328,7 +328,7 @@ static int irq[MAXHA] __initdata = - {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff, - 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; - /* disable driver flag */ --static int disable __initdata = 0; -+static int disable = 0; - /* reserve flag */ - static int reserve_mode = 1; - /* reserve list */ -@@ -658,7 +658,7 @@ static int __devinit gdth_pci_init_one(s - #endif /* CONFIG_PCI */ - - #ifdef CONFIG_EISA --static int __init gdth_init_eisa(ushort eisa_adr,gdth_ha_str *ha) -+static int __devinit gdth_init_eisa(ushort eisa_adr,gdth_ha_str *ha) - { - ulong32 retries,id; - unchar prot_ver,eisacf,i,irq_found; -@@ -752,7 +752,7 @@ static int __init gdth_init_eisa(ushort - #endif /* CONFIG_EISA */ - - #ifdef CONFIG_ISA --static int __init gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha) -+static int __devinit gdth_init_isa(ulong32 bios_adr,gdth_ha_str *ha) - { - register gdt2_dpram_str __iomem *dp2_ptr; - int i; -@@ -4670,7 +4670,7 @@ static struct scsi_host_template gdth_te - }; - - #ifdef CONFIG_ISA --static int __init gdth_isa_probe_one(ulong32 isa_bios) -+static int __devinit gdth_isa_probe_one(ulong32 isa_bios) - { - struct Scsi_Host *shp; - gdth_ha_str *ha; -@@ -4802,7 +4802,7 @@ static int __init gdth_isa_probe_one(ulo - #endif /* CONFIG_ISA */ - - #ifdef CONFIG_EISA --static int __init gdth_eisa_probe_one(ushort eisa_slot) -+static int __devinit gdth_eisa_probe_one(ushort eisa_slot) - { - struct Scsi_Host *shp; - gdth_ha_str *ha; -@@ -5138,7 +5138,7 @@ static struct notifier_block gdth_notifi - gdth_halt, NULL, 0 - }; - --static int __init gdth_init(void) -+static int __devinit gdth_init(void) - { - if (disable) { - printk("GDT-HA: Controller driver disabled from" -@@ -5192,7 +5192,7 @@ static int __init gdth_init(void) - return 0; - } - --static void __exit gdth_exit(void) -+static void __devexit gdth_exit(void) - { - gdth_ha_str *ha; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/hpsa-fix-section-mismatch new/patches.rpmify/hpsa-fix-section-mismatch --- old/patches.rpmify/hpsa-fix-section-mismatch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/hpsa-fix-section-mismatch 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,23 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: hpsa: Fix section mismatch + + hpsa_pci_init calls hpsa_interrupt_mode which is a __devinit function. + hpsa_pci_init is only called by hpsa_init_one which is also __devinit, so + mark it __devinit as well. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + drivers/scsi/hpsa.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/scsi/hpsa.c ++++ b/drivers/scsi/hpsa.c +@@ -3111,7 +3111,7 @@ default_int_mode: + return; + } + +-static int hpsa_pci_init(struct ctlr_info *h, struct pci_dev *pdev) ++static int __devinit hpsa_pci_init(struct ctlr_info *h, struct pci_dev *pdev) + { + ushort subsystem_vendor_id, subsystem_device_id, command; + __u32 board_id, scratchpad = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/hugetlbfs-fix-section-mismatches new/patches.rpmify/hugetlbfs-fix-section-mismatches --- old/patches.rpmify/hugetlbfs-fix-section-mismatches 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/hugetlbfs-fix-section-mismatches 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,42 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: hugetlb: Fix section mismatches + + hugetlb_register_node calls hugetlb_sysfs_add_hstate, which is marked with + __init. Since hugetlb_register_node is only called by + hugetlb_register_all_nodes, which in turn is only called by hugetlb_init, + it's safe to mark both of them as __init. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + mm/hugetlb.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/mm/hugetlb.c ++++ b/mm/hugetlb.c +@@ -1648,7 +1648,7 @@ void hugetlb_unregister_node(struct node + * hugetlb module exit: unregister hstate attributes from node sysdevs + * that have them. + */ +-static void hugetlb_unregister_all_nodes(void) ++static void __init hugetlb_unregister_all_nodes(void) + { + int nid; + +@@ -1668,7 +1668,7 @@ static void hugetlb_unregister_all_nodes + * Register hstate attributes for a single node sysdev. + * No-op if attributes already registered. + */ +-void hugetlb_register_node(struct node *node) ++void __init hugetlb_register_node(struct node *node) + { + struct hstate *h; + struct node_hstate *nhs = &node_hstates[node->sysdev.id]; +@@ -1683,7 +1683,7 @@ void hugetlb_register_node(struct node * + * sysdevs of nodes that have memory. All on-line nodes should have + * registered their associated sysdev by this time. + */ +-static void hugetlb_register_all_nodes(void) ++static void __init hugetlb_register_all_nodes(void) + { + int nid; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning new/patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning --- old/patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/ia64-mca-fix-cast-from-integer-to-pointer-warning 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,24 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: ia64/mca: Fix cast from integer to pointer warning + + __get_free_pages() returns an unsigned long that is the address of the + pages returned. ia64_mca_cpu_init wants to use it as a data pointer, so + we cast it as void *. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + arch/ia64/kernel/mca.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/arch/ia64/kernel/mca.c ++++ b/arch/ia64/kernel/mca.c +@@ -1958,7 +1958,8 @@ ia64_mca_cpu_init(void *cpu_data) + data = mca_bootmem(); + first_time = 0; + } else +- data = __get_free_pages(GFP_KERNEL, get_order(sz)); ++ data = (void *)__get_free_pages(GFP_KERNEL, ++ get_order(sz)); + if (!data) + panic("Could not allocate MCA memory for cpu %d\n", + cpu); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ipmi-section-conflict.diff new/patches.rpmify/ipmi-section-conflict.diff --- old/patches.rpmify/ipmi-section-conflict.diff 2009-12-03 16:01:42.000000000 +0100 +++ new/patches.rpmify/ipmi-section-conflict.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: [PATCH] ipmi: Fix section type conflicts - - Module parameters can't be static since the module macros explicitly - put those symbols in the __param section. It causes a section conflict - on ia64. This doesn't occur with standard types, since they are global - and exported. - -Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> ---- - - drivers/char/ipmi/ipmi_si_intf.c | 4 ++-- - drivers/char/ipmi/ipmi_watchdog.c | 10 +++++----- - 2 files changed, 7 insertions(+), 7 deletions(-) - ---- a/drivers/char/ipmi/ipmi_si_intf.c -+++ b/drivers/char/ipmi/ipmi_si_intf.c -@@ -1150,7 +1150,7 @@ static unsigned int num_slave_addrs; - #define IPMI_MEM_ADDR_SPACE 1 - static char *addr_space_to_str[] = { "i/o", "mem" }; - --static int hotmod_handler(const char *val, struct kernel_param *kp); -+int hotmod_handler(const char *val, struct kernel_param *kp); - - module_param_call(hotmod, hotmod_handler, NULL, NULL, 0200); - MODULE_PARM_DESC(hotmod, "Add and remove interfaces. See" -@@ -1572,7 +1572,7 @@ static int check_hotmod_int_op(const cha - return 0; - } - --static int hotmod_handler(const char *val, struct kernel_param *kp) -+int hotmod_handler(const char *val, struct kernel_param *kp) - { - char *str = kstrdup(val, GFP_KERNEL); - int rv; ---- a/drivers/char/ipmi/ipmi_watchdog.c -+++ b/drivers/char/ipmi/ipmi_watchdog.c -@@ -196,7 +196,7 @@ static void ipmi_unregister_watchdog(int - */ - static int start_now; - --static int set_param_int(const char *val, struct kernel_param *kp) -+int set_param_int(const char *val, struct kernel_param *kp) - { - char *endp; - int l; -@@ -215,7 +215,7 @@ static int set_param_int(const char *val - return rv; - } - --static int get_param_int(char *buffer, struct kernel_param *kp) -+int get_param_int(char *buffer, struct kernel_param *kp) - { - return sprintf(buffer, "%i", *((int *)kp->arg)); - } -@@ -227,7 +227,7 @@ static int preaction_op(const char *inva - static int preop_op(const char *inval, char *outval); - static void check_parms(void); - --static int set_param_str(const char *val, struct kernel_param *kp) -+int set_param_str(const char *val, struct kernel_param *kp) - { - action_fn fn = (action_fn) kp->arg; - int rv = 0; -@@ -251,7 +251,7 @@ static int set_param_str(const char *val - return rv; - } - --static int get_param_str(char *buffer, struct kernel_param *kp) -+int get_param_str(char *buffer, struct kernel_param *kp) - { - action_fn fn = (action_fn) kp->arg; - int rv; -@@ -263,7 +263,7 @@ static int get_param_str(char *buffer, s - } - - --static int set_param_wdog_ifnum(const char *val, struct kernel_param *kp) -+int set_param_wdog_ifnum(const char *val, struct kernel_param *kp) - { - int rv = param_set_int(val, kp); - if (rv) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/md-section-conflict new/patches.rpmify/md-section-conflict --- old/patches.rpmify/md-section-conflict 2009-12-03 16:01:42.000000000 +0100 +++ new/patches.rpmify/md-section-conflict 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: md: Fix section conflicts - - Module parameters can't be static since the module macros explicitly - put those symbols in the __param section. It causes a section conflict - on ia64. This doesn't occur with standard types, since they are global - and exported. - -Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> ---- - - drivers/md/md.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/md/md.c -+++ b/drivers/md/md.c -@@ -6968,11 +6968,11 @@ static __exit void md_exit(void) - subsys_initcall(md_init); - module_exit(md_exit) - --static int get_ro(char *buffer, struct kernel_param *kp) -+int get_ro(char *buffer, struct kernel_param *kp) - { - return sprintf(buffer, "%d", start_readonly); - } --static int set_ro(const char *val, struct kernel_param *kp) -+int set_ro(const char *val, struct kernel_param *kp) - { - char *e; - int num = simple_strtoul(val, &e, 10); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/no-include-asm new/patches.rpmify/no-include-asm --- old/patches.rpmify/no-include-asm 2009-12-03 16:01:42.000000000 +0100 +++ new/patches.rpmify/no-include-asm 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -From: Takashi Iwai <tiwai(a)suse.de> -Subject: [PATCH] kbuild: correctly link include/asm in external builds -Patch-mainline: 2.6.27? - -Looking at this problem now, and found that it's likely a bug in the -upstream. The patch below should fix the creation of include2/asm -symlink, which resulted in build errors. - - -Takashi - -Signed-off-by: Takashi Iwai <tiwai(a)suse.de> ---- - ---- - Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/Makefile -+++ b/Makefile -@@ -965,7 +965,11 @@ ifneq ($(KBUILD_SRC),) - fi; - $(Q)if [ ! -d include2 ]; then \ - mkdir -p include2; \ -- ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ -+ if [ -d $(srctree)/arch/$(SRCARCH)/include/asm ]; then \ -+ ln -fsn $(srctree)/arch/$(SRCARCH)/include/asm include2/asm; \ -+ else \ -+ ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ -+ fi; \ - fi - endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/otus-fix-assignment-makes-integer-from-pointer-without-a-cast-warnings new/patches.rpmify/otus-fix-assignment-makes-integer-from-pointer-without-a-cast-warnings --- old/patches.rpmify/otus-fix-assignment-makes-integer-from-pointer-without-a-cast-warnings 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/otus-fix-assignment-makes-integer-from-pointer-without-a-cast-warnings 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,60 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: otus: fix assignment makes integer from pointer without a cast warnings + + This patch fixes some %x pointer printing to %p. + + It also uses the skb_tail_pointer and skb_mac_header macros for accessing + thos members. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + drivers/staging/otus/usbdrv.c | 4 ++-- + drivers/staging/otus/wrap_pkt.c | 10 ++-------- + 2 files changed, 4 insertions(+), 10 deletions(-) + +--- a/drivers/staging/otus/usbdrv.c ++++ b/drivers/staging/otus/usbdrv.c +@@ -829,7 +829,7 @@ int zfLnxRegisterVapDev(struct net_devic + { + /* Allocate net device structure */ + vap[vapId].dev = alloc_etherdev(0); +- printk("Register vap dev=%x\n", (u32_t)vap[vapId].dev); ++ printk("Register vap dev=%p\n", vap[vapId].dev); + + if(vap[vapId].dev == NULL) { + printk("alloc_etherdev fail\n"); +@@ -883,7 +883,7 @@ int zfLnxUnregisterVapDev(struct net_dev + printk("Unregister VAP dev : %s\n", vap[vapId].dev->name); + + if(vap[vapId].dev != NULL) { +- printk("Unregister vap dev=%x\n", (u32_t)vap[vapId].dev); ++ printk("Unregister vap dev=%p\n", vap[vapId].dev); + // + //unregister_netdevice(wds[wdsId].dev); + unregister_netdev(vap[vapId].dev); +--- a/drivers/staging/otus/wrap_pkt.c ++++ b/drivers/staging/otus/wrap_pkt.c +@@ -58,7 +58,7 @@ void zfLnxRecv80211(zdev_t *dev, zbuf_t + skb1 = skb_copy(buf, GFP_ATOMIC); + if (skb1 != NULL) { + skb1->dev = dev; +- skb1->mac_header = skb1->data; ++ skb_reset_mac_header(skb1); + skb1->ip_summed = CHECKSUM_NONE; + skb1->pkt_type = PACKET_OTHERHOST; + /* ETH_P_80211_RAW */ +@@ -85,13 +85,7 @@ void zfLnxRecvEth(zdev_t *dev, zbuf_t *b + /* new_buf = dev_alloc_skb(2048); */ + new_buf = dev_alloc_skb(buf->len); + +-#ifdef NET_SKBUFF_DATA_USES_OFFSET +- new_buf->tail = 0; +- new_buf->len = 0; +-#else +- new_buf->tail = new_buf->data; +- new_buf->len = 0; +-#endif ++ skb_reset_tail_pointer(new_buf); + + skb_put(new_buf, buf->len); + memcpy(new_buf->data, buf->data, buf->len); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/ppc-crashdump-typefix new/patches.rpmify/ppc-crashdump-typefix --- old/patches.rpmify/ppc-crashdump-typefix 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/ppc-crashdump-typefix 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,22 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: powerpc: use min_t in copy_oldmem_page + + The gcc used in Factory considers the comparison of csize and PAGE_SIZE + to be invalid and causes a build failure. This patch forces it to use size_t. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + arch/powerpc/kernel/crash_dump.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/powerpc/kernel/crash_dump.c ++++ b/arch/powerpc/kernel/crash_dump.c +@@ -128,7 +128,7 @@ ssize_t copy_oldmem_page(unsigned long p + if (!csize) + return 0; + +- csize = min(csize, PAGE_SIZE); ++ csize = min_t(size_t, csize, PAGE_SIZE); + + if (pfn < max_pfn) { + vaddr = __va(pfn << PAGE_SHIFT); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/psmouse-section-conflict.diff new/patches.rpmify/psmouse-section-conflict.diff --- old/patches.rpmify/psmouse-section-conflict.diff 2009-12-03 16:01:42.000000000 +0100 +++ new/patches.rpmify/psmouse-section-conflict.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: [PATCH] psmouse: fix section type conflict - - Module parameters can't be static since the module macros explicitly - put those symbols in the __param section. It causes a section conflict - on ia64. This doesn't occur with standard types, since they are global - and exported. - -Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> - ---- - - drivers/input/mouse/psmouse-base.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - ---- a/drivers/input/mouse/psmouse-base.c -+++ b/drivers/input/mouse/psmouse-base.c -@@ -39,8 +39,8 @@ MODULE_DESCRIPTION(DRIVER_DESC); - MODULE_LICENSE("GPL"); - - static unsigned int psmouse_max_proto = PSMOUSE_AUTO; --static int psmouse_set_maxproto(const char *val, struct kernel_param *kp); --static int psmouse_get_maxproto(char *buffer, struct kernel_param *kp); -+int psmouse_set_maxproto(const char *val, struct kernel_param *kp); -+int psmouse_get_maxproto(char *buffer, struct kernel_param *kp); - #define param_check_proto_abbrev(name, p) __param_check(name, p, unsigned int) - #define param_set_proto_abbrev psmouse_set_maxproto - #define param_get_proto_abbrev psmouse_get_maxproto -@@ -1652,7 +1652,8 @@ static ssize_t psmouse_attr_set_resoluti - } - - --static int psmouse_set_maxproto(const char *val, struct kernel_param *kp) -+/* These two should be static, but it causes a section type conflict */ -+int psmouse_set_maxproto(const char *val, struct kernel_param *kp) - { - const struct psmouse_protocol *proto; - -@@ -1669,7 +1670,7 @@ static int psmouse_set_maxproto(const ch - return 0; - } - --static int psmouse_get_maxproto(char *buffer, struct kernel_param *kp) -+int psmouse_get_maxproto(char *buffer, struct kernel_param *kp) - { - int type = *((unsigned int *)kp->arg); - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rt2860-fix-section-mismatches new/patches.rpmify/rt2860-fix-section-mismatches --- old/patches.rpmify/rt2860-fix-section-mismatches 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/rt2860-fix-section-mismatches 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,36 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: rt2860: Fix section mismatch + + rtusb_probe calls rt2870_probe which is marked __devinit. Since + rtusb_probe is only called as rtusb_driver->probe, it's safe to mark it + as __devinit also. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + drivers/staging/rt2860/usb_main_dev.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/staging/rt2860/usb_main_dev.c ++++ b/drivers/staging/rt2860/usb_main_dev.c +@@ -216,8 +216,8 @@ static int rt2870_suspend(struct usb_int + static int rt2870_resume(struct usb_interface *intf); + #endif /* CONFIG_PM // */ + +-static int rtusb_probe(struct usb_interface *intf, +- const struct usb_device_id *id); ++static int __devinit rtusb_probe(struct usb_interface *intf, ++ const struct usb_device_id *id); + static void rtusb_disconnect(struct usb_interface *intf); + + static BOOLEAN USBDevConfigInit(IN struct usb_device *dev, +@@ -296,8 +296,8 @@ static BOOLEAN USBDevConfigInit(IN struc + + } + +-static int rtusb_probe(struct usb_interface *intf, +- const struct usb_device_id *id) ++static int __devinit rtusb_probe(struct usb_interface *intf, ++ const struct usb_device_id *id) + { + struct rt_rtmp_adapter *pAd; + struct usb_device *dev; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rt2860-use-skb_tail_pointer new/patches.rpmify/rt2860-use-skb_tail_pointer --- old/patches.rpmify/rt2860-use-skb_tail_pointer 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/rt2860-use-skb_tail_pointer 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,67 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: rt2860: Use skb_tail_pointer + + rt2860 uses skb->tail directly. This patch uses the tail pointer macros + instead. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + drivers/staging/rt2860/rt_linux.c | 10 +++++----- + drivers/staging/rt2860/rt_linux.h | 4 ++-- + 2 files changed, 7 insertions(+), 7 deletions(-) + +--- a/drivers/staging/rt2860/rt_linux.c ++++ b/drivers/staging/rt2860/rt_linux.c +@@ -462,9 +462,9 @@ void *duplicate_pkt(struct rt_rtmp_adapt + if ((skb = + __dev_alloc_skb(HdrLen + DataSize + 2, MEM_ALLOC_FLAG)) != NULL) { + skb_reserve(skb, 2); +- NdisMoveMemory(skb->tail, pHeader802_3, HdrLen); ++ NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen); + skb_put(skb, HdrLen); +- NdisMoveMemory(skb->tail, pData, DataSize); ++ NdisMoveMemory(skb_tail_pointer(skb), pData, DataSize); + skb_put(skb, DataSize); + skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); + pPacket = OSPKT_TO_RTPKT(skb); +@@ -515,7 +515,7 @@ void *ClonePacket(struct rt_rtmp_adapter + pClonedPkt->dev = pRxPkt->dev; + pClonedPkt->data = pData; + pClonedPkt->len = DataSize; +- pClonedPkt->tail = pClonedPkt->data + pClonedPkt->len; ++ skb_set_tail_pointer(pClonedPkt, DataSize) + ASSERT(DataSize < 1530); + } + return pClonedPkt; +@@ -535,7 +535,7 @@ void update_os_packet_info(struct rt_rtm + pOSPkt->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); + pOSPkt->data = pRxBlk->pData; + pOSPkt->len = pRxBlk->DataSize; +- pOSPkt->tail = pOSPkt->data + pOSPkt->len; ++ skb_set_tail_pointer(pOSPkt, pOSPkt->len); + } + + void wlan_802_11_to_802_3_packet(struct rt_rtmp_adapter *pAd, +@@ -553,7 +553,7 @@ void wlan_802_11_to_802_3_packet(struct + pOSPkt->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); + pOSPkt->data = pRxBlk->pData; + pOSPkt->len = pRxBlk->DataSize; +- pOSPkt->tail = pOSPkt->data + pOSPkt->len; ++ skb_set_tail_pointer(pOSPkt, pOSPkt->len); + + /* */ + /* copy 802.3 header */ +--- a/drivers/staging/rt2860/rt_linux.h ++++ b/drivers/staging/rt2860/rt_linux.h +@@ -658,9 +658,9 @@ void linux_pci_unmap_single(void *handle + (RTPKT_TO_OSPKT(_pkt)->len) = (_len) + + #define GET_OS_PKT_DATATAIL(_pkt) \ +- (RTPKT_TO_OSPKT(_pkt)->tail) ++ (skb_tail_pointer(RTPKT_TO_OSPKT(_pkt)) + #define SET_OS_PKT_DATATAIL(_pkt, _start, _len) \ +- ((RTPKT_TO_OSPKT(_pkt))->tail) = (u8 *)((_start) + (_len)) ++ (skb_set_tail_pointer(RTPKT_TO_OSPKT(_pkt), _len)) + + #define GET_OS_PKT_HEAD(_pkt) \ + (RTPKT_TO_OSPKT(_pkt)->head) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rtl8192e-fix-section-mismatches new/patches.rpmify/rtl8192e-fix-section-mismatches --- old/patches.rpmify/rtl8192e-fix-section-mismatches 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/rtl8192e-fix-section-mismatches 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,47 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: rtl8192e: Fix section mismatches + + The following functions are all called during the failure path in + module initialization so can't be marked __exit. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + + drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c | 2 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 2 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c ++++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt.c +@@ -225,7 +225,7 @@ out: + } + + +-void __exit ieee80211_crypto_deinit(void) ++void ieee80211_crypto_deinit(void) + { + struct list_head *ptr, *n; + +--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c ++++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c +@@ -519,7 +519,7 @@ int __init ieee80211_crypto_ccmp_init(vo + } + + +-void __exit ieee80211_crypto_ccmp_exit(void) ++void ieee80211_crypto_ccmp_exit(void) + { + ieee80211_unregister_crypto_ops(&ieee80211_crypt_ccmp); + } +--- a/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c ++++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_tkip.c +@@ -1011,7 +1011,7 @@ int __init ieee80211_crypto_tkip_init(vo + } + + +-void __exit ieee80211_crypto_tkip_exit(void) ++void ieee80211_crypto_tkip_exit(void) + { + ieee80211_unregister_crypto_ops(&ieee80211_crypt_tkip); + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rtl8192e-use-skb_tail_pointer new/patches.rpmify/rtl8192e-use-skb_tail_pointer --- old/patches.rpmify/rtl8192e-use-skb_tail_pointer 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/rtl8192e-use-skb_tail_pointer 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,44 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: rtl8192e: Use skb_tail_pointer + + rtl8192e uses skb->tail directly. This patch uses the tail pointer macros + instead. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + drivers/staging/rtl8192e/r8192E_core.c | 5 ++--- + drivers/staging/rtl8192e/r819xE_cmdpkt.c | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +--- a/drivers/staging/rtl8192e/r8192E_core.c ++++ b/drivers/staging/rtl8192e/r8192E_core.c +@@ -1575,7 +1575,7 @@ static short rtl8192_alloc_rx_desc_ring( + return 0; + priv->rx_buf[i] = skb; + mapping = (dma_addr_t *)skb->cb; +- *mapping = pci_map_single(priv->pdev, skb->tail,//skb_tail_pointer(skb), ++ *mapping = pci_map_single(priv->pdev, skb_tail_pointer(skb), + priv->rxbuffersize, PCI_DMA_FROMDEVICE); + + entry->BufferAddress = cpu_to_le32(*mapping); +@@ -5806,8 +5806,7 @@ static void rtl8192_rx(struct net_device + + skb = new_skb; + priv->rx_buf[priv->rx_idx] = skb; +- *((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb->tail, priv->rxbuffersize, PCI_DMA_FROMDEVICE); +-// *((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb_tail_pointer(skb), priv->rxbuffersize, PCI_DMA_FROMDEVICE); ++ *((dma_addr_t *) skb->cb) = pci_map_single(priv->pdev, skb_tail_pointer(skb), priv->rxbuffersize, PCI_DMA_FROMDEVICE); + } + + } +--- a/drivers/staging/rtl8192e/r819xE_cmdpkt.c ++++ b/drivers/staging/rtl8192e/r819xE_cmdpkt.c +@@ -135,7 +135,7 @@ RT_STATUS cmpk_message_handle_tx( + * Transform from little endian to big endian + * and pending zero + */ +- seg_ptr = skb->tail; ++ seg_ptr = skb_tail_pointer(skb); + for(i=0 ; i < frag_length; i+=4) { + *seg_ptr++ = ((i+0)<frag_length)?code_virtual_address[i+3]:0; + *seg_ptr++ = ((i+1)<frag_length)?code_virtual_address[i+2]:0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/rtl8192u-dont-use-mhard-float new/patches.rpmify/rtl8192u-dont-use-mhard-float --- old/patches.rpmify/rtl8192u-dont-use-mhard-float 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/rtl8192u-dont-use-mhard-float 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,22 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: rtl8192u: don't use -mhard-float + + rtl8192u uses -mhard-float, which doesn't exist on ia64. Since in-kernel + floating-point isn't allowed, this is implied anyway. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + drivers/staging/rtl8192u/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/rtl8192u/Makefile ++++ b/drivers/staging/rtl8192u/Makefile +@@ -3,7 +3,7 @@ NIC_SELECT = RTL8192U + EXTRA_CFLAGS += -std=gnu89 + EXTRA_CFLAGS += -O2 + +-EXTRA_CFLAGS += -mhard-float -DCONFIG_FORCE_HARD_FLOAT=y ++EXTRA_CFLAGS += -DCONFIG_FORCE_HARD_FLOAT=y + EXTRA_CFLAGS += -DJACKSON_NEW_8187 -DJACKSON_NEW_RX + EXTRA_CFLAGS += -DTHOMAS_BEACON -DTHOMAS_TASKLET -DTHOMAS_SKB -DTHOMAS_TURBO + #EXTRA_CFLAGS += -DUSB_TX_DRIVER_AGGREGATION_ENABLE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/smsc47m1-fix-section-mismatch new/patches.rpmify/smsc47m1-fix-section-mismatch --- old/patches.rpmify/smsc47m1-fix-section-mismatch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/smsc47m1-fix-section-mismatch 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,22 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: smsc47m1: Fix section mismatch + + smsc47m1_restore is called from sm_smsc47m1_exit, which is an __exit + function, so it can't be __init. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + drivers/hwmon/smsc47m1.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/hwmon/smsc47m1.c ++++ b/drivers/hwmon/smsc47m1.c +@@ -488,7 +488,7 @@ static int __init smsc47m1_find(unsigned + } + + /* Restore device to its initial state */ +-static void __init smsc47m1_restore(const struct smsc47m1_sio_data *sio_data) ++static void smsc47m1_restore(const struct smsc47m1_sio_data *sio_data) + { + if ((sio_data->activate & 0x01) == 0) { + superio_enter(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/staging-missing-sched.h new/patches.rpmify/staging-missing-sched.h --- old/patches.rpmify/staging-missing-sched.h 2009-12-03 16:01:42.000000000 +0100 +++ new/patches.rpmify/staging-missing-sched.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -From: Jeff Mahoney <jeffm(a)suse.com> -Subject: [PATCH] staging: Complete sched.h removal from interrupt.h - - Commit d43c36dc removed sched.h from interrupt.h and distributed sched.h - to users which needed it. Since make all{mod,yes}config skips staging, - these drivers were missed. - -Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> ---- - drivers/staging/b3dfg/b3dfg.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/staging/b3dfg/b3dfg.c -+++ b/drivers/staging/b3dfg/b3dfg.c -@@ -33,6 +33,7 @@ - #include <linux/cdev.h> - #include <linux/list.h> - #include <linux/poll.h> -+#include <linux/sched.h> - #include <linux/wait.h> - #include <linux/mm.h> - #include <linux/uaccess.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings new/patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings --- old/patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.rpmify/tioca-fix-assignment-from-incompatible-pointer-warnings 2010-01-26 23:36:39.000000000 +0100 @@ -0,0 +1,22 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: tioca: Fix assignment from incompatible pointer warnings + + The prototype for sn_pci_provider->{dma_map,dma_map_consistent} expects + an unsigned long instead of a u64. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + arch/ia64/sn/pci/tioca_provider.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/ia64/sn/pci/tioca_provider.c ++++ b/arch/ia64/sn/pci/tioca_provider.c +@@ -508,7 +508,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dm + * use the GART mapped mode. + */ + static u64 +-tioca_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags) ++tioca_dma_map(struct pci_dev *pdev, unsigned long paddr, size_t byte_count, int dma_flags) + { + u64 mapaddr; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.rpmify/tsi148-dependency new/patches.rpmify/tsi148-dependency --- old/patches.rpmify/tsi148-dependency 2009-12-03 16:01:42.000000000 +0100 +++ new/patches.rpmify/tsi148-dependency 2010-01-26 23:36:39.000000000 +0100 @@ -1,5 +1,5 @@ From: Jeff Mahoney <jeffm(a)suse.com> -Subject: [PATCH] vme/tsi148: Depend on VIRT_TO_BUS +Subject: vme/tsi148: Depend on VIRT_TO_BUS This driver depends on virt_to_bus working correctly, but it doesn't exist on ppc64 (and probably other arches). ++++++ patches.suse.tar.bz2 ++++++ ++++ 33800 lines of diff (skipped) ++++++ patches.trace.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/ftrace-framepointer.diff new/patches.trace/ftrace-framepointer.diff --- old/patches.trace/ftrace-framepointer.diff 2009-11-27 10:49:21.000000000 +0100 +++ new/patches.trace/ftrace-framepointer.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -From: Jan Blunck <jblunck(a)suse.de> -Subject: Select FRAME_POINTER only on SYSPROF_TRACER -Date: Wed Sep 24 10:32:16 CEST 2008 - -The only tracer that requires frame pointers is the sysprof trace. Since this -tracer copies the functionality of oprofile, it isn't required at all. - -Signed-off-by: Jan Blunck <jblunck(a)suse.de> ---- - kernel/trace/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/kernel/trace/Kconfig -+++ b/kernel/trace/Kconfig -@@ -126,7 +126,6 @@ if FTRACE - config FUNCTION_TRACER - bool "Kernel Function Tracer" - depends on HAVE_FUNCTION_TRACER -- select FRAME_POINTER - select KALLSYMS - select GENERIC_TRACER - select CONTEXT_SWITCH_TRACER -@@ -203,6 +202,7 @@ config SYSPROF_TRACER - bool "Sysprof Tracer" - depends on X86 - select GENERIC_TRACER -+ select FRAME_POINTER - select CONTEXT_SWITCH_TRACER - help - This tracer provides the trace needed by the 'Sysprof' userspace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/lttng-instrumentation-fs.patch new/patches.trace/lttng-instrumentation-fs.patch --- old/patches.trace/lttng-instrumentation-fs.patch 2009-11-27 10:49:21.000000000 +0100 +++ new/patches.trace/lttng-instrumentation-fs.patch 2010-01-26 23:36:01.000000000 +0100 @@ -132,11 +132,13 @@ goto out_fput; --- a/fs/open.c +++ b/fs/open.c -@@ -30,6 +30,10 @@ - #include <linux/audit.h> +@@ -30,8 +30,12 @@ #include <linux/falloc.h> #include <linux/fs_struct.h> + #include <linux/ima.h> +#include <trace/fs.h> + + #include "internal.h" + +DEFINE_TRACE(fs_open); +DEFINE_TRACE(fs_close); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/lttng-instrumentation-ipc.patch new/patches.trace/lttng-instrumentation-ipc.patch --- old/patches.trace/lttng-instrumentation-ipc.patch 2009-11-27 10:49:21.000000000 +0100 +++ new/patches.trace/lttng-instrumentation-ipc.patch 2010-01-26 23:36:01.000000000 +0100 @@ -37,6 +37,27 @@ ipc/shm.c | 8 +++++++- 4 files changed, 39 insertions(+), 3 deletions(-) +--- /dev/null ++++ b/include/trace/ipc.h +@@ -0,0 +1,18 @@ ++#ifndef _TRACE_IPC_H ++#define _TRACE_IPC_H ++ ++#include <linux/tracepoint.h> ++ ++DECLARE_TRACE(ipc_msg_create, ++ TP_PROTO(long id, int flags), ++ TP_ARGS(id, flags)); ++DECLARE_TRACE(ipc_sem_create, ++ TP_PROTO(long id, int flags), ++ TP_ARGS(id, flags)); ++DECLARE_TRACE(ipc_shm_create, ++ TP_PROTO(long id, int flags), ++ TP_ARGS(id, flags)); ++DECLARE_TRACE(ipc_call, ++ TP_PROTO(unsigned int call, unsigned int first), ++ TP_ARGS(call, first)); ++#endif --- a/ipc/msg.c +++ b/ipc/msg.c @@ -38,6 +38,7 @@ @@ -56,7 +77,7 @@ static void freeque(struct ipc_namespace *, struct kern_ipc_perm *); static int newque(struct ipc_namespace *, struct ipc_params *); #ifdef CONFIG_PROC_FS -@@ -314,6 +317,7 @@ SYSCALL_DEFINE2(msgget, key_t, key, int, +@@ -315,6 +318,7 @@ SYSCALL_DEFINE2(msgget, key_t, key, int, struct ipc_namespace *ns; struct ipc_ops msg_ops; struct ipc_params msg_params; @@ -64,7 +85,7 @@ ns = current->nsproxy->ipc_ns; -@@ -324,7 +328,9 @@ SYSCALL_DEFINE2(msgget, key_t, key, int, +@@ -325,7 +329,9 @@ SYSCALL_DEFINE2(msgget, key_t, key, int, msg_params.key = key; msg_params.flg = msgflg; @@ -94,7 +115,7 @@ void sem_init_ns(struct ipc_namespace *ns) { ns->sc_semmsl = SEMMSL; -@@ -313,6 +316,7 @@ SYSCALL_DEFINE3(semget, key_t, key, int, +@@ -320,6 +323,7 @@ SYSCALL_DEFINE3(semget, key_t, key, int, struct ipc_namespace *ns; struct ipc_ops sem_ops; struct ipc_params sem_params; @@ -102,7 +123,7 @@ ns = current->nsproxy->ipc_ns; -@@ -327,7 +331,9 @@ SYSCALL_DEFINE3(semget, key_t, key, int, +@@ -334,7 +338,9 @@ SYSCALL_DEFINE3(semget, key_t, key, int, sem_params.flg = semflg; sem_params.u.nsems = nsems; @@ -116,9 +137,9 @@ --- a/ipc/shm.c +++ b/ipc/shm.c @@ -40,6 +40,7 @@ + #include <linux/nsproxy.h> #include <linux/mount.h> #include <linux/ipc_namespace.h> - #include <linux/ima.h> +#include <trace/ipc.h> #include <asm/uaccess.h> @@ -132,7 +153,7 @@ #define shm_ids(ns) ((ns)->ids[IPC_SHM_IDS]) #define shm_unlock(shp) \ -@@ -450,6 +453,7 @@ SYSCALL_DEFINE3(shmget, key_t, key, size +@@ -451,6 +454,7 @@ SYSCALL_DEFINE3(shmget, key_t, key, size struct ipc_namespace *ns; struct ipc_ops shm_ops; struct ipc_params shm_params; @@ -140,7 +161,7 @@ ns = current->nsproxy->ipc_ns; -@@ -461,7 +465,9 @@ SYSCALL_DEFINE3(shmget, key_t, key, size +@@ -462,7 +466,9 @@ SYSCALL_DEFINE3(shmget, key_t, key, size shm_params.flg = shmflg; shm_params.u.size = size; @@ -151,24 +172,3 @@ } static inline unsigned long copy_shmid_to_user(void __user *buf, struct shmid64_ds *in, int version) ---- /dev/null -+++ b/include/trace/ipc.h -@@ -0,0 +1,18 @@ -+#ifndef _TRACE_IPC_H -+#define _TRACE_IPC_H -+ -+#include <linux/tracepoint.h> -+ -+DECLARE_TRACE(ipc_msg_create, -+ TP_PROTO(long id, int flags), -+ TP_ARGS(id, flags)); -+DECLARE_TRACE(ipc_sem_create, -+ TP_PROTO(long id, int flags), -+ TP_ARGS(id, flags)); -+DECLARE_TRACE(ipc_shm_create, -+ TP_PROTO(long id, int flags), -+ TP_ARGS(id, flags)); -+DECLARE_TRACE(ipc_call, -+ TP_PROTO(unsigned int call, unsigned int first), -+ TP_ARGS(call, first)); -+#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/lttng-instrumentation-kernel.patch new/patches.trace/lttng-instrumentation-kernel.patch --- old/patches.trace/lttng-instrumentation-kernel.patch 2009-11-27 10:49:21.000000000 +0100 +++ new/patches.trace/lttng-instrumentation-kernel.patch 2010-01-26 23:36:01.000000000 +0100 @@ -33,10 +33,26 @@ kernel/printk.c | 7 +++++++ 2 files changed, 20 insertions(+) +--- /dev/null ++++ b/include/trace/kernel.h +@@ -0,0 +1,13 @@ ++#ifndef _TRACE_KERNEL_H ++#define _TRACE_KERNEL_H ++ ++#include <linux/tracepoint.h> ++ ++DECLARE_TRACE(kernel_printk, ++ TP_PROTO(unsigned long retaddr), ++ TP_ARGS(retaddr)); ++DECLARE_TRACE(kernel_vprintk, ++ TP_PROTO(unsigned long retaddr, char *buf, int len), ++ TP_ARGS(retaddr, buf, len)); ++ ++#endif --- a/kernel/printk.c +++ b/kernel/printk.c @@ -35,6 +35,7 @@ - #include <linux/kexec.h> + #include <linux/kmsg_dump.h> #include <linux/jhash.h> #include <linux/device.h> +#include <trace/kernel.h> @@ -61,7 +77,7 @@ #ifdef CONFIG_PRINTK static char __log_buf[__LOG_BUF_LEN]; -@@ -623,6 +628,7 @@ asmlinkage int printk(const char *fmt, . +@@ -609,6 +614,7 @@ asmlinkage int printk(const char *fmt, . int r; va_start(args, fmt); @@ -69,7 +85,7 @@ r = vprintk(fmt, args); va_end(args); -@@ -745,6 +751,7 @@ asmlinkage int vprintk(const char *fmt, +@@ -731,6 +737,7 @@ asmlinkage int vprintk(const char *fmt, printed_len += vscnprintf(printk_buf + printed_len, sizeof(printk_buf) - printed_len, fmt, args); @@ -77,19 +93,3 @@ p = printk_buf; ---- /dev/null -+++ b/include/trace/kernel.h -@@ -0,0 +1,13 @@ -+#ifndef _TRACE_KERNEL_H -+#define _TRACE_KERNEL_H -+ -+#include <linux/tracepoint.h> -+ -+DECLARE_TRACE(kernel_printk, -+ TP_PROTO(unsigned long retaddr), -+ TP_ARGS(retaddr)); -+DECLARE_TRACE(kernel_vprintk, -+ TP_PROTO(unsigned long retaddr, char *buf, int len), -+ TP_ARGS(retaddr, buf, len)); -+ -+#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/lttng-instrumentation-net.patch new/patches.trace/lttng-instrumentation-net.patch --- old/patches.trace/lttng-instrumentation-net.patch 2009-11-27 10:49:21.000000000 +0100 +++ new/patches.trace/lttng-instrumentation-net.patch 2010-01-26 23:36:01.000000000 +0100 @@ -102,8 +102,8 @@ #include "net-sysfs.h" @@ -196,6 +197,13 @@ EXPORT_SYMBOL(dev_base_lock); - #define NETDEV_HASHBITS 8 - #define NETDEV_HASHENTRIES (1 << NETDEV_HASHBITS) + DEFINE_RWLOCK(dev_base_lock); + EXPORT_SYMBOL(dev_base_lock); +DEFINE_TRACE(net_dev_xmit); +DEFINE_TRACE(net_dev_receive); @@ -123,7 +123,7 @@ /* Disable soft irqs for various locks below. Also * stops preemption for RCU. */ -@@ -2318,6 +2327,7 @@ int netif_receive_skb(struct sk_buff *sk +@@ -2355,6 +2364,7 @@ int netif_receive_skb(struct sk_buff *sk __get_cpu_var(netdev_rx_stat).total++; @@ -131,7 +131,7 @@ skb_reset_network_header(skb); skb_reset_transport_header(skb); skb->mac_len = skb->network_header - skb->mac_header; -@@ -2739,6 +2749,8 @@ void __napi_schedule(struct napi_struct +@@ -2779,6 +2789,8 @@ void __napi_schedule(struct napi_struct { unsigned long flags; @@ -140,7 +140,7 @@ local_irq_save(flags); list_add_tail(&n->poll_list, &__get_cpu_var(softnet_data).poll_list); __raise_softirq_irqoff(NET_RX_SOFTIRQ); -@@ -2754,6 +2766,7 @@ void __napi_complete(struct napi_struct +@@ -2794,6 +2806,7 @@ void __napi_complete(struct napi_struct list_del(&n->poll_list); smp_mb__before_clear_bit(); clear_bit(NAPI_STATE_SCHED, &n->state); @@ -148,7 +148,7 @@ } EXPORT_SYMBOL(__napi_complete); -@@ -2854,6 +2867,7 @@ static void net_rx_action(struct softirq +@@ -2894,6 +2907,7 @@ static void net_rx_action(struct softirq */ work = 0; if (test_bit(NAPI_STATE_SCHED, &n->state)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/lttng-instrumentation-page_alloc.patch new/patches.trace/lttng-instrumentation-page_alloc.patch --- old/patches.trace/lttng-instrumentation-page_alloc.patch 2009-11-27 10:49:21.000000000 +0100 +++ new/patches.trace/lttng-instrumentation-page_alloc.patch 2010-01-26 23:36:01.000000000 +0100 @@ -32,11 +32,30 @@ mm/page_alloc.c | 9 +++++++++ 2 files changed, 25 insertions(+) +--- /dev/null ++++ b/include/trace/page_alloc.h +@@ -0,0 +1,16 @@ ++#ifndef _TRACE_PAGE_ALLOC_H ++#define _TRACE_PAGE_ALLOC_H ++ ++#include <linux/tracepoint.h> ++ ++/* ++ * mm_page_alloc : page can be NULL. ++ */ ++DECLARE_TRACE(page_alloc, ++ TP_PROTO(struct page *page, unsigned int order), ++ TP_ARGS(page, order)); ++DECLARE_TRACE(page_free, ++ TP_PROTO(struct page *page, unsigned int order), ++ TP_ARGS(page, order)); ++ ++#endif --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -49,6 +49,7 @@ - #include <linux/debugobjects.h> #include <linux/kmemleak.h> + #include <linux/memory.h> #include <trace/events/kmem.h> +#include <trace/page_alloc.h> @@ -52,7 +71,7 @@ static void __free_pages_ok(struct page *page, unsigned int order); /* -@@ -587,6 +591,8 @@ static void __free_pages_ok(struct page +@@ -590,6 +594,8 @@ static void __free_pages_ok(struct page kmemcheck_free_shadow(page, order); @@ -61,7 +80,7 @@ for (i = 0 ; i < (1 << order) ; ++i) bad += free_pages_check(page + i); if (bad) -@@ -1086,6 +1092,8 @@ static void free_hot_cold_page(struct pa +@@ -1089,6 +1095,8 @@ static void free_hot_cold_page(struct pa kmemcheck_free_shadow(page, 0); @@ -70,7 +89,7 @@ if (PageAnon(page)) page->mapping = NULL; if (free_pages_check(page)) -@@ -1918,6 +1926,7 @@ nopage: +@@ -1917,6 +1925,7 @@ nopage: } return page; got_pg: @@ -78,22 +97,3 @@ if (kmemcheck_enabled) kmemcheck_pagealloc_alloc(page, order, gfp_mask); return page; ---- /dev/null -+++ b/include/trace/page_alloc.h -@@ -0,0 +1,16 @@ -+#ifndef _TRACE_PAGE_ALLOC_H -+#define _TRACE_PAGE_ALLOC_H -+ -+#include <linux/tracepoint.h> -+ -+/* -+ * mm_page_alloc : page can be NULL. -+ */ -+DECLARE_TRACE(page_alloc, -+ TP_PROTO(struct page *page, unsigned int order), -+ TP_ARGS(page, order)); -+DECLARE_TRACE(page_free, -+ TP_PROTO(struct page *page, unsigned int order), -+ TP_ARGS(page, order)); -+ -+#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/lttng-instrumentation-socket.patch new/patches.trace/lttng-instrumentation-socket.patch --- old/patches.trace/lttng-instrumentation-socket.patch 2009-11-27 10:49:21.000000000 +0100 +++ new/patches.trace/lttng-instrumentation-socket.patch 2010-01-26 23:36:01.000000000 +0100 @@ -40,8 +40,8 @@ #include <linux/netfilter.h> +#include <trace/socket.h> - static int sock_no_open(struct inode *irrelevant, struct file *dontcare); - static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov, + #include <linux/if_tun.h> + #include <linux/ipv6_route.h> @@ -156,6 +157,11 @@ static const struct net_proto_family *ne static DEFINE_PER_CPU(int, sockets_in_use) = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/lttng-instrumentation-swap.patch new/patches.trace/lttng-instrumentation-swap.patch --- old/patches.trace/lttng-instrumentation-swap.patch 2009-11-27 10:49:21.000000000 +0100 +++ new/patches.trace/lttng-instrumentation-swap.patch 2010-01-26 23:36:01.000000000 +0100 @@ -35,10 +35,31 @@ mm/swapfile.c | 6 ++++++ 4 files changed, 34 insertions(+) -Index: linux-2.6.31-master/mm/memory.c -=================================================================== ---- linux-2.6.31-master.orig/mm/memory.c -+++ linux-2.6.31-master/mm/memory.c +--- /dev/null ++++ b/include/trace/swap.h +@@ -0,0 +1,20 @@ ++#ifndef _TRACE_SWAP_H ++#define _TRACE_SWAP_H ++ ++#include <linux/swap.h> ++#include <linux/tracepoint.h> ++ ++DECLARE_TRACE(swap_in, ++ TP_PROTO(struct page *page, swp_entry_t entry), ++ TP_ARGS(page, entry)); ++DECLARE_TRACE(swap_out, ++ TP_PROTO(struct page *page), ++ TP_ARGS(page)); ++DECLARE_TRACE(swap_file_open, ++ TP_PROTO(struct file *file, char *filename), ++ TP_ARGS(file, filename)); ++DECLARE_TRACE(swap_file_close, ++ TP_PROTO(struct file *file), ++ TP_ARGS(file)); ++ ++#endif +--- a/mm/memory.c ++++ b/mm/memory.c @@ -56,6 +56,7 @@ #include <linux/kallsyms.h> #include <linux/swapops.h> @@ -56,18 +77,16 @@ #ifndef CONFIG_NEED_MULTIPLE_NODES /* use the per-pgdat data instead for discontigmem - mbligh */ unsigned long max_mapnr; -@@ -2539,6 +2542,7 @@ static int do_swap_page(struct mm_struct +@@ -2626,6 +2629,7 @@ static int do_swap_page(struct mm_struct /* Had to read the page from swap area: Major fault */ ret = VM_FAULT_MAJOR; count_vm_event(PGMAJFAULT); + trace_swap_in(page, entry); } else if (PageHWPoison(page)) { - ret = VM_FAULT_HWPOISON; - delayacct_clear_flag(DELAYACCT_PF_SWAPIN); -Index: linux-2.6.31-master/mm/page_io.c -=================================================================== ---- linux-2.6.31-master.orig/mm/page_io.c -+++ linux-2.6.31-master/mm/page_io.c + /* + * hwpoisoned dirty swapcache pages are kept for killing +--- a/mm/page_io.c ++++ b/mm/page_io.c @@ -18,8 +18,11 @@ #include <linux/swapops.h> #include <linux/buffer_head.h> @@ -77,7 +96,7 @@ +DEFINE_TRACE(swap_out); + - static struct bio *get_swap_bio(gfp_t gfp_flags, pgoff_t index, + static struct bio *get_swap_bio(gfp_t gfp_flags, struct page *page, bio_end_io_t end_io) { @@ -127,6 +130,7 @@ int swap_writepage(struct page *page, st @@ -88,10 +107,8 @@ unlock_page(page); submit_bio(rw, bio); out: -Index: linux-2.6.31-master/mm/swapfile.c -=================================================================== ---- linux-2.6.31-master.orig/mm/swapfile.c -+++ linux-2.6.31-master/mm/swapfile.c +--- a/mm/swapfile.c ++++ b/mm/swapfile.c @@ -33,12 +33,16 @@ #include <linux/capability.h> #include <linux/syscalls.h> @@ -106,9 +123,9 @@ +DEFINE_TRACE(swap_file_open); +DEFINE_TRACE(swap_file_close); + - static DEFINE_SPINLOCK(swap_lock); - static unsigned int nr_swapfiles; - long nr_swap_pages; + static bool swap_count_continued(struct swap_info_struct *, pgoff_t, + unsigned char); + static void free_swap_count_continuations(struct swap_info_struct *); @@ -1647,6 +1651,7 @@ SYSCALL_DEFINE1(swapoff, const char __us swap_map = p->swap_map; p->swap_map = NULL; @@ -118,35 +135,10 @@ mutex_unlock(&swapon_mutex); vfree(swap_map); @@ -2038,6 +2043,7 @@ SYSCALL_DEFINE2(swapon, const char __use - } else { - swap_info[prev].next = p - swap_info; - } + swap_list.head = swap_list.next = type; + else + swap_info[prev]->next = type; + trace_swap_file_open(swap_file, name); spin_unlock(&swap_lock); mutex_unlock(&swapon_mutex); error = 0; -Index: linux-2.6.31-master/include/trace/swap.h -=================================================================== ---- /dev/null -+++ linux-2.6.31-master/include/trace/swap.h -@@ -0,0 +1,20 @@ -+#ifndef _TRACE_SWAP_H -+#define _TRACE_SWAP_H -+ -+#include <linux/swap.h> -+#include <linux/tracepoint.h> -+ -+DECLARE_TRACE(swap_in, -+ TP_PROTO(struct page *page, swp_entry_t entry), -+ TP_ARGS(page, entry)); -+DECLARE_TRACE(swap_out, -+ TP_PROTO(struct page *page), -+ TP_ARGS(page)); -+DECLARE_TRACE(swap_file_open, -+ TP_PROTO(struct file *file, char *filename), -+ TP_ARGS(file, filename)); -+DECLARE_TRACE(swap_file_close, -+ TP_PROTO(struct file *file), -+ TP_ARGS(file)); -+ -+#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/powerpc-rename-irq-tracing new/patches.trace/powerpc-rename-irq-tracing --- old/patches.trace/powerpc-rename-irq-tracing 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.trace/powerpc-rename-irq-tracing 2010-01-26 23:36:01.000000000 +0100 @@ -0,0 +1,73 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: powerpc: rename irq tracing + + powerpc has separate irq tracing from that used in kernel/. This patch + renames it to powerpc_irq_entry. + + This may not be the correct fix, but it fixes a multiply-defined + build failure. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> +--- + arch/powerpc/include/asm/trace.h | 5 +++-- + arch/powerpc/kernel/irq.c | 7 ++++--- + 2 files changed, 7 insertions(+), 5 deletions(-) + +--- a/arch/powerpc/include/asm/trace.h ++++ b/arch/powerpc/include/asm/trace.h +@@ -5,10 +5,11 @@ + #define _TRACE_POWERPC_H + + #include <linux/tracepoint.h> ++#include <trace/irq.h> + + struct pt_regs; + +-TRACE_EVENT(irq_entry, ++TRACE_EVENT(powerpc_irq_entry, + + TP_PROTO(struct pt_regs *regs), + +@@ -25,7 +26,7 @@ TRACE_EVENT(irq_entry, + TP_printk("pt_regs=%p", __entry->regs) + ); + +-TRACE_EVENT(irq_exit, ++TRACE_EVENT(powerpc_irq_exit, + + TP_PROTO(struct pt_regs *regs), + +--- a/arch/powerpc/kernel/irq.c ++++ b/arch/powerpc/kernel/irq.c +@@ -54,6 +54,7 @@ + #include <linux/pci.h> + #include <linux/debugfs.h> + #include <linux/perf_event.h> ++#include <linux/ftrace.h> + + #include <asm/uaccess.h> + #include <asm/system.h> +@@ -337,12 +338,12 @@ static inline void check_stack_overflow( + #endif + } + +-void do_IRQ(struct pt_regs *regs) ++void __irq_entry do_IRQ(struct pt_regs *regs) + { + struct pt_regs *old_regs = set_irq_regs(regs); + unsigned int irq; + +- trace_irq_entry(regs); ++ trace_powerpc_irq_entry(regs); + + irq_enter(); + +@@ -368,7 +369,7 @@ void do_IRQ(struct pt_regs *regs) + } + #endif + +- trace_irq_exit(regs); ++ trace_powerpc_irq_exit(regs); + } + + void __init init_IRQ(void) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.trace/utrace-core new/patches.trace/utrace-core --- old/patches.trace/utrace-core 2009-11-27 10:49:21.000000000 +0100 +++ new/patches.trace/utrace-core 2010-01-26 23:36:01.000000000 +0100 @@ -49,7 +49,7 @@ @@ -9,7 +9,7 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \ kernel-hacking.xml kernel-locking.xml deviceiobook.xml \ - procfs-guide.xml writing_usb_driver.xml networking.xml \ + writing_usb_driver.xml networking.xml \ - kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \ + kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml utrace.xml \ gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ @@ -729,9 +729,9 @@ return 0; } @@ -134,6 +140,8 @@ static inline __must_check int tracehook - */ - static inline void tracehook_report_syscall_exit(struct pt_regs *regs, int step) - { + return; + } + + if (task_utrace_flags(current) & UTRACE_EVENT(SYSCALL_EXIT)) + utrace_report_syscall_exit(regs); ptrace_report_syscall(regs); @@ -1686,7 +1686,7 @@ +#endif /* linux/utrace_struct.h */ --- a/init/Kconfig +++ b/init/Kconfig -@@ -1266,6 +1266,15 @@ config STOP_MACHINE +@@ -1276,6 +1276,15 @@ config STOP_MACHINE help Need stop_machine() primitive. ++++++ patches.xen.tar.bz2 ++++++ ++++ 52705 lines of diff (skipped) ++++++ series.conf ++++++ ++++ 950 lines (skipped) ++++ between kernel-source/series.conf ++++ and /mounts/work_src_done/STABLE/kernel-source/series.conf ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:31.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:31.000000000 +0100 @@ -1,3 +1,3 @@ -2009-12-04 00:41:46 +0100 -GIT Revision: 4070eecb55553914dd7cf49aeb8a589df281e7d9 +2010-01-27 14:55:38 +0100 +GIT Revision: 2b3dccc0787e3003e55784678dcf8aa5c6503f95 GIT Branch: master ++++++ supported.conf ++++++ --- /var/tmp/diff_new_pack.5jlPHT/_old 2010-01-29 14:21:31.000000000 +0100 +++ /var/tmp/diff_new_pack.5jlPHT/_new 2010-01-29 14:21:31.000000000 +0100 @@ -43,6 +43,8 @@ kernel/arch/s390/kvm/kvm kernel/arch/x86/crypto/aes-i586 # Rijndael (AES) Cipher Algorithm (optimized for i586) kernel/arch/x86/crypto/aes-x86_64 + kernel/arch/x86/crypto/aesni-intel + kernel/arch/x86/crypto/ghash-clmulni-intel external # fate #306883 kernel/arch/x86/crypto/salsa20-i586 kernel/arch/x86/crypto/salsa20-x86_64 kernel/arch/x86/crypto/twofish-i586 @@ -58,6 +60,7 @@ - kernel/arch/x86/kernel/cpu/cpufreq/powernow-k6 - kernel/arch/x86/kernel/cpu/cpufreq/powernow-k7 kernel/arch/x86/kernel/cpu/cpufreq/powernow-k8 # AMD Athlon 64 and Opteron processor frequency driver. + kernel/arch/x86/kernel/cpu/cpufreq/pcc-cpufreq # HP's PCC cpufreq driver -> fate#306746 kernel/arch/x86/kernel/cpu/cpufreq/speedstep-centrino - kernel/arch/x86/kernel/cpu/cpufreq/speedstep-ich kernel/arch/x86/kernel/cpu/cpufreq/speedstep-lib @@ -69,8 +72,9 @@ kernel/arch/x86/kvm/kvm kernel/arch/x86/kvm/kvm-amd kernel/arch/x86/kvm/kvm-intel - kernel/arch/x86/oprofile/oprofile kernel/arch/x86/oprofile/oprofile # OProfile system profiler + kernel/arch/x86/kernel/cpu/mcheck/mce-inject # Needed for Intel MCE/RAS testing + mm/hwpoison-inject # Needed for Intel MCE/RAS testing kernel/crypto/aead kernel/crypto/aes_generic kernel/crypto/anubis @@ -143,6 +147,7 @@ +base kernel/drivers/acpi/dock # Be careful: libata depends on it kernel/drivers/acpi/fan # ACPI Fan Driver kernel/drivers/acpi/pci_slot + kernel/drivers/acpi/power_meter # ACPI Power Meter Driver kernel/drivers/acpi/processor # ACPI Processor Driver kernel/drivers/acpi/sbs kernel/drivers/acpi/sbshc @@ -688,6 +693,7 @@ kernel/drivers/input/keyboard/sunkbd # Sun keyboard driver kernel/drivers/input/keyboard/twl4030_keypad kernel/drivers/input/keyboard/xtkbd # XT keyboard driver + kernel/drivers/input/sparse-keymap kernel/drivers/input/misc/apanel kernel/drivers/input/misc/ati_remote kernel/drivers/input/misc/ati_remote2 @@ -811,6 +817,7 @@ - kernel/drivers/macintosh/mol/sheep kernel/drivers/md/dm-crypt # device-mapper target for transparent encryption / decryption kernel/drivers/md/dm-delay + kernel/drivers/md/dm-log-userspace kernel/drivers/md/dm-log kernel/drivers/md/dm-memcache kernel/drivers/md/dm-message @@ -819,7 +826,7 @@ kernel/drivers/md/dm-multipath # device-mapper multipath target kernel/drivers/md/dm-raid45 kernel/drivers/md/dm-regions - kernel/drivers/md/dm-region_hash + kernel/drivers/md/dm-region-hash kernel/drivers/md/dm-round-robin # Round-robin path selector kernel/drivers/md/dm-least-pending kernel/drivers/md/dm-queue-length # Queue-lenght oriented dynamic load balancer @@ -943,6 +950,7 @@ - kernel/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget # TTUSB DVB Driver - kernel/drivers/media/dvb/ttusb-dec/ttusbdecfe - kernel/drivers/media/dvb/ttusb-dec/ttusb_dec # TechnoTrend/Hauppauge DEC USB + kernel/drivers/media/IR/ir-core kernel/drivers/media/radio/dsbr100 +isa kernel/drivers/media/radio/radio-aimslab +isa kernel/drivers/media/radio/radio-aztech @@ -1022,6 +1030,7 @@ kernel/drivers/media/video/m52790 kernel/drivers/media/video/meye kernel/drivers/media/video/msp3400 # device driver for msp34xx TV sound processor + kernel/drivers/media/video/soc_mediabus kernel/drivers/media/video/mt9m001 kernel/drivers/media/video/mt9v022 kernel/drivers/media/video/mxb # video4linux-2 driver for the Siemens-Nixdorf 'Multimedia eXtension board' @@ -1343,6 +1352,7 @@ kernel/drivers/net/macvlan kernel/drivers/net/mii # MII hardware support library kernel/drivers/net/mlx4/mlx4_core + kernel/drivers/net/mlx4/mlx4_en kernel/drivers/net/mv643xx_eth # gigabit Pegasos2, all chips share the same MAC kernel/drivers/net/myri10ge/myri10ge kernel/drivers/net/natsemi # National Semiconductor DP8381x series PCI Ethernet driver @@ -1458,6 +1468,7 @@ kernel/drivers/net/via-velocity # VIA Networking Velocity Family Gigabit Ethernet Adapter Driver kernel/drivers/net/virtio_net +isa kernel/drivers/net/wan/c101 +- kernel/drivers/net/wan/cosa - kernel/drivers/net/wan/dlci - kernel/drivers/net/wan/dscc4 - kernel/drivers/net/wan/farsync @@ -1483,25 +1494,16 @@ +isa kernel/drivers/net/wan/z85230 +isa kernel/drivers/net/wd kernel/drivers/net/wireless/adm8211 -- kernel/drivers/net/wireless/airo_cs # Support for Cisco/Aironet 802.11 wireless ethernet cards. This is the module that links the PCMCIA card with the airo module. -- kernel/drivers/net/wireless/airo # Support for Cisco/Aironet 802.11 wireless ethernet cards. Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs. kernel/drivers/net/wireless/airport kernel/drivers/net/wireless/ath/ath kernel/drivers/net/wireless/ath5k/ath5k kernel/drivers/net/wireless/ath9k/ath9k + kernel/drivers/net/wireless/ath9k/ath9k_hw + kernel/drivers/net/wireless/ath9k/ath9k_common + kernel/drivers/net/wireless/atmel # Support for Atmel at76c50x 802.11 wireless ethernet cards. kernel/drivers/net/wireless/atmel_cs # Support for Atmel at76c50x 802.11 wireless ethernet cards. kernel/drivers/net/wireless/atmel_pci # Support for Atmel at76c50x 802.11 wireless ethernet cards. - kernel/drivers/net/wireless/atmel # Support for Atmel at76c50x 802.11 wireless ethernet cards. -- kernel/drivers/net/wireless/b43/b43 -- kernel/drivers/net/wireless/b43legacy/b43legacy kernel/drivers/net/wireless/hermes # Low-level driver helper for Lucent Hermes chipset and Prism II HFA384x wireless MAC controller -- kernel/drivers/net/wireless/hostap/hostap_cs -- kernel/drivers/net/wireless/hostap/hostap # Host AP common routines -- kernel/drivers/net/wireless/hostap/hostap_pci # Support for Intersil Prism2.5-based 802.11 wireless LAN PCI cards. -- kernel/drivers/net/wireless/hostap/hostap_plx # Support for Intersil Prism2-based 802.11 wireless LAN cards (PLX). -+external kernel/drivers/net/wireless/ipw2x00/ipw2100 -+external kernel/drivers/net/wireless/ipw2x00/ipw2200 -+external kernel/drivers/net/wireless/ipw2x00/libipw kernel/drivers/net/wireless/iwlwifi/iwl3945 kernel/drivers/net/wireless/iwlwifi/iwlagn kernel/drivers/net/wireless/iwlwifi/iwlcore @@ -1511,8 +1513,8 @@ kernel/drivers/net/wireless/libertas/usb8xxx kernel/drivers/net/wireless/mac80211_hwsim kernel/drivers/net/wireless/netwave_cs - kernel/drivers/net/wireless/orinoco_cs # Driver for PCMCIA Lucent Orinoco, Prism II based and similar wireless cards kernel/drivers/net/wireless/orinoco # Driver for Lucent Orinoco, Prism II based and similar wireless cards + kernel/drivers/net/wireless/orinoco_cs # Driver for PCMCIA Lucent Orinoco, Prism II based and similar wireless cards kernel/drivers/net/wireless/orinoco_nortel # Nortel specific Orinoco driver kernel/drivers/net/wireless/orinoco_pci # Driver for wireless LAN cards using direct PCI interface kernel/drivers/net/wireless/orinoco_plx # Driver for wireless LAN cards using the PLX9052 PCI bridge @@ -1521,25 +1523,49 @@ kernel/drivers/net/wireless/p54/p54pci kernel/drivers/net/wireless/p54/p54usb kernel/drivers/net/wireless/prism54/prism54 # The Prism54 802.11 Wireless LAN adapter -- kernel/drivers/net/wireless/ray_cs # Raylink/WebGear wireless LAN driver kernel/drivers/net/wireless/rndis_wlan + kernel/drivers/net/wireless/rtl8180 + kernel/drivers/net/wireless/rtl8187 + kernel/drivers/net/wireless/strip # Starmode Radio IP (STRIP) Device Driver + kernel/drivers/net/wireless/zd1201 + kernel/drivers/net/wireless/zd1211rw/zd1211rw ++external kernel/drivers/net/wireless/ipw2x00/ipw2100 ++external kernel/drivers/net/wireless/ipw2x00/ipw2200 ++external kernel/drivers/net/wireless/ipw2x00/libipw ++isa kernel/drivers/net/wireless/wavelan ++review kernel/drivers/net/wireless/spectrum_cs # Driver for 802.11b cards using RAM-loadable Symbol firmwar +- kernel/drivers/net/wireless/airo # Support for Cisco/Aironet 802.11 wireless ethernet cards. Direct support for ISA/PCI/MPI cards and support for PCMCIA when used with airo_cs. +- kernel/drivers/net/wireless/airo_cs # Support for Cisco/Aironet 802.11 wireless ethernet cards. This is the module that links the PCMCIA card with the airo module. +- kernel/drivers/net/wireless/arlan +- kernel/drivers/net/wireless/at76c50x-usb +- kernel/drivers/net/wireless/b43/b43 +- kernel/drivers/net/wireless/b43legacy/b43legacy +- kernel/drivers/net/wireless/hostap/hostap # Host AP common routines +- kernel/drivers/net/wireless/hostap/hostap_cs +- kernel/drivers/net/wireless/hostap/hostap_pci # Support for Intersil Prism2.5-based 802.11 wireless LAN PCI cards. +- kernel/drivers/net/wireless/hostap/hostap_plx # Support for Intersil Prism2-based 802.11 wireless LAN cards (PLX). +- kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi +- kernel/drivers/net/wireless/libertas/libertas_spi +- kernel/drivers/net/wireless/libertas_tf/libertas_tf +- kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb +- kernel/drivers/net/wireless/mwl8k +- kernel/drivers/net/wireless/p54/p54spi +- kernel/drivers/net/wireless/ray_cs # Raylink/WebGear wireless LAN driver - kernel/drivers/net/wireless/rt2x00/rt2400pci - kernel/drivers/net/wireless/rt2x00/rt2500pci - kernel/drivers/net/wireless/rt2x00/rt2500usb +- kernel/drivers/net/wireless/rt2x00/rt2800usb - kernel/drivers/net/wireless/rt2x00/rt2x00lib - kernel/drivers/net/wireless/rt2x00/rt2x00pci - kernel/drivers/net/wireless/rt2x00/rt2x00usb - kernel/drivers/net/wireless/rt2x00/rt61pci - kernel/drivers/net/wireless/rt2x00/rt73usb - kernel/drivers/net/wireless/rtl8180 - kernel/drivers/net/wireless/rtl8187 -+review kernel/drivers/net/wireless/spectrum_cs # Driver for 802.11b cards using RAM-loadable Symbol firmwar - kernel/drivers/net/wireless/strip # Starmode Radio IP (STRIP) Device Driver -+isa kernel/drivers/net/wireless/wavelan - kernel/drivers/net/wireless/wavelan_cs +- kernel/drivers/net/wireless/wl12xx/wl1251 +- kernel/drivers/net/wireless/wl12xx/wl1251_sdio +- kernel/drivers/net/wireless/wl12xx/wl1251_spi +- kernel/drivers/net/wireless/wl12xx/wl1271 - kernel/drivers/net/wireless/wl3501_cs # Planet wl3501 wireless driver - kernel/drivers/net/wireless/zd1201 - kernel/drivers/net/wireless/zd1211rw/zd1211rw kernel/drivers/net/yellowfin # Packet Engines Yellowfin G-NIC Gigabit Ethernet driver +isa kernel/drivers/net/znet kernel/drivers/parport/parport @@ -1558,6 +1584,7 @@ kernel/drivers/pci/hotplug/pci_hotplug # PCI Hot Plug PCI Core kernel/drivers/pci/hotplug/sgi_hotplug # SGI's PCI Hotplug controller Driver kernel/drivers/pci/hotplug/shpchp # Standard Hot Plug PCI Controller Driver + kernel/drivers/pci/pcie/aer/aer_inject # fate #306815 kernel/drivers/pcmcia/i82092 +isa kernel/drivers/pcmcia/i82365 kernel/drivers/pcmcia/pcmcia @@ -2462,8 +2489,12 @@ kernel/net/sunrpc/xprtrdma/svcrdma kernel/net/sunrpc/xprtrdma/xprtrdma - kernel/net/wanrouter/wanrouter +- kernel/net/wimax/wimax kernel/net/wireless/cfg80211 kernel/net/wireless/lib80211 + kernel/net/wireless/lib80211_crypt_ccmp + kernel/net/wireless/lib80211_crypt_tkip + kernel/net/wireless/lib80211_crypt_wep - kernel/net/x25/x25 # The X.25 Packet Layer network layer protocol kernel/net/xfrm/xfrm_ipcomp kernel/net/xfrm/xfrm_user @@ -2505,6 +2536,7 @@ kernel/sound/drivers/snd-serial-u16550 # MIDI serial u16550 kernel/sound/drivers/snd-virmidi # Dummy soundcard for virtual rawmidi devices kernel/sound/drivers/vx/snd-vx-lib # Common routines for Digigram VX drivers + kernel/sound/i2c/other/snd-ak4113 kernel/sound/i2c/other/snd-ak4114 +isa kernel/sound/i2c/other/snd-ak4117 kernel/sound/i2c/other/snd-ak4xxx-adda # Routines for control of AK452x / AK43xx AD/DA converters ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tulip for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jan '10

28 Jan '10

Hello community, here is the log from the commit of package tulip for openSUSE:Factory checked in at Thu Jan 28 20:05:37 CET 2010. -------- --- tulip/tulip.changes 2009-11-15 18:18:10.000000000 +0100 +++ tulip/tulip.changes 2010-01-20 09:38:17.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Jan 20 08:39:18 UTC 2010 - kkaempf(a)novell.com + +- Update to 3.3.0 + This release has a new CMake build system, new GUI features, Tulip + core library performance improvements, OpenGL rendering engine + improvements, plugins download improvements, support of Qt 4.6, and + many bug fixes. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- tulip-3.2.0-devHandbook.pdf tulip-3.2.0-userManual.pdf tulip-3.2.0.dif tulip-3.2.0.tar.bz2 New: ---- tulip-3.3.0-devHandbook.pdf tulip-3.3.0-userManual.pdf tulip-3.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tulip.spec ++++++ --- /var/tmp/diff_new_pack.rncj1K/_old 2010-01-28 20:05:09.000000000 +0100 +++ /var/tmp/diff_new_pack.rncj1K/_new 2010-01-28 20:05:09.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package tulip (Version 3.2.0) +# spec file for package tulip (Version 3.3.0) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,11 +32,11 @@ BuildRequires: fdupes %endif Summary: Visualization of huge graphs -Version: 3.2.0 -Release: 2 +Version: 3.3.0 +Release: 1 Prefix: /usr # .so version -%define tulip_version 3.2 +%define tulip_version 3.3 %define datadir %{prefix}/share %define pkgdatadir %{prefix}/share/tulip Url: http://www.tulip-software.org @@ -45,8 +45,7 @@ Source2: tulip-%{version}-userManual.pdf Source3: tulip-%{version}-devHandbook.pdf Source4: tulip-rpmlintrc -Patch: %{name}-%{version}.dif -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Graphics/Visualization/Graph Requires: Mesa BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -88,7 +87,7 @@ Poset Import plug-in Luis Garcia. %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Visualization of huge graphs - development files Group: Development/Libraries/Other Requires: tulip @@ -129,7 +128,7 @@ Poset Import plug-in Luis Garcia. %package doc -License: GPL v2 or later +License: GPLv2+ Summary: Visualization of huge graphs - user documentation Group: Productivity/Graphics/Visualization/Graph Requires: tulip @@ -170,7 +169,7 @@ Poset Import plug-in Luis Garcia. %package devel-doc -License: GPL v2 or later +License: GPLv2+ Summary: Visualization of huge graphs - development documentation Group: Documentation/HTML Requires: tulip-doc @@ -211,7 +210,7 @@ Poset Import plug-in Luis Garcia. %package -n libtulip -License: GPL v2 or later +License: GPLv2+ Summary: A library for handling large graphs Group: Productivity/Graphics/Visualization/Graph @@ -232,7 +231,7 @@ Poset Import plug-in Luis Garcia. %package -n libtulip-ogl -License: GPL v2 or later +License: GPLv2+ Summary: A library for displaying graph in a GL context Group: Productivity/Graphics/Visualization/Graph Requires: Mesa @@ -254,7 +253,7 @@ Poset Import plug-in Luis Garcia. %package -n libtulip-qt4 -License: GPL v2 or later +License: GPLv2+ Provides: libtulip-qt3 Obsoletes: libtulip-qt3 Summary: A set of Qt Widgets for tulip/tulip-ogl @@ -278,7 +277,6 @@ %prep %setup -q -%patch -p0 %build %{?suse_update_config:%{suse_update_config -f}} @@ -325,10 +323,6 @@ %fdupes -s %{buildroot}/%{prefix}/include/tulip %endif rm -f %{buildroot}/%{_libdir}/*.a -# marked as nodist -rm -f %{buildroot}/%{prefix}/include/ParallelCoordinatesConfigDialogData.h -rm -f %{buildroot}/%{prefix}/include/SpreadInsertColumnDialogData.h -rm -f %{buildroot}/%{prefix}/include/SpreadMainWidgetData.h %clean # Clear up the mess @@ -447,7 +441,6 @@ %dir %{_libdir}/tlp/designer %{_libdir}/tlp/designer/lib*.* %dir %{_libdir}/tlp/view -%{_libdir}/tlp/view/libParallelCoordinates-%{version}.* %{_libdir}/tlp/view/libSpreadSheet-%{version}.* %files doc @@ -459,7 +452,7 @@ %{datadir}/aclocal/tulip.m4 %dir %{_includedir}/tulip %{_includedir}/tulip/* -%{_includedir}/ParallelCoords*.h +%{_includedir}/*.h %files devel-doc %defattr(-,root,root) ++++++ tulip-3.2.0-devHandbook.pdf -> tulip-3.3.0-devHandbook.pdf ++++++ (binary differes) ++++++ tulip-3.2.0-userManual.pdf -> tulip-3.3.0-userManual.pdf ++++++ (binary differes) ++++++ tulip-3.2.0.tar.bz2 -> tulip-3.3.0.tar.bz2 ++++++ tulip/tulip-3.2.0.tar.bz2 tulip/tulip-3.3.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rxvt-unicode for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jan '10

28 Jan '10

Hello community, here is the log from the commit of package rxvt-unicode for openSUSE:Factory checked in at Thu Jan 28 19:17:18 CET 2010. -------- --- rxvt-unicode/rxvt-unicode.changes 2009-06-16 11:49:54.000000000 +0200 +++ rxvt-unicode/rxvt-unicode.changes 2010-01-01 00:33:38.000000000 +0100 @@ -1,0 +2,56 @@ +Wed Dec 30 10:41:46 UTC 2009 - pascal.bleser(a)opensuse.org + +- update to version 9.07: + * maintenance release, fixing a large number of minor issues, + such as compilation problems that have been found since the + last release + +------------------------------------------------------------------- +Thu Aug 13 15:53:07 UTC 2009 - puzel(a)novell.com + +- update to version 9.06: + - updates libev to 3.48. + - the aterm code now frees the as visual and image manager objects + when a window was closed. + - do not (wrongly) adjust the virtual line length inside + scr_insdel_chars/ERASE (Miroslav Lichvar). + - fix an issue where wide tab characters caused character shifts + when part of them was deleted (tracked down by Miroslav Lichvar). + - artificially enlargen the previous character at the end of a line + when trying to output a character that doesn't fit. looks ugly, but + makes copy&paste work. + - remove bogus "setuid/setgid security issues" from rxvt.1.pod, they + no longer apply. + - the urgency hint is now cleared on both focus in and focus out. + - cache urgency hint locally to avoid server rtt on every focus change. + - perl 5.10 needs PERL_SYS_INIT3 on hppa. + - ignore byte-order marks and do not treat them like combining characters. + - fix build issue when CURSOR_BLINK is not defined (Emanuele Giaquinta). + - do some µ-optimisations to the character fast path. + - use a less cunning, but more robust algorithm to avoid one terminal + monopolising the whole process by outputting a lot of text. + - try to work around linux first breaking sched_yield and now breaking + the only known workaround. + - new option -icon to set _NET_WM_ICON (based on patch by Frank Schmitt). + - initialise the as visual only on demand, instead of unconditionally, + to save memory in the common case of not using visual gimmicks. + - try to work around bugs in a few wm's that errornously resize + client windows on hint property updates by temporarily + disabling size hints. + - implement the DECSTR soft reset sequence and use it for tput init, + and make hard RIS and DECSTR both reset more private modes, such + as mouse reporting. + - redundantly clear mouse reporting and a few other states in + tput init/tput reset, for older urxvts. + - partial/full clear screens did cause flickering and possibly pixel + droppings when urxvt viewed the scrollback buffer. + - use current rendition style in DCH sequence. + - the 132/80 mode switch no longer forces a screen reset. + - add an osc sequence to change the border colour (Emanuele Giaquinta). + - new perl extension "overlay-osc", for status displays and the like. + - fix some minor cursor drawing issues with overlays by allowing + overlays to modify screen flags (to disable the cursor themselves). + - work around programs not restoring rstyle before rmcup + (analysed by Miroslav Lichvar). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rxvt-unicode-9.05.tar.bz2 New: ---- rxvt-unicode-9.07.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rxvt-unicode.spec ++++++ --- /var/tmp/diff_new_pack.oILZWs/_old 2010-01-28 19:16:59.000000000 +0100 +++ /var/tmp/diff_new_pack.oILZWs/_new 2010-01-28 19:16:59.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package rxvt-unicode (Version 9.05) +# spec file for package rxvt-unicode (Version 9.07) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,14 +19,19 @@ Name: rxvt-unicode -Version: 9.05 -Release: 18 +Version: 9.07 +Release: 1 # -License: LGPL v2.1 or later +License: LGPLv2.1+ Group: System/X11/Terminals # BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: freetype2-devel gcc-c++ pkgconfig xorg-x11-devel +BuildRequires: freetype2-devel gcc-c++ pkgconfig +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 920 +BuildRequires: XFree86-devel +%else +BuildRequires: xorg-x11-devel +%endif # for tic BuildRequires: ncurses-devel Provides: locale(xorg-x11:ja;ko;zh) @@ -46,8 +51,7 @@ Source: http://dist.schmorp.de/%{name}/%{name}-%{version}.tar.bz2 Source1: rxvt-unicode-rpmlintrc Source2: rxvt-unicode.README.SuSE -Patch: rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch -Patch1: rxvt-unicode-9.05.diff +Patch1: rxvt-unicode-9.02-CVE-2008-1142-DISPLAY.patch # Summary: Rxvt X Terminal with Unicode Support @@ -65,9 +69,8 @@ %prep %setup -q -%patch -%patch1 -p1 -find -type d -name CVS -print0 | xargs -r0 rm -r +%patch1 +find -type d -name CVS -print0 | xargs -r0 %__rm -r %{__install} -m 0644 %{S:2} README.SuSE %build @@ -126,7 +129,7 @@ --with-xpm-library=%{_prefix}/%{_lib} \ %endif --with-xpm -%{__make} +%__make %{?jobs:-j%{jobs}} %install %if %with_terminfo_files @@ -176,5 +179,6 @@ %{_libdir}/urxvt/perl/xim-onthespot %{_libdir}/urxvt/perl/kuake %{_libdir}/urxvt/perl/macosx-clipboard +%{_libdir}/urxvt/perl/overlay-osc %changelog ++++++ rxvt-unicode-9.05.tar.bz2 -> rxvt-unicode-9.07.tar.bz2 ++++++ ++++ 10475 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit blender for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jan '10

28 Jan '10

Hello community, here is the log from the commit of package blender for openSUSE:Factory checked in at Thu Jan 28 17:42:26 CET 2010. -------- --- blender/blender.changes 2009-12-19 20:34:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/blender/blender.changes 2010-01-23 15:51:35.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Jan 23 08:01:37 UTC 2010 - davejplater(a)gmail.com + +- Cleanup spec file, reinstate fdupes and add blender-2.49b-rpmlintrc + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- blender-2.49b-arrayoverflow.patch blender-2.49b-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blender.spec ++++++ --- /var/tmp/diff_new_pack.u11Dz9/_old 2010-01-28 17:40:46.000000000 +0100 +++ /var/tmp/diff_new_pack.u11Dz9/_new 2010-01-28 17:40:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package blender (Version 2.49b) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,6 +19,7 @@ Name: blender +%define jobs 3 %define DISTRIBUTABLE 1 # Patched code is built by default. # Use rpmbuild -D 'DISTRIBUTABLE 0' to build original code. @@ -27,8 +28,7 @@ BuildRequires: libao-devel libdrm-devel libpng-devel libquicktime-devel libtiff-devel libvorbis-devel BuildRequires: openal-devel openssl-devel python-devel scons update-desktop-files xorg-x11 yafray BuildRequires: desktop-file-utils shared-mime-info yasm-devel -#BuildRequires: kdebase3-runtime -BuildRequires: gettext-tools +BuildRequires: fdupes gettext-tools #noarch subpackage of binary package only possible from rpm-4.6.0 onwards. %if %suse_version > 1110 BuildRequires: rpm >= 4.6.0 @@ -40,7 +40,7 @@ Group: Productivity/Graphics/Visualization/Raytracers Summary: 3D Animation and Rendering Software Version: 2.49b -Release: 2 +Release: 3 AutoReqProv: on Requires: yafray Url: http://www.blender.org/ @@ -67,6 +67,7 @@ Source8: blender-patch-source Source9: blender.desktop Source10: x-blend.desktop +Source11: blender-2.49b-rpmlintrc Patch0: blender-2.48-bmake.patch Patch1: blender-2.48-gcc43.patch Patch2: blender-2.48-libtiff.patch @@ -79,6 +80,7 @@ #Patch submitted upstream - Blender Patches item #19234, Patch8: blender-2.49-uninit_var.patch Patch9: blender-2.49b-undefined-opp.patch +Patch10: blender-2.49b-arrayoverflow.patch Recommends: blender-doc %description @@ -145,6 +147,7 @@ %endif %patch8 %patch9 +%patch10 #fix locale naming %__mv bin/.blender/locale/hr_HR bin/.blender/locale/hr %__sed -i -e '/LLIBS/s/ c / /' config/linux2-config.py @@ -171,12 +174,8 @@ BF_PTHREADS=true \ %if %DISTRIBUTABLE <= 0 WITH_BF_FFMPEG=true \ - WITH_BF_LIBMP3LAME=yes \ - WITH_BF_X264=yes \ %else WITH_BF_FFMPEG=false \ - WITH_BF_LIBMP3LAME=no \ - WITH_BF_X264=no \ %endif WITH_BF_ZLIB=true \ WITH_BF_INTERNATIONAL=true \ @@ -239,10 +238,11 @@ # x-blend.desktop %__install -D -m 0644 "%{SOURCE10}" "%{buildroot}%{_datadir}/applications/x-blend.desktop" %suse_update_desktop_file %{buildroot}/%{_datadir}/applications/x-blend.desktop -#%%fdupes -s $RPM_BUILD_ROOT # symlink blenderplayer %__ln_s %{_libdir}/blender/blenderplayer %{buildroot}/%{_bindir}/blenderplayer -%find_lang blender +#mv "%{buildroot}%{_libdir}/%{name}/.blender/locale" "%{buildroot}%{_datadir}/ +%find_lang %{name} +%fdupes -s %{buildroot}%{_libdir}/%{name}/plugins %post /usr/bin/update-mime-database "%{_datadir}/mime" >/dev/null @@ -255,7 +255,7 @@ %__rm -rf ../install %__rm -rf "%{buildroot}" -%files +%files -f %{name}.lang %defattr(-,root,root) %{_bindir}/blender %{_bindir}/blender-sample ++++++ blender-2.49b-arrayoverflow.patch ++++++ Index: extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h =================================================================== --- extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h.orig +++ extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h @@ -501,7 +501,7 @@ class btGeneric6DofSpringConstraint : pu { protected: bool m_springEnabled[6]; - btScalar m_equilibriumPoint[6]; + btScalar m_equilibriumPoint[7]; btScalar m_springStiffness[6]; btScalar m_springDamping[6]; // between 0 and 1 (1 == no damping) void internalUpdateSprings(btConstraintInfo2* info); ++++++ blender-2.49b-rpmlintrc ++++++ addFilter("non-executable-script") addFilter("hidden-file-or-dir") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patterns-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jan '10

28 Jan '10

Hello community, here is the log from the commit of package patterns-openSUSE for openSUSE:Factory checked in at Thu Jan 28 17:39:14 CET 2010. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2010-01-21 15:32:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/patterns-openSUSE/patterns-openSUSE.changes 2010-01-28 10:05:48.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Jan 28 08:55:30 UTC 2010 - coolo(a)novell.com + +26e7f97 put lxde on dvd - let's see how large it is + +------------------------------------------------------------------- +Mon Jan 25 12:11:35 UTC 2010 - coolo(a)novell.com + +93eff17 added lxde patterns +1a1ca32 Switch to the new at-spi2 stack by default + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.gnNYSY/_old 2010-01-28 17:36:12.000000000 +0100 +++ /var/tmp/diff_new_pack.gnNYSY/_new 2010-01-28 17:36:12.000000000 +0100 @@ -25,7 +25,7 @@ AutoReqProv: on Summary: Patterns for Installation (full ftp tree) Version: 11.3 -Release: 2 +Release: 3 Url: http://en.opensuse.org/Patterns BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 @@ -272,7 +272,6 @@ Recommends: aalib-devel Recommends: accerciser Recommends: alsa-devel -Recommends: at-spi-devel Recommends: atk-devel Recommends: audiofile-devel Recommends: cairo-devel @@ -1052,7 +1051,7 @@ Recommends: NetworkManager-gnome Recommends: PolicyKit-gnome Recommends: aria2 -Recommends: at-spi +Recommends: at-spi2-core Recommends: avahi Recommends: awesfx Recommends: beagle @@ -1766,6 +1765,80 @@ %description laptop This package is installed if a pattern is selected to have a working update path +%package lxde +License: GPLv2+ +Group: Metapackages +Summary: Meta package for pattern lxde +Recommends: MozillaFirefox +Recommends: aria2 +Recommends: avahi +%ifarch ix86 +Recommends: avahi +%endif +Recommends: beaver +Recommends: cheese +Recommends: desktop-data-openSUSE +Recommends: droid-fonts +Recommends: galculator +Recommends: gmixer +Recommends: gnome-bluetooth +Recommends: gnome-packagekit +Recommends: gpicview +Recommends: gtk2-engine-murrine +Recommends: gutenprint +Recommends: hplip +Recommends: java-1_6_0-openjdk-plugin +Recommends: lxappearance +Recommends: lxde-common +Recommends: lxde-common-branding-openSUSE +Recommends: lxdm +Recommends: lxinput +Recommends: lxmenu-data +Recommends: lxmusic +Recommends: lxpanel +Recommends: lxrandr +Recommends: lxsession +Recommends: lxsession-edit +Recommends: lxshortcut +Recommends: lxtask +Recommends: lxterminal +Recommends: menu-cache +Recommends: nuoveXT2-icon-theme +Recommends: obconf +Recommends: openbox +Recommends: parcellite +Recommends: pcmanfm +Recommends: pidgin +Recommends: pinentry-gtk2 +Recommends: preload +Recommends: samba +Recommends: smolt +Recommends: transmisson-gtk +Recommends: xarchiver +Recommends: xdg-user-dirs +Recommends: xorg-x11 +Recommends: xscreensaver +Requires: patterns-openSUSE-lxde +Requires: patterns-openSUSE-x11 +%ifarch x86_64 +Recommends: nspluginwrapper +%endif + +%description lxde +This package is installed if a pattern is selected to have a working update path + +%package lxde_office +License: GPLv2+ +Group: Metapackages +Summary: Meta package for pattern lxde_office +Recommends: OpenOffice_org-gnome +Requires: patterns-openSUSE-lxde +Requires: patterns-openSUSE-lxde_office +Supplements: packageand(patterns-openSUSE-lxde:patterns-openSUSE-office) + +%description lxde_office +This package is installed if a pattern is selected to have a working update path + %package mail_server License: GPLv2+ Group: Metapackages @@ -2425,6 +2498,8 @@ echo 'This file marks the pattern kde4_yast to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/kde4_yast.txt echo 'This file marks the pattern lamp_server to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/lamp_server.txt echo 'This file marks the pattern laptop to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/laptop.txt +echo 'This file marks the pattern lxde to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/lxde.txt +echo 'This file marks the pattern lxde_office to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/lxde_office.txt echo 'This file marks the pattern mail_server to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/mail_server.txt echo 'This file marks the pattern misc_server to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/misc_server.txt echo 'This file marks the pattern multimedia to be installed.' > $RPM_BUILD_ROOT/usr/share/doc/packages/patterns-openSUSE/multimedia.txt @@ -2838,6 +2913,16 @@ %dir /usr/share/doc/packages/patterns-openSUSE /usr/share/doc/packages/patterns-openSUSE/laptop.txt +%files lxde +%defattr(-,root,root) +%dir /usr/share/doc/packages/patterns-openSUSE +/usr/share/doc/packages/patterns-openSUSE/lxde.txt + +%files lxde_office +%defattr(-,root,root) +%dir /usr/share/doc/packages/patterns-openSUSE +/usr/share/doc/packages/patterns-openSUSE/lxde_office.txt + %files mail_server %defattr(-,root,root) %dir /usr/share/doc/packages/patterns-openSUSE ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/DEVEL-GNOME new/patterns-openSUSE-data/data/DEVEL-GNOME --- old/patterns-openSUSE-data/data/DEVEL-GNOME 2009-10-02 19:46:32.000000000 +0200 +++ new/patterns-openSUSE-data/data/DEVEL-GNOME 2010-01-25 13:10:03.000000000 +0100 @@ -7,7 +7,6 @@ gtk-doc aalib-devel alsa-devel -at-spi-devel atk-devel audiofile-devel cairo-devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/GNOME-BASIS new/patterns-openSUSE-data/data/GNOME-BASIS --- old/patterns-openSUSE-data/data/GNOME-BASIS 2009-10-05 16:30:58.000000000 +0200 +++ new/patterns-openSUSE-data/data/GNOME-BASIS 2010-01-25 13:10:03.000000000 +0100 @@ -23,7 +23,7 @@ // #332596 gnome-keyring-pam gnome-mount -at-spi +at-spi2-core awesfx beagle beagle-evolution diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/LXDE new/patterns-openSUSE-data/data/LXDE --- old/patterns-openSUSE-data/data/LXDE 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/data/LXDE 2010-01-25 10:16:11.000000000 +0100 @@ -0,0 +1,55 @@ ++Prq: +patterns-openSUSE-lxde +-Prq: + ++Prc: +lxappearance +lxdm +lxde-common +lxde-common-branding-openSUSE +lxinput +lxmenu-data +lxmusic +lxpanel +lxrandr +lxsession +lxsession-edit +lxshortcut +lxtask +lxterminal +menu-cache +nuoveXT2-icon-theme +openbox +obconf +pcmanfm +gpicview +beaver +xarchiver +galculator +gmixer +parcellite +xscreensaver +gnome-bluetooth +pidgin +transmisson-gtk +cheese +// #393956 + 450220 + 481468(xdm) +xorg-x11 +// bnc#537362 +gnome-packagekit +// #404447 +gtk2-engine-murrine +// #440285 +pinentry-gtk2 +avahi +// #537365 +smolt +-Prc: ++Psg: +#pragma online +// Is that the right place for +// power manager? +xfce4-power-manager +lxlauncher +leafpad +-Psg: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/data/LXDE-Office new/patterns-openSUSE-data/data/LXDE-Office --- old/patterns-openSUSE-data/data/LXDE-Office 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/data/LXDE-Office 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1,9 @@ ++Prq: +patterns-openSUSE-lxde_office +-Prq: + ++Prc: +#if defined(__i386__) || defined (__x86_64__) +OpenOffice_org-gnome +#endif +-Prc: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/pattern-list.txt new/patterns-openSUSE-data/pattern-list.txt --- old/patterns-openSUSE-data/pattern-list.txt 2009-04-21 14:54:44.000000000 +0200 +++ new/patterns-openSUSE-data/pattern-list.txt 2010-01-25 10:16:10.000000000 +0100 @@ -15,6 +15,7 @@ gnome: GNOME Desktop Environment kde: KDE Desktop Environment xfce: XFCE Desktop Environment [only ftp/DVD] +lxde: LXDE Desktop Environment [only ftp/DVD] x11: X Window System fonts: Fonts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde/category new/patterns-openSUSE-data/toinstall/lxde/category --- old/patterns-openSUSE-data/toinstall/lxde/category 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde/category 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +addon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde/icon new/patterns-openSUSE-data/toinstall/lxde/icon --- old/patterns-openSUSE-data/toinstall/lxde/icon 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde/icon 2010-01-25 10:16:11.000000000 +0100 @@ -0,0 +1 @@ +pattern-lxde diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde/order new/patterns-openSUSE-data/toinstall/lxde/order --- old/patterns-openSUSE-data/toinstall/lxde/order 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde/order 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +1280 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde/requires new/patterns-openSUSE-data/toinstall/lxde/requires --- old/patterns-openSUSE-data/toinstall/lxde/requires 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde/requires 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +x11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde/role new/patterns-openSUSE-data/toinstall/lxde/role --- old/patterns-openSUSE-data/toinstall/lxde/role 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde/role 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +Graphical Environments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde/sel new/patterns-openSUSE-data/toinstall/lxde/sel --- old/patterns-openSUSE-data/toinstall/lxde/sel 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde/sel 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1,3 @@ +LXDE +COMMON-DESKTOP +COMMON-DESKTOP-OPT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde/visible new/patterns-openSUSE-data/toinstall/lxde/visible --- old/patterns-openSUSE-data/toinstall/lxde/visible 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde/visible 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde_office/category new/patterns-openSUSE-data/toinstall/lxde_office/category --- old/patterns-openSUSE-data/toinstall/lxde_office/category 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde_office/category 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +addon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde_office/extends new/patterns-openSUSE-data/toinstall/lxde_office/extends --- old/patterns-openSUSE-data/toinstall/lxde_office/extends 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde_office/extends 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +office diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde_office/freshens new/patterns-openSUSE-data/toinstall/lxde_office/freshens --- old/patterns-openSUSE-data/toinstall/lxde_office/freshens 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde_office/freshens 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +lxde diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde_office/icon new/patterns-openSUSE-data/toinstall/lxde_office/icon --- old/patterns-openSUSE-data/toinstall/lxde_office/icon 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde_office/icon 2010-01-25 10:16:11.000000000 +0100 @@ -0,0 +1 @@ +pattern-lxde diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde_office/order new/patterns-openSUSE-data/toinstall/lxde_office/order --- old/patterns-openSUSE-data/toinstall/lxde_office/order 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde_office/order 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +1880 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde_office/requires new/patterns-openSUSE-data/toinstall/lxde_office/requires --- old/patterns-openSUSE-data/toinstall/lxde_office/requires 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde_office/requires 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +lxde diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde_office/role new/patterns-openSUSE-data/toinstall/lxde_office/role --- old/patterns-openSUSE-data/toinstall/lxde_office/role 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde_office/role 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +Graphical Environments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde_office/sel new/patterns-openSUSE-data/toinstall/lxde_office/sel --- old/patterns-openSUSE-data/toinstall/lxde_office/sel 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde_office/sel 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +LXDE-Office diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde_office/supplements new/patterns-openSUSE-data/toinstall/lxde_office/supplements --- old/patterns-openSUSE-data/toinstall/lxde_office/supplements 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde_office/supplements 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +office diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/lxde_office/visible new/patterns-openSUSE-data/toinstall/lxde_office/visible --- old/patterns-openSUSE-data/toinstall/lxde_office/visible 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/lxde_office/visible 2010-01-25 10:16:10.000000000 +0100 @@ -0,0 +1 @@ +false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patterns-openSUSE-data/toinstall/rest_dvd/requires new/patterns-openSUSE-data/toinstall/rest_dvd/requires --- old/patterns-openSUSE-data/toinstall/rest_dvd/requires 2010-01-21 15:27:36.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/rest_dvd/requires 2010-01-25 16:04:31.000000000 +0100 @@ -100,8 +100,10 @@ #endif // for now xen_server xfce +lxde #if defined(__i386__) || defined (__x86_64__) xfce_office +lxde_office #endif xgl yast2_basis ++++++ preprocess ++++++ --- /var/tmp/diff_new_pack.gnNYSY/_old 2010-01-28 17:36:12.000000000 +0100 +++ /var/tmp/diff_new_pack.gnNYSY/_new 2010-01-28 17:36:12.000000000 +0100 @@ -5,5 +5,5 @@ cmdline="-U__i386__ -Ui386 -Ux86_64 -U__i586__ -U__x86_64__ -U__i686__ -D__$EXPLICIT_UNAME""__ " fi -{ /usr/bin/cpp -Ulinux -Uunix $cmdline -P $1; echo; } | grep -v "^$" +{ /usr/bin/cpp -Ulinux -Uunix -Upowerpc $cmdline -P $1; echo; } | grep -v "^$" exit 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit t-prot for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jan '10

28 Jan '10

Hello community, here is the log from the commit of package t-prot for openSUSE:Factory checked in at Thu Jan 28 17:36:53 CET 2010. -------- --- t-prot/t-prot.changes 2007-10-18 13:29:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/t-prot/t-prot.changes 2010-01-19 12:14:31.000000000 +0100 @@ -1,0 +2,27 @@ +Tue Jan 19 11:15:18 UTC 2010 - puzel(a)novell.com + +- update to 2.12 + * Exit with exit status EX_OK when --max-lines + hits and -Mmutt is set (mutt is picky when a display_filter + fails). Provide a notification line in that case. Update man page. + +------------------------------------------------------------------- +Tue Jan 5 15:42:52 UTC 2010 - puzel(a)novell.com + +- Update to 2.11 + * contrib/filter_innd.pl: Command line default has changed, check + flags must be set now. + * Fix initialization and command line parsing for + --check (this should work as advertised now). Make the ratio check + code a little easier to read. Add the default value for the ratio + check to the man page. + * Do not check for message length in attachments (we + checked already for the entire message). Do exit with proper exit + code if message is longer than set in --max-lines (so scripts can + see if we gave up processing). + * Change check order and remove duplicated code for + --max-lines. + * Fix a typo, thanks to Michael Hunger. Tweak the MS-TOFU + pattern, thanks to Simon Ruderich. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- t-prot-2.5.tar.bz2 New: ---- t-prot-2.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ t-prot.spec ++++++ --- /var/tmp/diff_new_pack.K7nWRt/_old 2010-01-28 17:35:00.000000000 +0100 +++ /var/tmp/diff_new_pack.K7nWRt/_new 2010-01-28 17:35:00.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package t-prot (Version 2.5) +# spec file for package t-prot (Version 2.12) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,12 +20,12 @@ Name: t-prot BuildRequires: perl-Getopt-Mixed perl-gettext Url: http://www.escape.de/users/tolot/mutt/ -License: Any permissive +License: PERMISSIVE-OSI-COMPLIANT Group: Productivity/Networking/Email/Utilities AutoReqProv: on Requires: perl-Getopt-Mixed perl-gettext -Version: 2.5 -Release: 63 +Version: 2.12 +Release: 1 Summary: A Display Filter for RFC822 Messages Source: %{name}-%{version}.tar.bz2 Source1: muttrc.t-prot ++++++ t-prot-2.5.tar.bz2 -> t-prot-2.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/t-prot-2.5/ChangeLog new/t-prot-2.12/ChangeLog --- old/t-prot-2.5/ChangeLog 2007-09-19 13:36:27.000000000 +0200 +++ new/t-prot-2.12/ChangeLog 2010-01-08 12:35:32.000000000 +0100 @@ -1,3 +1,121 @@ +2010-01-08 11:10 Jochen Striepe + + * t-prot: Release as v2.12. + +2010-01-08 11:08 Jochen Striepe + + * t-prot, t-prot.1: Exit with exit status EX_OK when --max-lines + hits and -Mmutt is set (mutt is picky when a display_filter fails). + Provide a notification line in that case. Update man page. Many + thanks to Gerfried Fuchs, Martin F. Krafft and Tino Keitel for + reporting, providing a patch and testing. + +2010-01-05 12:05 Jochen Striepe + + * t-prot: Release as v2.11. + +2010-01-05 12:01 Jochen Striepe + + * contrib/filter_innd.pl: Command line default has changed, check + flags must be set now. + +2010-01-05 11:46 Jochen Striepe + + * t-prot.1: Better explain ratio check value. + +2010-01-05 11:43 Jochen Striepe + + * t-prot.1: Update copyright time stamp. + +2010-01-05 11:42 Jochen Striepe + + * t-prot, t-prot.1: Fix initialization and command line parsing for + --check (this should work as advertised now). Make the ratio check + code a little easier to read. Add the default value for the ratio + check to the man page. + +2010-01-04 11:07 Jochen Striepe + + * t-prot.1: Remove URLs to example scripts and configs. The files + are provided with the package. + +2009-12-30 21:34 Jochen Striepe + + * t-prot, t-prot.1: Fix last commit, release as t-prot v2.10. + Update man page. + +2009-12-30 21:28 Jochen Striepe + + * t-prot: Release as t-prot v2.9. + +2009-12-30 21:27 Jochen Striepe + + * t-prot: Do not check for message length in attachments (we + checked already for the entire message). Do exit with proper exit + code if message is longer than set in --max-lines (so scripts can + see if we gave up processing). + +2009-12-30 09:07 Jochen Striepe + + * t-prot.1: Fix speling. + +2009-12-25 17:40 Jochen Striepe + + * t-prot.1: Fix time stamp. + +2009-12-20 21:38 Jochen Striepe + + * t-prot.1: Fix rendering for anyone out there using UTF-8. Many + thanks (and a very merry Christmas) to Alfie. + +2009-12-19 22:18 Jochen Striepe + + * t-prot: Release as v2.8. + +2009-12-18 21:53 Jochen Striepe + + * t-prot, t-prot.1: Update documentation to reflect last change. + Avoid being tripped by endless (or non-existant) headers. + +2009-12-18 13:25 Jochen Striepe + + * t-prot: Change check order and remove duplicated code for + --max-lines. + +2009-08-24 20:32 Jochen Striepe + + * t-prot: Release as t-prot v2.7. + +2009-08-24 17:20 Jochen Striepe + + * t-prot: Cosmetics. + +2009-08-24 17:17 Jochen Striepe + + * t-prot: Cosmetics. + +2009-08-24 12:15 Jochen Striepe + + * t-prot: Andreas Kneib had problems with some Microsoft Outlook + gargabe and submitted a one-liner. Thanks! + +2009-08-24 02:07 Jochen Striepe + + * t-prot: Release as t-prot v2.6. + +2009-08-24 01:44 Jochen Striepe + + * t-prot.1: Update dates. + +2009-08-24 01:43 Jochen Striepe + + * t-prot.1: Fix a typo, thanks to Gerfried Fuchs. + +2009-08-24 01:42 Jochen Striepe + + * t-prot: Fix a typo, thanks to Michael Hunger. Tweak the MS-TOFU + pattern, thanks to Simon Ruderich. + 2007-09-19 11:32 Jochen Striepe * t-prot, t-prot.1: Updated time stamps, released as v2.5. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/t-prot-2.5/contrib/filter_innd.pl new/t-prot-2.12/contrib/filter_innd.pl --- old/t-prot-2.5/contrib/filter_innd.pl 2007-09-19 13:36:27.000000000 +0200 +++ new/t-prot-2.12/contrib/filter_innd.pl 2010-01-08 12:35:32.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: filter_innd.pl,v 1.5 2005/04/15 14:07:11 jochen Exp $ +# $Id: filter_innd.pl,v 1.6 2010/01/05 12:01:13 jochen Exp $ # Copyright (c) 2004-2005 Jochen Striepe <t-prot(a)tolot.escape.de> # # This file is provided as an example how t-prot can be used for @@ -51,7 +51,7 @@ print OUT $foo; close OUT; - open(IN, "/usr/bin/t-prot -m -t -p --body --check -i $f|") + open(IN, "/usr/bin/t-prot -m -t -p --body --check=ratio -i $f|") || goto FINISH; $rval = <IN>; close IN; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/t-prot-2.5/contrib/README.patches new/t-prot-2.12/contrib/README.patches --- old/t-prot-2.5/contrib/README.patches 2007-09-19 13:36:27.000000000 +0200 +++ new/t-prot-2.12/contrib/README.patches 2010-01-08 12:35:32.000000000 +0100 @@ -22,8 +22,28 @@ -RECENT PATCHES -============== +PERMANENT PATCHES +================= + +These patches are updated as need be, as several distributions (that +is, their t-prot package maintainers) use them to adapt t-prot to the +distribution's environment. They will _not_ get dropped just because +nobody bugs me. :) + +Users: Please note that these patches will most likely be applied by the +t-prot package maintainer(s) of your distribution (if the distribution +makes use of said Slang, mutt and gnupg versions). + +t-prot-*-gol.diff +================= +Getopt::Mixed is abandoned and marked deprecated by its author, and many +distributions would like nothing better than to get rid of it. Using this +patch, you can make t-prot use Getopt::Long (which comes bundled with +standard perl). + +If you know how to deal with the serious performance impacts Getopt::Long +brings along, please drop me an email. Thanks. + t-prot-*-mutt15*.diff and t-prot-*-gpg1*.diff ============================================= @@ -39,9 +59,11 @@ Patch by Gregor Herrmann, making t-prot.sl run with Slang-2. -Please note that these patches will most likely be applied by the t-prot -package maintainer(s) of your distribution (if the distribution makes -use of said mutt and gnupg versions). + +RECENT PATCHES +============== + +none @@ -75,8 +97,8 @@ into vanilla t-prot. Thanks to everyone who sent bug reports or gave feedback. -t-prot-*-gol.diff -================= +t-prot-*-gol.diff (first version) +================================= This patch is no longer available. The feedback to Debian Bug #193937 came only from two people: the Debian diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/t-prot-2.5/contrib/t-prot-r1.271-gol.diff new/t-prot-2.12/contrib/t-prot-r1.271-gol.diff --- old/t-prot-2.5/contrib/t-prot-r1.271-gol.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/t-prot-2.12/contrib/t-prot-r1.271-gol.diff 2010-01-08 12:35:32.000000000 +0100 @@ -0,0 +1,189 @@ +--- t-prot 2010-01-08 12:10:26.000000000 +0100 ++++ t-prot-gol 2010-01-08 12:14:18.000000000 +0100 +@@ -4,7 +4,7 @@ + require 5.006; + use strict; + use Fcntl qw(O_EXCL O_WRONLY O_CREAT); +-use Getopt::Mixed qw(nextOption); ++use Getopt::Long qw(:config gnu_getopt no_ignore_case); + use constant VER => '2.12'; + use constant REV => ''; + use constant REL => q$Revision: 1.271 $=~m/(\d+(?:\.\d+)+)/; +@@ -914,84 +914,83 @@ + (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + my $ifile = '-'; # use STDIN if nothing specified + ++# temp vals: ++my ($_t1, $_t2, $_t3, $_t4, $_t5, $_t6, $_t7, $_t8, $_t9, $_ta, $_tb) = undef; ++ + # get command line params: +-Getopt::Mixed::init('a A=s c d e h i=s k L=s l m M=s o=s P=s p:s r S:i'. +- ' s t v w bigq:s body check:s debug>d diff ftr-ad ftr-ml groupwise'. +- ' help>h kminl=i kmaxl=i kdiff=i lax-security locale=s max-lines=i'. +- ' ms-smart mua>M pgp-short pgp-move pgp-move-vrf sigsmax:i spass'. +- ' version>v'); +-while (my ($opt, $val, $pretty) = nextOption()) { +- if ($opt eq 'a') { $ad = 1; } +- elsif ($opt eq 'A') { $ads = $val; } +- elsif ($opt eq 'bigq') { +- if ($val !~ /^(?:(\d+)(?:,(\d+))?)?$/) { help(); } +- $bigqn = $1?$1:30; +- $bigqx = $2?$2:10; +- if ($bigqn<=0 || $bigqx<=0 || $bigqn<=$bigqx) { help(); } +- } +- elsif ($opt eq 'body') { $nohdr = 1; $hdrs = 1; } +- elsif ($opt eq 'c') { $cr = 1; } +- elsif ($opt eq 'check') { +- $check = 1; +- while ($val && $val =~ /^([^,\s]+)(?:,(\S+))?$/) { +- my $foo = $1; +- $val = $2; +- +- if ($foo =~ /^ratio(?:=(0?\.\d+))?$/) { +- $check_ratio = $1?$1:0.75; +- } +- } +- } +- elsif ($opt eq 'd') { $sysl = 1; } +- elsif ($opt eq 'diff') { $diff = 1; } +- elsif ($opt eq 'e') { $elli = 1; } +- elsif ($opt eq 'ftr-ad') { $ftr_ad = 1; $ad = 1; } +- elsif ($opt eq 'ftr-ml') { $ftr_ml = 1; $ml = 1; } +- elsif ($opt eq 'groupwise') { $gw = 1; } +- elsif ($opt eq 'i') { $ifile = $val; } +- elsif ($opt eq 'k') { $kamm = 1; } +- elsif ($opt eq 'kminl') { $kminl = $val; $kamm = 1; } +- elsif ($opt eq 'kmaxl') { $kmaxl = $val; $kamm = 1; } +- elsif ($opt eq 'kdiff') { $kdiff = $val; $kamm = 1; } +- elsif ($opt eq 'L') { $footers = $val; } +- elsif ($opt eq 'l') { $ml = 1; } +- elsif ($opt eq 'lax-security') { $lax = 1; } +- elsif ($opt eq 'locale') { $locale = $val; } +- elsif ($opt eq 'm') { $ms = 1; } +- elsif ($opt eq 'max-lines') { $maxlines = $val; } +- elsif ($opt eq 'ms-smart') { $ms_smart = 1; $ms = 1; } +- elsif ($opt eq 'M') { +- $mua = lc($val); ++if (!Getopt::Long::GetOptions( ++ 'a' => \$ad, ++ 'A=s' => \$ads, ++ 'bigq:s' => \$_t1, ++ 'c' => \$cr, ++ 'check:s' => \$_t9, ++ 'debug|d' => \$sysl, ++ 'diff' => \$diff, ++ 'e' => \$elli, ++ 'ftr-ad' => \$ftr_ad, ++ 'ftr-ml' => \$ftr_ml, ++ 'groupwise' => \$gw, ++ 'help|h' => \$_t2, ++ 'i=s' => \$ifile, ++ 'k' => \$kamm, ++ 'kminl=i' => \$_t3, ++ 'kmaxl=i' => \$_t4, ++ 'kdiff=i' => \$_t5, ++ 'L=s' => \$footers, ++ 'l' => \$ml, ++ 'lax-security' => \$lax, ++ 'locale=s' => \$locale, ++ 'max-lines=i' => \$maxlines, ++ 'ms-smart' => \$ms_smart, ++ 'mua|M=s' => \$_t7, ++ 'm' => \$ms, ++ 'o=s' => \$ofile, ++ 'P=s' => \$boun, ++ 'p:s' => \$_t8, ++ 'pgp-short' => \$pgpshort, ++ 'pgp-move' => \$pgpmove, ++ 'pgp-move-vrf' => \$pgpmovevrf, ++ 'r' => \$hdrs, ++ 'S:i' => \$_t6, ++ 's' => \$sig, ++ 'sigsmax:i' => \$_ta, ++ 'spass' => \$spass, ++ 't' => \$trad, ++ 'version|v' => \$_tb, ++ 'w' => \$trsp ++ )) { ++ help(); ++} + +- if ($mua eq 'mutt') { +- # mutt still displays the message when ^C'ing pgp verification: +- $SIG{'INT'} = 'sigint_handler'; +- } ++# clean up temp vals: ++if (defined $_t1) { ++ if ($_t1 !~ /^(?:(\d+)(?:,(\d+))?)?$/) { help(); } ++ $bigqn = $1?$1:30; ++ $bigqx = $2?$2:10; ++ if ($bigqn<=0 || $bigqx<=0 || $bigqn<=$bigqx) { help(); } ++} ++if (defined $_t2) { help(); } ++if (defined $_t3) { $kminl = $_t3; $kamm = 1; } ++if (defined $_t4) { $kmaxl = $_t4; $kamm = 1; } ++if (defined $_t5) { $kdiff = $_t5; $kamm = 1; } ++if (defined $_t6) { $lsig = $_t6 ? $_t6 : $maxsig; } ++if (defined $_t7) { ++ $mua = lc($_t7); ++ # mutt still displays the message when ^C'ing pgp verification: ++ if ($mua eq 'mutt') { $SIG{'INT'} = 'sigint_handler'; } ++} ++if (defined $_t8) { $mda = $_t8 ? $_t8 : '1'; } ++if (defined $_t9) { ++ $check = 1; ++ while ($_t9 && $_t9 =~ /^([^,\s]+)(?:,(\S+))?$/) { ++ my $foo = $1; ++ $_t9 = $2; ++ if ($foo =~ /^ratio(?:=(0?\.\d+))?$/) { $check_ratio = $1?$1:0.75; } + } +- elsif ($opt eq 'o') { $ofile = $val; } +- elsif ($opt eq 'P') { $boun = $val; } +- elsif ($opt eq 'p') { $mda = $val ? $val : '1'; } +- elsif ($opt eq 'pgp-short') { $pgpshort = 1; } +- elsif ($opt eq 'pgp-move') { $pgpmove = 1; } +- elsif ($opt eq 'pgp-move-vrf') { $pgpmovevrf = 1; } +- elsif ($opt eq 'r') { $hdrs = 1; } +- elsif ($opt eq 'S') { $lsig = $val ? $val : $maxsig; } +- elsif ($opt eq 's') { $sig = 1; } +- elsif ($opt eq 'sigsmax') { $sign = $val ? $val : undef; } +- elsif ($opt eq 'spass') { $spass = 1; } +- elsif ($opt eq 't') { $trad = 1; } +- elsif ($opt eq 'v') { version(); } +- elsif ($opt eq 'w') { $trsp = 1; } +- else { help(); } + } +-Getopt::Mixed::cleanup(); +-if (($ml && $footers eq '')|| # no -l without -L +- ($ad && $ads eq '')|| # no -a without -A +- ($nohdr && $pgpshort)|| # --body and --pgp-short are like oil and water +- ($ifile eq '')|| # no empty -i +- ($ofile eq '')) # no empty -o +-{ help(); } +- ++if (defined $_ta) { $sign = $_ta ? $_ta : undef; } ++if (defined $_tb) { version(); } ++if ($ms_smart) { $ms = 1; } + + if ($mua eq 'mutt') { + if (defined $locale && $locale ne '' && $locale ne 'C' && $locale ne 'POSIX') { +@@ -1053,11 +1052,15 @@ + m/^([^%]*)/; + } + } +- +-} +-else { +- if ($ms_smart || $pgpshort || $pgpmove || $pgpmovevrf) { help(); } + } ++elsif ($ms_smart || $pgpshort || $pgpmove || $pgpmovevrf) { help(); } ++ ++if (($ml && $footers eq '')|| # no -l without -L ++ ($ad && $ads eq '')|| # no -a without -A ++ ($nohdr && $pgpshort)|| # --body and --pgp-short are like oil and water ++ ($ifile eq '')|| # no empty -i ++ ($ofile eq '')) # no empty -o ++{ help(); } + + + # Read message: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/t-prot-2.5/NEWS new/t-prot-2.12/NEWS --- old/t-prot-2.5/NEWS 1970-01-01 01:00:00.000000000 +0100 +++ new/t-prot-2.12/NEWS 2010-01-08 12:35:32.000000000 +0100 @@ -0,0 +1,25 @@ +T-PROT AND SUPPORT FOR GETOPT::LONG +=================================== + +Most distributions (it seems to me) are quite eager to abandon Getopt::Mixed, +having Getopt::Long in the official Perl package, which does everything the +former module did. Getopt::Mixed is unmaintained and marked deprecated by +its author, so why keep it? + +The answer is simple: because it's much faster (GNU time(1) tells me 28% +faster for running my complete t-prot release test suite consisting of +real-life emails) than anything I could get out of Getopt::Long. Plus, +from my point of view, there are no problems having a package installed +that is well-tested and just works fine (you don't need updates and more +new shiny features if the software just does what you want it to do). + +So we have the choice between easy maintainance and better performance. + + +For the time being, I made my choice and keep sticking to Getopt::Mixed as +long as it works as-is with current stable perl versions. That does not mean +I don't see the merits of a well-maintained standard module, which is already +available on any perl system out there. Thus, a patch is provided to allow +easy migration to Getopt::Long for anyone who likes this better. I hope +this solution is fine for everyone. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/t-prot-2.5/t-prot new/t-prot-2.12/t-prot --- old/t-prot-2.5/t-prot 2007-09-19 13:36:27.000000000 +0200 +++ new/t-prot-2.12/t-prot 2010-01-08 12:35:32.000000000 +0100 @@ -1,13 +1,13 @@ #!/usr/bin/perl -w -# $Id: t-prot,v 1.255 2007/09/19 11:32:58 jochen Exp $ +# $Id: t-prot,v 1.271 2010/01/08 11:10:26 jochen Exp $ require 5.006; use strict; use Fcntl qw(O_EXCL O_WRONLY O_CREAT); use Getopt::Mixed qw(nextOption); -use constant VER => '2.5'; +use constant VER => '2.12'; use constant REV => ''; -use constant REL => q$Revision: 1.255 $=~m/(\d+(?:\.\d+)+)/; +use constant REL => q$Revision: 1.271 $=~m/(\d+(?:\.\d+)+)/; # MTA expecting mail on STDIN # (you might have to adjust this if using a different MTA) use constant SENDMAIL => '/usr/sbin/sendmail -oi'; @@ -54,7 +54,7 @@ $ftr_ml = undef; # too hard on performance to be default $ofile = '-'; # use STDOUT if nothing is specified $spass_prefix = 'SPAM: '; -$check_ratio = .75; # 3/4 tofu is enough not to accept the message +$check_ratio = 0; # off by default $msg_quote = "Blocked by $0: This message has been rejected because of a full quote. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n"; $msg_ratio = "Blocked by $0: This message has been rejected because of excessive quoting. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n"; # end of user adjusted vals @@ -108,7 +108,7 @@ --kminl=n min. line length for wrapped line; requires -k --kmaxl=n max. line length for wrapped line; requires -k --kdiff=n max. length difference between wrapped lines; req. -k - -L=DIRECTORY mailling list footer directory, treat mailing list + -L=DIRECTORY mailing list footer directory, treat mailing list footers as signature -l delete mailing list footer; requires -L --lax-security use unsafe writing method; USE ON YOUR OWN RISK! @@ -178,12 +178,12 @@ for (my $z=0; $z<=$#l; $z++) { chomp($l[$z]); } if (defined $V) { - WIPE: for (my $z=scalar(@$L)-scalar(@l); $z>=0; $z--) - { + WIPE: for (my $z=scalar(@$L)-scalar(@l); $z>=0; $z--) { if (scalar(@l)+$z<=scalar(@$L)) { my $y = 0; for(my $x=1; $x<=scalar(@l); $x++) { - if (index($$L[scalar(@$L)-$x-$z], $l[scalar(@l)-$x])!=0) { + if (index($$L[scalar(@$L)-$x-$z], + $l[scalar(@l)-$x])!=0) { $y = 1; } } @@ -255,11 +255,12 @@ (index($$L[$x+1], $indent)!=0) && ($$L[$x+1] !~ /^$/) && ($$L[$x+1] !~ /^[\s^]/) && - ($$L[$x] !~ /-$/) && + ($$L[$x] !~ /-$/) && ($$L[$x+1] !~ /^\Q[...]\E\s*$/) && ($mua ne 'mutt' || $$L[$x+1] !~ /^(?:\e[^\a]+\a)?\[-- /) && (length($$L[$x])+index($$L[$x+1], ' ')>$max || - (index($$L[$x+1], ' ')<0 && length($$L[$x])+length($$L[$x+1])>$max)) && + (index($$L[$x+1], ' ')<0 && + length($$L[$x])+length($$L[$x+1])>$max)) && (length($$L[$x])+length($$L[$x+1])<$kmaxl) && (length($$L[$x])+length($$L[$x+1])>$kminl) && (length($$L[$x])-length($$L[$x+1])>$kdiff) && @@ -441,23 +442,13 @@ my (@ads, @hdr, @bo1, @bo2, @ftr, @sig, @vrb, @att) = ((), (), (), (), (), (), (), (), ()); - # First, remove and store lines we might need later... + # Remove and store lines we might need later... # Remove headers: if (!$nohdr) { for ($x=0; $x<$#$lines; $x++) { if (@$lines[$x] =~ /^$/) { last; }; } - - # check body length and stop processing silently if msg is too long: - if ((defined $maxlines) && (@$lines-$x > $maxlines)) { - return; - } - @hdr = @$lines[0..$x]; splice(@$lines, 0, $x+1); } - elsif ((defined $maxlines) && (@$lines > $maxlines)) { - # check body length and stop processing silently if msg is too long: - return; - } # remember the original body lines count my $linecount = scalar(@$lines); @@ -558,9 +549,8 @@ if (index($$lines[$x], $indent)==0) { $y++; } } } - $y = $y/$z; - if ($y>=$check_ratio) { + if ($y/$z>=$check_ratio) { print $msg_ratio; exit EX_UNAVAILABLE; } @@ -702,6 +692,7 @@ my @tofu = ('Original Message', 'Original-Nachricht', 'Urspr�ngliche Nachricht', + 'Ursprüngliche Nachricht', 'Ursprungliche Nachricht', 'Mensagem original', 'Ursprungligt meddelande', @@ -715,7 +706,7 @@ DONE: for ($x=0; $x<scalar(@$lines); $x++) { if (!$vrb[$x]) { foreach my $tmp (@tofu) { - if (($ms && $$lines[$x] =~ /^-+\s?$tmp\s?-+/) || + if (($ms && $$lines[$x] =~ /^\s?-+\s?$tmp\s?-+/) || ($gw && ($$lines[$x] =~ /^>>>[^\<]+<[^\>]+> \d\d?\/\d\d?\/\d\d? \d\d?:\d\d [AP]M >>>/ || $$lines[$x] =~ /^>>> On [A-Z][a-z][a-z]?, [A-Z][a-z][a-z]? \d\d?, \d\d\d\d at [ \d]\d:\d\d [AP]M, in message/))) { @@ -942,11 +933,12 @@ elsif ($opt eq 'c') { $cr = 1; } elsif ($opt eq 'check') { $check = 1; - while ($val && $val =~ s/^([^,\s]+)(?:,(\S+))?$/$2/) { + while ($val && $val =~ /^([^,\s]+)(?:,(\S+))?$/) { my $foo = $1; + $val = $2; - if ($foo =~ /^ratio=(0?\.\d+)$/) { - $check_ratio = $1?$1:1; + if ($foo =~ /^ratio(?:=(0?\.\d+))?$/) { + $check_ratio = $1?$1:0.75; } } } @@ -1074,6 +1066,25 @@ my @message = <IN>; close IN; +# First, check msg length and stop processing if msg is too long: +if ((defined $maxlines) && (@message > $maxlines)) { + if ($ofile ne 'NONE') { + if ($mua eq 'mutt') { + my $x = 0; + if (!$nohdr) { + do { $x++; } while ($x<$#message && $message[$x]!~/^$/); + $x++; + } + splice(@message, $x, 0, + ("[---=| Processing by $0 skipped: message too long |=---]\n\n")); + } + + write_msg(($mda?'|'.SENDMAIL." $mda":">$ofile"), \@message); + } + if ($mua eq 'mutt') { exit(EX_OK); } + exit(EX_DATAERR); +} + # this should be self-explanatory: process_msg(\@message); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/t-prot-2.5/t-prot.1 new/t-prot-2.12/t-prot.1 --- old/t-prot-2.5/t-prot.1 2007-09-19 13:36:27.000000000 +0200 +++ new/t-prot-2.12/t-prot.1 2010-01-08 12:35:32.000000000 +0100 @@ -1,10 +1,10 @@ -.\" $Id: t-prot.1,v 1.132 2007/09/19 11:32:59 jochen Exp $ +.\" $Id: t-prot.1,v 1.144 2010/01/08 11:08:50 jochen Exp $ .\" -.TH T-PROT "1" "September 2007" "T-PROT" +.TH T-PROT "1" "January 2010" "T-PROT" .SH NAME t-prot \- TOFU Protection - Display Filter for RFC 2822 messages .SH SYNOPSIS -.BI "t-prot [" OPTIONS "]..." +.BI "t\-prot [" OPTIONS "]..." .SH DESCRIPTION .PP This program is a filter to improve the readability of @@ -21,20 +21,18 @@ is the reason for not using standard CPAN modules for handling messages). .PP -For easy usage, you can download a file to be included in your ~/.muttrc: -.I http://www.escape.de/users/tolot/mutt/t-prot/muttrc.t-prot -.br -And here is an example S-Lang macro to use t-prot from within slrn: -.I http://www.escape.de/users/tolot/mutt/t-prot/t-prot.sl +For easy usage, you can include the file muttrc.t\-prot in your +~/.muttrc. Also coming with the t-prot package is the example S-Lang +macro t\-prot.sl for using t-prot from within slrn. .SH OPTIONS .TP .BR "\-A" =DIRECTORY "ad footer directory": Defines the directory which contains the advertisement list footers (one footer per file) which are to be tested when removing them with options -.B -a +.B \-a or -.BR --ftr-ad . +.BR \-\-ftr\-ad . .br This option is also needed if you do not want signature lengths to be counted wrong or fullquotes get undetected when an ad footer is @@ -53,12 +51,12 @@ (which is mandatory for this option). The comparison is done by perl's .B index() function (please try -.I perldoc -f index +.I perldoc \-f index for details). .sp .IR NOTE : This option is not needed if -.B --ftr-ad +.B \-\-ftr\-ad is specified. .TP .BR "\-\-bigq" [=n[,x]] @@ -71,7 +69,7 @@ lines. .IP .IR NOTE : -This does not work with --pgp-short, and multipart messages will not +This does not work with \-\-pgp\-short, and multipart messages will not be detected due to missing headers. .TP .B "\-c" @@ -89,7 +87,8 @@ .IR ratio [=n] .br If the quoting ratio is n or more, the message is rejected. Must be -between 0 and 1, or else it is entirely disabled. +between 0 and 1, or else it is entirely disabled. Default is 0.75 +(i.e., three quarters are quoted). .TP .B "\-d, \-\-debug" "debug": @@ -137,7 +136,7 @@ be helpful with broken list servers, or even if your email provider munges the bodies of your messages. .br -Works similar to --ftr-ad, just that it is intended for mailing list footers. +Works similar to \-\-ftr\-ad, just that it is intended for mailing list footers. .sp .IR NOTE : This requires a directory with footer files to be given with option @@ -153,7 +152,7 @@ .TP .BR "\-i" =FILE "input file": -Defines a file for input; the default input is from '-' i.e. STDIN. +Defines a file for input; the default input is from '\-' i.e. STDIN. .TP .B "\-k" "anti Kammquote": @@ -287,7 +286,7 @@ Hides TOFU as given by some Microsoft mailers. (You all surely know these fullquotes beginning with .br -"----- Original Message -----" +"\-\-\-\-\- Original Message \-\-\-\-\-" .br and some header lines...) .TP @@ -306,8 +305,9 @@ .BR "\-m" . .TP .BR "\-\-max\-lines" =x -Maximum number of lines a message body may count. If the body is longer -than x lines, the message will not be processed but printed unmodified. +Maximum number of lines a message may count (with headers). If the message +is longer than x lines, the message will not be processed but printed +unmodified. Exit status will be EX_DATAERR except when called with -Mmutt. .TP .BR "\-o" =FILE "output file": @@ -332,7 +332,7 @@ put this line into your alias file and invoke .BR newaliases : .sp -notofu: |"/usr/local/bin/t-prot -mt -p=user@mydomain" +notofu: |"/usr/local/bin/t\-prot \-mt \-p=user@mydomain" .sp This will bounce messages for <notofu@domainname> if any TOFU is detected inside the message, and deliver it to <user@mydomain> otherwise. @@ -387,7 +387,7 @@ conformance.) .sp .IR NOTE : -The line containing "-- " ist not counted when testing for an overlong +The line containing "\-\- " ist not counted when testing for an overlong signature, but it is included when displaying how many lines were deleted. .TP .B "\-s" @@ -439,7 +439,7 @@ and .I LANG are read and respected when interpreting output by mutt or gnupg -(unless they are overruled by the --locale option). T-prot's own +(unless they are overruled by the \-\-locale option). T-prot's own output is English regardless of any locale setting. .SH EXIT STATUS On program exit, t-prot uses exit codes from @@ -483,7 +483,7 @@ There are several ways to fine-tune t-prot's performance: .PP Some command line options are quite grave a performance hit -- do not -use -k and especially --ms-smart if you are content without them. +use \-k and especially \-\-ms\-smart if you are content without them. .PP Checking for special footers is very costly as well. Put as few footer files as absolutely needed in any footer directory. @@ -513,7 +513,7 @@ .PP .TP .IR Q : -I use the options -l and -L to supress mailing list footers when +I use the options \-l and \-L to supress mailing list footers when displaying messages in .BR mutt (1). This does work sometimes, but sometimes it does not: the footer is not @@ -524,7 +524,7 @@ This might occur if the message is badly encoded, so mutt cannot resolve all encoded characters, e.g. if you have an encoded message on a mailing list, and majordomo appends a mailing list footer in a different encoding -(or even plain us-ascii). "-- " simply does not match "--=20". +(or even plain us-ascii). "\-\- " simply does not match "\-\-=20". .br Another problem are non-us-ascii characters. Just avoid them, and everything should work fine. @@ -544,18 +544,18 @@ .sp #v+ .br -This line is protected from being filtered by t-prot !!!!!!! +This line is protected from being filtered by t\-prot !!!!!!! .br -#v- +#v\- .br Text coming now is not. .SH AUTHOR -Written by Jochen Striepe <t-prot(a)tolot.escape.de>. +Written by Jochen Striepe <t\-prot(a)tolot.escape.de>. .SH COPYRIGHT All of the documentation and software included in the t-prot releases -is copyrighted by Jochen Striepe (except when explicitely stated otherwise). +is copyrighted by Jochen Striepe (except when explicitly stated otherwise). .PP -Copyright \(co 2001-2007 Jochen Striepe. All rights reserved. +Copyright \(co 2001-2010 Jochen Striepe. All rights reserved. .PP Redistribution and use, with or without modification, are permitted provided that the following conditions are met: @@ -599,7 +599,7 @@ There is a problem when mutt gives a PGP verified or even a multipart message to t-prot: The information where the PGP encrypted/signed data or even attachments begin and end is plainly embedded in the text, not -really cleanly recognizeable for t-prot. The problem should be worked +really cleanly recognizable for t-prot. The problem should be worked around by now, please send a bug report if it does not work for you. .SH "REPORTING BUGS" Please note that t-prot development happens on @@ -629,7 +629,7 @@ .I display_filter facility, just set display_filter to something like .IP -"tee ~/foobar | t-prot <your options>" +"tee ~/foobar | t\-prot <your options>" .PP and include ~/foobar in the bug report -- this way we might reproduce the bug much easier if you are using a different environment than we do. @@ -639,7 +639,7 @@ be important to enable us reproducing the bug. .PP Send your bug report to -.IR <t-prot-bugs(a)tolot.escape.de> . +.IR <t\-prot\-bugs(a)tolot.escape.de> . Thank you. .SH TODO Fix bugs (see the ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit privoxy for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jan '10

28 Jan '10

Hello community, here is the log from the commit of package privoxy for openSUSE:Factory checked in at Thu Jan 28 17:34:49 CET 2010. -------- --- privoxy/privoxy.changes 2009-09-29 14:57:36.000000000 +0200 +++ privoxy/privoxy.changes 2010-01-27 15:30:18.000000000 +0100 @@ -1,0 +2,50 @@ +Wed Jan 27 15:11:45 UTC 2010 - mseben(a)novell.com + +- updated to 3.0.15 BETA + - In case of missing server data, no error message is send to the + client if the request arrived on a reused connection. The client + is then supposed to silently retry the request without bothering + the user. This should significantly reduce the frequency of the + "No server or forwarder data received" error message many users + reported. + - More reliable detection of prematurely closed client sockets + with keep-alive enabled. + - FEATURE_CONNECTION_KEEP_ALIVE is decoupled from + FEATURE_CONNECTION_SHARING and now available on + all platforms. + - Improved handling of POST requests on reused connections. + Should fix problems with stalled connections after submitting + form data with some browser configurations. + - Fixed various latency calculation issues. + - Allows the client to pass NTLM authentication requests to a + forwarding proxy. This was already assumed and hinted to work + in 3.0.13 beta but actually didn't. Now it's confirmed to work + with IE, Firefox and Chrome. + Thanks to Francois Botha and Wan-Teh Chang + - Fixed a calculation problem if receiving the server headers + takes more than two reads, that could cause Privoxy to terminate + the connection prematurely. Reported by Oliver. + - Compiles again on platforms such as OpenBSD and systems + using earlier glibc version that don't support AI_ADDRCONFIG. + Anonymously submitted in #2872591. + - A bunch of MS VC project files and Suse and Redhat RPM spec + files have been removed as they were no longer maintained for + quite some time. + - Overly long action lines are properly rejected with a proper + error message. Previously they would be either rejected as + invalid or cause a core dump through abort(). + - Already timed-out connections are no longer temporarily remembered. + They weren't reused anyway, but wasted a socket slot. + - len refers to the number of bytes actually read which might + differ from the ones received. Adjust log messages accordingly. + - The optional JavaScript on the CGI page uses encodeURIComponent() + instead of escape() which doesn't encode all characters that matter. + Anonymously reported in #2832722. + - Fix gcc45 warnings in decompress_iob(). + - Various log message improvements. + - Privoxy-Regression-Test supports redirect tests. + - Privoxy-Log-Parser can gather some connection statistics. +- moved init script to init.suse file and dropped diff against + tarball: init.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- privoxy-3.0.14-beta-src.tar.bz2 privoxy-3.0.14-config.patch privoxy-3.0.14-init.patch privoxy-3.0.14-networkmanager.patch privoxy-3.0.14-utf8.patch New: ---- privoxy-3.0.15-beta-src.tar.bz2 privoxy-3.0.15-config.patch privoxy-3.0.15-init.suse privoxy-3.0.15-networkmanager.patch privoxy-3.0.15-utf8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ privoxy.spec ++++++ --- /var/tmp/diff_new_pack.4iQ080/_old 2010-01-28 17:34:39.000000000 +0100 +++ /var/tmp/diff_new_pack.4iQ080/_new 2010-01-28 17:34:39.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package privoxy (Version 3.0.13.90.1) +# spec file for package privoxy (Version 3.0.15) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,23 +21,21 @@ Name: privoxy BuildRequires: pcre-devel w3m zlib-devel Url: http://www.privoxy.org/ -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Networking/Web/Proxy Provides: ijb junkbuster Obsoletes: ijb junkbuster AutoReqProv: on PreReq: %fillup_prereq %insserv_prereq /usr/sbin/useradd /usr/sbin/groupadd -#this define could be drop, in next stable realease -%define package_version 3.0.14 -Version: 3.0.13.90.1 -Release: 3 +Version: 3.0.15 +Release: 1 Summary: The Internet Junkbuster - HTTP Proxy Server -Source: privoxy-%{package_version}-beta-src.tar.bz2 +Source: privoxy-%{version}-beta-src.tar.bz2 Source1: privoxy.logrotate -Patch: %{name}-%{package_version}-init.patch -Patch1: %{name}-%{package_version}-config.patch -Patch2: %{name}-%{package_version}-utf8.patch -Patch3: %{name}-%{package_version}-networkmanager.patch +Source2: %{name}-%{version}-init.suse +Patch1: %{name}-%{version}-config.patch +Patch2: %{name}-%{version}-utf8.patch +Patch3: %{name}-%{version}-networkmanager.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: logrotate cron %define chroot /var/lib/privoxy @@ -55,7 +53,7 @@ %package doc Group: Productivity/Networking/Web/Proxy -License: GPL v2 or later +License: GPLv2+ Summary: The documentation of Privoxy Requires: %{name} = %{version} @@ -72,8 +70,7 @@ Privoxy Developers <developers(a)privoxy.org> %prep -%setup -q -n privoxy-%package_version-beta -%patch -p1 +%setup -q -n privoxy-%{version}-beta %patch1 %patch2 -p0 %patch3 @@ -96,7 +93,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d cp -a templates $RPM_BUILD_ROOT/%chroot/etc install -m 644 config *.action *.filter trust $RPM_BUILD_ROOT/%chroot/etc -install -m 755 privoxy.init.suse $RPM_BUILD_ROOT/etc/init.d/privoxyd +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/init.d/privoxyd install -m 755 privoxy $RPM_BUILD_ROOT/usr/sbin install -m 755 privoxy_nm $RPM_BUILD_ROOT/etc/NetworkManager/dispatcher.d/privoxyd install -m 644 privoxy.1 $RPM_BUILD_ROOT%_mandir/man1 ++++++ privoxy-3.0.14-beta-src.tar.bz2 -> privoxy-3.0.15-beta-src.tar.bz2 ++++++ ++++ 10044 lines of diff (skipped) ++++++ privoxy-3.0.14-config.patch -> privoxy-3.0.15-config.patch ++++++ ++++++ privoxy-3.0.15-init.suse ++++++ #! /bin/sh # ******************************************************************** # # File : $Source: /cvsroot/ijbswa/current/privoxy.init.suse,v $ # # Purpose : This shell script takes care of starting and stopping # privoxy. # # Copyright : Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ # # Based on the Internet Junkbuster originally written # by and Copyright (C) 1997 Anonymous Coders and # Junkbusters Corporation. http://www.junkbusters.com # # This program is free software; you can redistribute it # and/or modify it under the terms of the GNU General # Public License as published by the Free Software # Foundation; either version 2 of the License, or (at # your option) any later version. # # This program is distributed in the hope that it will # be useful, but WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. See the GNU General Public # License for more details. # # The GNU General Public License should be included with # this file. If not, you can view it at # http://www.gnu.org/copyleft/gpl.html # or write to the Free Software Foundation, Inc., 59 # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # ********************************************************************/ ### BEGIN INIT INFO # Provides: privoxy # Required-Start: $network $syslog $remote_fs # Required-Stop: $remote_fs $local_fs # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Starts Privoxy # Description: Starts Privoxy ### END INIT INFO . /etc/rc.status rc_reset case "$1" in start) echo -n "Starting Privoxy" if [ ! -f /var/run/privoxy.pid ] || ! kill -0 `cat /var/run/privoxy.pid` 2> /dev/null; then # set up chroot dir for i in /etc/{resolv.conf,host.conf,hosts,localtime}; do cp -p $i /var/lib/privoxy/etc/ &>/dev/null \ || { echo "...$0:$LINENO: could not copy $i to chroot jail"; rc_failed; rc_status -v1; exit 6; } done libdir=/$(basename $(echo /var/lib/privoxy/lib*)) for i in /$libdir/{libresolv.so.2,libnss_dns{,6}.so.2}; do if [ -s $i ]; then cp -p $i /var/lib/privoxy/$libdir/ \ || { echo "...$0:$LINENO: could not copy $i to chroot jail"; rc_failed; rc_status -v1; exit 6; } fi done # started process in privoxy wait 1 sec and then check forked process (e.g child died due to missing config files), # so we need a time (-T 1 option) while forked process checks config file # better options for startproc could be -w, but this options is available only since 11.2 startproc -T 1 /usr/sbin/privoxy --user privoxy.privoxy --pidfile /var/run/privoxy.pid --chroot /etc/config 2> /dev/null else false fi rc_status -v ;; stop) echo -n "Shutting down Privoxy" killproc -TERM /usr/sbin/privoxy && rm -f /var/run/privoxy.pid # remove libraries from the chroot jail, just so they are not left over # if the server is deinstalled rm -f /var/lib/privoxy/lib*/* rc_status -v ;; reload) echo -n "Reloading Privoxy" kill -HUP `cat /var/run/privoxy.pid` rc_status -v ;; try-restart) $0 status >/dev/null && $0 restart rc_status ;; restart) $0 stop $0 start rc_status ;; status) echo -n "Checking for Privoxy" checkproc /usr/sbin/privoxy rc_status -v ;; *) echo "Usage: $0 {start|restart|reload|status|stop}" exit 1 esac rc_exit ++++++ privoxy-3.0.14-networkmanager.patch -> privoxy-3.0.15-networkmanager.patch ++++++ ++++++ privoxy-3.0.14-utf8.patch -> privoxy-3.0.15-utf8.patch ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit viewvc for openSUSE:Factory
by root＠Hilbert.suse.de 28 Jan '10

28 Jan '10

Hello community, here is the log from the commit of package viewvc for openSUSE:Factory checked in at Thu Jan 28 17:32:18 CET 2010. -------- --- viewvc/viewvc.changes 2009-12-31 15:20:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/viewvc/viewvc.changes 2010-01-22 23:34:11.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 18 23:05:21 CET 2010 - dmueller(a)suse.de + +- rediff buglink.patch + +------------------------------------------------------------------- @@ -4 +9 @@ -- update to 1.1.3: +- update to 1.1.3 (bnc#570605): calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ viewvc.spec ++++++ --- /var/tmp/diff_new_pack.dfxqp8/_old 2010-01-28 17:23:06.000000000 +0100 +++ /var/tmp/diff_new_pack.dfxqp8/_new 2010-01-28 17:23:06.000000000 +0100 @@ -21,7 +21,7 @@ Name: viewvc BuildRequires: apache2-devel python-devel Version: 1.1.3 -Release: 1 +Release: 2 # %define apxs /usr/sbin/apxs2 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) @@ -68,7 +68,7 @@ %prep %setup -q -%patch0 -p1 +%patch0 %build ++++++ viewvc-buglink.patch ++++++ --- /var/tmp/diff_new_pack.dfxqp8/_old 2010-01-28 17:23:06.000000000 +0100 +++ /var/tmp/diff_new_pack.dfxqp8/_new 2010-01-28 17:23:06.000000000 +0100 @@ -1,7 +1,6 @@ -diff -uNr viewvc-1.1.2.orig/conf/viewvc.conf.dist viewvc-1.1.2/conf/viewvc.conf.dist ---- viewvc-1.1.2.orig/conf/viewvc.conf.dist 2009-07-07 16:06:18.000000000 +0200 -+++ viewvc-1.1.2/conf/viewvc.conf.dist 2009-08-11 20:12:38.790913000 +0200 -@@ -298,6 +298,21 @@ +--- conf/viewvc.conf.dist ++++ conf/viewvc.conf.dist +@@ -303,6 +303,21 @@ ##--------------------------------------------------------------------------- [options] @@ -23,10 +22,9 @@ ## root_as_url_component: Interpret the first path component in the URL ## after the script location as the root to use. This is an ## alternative to using the "root=" query key. If ViewVC is configured -diff -uNr viewvc-1.1.2.orig/lib/config.py viewvc-1.1.2/lib/config.py ---- viewvc-1.1.2.orig/lib/config.py 2009-06-04 17:41:53.000000000 +0200 -+++ viewvc-1.1.2/lib/config.py 2009-08-11 19:56:29.726935000 +0200 -@@ -251,6 +251,7 @@ +--- lib/config.py ++++ lib/config.py +@@ -421,6 +421,7 @@ self.options.dir_pagesize = 0 self.options.log_pagesize = 0 self.options.limit_changes = 100 @@ -34,122 +32,48 @@ self.templates.diff = None self.templates.directory = None -diff -uNr viewvc-1.1.2.orig/lib/viewvc.py viewvc-1.1.2/lib/viewvc.py ---- viewvc-1.1.2.orig/lib/viewvc.py 2009-08-11 15:05:06.000000000 +0200 -+++ viewvc-1.1.2/lib/viewvc.py 2009-08-11 19:56:29.721946000 +0200 -@@ -1096,11 +1096,14 @@ - # otherwise, no mangling - return text - --def htmlify(html, mangle_email_addrs=0): -+_re_rewrite_bug = re.compile(r'((?:\bbug[\s#+]|[^&]#|^#)\s*(\d\d+))', re.I) -+def htmlify(html, mangle_email_addrs=0, buglink = None): - if not html: - return html - html = cgi.escape(html) - html = re.sub(_re_rewrite_url, r'<a href="\1">\1</a>', html) -+ if buglink is not None: -+ html = re.sub(_re_rewrite_bug, r'<a href="%s\2">\1</a>' % buglink, html) - html = mangle_email_addresses(html, mangle_email_addrs) - return html - -@@ -1109,7 +1112,8 @@ - return log +--- lib/viewvc.py ++++ lib/viewvc.py +@@ -1088,6 +1088,9 @@ + _re_rewrite_email = re.compile('([-a-zA-Z0-9_.\+]+)@' + '(([-a-zA-Z0-9]+\.)+[A-Za-z]{2,4})') + ++# Matches bug numbers ++_re_rewrite_bug = re.compile(r'((?:\bbug[\s:#+]|[^&]#|^#)\s*(\d\d+))', re.I) ++_re_buglink_prefix = "" + + class HtmlFormatter: + """Format a string as HTML-encoded output with customizable markup +@@ -1101,6 +1104,21 @@ + def __init__(self): + self._formatters = [] + ++ def format_bugzilla(self, mobj, userdata, maxlen=0): ++ """Return a 2-tuple containing: ++ - the text represented by MatchObject MOBJ, formatted as ++ linkified URL, with no more than MAXLEN characters in the ++ non-HTML-tag bits. If MAXLEN is 0, there is no maximum. ++ - the number of non-HTML-tag characters returned. ++ """ ++ s = mobj.group(0) ++ trunc_s = maxlen and s[:maxlen] or s ++ return '<a href="%s%s">%s</a>' % (_re_buglink_prefix, urllib.quote(mobj.group(2)), ++ cgi.escape(trunc_s)), \ ++ len(trunc_s) ++ ++ ++ + def format_url(self, mobj, userdata, maxlen=0): + """Return a 2-tuple containing: + - the text represented by MatchObject MOBJ, formatted as +@@ -1250,6 +1268,10 @@ if htmlize: - s = htmlify(log[:cfg.options.short_log_len], -- cfg.options.mangle_email_addresses) -+ cfg.options.mangle_email_addresses, -+ cfg.options.buglink_base) - else: - s = cgi.escape(log[:cfg.options.short_log_len]) + lf = HtmlFormatter() + lf.add_formatter(_re_rewrite_url, lf.format_url) ++ if cfg.options.buglink_base is not None: ++ global _re_buglink_prefix ++ _re_buglink_prefix = cfg.options.buglink_base ++ lf.add_formatter(_re_rewrite_bug, lf.format_bugzilla); if cfg.options.mangle_email_addresses == 2: -@@ -1318,7 +1322,7 @@ - if not chunk: - break - if htmlize: -- chunk = htmlify(chunk, mangle_email_addrs=0) -+ chunk = htmlify(chunk, cfg.options.mangle_email_addresses, cfg.options.buglink_base) - dst.write(chunk) - - class MarkupPipeWrapper: -@@ -1572,7 +1576,7 @@ - data['date'] = make_time_string(entry.date, cfg) - data['author'] = entry.author - data['changed'] = entry.changed -- data['log'] = htmlify(entry.log, cfg.options.mangle_email_addresses) -+ data['log'] = htmlify(entry.log, cfg.options.mangle_email_addresses, cfg.options.buglink_base) - data['size'] = entry.size - - if entry.date is not None: -@@ -1789,7 +1793,7 @@ - row.ago = html_time(request, file.date) - if cfg.options.show_logs: - row.short_log = format_log(file.log, cfg) -- row.log = htmlify(file.log, cfg.options.mangle_email_addresses) -+ row.log = htmlify(file.log, cfg.options.mangle_email_addresses, cfg.options.buglink_base) - row.lockinfo = file.lockinfo - row.anchor = request.server.escape(file.name) - row.name = request.server.escape(file.name) -@@ -1876,7 +1880,7 @@ - 'sortby' : sortby, - 'sortdir' : sortdir, - 'search_re' : search_re \ -- and htmlify(search_re, cfg.options.mangle_email_addresses) \ -+ and htmlify(search_re, cfg.options.mangle_email_addresses, cfg.options.buglink_base) \ - or None, - 'dir_pagestart' : None, - 'sortby_file_href' : request.get_url(params={'sortby': 'file', -@@ -2164,7 +2168,7 @@ - entry.ago = None - if rev.date is not None: - entry.ago = html_time(request, rev.date, 1) -- entry.log = htmlify(rev.log or "", cfg.options.mangle_email_addresses) -+ entry.log = htmlify(rev.log or "", cfg.options.mangle_email_addresses, cfg.options.buglink_base) - entry.size = rev.size - entry.lockinfo = rev.lockinfo - entry.branch_point = None -@@ -2619,7 +2623,7 @@ - text = string.replace(text, ' ', ' \x01nbsp;') - else: - text = string.replace(text, ' ', '\x01nbsp;') -- text = htmlify(text, mangle_email_addrs=0) -+ text = htmlify(text, self.cfg.options.mangle_email_addresses, self.cfg.options.buglink_base) - text = string.replace(text, '\x01', '&') - text = string.replace(text, '\x02', - '\ ') -@@ -2995,7 +2999,7 @@ - changes = DiffSource(fp, cfg) - else: - raw_diff_fp = MarkupPipeWrapper(cfg, fp, -- htmlify(headers, mangle_email_addrs=0), -+ htmlify(headers, cfg.options.mangle_email_addresses, cfg.options.buglink_base), - None, 1) - - no_format_params = request.query_dict.copy() -@@ -3372,7 +3376,7 @@ - 'rev' : str(rev), - 'author' : author, - 'date' : date_str, -- 'log' : msg and htmlify(msg, cfg.options.mangle_email_addresses) or None, -+ 'log' : msg and htmlify(msg, cfg.options.mangle_email_addresses, cfg.options.buglink_base) or None, - 'ago' : date is not None and html_time(request, date, 1) or None, - 'changes' : changes, - 'prev_href' : prev_rev_href, -@@ -3504,7 +3508,7 @@ - comment = request.query_dict.get('comment', '') - if comment: - ret.append('with comment %s ' -- % htmlify(comment, mangle_email_addrs=0)) -+ % htmlify(comment, cfg.options.mangle_email_addresses, cfg.options.buglink_base)) - if who: - ret.append('by %s ' % request.server.escape(who)) - date = request.query_dict.get('date', 'hours') -@@ -3692,7 +3696,7 @@ - commit.log = None - commit.short_log = None - else: -- commit.log = htmlify(desc) -+ commit.log = htmlify(desc, 0, cfg.options.buglink_base) - commit.short_log = format_log(desc, cfg, format != 'rss') - commit.author = request.server.escape(author) - commit.rss_date = make_rss_time_string(date, request.cfg) + lf.add_formatter(_re_rewrite_email, lf.format_email_truncated) + elif cfg.options.mangle_email_addresses == 1: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0