October 2007 - openSUSE Commits - openSUSE Mailing Lists

commit kernel-source
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package kernel-source checked in at Wed Oct 31 12:37:16 CET 2007. -------- --- kernel-source/kernel-debug.changes 2007-10-25 12:18:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2007-10-31 08:03:14.000000000 +0100 @@ -1,0 +2,29 @@ +Mon Oct 29 22:59:41 CET 2007 - jeffm(a)suse.de + +- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over + devices individually for /proc/scsi/scsi (263731). + +------------------------------------------------------------------- +Fri Oct 26 14:58:23 CEST 2007 - jeffm(a)suse.de + +- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen + +------------------------------------------------------------------- +Fri Oct 26 13:43:20 CEST 2007 - bwalle(a)suse.de + +- patches.fixes/remove-transparent-bridge-sizing: + PCI: remove transparent bridge sizing (331027). + +------------------------------------------------------------------- +Thu Oct 25 22:02:09 CEST 2007 - philips(a)suse.de + +- patches.drivers/e1000e.patch: update to the latest version in + 2.6.24-rc1 + +------------------------------------------------------------------- +Thu Oct 25 20:36:52 CEST 2007 - jeffm(a)suse.de + +- Update config files: Enable printk timestamping. It can be disabled + at boot time with printk.time=0. + +------------------------------------------------------------------- kernel-default.changes: same change kernel-dummy.changes: same change kernel-kdump.changes: same change kernel-pae.changes: same change kernel-ppc64.changes: same change kernel-rt.changes: same change kernel-rt_debug.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:05.000000000 +0100 +++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:05.000000000 +0100 @@ -39,7 +39,7 @@ %endif Summary: A Debug Version of the Kernel Version: 2.6.23.1 -Release: 7 +Release: 9 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -174,7 +174,7 @@ -Source Timestamp: 2007/10/25 08:51:03 UTC +Source Timestamp: 2007/10/29 21:58:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then @@ -559,6 +559,20 @@ %files -f kernel.files %changelog +* Mon Oct 29 2007 - jeffm(a)suse.de +- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over + devices individually for /proc/scsi/scsi (263731). +* Fri Oct 26 2007 - jeffm(a)suse.de +- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen +* Fri Oct 26 2007 - bwalle(a)suse.de +- patches.fixes/remove-transparent-bridge-sizing: + PCI: remove transparent bridge sizing (331027). +* Thu Oct 25 2007 - philips(a)suse.de +- patches.drivers/e1000e.patch: update to the latest version in + 2.6.24-rc1 +* Thu Oct 25 2007 - jeffm(a)suse.de +- Update config files: Enable printk timestamping. It can be disabled + at boot time with printk.time=0. * Thu Oct 25 2007 - jbeulich(a)novell.com - patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch: Delete. kernel-default.spec: same change ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:06.000000000 +0100 +++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:06.000000000 +0100 @@ -15,7 +15,7 @@ Url: http://www.kernel.org/ Summary: Internal dummy package for synchronizing release numbers Version: 2.6.23.1 -Release: 7 +Release: 9 License: GPL v2 or later Group: System/Kernel AutoReqProv: off @@ -28,7 +28,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2007/10/25 08:51:03 UTC +Source Timestamp: 2007/10/29 21:58:23 UTC %install rm -rf %buildroot @@ -39,6 +39,20 @@ %defattr(-, root, root) /etc/dummy %changelog +* Mon Oct 29 2007 - jeffm(a)suse.de +- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over + devices individually for /proc/scsi/scsi (263731). +* Fri Oct 26 2007 - jeffm(a)suse.de +- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen +* Fri Oct 26 2007 - bwalle(a)suse.de +- patches.fixes/remove-transparent-bridge-sizing: + PCI: remove transparent bridge sizing (331027). +* Thu Oct 25 2007 - philips(a)suse.de +- patches.drivers/e1000e.patch: update to the latest version in + 2.6.24-rc1 +* Thu Oct 25 2007 - jeffm(a)suse.de +- Update config files: Enable printk timestamping. It can be disabled + at boot time with printk.time=0. * Thu Oct 25 2007 - jbeulich(a)novell.com - patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch: Delete. ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:06.000000000 +0100 +++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:06.000000000 +0100 @@ -39,7 +39,7 @@ %endif Summary: kernel for kdump Version: 2.6.23.1 -Release: 7 +Release: 9 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -173,7 +173,7 @@ -Source Timestamp: 2007/10/25 08:51:03 UTC +Source Timestamp: 2007/10/29 21:58:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then @@ -558,6 +558,20 @@ %files -f kernel.files %changelog +* Mon Oct 29 2007 - jeffm(a)suse.de +- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over + devices individually for /proc/scsi/scsi (263731). +* Fri Oct 26 2007 - jeffm(a)suse.de +- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen +* Fri Oct 26 2007 - bwalle(a)suse.de +- patches.fixes/remove-transparent-bridge-sizing: + PCI: remove transparent bridge sizing (331027). +* Thu Oct 25 2007 - philips(a)suse.de +- patches.drivers/e1000e.patch: update to the latest version in + 2.6.24-rc1 +* Thu Oct 25 2007 - jeffm(a)suse.de +- Update config files: Enable printk timestamping. It can be disabled + at boot time with printk.time=0. * Thu Oct 25 2007 - jbeulich(a)novell.com - patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch: Delete. kernel-pae.spec: same change ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:06.000000000 +0100 +++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:06.000000000 +0100 @@ -38,8 +38,8 @@ %endif Summary: Kernel for ppc64 Systems Version: 2.6.23.1 -Release: 7 -License: GPL v2 or later; LGPL v2 or later +Release: 9 +License: GPL v2 or later; LGPL v2.1 or later Group: System/Kernel AutoReqProv: on BuildRequires: coreutils module-init-tools @@ -185,7 +185,7 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/10/25 08:51:03 UTC +Source Timestamp: 2007/10/29 21:58:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then @@ -570,6 +570,20 @@ %files -f kernel.files %changelog +* Mon Oct 29 2007 - jeffm(a)suse.de +- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over + devices individually for /proc/scsi/scsi (263731). +* Fri Oct 26 2007 - jeffm(a)suse.de +- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen +* Fri Oct 26 2007 - bwalle(a)suse.de +- patches.fixes/remove-transparent-bridge-sizing: + PCI: remove transparent bridge sizing (331027). +* Thu Oct 25 2007 - philips(a)suse.de +- patches.drivers/e1000e.patch: update to the latest version in + 2.6.24-rc1 +* Thu Oct 25 2007 - jeffm(a)suse.de +- Update config files: Enable printk timestamping. It can be disabled + at boot time with printk.time=0. * Thu Oct 25 2007 - jbeulich(a)novell.com - patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch: Delete. ++++++ kernel-rt_debug.spec ++++++ --- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:06.000000000 +0100 +++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:06.000000000 +0100 @@ -39,7 +39,7 @@ %endif Summary: A Debug Version of the Kernel Version: 2.6.23.1 -Release: 7 +Release: 9 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -171,7 +171,7 @@ -Source Timestamp: 2007/10/25 08:51:03 UTC +Source Timestamp: 2007/10/29 21:58:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then @@ -556,6 +556,20 @@ %files -f kernel.files %changelog +* Mon Oct 29 2007 - jeffm(a)suse.de +- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over + devices individually for /proc/scsi/scsi (263731). +* Fri Oct 26 2007 - jeffm(a)suse.de +- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen +* Fri Oct 26 2007 - bwalle(a)suse.de +- patches.fixes/remove-transparent-bridge-sizing: + PCI: remove transparent bridge sizing (331027). +* Thu Oct 25 2007 - philips(a)suse.de +- patches.drivers/e1000e.patch: update to the latest version in + 2.6.24-rc1 +* Thu Oct 25 2007 - jeffm(a)suse.de +- Update config files: Enable printk timestamping. It can be disabled + at boot time with printk.time=0. * Thu Oct 25 2007 - jbeulich(a)novell.com - patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch: Delete. ++++++ kernel-rt.spec ++++++ --- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:07.000000000 +0100 +++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:07.000000000 +0100 @@ -39,7 +39,7 @@ %endif Summary: The Realtime Linux Kernel Version: 2.6.23.1 -Release: 7 +Release: 9 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -176,7 +176,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/10/25 08:51:03 UTC +Source Timestamp: 2007/10/29 21:58:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then @@ -561,6 +561,20 @@ %files -f kernel.files %changelog +* Mon Oct 29 2007 - jeffm(a)suse.de +- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over + devices individually for /proc/scsi/scsi (263731). +* Fri Oct 26 2007 - jeffm(a)suse.de +- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen +* Fri Oct 26 2007 - bwalle(a)suse.de +- patches.fixes/remove-transparent-bridge-sizing: + PCI: remove transparent bridge sizing (331027). +* Thu Oct 25 2007 - philips(a)suse.de +- patches.drivers/e1000e.patch: update to the latest version in + 2.6.24-rc1 +* Thu Oct 25 2007 - jeffm(a)suse.de +- Update config files: Enable printk timestamping. It can be disabled + at boot time with printk.time=0. * Thu Oct 25 2007 - jbeulich(a)novell.com - patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch: Delete. ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:07.000000000 +0100 +++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:07.000000000 +0100 @@ -39,7 +39,7 @@ %endif Summary: The Standard Kernel Version: 2.6.23.1 -Release: 4 +Release: 5 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -167,7 +167,7 @@ -Source Timestamp: 2007/10/25 08:51:03 UTC +Source Timestamp: 2007/10/29 21:58:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then @@ -552,6 +552,20 @@ %files -f kernel.files %changelog +* Mon Oct 29 2007 - jeffm(a)suse.de +- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over + devices individually for /proc/scsi/scsi (263731). +* Fri Oct 26 2007 - jeffm(a)suse.de +- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen +* Fri Oct 26 2007 - bwalle(a)suse.de +- patches.fixes/remove-transparent-bridge-sizing: + PCI: remove transparent bridge sizing (331027). +* Thu Oct 25 2007 - philips(a)suse.de +- patches.drivers/e1000e.patch: update to the latest version in + 2.6.24-rc1 +* Thu Oct 25 2007 - jeffm(a)suse.de +- Update config files: Enable printk timestamping. It can be disabled + at boot time with printk.time=0. * Thu Oct 25 2007 - jbeulich(a)novell.com - patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch: Delete. ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:07.000000000 +0100 +++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:07.000000000 +0100 @@ -22,7 +22,7 @@ %endif Summary: The Linux Kernel Sources Version: 2.6.23.1 -Release: 7 +Release: 9 License: GPL v2 only Group: Development/Sources AutoReqProv: off @@ -105,7 +105,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/10/25 08:51:03 UTC +Source Timestamp: 2007/10/29 21:58:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then @@ -277,6 +277,20 @@ %files -f kernel-source.files %changelog +* Mon Oct 29 2007 - jeffm(a)suse.de +- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over + devices individually for /proc/scsi/scsi (263731). +* Fri Oct 26 2007 - jeffm(a)suse.de +- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen +* Fri Oct 26 2007 - bwalle(a)suse.de +- patches.fixes/remove-transparent-bridge-sizing: + PCI: remove transparent bridge sizing (331027). +* Thu Oct 25 2007 - philips(a)suse.de +- patches.drivers/e1000e.patch: update to the latest version in + 2.6.24-rc1 +* Thu Oct 25 2007 - jeffm(a)suse.de +- Update config files: Enable printk timestamping. It can be disabled + at boot time with printk.time=0. * Thu Oct 25 2007 - jbeulich(a)novell.com - patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch: Delete. ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:07.000000000 +0100 +++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:07.000000000 +0100 @@ -21,7 +21,7 @@ %endif Summary: Kernel Symbol Versions (modversions) Version: 2.6.23.1 -Release: 7 +Release: 9 License: GPL v2 or later Group: Development/Sources AutoReqProv: off @@ -95,7 +95,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/10/25 08:51:03 UTC +Source Timestamp: 2007/10/29 21:58:23 UTC %prep echo "Architecture symbol(s):" %symbols @@ -149,6 +149,20 @@ /boot/symsets-*-*.tar.gz /lib/modules/*/build %changelog +* Mon Oct 29 2007 - jeffm(a)suse.de +- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over + devices individually for /proc/scsi/scsi (263731). +* Fri Oct 26 2007 - jeffm(a)suse.de +- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen +* Fri Oct 26 2007 - bwalle(a)suse.de +- patches.fixes/remove-transparent-bridge-sizing: + PCI: remove transparent bridge sizing (331027). +* Thu Oct 25 2007 - philips(a)suse.de +- patches.drivers/e1000e.patch: update to the latest version in + 2.6.24-rc1 +* Thu Oct 25 2007 - jeffm(a)suse.de +- Update config files: Enable printk timestamping. It can be disabled + at boot time with printk.time=0. * Thu Oct 25 2007 - jbeulich(a)novell.com - patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch: Delete. ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:07.000000000 +0100 +++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:07.000000000 +0100 @@ -39,7 +39,7 @@ %endif Summary: The Standard Kernel - without any SUSE patches Version: 2.6.23.1 -Release: 7 +Release: 9 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -187,7 +187,7 @@ -Source Timestamp: 2007/10/25 08:51:03 UTC +Source Timestamp: 2007/10/29 21:58:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then @@ -572,6 +572,20 @@ %files -f kernel.files %changelog +* Mon Oct 29 2007 - jeffm(a)suse.de +- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over + devices individually for /proc/scsi/scsi (263731). +* Fri Oct 26 2007 - jeffm(a)suse.de +- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen +* Fri Oct 26 2007 - bwalle(a)suse.de +- patches.fixes/remove-transparent-bridge-sizing: + PCI: remove transparent bridge sizing (331027). +* Thu Oct 25 2007 - philips(a)suse.de +- patches.drivers/e1000e.patch: update to the latest version in + 2.6.24-rc1 +* Thu Oct 25 2007 - jeffm(a)suse.de +- Update config files: Enable printk timestamping. It can be disabled + at boot time with printk.time=0. * Thu Oct 25 2007 - jbeulich(a)novell.com - patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch: Delete. ++++++ kernel-xenpae.spec ++++++ --- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:08.000000000 +0100 +++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:08.000000000 +0100 @@ -39,7 +39,7 @@ %endif Summary: The Xen Kernel with PAE support Version: 2.6.23.1 -Release: 1 +Release: 9 License: GPL v2 or later Group: System/Kernel AutoReqProv: on @@ -170,7 +170,7 @@ -Source Timestamp: 2007/10/25 08:51:03 UTC +Source Timestamp: 2007/10/29 21:58:23 UTC %prep if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then @@ -555,6 +555,20 @@ %files -f kernel.files %changelog +* Mon Oct 29 2007 - jeffm(a)suse.de +- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over + devices individually for /proc/scsi/scsi (263731). +* Fri Oct 26 2007 - jeffm(a)suse.de +- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen +* Fri Oct 26 2007 - bwalle(a)suse.de +- patches.fixes/remove-transparent-bridge-sizing: + PCI: remove transparent bridge sizing (331027). +* Thu Oct 25 2007 - philips(a)suse.de +- patches.drivers/e1000e.patch: update to the latest version in + 2.6.24-rc1 +* Thu Oct 25 2007 - jeffm(a)suse.de +- Update config files: Enable printk timestamping. It can be disabled + at boot time with printk.time=0. * Thu Oct 25 2007 - jbeulich(a)novell.com - patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch: Delete. kernel-xen.spec: same change ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2007-10-25 12:18:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-10-31 08:03:08.000000000 +0100 @@ -1 +1 @@ -2007/10/25 08:51:03 UTC +2007/10/29 21:58:23 UTC ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/alpha/default new/config/alpha/default --- old/config/alpha/default 2007-10-17 23:02:43.000000000 +0200 +++ new/config/alpha/default 2007-10-26 09:13:27.000000000 +0200 @@ -3308,7 +3308,6 @@ # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3422,3 +3421,4 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/alpha/vanilla new/config/alpha/vanilla --- old/config/alpha/vanilla 2007-10-14 07:19:05.000000000 +0200 +++ new/config/alpha/vanilla 2007-10-26 09:13:27.000000000 +0200 @@ -3217,7 +3217,6 @@ # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3328,3 +3327,4 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2007-10-25 12:17:23.000000000 +0200 +++ new/config/i386/debug 2007-10-26 09:13:27.000000000 +0200 @@ -3694,7 +3694,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3843,3 +3842,4 @@ CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_TRAMPOLINE=y CONFIG_KTIME_SCALAR=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/default new/config/i386/default --- old/config/i386/default 2007-10-25 12:17:23.000000000 +0200 +++ new/config/i386/default 2007-10-26 09:13:27.000000000 +0200 @@ -3698,7 +3698,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3842,3 +3841,4 @@ CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_TRAMPOLINE=y CONFIG_KTIME_SCALAR=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2007-10-25 12:17:25.000000000 +0200 +++ new/config/i386/pae 2007-10-26 09:13:27.000000000 +0200 @@ -3696,7 +3696,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3840,3 +3839,4 @@ CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_TRAMPOLINE=y CONFIG_KTIME_SCALAR=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/rt new/config/i386/rt --- old/config/i386/rt 2007-10-19 12:06:49.000000000 +0200 +++ new/config/i386/rt 2007-10-26 09:13:27.000000000 +0200 @@ -3719,7 +3719,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3871,3 +3870,4 @@ CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_TRAMPOLINE=y CONFIG_KTIME_SCALAR=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/rt_debug new/config/i386/rt_debug --- old/config/i386/rt_debug 2007-10-19 12:06:49.000000000 +0200 +++ new/config/i386/rt_debug 2007-10-26 09:13:27.000000000 +0200 @@ -3713,7 +3713,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_MUST_CHECK=y CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3876,3 +3875,4 @@ CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_TRAMPOLINE=y CONFIG_KTIME_SCALAR=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/vanilla new/config/i386/vanilla --- old/config/i386/vanilla 2007-10-16 08:01:12.000000000 +0200 +++ new/config/i386/vanilla 2007-10-26 09:13:27.000000000 +0200 @@ -3661,7 +3661,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3803,3 +3802,4 @@ CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_TRAMPOLINE=y CONFIG_KTIME_SCALAR=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2007-10-25 12:17:25.000000000 +0200 +++ new/config/i386/xen 2007-10-26 09:13:27.000000000 +0200 @@ -3424,7 +3424,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3605,3 +3604,4 @@ CONFIG_X86_NO_TSS=y CONFIG_X86_NO_IDT=y CONFIG_KTIME_SCALAR=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xenpae new/config/i386/xenpae --- old/config/i386/xenpae 2007-10-25 12:17:25.000000000 +0200 +++ new/config/i386/xenpae 2007-10-26 09:13:27.000000000 +0200 @@ -3426,7 +3426,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3607,3 +3606,4 @@ CONFIG_X86_NO_TSS=y CONFIG_X86_NO_IDT=y CONFIG_KTIME_SCALAR=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/debug new/config/ia64/debug --- old/config/ia64/debug 2007-10-17 23:02:43.000000000 +0200 +++ new/config/ia64/debug 2007-10-26 09:13:27.000000000 +0200 @@ -3159,7 +3159,6 @@ # # Kernel hacking # -CONFIG_PRINTK_TIME=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3258,3 +3257,4 @@ CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_HW=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/default new/config/ia64/default --- old/config/ia64/default 2007-10-17 23:02:43.000000000 +0200 +++ new/config/ia64/default 2007-10-26 09:13:27.000000000 +0200 @@ -3156,7 +3156,6 @@ # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3254,3 +3253,4 @@ CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_HW=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/vanilla new/config/ia64/vanilla --- old/config/ia64/vanilla 2007-10-14 07:19:06.000000000 +0200 +++ new/config/ia64/vanilla 2007-10-26 09:13:27.000000000 +0200 @@ -3109,7 +3109,6 @@ # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3200,3 +3199,4 @@ CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_HW=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/default new/config/powerpc/default --- old/config/powerpc/default 2007-10-17 23:02:43.000000000 +0200 +++ new/config/powerpc/default 2007-10-26 09:13:27.000000000 +0200 @@ -2728,7 +2728,6 @@ # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -2828,3 +2827,4 @@ CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_HW=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/kdump new/config/powerpc/kdump --- old/config/powerpc/kdump 2007-10-14 07:19:06.000000000 +0200 +++ new/config/powerpc/kdump 2007-10-26 09:13:27.000000000 +0200 @@ -2030,7 +2030,6 @@ # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -2131,3 +2130,4 @@ CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_HW=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/ppc64 new/config/powerpc/ppc64 --- old/config/powerpc/ppc64 2007-10-14 07:19:06.000000000 +0200 +++ new/config/powerpc/ppc64 2007-10-26 09:13:27.000000000 +0200 @@ -2524,7 +2524,6 @@ # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -2626,3 +2625,4 @@ CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_HW=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/vanilla new/config/powerpc/vanilla --- old/config/powerpc/vanilla 2007-10-14 07:19:06.000000000 +0200 +++ new/config/powerpc/vanilla 2007-10-26 09:13:27.000000000 +0200 @@ -2580,7 +2580,6 @@ # # Kernel hacking # -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -2679,3 +2678,4 @@ CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_HW=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/default new/config/s390/default --- old/config/s390/default 2007-10-14 07:19:06.000000000 +0200 +++ new/config/s390/default 2007-10-26 09:13:27.000000000 +0200 @@ -1001,7 +1001,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -1112,3 +1111,4 @@ CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/s390 new/config/s390/s390 --- old/config/s390/s390 2007-10-14 07:19:06.000000000 +0200 +++ new/config/s390/s390 2007-10-26 09:13:27.000000000 +0200 @@ -1000,7 +1000,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -1111,3 +1110,4 @@ CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/vanilla new/config/s390/vanilla --- old/config/s390/vanilla 2007-10-14 07:19:06.000000000 +0200 +++ new/config/s390/vanilla 2007-10-26 09:13:27.000000000 +0200 @@ -996,7 +996,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -1106,3 +1105,4 @@ CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m CONFIG_PLIST=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/debug new/config/x86_64/debug --- old/config/x86_64/debug 2007-10-25 12:17:26.000000000 +0200 +++ new/config/x86_64/debug 2007-10-26 09:13:27.000000000 +0200 @@ -3372,7 +3372,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3499,3 +3498,4 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2007-10-25 12:17:26.000000000 +0200 +++ new/config/x86_64/default 2007-10-26 09:13:27.000000000 +0200 @@ -3380,7 +3380,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3502,3 +3501,4 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/rt new/config/x86_64/rt --- old/config/x86_64/rt 2007-10-19 12:06:49.000000000 +0200 +++ new/config/x86_64/rt 2007-10-26 09:13:27.000000000 +0200 @@ -3411,7 +3411,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3540,3 +3539,4 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/rt_debug new/config/x86_64/rt_debug --- old/config/x86_64/rt_debug 2007-10-19 12:06:49.000000000 +0200 +++ new/config/x86_64/rt_debug 2007-10-26 09:13:27.000000000 +0200 @@ -3403,7 +3403,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set CONFIG_ENABLE_MUST_CHECK=y CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3543,3 +3542,4 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/vanilla new/config/x86_64/vanilla --- old/config/x86_64/vanilla 2007-10-16 08:01:12.000000000 +0200 +++ new/config/x86_64/vanilla 2007-10-26 09:13:27.000000000 +0200 @@ -3340,7 +3340,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3460,3 +3459,4 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y +CONFIG_PRINTK_TIME=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/xen new/config/x86_64/xen --- old/config/x86_64/xen 2007-10-25 12:17:26.000000000 +0200 +++ new/config/x86_64/xen 2007-10-26 18:02:27.000000000 +0200 @@ -3312,7 +3312,6 @@ # Kernel hacking # CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set @@ -3474,3 +3473,4 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y +CONFIG_PRINTK_TIME=y ++++++ needed_space_in_mb ++++++ --- kernel-source/needed_space_in_mb 2007-10-26 01:54:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2007-10-31 08:03:29.000000000 +0100 @@ -1 +1 @@ -6000 +6144 ++++++ patches.drivers.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/e1000e.patch new/patches.drivers/e1000e.patch --- old/patches.drivers/e1000e.patch 2007-08-27 21:42:57.000000000 +0200 +++ new/patches.drivers/e1000e.patch 2007-10-26 09:13:28.000000000 +0200 @@ -1,6 +1,6 @@ From: Brandon Philips <bphilips(a)suse.de> Subject: [Backport] e1000e: pci-express e1000 driver (currently ICH9 only) -Patch-mainline: -mm expected 2.6.24 +Patch-mainline: 2.6.24 References: FATE 302349 GIT: linux/kernel/git/jgarzik/netdev-2.6.git#e1000e @@ -12,66 +12,24 @@ Signed-off-by: Jeff Garzik <jeff(a)garzik.org> --- - drivers/net/Kconfig | 23 - drivers/net/Makefile | 1 drivers/net/e1000e/82571.c | 1351 +++++++++++++ drivers/net/e1000e/Makefile | 37 - drivers/net/e1000e/defines.h | 737 +++++++ - drivers/net/e1000e/e1000.h | 519 +++++ + drivers/net/e1000e/defines.h | 739 +++++++ + drivers/net/e1000e/e1000.h | 514 ++++ drivers/net/e1000e/es2lan.c | 1232 +++++++++++ - drivers/net/e1000e/ethtool.c | 1774 +++++++++++++++++ + drivers/net/e1000e/ethtool.c | 1791 +++++++++++++++++ drivers/net/e1000e/hw.h | 864 ++++++++ drivers/net/e1000e/ich8lan.c | 2225 +++++++++++++++++++++ - drivers/net/e1000e/lib.c | 2466 +++++++++++++++++++++++ - drivers/net/e1000e/netdev.c | 4460 +++++++++++++++++++++++++++++++++++++++++++ + drivers/net/e1000e/lib.c | 2493 ++++++++++++++++++++++++ + drivers/net/e1000e/netdev.c | 4438 +++++++++++++++++++++++++++++++++++++++++++ drivers/net/e1000e/param.c | 382 +++ drivers/net/e1000e/phy.c | 1773 +++++++++++++++++ - 14 files changed, 17844 insertions(+) + 12 files changed, 17839 insertions(+) ---- a/drivers/net/Kconfig 2007-08-27 14:01:21.000000000 -0400 -+++ b/drivers/net/Kconfig 2007-08-27 14:01:22.000000000 -0400 -@@ -1994,6 +1994,29 @@ config E1000_DISABLE_PACKET_SPLIT - - If in doubt, say N. - -+config E1000E -+ tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support" -+ depends on PCI -+ ---help--- -+ This driver supports the PCI-Express Intel(R) PRO/1000 gigabit -+ ethernet family of adapters. For PCI or PCI-X e1000 adapters, -+ use the regular e1000 driver For more information on how to -+ identify your adapter, go to the Adapter & Driver ID Guide at: -+ -+ <http://support.intel.com/support/network/adapter/pro100/21397.htm> -+ -+ For general information and support, go to the Intel support -+ website at: -+ -+ <http://support.intel.com> -+ -+ More specific information on configuring the driver is in -+ <file:Documentation/networking/e1000e.txt>. -+ -+ To compile this driver as a module, choose M here and read -+ <file:Documentation/networking/net-modules.txt>. The module -+ will be called e1000e. -+ - source "drivers/net/ixp2000/Kconfig" - - config MYRI_SBUS ---- a/drivers/net/Makefile 2007-08-27 14:01:21.000000000 -0400 -+++ b/drivers/net/Makefile 2007-08-27 14:01:22.000000000 -0400 -@@ -3,6 +3,7 @@ - # - - obj-$(CONFIG_E1000) += e1000/ -+obj-$(CONFIG_E1000E) += e1000e/ - obj-$(CONFIG_IBM_EMAC) += ibm_emac/ - obj-$(CONFIG_IXGB) += ixgb/ - obj-$(CONFIG_CHELSIO_T1) += chelsio/ ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/net/e1000e/82571.c 2007-08-27 14:01:22.000000000 -0400 +Index: linux-2.6.23/drivers/net/e1000e/82571.c +=================================================================== +--- /dev/null ++++ linux-2.6.23/drivers/net/e1000e/82571.c @@ -0,0 +1,1351 @@ +/******************************************************************************* + @@ -1424,8 +1382,10 @@ + .nvm_ops = &e82573_nvm_ops, +}; + ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/net/e1000e/Makefile 2007-08-27 14:01:22.000000000 -0400 +Index: linux-2.6.23/drivers/net/e1000e/Makefile +=================================================================== +--- /dev/null ++++ linux-2.6.23/drivers/net/e1000e/Makefile @@ -0,0 +1,37 @@ +################################################################################ +# @@ -1464,9 +1424,11 @@ +e1000e-objs := 82571.o ich8lan.o es2lan.o \ + lib.o phy.o param.o ethtool.o netdev.o + ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/net/e1000e/defines.h 2007-08-27 14:01:22.000000000 -0400 -@@ -0,0 +1,737 @@ +Index: linux-2.6.23/drivers/net/e1000e/defines.h +=================================================================== +--- /dev/null ++++ linux-2.6.23/drivers/net/e1000e/defines.h +@@ -0,0 +1,739 @@ +/******************************************************************************* + + Intel PRO/1000 Linux driver @@ -2042,9 +2004,11 @@ +/* For checksumming, the sum of all words in the NVM should equal 0xBABA. */ +#define NVM_SUM 0xBABA + -+#define NVM_WORD_SIZE_BASE_SHIFT 6 ++/* PBA (printed board assembly) number words */ ++#define NVM_PBA_OFFSET_0 8 ++#define NVM_PBA_OFFSET_1 9 + -+/* NVM Commands - Microwire */ ++#define NVM_WORD_SIZE_BASE_SHIFT 6 + +/* NVM Commands - SPI */ +#define NVM_MAX_RETRY_SPI 5000 /* Max wait of 5ms, for RDY signal */ @@ -2204,9 +2168,11 @@ +#define E1000_GEN_POLL_TIMEOUT 640 + +#endif /* _E1000_DEFINES_H_ */ ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/net/e1000e/e1000.h 2007-08-27 14:01:22.000000000 -0400 -@@ -0,0 +1,519 @@ +Index: linux-2.6.23/drivers/net/e1000e/e1000.h +=================================================================== +--- /dev/null ++++ linux-2.6.23/drivers/net/e1000e/e1000.h +@@ -0,0 +1,514 @@ +/******************************************************************************* + + Intel PRO/1000 Linux driver @@ -2351,18 +2317,9 @@ + /* array of buffer information structs */ + struct e1000_buffer *buffer_info; + -+ union { -+ /* for TX */ -+ struct { -+ bool last_tx_tso; /* used to mark tso desc. */ -+ }; -+ /* for RX */ -+ struct { -+ /* arrays of page information for packet split */ -+ struct e1000_ps_page *ps_pages; -+ struct sk_buff *rx_skb_top; -+ }; -+ }; ++ /* arrays of page information for packet split */ ++ struct e1000_ps_page *ps_pages; ++ struct sk_buff *rx_skb_top; + + struct e1000_queue_stats stats; +}; @@ -2405,6 +2362,8 @@ + struct e1000_ring *tx_ring /* One per active queue */ + ____cacheline_aligned_in_smp; + ++ struct napi_struct napi; ++ + unsigned long tx_queue_len; + unsigned int restart_queue; + u32 txd_cmd; @@ -2576,6 +2535,8 @@ +extern struct e1000_info e1000_ich9_info; +extern struct e1000_info e1000_es2_info; + ++extern s32 e1000e_read_part_num(struct e1000_hw *hw, u32 *part_num); ++ +extern s32 e1000e_commit_phy(struct e1000_hw *hw); + +extern bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw); @@ -2726,8 +2687,10 @@ +} + +#endif /* _E1000_H_ */ ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/net/e1000e/es2lan.c 2007-08-27 14:01:22.000000000 -0400 +Index: linux-2.6.23/drivers/net/e1000e/es2lan.c +=================================================================== +--- /dev/null ++++ linux-2.6.23/drivers/net/e1000e/es2lan.c @@ -0,0 +1,1232 @@ +/******************************************************************************* + @@ -3961,9 +3924,11 @@ + .nvm_ops = &es2_nvm_ops, +}; + ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/net/e1000e/ethtool.c 2007-08-27 14:01:22.000000000 -0400 -@@ -0,0 +1,1774 @@ +Index: linux-2.6.23/drivers/net/e1000e/ethtool.c +=================================================================== +--- /dev/null ++++ linux-2.6.23/drivers/net/e1000e/ethtool.c +@@ -0,0 +1,1791 @@ +/******************************************************************************* + + Intel PRO/1000 Linux driver @@ -4076,6 +4041,7 @@ +{ + struct e1000_adapter *adapter = netdev_priv(netdev); + struct e1000_hw *hw = &adapter->hw; ++ u32 status; + + if (hw->media_type == e1000_media_type_copper) { + @@ -4113,16 +4079,16 @@ + ecmd->transceiver = XCVR_EXTERNAL; + } + -+ if (er32(STATUS) & E1000_STATUS_LU) { -+ -+ adapter->hw.mac.ops.get_link_up_info(hw, &adapter->link_speed, -+ &adapter->link_duplex); -+ ecmd->speed = adapter->link_speed; -+ -+ /* unfortunately FULL_DUPLEX != DUPLEX_FULL -+ * and HALF_DUPLEX != DUPLEX_HALF */ ++ status = er32(STATUS); ++ if (status & E1000_STATUS_LU) { ++ if (status & E1000_STATUS_SPEED_1000) ++ ecmd->speed = 1000; ++ else if (status & E1000_STATUS_SPEED_100) ++ ecmd->speed = 100; ++ else ++ ecmd->speed = 10; + -+ if (adapter->link_duplex == FULL_DUPLEX) ++ if (status & E1000_STATUS_FD) + ecmd->duplex = DUPLEX_FULL; + else + ecmd->duplex = DUPLEX_HALF; @@ -4136,6 +4102,16 @@ + return 0; +} + ++static u32 e1000_get_link(struct net_device *netdev) ++{ ++ struct e1000_adapter *adapter = netdev_priv(netdev); ++ struct e1000_hw *hw = &adapter->hw; ++ u32 status; ++ ++ status = er32(STATUS); ++ return (status & E1000_STATUS_LU); ++} ++ +static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx) +{ + struct e1000_mac_info *mac = &adapter->hw.mac; @@ -4267,6 +4243,7 @@ + hw->mac.original_fc = hw->mac.fc; + + if (adapter->fc_autoneg == AUTONEG_ENABLE) { ++ hw->mac.fc = e1000_fc_default; + if (netif_running(adapter->netdev)) { + e1000e_down(adapter); + e1000e_up(adapter); @@ -4543,8 +4520,6 @@ + + strncpy(drvinfo->fw_version, firmware_version, 32); + strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32); -+ drvinfo->n_stats = E1000_STATS_LEN; -+ drvinfo->testinfo_len = E1000_TEST_LEN; + drvinfo->regdump_len = e1000_get_regs_len(netdev); + drvinfo->eedump_len = e1000_get_eeprom_len(netdev); +} @@ -4752,10 +4727,16 @@ + REG_SET_AND_CHECK(E1000_RCTL, before, 0x003FFFFB); + REG_SET_AND_CHECK(E1000_TCTL, 0xFFFFFFFF, 0x00000000); + -+ REG_SET_AND_CHECK(E1000_RCTL, 0xFFFFFFFF, 0x01FFFFFF); -+ REG_PATTERN_TEST(E1000_RDBAL, 0xFFFFF000, 0xFFFFFFFF); -+ REG_PATTERN_TEST(E1000_TXCW, 0x0000FFFF, 0x0000FFFF); -+ REG_PATTERN_TEST(E1000_TDBAL, 0xFFFFF000, 0xFFFFFFFF); ++ REG_SET_AND_CHECK(E1000_RCTL, before, 0xFFFFFFFF); ++ REG_PATTERN_TEST(E1000_RDBAL, 0xFFFFFFF0, 0xFFFFFFFF); ++ if ((mac->type != e1000_ich8lan) && ++ (mac->type != e1000_ich9lan)) ++ REG_PATTERN_TEST(E1000_TXCW, 0xC000FFFF, 0x0000FFFF); ++ REG_PATTERN_TEST(E1000_TDBAL, 0xFFFFFFF0, 0xFFFFFFFF); ++ REG_PATTERN_TEST(E1000_TIDV, 0x0000FFFF, 0x0000FFFF); ++ for (i = 0; i < mac->rar_entry_count; i++) ++ REG_PATTERN_TEST_ARRAY(E1000_RA, ((i << 1) + 1), ++ 0x8003FFFF, 0xFFFFFFFF); + + for (i = 0; i < mac->mta_reg_count; i++) + REG_PATTERN_TEST_ARRAY(E1000_MTA, i, 0xFFFFFFFF, 0xFFFFFFFF); @@ -5412,11 +5393,11 @@ + } + + *data = e1000_setup_desc_rings(adapter); -+ if (data) ++ if (*data) + goto out; + + *data = e1000_setup_loopback_test(adapter); -+ if (data) ++ if (*data) + goto err_loopback; + + *data = e1000_run_loopback_test(adapter); @@ -5459,9 +5440,16 @@ + return *data; +} + -+static int e1000_diag_test_count(struct net_device *netdev) ++static int e1000e_get_sset_count(struct net_device *netdev, int sset) +{ -+ return E1000_TEST_LEN; ++ switch (sset) { ++ case ETH_SS_TEST: ++ return E1000_TEST_LEN; ++ case ETH_SS_STATS: ++ return E1000_STATS_LEN; ++ default: ++ return -EOPNOTSUPP; ++ } +} + +static void e1000_diag_test(struct net_device *netdev, @@ -5658,11 +5646,6 @@ + return 0; +} + -+static int e1000_get_stats_count(struct net_device *netdev) -+{ -+ return E1000_STATS_LEN; -+} -+ +static void e1000_get_ethtool_stats(struct net_device *netdev, + struct ethtool_stats *stats, + u64 *data) @@ -5710,7 +5693,7 @@ + .get_msglevel = e1000_get_msglevel, + .set_msglevel = e1000_set_msglevel, + .nway_reset = e1000_nway_reset, -+ .get_link = ethtool_op_get_link, ++ .get_link = e1000_get_link, + .get_eeprom_len = e1000_get_eeprom_len, + .get_eeprom = e1000_get_eeprom, + .set_eeprom = e1000_set_eeprom, @@ -5726,20 +5709,21 @@ + .set_sg = ethtool_op_set_sg, + .get_tso = ethtool_op_get_tso, + .set_tso = e1000_set_tso, -+ .self_test_count = e1000_diag_test_count, + .self_test = e1000_diag_test, + .get_strings = e1000_get_strings, + .phys_id = e1000_phys_id, -+ .get_stats_count = e1000_get_stats_count, + .get_ethtool_stats = e1000_get_ethtool_stats, ++ .get_sset_count = e1000e_get_sset_count, +}; + +void e1000e_set_ethtool_ops(struct net_device *netdev) +{ + SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops); +} ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/net/e1000e/hw.h 2007-08-27 14:01:22.000000000 -0400 +Index: linux-2.6.23/drivers/net/e1000e/hw.h +=================================================================== +--- /dev/null ++++ linux-2.6.23/drivers/net/e1000e/hw.h @@ -0,0 +1,864 @@ +/******************************************************************************* + @@ -6595,7 +6579,7 @@ + +#ifdef DEBUG +#define hw_dbg(hw, format, arg...) \ -+ printk(KERN_DEBUG, "%s: " format, e1000_get_hw_dev_name(hw), ##arg); ++ printk(KERN_DEBUG "%s: " format, e1000e_get_hw_dev_name(hw), ##arg) +#else +static inline int __attribute__ ((format (printf, 2, 3))) +hw_dbg(struct e1000_hw *hw, const char *format, ...) @@ -6605,8 +6589,10 @@ +#endif + +#endif ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/net/e1000e/ich8lan.c 2007-08-27 14:01:22.000000000 -0400 +Index: linux-2.6.23/drivers/net/e1000e/ich8lan.c +=================================================================== +--- /dev/null ++++ linux-2.6.23/drivers/net/e1000e/ich8lan.c @@ -0,0 +1,2225 @@ +/******************************************************************************* + @@ -8833,9 +8819,11 @@ + .nvm_ops = &ich8_nvm_ops, +}; + ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/net/e1000e/lib.c 2007-08-27 14:01:22.000000000 -0400 -@@ -0,0 +1,2466 @@ +Index: linux-2.6.23/drivers/net/e1000e/lib.c +=================================================================== +--- /dev/null ++++ linux-2.6.23/drivers/net/e1000e/lib.c +@@ -0,0 +1,2493 @@ +/******************************************************************************* + + Intel PRO/1000 Linux driver @@ -9477,9 +9465,15 @@ + if (e1000_check_reset_block(hw)) + return 0; + -+ ret_val = e1000_set_default_fc_generic(hw); -+ if (ret_val) -+ return ret_val; ++ /* ++ * If flow control is set to default, set flow control based on ++ * the EEPROM flow control settings. ++ */ ++ if (mac->fc == e1000_fc_default) { ++ ret_val = e1000_set_default_fc_generic(hw); ++ if (ret_val) ++ return ret_val; ++ } + + /* We want to save off the original Flow Control configuration just + * in case we get disconnected and then reconnected into a different @@ -11302,9 +11296,32 @@ + return ret_val; +} + ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/net/e1000e/netdev.c 2007-08-27 14:01:22.000000000 -0400 -@@ -0,0 +1,4460 @@ ++s32 e1000e_read_part_num(struct e1000_hw *hw, u32 *part_num) ++{ ++ s32 ret_val; ++ u16 nvm_data; ++ ++ ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_0, 1, &nvm_data); ++ if (ret_val) { ++ hw_dbg(hw, "NVM Read Error\n"); ++ return ret_val; ++ } ++ *part_num = (u32)(nvm_data << 16); ++ ++ ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_1, 1, &nvm_data); ++ if (ret_val) { ++ hw_dbg(hw, "NVM Read Error\n"); ++ return ret_val; ++ } ++ *part_num |= nvm_data; ++ ++ return 0; ++} +Index: linux-2.6.23/drivers/net/e1000e/netdev.c +=================================================================== +--- /dev/null ++++ linux-2.6.23/drivers/net/e1000e/netdev.c +@@ -0,0 +1,4438 @@ +/******************************************************************************* + + Intel PRO/1000 Linux driver @@ -11373,9 +11390,7 @@ + **/ +char *e1000e_get_hw_dev_name(struct e1000_hw *hw) +{ -+ struct e1000_adapter *adapter = hw->back; -+ struct net_device *netdev = adapter->netdev; -+ return netdev->name; ++ return hw->adapter->netdev->name; +} +#endif + @@ -12456,12 +12471,12 @@ + mod_timer(&adapter->watchdog_timer, jiffies + 1); + } + -+ if (netif_rx_schedule_prep(netdev)) { ++ if (netif_rx_schedule_prep(netdev, &adapter->napi)) { + adapter->total_tx_bytes = 0; + adapter->total_tx_packets = 0; + adapter->total_rx_bytes = 0; + adapter->total_rx_packets = 0; -+ __netif_rx_schedule(netdev); ++ __netif_rx_schedule(netdev, &adapter->napi); + } else { + atomic_dec(&adapter->irq_sem); + } @@ -12519,12 +12534,12 @@ + mod_timer(&adapter->watchdog_timer, jiffies + 1); + } + -+ if (netif_rx_schedule_prep(netdev)) { ++ if (netif_rx_schedule_prep(netdev, &adapter->napi)) { + adapter->total_tx_bytes = 0; + adapter->total_tx_packets = 0; + adapter->total_rx_bytes = 0; + adapter->total_rx_packets = 0; -+ __netif_rx_schedule(netdev); ++ __netif_rx_schedule(netdev, &adapter->napi); + } else { + atomic_dec(&adapter->irq_sem); + } @@ -12790,7 +12805,6 @@ + + tx_ring->next_to_use = 0; + tx_ring->next_to_clean = 0; -+ tx_ring->last_tx_tso = 0; + + writel(0, adapter->hw.hw_addr + tx_ring->head); + writel(0, adapter->hw.hw_addr + tx_ring->tail); @@ -12970,10 +12984,10 @@ + * e1000_clean - NAPI Rx polling callback + * @adapter: board private structure + **/ -+static int e1000_clean(struct net_device *poll_dev, int *budget) ++static int e1000_clean(struct napi_struct *napi, int budget) +{ -+ struct e1000_adapter *adapter; -+ int work_to_do = min(*budget, poll_dev->quota); ++ struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi); ++ struct net_device *poll_dev = adapter->netdev; + int tx_cleaned = 0, work_done = 0; + + /* Must NOT use netdev_priv macro here. */ @@ -12992,25 +13006,19 @@ + spin_unlock(&adapter->tx_queue_lock); + } + -+ adapter->clean_rx(adapter, &work_done, work_to_do); -+ *budget -= work_done; -+ poll_dev->quota -= work_done; ++ adapter->clean_rx(adapter, &work_done, budget); + + /* If no Tx and not enough Rx work done, exit the polling mode */ -+ if ((!tx_cleaned && (work_done == 0)) || ++ if ((!tx_cleaned && (work_done < budget)) || + !netif_running(poll_dev)) { +quit_polling: + if (adapter->itr_setting & 3) + e1000_set_itr(adapter); -+ netif_rx_complete(poll_dev); -+ if (test_bit(__E1000_DOWN, &adapter->state)) -+ atomic_dec(&adapter->irq_sem); -+ else -+ e1000_irq_enable(adapter); -+ return 0; ++ netif_rx_complete(poll_dev, napi); ++ e1000_irq_enable(adapter); + } + -+ return 1; ++ return work_done; +} + +static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid) @@ -13317,7 +13325,6 @@ + break; + } + -+#ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT + /* + * 82571 and greater support packet-split where the protocol + * header is placed in skb->data and the packet data is @@ -13337,7 +13344,7 @@ + pages = PAGE_USE_COUNT(adapter->netdev->mtu); + if ((pages <= 3) && (PAGE_SIZE <= 16384) && (rctl & E1000_RCTL_LPE)) + adapter->rx_ps_pages = pages; -+#endif ++ + if (adapter->rx_ps_pages) { + /* Configure extra packet-split registers */ + rfctl = er32(RFCTL); @@ -13748,7 +13755,7 @@ + + clear_bit(__E1000_DOWN, &adapter->state); + -+ netif_poll_enable(adapter->netdev); ++ napi_enable(&adapter->napi); + e1000_irq_enable(adapter); + + /* fire a link change interrupt to start the watchdog */ @@ -13781,7 +13788,7 @@ + e1e_flush(); + msleep(10); + -+ netif_poll_disable(netdev); ++ napi_disable(&adapter->napi); + e1000_irq_disable(adapter); + + del_timer_sync(&adapter->watchdog_timer); @@ -13914,7 +13921,7 @@ + /* From here on the code is the same as e1000e_up() */ + clear_bit(__E1000_DOWN, &adapter->state); + -+ netif_poll_enable(netdev); ++ napi_enable(&adapter->napi); + + e1000_irq_enable(adapter); + @@ -14523,15 +14530,6 @@ + while (len) { + buffer_info = &tx_ring->buffer_info[i]; + size = min(len, max_per_txd); -+ /* Workaround for Controller erratum -- -+ * descriptor for non-tso packet in a linear SKB that follows a -+ * tso gets written back prematurely before the data is fully -+ * DMA'd to the controller */ -+ if (tx_ring->last_tx_tso && !skb_is_gso(skb)) { -+ tx_ring->last_tx_tso = 0; -+ if (!skb->data_len) -+ size -= 4; -+ } + + /* Workaround for premature desc write-backs + * in TSO mode. Append 4-byte sentinel desc */ @@ -14750,14 +14748,13 @@ + unsigned int max_per_txd = E1000_MAX_PER_TXD; + unsigned int max_txd_pwr = E1000_MAX_TXD_PWR; + unsigned int tx_flags = 0; -+ unsigned int len = skb->len; ++ unsigned int len = skb->len - skb->data_len; + unsigned long irq_flags; -+ unsigned int nr_frags = 0; -+ unsigned int mss = 0; ++ unsigned int nr_frags; ++ unsigned int mss; + int count = 0; + int tso; + unsigned int f; -+ len -= skb->data_len; + + if (test_bit(__E1000_DOWN, &adapter->state)) { + dev_kfree_skb_any(skb); @@ -14785,7 +14782,7 @@ + * points to just header, pull a few bytes of payload from + * frags into skb->data */ + hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb); -+ if (skb->data_len && (hdr_len == (skb->len - skb->data_len))) { ++ if (skb->data_len && (hdr_len == len)) { + unsigned int pull_size; + + pull_size = min((unsigned int)4, skb->data_len); @@ -14804,10 +14801,6 @@ + count++; + count++; + -+ /* Controller Erratum workaround */ -+ if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb)) -+ count++; -+ + count += TXD_USE_COUNT(len, max_txd_pwr); + + nr_frags = skb_shinfo(skb)->nr_frags; @@ -14843,12 +14836,10 @@ + return NETDEV_TX_OK; + } + -+ if (tso) { -+ tx_ring->last_tx_tso = 1; ++ if (tso) + tx_flags |= E1000_TX_FLAGS_TSO; -+ } else if (e1000_tx_csum(adapter, skb)) { ++ else if (e1000_tx_csum(adapter, skb)) + tx_flags |= E1000_TX_FLAGS_CSUM; -+ } + + /* Old method was to assume IPv4 packet by default if TSO was enabled. + * 82571 hardware supports TSO capabilities for IPv6 as well... @@ -14861,7 +14852,7 @@ + /* handle pci_map_single() error in e1000_tx_map */ + dev_kfree_skb_any(skb); + spin_unlock_irqrestore(&adapter->tx_queue_lock, irq_flags); -+ return NETDEV_TX_BUSY; ++ return NETDEV_TX_OK; + } + + e1000_tx_queue(adapter, tx_flags, count); @@ -15289,6 +15280,7 @@ +{ + struct e1000_hw *hw = &adapter->hw; + struct net_device *netdev = adapter->netdev; ++ u32 part_num; + + /* print bus type/speed/width info */ + ndev_info(netdev, "(PCI Express:2.5GB/s:%s) " @@ -15303,6 +15295,10 @@ + ndev_info(netdev, "Intel(R) PRO/%s Network Connection\n", + (hw->phy.type == e1000_phy_ife) + ? "10/100" : "1000"); ++ e1000e_read_part_num(hw, &part_num); ++ ndev_info(netdev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n", ++ hw->mac.type, hw->phy.type, ++ (part_num >> 8), (part_num & 0xff)); +} + +/** @@ -15365,7 +15361,6 @@ + if (!netdev) + goto err_alloc_etherdev; + -+ SET_MODULE_OWNER(netdev); + SET_NETDEV_DEV(netdev, &pdev->dev); + + pci_set_drvdata(pdev, netdev); @@ -15409,8 +15404,7 @@ + e1000e_set_ethtool_ops(netdev); + netdev->tx_timeout = &e1000_tx_timeout; + netdev->watchdog_timeo = 5 * HZ; -+ netdev->poll = &e1000_clean; -+ netdev->weight = 64; ++ netif_napi_add(netdev, &adapter->napi, e1000_clean, 64); + netdev->vlan_rx_register = e1000_vlan_rx_register; + netdev->vlan_rx_add_vid = e1000_vlan_rx_add_vid; + netdev->vlan_rx_kill_vid = e1000_vlan_rx_kill_vid; @@ -15525,6 +15519,7 @@ + + /* Initialize link parameters. User can change them with ethtool */ + adapter->hw.mac.autoneg = 1; ++ adapter->fc_autoneg = 1; + adapter->hw.mac.original_fc = e1000_fc_default; + adapter->hw.mac.fc = e1000_fc_default; + adapter->hw.phy.autoneg_advertised = 0x2f; @@ -15579,7 +15574,6 @@ + /* tell the stack to leave us alone until e1000_open() is called */ + netif_carrier_off(netdev); + netif_stop_queue(netdev); -+ netif_poll_disable(netdev); + + strcpy(netdev->name, "eth%d"); + err = register_netdev(netdev); @@ -15737,9 +15731,10 @@ +static int __init e1000_init_module(void) +{ + int ret; -+ printk(KERN_INFO "Intel(R) PRO/1000 Network Driver - %s\n", -+ e1000e_driver_version); -+ printk(KERN_INFO "Copyright (c) 1999-2007 Intel Corporation.\n"); ++ printk(KERN_INFO "%s: Intel(R) PRO/1000 Network Driver - %s\n", ++ e1000e_driver_name, e1000e_driver_version); ++ printk(KERN_INFO "%s: Copyright (c) 1999-2007 Intel Corporation.\n", ++ e1000e_driver_name); + ret = pci_register_driver(&e1000_driver); + + return ret; @@ -15765,8 +15760,10 @@ +MODULE_VERSION(DRV_VERSION); + +/* e1000_main.c */ ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/net/e1000e/param.c 2007-08-27 14:01:22.000000000 -0400 +Index: linux-2.6.23/drivers/net/e1000e/param.c +=================================================================== +--- /dev/null ++++ linux-2.6.23/drivers/net/e1000e/param.c @@ -0,0 +1,382 @@ +/******************************************************************************* + @@ -16150,8 +16147,10 @@ + } + } +} ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/drivers/net/e1000e/phy.c 2007-08-27 14:01:22.000000000 -0400 +Index: linux-2.6.23/drivers/net/e1000e/phy.c +=================================================================== +--- /dev/null ++++ linux-2.6.23/drivers/net/e1000e/phy.c @@ -0,0 +1,1773 @@ +/******************************************************************************* + ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/proc-scsi-scsi-fix.diff new/patches.fixes/proc-scsi-scsi-fix.diff --- old/patches.fixes/proc-scsi-scsi-fix.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/proc-scsi-scsi-fix.diff 2007-10-29 22:56:32.000000000 +0100 @@ -0,0 +1,108 @@ +From: Jeff Mahoney <jeffm(a)suse.com> +Subject: [PATCH] scsi: iterate over devices individually for /proc/scsi/scsi +References: 263731 + + On systems with very large numbers (> 1600 or so) of SCSI devices, + cat /proc/scsi/scsi ends up failing with -ENOMEM. This is due to + the show routine simply iterating over all of the devices with + bus_for_each_dev(), and trying to dump all of them into the buffer + at the same time. On my test system (using scsi_debug with 4064 devices), + the output ends up being ~ 632k, far more than kmalloc will typically allow. + + This patch defines its own seq_file opreations to iterate over the scsi + devices.The result is that each show() operation only dumps ~ 180 bytes + into the buffer at a time so we don't run out of memory. + + If the "Attached devices" header isn't required, we can dump the + sfile->private bit completely. + +Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> + +--- + + drivers/scsi/scsi_proc.c | 58 ++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 52 insertions(+), 6 deletions(-) + +--- a/drivers/scsi/scsi_proc.c 2007-10-29 13:56:28.000000000 -0400 ++++ b/drivers/scsi/scsi_proc.c 2007-10-29 15:50:57.000000000 -0400 +@@ -294,20 +294,66 @@ static ssize_t proc_scsi_write(struct fi + return err; + } + +-static int proc_scsi_show(struct seq_file *s, void *p) ++static int always_match(struct device *dev, void *data) + { +- seq_printf(s, "Attached devices:\n"); +- bus_for_each_dev(&scsi_bus_type, NULL, s, proc_print_scsidevice); +- return 0; ++ return 1; ++} ++ ++static inline struct device *next_scsi_device(struct device *start) ++{ ++ struct device *next = bus_find_device(&scsi_bus_type, start, NULL, ++ always_match); ++ put_device(start); ++ return next; ++} ++ ++static void *scsi_seq_start(struct seq_file *sfile, loff_t *pos) ++{ ++ struct device *dev = NULL; ++ loff_t n = *pos; ++ ++ while ((dev = next_scsi_device(dev))) { ++ if (!n--) ++ break; ++ sfile->private++; ++ } ++ return dev; ++} ++ ++static void *scsi_seq_next(struct seq_file *sfile, void *v, loff_t *pos) ++{ ++ (*pos)++; ++ sfile->private++; ++ return next_scsi_device(v); ++} ++ ++static void scsi_seq_stop(struct seq_file *sfile, void *v) ++{ ++ put_device(v); ++} ++ ++static int scsi_seq_show(struct seq_file *sfile, void *dev) ++{ ++ if (!sfile->private) ++ seq_puts(sfile, "Attached devices:\n"); ++ ++ return proc_print_scsidevice(dev, sfile); + } + ++static struct seq_operations scsi_seq_ops = { ++ .start = scsi_seq_start, ++ .next = scsi_seq_next, ++ .stop = scsi_seq_stop, ++ .show = scsi_seq_show ++}; ++ + static int proc_scsi_open(struct inode *inode, struct file *file) + { + /* + * We don't really needs this for the write case but it doesn't + * harm either. + */ +- return single_open(file, proc_scsi_show, NULL); ++ return seq_open(file, &scsi_seq_ops); + } + + static struct file_operations proc_scsi_operations = { +@@ -315,7 +361,7 @@ static struct file_operations proc_scsi_ + .read = seq_read, + .write = proc_scsi_write, + .llseek = seq_lseek, +- .release = single_release, ++ .release = seq_release, + }; + + int __init scsi_init_procfs(void) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/remove-transparent-bridge-sizing new/patches.fixes/remove-transparent-bridge-sizing --- old/patches.fixes/remove-transparent-bridge-sizing 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/remove-transparent-bridge-sizing 2007-10-26 13:43:32.000000000 +0200 @@ -0,0 +1,38 @@ +From: Gary Hade <garyhade(a)us.ibm.com> +Date: Wed Oct 3 15:55:51 2007 -0700 +Subject: PCI: remove transparent bridge sizing +References: 331027 + +Remove transparent bridge sizing. + +Due to code in pci_read_bridge_bases() [drivers/pci/probe.c] the child +bus of a transparent bridge already has access to the parent bus +resources so transparent bridge sizing appears unnecessary. The bridge +sizing includes alignment and granularity adjustments that can cause +significantly more memory to be reserved from the parant bus than +required by devices on the child bus and allotted by _CRS. + + +Signed-off-by: Gary Hade <gary.hade(a)us.ibm.com> +Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> +commit 8fa5913d54f3b1e09948e6a0db34da887e05ff1f + +--- + drivers/pci/setup-bus.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/pci/setup-bus.c ++++ b/drivers/pci/setup-bus.c +@@ -472,7 +472,12 @@ void pci_bus_size_bridges(struct pci_bus + break; + + case PCI_CLASS_BRIDGE_PCI: ++ /* don't size subtractive decoding (transparent) ++ * PCI-to-PCI bridges */ ++ if (bus->self->transparent) ++ break; + pci_bridge_check_ranges(bus); ++ /* fall through */ + default: + pbus_size_io(bus); + /* If the bridge supports prefetchable range, size it ++++++ series.conf ++++++ --- kernel-source/series.conf 2007-10-25 12:17:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-10-31 08:02:57.000000000 +0100 @@ -423,6 +423,8 @@ # Remaining SCSI patches (garloff) patches.suse/scsi-error-test-unit-ready-timeout + patches.fixes/proc-scsi-scsi-fix.diff + ######################################################## # Network ######################################################## @@ -446,6 +448,7 @@ ######################################################## # PCI and PCI hotplug ######################################################## + patches.fixes/remove-transparent-bridge-sizing ######################################################## # sysfs / driver core ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnokii
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package gnokii checked in at Wed Oct 31 12:29:01 CET 2007. -------- --- gnokii/gnokii.changes 2007-10-30 14:11:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnokii/gnokii.changes 2007-10-31 11:51:50.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Oct 31 11:50:04 CET 2007 - prusnak(a)suse.cz + +- added pcsc-lite-devel to BuildRequires +- don't package .la files +- cleaned spec file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnokii.spec ++++++ --- /var/tmp/diff_new_pack.l12981/_old 2007-10-31 12:28:52.000000000 +0100 +++ /var/tmp/diff_new_pack.l12981/_new 2007-10-31 12:28:52.000000000 +0100 @@ -11,9 +11,9 @@ # norootforbuild Name: gnokii -BuildRequires: bluez-libs gtk2-devel libical-devel libusb-devel mysql-devel postgresql-devel update-desktop-files +BuildRequires: bluez-libs gtk2-devel libical-devel libusb-devel mysql-devel pcsc-lite-devel postgresql-devel update-desktop-files Version: 0.6.20 -Release: 1 +Release: 2 PreReq: permissions Requires: bluez-libs Group: Hardware/Mobile @@ -79,8 +79,8 @@ %package devel Group: Hardware/Mobile Summary: Nokia Connectivity Program -Provides: gnokii:/usr/share/smsd -Requires: gnokii = %{version} +Requires: %{name} = %{version} +Requires: %{name}-smsd = %{version} Requires: libical-devel xorg-x11-devel libusb-devel glib2-devel libopenssl-devel %description devel @@ -102,38 +102,28 @@ %build export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC -Wall -Wno-unused -fstack-protector -fno-strict-aliasing" %configure \ + --docdir=%{_defaultdocdir}/%{name} \ --enable-nls \ --enable-security \ --with-x -make -C common all -make -C common/data all make %{?jobs:-j%jobs} -make -C smsd/ all -make -C smsd/ libpq.la libmysql.la libfile.la +make -C smsd %{?jobs:-j%jobs} %install cp %{S:3} . -install -m755 -d $RPM_BUILD_ROOT%{_sysconfdir} -install -m755 -d $RPM_BUILD_ROOT%{_mandir}/man{1,8} make DESTDIR=$RPM_BUILD_ROOT install -make DESTDIR=$RPM_BUILD_ROOT -C smsd/ install -# libtool files not needed. there is no depending program at the moement... -rm $RPM_BUILD_ROOT/%{_libdir}/smsd/libfile.a -rm $RPM_BUILD_ROOT/%{_libdir}/smsd/libfile.la +make DESTDIR=$RPM_BUILD_ROOT install-devel +make DESTDIR=$RPM_BUILD_ROOT -C smsd install +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/smsd/*.la +mv -f $RPM_BUILD_ROOT/usr/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1 +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir} sed "s:/usr/local/sbin:%{_sbindir}:g" Docs/sample/gnokiirc > $RPM_BUILD_ROOT%{_sysconfdir}/gnokiirc -# man-pages -cp Docs/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/ -cp Docs/man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8/ -cp Docs/man/*.1x $RPM_BUILD_ROOT%{_mandir}/man1/ -%{find_lang} %{name} -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ -install -m 0644 %SOURCE2 \ - $RPM_BUILD_ROOT/usr/share/pixmaps/ +rm -f $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}/gnapplet.sis +%find_lang %{name} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps %suse_update_desktop_file -i xgnokii System Telephony -# included via %doc -rm $RPM_BUILD_ROOT/usr/share/doc/gnokii/gnapplet.sis -# fixup la file -sed -i -e "s@ [^\ ]*$RPM_BUILD_DIR[^\ ]* @ @" $RPM_BUILD_ROOT/%{_libdir}/libgnokii.la %post /sbin/ldconfig @@ -150,12 +140,11 @@ %files -f %{name}.lang %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/gnokiirc -%doc COPYING COPYRIGHT ChangeLog MAINTAINERS TODO README.SUSE -%doc Docs/Bugs Docs/CREDITS Docs/CodingStyle Docs/DataCalls-QuickStart Docs/FAQ -%doc Docs/README* Docs/gettext-howto Docs/gnokii-* Docs/logos.txt Docs/ringtones.txt -%doc %{_mandir}/man1/gnokii.1.gz -%doc %{_mandir}/man8/gnokiid.8.gz -%doc %{_mandir}/man8/mgnokiidev.8.gz +%dir %{_defaultdocdir}/%{name} +%doc %{_defaultdocdir}/%{name}/* +%doc %{_mandir}/man1/gnokii* +%doc %{_mandir}/man8/gnokiid* +%doc %{_mandir}/man8/mgnokiidev* %{_bindir}/gnokii %{_libdir}/*.so.* %{_sbindir}/gnokiid @@ -163,16 +152,16 @@ %files -n xgnokii %defattr(-,root,root) -%doc %{_mandir}/man1/xgnokii.1x.gz -%{_datadir}/applications/* -%{_datadir}/pixmaps/* +%doc %{_mandir}/man1/xgnokii* %{_bindir}/xgnokii %{_datadir}/xgnokii +%{_datadir}/applications/* +%{_datadir}/pixmaps/* %files smsd %defattr(-,root,root) -%doc %{_mandir}/man1/sendsms.1.gz -%doc %{_mandir}/man8/smsd.8.gz +%doc %{_mandir}/man1/sendsms* +%doc %{_mandir}/man8/smsd* %{_bindir}/sendsms %{_sbindir}/smsd %dir %{_libdir}/smsd @@ -180,10 +169,8 @@ %files devel %defattr(-,root,root) -%{_libdir}/*.la %{_libdir}/*.a %{_libdir}/*.so -%{_libdir}/smsd/*.la %{_libdir}/smsd/*.a %{_libdir}/smsd/*.so %exclude %{_libdir}/smsd/libfile.so @@ -191,6 +178,10 @@ %{_includedir}/gnokii.h %{_includedir}/gnokii %changelog +* Wed Oct 31 2007 - prusnak(a)suse.cz +- added pcsc-lite-devel to BuildRequires +- don't package .la files +- cleaned spec file * Tue Oct 30 2007 - prusnak(a)suse.cz - updated to 0.6.20 * libgnokii updates ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gcc41
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package gcc41 checked in at Wed Oct 31 12:27:34 CET 2007. -------- --- gcc41/cross-avr-gcc.changes 2007-08-10 16:53:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc41/cross-avr-gcc.changes 2007-10-30 15:09:57.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Oct 30 15:09:44 CET 2007 - rguenther(a)suse.de + +- Update to gcc-4_1-branch head (r129775). + +------------------------------------------------------------------- +Mon Oct 1 11:38:25 CEST 2007 - rguenther(a)suse.de + +- Add patch to add -fpreserve-function-arguments. [#326866] + +------------------------------------------------------------------- gcc41.changes: same change libgcj41.changes: same change Old: ---- gcc-4.1.3-20070724.tar.bz2 New: ---- fpreserve-function-arguments4.patch gcc-4.1.3-20071030.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-avr-gcc.spec ++++++ --- /var/tmp/diff_new_pack.i28605/_old 2007-10-31 12:26:41.000000000 +0100 +++ /var/tmp/diff_new_pack.i28605/_new 2007-10-31 12:26:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-avr-gcc (Version 4.1.3_20070724) +# spec file for package cross-avr-gcc (Version 4.1.3_20071030) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -24,10 +24,10 @@ %define _prefix /opt/cross # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc -URL: http://gcc.gnu.org/ -License: BSD 3-Clause, GPL v2 or later -Version: 4.1.3_20070724 -Release: 6 +Url: http://gcc.gnu.org/ +License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT +Version: 4.1.3_20071030 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.1 @@ -39,7 +39,7 @@ # COMMON-END # COMMON-BEGIN Group: Development/Languages/C and C++ -Autoreqprov: on +AutoReqProv: on Summary: The GNU C Compiler for atmel Processors BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gcc-%{gcc_version}%{snapshot_date}.tar.bz2 @@ -97,6 +97,7 @@ Patch72: Wprofile-mismatch.patch Patch73: parentheses-mathematical-5.diff Patch74: Wuninitialized.patch +Patch75: fpreserve-function-arguments4.patch # Greyhound (aka AMD Family 10h) support Patch200: gcc-amdfam10-suse-1.patch Patch201: gcc-amdfam10-suse-2.patch @@ -154,6 +155,9 @@ %endif %define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_version} %define gxxinclude %{_prefix}/include/c++/%{gcc_version} +# COMMON-END +# COMMON-BEGIN + %prep %setup -q -n gcc-%{gcc_version}%{snapshot_date} %patch1 @@ -211,6 +215,7 @@ %patch72 %patch73 %patch74 +%patch75 %patch200 %patch201 %patch202 @@ -399,8 +404,11 @@ %files %defattr(-,root,root) %{_prefix} - %changelog +* Tue Oct 30 2007 - rguenther(a)suse.de +- Update to gcc-4_1-branch head (r129775). +* Mon Oct 01 2007 - rguenther(a)suse.de +- Add patch to add -fpreserve-function-arguments. [#326866] * Fri Aug 10 2007 - matz(a)suse.de - Remove include/sound directory, as it now also contains fixed includes. ++++++ gcc41.spec ++++++ ++++ 964 lines (skipped) ++++ between gcc41/gcc41.spec ++++ and /mounts/work_src_done/STABLE/gcc41/gcc41.spec ++++++ libgcj41.spec ++++++ --- /var/tmp/diff_new_pack.i28605/_old 2007-10-31 12:26:41.000000000 +0100 +++ /var/tmp/diff_new_pack.i28605/_new 2007-10-31 12:26:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libgcj41 (Version 4.1.3_20070724) +# spec file for package libgcj41 (Version 4.1.3_20071030) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -123,9 +123,9 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -License: GPL v2 or later, LGPL v2 or later -Version: 4.1.3_20070724 -Release: 8 +License: GPL v2 or later; LGPL v2.1 or later +Version: 4.1.3_20071030 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.1 @@ -144,7 +144,7 @@ %endif # COMMON-BEGIN Group: System/Libraries -Autoreqprov: on +AutoReqProv: on Summary: Java Runtime Library for gcc BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gcc-%{gcc_version}%{snapshot_date}.tar.bz2 @@ -202,6 +202,7 @@ Patch72: Wprofile-mismatch.patch Patch73: parentheses-mathematical-5.diff Patch74: Wuninitialized.patch +Patch75: fpreserve-function-arguments4.patch # Greyhound (aka AMD Family 10h) support Patch200: gcc-amdfam10-suse-1.patch Patch201: gcc-amdfam10-suse-2.patch @@ -233,7 +234,7 @@ Group: System/Libraries Provides: libgcj = %{version}-%{release} Obsoletes: libgcj -Autoreqprov: on +AutoReqProv: on %description This library is needed if you want to use the GNU Java compiler, gcj. @@ -241,16 +242,16 @@ - %post %run_ldconfig %postun %run_ldconfig + %package -n libgcj41-devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/Java -Autoreqprov: on +AutoReqProv: on Requires: libstdc++41-devel = %{version} Requires: libgcj >= %{version}-%{release} Requires: gtk2-devel @@ -271,7 +272,7 @@ Summary: Java bytecode Interpreter for gcc Group: System/Libraries Requires: libgcj >= %{version}-%{release} -Autoreqprov: on +AutoReqProv: on %description -n gcc41-gij This package contains the java bytecode interpreter gij and related @@ -282,7 +283,7 @@ %package -n libffi41 Summary: Foreign Function Interface library Group: System/Libraries -Autoreqprov: on +AutoReqProv: on Provides: g-wrap:/usr/lib/libffi.so.4 %description -n libffi41 @@ -292,7 +293,6 @@ - %post -n libffi41 %run_ldconfig @@ -301,16 +301,16 @@ # PACKAGE-END # PACKAGE-BEGIN # PACKAGE-BEGIN + %package -n libffi41-32bit Summary: Foreign Function Interface library Group: Development/Languages/C and C++ -Autoreqprov: on +AutoReqProv: on Provides: g-wrap:/usr/lib/libffi.so.4 %description -n libffi41-32bit A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. - %post -n libffi41-32bit %run_ldconfig @@ -319,16 +319,16 @@ # PACKAGE-END # PACKAGE-BEGIN # PACKAGE-BEGIN + %package -n libffi41-64bit Summary: Foreign Function Interface library Group: Development/Languages/C and C++ -Autoreqprov: on +AutoReqProv: on Provides: g-wrap:/usr/lib/libffi.so.4 %description -n libffi41-64bit A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language. - %post -n libffi41-64bit %run_ldconfig @@ -337,10 +337,11 @@ # PACKAGE-END # PACKAGE-BEGIN # PACKAGE-BEGIN + %package -n libffi41-devel Summary: Foreign Function Interface library development files Group: System/Libraries -Autoreqprov: on +AutoReqProv: on Requires: libffi41 >= %{version}-%{release} %description -n libffi41-devel @@ -353,7 +354,7 @@ %package -n libffi41-devel-32bit Summary: Foreign Function Interface library development files Group: Development/Languages/C and C++ -Autoreqprov: on +AutoReqProv: on Requires: libffi41-32bit >= %{version}-%{release} %description -n libffi41-devel-32bit @@ -361,7 +362,7 @@ %package -n libffi41-devel-64bit Summary: Foreign Function Interface library development files Group: Development/Languages/C and C++ -Autoreqprov: on +AutoReqProv: on Requires: libffi41-64bit >= %{version}-%{release} %description -n libffi41-devel-64bit @@ -398,6 +399,8 @@ %endif %define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_version} %define gxxinclude %{_prefix}/include/c++/%{gcc_version} +# COMMON-END +# Versionspecific directories %define versmainlibdir %{libsubdir} %define versmainlibdirbi32 %{libsubdir}/32 %define versmainlibdirbi64 %{libsubdir}/64 @@ -409,6 +412,7 @@ %ifarch ppc64 %define versnoflibdir %{libsubdir}/32/nof %endif +# If we use versionspecific libs, they end in libsubdir %if %{versionspecificlibs} %define mainlibdir %{libsubdir} %define mainlibdirbi32 %{libsubdir}/32 @@ -427,6 +431,12 @@ %define mainlibdirbi64 %{_prefix}/lib64 %define noflibdir %{_prefix}/lib/nof %endif +# Now define a few macros that make it easy to package libs and +# related files just to the right package, without caring for the +# exact path the files are in. +# %mainlib package X from all dirs that belong to the main package +# %biarchlib package X from all dirs that belong to the -32/64bit package +# by default, nof libs go where the 32bit libs go. %if %{build_nof} %define mainlib() %{mainlibdir}/%1\ %{noflibdir}/%1\ @@ -531,6 +541,8 @@ %endif %endif %endif +# COMMON-BEGIN + %prep %setup -q -n gcc-%{gcc_version}%{snapshot_date} %patch1 @@ -588,6 +600,7 @@ %patch72 %patch73 %patch74 +%patch75 %patch200 %patch201 %patch202 @@ -1013,22 +1026,14 @@ %endif # We usually do not multilib libjava %if %{biarch_libjava} - %mainlib libgcj.so.* - %mainlib libgij.so.* - %mainlib libgcjawt.so.* - %mainlib lib-gnu-java-awt-peer-gtk.so.* # these libs may get dlopened by their .la/.so name - %mainlib libgcjawt.la - %mainlib libgcjawt.so - %mainlib lib-gnu-java-awt-peer-gtk.la - %mainlib lib-gnu-java-awt-peer-gtk.so %else %{mainlibdir}/libgcj.so.* @@ -1063,15 +1068,10 @@ %{gxxinclude}/org %{libsubdir}/include/gcj %if %{biarch_libjava} - %mainlib libgcj.la - %mainlib libgcj.so - %mainlib libgcj.spec - %mainlib libgij.la - %mainlib libgij.so %else %{mainlibdir}/libgcj.la @@ -1096,13 +1096,11 @@ %files -n libffi41 %defattr(-,root,root) - %mainlib libffi.so.* %if %{separate_biarch} %files -n libffi41%{separate_biarch_suffix} %defattr(-,root,root) - %biarchlib libffi.so.* %endif @@ -1110,17 +1108,13 @@ %defattr(-,root,root) %{_prefix}/include/ffi.h %{_prefix}/include/ffitarget.h - %mainlib libffi.so - %mainlib libffi.a %if %{separate_biarch} %files -n libffi41-devel%{separate_biarch_suffix} %defattr(-,root,root) - %biarchlib libffi.so - %biarchlib libffi.a %endif %endif @@ -1132,8 +1126,11 @@ %doc testresults/*.sum %doc testresults/*.log %endif - %changelog +* Tue Oct 30 2007 - rguenther(a)suse.de +- Update to gcc-4_1-branch head (r129775). +* Mon Oct 01 2007 - rguenther(a)suse.de +- Add patch to add -fpreserve-function-arguments. [#326866] * Fri Aug 10 2007 - matz(a)suse.de - Remove include/sound directory, as it now also contains fixed includes. ++++++ fpreserve-function-arguments4.patch ++++++ Index: gcc/gimplify.c =================================================================== *** gcc/gimplify.c.orig 2007-08-27 16:39:56.000000000 +0200 --- gcc/gimplify.c 2007-09-28 19:40:59.000000000 +0200 *************** gimplify_body (tree *body_p, tree fndecl *** 4976,4981 **** --- 4976,5031 ---- BIND_EXPR_BODY (body) = parm_stmts; } + /* If we want to forcibly preserve function argument values, do so here. */ + if (flag_preserve_function_arguments) + { + char s[1024] = "# "; + tree asmt, parm, inputs = NULL_TREE, stmts = NULL_TREE; + bool mem_p = false; + int i = 0; + + sprintf (s + strlen(s), "%s ", IDENTIFIER_POINTER (DECL_NAME (fndecl))); + + for (parm = DECL_ARGUMENTS (fndecl); parm ; parm = TREE_CHAIN (parm)) + { + tree pt = parm; + tree type = TREE_TYPE (parm); + /* Maybe build a fancy memory operand here. For now just use + a pointer input and let the operand scanner deal with the rest. */ + if (TYPE_MODE (type) == BLKmode) + { + pt = build_fold_addr_expr (parm); + type = TREE_TYPE (pt); + } + if (POINTER_TYPE_P (type)) + mem_p = true; + sprintf (s + strlen(s), "%%%i ", i++); + inputs = tree_cons (tree_cons (NULL_TREE, build_string (1, "g"), + NULL_TREE), pt, inputs); + } + + if (i != 0) + { + /* While on the tree level we can do w/o explicit "memory" + clobbering because we tweak the operand scanner, on RTL level + we need it. */ + tree clobbers = NULL_TREE; + if (mem_p) + clobbers = tree_cons (NULL_TREE, build_string (6, "memory"), + NULL_TREE); + asmt = build4 (ASM_EXPR, void_type_node, + build_string (strlen (s), s), + NULL_TREE, /* no outputs */ + inputs, clobbers); + ASM_VOLATILE_P (asmt) = 1; + TREE_READONLY (asmt) = 1; + gimplify_and_add (asmt, &stmts); + + append_to_statement_list_force (BIND_EXPR_BODY (body), &stmts); + BIND_EXPR_BODY (body) = stmts; + } + } + /* Unshare again, in case gimplification was sloppy. */ unshare_all_trees (body); Index: gcc/common.opt =================================================================== *** gcc/common.opt.orig 2007-02-05 13:59:11.000000000 +0100 --- gcc/common.opt 2007-09-28 15:29:26.000000000 +0200 *************** fmudflapir *** 590,595 **** --- 590,599 ---- Common RejectNegative Report Var(flag_mudflap_ignore_reads) Ignore read operations when inserting mudflap instrumentation + fpreserve-function-arguments + Common Report Var(flag_preserve_function_arguments) + Preserve function argument values for debugging + freschedule-modulo-scheduled-loops Common Report Var(flag_resched_modulo_sched) Enable/Disable the traditional scheduling in loops that already passed modulo scheduling Index: gcc/tree-ssa-operands.c =================================================================== *** gcc/tree-ssa-operands.c.orig 2007-06-06 16:58:54.000000000 +0200 --- gcc/tree-ssa-operands.c 2007-09-28 16:02:12.000000000 +0200 *************** Boston, MA 02110-1301, USA. */ *** 103,108 **** --- 103,110 ---- to distinguish "reset the world" events from explicit MODIFY_EXPRs. */ #define opf_non_specific (1 << 3) + /* Hack to mark all SSA_NAME uses in asms as abnormal. */ + #define opf_mark_abnormal (1 << 4) /* Array for building all the def operands. */ static VEC(tree,heap) *build_defs; *************** get_asm_expr_operands (tree stmt) *** 1343,1349 **** int i; tree link; const char *constraint; ! bool allows_mem, allows_reg, is_inout; for (i=0, link = ASM_OUTPUTS (stmt); link; ++i, link = TREE_CHAIN (link)) { --- 1345,1351 ---- int i; tree link; const char *constraint; ! bool allows_mem, allows_reg, is_inout, memory_p; for (i=0, link = ASM_OUTPUTS (stmt); link; ++i, link = TREE_CHAIN (link)) { *************** get_asm_expr_operands (tree stmt) *** 1367,1392 **** get_expr_operands (stmt, &TREE_VALUE (link), opf_is_def); } ! for (link = ASM_INPUTS (stmt); link; link = TREE_CHAIN (link)) ! { ! constraint ! = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (link))); ! parse_input_constraint (&constraint, 0, 0, noutputs, 0, ! oconstraints, &allows_mem, &allows_reg); ! ! /* Memory operands are addressable. Note that STMT needs the ! address of this operand. */ ! if (!allows_reg && allows_mem) ! { ! tree t = get_base_address (TREE_VALUE (link)); ! if (t && DECL_P (t) && s_ann) ! add_to_addressable_set (t, &s_ann->addresses_taken); ! } ! ! get_expr_operands (stmt, &TREE_VALUE (link), 0); ! } ! ! /* Clobber memory for asm ("" : : : "memory"); */ for (link = ASM_CLOBBERS (stmt); link; link = TREE_CHAIN (link)) if (strcmp (TREE_STRING_POINTER (TREE_VALUE (link)), "memory") == 0) --- 1369,1375 ---- get_expr_operands (stmt, &TREE_VALUE (link), opf_is_def); } ! memory_p = false; /* Clobber memory for asm ("" : : : "memory"); */ for (link = ASM_CLOBBERS (stmt); link; link = TREE_CHAIN (link)) if (strcmp (TREE_STRING_POINTER (TREE_VALUE (link)), "memory") == 0) *************** get_asm_expr_operands (tree stmt) *** 1394,1399 **** --- 1377,1388 ---- unsigned i; bitmap_iterator bi; + if (TREE_READONLY (stmt)) + { + memory_p = true; + break; + } + /* Clobber all call-clobbered variables (or .GLOBAL_VAR if we decided to group them). */ if (global_var) *************** get_asm_expr_operands (tree stmt) *** 1425,1430 **** --- 1414,1470 ---- break; } + + for (link = ASM_INPUTS (stmt); link; link = TREE_CHAIN (link)) + { + constraint + = TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (link))); + parse_input_constraint (&constraint, 0, 0, noutputs, 0, + oconstraints, &allows_mem, &allows_reg); + + /* Memory operands are addressable. Note that STMT needs the + address of this operand. */ + if (!allows_reg && allows_mem) + { + tree t = get_base_address (TREE_VALUE (link)); + if (t && DECL_P (t) && s_ann) + add_to_addressable_set (t, &s_ann->addresses_taken); + } + + get_expr_operands (stmt, &TREE_VALUE (link), opf_mark_abnormal); + + /* Read-only memory. Copied from get_indirect_ref_operands. */ + if (memory_p + && POINTER_TYPE_P (TREE_TYPE (TREE_VALUE (link))) + && SSA_VAR_P (TREE_VALUE (link))) + { + tree ptr = TREE_VALUE (link); + int flags = 0; + struct ptr_info_def *pi = NULL; + + /* If PTR has flow-sensitive points-to information, use it. */ + if (TREE_CODE (ptr) == SSA_NAME + && (pi = SSA_NAME_PTR_INFO (ptr)) != NULL + && pi->name_mem_tag) + { + /* PTR has its own memory tag. Use it. */ + add_stmt_operand (&pi->name_mem_tag, s_ann, flags); + } + else + { + /* If PTR is not an SSA_NAME or it doesn't have a name + tag, use its type memory tag. */ + var_ann_t v_ann; + + if (TREE_CODE (ptr) == SSA_NAME) + ptr = SSA_NAME_VAR (ptr); + v_ann = var_ann (ptr); + if (v_ann->type_mem_tag) + add_stmt_operand (&v_ann->type_mem_tag, s_ann, flags); + } + } + } + } /* A subroutine of get_expr_operands to handle INDIRECT_REF, *************** add_stmt_operand (tree *var_p, stmt_ann_ *** 1681,1686 **** --- 1721,1730 ---- append_def (var_p); else append_use (var_p); + + if (flags & opf_mark_abnormal + && TREE_CODE (*var_p) == SSA_NAME) + SSA_NAME_OCCURS_IN_ABNORMAL_PHI (*var_p) = true; } else { Index: gcc/combine.c =================================================================== *** gcc/combine.c.orig 2007-05-19 19:09:46.000000000 +0200 --- gcc/combine.c 2007-09-28 18:14:51.000000000 +0200 *************** can_combine_p (rtx insn, rtx i3, rtx pre *** 1265,1271 **** and it is a pain to update that information. Exception: if source is a constant, moving it later can't hurt. Accept that special case, because it helps -fforce-addr a lot. */ ! || (INSN_CUID (insn) < last_call_cuid && ! CONSTANT_P (src))) return 0; /* DEST must either be a REG or CC0. */ --- 1265,1278 ---- and it is a pain to update that information. Exception: if source is a constant, moving it later can't hurt. Accept that special case, because it helps -fforce-addr a lot. */ ! || (INSN_CUID (insn) < last_call_cuid && ! CONSTANT_P (src)) ! || (flag_preserve_function_arguments ! && REG_P (dest) ! && REG_P (src) ! && GET_CODE (PATTERN (i3)) == PARALLEL ! && GET_CODE (XVECEXP (PATTERN (i3), 0, 0)) == ASM_OPERANDS ! && REG_USERVAR_P (dest) ! && REG_EXPR (dest) != REG_EXPR (src))) return 0; /* DEST must either be a REG or CC0. */ Index: gcc/var-tracking.c =================================================================== *** gcc/var-tracking.c.orig 2007-02-20 11:27:19.000000000 +0100 --- gcc/var-tracking.c 2007-09-28 19:27:29.000000000 +0200 *************** dump_variable (void **slot, void *data A *** 1750,1757 **** int i; location_chain node; ! fprintf (dump_file, " name: %s\n", ! IDENTIFIER_POINTER (DECL_NAME (var->decl))); for (i = 0; i < var->n_var_parts; i++) { fprintf (dump_file, " offset %ld\n", --- 1750,1758 ---- int i; location_chain node; ! fprintf (dump_file, " name: %sD.%u\n", ! IDENTIFIER_POINTER (DECL_NAME (var->decl)), ! DECL_UID (var->decl)); for (i = 0; i < var->n_var_parts; i++) { fprintf (dump_file, " offset %ld\n", Index: gcc/recog.c =================================================================== *** gcc/recog.c.orig 2005-12-22 13:49:10.000000000 +0100 --- gcc/recog.c 2007-10-05 14:52:54.000000000 +0200 *************** num_changes_pending (void) *** 336,341 **** --- 336,369 ---- return num_changes; } + /* If we want to preserve arguments to inlined functions we need + to preserve some asm operands. We know we changed OLD into NEW + in an asm instruction. Return 1 if this wasn't okay, 0 otherwise. */ + static int + invalid_asm_change (rtx old, rtx new) + { + tree e1, e2; + /* It is invalid to change a REG which had an associated decl expression, + with something which has a different expression. It's okay, though, + to change a REG with no expression to some other. */ + if (GET_CODE (old) == SUBREG) + old = SUBREG_REG (old); + if (GET_CODE (new) == SUBREG) + new = SUBREG_REG (new); + /* If we replaced something else than a REG or MEM, it's okay. */ + if (!REG_P (old) && !MEM_P (old)) + return 0; + /* If we replaced a REG or MEM with something else, we are going + to loose that information. */ + if (!REG_P (new) && !MEM_P (new)) + return 1; + e1 = REG_P (old) ? REG_EXPR (old) : MEM_EXPR (old); + if (!e1) + return 0; + e2 = REG_P (new) ? REG_EXPR (new) : MEM_EXPR (new); + return e1 != e2; + } + /* Tentatively apply the changes numbered NUM and up. Return 1 if all changes are valid, zero otherwise. */ *************** verify_changes (int num) *** 368,373 **** --- 396,405 ---- if (! memory_address_p (GET_MODE (object), XEXP (object, 0))) break; } + else if (flag_preserve_function_arguments + && asm_noperands (PATTERN (object)) >= 0 + && invalid_asm_change (changes[i].old, *changes[i].loc)) + break; else if (insn_invalid_p (object)) { rtx pat = PATTERN (object); ++++++ gcc-4.1.3-20070724.tar.bz2 -> gcc-4.1.3-20071030.tar.bz2 ++++++ gcc41/gcc-4.1.3-20070724.tar.bz2 /mounts/work_src_done/STABLE/gcc41/gcc-4.1.3-20071030.tar.bz2 differ: byte 11, line 1 ++++++ gcc.spec.in ++++++ --- gcc41/gcc.spec.in 2007-08-10 16:51:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc41/gcc.spec.in 2007-10-30 15:08:50.000000000 +0100 @@ -133,7 +133,7 @@ URL: http://gcc.gnu.org/ License: GPL -Version: 4.1.3_20070724 +Version: 4.1.3_20071030 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -213,6 +213,7 @@ Patch72: Wprofile-mismatch.patch Patch73: parentheses-mathematical-5.diff Patch74: Wuninitialized.patch +Patch75: fpreserve-function-arguments4.patch # Greyhound (aka AMD Family 10h) support Patch200: gcc-amdfam10-suse-1.patch Patch201: gcc-amdfam10-suse-2.patch @@ -851,6 +852,7 @@ %patch72 %patch73 %patch74 +%patch75 %patch200 %patch201 %patch202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 blackbox
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package blackbox checked in at Wed Oct 31 12:25:59 CET 2007. -------- --- blackbox/blackbox.changes 2007-05-03 18:26:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/blackbox/blackbox.changes 2007-10-31 10:54:04.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Oct 31 10:53:45 CET 2007 - prusnak(a)suse.cz + +- added missing <string.h> and <stdlib.h> includes (includes.patch) + +------------------------------------------------------------------- New: ---- blackbox-0.70.1-includes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blackbox.spec ++++++ --- /var/tmp/diff_new_pack.j18391/_old 2007-10-31 12:24:19.000000000 +0100 +++ /var/tmp/diff_new_pack.j18391/_new 2007-10-31 12:24:19.000000000 +0100 @@ -12,19 +12,20 @@ Name: blackbox BuildRequires: freetype2-devel gcc-c++ pkgconfig update-desktop-files xorg-x11-devel -License: BSD License and BSD-like +License: BSD 3-Clause Group: System/GUI/Other Provides: windowmanager -Autoreqprov: on +AutoReqProv: on Version: 0.70.1 -Release: 55 +Release: 105 Summary: A Window Manager with the X Window System as the Only Dependency -URL: http://blackboxwm.sf.net -Source: %name-%version.tar.bz2 +Url: http://blackboxwm.sf.net +Source: %{name}-%{version}.tar.bz2 Source1: slit Source2: suse-blackboxmenu -Source3: %name.desktop +Source3: %{name}.desktop Patch0: blackbox-lib64.patch +Patch1: %{name}-0.70.1-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /bin/cp Requires: xdg-menu @@ -65,22 +66,23 @@ %prep %setup -q %patch0 +%patch1 cp %{S:1} . %build autoreconf -fi -CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \ - --prefix=/usr \ - --mandir=%_mandir --libdir=%_libdir +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +%configure export LC_CTYPE="en_US"; make %install make "DESTDIR=$RPM_BUILD_ROOT" install -install -m 644 %{S:2} $RPM_BUILD_ROOT/usr/share/blackbox/menu +rm -f $RPM_BUILD_ROOT%{_libdir}/libbt.la +install -m 644 %{S:2} $RPM_BUILD_ROOT%{_datadir}/blackbox/menu # install kdm/gdm entry -install -m 0755 -d $RPM_BUILD_ROOT/usr/share/xsessions/ -install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/xsessions/ -%suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/%name.desktop +install -m 0755 -d $RPM_BUILD_ROOT%{_datadir}/xsessions/ +install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/xsessions/ +%suse_update_desktop_file $RPM_BUILD_ROOT%{_datadir}/xsessions/%{name}.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -88,26 +90,26 @@ %files %defattr(-,root,root) %doc AUTHORS ChangeLog* LICENSE README TODO README.bbtools README.bsetbg slit data/README.menu data/README.style -%dir /usr/share/blackbox -%config(noreplace) /usr/share/blackbox/menu -%config(noreplace) /usr/share/blackbox/styles -%_bindir/* -%_mandir/man1/* -/usr/share/xsessions/%name.desktop +%dir %{_datadir}/blackbox +%config(noreplace) %{_datadir}/blackbox/menu +%config(noreplace) %{_datadir}/blackbox/styles +%{_bindir}/* +%{_mandir}/man1/* +%{_datadir}/xsessions/%{name}.desktop %files devel %defattr(-, root, root, 0755) %{_includedir}/bt/ %{_libdir}/libbt.a -%{_libdir}/libbt.la %{_libdir}/pkgconfig/libbt.pc %pre if [ -d usr/share/Blackbox -a ! -d usr/share/blackbox ]; then cp -a usr/share/Blackbox usr/share/blackbox fi - %changelog +* Wed Oct 31 2007 - prusnak(a)suse.cz +- added missing <string.h> and <stdlib.h> includes (includes.patch) * Thu May 03 2007 - prusnak(a)suse.cz - changed expat to libexpat-devel in Requires of devel subpackage * Mon Mar 05 2007 - mmarek(a)suse.cz ++++++ blackbox-0.70.1-includes.patch ++++++ --- lib/Image.cc +++ lib/Image.cc @@ -44,6 +44,7 @@ #include <math.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> // #define COLORTABLE_DEBUG // #define MITSHM_DEBUG --- lib/Resource.cc +++ lib/Resource.cc @@ -29,7 +29,7 @@ #include <X11/Xresource.h> #include <stdio.h> - +#include <string.h> bt::Resource::Resource(void) : db(NULL) --- src/BlackboxResource.cc +++ src/BlackboxResource.cc @@ -33,6 +33,7 @@ #include <X11/Xutil.h> #include <X11/cursorfont.h> +#include <string.h> BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { screen_resources = 0; --- src/Screen.cc +++ src/Screen.cc @@ -47,7 +47,7 @@ #include <assert.h> #include <ctype.h> #include <dirent.h> - +#include <string.h> static bool running = true; static int anotherWMRunning(Display *, XErrorEvent *) { --- src/ScreenResource.cc +++ src/ScreenResource.cc @@ -32,7 +32,7 @@ #include <Resource.hh> #include <assert.h> - +#include <string.h> static const int iconify_width = 9; static const int iconify_height = 9; --- src/main.cc +++ src/main.cc @@ -35,7 +35,7 @@ #include "../version.h" #include <stdio.h> - +#include <string.h> static void showHelp(int exitval) { // print version - this should not be localized! --- util/bsetroot.cc +++ util/bsetroot.cc @@ -31,7 +31,8 @@ #include <X11/Xatom.h> #include <stdio.h> - +#include <stdlib.h> +#include <string.h> // ignore all X errors static int x11_error(::Display *, XErrorEvent *) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 audit
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package audit checked in at Wed Oct 31 12:24:10 CET 2007. -------- --- audit/audit.changes 2007-10-10 23:19:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/audit/audit.changes 2007-10-31 07:10:34.100751000 +0100 @@ -1,0 +2,7 @@ +Wed Oct 31 07:08:38 CET 2007 - tonyj(a)suse.de + +- Incorporate 1 more Redhat fixe post 1.6.2 +- Go back to 10.2 behaviour wrt to starting in disabled state. + This time using patch submitted upstream, fix for #Bug 333739 + +------------------------------------------------------------------- New: ---- audit-startup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audit-libs-python.spec ++++++ --- /var/tmp/diff_new_pack.R15694/_old 2007-10-31 12:22:49.000000000 +0100 +++ /var/tmp/diff_new_pack.R15694/_new 2007-10-31 12:22:49.000000000 +0100 @@ -15,7 +15,7 @@ BuildRequires: audit-devel gcc-c++ pkg-config python-devel swig Summary: Python Bindings for libaudit Version: 1.6.2 -Release: 1 +Release: 10 License: GPL v2 or later Group: System/Monitoring Url: http://people.redhat.com/sgrubb/audit/ ++++++ audit.spec ++++++ --- /var/tmp/diff_new_pack.R15694/_old 2007-10-31 12:22:49.000000000 +0100 +++ /var/tmp/diff_new_pack.R15694/_new 2007-10-31 12:22:49.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: gcc-c++ Summary: User Space Tools for 2.6 Kernel Auditing Version: 1.6.2 -Release: 1 +Release: 4 License: GPL v2 or later Group: System/Monitoring Url: http://people.redhat.com/sgrubb/audit/ @@ -24,6 +24,7 @@ Patch0: audit-no_sca.patch Patch1: audit-no_python.patch Patch2: audit-1.6.2-bugs.patch +Patch3: audit-startup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-libs = %{version}-%{release} PreReq: %insserv_prereq %fillup_prereq @@ -56,7 +57,7 @@ %package devel Summary: Header files and static library for libaudit -License: LGPL v2 or later +License: LGPL v2.1 or later Group: System/Monitoring Requires: %{name}-libs = %{version}-%{release} @@ -76,6 +77,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build #autoreconf -iv --install @@ -194,6 +196,10 @@ %dir %attr(700,root,root) /var/log/audit %ghost %config(noreplace) /var/log/audit/audit.log %changelog +* Wed Oct 31 2007 - tonyj(a)suse.de +- Incorporate 1 more Redhat fixe post 1.6.2 +- Go back to 10.2 behaviour wrt to starting in disabled state. + This time using patch submitted upstream, fix for #Bug 333739 * Wed Oct 10 2007 - tonyj(a)suse.de - Upgrade to 1.6.2 Plus two bugs discovered in Fedora, will be fixed in 1.6.3 ++++++ audit-1.6.2-bugs.patch ++++++ --- /var/tmp/diff_new_pack.R15694/_old 2007-10-31 12:22:49.000000000 +0100 +++ /var/tmp/diff_new_pack.R15694/_new 2007-10-31 12:22:49.000000000 +0100 @@ -2,10 +2,22 @@ Subject: Patches for 1.6.2 Upsteam: yes (in 1.6.3) -Misc patches for 1.6.2 audit +Misc patches for 1.6.2 audit (from Steve Grubb) ---- audit-1.6.2.orig/lib/lookup_table.c 2007-10-05 10:30:25.000000000 -0400 -+++ audit-1.6.2/lib/lookup_table.c 2007-10-05 10:32:01.000000000 -0400 +diff -urp audit-1.6.2.orig/audisp/audispd.c audit-1.6.2/audisp/audispd.c +--- audit-1.6.2.orig/audisp/audispd.c 2007-10-17 13:56:22.000000000 -0400 ++++ audit-1.6.2/audisp/audispd.c 2007-10-17 14:13:49.000000000 -0400 +@@ -369,7 +369,6 @@ int main(int argc, char *argv[]) + conf = plist_get_cur(&plugin_conf); + while (conf) { + free_pconfig(conf->p); +- free(conf->p); + conf = plist_next(&plugin_conf); + } + plist_clear(&plugin_conf); +diff -urp audit-1.6.2.orig/lib/lookup_table.c audit-1.6.2/lib/lookup_table.c +--- audit-1.6.2.orig/lib/lookup_table.c 2007-10-17 13:56:22.000000000 -0400 ++++ audit-1.6.2/lib/lookup_table.c 2007-10-17 13:56:49.000000000 -0400 @@ -483,7 +483,7 @@ int audit_name_to_msg_type(const char *m strncpy(buf, msg_type + 8, len); errno = 0; @@ -15,10 +27,34 @@ errno = 0; return strtol(msg_type, NULL, 10); } - ---- audit-1.6.2.orig/src/auditd.c 2007-10-05 10:31:35.000000000 -0400 -+++ audit-1.6.2/src/auditd.c 2007-10-05 10:30:04.000000000 -0400 -@@ -135,8 +135,8 @@ static void distribute_event(struct audi +diff -urp audit-1.6.2.orig/lib/msg_typetab.h audit-1.6.2/lib/msg_typetab.h +--- audit-1.6.2.orig/lib/msg_typetab.h 2007-10-17 13:56:22.000000000 -0400 ++++ audit-1.6.2/lib/msg_typetab.h 2007-10-17 13:57:27.000000000 -0400 +@@ -92,7 +92,7 @@ _S(AUDIT_KERNEL_OTHER, "KE + _S(AUDIT_FD_PAIR, "FD_PAIR" ) + _S(AUDIT_OBJ_PID, "OBJ_PID" ) + _S(AUDIT_TTY, "TTY" ) +-//_S(AUDIT_EOE, "EOE" ) ++_S(AUDIT_EOE, "EOE" ) + _S(AUDIT_AVC, "AVC" ) + _S(AUDIT_SELINUX_ERR, "SELINUX_ERR" ) + _S(AUDIT_AVC_PATH, "AVC_PATH" ) +diff -urp audit-1.6.2.orig/src/auditd.c audit-1.6.2/src/auditd.c +--- audit-1.6.2.orig/src/auditd.c 2007-10-17 13:56:22.000000000 -0400 ++++ audit-1.6.2/src/auditd.c 2007-10-17 13:59:32.000000000 -0400 +@@ -127,16 +127,18 @@ static void distribute_event(struct audi + + /* End of Event is for realtime interface - skip local logging of it */ + if (rep->reply.type != AUDIT_EOE) { ++ int yield = rep->reply.type <= AUDIT_LAST_DAEMON && ++ rep->reply.type >= AUDIT_FIRST_DAEMON ? 1 : 0; ++ + /* Write to local disk */ + enqueue_event(rep); +- if (rep->reply.type <= AUDIT_LAST_DAEMON && +- rep->reply.type >= AUDIT_FIRST_DAEMON) ++ if (yield) + pthread_yield(); /* Let other thread try to log it. */ } /* Last chance to send...maybe the pipe is empty now. */ ++++++ auditd.init ++++++ --- audit/auditd.init 2007-05-02 14:23:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/audit/auditd.init 2007-10-30 22:09:46.229690000 +0100 @@ -98,6 +98,10 @@ case "$1" in start) echo -n "Starting auditd " + if [ "$AUDITD_DISABLE_CONTEXTS" == "yes" ] ; then + EXTRAOPTIONS="$EXTRAOPTIONS -s disable" + fi + ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. startproc $AUDITD_BIN $EXTRAOPTIONS ++++++ auditd.sysconfig ++++++ --- audit/auditd.sysconfig 2007-05-02 14:23:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/audit/auditd.sysconfig 2007-10-30 22:09:22.681270000 +0100 @@ -29,3 +29,7 @@ # ## Type: yesno ## Default: yes +# +# This option disables syscall auditing by default. This can also be +# accomplished by auditctl -e. +AUDITD_DISABLE_CONTEXTS="yes" ++++++ audit-startup.patch ++++++ --- audit-1.6.2.orig/docs/auditd.8 +++ audit-1.6.2/docs/auditd.8 @@ -3,7 +3,7 @@ auditd \- The Linux Audit daemon .SH SYNOPSIS .B auditd -.RB [ \-f ]\ [ \-l ]\ [ \-n ] +.RB [ \-f ]\ [ \-l ]\ [ \-n ]\ [ \-s\ disable|enable|nochange ] .SH DESCRIPTION \fBauditd\fP is the userspace component to the Linux Auditing System. It's responsible for writing audit records to the disk. Viewing the logs is done with the .B ausearch @@ -24,6 +24,9 @@ .TP .B \-n no fork. This is useful for running off of inittab +.TP +.B \-s=\fIENABLE_STATE\fR +specify when starting if auditd should change the current value for the kernel enabled flag. Valid values for ENABLE_STATE are "disable", "enable" or "nochange". The default is to enable (and disable when auditd terminates). The value of the enabled flag may be changed during the lifetime of auditd using 'auditctl -e'. .SH SIGNALS .TP SIGHUP --- audit-1.6.2.orig/src/auditd.c +++ audit-1.6.2/src/auditd.c @@ -36,6 +36,7 @@ #include <sys/wait.h> #include <fcntl.h> #include <pthread.h> +#include <getopt.h> #include "libaudit.h" #include "auditd-config.h" @@ -65,13 +66,19 @@ static void clean_exit(void); static int get_reply(int fd, struct audit_reply *rep, int seq); +enum startup_state {startup_disable=0, startup_enable, startup_nochange, startup_INVALID}; +static const char *startup_states[] = {"disable", "enable", "nochange"}; /* * Output a usage message */ static void usage(void) { - puts("Usage: auditd [ -f -l -n ]"); + fprintf(stderr, "Usage: auditd [-f] [-l] [-n] [-s %s|%s|%s]\n", + startup_states[startup_disable], + startup_states[startup_enable], + startup_states[startup_nochange]); + exit(2); } @@ -308,26 +315,56 @@ struct rlimit limit; int hup_info_requested = 0, usr1_info_requested = 0; int i; + int opt_foreground = 0, opt_allow_links = 0; + enum startup_state opt_startup = startup_enable; + int c; + extern char *optarg; + extern int optind; /* Get params && set mode */ - config.daemonize = D_BACKGROUND; - if (argc > 1) { - for (i=1; i<argc; i++) { - if (strcmp(argv[i], "-f") == 0) - config.daemonize = D_FOREGROUND; - else if (strcmp(argv[i], "-l") == 0) - set_allow_links(1); - else if (strcmp(argv[i], "-n") == 0) - do_fork = 0; - else + while ((c = getopt(argc, argv, "flns:")) != -1) { + switch (c) { + case 'f': + opt_foreground = 1; + break; + case 'l': + opt_allow_links=1; + break; + case 'n': + do_fork = 0; + break; + case 's': + for (i=0; i<startup_INVALID; i++) { + if (strncmp(optarg, startup_states[i], + strlen(optarg)) == 0) { + opt_startup = i; + break; + } + } + if (i == startup_INVALID) { + fprintf(stderr, "unknown startup mode '%s'\n", + optarg); usage(); + } + break; + default: + usage(); } } - // Make paramemters take effect - if (config.daemonize == D_FOREGROUND) + /* check for trailing command line following options */ + if (optind < argc) { + usage(); + } + + if (opt_allow_links) + set_allow_links(1); + + if (opt_foreground) { + config.daemonize = D_FOREGROUND; set_aumessage_mode(MSG_STDERR, DBG_YES); - else { + } else { + config.daemonize = D_BACKGROUND; set_aumessage_mode(MSG_SYSLOG, DBG_NO); (void) umask( umask( 077 ) | 022 ); } @@ -472,8 +509,9 @@ /* Now tell parent that everything went OK */ tell_parent(SUCCESS); - /* Enable auditing just in case it was off */ - if (audit_set_enabled(fd, 1) < 0) { + /* Depending on value of opt_startup (-s) set initial audit state */ + if (opt_startup != startup_nochange && + audit_set_enabled(fd, (int)opt_startup) < 0) { char emsg[DEFAULT_BUF_SZ]; snprintf(emsg, sizeof(emsg), "auditd error halt, auid=%u pid=%d res=failed", @@ -481,15 +519,19 @@ stop = 1; //FIXME add subj send_audit_event(AUDIT_DAEMON_ABORT, emsg); - audit_msg(LOG_ERR, "Unable to enable auditing, exiting"); + audit_msg(LOG_ERR, + "Unable to set intitial audit startup state to '%s', exiting", + startup_states[opt_startup]); close_down(); if (pidfile) unlink(pidfile); shutdown_dispatcher(); return 1; } - audit_msg(LOG_NOTICE, "Init complete, auditd %s listening for events", - VERSION); + audit_msg(LOG_NOTICE, + "Init complete, auditd %s listening for events (startup state %s)", + VERSION, + startup_states[opt_startup]); /* Parent should be gone by now... */ if (do_fork) @@ -603,6 +645,9 @@ /* Write message to log that we are going down */ int rc; + if (opt_startup == startup_enable) { + audit_set_enabled(fd, (int)startup_disable); + } rc = audit_request_signal_info(fd); if (rc > 0) { struct audit_reply trep; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 wine
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package wine checked in at Wed Oct 31 03:04:36 CET 2007. -------- --- arch/i386/wine/wine.changes 2007-10-26 20:55:50.000000000 +0200 +++ /mounts/work_users/ro/STABLE/wine/wine.changes 2007-10-31 02:04:30.033518000 +0100 @@ -1,0 +2,5 @@ +Wed Oct 31 02:04:21 CET 2007 - ro(a)suse.de + +- include assert.h for alsa source + +------------------------------------------------------------------- New: ---- wine-assert.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.X30511/_old 2007-10-31 03:04:24.000000000 +0100 +++ /var/tmp/diff_new_pack.X30511/_new 2007-10-31 03:04:24.000000000 +0100 @@ -16,13 +16,14 @@ Group: System/Emulators/PC AutoReqProv: on Version: 0.9.48 -Release: 1 +Release: 3 Summary: An MS Windows Emulator Url: http://www.winehq.com Source0: wine-%version.tar.bz2 Source1: http://kegel.com/wine/winetricks Source3: README.SuSE Source4: wine.desktop +Patch: wine-assert.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,6 +55,7 @@ %prep %setup -q +%patch # cp %{S:3} . # @@ -114,6 +116,8 @@ %{_libdir}/wine/*.a /usr/share/aclocal/wine.m4 %changelog +* Wed Oct 31 2007 - ro(a)suse.de +- include assert.h for alsa source * Fri Oct 26 2007 - meissner(a)suse.de - Upgraded to upstream 0.9.48: - Still more fixes for regression test failures. ++++++ wine-assert.patch ++++++ --- dlls/winealsa.drv/dsoutput.c +++ dlls/winealsa.drv/dsoutput.c @@ -45,6 +45,7 @@ #ifdef HAVE_SYS_MMAN_H # include <sys/mman.h> #endif +#include <assert.h> #include "windef.h" #include "winbase.h" #include "wingdi.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 seq24
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package seq24 checked in at Wed Oct 31 02:29:37 CET 2007. -------- --- seq24/seq24.changes 2007-10-22 14:40:46.000000000 +0200 +++ /mounts/work_users/ro/STABLE/seq24/seq24.changes 2007-10-31 01:52:46.774339000 +0100 @@ -1,0 +2,5 @@ +Wed Oct 31 01:52:40 CET 2007 - ro(a)suse.de + +- include assert.h for alsa source + +------------------------------------------------------------------- New: ---- seq24-assert.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seq24.spec ++++++ --- /var/tmp/diff_new_pack.i14978/_old 2007-10-31 02:29:32.000000000 +0100 +++ /var/tmp/diff_new_pack.i14978/_new 2007-10-31 02:29:32.000000000 +0100 @@ -14,13 +14,14 @@ BuildRequires: alsa-devel gcc-c++ gtkmm2-devel jack-devel update-desktop-files Summary: A Small, Real-Time MIDI Sequencer Version: 0.8.7 -Release: 128 +Release: 138 License: GPL v2 or later Group: Productivity/Multimedia/Sound/Midi Source: %{name}-%{version}.tar.bz2 Source1: %name.desktop Source2: seq24.png Patch: seq24-gcc43-fixes.diff +Patch1: seq24-assert.patch Url: http://www.filter24.org/seq24/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,6 +38,7 @@ %prep %setup %patch +%patch1 %{?suse_update_config:%{suse_update_config -f}} %build @@ -63,6 +65,8 @@ /usr/share/applications/*.desktop %{_datadir}/pixmaps/*.png %changelog +* Wed Oct 31 2007 - ro(a)suse.de +- include assert.h for alsa source * Mon Oct 22 2007 - tiwai(a)suse.de - fix build with gcc 4.3 * Thu Oct 12 2006 - tiwai(a)suse.de ++++++ seq24-assert.patch ++++++ --- src/perform.cpp +++ src/perform.cpp @@ -23,6 +23,7 @@ #include <stdio.h> #include <time.h> #include <sched.h> +#include <assert.h> //For keys #include <gtkmm/accelkey.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdeaccessibility4
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package kdeaccessibility4 checked in at Wed Oct 31 02:27:15 CET 2007. -------- --- KDE/kdeaccessibility4/kdeaccessibility4.changes 2007-10-16 17:01:11.000000000 +0200 +++ /mounts/work_users/ro/STABLE/kdeaccessibility4/kdeaccessibility4.changes 2007-10-31 01:46:55.101566000 +0100 @@ -1,0 +2,5 @@ +Wed Oct 31 01:46:44 CET 2007 - ro(a)suse.de + +- include assert.h in alsaplayer.cpp + +------------------------------------------------------------------- kdeaccessibility4-icons.changes: same change New: ---- kdeaccessibility4-assert.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeaccessibility4-icons.spec ++++++ --- /var/tmp/diff_new_pack.tj5801/_old 2007-10-31 02:24:44.000000000 +0100 +++ /var/tmp/diff_new_pack.tj5801/_new 2007-10-31 02:24:44.000000000 +0100 @@ -19,7 +19,7 @@ Summary: Monochrome Icon Set for KDE Url: http://www.kde.org Version: 3.94.1 -Release: 1 +Release: 11 Source0: kdeaccessibility-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -56,6 +56,8 @@ %doc COPYING COPYING-DOCS /usr/share/icons/mono %changelog +* Wed Oct 31 2007 - ro(a)suse.de +- include assert.h in alsaplayer.cpp * Tue Oct 16 2007 - dmueller(a)suse.de - update to KDE 4.0 beta3 * Tue Oct 02 2007 - stbinner(a)suse.de ++++++ kdeaccessibility4.spec ++++++ --- /var/tmp/diff_new_pack.tj5801/_old 2007-10-31 02:24:45.000000000 +0100 +++ /var/tmp/diff_new_pack.tj5801/_new 2007-10-31 02:24:45.000000000 +0100 @@ -16,13 +16,14 @@ Summary: kdeaccessibility Base Package Url: http://www.kde.org Version: 3.94.1 -Release: 1 +Release: 11 %define rversion 3.94.1 Source0: kdeaccessibility-%rversion.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: kdebase4-runtime Patch: desktop-files.diff +Patch1: kdeaccessibility4-assert.patch Suggests: kde4-kmag Suggests: kde4-kmousetool Suggests: kde4-kmouth @@ -43,6 +44,7 @@ %prep %setup -q -n kdeaccessibility-%rversion %patch +%patch1 %build %cmake_kde4 -d build @@ -252,6 +254,8 @@ %defattr(-,root,root) %doc COPYING COPYING-DOCS %changelog +* Wed Oct 31 2007 - ro(a)suse.de +- include assert.h in alsaplayer.cpp * Tue Oct 16 2007 - dmueller(a)suse.de - update to KDE 4.0 beta3 * Tue Oct 02 2007 - stbinner(a)suse.de ++++++ kdeaccessibility4-assert.patch ++++++ --- kttsd/players/alsaplayer/alsaplayer.cpp +++ kttsd/players/alsaplayer/alsaplayer.cpp @@ -37,6 +37,7 @@ # include <time.h> # endif #endif +#include <assert.h> // Qt includes. #include <QtCore/QDir> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdeaccessibility3
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package kdeaccessibility3 checked in at Wed Oct 31 02:23:57 CET 2007. -------- --- KDE/kdeaccessibility3/kdeaccessibility3.changes 2007-10-15 17:52:11.000000000 +0200 +++ /mounts/work_users/ro/STABLE/kdeaccessibility3/kdeaccessibility3.changes 2007-10-31 01:47:10.853473000 +0100 @@ -1,0 +2,5 @@ +Wed Oct 31 01:47:03 CET 2007 - ro(a)suse.de + +- include assert.h in alsaplayer.cpp + +------------------------------------------------------------------- New: ---- kdeaccessibility3-assert.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeaccessibility3.spec ++++++ --- /var/tmp/diff_new_pack.ym2439/_old 2007-10-31 02:23:20.000000000 +0100 +++ /var/tmp/diff_new_pack.ym2439/_new 2007-10-31 02:23:20.000000000 +0100 @@ -17,7 +17,7 @@ Summary: Tools for Handicapped People to Use the GUI BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 3.5.8 -Release: 1 +Release: 10 Obsoletes: kmag Provides: kmag Url: http://www.kde.org @@ -34,6 +34,7 @@ Source0: kdeaccessibility-%{version}.tar.bz2 Source1: kaccessrc #Patch: 3_5_BRANCH.diff +Patch1: kdeaccessibility3-assert.patch %description KMag: Magnifies a part of the screen. KMouseTool: Clicks the mouse for @@ -51,6 +52,7 @@ %prep %setup -q -n kdeaccessibility-%{version} #%patch +%patch1 . /etc/opt/kde3/common_options update_admin @@ -147,6 +149,8 @@ %{_mandir}/man1/kmousetool* %{_mandir}/man1/kmouth* %changelog +* Wed Oct 31 2007 - ro(a)suse.de +- include assert.h in alsaplayer.cpp * Tue Oct 09 2007 - stbinner(a)suse.de - update to 3.5.8, just version bump * Sat Aug 04 2007 - stbinner(a)suse.de ++++++ kdeaccessibility3-assert.patch ++++++ --- kttsd/players/alsaplayer/alsaplayer.cpp +++ kttsd/players/alsaplayer/alsaplayer.cpp @@ -37,6 +37,7 @@ # include <time.h> # endif #endif +#include <assert.h> // Qt includes. #include <qdir.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdebase4-runtime
by root＠Hilbert.suse.de 31 Oct '07

31 Oct '07

Hello community, here is the log from the commit of package kdebase4-runtime checked in at Wed Oct 31 02:20:25 CET 2007. -------- New Changes file: --- /dev/null 2006-09-20 18:56:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2007-10-31 02:19:05.838100000 +0100 @@ -0,0 +1,142 @@ +------------------------------------------------------------------- +Wed Oct 31 02:18:55 CET 2007 - dmueller(a)suse.de + +- update to 3.95.0 + +------------------------------------------------------------------- +Thu Oct 18 16:35:20 CEST 2007 - dmueller(a)suse.de + +- update to 3.94.1 + +------------------------------------------------------------------- +Thu Oct 18 00:41:22 CEST 2007 - ro(a)suse.de + +- fix build: add directory to filelist + +------------------------------------------------------------------- +Mon Oct 8 23:06:27 CEST 2007 - dmueller(a)suse.de + +- update to KDE 4.0 Beta3 + +------------------------------------------------------------------- +Tue Oct 2 14:36:09 CEST 2007 - stbinner(a)suse.de + +- update to 3.93.0.svn720100 + +------------------------------------------------------------------ +Wed Sep 26 13:50:40 CEST 2007 - stbinner(a)suse.de + +- update to 3.93.0.svn717244 + +-------------------------------------------------------------------- +Fri Sep 21 23:12:54 CEST 2007 - stbinner(a)suse.de + +- don't remove icons anymore after build check got fixed (#307017) + +------------------------------------------------------------------- +Thu Sep 13 14:20:52 CEST 2007 - stbinner(a)suse.de + +- update to 3.93.0.svn712052 + +------------------------------------------------------------------- +Mon Sep 10 14:20:41 CEST 2007 - dmueller(a)suse.de + +- don't set $LANGUAGE in konsole (#305210) + +------------------------------------------------------------------- +Sat Sep 1 19:01:56 CEST 2007 - stbinner(a)suse.de + +- update to KDE 4.0 Beta 2 + +------------------------------------------------------------------- +Thu Aug 23 18:21:45 CEST 2007 - stbinner(a)suse.de + +- update to 3.92.0.svn703920 + +------------------------------------------------------------------- +Thu Aug 16 14:25:10 CEST 2007 - stbinner(a)suse.de + +- update to 3.92.0.svn700775 + +------------------------------------------------------------------- +Wed Aug 15 10:44:40 CEST 2007 - stbinner(a)suse.de + +- fix more file conflicts + +------------------------------------------------------------------- +Thu Aug 9 09:57:10 CEST 2007 - stbinner(a)suse.de + +- update to 3.92.0.svn697325 +- fix file conflicts + +------------------------------------------------------------------- +Sat Jul 28 22:58:28 CEST 2007 - stbinner(a)suse.de + +- update to KDE 4.0 Beta 1 + +------------------------------------------------------------------- +Thu Jul 19 11:55:49 CEST 2007 - stbinner(a)suse.de + +- don't show System Settings on non-KDE/KDE3 desktop + +------------------------------------------------------------------- +Mon Jul 16 14:47:51 CEST 2007 - stbinner(a)suse.de + +- use the non generic lib version for libkonq + +------------------------------------------------------------------- +Thu Jul 12 15:36:00 CEST 2007 - stbinner(a)suse.de + +- update to 3.91.0.svn672298 + +------------------------------------------------------------------- +Sat Jun 23 10:29:31 CEST 2007 - stbinner(a)suse.de + +- update to 3.90.1.svn679137 + +------------------------------------------------------------------- +Fri Jun 8 09:00:47 CEST 2007 - stbinner(a)suse.de + +- update to 3.90.1.svn670093 + +------------------------------------------------------------------- +Mon Jun 4 18:11:58 CEST 2007 - stbinner(a)suse.de + +- fix build + +------------------------------------------------------------------- +Fri Jun 1 13:31:58 CEST 2007 - coolo(a)suse.de + +- simplify spec file by using macros from kde4-filesystem + +------------------------------------------------------------------- +Wed May 23 16:09:43 CEST 2007 - stbinner(a)suse.de + +- run %fdupes +- fix prefix of two bins + +------------------------------------------------------------------- +Wed May 16 21:32:29 CEST 2007 - olh(a)suse.de + +- Buildrequires libusb -> libusb-devel + +------------------------------------------------------------------- +Tue May 15 16:41:21 CEST 2007 - stbinner(a)suse.de + +- show .desktop files of kdebase4-runtime only in a KDE session + +------------------------------------------------------------------- +Sat May 12 07:05:12 CEST 2007 - stbinner(a)suse.de + +- libkdeinit -> libkdeinit4 + +------------------------------------------------------------------- +Thu May 10 09:54:10 CEST 2007 - stbinner(a)suse.de + +- fix package file conflicts + +------------------------------------------------------------------- +Mon May 7 09:06:21 CEST 2007 - stbinner(a)suse.de + +- initial package in abuild + New Changes file: --- /dev/null 2006-09-20 18:56:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/oxygen-icon-theme.changes 2007-10-26 13:42:45.000000000 +0200 @@ -0,0 +1,127 @@ +------------------------------------------------------------------- +Mon Oct 8 23:06:27 CEST 2007 - dmueller(a)suse.de + +- update to KDE 4.0 Beta3 + +------------------------------------------------------------------- +Tue Oct 2 14:36:09 CEST 2007 - stbinner(a)suse.de + +- update to 3.93.0.svn720100 + +------------------------------------------------------------------ +Wed Sep 26 13:50:40 CEST 2007 - stbinner(a)suse.de + +- update to 3.93.0.svn717244 + +-------------------------------------------------------------------- +Fri Sep 21 23:12:54 CEST 2007 - stbinner(a)suse.de + +- don't remove icons anymore after build check got fixed (#307017) + +------------------------------------------------------------------- +Thu Sep 13 14:20:52 CEST 2007 - stbinner(a)suse.de + +- update to 3.93.0.svn712052 + +------------------------------------------------------------------- +Mon Sep 10 14:20:41 CEST 2007 - dmueller(a)suse.de + +- don't set $LANGUAGE in konsole (#305210) + +------------------------------------------------------------------- +Sat Sep 1 19:01:56 CEST 2007 - stbinner(a)suse.de + +- update to KDE 4.0 Beta 2 + +------------------------------------------------------------------- +Thu Aug 23 18:21:45 CEST 2007 - stbinner(a)suse.de + +- update to 3.92.0.svn703920 + +------------------------------------------------------------------- +Thu Aug 16 14:25:10 CEST 2007 - stbinner(a)suse.de + +- update to 3.92.0.svn700775 + +------------------------------------------------------------------- +Wed Aug 15 10:44:40 CEST 2007 - stbinner(a)suse.de + +- fix more file conflicts + +------------------------------------------------------------------- +Thu Aug 9 09:57:10 CEST 2007 - stbinner(a)suse.de + +- update to 3.92.0.svn697325 +- fix file conflicts + +------------------------------------------------------------------- +Sat Jul 28 22:58:28 CEST 2007 - stbinner(a)suse.de + +- update to KDE 4.0 Beta 1 + +------------------------------------------------------------------- +Thu Jul 19 11:55:49 CEST 2007 - stbinner(a)suse.de + +- don't show System Settings on non-KDE/KDE3 desktop + +------------------------------------------------------------------- +Mon Jul 16 14:47:51 CEST 2007 - stbinner(a)suse.de + +- use the non generic lib version for libkonq + +------------------------------------------------------------------- +Thu Jul 12 15:36:00 CEST 2007 - stbinner(a)suse.de + +- update to 3.91.0.svn672298 + +------------------------------------------------------------------- +Sat Jun 23 10:29:31 CEST 2007 - stbinner(a)suse.de + +- update to 3.90.1.svn679137 + +------------------------------------------------------------------- +Fri Jun 8 09:00:47 CEST 2007 - stbinner(a)suse.de + +- update to 3.90.1.svn670093 + +------------------------------------------------------------------- +Mon Jun 4 18:11:58 CEST 2007 - stbinner(a)suse.de + +- fix build + +------------------------------------------------------------------- +Fri Jun 1 13:31:58 CEST 2007 - coolo(a)suse.de + +- simplify spec file by using macros from kde4-filesystem + +------------------------------------------------------------------- +Wed May 23 16:09:43 CEST 2007 - stbinner(a)suse.de + +- run %fdupes +- fix prefix of two bins + +------------------------------------------------------------------- +Wed May 16 21:32:29 CEST 2007 - olh(a)suse.de + +- Buildrequires libusb -> libusb-devel + +------------------------------------------------------------------- +Tue May 15 16:41:21 CEST 2007 - stbinner(a)suse.de + +- show .desktop files of kdebase4-runtime only in a KDE session + +------------------------------------------------------------------- +Sat May 12 07:05:12 CEST 2007 - stbinner(a)suse.de + +- libkdeinit -> libkdeinit4 + +------------------------------------------------------------------- +Thu May 10 09:54:10 CEST 2007 - stbinner(a)suse.de + +- fix package file conflicts + +------------------------------------------------------------------- +Mon May 7 09:06:21 CEST 2007 - stbinner(a)suse.de + +- initial package in abuild + New: ---- kdebase4-runtime.changes kdebase4-runtime.spec kdebase-runtime-3.95.0.tar.bz2 oxygen-icon-theme.changes oxygen-icon-theme.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ # # spec file for package kdebase4-runtime (Version 3.95.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: kdebase4-runtime BuildRequires: NetworkManager-devel bluez-libs libkdepimlibs4-devel libqimageblitz-devel BuildRequires: libsmbclient-devel libsoprano-devel libxklavier-devel xine-devel %if %suse_version > 1020 BuildRequires: fdupes libusb-devel %else BuildRequires: libusb %endif License: GPL v2 or later Group: System/GUI/KDE Summary: The KDE Runtime Components Url: http://www.kde.org/ Version: 3.95.0 Release: 1 %define rversion 3.95.0 Source0: kdebase-runtime-%rversion.tar.bz2 #Source1: _upstream #Source2: rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: oxygen-icon-theme >= %version Requires: kde4-kdialog Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) %description This package contains all run-time dependencies of KDE applications. Authors: -------- The KDE Team <kde(a)kde.org> %prep %setup -q -n kdebase-runtime-%rversion %build %cmake_kde4 -d build %make_jobs %install cd build %makeinstall rm -rf $RPM_BUILD_ROOT/usr/share/icons/hicolor/index.theme rm -rf $RPM_BUILD_ROOT/usr/share/icons/oxygen rm -rf $RPM_BUILD_ROOT/usr/share/wallpapers mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus mv $RPM_BUILD_ROOT/usr/etc/xdg/menus/kde-information.menu $RPM_BUILD_ROOT/etc/xdg/menus/kde4-information.menu %suse_update_desktop_file knetattach System Network %suse_update_desktop_file Help Documentation Viewer %if %suse_version > 1020 %fdupes -s $RPM_BUILD_ROOT %endif %kde_post_install %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %verifyscript %verify_permissions -e /usr/bin/kcheckpass %verify_permissions -e /usr/bin/kdesud %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /usr/bin/kcmshell4 /usr/bin/kdebugdialog /usr/bin/kde-cp /usr/bin/kde-mv /usr/bin/kde-open /usr/bin/kfile4 /usr/bin/khelpcenter /usr/bin/khotnewstuff4 /usr/bin/kinfocenter /usr/bin/kioclient %_libdir/kde4/libexec/kioexec /usr/bin/kmimetypefinder /usr/bin/knotify4 /usr/bin/kquitapp /usr/bin/kreadconfig /usr/bin/kstart /usr/bin/ktrash /usr/bin/kuiserver /usr/bin/kwriteconfig /usr/bin/kde4-menu /usr/bin/ktraderclient /usr/bin/ksvgtopng /etc/xdg/menus/kde4-information.menu %_libdir/kde4/kcm_phononxine.so %_libdir/kde4/phonon_xine.so %_libdir/kde4/kded_soliduiserver.so %_libdir/kde4/cursorthumbnail.so %_libdir/kde4/djvuthumbnail.so %_libdir/kde4/htmlthumbnail.so %_libdir/kde4/imagethumbnail.so %_libdir/kde4/kcm_cgi.so %_libdir/kde4/kcm_componentchooser.so %_libdir/kde4/kcm_icons.so %_libdir/kde4/kcm_ioslaveinfo.so %_libdir/kde4/kcm_kded.so %_libdir/kde4/kcm_kdnssd.so %_libdir/kde4/kcm_knotify.so %_libdir/kde4/kcm_locale.so %_libdir/kde4/kcm_samba.so %_libdir/kde4/kded_kpasswdserver.so %_libdir/kde4/kded_ktimezoned.so %_libdir/kde4/kded_remotedirnotify.so %_libdir/kde4/kio_about.so %_libdir/kde4/kio_sftp.so %_libdir/kde4/kio_cgi.so %_libdir/kde4/kio_filter.so %_libdir/kde4/kio_finger.so %_libdir/kde4/kio_fish.so %_libdir/kde4/kio_floppy.so %_libdir/kde4/kio_info.so %_libdir/kde4/kio_man.so %_libdir/kde4/kio_nfs.so %_libdir/kde4/kio_remote.so %_libdir/kde4/kio_settings.so %_libdir/kde4/kio_smb.so %_libdir/kde4/kio_archive.so %_libdir/kde4/kio_thumbnail.so %_libdir/kde4/kio_trash.so %_libdir/kde4/librenaudioplugin.so %_libdir/kde4/librenimageplugin.so /usr/share/kde4/services/renaudiodlg.desktop /usr/share/kde4/services/renimagedlg.desktop %_libdir/kde4/libfixhosturifilter.so %_libdir/kde4/libkmanpart.so %_libdir/kde4/libkshorturifilter.so %_libdir/kde4/libkuriikwsfilter.so %_libdir/kde4/libkurisearchfilter.so %_libdir/kde4/liblocaldomainurifilter.so %_libdir/kde4/svgthumbnail.so %_libdir/kde4/textthumbnail.so %_libdir/libkdeinit4_kcmshell4.so %_libdir/libkdeinit4_khelpcenter.so %_libdir/libkdeinit4_kinfocenter.so %_libdir/libkdeinit4_kuiserver.so /usr/share/dbus-1/services/org.kde.knotify.service /usr/share/applications/kde4/Help.desktop /usr/share/applications/kde4/knetattach.desktop %_kde_share_dir/apps/drkonqi %_kde_share_dir/apps/kcm_componentchooser %_kde_share_dir/apps/kcmlocale %_kde_share_dir/apps/kconf_update/kuriikwsfilter.upd %dir %_kde_share_dir/apps/kcontrol %_kde_share_dir/apps/kcontrol/about %dir %_kde_share_dir/apps/kcontrol/pics %_kde_share_dir/apps/kcontrol/pics/play.png %dir %_kde_share_dir/apps/kde %_kde_share_dir/apps/kde/kde.notifyrc %_kde_share_dir/apps/khelpcenter %_kde_share_dir/apps/kinfocenter %_kde_share_dir/apps/kio_finger %_kde_share_dir/apps/kio_info %_kde_share_dir/apps/kio_man %_kde_share_dir/apps/konqueror/dirtree/remote/smb-network.desktop %_kde_share_dir/apps/kuiserver %_kde_share_dir/apps/remoteview %_kde_share_dir/config.kcfg/khelpcenter.kcfg %config %_kde_config_dir/khotnewstuffrc %config %_kde_config_dir/kshorturifilterrc /usr/share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml /usr/share/dbus-1/interfaces/org.kde.KTimeZoned.xml %dir /usr/share/desktop-directories /usr/share/desktop-directories/kde-information.directory /usr/share/icons/crystalsvg/*/apps/energy.* /usr/share/icons/crystalsvg/*/apps/hwinfo.* /usr/share/icons/crystalsvg/*/apps/icons.* /usr/share/icons/crystalsvg/*/apps/iconthemes.* /usr/share/icons/crystalsvg/*/apps/kcmdf.* /usr/share/icons/crystalsvg/*/apps/kcmsystem.* /usr/share/icons/crystalsvg/*/apps/knotify.* /usr/share/icons/crystalsvg/*/apps/looknfeel.* /usr/share/icons/crystalsvg/*/apps/multimedia.* /usr/share/icons/crystalsvg/*/apps/panel_settings.* /usr/share/icons/crystalsvg/*/apps/samba.* /usr/share/icons/crystalsvg/*/devices/laptop.* /usr/share/icons/hicolor/*/apps/khelpcenter.* /usr/share/icons/hicolor/*/apps/knetattach.* %_kde_share_dir/services/kcm_phononxine.desktop %_kde_share_dir/services/phononbackends/xine.desktop %_kde_share_dir/services/about.protocol %_kde_share_dir/services/applications.protocol %_kde_share_dir/services/ar.protocol %_kde_share_dir/services/bzip2.protocol %_kde_share_dir/services/bzip.protocol %_kde_share_dir/services/cgi.protocol %_kde_share_dir/services/componentchooser.desktop %_kde_share_dir/services/cursorthumbnail.desktop %_kde_share_dir/services/djvuthumbnail.desktop %_kde_share_dir/services/finger.protocol %_kde_share_dir/services/fish.protocol %_kde_share_dir/services/fixhosturifilter.desktop %_kde_share_dir/services/floppy.protocol %_kde_share_dir/services/gzip.protocol %_kde_share_dir/services/htmlthumbnail.desktop %_kde_share_dir/services/icons.desktop %_kde_share_dir/services/ioslaveinfo.desktop %_kde_share_dir/services/imagethumbnail.desktop %_kde_share_dir/services/info.protocol %_kde_share_dir/services/kcmcgi.desktop %_kde_share_dir/services/kcmkded.desktop %_kde_share_dir/services/kcm_kdnssd.desktop %_kde_share_dir/services/kcmnotify.desktop %_kde_share_dir/services/kded/soliduiserver.desktop %_kde_share_dir/services/kded/ktimezoned.desktop %_kde_share_dir/services/kded/remotedirnotify.desktop %_kde_share_dir/services/khelpcenter.desktop %_kde_share_dir/services/kinfocenter.desktop %_kde_share_dir/services/kmanpart.desktop %_kde_share_dir/services/knotify4.desktop %_kde_share_dir/services/kshorturifilter.desktop %_kde_share_dir/services/kuiserver.desktop %_kde_share_dir/services/kuriikwsfilter.desktop %_kde_share_dir/services/kurisearchfilter.desktop %_kde_share_dir/services/language.desktop %_kde_share_dir/services/localdomainurifilter.desktop %_kde_share_dir/services/man.protocol %_kde_share_dir/services/nfs.protocol %_kde_share_dir/services/programs.protocol %_kde_share_dir/services/remote.protocol %_kde_share_dir/services/searchproviders %_kde_share_dir/services/settings.protocol %_kde_share_dir/services/smb.protocol %_kde_share_dir/services/smbstatus.desktop %_kde_share_dir/services/svgthumbnail.desktop %_kde_share_dir/services/tar.protocol %_kde_share_dir/services/textthumbnail.desktop %_kde_share_dir/services/thumbnail.protocol %_kde_share_dir/services/trash.protocol %_kde_share_dir/services/zip.protocol %_kde_share_dir/servicetypes/searchprovider.desktop %_kde_share_dir/servicetypes/thumbcreator.desktop %dir %_kde_share_dir/apps/kstyle/themes %dir %_kde_share_dir/apps/kstyle %dir %_libdir/kde4/plugins/styles %exclude /usr/share/locale/en_US /usr/share/locale/en_US/entry.desktop /usr/share/locale/* /usr/share/emoticons /usr/share/sounds/*.ogg %doc %lang(en) /usr/share/doc/kde/HTML/en/kcontrol %doc %lang(en) /usr/share/doc/kde/HTML/en/kdebugdialog %doc %lang(en) /usr/share/doc/kde/HTML/en/kdesu %doc %lang(en) /usr/share/doc/kde/HTML/en/khelpcenter %doc %lang(en) /usr/share/doc/kde/HTML/en/knetattach /usr/share/kde4/apps/cmake /usr/share/kde4/apps/kstyle /usr/share/kde4/services/sftp.protocol %doc %lang(en) /usr/share/doc/kde/HTML/en/kioslave /usr/%_lib/kde4/kstyle_oxygen_config.so /usr/%_lib/kde4/kstyle_plastik_config.so /usr/%_lib/kde4/libexec/drkonqi /usr/%_lib/kde4/libexec/kdeeject /usr/%_lib/kde4/libexec/kdesu /usr/%_lib/kde4/libexec/kdesud /usr/%_lib/kde4/libexec/khc_docbookdig.pl /usr/%_lib/kde4/libexec/khc_htdig.pl /usr/%_lib/kde4/libexec/khc_htsearch.pl /usr/%_lib/kde4/libexec/khc_indexbuilder /usr/%_lib/kde4/libexec/khc_mansearch.pl /usr/%_lib/kde4/libexec/klocaldomainurifilterhelper /usr/%_lib/kde4/libexec/knetattach /usr/%_lib/kde4/plugins/styles/oxygen.so /usr/%_lib/kde4/plugins/styles/plastik.so %changelog * Wed Oct 31 2007 - dmueller(a)suse.de - update to 3.95.0 * Thu Oct 18 2007 - dmueller(a)suse.de - update to 3.94.1 * Thu Oct 18 2007 - ro(a)suse.de - fix build: add directory to filelist * Mon Oct 08 2007 - dmueller(a)suse.de - update to KDE 4.0 Beta3 * Tue Oct 02 2007 - stbinner(a)suse.de - update to 3.93.0.svn720100 * Wed Sep 26 2007 - stbinner(a)suse.de - update to 3.93.0.svn717244 * Fri Sep 21 2007 - stbinner(a)suse.de - don't remove icons anymore after build check got fixed (#307017) * Thu Sep 13 2007 - stbinner(a)suse.de - update to 3.93.0.svn712052 * Mon Sep 10 2007 - dmueller(a)suse.de - don't set $LANGUAGE in konsole (#305210) * Sat Sep 01 2007 - stbinner(a)suse.de - update to KDE 4.0 Beta 2 * Thu Aug 23 2007 - stbinner(a)suse.de - update to 3.92.0.svn703920 * Thu Aug 16 2007 - stbinner(a)suse.de - update to 3.92.0.svn700775 * Wed Aug 15 2007 - stbinner(a)suse.de - fix more file conflicts * Thu Aug 09 2007 - stbinner(a)suse.de - update to 3.92.0.svn697325 - fix file conflicts * Sat Jul 28 2007 - stbinner(a)suse.de - update to KDE 4.0 Beta 1 * Thu Jul 19 2007 - stbinner(a)suse.de - don't show System Settings on non-KDE/KDE3 desktop * Mon Jul 16 2007 - stbinner(a)suse.de - use the non generic lib version for libkonq * Thu Jul 12 2007 - stbinner(a)suse.de - update to 3.91.0.svn672298 * Sat Jun 23 2007 - stbinner(a)suse.de - update to 3.90.1.svn679137 * Fri Jun 08 2007 - stbinner(a)suse.de - update to 3.90.1.svn670093 * Mon Jun 04 2007 - stbinner(a)suse.de - fix build * Fri Jun 01 2007 - coolo(a)suse.de - simplify spec file by using macros from kde4-filesystem * Wed May 23 2007 - stbinner(a)suse.de - run %%fdupes - fix prefix of two bins * Wed May 16 2007 - olh(a)suse.de - Buildrequires libusb -> libusb-devel * Tue May 15 2007 - stbinner(a)suse.de - show .desktop files of kdebase4-runtime only in a KDE session * Sat May 12 2007 - stbinner(a)suse.de - libkdeinit -> libkdeinit4 * Thu May 10 2007 - stbinner(a)suse.de - fix package file conflicts * Mon May 07 2007 - stbinner(a)suse.de - initial package in abuild ++++++ oxygen-icon-theme.spec ++++++ # # spec file for package oxygen-icon-theme (Version 3.95.0) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: oxygen-icon-theme BuildRequires: libkde4-devel libqimageblitz-devel xine-devel %if %suse_version > 1020 BuildRequires: fdupes %endif License: LGPL v2.1 or later Group: System/GUI/KDE Summary: Oxygen Icon Theme Url: http://www.kde.org Version: 3.95.0 Release: 1 Requires: hicolor-icon-theme Recommends: oxygen-icon-theme-scalable Source0: kdebase-runtime-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Provides: kdelibs4-icons = 3.92.0 Obsoletes: kdelibs4-icons <= 3.92.0 %description This package contains the non-scalable icons of the Oxygen icon theme. Authors: -------- The KDE Team <kde(a)kde.org> %prep %setup -q -n kdebase-runtime-%version %build cd pics/oxygen %cmake_kde4 -d build %make_jobs %install cd pics/oxygen/build make install DESTDIR=$RPM_BUILD_ROOT/usr/share/icons mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/scalable/filesystems mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/128x128/actions mkdir -p $RPM_BUILD_ROOT/usr/share/icons/oxygen/64x64/actions %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT %endif %clean rm -rf $RPM_BUILD_ROOT %package scalable Group: System/GUI/KDE Summary: Oxygen Icon Theme Requires: oxygen-icon-theme Provides: kdelibs4-icons-scalable = 3.92.0 Obsoletes: kdelibs4-icons-scalable <= 3.92.0 %description scalable This package contains the scalable icons of the Oxygen icon theme. Authors: -------- The KDE Team <kde(a)kde.org> %files scalable %defattr(-,root,root) /usr/share/icons/oxygen/scalable %files %defattr(-,root,root) %exclude /usr/share/icons/oxygen/scalable/*/* %dir /usr/share/icons/oxygen/scalable/actions %dir /usr/share/icons/oxygen/scalable/apps %dir /usr/share/icons/oxygen/scalable/devices %dir /usr/share/icons/oxygen/scalable/emblems %dir /usr/share/icons/oxygen/scalable/filesystems %dir /usr/share/icons/oxygen/scalable/mimetypes %dir /usr/share/icons/oxygen/scalable/places /usr/share/icons/oxygen %changelog * Mon Oct 08 2007 - dmueller(a)suse.de - update to KDE 4.0 Beta3 * Tue Oct 02 2007 - stbinner(a)suse.de - update to 3.93.0.svn720100 * Wed Sep 26 2007 - stbinner(a)suse.de - update to 3.93.0.svn717244 * Fri Sep 21 2007 - stbinner(a)suse.de - don't remove icons anymore after build check got fixed (#307017) * Thu Sep 13 2007 - stbinner(a)suse.de - update to 3.93.0.svn712052 * Mon Sep 10 2007 - dmueller(a)suse.de - don't set $LANGUAGE in konsole (#305210) * Sat Sep 01 2007 - stbinner(a)suse.de - update to KDE 4.0 Beta 2 * Thu Aug 23 2007 - stbinner(a)suse.de - update to 3.92.0.svn703920 * Thu Aug 16 2007 - stbinner(a)suse.de - update to 3.92.0.svn700775 * Wed Aug 15 2007 - stbinner(a)suse.de - fix more file conflicts * Thu Aug 09 2007 - stbinner(a)suse.de - update to 3.92.0.svn697325 - fix file conflicts * Sat Jul 28 2007 - stbinner(a)suse.de - update to KDE 4.0 Beta 1 * Thu Jul 19 2007 - stbinner(a)suse.de - don't show System Settings on non-KDE/KDE3 desktop * Mon Jul 16 2007 - stbinner(a)suse.de - use the non generic lib version for libkonq * Thu Jul 12 2007 - stbinner(a)suse.de - update to 3.91.0.svn672298 * Sat Jun 23 2007 - stbinner(a)suse.de - update to 3.90.1.svn679137 * Fri Jun 08 2007 - stbinner(a)suse.de - update to 3.90.1.svn670093 * Mon Jun 04 2007 - stbinner(a)suse.de - fix build * Fri Jun 01 2007 - coolo(a)suse.de - simplify spec file by using macros from kde4-filesystem * Wed May 23 2007 - stbinner(a)suse.de - run %%fdupes - fix prefix of two bins * Wed May 16 2007 - olh(a)suse.de - Buildrequires libusb -> libusb-devel * Tue May 15 2007 - stbinner(a)suse.de - show .desktop files of kdebase4-runtime only in a KDE session * Sat May 12 2007 - stbinner(a)suse.de - libkdeinit -> libkdeinit4 * Thu May 10 2007 - stbinner(a)suse.de - fix package file conflicts * Mon May 07 2007 - stbinner(a)suse.de - initial package in abuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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