June 2007 - openSUSE Commits - openSUSE Mailing Lists

commit kernel-source
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package kernel-source checked in at Thu Jun 28 19:43:34 CEST 2007. -------- --- kernel-source/kernel-bigsmp.changes 2007-06-22 02:08:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/kernel-bigsmp.changes 2007-06-28 09:06:42.000000000 +0200 @@ -2 +2 @@ -Fri Jun 22 00:29:58 CEST 2007 - jeffm(a)suse.de +Thu Jun 28 03:41:07 CEST 2007 - jeffm(a)suse.de @@ -4 +4,18 @@ -- Update to 2.6.22-rc5-git5. +- Update to 2.6.22-rc6-git1. + +------------------------------------------------------------------- +Tue Jun 26 10:24:57 CEST 2007 - olh(a)suse.de + +- disable ondemand governor + does not work due to too long transition latency + +------------------------------------------------------------------- +Mon Jun 25 21:21:37 CEST 2007 - olh(a)suse.de + +- build cramfs as module on ppc32 + +------------------------------------------------------------------- +Sun Jun 24 08:35:33 CEST 2007 - olh(a)suse.de + +- update ps3 patches + gelic, storage, ps3fb fixes @@ -7 +24,35 @@ -Fri Jun 22 00:29:04 CEST 2007 - jeffm(a)suse.de +Fri Jun 22 16:26:04 CEST 2007 - jeffm(a)suse.de + +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). + +------------------------------------------------------------------- +Fri Jun 22 13:05:08 CEST 2007 - bwalle(a)suse.de + +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). + +------------------------------------------------------------------- +Fri Jun 22 11:16:49 CEST 2007 - jbeulich(a)novell.com + +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. + +------------------------------------------------------------------- +Fri Jun 22 00:29:58 CEST 2007 - jeffm(a)suse.de kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-um.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:04.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-bigsmp (Version 2.6.22_rc5_git5) +# spec file for package kernel-bigsmp (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -51,7 +51,7 @@ %endif %endif Summary: Kernel with PAE Support -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL) Group: System/Kernel @@ -103,7 +103,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.22_rc5_git5-%source_rel +Provides: kernel = 2.6.22_rc6_git1-%source_rel %endif %endif Provides: k_smp4G @@ -176,12 +176,12 @@ -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-bigsmp-2.6.22_rc5_git5.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.22_rc5_git5.src.rpm." + echo "The kernel-bigsmp-2.6.22_rc6_git1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc6_git1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -570,8 +570,41 @@ %files -f kernel.files %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:04.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-debug (Version 2.6.22_rc5_git5) +# spec file for package kernel-debug (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -51,7 +51,7 @@ %endif %endif Summary: A Debug Version of the Kernel -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL) Group: System/Kernel @@ -103,7 +103,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.22_rc5_git5-%source_rel +Provides: kernel = 2.6.22_rc6_git1-%source_rel %endif %endif %ifarch %ix86 @@ -181,12 +181,12 @@ -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-debug-2.6.22_rc5_git5.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.22_rc5_git5.src.rpm." + echo "The kernel-debug-2.6.22_rc6_git1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc6_git1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -575,8 +575,41 @@ %files -f kernel.files %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:04.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-default (Version 2.6.22_rc5_git5) +# spec file for package kernel-default (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -51,7 +51,7 @@ %endif %endif Summary: The Standard Kernel for both Uniprocessor and Multiprocessor Systems -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL) Group: System/Kernel @@ -103,7 +103,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.22_rc5_git5-%source_rel +Provides: kernel = 2.6.22_rc6_git1-%source_rel %endif %endif %ifarch alpha @@ -202,12 +202,12 @@ -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-default-2.6.22_rc5_git5.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.22_rc5_git5.src.rpm." + echo "The kernel-default-2.6.22_rc6_git1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc6_git1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -596,8 +596,41 @@ %files -f kernel.files %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:05.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-dummy (Version 2.6.22_rc5_git5) +# spec file for package kernel-dummy (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,7 +14,7 @@ Name: kernel-dummy URL: http://www.kernel.org/ Summary: Internal dummy package for synchronizing release numbers -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL) Group: System/Kernel @@ -28,7 +28,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %install @@ -41,8 +41,41 @@ /etc/dummy %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:05.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-kdump (Version 2.6.22_rc5_git5) +# spec file for package kernel-kdump (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -51,7 +51,7 @@ %endif %endif Summary: kernel for kdump -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL) Group: System/Kernel @@ -103,7 +103,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.22_rc5_git5-%source_rel +Provides: kernel = 2.6.22_rc6_git1-%source_rel %endif %endif %ifarch ppc @@ -180,12 +180,12 @@ -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-kdump-2.6.22_rc5_git5.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.22_rc5_git5.src.rpm." + echo "The kernel-kdump-2.6.22_rc6_git1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc6_git1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -574,8 +574,41 @@ %files -f kernel.files %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:05.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 2.6.22_rc5_git5) +# spec file for package kernel-ppc64 (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -50,7 +50,7 @@ %endif %endif Summary: Kernel for ppc64 Systems -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Kernel @@ -102,7 +102,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.22_rc5_git5-%source_rel +Provides: kernel = 2.6.22_rc6_git1-%source_rel %endif %endif %ifarch ppc @@ -192,12 +192,12 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-ppc64-2.6.22_rc5_git5.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.22_rc5_git5.src.rpm." + echo "The kernel-ppc64-2.6.22_rc6_git1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc6_git1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -586,8 +586,41 @@ %files -f kernel.files %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:05.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 2.6.22_rc5_git5) +# spec file for package kernel-s390 (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -51,7 +51,7 @@ %endif %endif Summary: The Standard Kernel -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL) Group: System/Kernel @@ -103,7 +103,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.22_rc5_git5-%source_rel +Provides: kernel = 2.6.22_rc6_git1-%source_rel %endif %endif Provides: kernel-32bit k_deflt @@ -174,12 +174,12 @@ -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-s390-2.6.22_rc5_git5.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.22_rc5_git5.src.rpm." + echo "The kernel-s390-2.6.22_rc6_git1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc6_git1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -568,8 +568,41 @@ %files -f kernel.files %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:05.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.22_rc5_git5) +# spec file for package kernel-source (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,7 +21,7 @@ %define source_rel %release %endif Summary: The Linux Kernel Sources -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL) Group: Development/Sources @@ -105,7 +105,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then @@ -128,16 +128,16 @@ # Apply the patches needed for this architecture. %_sourcedir/guards %symbols < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.22_rc5_git5/kernel-source.patches -for patch in $(< %_builddir/kernel-source-2.6.22_rc5_git5/kernel-source.patches); do - if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.22_rc5_git5/$patch; then + > %_builddir/kernel-source-2.6.22_rc6_git1/kernel-source.patches +for patch in $(< %_builddir/kernel-source-2.6.22_rc6_git1/kernel-source.patches); do + if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.22_rc6_git1/$patch; then echo "*** Patch $patch failed ***" exit 1 fi done -%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.22_rc5_git5 %source_rel -KERNELRELEASE=2.6.22-rc5-git5-%source_rel +%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.22_rc6_git1 %source_rel +KERNELRELEASE=2.6.22-rc6-git1-%source_rel cat > %_builddir/%{name}-%{version}/.rpm-defs <<EOF KERNELRELEASE=$KERNELRELEASE SYMBOLS="%symbols" @@ -158,8 +158,8 @@ ;; esac %_sourcedir/guards %symbols kernel-$flavor < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.22_rc5_git5/kernel-$flavor.patches - diff -q %_builddir/kernel-source-2.6.22_rc5_git5/kernel-{source,$flavor}.patches \ + > %_builddir/kernel-source-2.6.22_rc6_git1/kernel-$flavor.patches + diff -q %_builddir/kernel-source-2.6.22_rc6_git1/kernel-{source,$flavor}.patches \ || continue o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor mkdir -p $o @@ -292,8 +292,41 @@ %files -f kernel-source.files %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:05.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 2.6.22_rc5_git5) +# spec file for package kernel-syms (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: kernel-syms URL: http://www.kernel.org/ Summary: Kernel Symbol Versions (modversions) -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL) Group: Development/Sources @@ -57,7 +57,7 @@ #!BuildIgnore: irqbalance xen #!BuildIgnore: perl-Bootloader mkinitrd Requires: linux -Requires: kernel-source = 2.6.22_rc5_git5-%release +Requires: kernel-source = 2.6.22_rc6_git1-%release Source11: arch-symbols Source12: guards Source21: config.conf @@ -90,7 +90,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %prep echo "Architecture symbol(s):" %symbols @@ -136,8 +136,41 @@ /lib/modules/*/* %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:06.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-um (Version 2.6.22_rc5_git5) +# spec file for package kernel-um (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -51,7 +51,7 @@ %endif %endif Summary: The User Mode Linux kernel. -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL) Group: System/Kernel @@ -103,7 +103,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.22_rc5_git5-%source_rel +Provides: kernel = 2.6.22_rc6_git1-%source_rel %endif %endif %ifarch %ix86 @@ -182,12 +182,12 @@ -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-um-2.6.22_rc5_git5.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.22_rc5_git5.src.rpm." + echo "The kernel-um-2.6.22_rc6_git1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc6_git1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -576,8 +576,41 @@ %files -f kernel.files %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:06.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-vanilla (Version 2.6.22_rc5_git5) +# spec file for package kernel-vanilla (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -51,7 +51,7 @@ %endif %endif Summary: The Standard Kernel - without any SUSE patches -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL) Group: System/Kernel @@ -103,7 +103,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.22_rc5_git5-%source_rel +Provides: kernel = 2.6.22_rc6_git1-%source_rel %endif %endif %ifarch alpha @@ -194,12 +194,12 @@ -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-vanilla-2.6.22_rc5_git5.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.22_rc5_git5.src.rpm." + echo "The kernel-vanilla-2.6.22_rc6_git1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc6_git1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -588,8 +588,41 @@ %files -f kernel.files %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ kernel-xenpae.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:06.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xenpae (Version 2.6.22_rc5_git5) +# spec file for package kernel-xenpae (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -51,7 +51,7 @@ %endif %endif Summary: The Xen Kernel with PAE support -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL) Group: System/Kernel @@ -103,7 +103,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.22_rc5_git5-%source_rel +Provides: kernel = 2.6.22_rc6_git1-%source_rel %endif %endif Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 @@ -177,12 +177,12 @@ -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-xenpae-2.6.22_rc5_git5.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.22_rc5_git5.src.rpm." + echo "The kernel-xenpae-2.6.22_rc6_git1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc6_git1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -571,8 +571,41 @@ %files -f kernel.files %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.r30524/_old 2007-06-28 19:40:06.000000000 +0200 +++ /var/tmp/diff_new_pack.r30524/_new 2007-06-28 19:40:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-xen (Version 2.6.22_rc5_git5) +# spec file for package kernel-xen (Version 2.6.22_rc6_git1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -51,7 +51,7 @@ %endif %endif Summary: The Xen Kernel -Version: 2.6.22_rc5_git5 +Version: 2.6.22_rc6_git1 Release: 1 License: GNU General Public License (GPL) Group: System/Kernel @@ -103,7 +103,7 @@ #Conflicts: kernel %else %if ! %build_xen -Provides: kernel = 2.6.22_rc5_git5-%source_rel +Provides: kernel = 2.6.22_rc6_git1-%source_rel %endif %endif %ifarch %ix86 @@ -180,12 +180,12 @@ -Source Timestamp: 2007/06/21 22:30:31 UTC +Source Timestamp: 2007/06/28 01:45:40 UTC %prep if ! [ -e %_sourcedir/linux-2.6.21.tar.bz2 ]; then - echo "The kernel-xen-2.6.22_rc5_git5.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.22_rc5_git5.src.rpm." + echo "The kernel-xen-2.6.22_rc6_git1.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.22_rc6_git1.src.rpm." exit 1 fi echo "Architecture symbol(s):" %symbols @@ -574,8 +574,41 @@ %files -f kernel.files %changelog +* Thu Jun 28 2007 - jeffm(a)suse.de +- Update to 2.6.22-rc6-git1. +* Tue Jun 26 2007 - olh(a)suse.de +- disable ondemand governor + does not work due to too long transition latency +* Mon Jun 25 2007 - olh(a)suse.de +- build cramfs as module on ppc32 +* Sun Jun 24 2007 - olh(a)suse.de +- update ps3 patches + gelic, storage, ps3fb fixes * Fri Jun 22 2007 - jeffm(a)suse.de -- Update to 2.6.22-rc5-git5. +- patches.fixes/random-fix-bound-check-ordering.diff: random: + fix bound check ordering (286672). +* Fri Jun 22 2007 - bwalle(a)suse.de +- patches.arch/ia64-kdump-hpzx1-ioc-workaround: Fix problems + with sba_iommu and kdump (271158). +* Fri Jun 22 2007 - jbeulich(a)novell.com +- patches.xen/xen3-patch-2.6.22-rc3-rc4: Update to 2.6.22-rc4. +- patches.xen/xen3-patch-2.6.22-rc4-rc5: Update to 2.6.22-rc5. +- patches.xen/15130-x86_64-vsyscall-user.patch: Ensure that the + initial page tables allow userspace. +- patches.xen/42-freeze.patch: Kernel threads need to be aware + of freeze request. +- patches.xen/xen-x86-pXX_val: consolidate pte_val/pd_val + replacements. +- patches.xen/xen-x86_64-physmap-nx: force _PAGE_NX on the 1:1 + mapping (matching native). +- patches.xen/xen-i386-kconfig-msr: allow the /dev/cpu/*/msr + devices. +- patches.xen/xen-x86_64-entry: remove non-native entry point + name. +- patches.xen/xen-intel-agp: fix intel-agp address handling + (254208). +- Rediff a few other Xen patches. +- Update i386 Xen config files. * Fri Jun 22 2007 - jeffm(a)suse.de - Update to 2.6.22-rc5-git5. * Fri Jun 22 2007 - jeffm(a)suse.de ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2007-06-22 02:08:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-06-28 09:06:39.000000000 +0200 @@ -1 +1 @@ -2007/06/21 22:30:31 UTC +2007/06/28 01:45:40 UTC ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/bigsmp new/config/i386/bigsmp --- old/config/i386/bigsmp 2007-06-22 02:06:35.000000000 +0200 +++ new/config/i386/bigsmp 2007-06-28 08:54:05.000000000 +0200 @@ -3796,6 +3796,7 @@ CONFIG_EARLY_PRINTK=y CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_DEBUG_RODATA is not set # CONFIG_4KSTACKS is not set CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/debug new/config/i386/debug --- old/config/i386/debug 2007-06-22 02:06:35.000000000 +0200 +++ new/config/i386/debug 2007-06-28 08:54:05.000000000 +0200 @@ -3792,6 +3792,7 @@ # # Page alloc debug is incompatible with Software Suspend on i386 # +CONFIG_DEBUG_RODATA=y # CONFIG_4KSTACKS is not set CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/default new/config/i386/default --- old/config/i386/default 2007-06-22 02:06:35.000000000 +0200 +++ new/config/i386/default 2007-06-28 08:54:05.000000000 +0200 @@ -172,7 +172,6 @@ CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y -CONFIG_X86_CMPXCHG64=y CONFIG_X86_ALIGNMENT_16=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_MINIMUM_CPU_MODEL=4 @@ -3790,6 +3789,7 @@ # # Page alloc debug is incompatible with Software Suspend on i386 # +# CONFIG_DEBUG_RODATA is not set # CONFIG_4KSTACKS is not set CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/um new/config/i386/um --- old/config/i386/um 2007-06-18 21:18:11.000000000 +0200 +++ new/config/i386/um 2007-06-28 08:54:05.000000000 +0200 @@ -58,7 +58,6 @@ CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y -CONFIG_X86_CMPXCHG64=y CONFIG_X86_GOOD_APIC=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/vanilla new/config/i386/vanilla --- old/config/i386/vanilla 2007-06-22 02:06:36.000000000 +0200 +++ new/config/i386/vanilla 2007-06-28 08:54:05.000000000 +0200 @@ -172,7 +172,6 @@ CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y -CONFIG_X86_CMPXCHG64=y CONFIG_X86_ALIGNMENT_16=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_MINIMUM_CPU_MODEL=4 @@ -3788,6 +3787,7 @@ # # Page alloc debug is incompatible with Software Suspend on i386 # +# CONFIG_DEBUG_RODATA is not set # CONFIG_4KSTACKS is not set CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xen new/config/i386/xen --- old/config/i386/xen 2007-06-18 21:18:11.000000000 +0200 +++ new/config/i386/xen 2007-06-28 08:54:05.000000000 +0200 @@ -164,7 +164,6 @@ CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y -CONFIG_X86_CMPXCHG64=y CONFIG_X86_GOOD_APIC=y CONFIG_X86_INTEL_USERCOPY=y CONFIG_X86_USE_PPRO_CHECKSUM=y @@ -183,6 +182,7 @@ CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=m CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m CONFIG_X86_CPUID=m CONFIG_SWIOTLB=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xenpae new/config/i386/xenpae --- old/config/i386/xenpae 2007-06-18 21:18:11.000000000 +0200 +++ new/config/i386/xenpae 2007-06-25 19:47:19.000000000 +0200 @@ -183,6 +183,7 @@ CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=m CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m CONFIG_X86_CPUID=m CONFIG_SWIOTLB=y diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/default new/config/powerpc/default --- old/config/powerpc/default 2007-06-22 02:06:36.000000000 +0200 +++ new/config/powerpc/default 2007-06-28 08:54:06.000000000 +0200 @@ -179,7 +179,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # @@ -2596,7 +2596,7 @@ # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set CONFIG_EFS_FS=m -CONFIG_CRAMFS=y +CONFIG_CRAMFS=m # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/ppc64 new/config/powerpc/ppc64 --- old/config/powerpc/ppc64 2007-06-18 21:18:12.000000000 +0200 +++ new/config/powerpc/ppc64 2007-06-28 08:54:06.000000000 +0200 @@ -224,7 +224,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/vanilla new/config/powerpc/vanilla --- old/config/powerpc/vanilla 2007-06-22 02:06:36.000000000 +0200 +++ new/config/powerpc/vanilla 2007-06-28 08:54:06.000000000 +0200 @@ -179,7 +179,7 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m # @@ -2482,7 +2482,7 @@ # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set CONFIG_EFS_FS=m -CONFIG_CRAMFS=y +CONFIG_CRAMFS=m # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set CONFIG_QNX4FS_FS=m 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-06-22 02:06:36.000000000 +0200 +++ new/config/x86_64/debug 2007-06-28 08:54:06.000000000 +0200 @@ -3448,6 +3448,7 @@ CONFIG_RCU_TORTURE_TEST=m CONFIG_LKDTM=m # CONFIG_FAULT_INJECTION is not set +CONFIG_DEBUG_RODATA=y CONFIG_KDB=y CONFIG_KDB_MODULES=m # CONFIG_KDB_OFF is not set 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-06-22 02:06:36.000000000 +0200 +++ new/config/x86_64/default 2007-06-28 08:54:06.000000000 +0200 @@ -3454,6 +3454,7 @@ CONFIG_RCU_TORTURE_TEST=m CONFIG_LKDTM=m # CONFIG_FAULT_INJECTION is not set +# CONFIG_DEBUG_RODATA is not set # CONFIG_KDB is not set # CONFIG_IOMMU_DEBUG is not set # CONFIG_DEBUG_STACKOVERFLOW is not set 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-06-22 02:06:36.000000000 +0200 +++ new/config/x86_64/vanilla 2007-06-28 08:54:06.000000000 +0200 @@ -3446,6 +3446,7 @@ CONFIG_RCU_TORTURE_TEST=m CONFIG_LKDTM=m # CONFIG_FAULT_INJECTION is not set +# CONFIG_DEBUG_RODATA is not set # CONFIG_KDB is not set # CONFIG_IOMMU_DEBUG is not set # CONFIG_DEBUG_STACKOVERFLOW is not set 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-06-22 02:06:36.000000000 +0200 +++ new/config/x86_64/xen 2007-06-28 08:54:06.000000000 +0200 @@ -3375,6 +3375,7 @@ CONFIG_RCU_TORTURE_TEST=m CONFIG_LKDTM=m # CONFIG_FAULT_INJECTION is not set +# CONFIG_DEBUG_RODATA is not set # CONFIG_KDB is not set # CONFIG_DEBUG_STACKOVERFLOW is not set # CONFIG_DEBUG_STACK_USAGE is not set ++++++ kabi.tar.bz2 ++++++ ++++++ needed_space_in_mb ++++++ --- kernel-source/needed_space_in_mb 2007-06-22 19:48:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2007-06-28 09:07:05.000000000 +0200 @@ -1 +1 @@ -6000 +3072 ++++++ novell-kmp.tar.bz2 ++++++ ++++++ patches.apparmor.tar.bz2 ++++++ ++++++ patches.arch.tar.bz2 ++++++ ++++ 5193 lines of diff (skipped) ++++++ patches.drivers.tar.bz2 ++++++ ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/random-fix-bound-check-ordering.diff new/patches.fixes/random-fix-bound-check-ordering.diff --- old/patches.fixes/random-fix-bound-check-ordering.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/random-fix-bound-check-ordering.diff 2007-06-22 16:26:20.000000000 +0200 @@ -0,0 +1,60 @@ +From: Matt Mackall <mpm(a)selenic.com> +Subject: [PATCH] random: fix bound check ordering +Patch-mainline: +References: 286672 + +On Thu, Jun 21, 2007 at 04:29:12PM -0500, Matt Mackall wrote: +> On Thu, Jun 21, 2007 at 10:29:51PM +0200, Willy Tarreau wrote: +> > Hi all, +> > +> > PaX Team also sent me this information about /dev/random on 2.6. To be +> > honnest, I have not understood the exact details because I don't know +> > this code, but basically it's the classical thinko about min/max macros +> > which leads to the largest sized being used at some time. +> +> Sigh. Yep, that looks like a DoS. Not likely to be able to do a +> privilege escalation here though. I'll make a cleaner patch. + +random: fix bound check ordering + +If root raised the default wakeup threshold over the size of the +output pool, the pool transfer function could overflow the stack with +RNG bytes, causing a DoS. + +(Bug reported by PaX) + +Signed-off-by: Matt Mackall <mpm(a)selenic.com> +Acked-by: Jeff Mahoney <jeffm(a)suse.com> +--- + + drivers/char/random.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +Index: mm/drivers/char/random.c +=================================================================== +--- mm.orig/drivers/char/random.c 2007-06-21 16:39:35.000000000 -0500 ++++ mm/drivers/char/random.c 2007-06-21 16:51:36.000000000 -0500 +@@ -693,9 +693,14 @@ static void xfer_secondary_pool(struct e + + if (r->pull && r->entropy_count < nbytes * 8 && + r->entropy_count < r->poolinfo->POOLBITS) { +- int bytes = max_t(int, random_read_wakeup_thresh / 8, +- min_t(int, nbytes, sizeof(tmp))); ++ /* If we're limited, always leave two wakeup worth's BITS */ + int rsvd = r->limit ? 0 : random_read_wakeup_thresh/4; ++ int bytes = nbytes; ++ ++ /* pull at least as many as BYTES as wakeup BITS */ ++ bytes = max_t(int, bytes, random_read_wakeup_thresh / 8); ++ /* but never more than the buffer size */ ++ bytes = min_t(int, bytes, sizeof(tmp)); + + DEBUG_ENT("going to reseed %s with %d bits " + "(%d of %d requested)\n", + +-- +Mathematics is the supreme nostalgia of our time. +_______________________________________________ +Vendor Security mailing list +Vendor Security(a)lst.de +https://www.lst.de/cgi-bin/mailman/listinfo/vendor-sec ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 2150757 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.suse/kdb-x86_64 new/patches.suse/kdb-x86_64 --- old/patches.suse/kdb-x86_64 2007-06-05 01:10:48.000000000 +0200 +++ new/patches.suse/kdb-x86_64 2007-06-28 08:54:17.000000000 +0200 @@ -8481,9 +8481,9 @@ --- linux.orig/arch/x86_64/kernel/entry.S +++ linux/arch/x86_64/kernel/entry.S @@ -1163,3 +1163,30 @@ ENTRY(call_softirq) - ret + sysret CFI_ENDPROC - ENDPROC(call_softirq) + ENDPROC(ignore_sysret) + +#ifdef CONFIG_KDB + ++++++ patches.uml.tar.bz2 ++++++ ++++++ patches.xen.tar.bz2 ++++++ ++++ 6500 lines of diff (skipped) ++++++ series.conf ++++++ --- kernel-source/series.conf 2007-06-22 02:08:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-06-28 09:06:31.000000000 +0200 @@ -1,4 +1,5 @@ # Kernel patches configuration file +# vim: set sw=8 ts=8 noet: # # The following symbols are defined depending on the target architecture: # alpha ia64 mips mips64 ppc ppc64 s390 s390x sparc sparc64 x86_64 @@ -20,8 +21,8 @@ # latest standard kernel patches # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... - patches.kernel.org/patch-2.6.22-rc5 - patches.kernel.org/patch-2.6.22-rc5-git5 + patches.kernel.org/patch-2.6.22-rc6 + patches.kernel.org/patch-2.6.22-rc6-git1 ######################################################## # @@ -72,7 +73,7 @@ patches.arch/ppc-efika-of_device-generic-uevent.patch patches.arch/ppc-efika-psc-console-autodetection.patch -# PS3 git snapshot: 362fdbcbd64381f7e2f5835833b01f806e2d9aeb +# PS3 git snapshot: ffc742be975446e7520980f77d144b6d5cc412cc patches.arch/ppc-ps3tree-ps3-stable_cell-add-spu-shutdown-method.diff patches.arch/ppc-ps3tree-ps3-stable_ps3-rename-ipi-symbols.diff patches.arch/ppc-ps3tree-ps3-stable_ps3-maybe-unused.diff @@ -107,6 +108,7 @@ patches.arch/ppc-ps3tree-ps3-stable_ps3-sparse-warnings2.diff patches.arch/ppc-ps3tree-ps3-stable_ps3-system-bus-rework-usb.diff patches.arch/ppc-ps3tree-ps3-stable_ps3-usb-fix-return.diff + patches.arch/ppc-ps3tree-other_scsi-shost_priv.diff patches.arch/ppc-ps3tree-ps3-stable_ps3stor_flash_bootmem.diff patches.arch/ppc-ps3tree-ps3-stable_ps3stor_bus.diff patches.arch/ppc-ps3tree-ps3-stable_ps3stor_probe.diff @@ -136,6 +138,7 @@ patches.arch/ppc-ps3tree-ps3-wip_ps3-system-bus-status.diff patches.arch/ppc-ps3tree-ps3-wip_ps3-zimage-debug.diff patches.arch/ppc-ps3tree-ps3-wip_ps3-wip-defconfig-updates.patch + patches.arch/ppc-ps3tree-ps3-wip_ps3fb_dev_dbg.diff # PS3 git snapshot end patches.arch/ppc-suse-spe-logo_logo-extern-in-header.diff @@ -155,6 +158,9 @@ # build fix patches.arch/ppc-fix-prpmc2800 + # fix for kdump on HP platforms + patches.arch/ia64-kdump-hpzx1-ioc-workaround + # KDB v4.4 patches.suse/kdb-common patches.suse/kdb-i386 @@ -540,6 +546,7 @@ patches.fixes/export-symbol patches.fixes/saa7134-tvaudio-thread-handling.diff + patches.fixes/random-fix-bound-check-ordering.diff # PLEASE KEEP THESE PATCHES AT THE END OF series.conf # (as all other arch specific patches should be kept at the end @@ -594,6 +601,7 @@ # newer changeset backports patches.xen/15130-x86_64-vsyscall-user.patch + patches.xen/42-freeze.patch # changes outside arch/{i386,x86_64}/xen patches.xen/xen3-fixup-common @@ -607,6 +615,8 @@ patches.xen/xen3-patch-2.6.20 patches.xen/xen3-patch-2.6.21 patches.xen/xen3-patch-2.6.22-rc3 + patches.xen/xen3-patch-2.6.22-rc3-rc4 + patches.xen/xen3-patch-2.6.22-rc4-rc5 patches.xen/xen3-sysfs-crash-debugging.patch +andrea patches.xen/xen3-silent-stack-overflow @@ -628,3 +638,8 @@ patches.xen/xen-x86-panic-smp patches.xen/xen-split-pt-lock patches.xen/xen-blkif-protocol-fallback-hack + patches.xen/xen-x86-pXX_val + patches.xen/xen-x86_64-physmap-nx + patches.xen/xen-i386-kconfig-msr + patches.xen/xen-x86_64-entry + patches.xen/xen-intel-agp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sensors
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package sensors checked in at Thu Jun 28 19:42:48 CEST 2007. -------- --- sensors/sensors.changes 2007-06-21 22:51:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/sensors/sensors.changes 2007-06-27 13:37:28.001545000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 27 13:37:35 CEST 2007 - jdelvare(a)suse.de + +- Don't package the decode-edid.pl script. It requires parse-edid + from the read-edid package, which isn't included in Suse. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sensors.spec ++++++ --- /var/tmp/diff_new_pack.k10697/_old 2007-06-28 19:41:11.000000000 +0200 +++ /var/tmp/diff_new_pack.k10697/_new 2007-06-28 19:41:11.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: bison flex rrdtool-devel sysfsutils udev URL: http://www.lm-sensors.org/ Version: 2.10.3 -Release: 31 +Release: 33 Summary: Hardware health monitoring for Linux License: GNU General Public License (GPL) Group: System/Monitoring @@ -86,6 +86,7 @@ # cleanup rm -f $RPM_BUILD_ROOT/usr/src/linux/include/i2c-dev.h rm -f $RPM_BUILD_ROOT/usr/src/linux/include/sensors.h +rm -f $RPM_BUILD_ROOT/usr/bin/decode-edid.pl %postun %{insserv_cleanup} @@ -107,6 +108,9 @@ %doc /usr/share/man/man8/*.8.gz %changelog +* Wed Jun 27 2007 - jdelvare(a)suse.de +- Don't package the decode-edid.pl script. It requires parse-edid + from the read-edid package, which isn't included in Suse. * Thu Jun 21 2007 - dmueller(a)suse.de - adjust buildrequires * Mon Jun 04 2007 - jdelvare(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 SDL_ttf
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package SDL_ttf checked in at Thu Jun 28 19:42:32 CEST 2007. -------- --- SDL_ttf/SDL_ttf.changes 2007-03-02 12:40:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/SDL_ttf/SDL_ttf.changes 2007-06-07 16:28:26.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 7 16:27:46 CEST 2007 - prusnak(a)suse.cz + +- split devel subpackage + +------------------------------------------------------------------- Old: ---- SDL_ttf-2.0.8.dif New: ---- SDL_ttf-2.0.8-automake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL_ttf.spec ++++++ --- /var/tmp/diff_new_pack.V30433/_old 2007-06-28 19:40:01.000000000 +0200 +++ /var/tmp/diff_new_pack.V30433/_new 2007-06-28 19:40:01.000000000 +0200 @@ -15,13 +15,11 @@ URL: http://www.libsdl.org/projects/SDL_ttf/ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/X11 -#Requires: xforms -Autoreqprov: on Version: 2.0.8 -Release: 40 +Release: 71 Summary: Simple DirectMedia Layer--Truetype Library Source: %{name}-%{version}.tar.bz2 -Patch: %{name}-%{version}.dif +Patch0: %{name}-%{version}-automake.patch Patch1: %{name}-%{version}-noftinternals.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,9 +33,24 @@ -------- Sam Lantinga <slouken(a)libsdl.org> +%package devel +Requires: SDL_ttf = %{version} +Summary: Simple DirectMedia Layer--Truetype Library +Group: Development/Libraries/X11 + +%description devel +This is a sample library that allows you to use TrueType fonts in your +SDL applications. + + + +Authors: +-------- + Sam Lantinga <slouken(a)libsdl.org> + %prep %setup -q -%patch +%patch0 %patch1 %build @@ -58,13 +71,18 @@ %files %defattr(-,root,root) %doc CHANGES COPYING README -/usr/include/SDL/SDL_ttf.h -%_libdir/libSDL_ttf-2.0.so.* -%_libdir/libSDL_ttf.a -%_libdir/libSDL_ttf.la -%_libdir/libSDL_ttf.so +%{_libdir}/libSDL_ttf-2.0.so.* + +%files devel +%defattr(-,root,root) +%{_includedir}/SDL/SDL_ttf.h +%{_libdir}/libSDL_ttf.a +%{_libdir}/libSDL_ttf.la +%{_libdir}/libSDL_ttf.so %changelog +* Thu Jun 07 2007 - prusnak(a)suse.cz +- split devel subpackage * Fri Mar 02 2007 - prusnak(a)suse.cz - cleaned spec file * Fri Jun 23 2006 - nadvornik(a)suse.cz ++++++ SDL_ttf-2.0.8-automake.patch ++++++ --- Makefile.am +++ Makefile.am @@ -1,5 +1,5 @@ # Makefile.am for the SDL truetype font loading library and viewer - +AUTOMAKE_OPTIONS = foreign lib_LTLIBRARIES = libSDL_ttf.la libSDL_ttfincludedir = $(includedir)/SDL ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 scribus
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package scribus checked in at Thu Jun 28 19:41:04 CEST 2007. -------- --- KDE/scribus/scribus.changes 2007-06-20 01:29:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/scribus/scribus.changes 2007-06-27 19:26:07.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 27 19:25:56 CEST 2007 - dmueller(a)suse.de + +- build against cmake to fix various issues + +------------------------------------------------------------------- Old: ---- scribus-1.3.3.9_string-literal-comparsion-b.patch New: ---- lib64.diff scribus-1.3.3.9-no-rpath.diff string-compare.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scribus.spec ++++++ --- /var/tmp/diff_new_pack.V28165/_old 2007-06-28 19:39:52.000000000 +0200 +++ /var/tmp/diff_new_pack.V28165/_new 2007-06-28 19:39:52.000000000 +0200 @@ -12,6 +12,7 @@ Name: scribus BuildRequires: cairo-devel cups cups-devel kdelibs3-devel python-devel shared-mime-info +BuildRequires: cmake %if %suse_version < 1000 BuildRequires: libjpeg-devel %endif @@ -28,9 +29,11 @@ Provides: scribus-short-words Obsoletes: scribus-i18n-de scribus-i18n-en scribus-i18n-fr scribus-short-words Version: 1.3.3.9 -Release: 1 +Release: 2 Source: %{name}-%{version}.tar.bz2 -Patch2: %{name}-%{version}_string-literal-comparsion-b.patch +Patch3: %{name}-1.3.3.9-no-rpath.diff +Patch4: string-compare.diff +Patch5: lib64.diff URL: http://www.scribus.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Open Source Page Layout and Desktop Publishing (DTP) @@ -64,78 +67,31 @@ Thomas Zastrow <webmaster(a)thomas-zastrow.de> Steve Callcott -%package devel -Summary: Open Source Page Layout / Desktop Publishing (DTP) -Group: Productivity/Publishing/Other -Requires: %{name} = %{version} freetype2-devel zlib-devel libstdc++-devel glibc-devel -Autoreqprov: on - -%description devel -Scribus is an desktop open source page layout program with the aim of -producing commerical grade output in PDF and Postscript, primarily, -though not exclusively for Linux. - -While the goals of the program are for ease of use and simple easy to -understand tools, Scribus offers support for professional publishing -features, such as CMYK colors, easy PDF creation, Encapsulated -Postscript import/export and creation of color separations. - - - -Authors: --------- - Franz Schmid <Franz.Schmid(a)altmuehlnet.de> - Paul F. Johnson <paul(a)all-the-johnsons.co.uk> - Craig Bradney <cbradney(a)zip.com.au> - Peter Linnell <mrdocs(a)scribus.info> - Petr Vaněk <petr(a)yarpen.cz> - Riku Leino <tsoots(a)welho.com> - Craig Ringer <craig(a)postnewspapers.com.au> - Alessandro Rimoldi http://ideale.ch/contact - Jean-Jacques Sarton <jj.sarton(a)t-online.de> - Christian T�pp <mr-ct(a)gmx.de> - Alastair Robinson <blackfive(a)fakenhamweb.co.uk> - Thomas Zastrow <webmaster(a)thomas-zastrow.de> - Steve Callcott - -%define prefix /usr %prep %setup -q -%patch2 +%patch3 +%patch4 +%patch5 %build -. /etc/opt/kde3/common_options -update_admin --no-unsermake -#autoconf -export CFLAGS="$RPM_OPT_FLAGS" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -./configure \ - --prefix=%{prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --sysconfdir=%{_sysconfdir} \ - --with-qt-libraries=/usr/%_lib/qt3/%_lib \ - --with-docdir=%{_docdir}/%{name} \ -%ifarch x86_64 ppc64 s390x - --enable-libsuffix=64 \ -%endif - --with-pythondir=%{_libdir}/python \ - --with-xinerama -make %{?jobs:-j %jobs} +mkdir build +cd build +export CXXFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="$CXXFLAGS" +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \ + -DCMAKE_SKIP_RPATH=TRUE -DDOCDIR=%{_docdir} -DLIB_INSTALL_DIR=%{_libdir} \ + -DLIB_SUFFIX=$(echo %_lib | cut -b4-) .. +make %install -#. /etc/opt/kde3/common_options -make DESTDIR=$RPM_BUILD_ROOT install +cd build +%makeinstall +cd .. mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} -cp AUTHORS COPYING ChangeLog NEWS README PACKAGING TODO $RPM_BUILD_ROOT%{_docdir}/%{name} -#suse_update_desktop_file -i %name Office WordProcessor -rm $RPM_BUILD_ROOT%{_libdir}/scribus/plugins/*.*a $RPM_BUILD_ROOT%{_libdir}/scribus/plugins/*/*.*a -install -d $RPM_BUILD_ROOT%{_datadir}/applications -install scribus.desktop $RPM_BUILD_ROOT%{_datadir}/applications/ -install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages -install scribus.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/scribus.xml -%suse_update_desktop_file scribus +install -m 644 -D $RPM_BUILD_ROOT/usr/share/scribus/icons/scribusicon.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/scribusicon.png +%suse_update_desktop_file %name Office WordProcessor +install -m 644 -D scribus.desktop $RPM_BUILD_ROOT%{_datadir}/applications/scribus.desktop +install -m 644 -D scribus.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/scribus.xml %post if [ -f /usr/bin/update-mime-database ]; then @@ -152,25 +108,21 @@ %files %defattr(-, root, root) -%doc %{_docdir}/%{name} +%doc AUTHORS ChangeLog NEWS README TODO %{_bindir}/* /usr/share/applications/*.desktop /usr/share/man/man?/*.* /usr/share/man/*/man?/*.* -/usr/share/pixmaps/* %{_libdir}/scribus %{_prefix}/share/mime/packages/*.xml %{_prefix}/share/scribus -%{_prefix}/share/doc/scribus-%{version} -# This should be owned by filesystem or man, but there are only scribus files: -%lang(pl) %dir /usr/share/man/pl -%lang(pl) %dir /usr/share/man/pl/man1 - -%files devel -%defattr(-, root, root) -%{_prefix}/include/scribus +/usr/share/icons/hicolor/48x48/apps/scribusicon.png +%dir /usr/share/man/pl +%dir /usr/share/man/pl/man1 %changelog +* Wed Jun 27 2007 - dmueller(a)suse.de +- build against cmake to fix various issues * Wed Jun 13 2007 - ltinkl(a)suse.cz - update to 1.3.3.9 bugfix release - many bugfixes ++++++ lib64.diff ++++++ --- CMakeLists.txt +++ CMakeLists.txt @@ -79,9 +79,9 @@ SET(SCRIPTSDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/scripts/") ADD_DEFINITIONS("-DSCRIPTSDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SCRIPTSDIR}\\\"") SET(TEMPLATEDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/templates/") ADD_DEFINITIONS("-DTEMPLATEDIR=\\\"${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR}\\\"") -SET(LIBDIR "lib/${MAIN_DIR_NAME}${TAG_VERSION}/") +SET(LIBDIR "lib${LIB_SUFFIX}/${MAIN_DIR_NAME}${TAG_VERSION}/") ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"") -SET(PLUGINDIR "lib/${MAIN_DIR_NAME}${TAG_VERSION}/plugins/") +SET(PLUGINDIR "lib${LIB_SUFFIX}/${MAIN_DIR_NAME}${TAG_VERSION}/plugins/") ADD_DEFINITIONS("-DPLUGINDIR=\\\"${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}\\\"") set(CMAKE_INSTALL_RPATH ${PLUGINDIR}) --- scribus/CMakeLists.txt +++ scribus/CMakeLists.txt @@ -438,4 +438,4 @@ ENDIF(RENDER_LIB STREQUAL "LIBART") INSTALL(TARGETS ${EXE_NAME} RUNTIME DESTINATION bin - LIBRARY DESTINATION lib) + LIBRARY DESTINATION lib${LIB_SUFFIX}) ++++++ scribus-1.3.3.9-no-rpath.diff ++++++ --- CMakeLists.txt +++ CMakeLists.txt @@ -7,7 +7,7 @@ SET(CMAKE_COLOR_MAKEFILE ON) SET(CMAKE_VERBOSE_MAKEFILE ON) SET(CMAKE_INCLUDE_CURRENT_DIR TRUE) -SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) +SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) #SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) #SET(CMAKE_SKIP_RPATH:BOOL NO) SET(CMAKE_SKIP_RULE_DEPENDENCY TRUE) @@ -69,7 +69,7 @@ SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/") ENDIF (TAG_VERSION) ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"") -SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") +SET(DOCDIR "share/doc/packages/${MAIN_DIR_NAME}${TAG_VERSION}/") ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") SET(ICONDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/icons/") ADD_DEFINITIONS("-DICONDIR=\\\"${CMAKE_INSTALL_PREFIX}/${ICONDIR}\\\"") ++++++ string-compare.diff ++++++ --- scribus/plugins/scriptplugin/cmdcolor.cpp +++ scribus/plugins/scriptplugin/cmdcolor.cpp @@ -147,7 +147,7 @@ PyObject *scribus_delcolor(PyObject* /* self */, PyObject* args) char *Repl = const_cast<char*>(CommonStrings::None.latin1()); if (!PyArg_ParseTuple(args, "es|es", "utf-8", &Name, "utf-8", &Repl)) return NULL; - if (Name == "") + if (!*Name) { PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot delete a color with an empty name.","python error")); return NULL; --- scribus/plugins/scriptplugin/cmdmisc.cpp +++ scribus/plugins/scriptplugin/cmdmisc.cpp @@ -190,7 +190,7 @@ PyObject *scribus_senttolayer(PyObject* /* self */, PyObject* args) return NULL; if(!checkHaveDocument()) return NULL; - if (Layer == "") + if (!*Layer) { PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot have an empty layer name.","python error")); return NULL; @@ -229,7 +229,7 @@ PyObject *scribus_layervisible(PyObject* /* self */, PyObject* args) return NULL; if(!checkHaveDocument()) return NULL; - if (Name == "") + if (!*Name) { PyErr_SetString(PyExc_ValueError, QString("Cannot have an empty layer name")); return NULL; @@ -261,7 +261,7 @@ PyObject *scribus_layerprint(PyObject* /* self */, PyObject* args) return NULL; if(!checkHaveDocument()) return NULL; - if (Name == "") + if (!*Name) { PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot have an empty layer name.","python error")); return NULL; @@ -292,7 +292,7 @@ PyObject *scribus_glayervisib(PyObject* /* self */, PyObject* args) return NULL; if(!checkHaveDocument()) return NULL; - if (Name == "") + if (!*Name) { PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot have an empty layer name.","python error")); return NULL; @@ -323,7 +323,7 @@ PyObject *scribus_glayerprint(PyObject* /* self */, PyObject* args) return NULL; if(!checkHaveDocument()) return NULL; - if (Name == "") + if (!*Name) { PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot have an empty layer name.","python error")); return NULL; @@ -355,7 +355,7 @@ PyObject *scribus_removelayer(PyObject* /* self */, PyObject* args) return NULL; if(!checkHaveDocument()) return NULL; - if (Name == "") + if (!*Name) { PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot have an empty layer name.","python error")); return NULL; @@ -410,7 +410,7 @@ PyObject *scribus_createlayer(PyObject* /* self */, PyObject* args) return NULL; if(!checkHaveDocument()) return NULL; - if (Name == "") + if (!*Name) { PyErr_SetString(PyExc_ValueError, QObject::tr("Cannot create layer without a name.","python error")); return NULL; --- scribus/plugins/scriptplugin/cmdobj.cpp +++ scribus/plugins/scriptplugin/cmdobj.cpp @@ -30,7 +30,7 @@ PyObject *scribus_newrect(PyObject* /* self */, PyObject* args) ScMW->doc->toolSettings.dWidth, ScMW->doc->toolSettings.dBrush, ScMW->doc->toolSettings.dPen, true); ScMW->doc->setRedrawBounding(ScMW->doc->Items->at(i)); - if (Name != "") + if (*Name) ScMW->doc->Items->at(i)->setItemName(QString::fromUtf8(Name)); return PyString_FromString(ScMW->doc->Items->at(i)->itemName().utf8()); } @@ -59,7 +59,7 @@ PyObject *scribus_newellipse(PyObject* /* self */, PyObject* args) return NULL; } ScMW->doc->setRedrawBounding(ScMW->doc->Items->at(i)); - if (Name != "") + if (*Name) ScMW->doc->Items->at(i)->setItemName(QString::fromUtf8(Name)); return PyString_FromString(ScMW->doc->Items->at(i)->itemName().utf8()); } @@ -86,7 +86,7 @@ PyObject *scribus_newimage(PyObject* /* self */, PyObject* args) return NULL; } ScMW->doc->setRedrawBounding(ScMW->doc->Items->at(i)); - if (Name != "") + if (*Name) ScMW->doc->Items->at(i)->setItemName(QString::fromUtf8(Name)); return PyString_FromString(ScMW->doc->Items->at(i)->itemName().utf8()); } @@ -113,7 +113,7 @@ PyObject *scribus_newtext(PyObject* /* self */, PyObject* args) return NULL; } ScMW->doc->setRedrawBounding(ScMW->doc->Items->at(i)); - if (Name != "") + if (*Name) ScMW->doc->Items->at(i)->setItemName(QString::fromUtf8(Name)); return PyString_FromString(ScMW->doc->Items->at(i)->itemName().utf8()); } @@ -151,7 +151,7 @@ PyObject *scribus_newline(PyObject* /* self */, PyObject* args) it->updateClip(); ScMW->doc->setRedrawBounding(it); it->OwnPage = ScMW->doc->OnPage(it); - if (Name != "") + if (*Name) it->setItemName(QString::fromUtf8(Name)); return PyString_FromString(it->itemName().utf8()); } @@ -224,7 +224,7 @@ PyObject *scribus_polyline(PyObject* /* self */, PyObject* args) } ScMW->view->SizeItem(it->PoLine.WidthHeight().x(), it->PoLine.WidthHeight().y(), ic, false, false, false); ScMW->view->AdjustItemSize(it); - if (Name != "") + if (*Name) { it->setItemName(QString::fromUtf8(Name)); } @@ -304,7 +304,7 @@ PyObject *scribus_polygon(PyObject* /* self */, PyObject* args) } ScMW->view->SizeItem(it->PoLine.WidthHeight().x(), it->PoLine.WidthHeight().y(), ic, false, false, false); ScMW->view->AdjustItemSize(it); - if (Name != "") + if (*Name) it->setItemName(QString::fromUtf8(Name)); return PyString_FromString(it->itemName().utf8()); } @@ -429,7 +429,7 @@ PyObject *scribus_pathtext(PyObject* /* self */, PyObject* args) PageItem *it = ScMW->doc->Items->at(i); ScMW->view->ToPathText(); ScMW->view->MoveItem(pageUnitXToDocX(x) - it->xPos(), pageUnitYToDocY(y) - it->yPos(), it); - if (Name != "") + if (*Name) it->setItemName(QString::fromUtf8(Name)); return PyString_FromString(it->itemName().utf8()); } @@ -532,7 +532,7 @@ PyObject *scribus_setstyle(PyObject* /* self */, PyObject* args) return NULL; } // for current item only - if (ScMW->doc->m_Selection->count() == 0 || name != "") + if (ScMW->doc->m_Selection->count() == 0 || *name) { // quick hack to always apply on the right frame - pv ScMW->view->Deselect(true); --- scribus/plugins/scriptplugin/cmdobj.cpp +++ scribus/plugins/scriptplugin/cmdobj.cpp @@ -391,7 +391,7 @@ PyObject *scribus_bezierline(PyObject* /* self */, PyObject* args) } ScMW->view->SizeItem(it->PoLine.WidthHeight().x(), it->PoLine.WidthHeight().y(), ic, false, false, false); ScMW->view->AdjustItemSize(it); - if (Name != "") + if (*Name) it->setItemName(QString::fromUtf8(Name)); return PyString_FromString(it->itemName().utf8()); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 procmail
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package procmail checked in at Thu Jun 28 19:39:45 CEST 2007. -------- --- procmail/procmail.changes 2007-01-08 13:34:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/procmail/procmail.changes 2007-06-28 14:51:43.215480000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 28 14:51:06 CEST 2007 - werner(a)suse.de + +- Be sure that standard programs are available in procmailrc + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procmail.spec ++++++ --- /var/tmp/diff_new_pack.q19302/_old 2007-06-28 19:37:14.000000000 +0200 +++ /var/tmp/diff_new_pack.q19302/_new 2007-06-28 19:37:14.000000000 +0200 @@ -15,9 +15,10 @@ URL: http://www.procmail.org/ License: Artistic License, GNU General Public License (GPL) Group: Productivity/Networking/Email/Clients +Requires: /usr/bin/mimencode /bin/sed /usr/bin/vacation Autoreqprov: on Version: 3.22 -Release: 83 +Release: 115 Summary: A program for local e-mail delivery Source: procmail-%{version}.tar.bz2 Patch0: procmail-%{version}-mailstat.patch @@ -72,7 +73,9 @@ %{_mandir}/man5/procmailrc.5.gz %{_mandir}/man5/procmailsc.5.gz -%changelog -n procmail +%changelog +* Thu Jun 28 2007 - werner(a)suse.de +- Be sure that standard programs are available in procmailrc * Mon Jan 08 2007 - werner(a)suse.de - Use only fcntl(2) for locking, do not mix with flock(2) (#231845) * Fri May 26 2006 - schwab(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pam-config
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package pam-config checked in at Thu Jun 28 19:39:03 CEST 2007. -------- --- pam-config/pam-config.changes 2007-01-29 13:29:19.000000000 +0100 +++ /mounts/work_src_done/STABLE/pam-config/pam-config.changes 2007-06-27 13:53:41.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 27 13:53:20 CEST 2007 - kukuk(a)suse.de + +- Version 0.16: + - Add support for pam_lastlog and pam_loginuid + +------------------------------------------------------------------- Old: ---- pam-config-0.15.tar.bz2 New: ---- pam-config-0.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam-config.spec ++++++ --- /var/tmp/diff_new_pack.X17566/_old 2007-06-28 19:36:38.000000000 +0200 +++ /var/tmp/diff_new_pack.X17566/_new 2007-06-28 19:36:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package pam-config (Version 0.15) +# spec file for package pam-config (Version 0.16) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,13 +12,12 @@ Name: pam-config Summary: Modify common PAM configuration files -Version: 0.15 +Version: 0.16 Release: 1 License: GNU General Public License (GPL) Autoreqprov: on PreReq: pam >= 0.99 Requires: pam-modules >= 10.2 -Prefix: %{_prefix} Group: System/Management Source: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -86,7 +85,10 @@ %ghost %config %{_sysconfdir}/pam.d/common-password-pc %ghost %config %{_sysconfdir}/pam.d/common-session-pc -%changelog -n pam-config +%changelog +* Wed Jun 27 2007 - kukuk(a)suse.de +- Version 0.16: + - Add support for pam_lastlog and pam_loginuid * Mon Jan 29 2007 - kukuk(a)suse.de - Version 0.15: - Fix -d handling of minlen option of pam_pwcheck ++++++ pam-config-0.15.tar.bz2 -> pam-config-0.16.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/ChangeLog new/pam-config-0.16/ChangeLog --- old/pam-config-0.15/ChangeLog 2007-01-29 13:25:20.000000000 +0100 +++ new/pam-config-0.16/ChangeLog 2007-06-27 13:34:16.000000000 +0200 @@ -1,3 +1,30 @@ +2007-06-27 Thorsten Kukuk <kukuk(a)suse.de> + + * release version 0.16 + + * src/mod_pam_lastlog.c: New file to support pam_lastlog.so. + * src/pam-config.c: Add options for pam_lastlog.so. + * src/pam-config.h: Likewise. + * src/write_config_session.c: Call pam_lastlog_modify. + + * src/load_single_config.c: New file. + * src/mod_pam_loginuid.c: New file. + * src/pam-config.c: Add options for pam_loginuid.so. + * src/pam-config.h: Likewise. + * src/write_config_session.c: Call pam_loginuid_modify. + * src/Makefile.am: Add mod_pam_loginuid.c and load_single_config.c. + + * src/pam-config.8.xml: Document new options. + +2007-06-14 Thorsten Kukuk <kukuk(a)suse.de> + + * src/load_config.c (print_unknown_option_error): New function + to simplify translations. + +2007-01-29 Thorsten Kukuk <kukuk(a)suse.de> + + * src/pam-config.8.xml: Remove NIS references. + 2007-01-29 Thorsten Kukuk <kukuk(a)suse.de> * release version 0.15 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/config.guess new/pam-config-0.16/config.guess --- old/pam-config-0.15/config.guess 2006-07-24 11:16:20.000000000 +0200 +++ new/pam-config-0.16/config.guess 2007-06-25 15:25:13.000000000 +0200 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-05-13' +timestamp='2006-07-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -221,7 +221,7 @@ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -800,10 +800,10 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) + x86:Interix*:[3456]*) echo i586-pc-interix${UNAME_RELEASE} exit ;; - EM64T:Interix*:[345]*) + EM64T:Interix*:[3456]*) echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) @@ -841,6 +841,9 @@ arm*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu exit ;; @@ -979,7 +982,7 @@ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff" exit ;; "") - # Either a pre-BFD a.out linker (linuxoldld) or + # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld" exit ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/config.sub new/pam-config-0.16/config.sub --- old/pam-config-0.15/config.sub 2006-07-24 11:16:20.000000000 +0200 +++ new/pam-config-0.16/config.sub 2007-06-25 15:25:13.000000000 +0200 @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-05-13' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -241,7 +241,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -276,6 +276,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | score \ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ @@ -284,7 +285,7 @@ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -317,7 +318,7 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ @@ -367,7 +368,7 @@ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) @@ -909,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -1214,7 +1219,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1366,6 +1371,9 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; spu-*) os=-elf ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/configure new/pam-config-0.16/configure --- old/pam-config-0.15/configure 2007-01-29 13:29:34.000000000 +0100 +++ new/pam-config-0.16/configure 2007-06-27 13:44:05.000000000 +0200 @@ -2056,7 +2056,7 @@ # Define the identity of the package. PACKAGE="pam-config" - VERSION=0.15 + VERSION=0.16 cat >>confdefs.h <<_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/configure.in new/pam-config-0.16/configure.in --- old/pam-config-0.15/configure.in 2007-01-29 13:27:51.000000000 +0100 +++ new/pam-config-0.16/configure.in 2007-06-27 13:43:55.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/pam-config.c) -AM_INIT_AUTOMAKE("pam-config", 0.15) +AM_INIT_AUTOMAKE("pam-config", 0.16) AM_CONFIG_HEADER(config.h) AC_PREFIX_DEFAULT(/usr) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/depcomp new/pam-config-0.16/depcomp --- old/pam-config-0.15/depcomp 2006-08-21 14:02:41.000000000 +0200 +++ new/pam-config-0.16/depcomp 2007-06-25 15:25:13.000000000 +0200 @@ -1,9 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-07-09.11 +scriptversion=2006-10-15.18 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software +# Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -91,7 +92,20 @@ ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" stat=$? if test $stat -eq 0; then : else @@ -276,6 +290,46 @@ rm -f "$tmpdepfile" ;; +hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. + sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. @@ -288,13 +342,13 @@ if test "$libtool" = yes; then # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to + # static library. This mechanism is used in libtool 1.4 series to # handle both shared and static libraries in a single compilation. # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. # # With libtool 1.5 this exception was removed, and libtool now # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and + # compilations output dependencies in $dir.libs/$base.o.d and # in $dir$base.o.d. We have to check for both files, because # one of the two compilations can be disabled. We should prefer # $dir$base.o.d over $dir.libs/$base.o.d because the latter is diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/INSTALL new/pam-config-0.16/INSTALL --- old/pam-config-0.15/INSTALL 2006-08-21 14:02:41.000000000 +0200 +++ new/pam-config-0.16/INSTALL 2007-06-25 15:25:13.000000000 +0200 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -10,7 +10,10 @@ Basic Installation ================== -These are generic installation instructions. +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -23,9 +26,9 @@ It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is +the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale -cache files.) +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -35,20 +38,17 @@ may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -78,7 +78,7 @@ by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. @@ -87,17 +87,15 @@ You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. Installation Names ================== @@ -190,12 +188,12 @@ ./configure CC=/usr/local2/bin/gcc causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: +overridden in the site shell script). - /bin/bash ./configure CONFIG_SHELL=/bin/bash +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/missing new/pam-config-0.16/missing --- old/pam-config-0.15/missing 2006-08-21 14:02:40.000000000 +0200 +++ new/pam-config-0.16/missing 2007-06-25 15:25:13.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/NEWS new/pam-config-0.16/NEWS --- old/pam-config-0.15/NEWS 2007-01-29 13:28:32.000000000 +0100 +++ new/pam-config-0.16/NEWS 2007-06-27 13:43:43.000000000 +0200 @@ -4,6 +4,9 @@ Please send bug reports, questions and suggestions to <kukuk(a)thkukuk.de>. +Version 0.16: +* Add support for pam_loginuid.so and pam_lastlog.so + Version 0.15: * Fix -d handling of minlen option of pam_pwcheck diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/po/pam-config.pot new/pam-config-0.16/po/pam-config.pot --- old/pam-config-0.15/po/pam-config.pot 2007-01-29 13:25:59.000000000 +0100 +++ new/pam-config-0.16/po/pam-config.pot 2007-06-27 13:34:35.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-29 13:25+0100\n" +"POT-Creation-Date: 2007-06-27 13:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -16,53 +16,19 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/load_config.c:73 +#. TRANSLATORS: first argument is name of a PAM module +#: src/load_config.c:35 #, c-format -msgid "Unknown option for pam_pwcheck.so, ignored: '%s'\n" +msgid "Unknown option for %s, ignored: '%s'\n" msgstr "" -#: src/load_config.c:104 -#, c-format -msgid "Unknown option for pam_unix2.so, ignored: '%s'\n" -msgstr "" - -#: src/load_config.c:132 -#, c-format -msgid "Unknown option for pam_krb5.so, ignored: '%s'\n" -msgstr "" - -#: src/load_config.c:158 -#, c-format -msgid "Unknown option for pam_ldap.so, ignored: '%s'\n" -msgstr "" - -#: src/load_config.c:184 -#, c-format -msgid "Unknown option for pam_winbind.so, ignored: '%s'\n" -msgstr "" - -#: src/load_config.c:210 -#, c-format -msgid "Unknown option for pam_cracklib.so, ignored: '%s'\n" -msgstr "" - -#: src/load_config.c:230 -#, c-format -msgid "Unknown option for pam_umask.so, ignored: '%s'\n" -msgstr "" - -#: src/load_config.c:252 -#, c-format -msgid "Unknown option for pam_capability.so, ignored: '%s'\n" -msgstr "" - -#: src/load_config.c:360 src/load_config.c:367 src/load_config.c:380 -#: src/load_config.c:387 +#: src/load_config.c:352 src/load_config.c:359 src/load_config.c:372 +#: src/load_config.c:379 #, c-format msgid "%s (%s): Arguments will be ignored\n" msgstr "" -#: src/load_config.c:450 +#: src/load_config.c:442 #, c-format msgid "%s: Unknown module %s, ignored!\n" msgstr "" @@ -176,14 +142,14 @@ msgid " -v, --version Print program version\n" msgstr "" -#: src/pam-config.c:98 src/pam-config.c:135 src/pam-config.c:890 -#: src/pam-config.c:900 src/pam-config.c:910 src/pam-config.c:921 +#: src/pam-config.c:98 src/pam-config.c:135 src/pam-config.c:922 +#: src/pam-config.c:932 src/pam-config.c:942 src/pam-config.c:953 #, c-format msgid "Error activating %s (%m)\n" msgstr "" -#: src/pam-config.c:100 src/pam-config.c:137 src/pam-config.c:892 -#: src/pam-config.c:902 src/pam-config.c:912 src/pam-config.c:923 +#: src/pam-config.c:100 src/pam-config.c:137 src/pam-config.c:924 +#: src/pam-config.c:934 src/pam-config.c:944 src/pam-config.c:955 #, c-format msgid "New config from %s is not in use!\n" msgstr "" @@ -198,14 +164,14 @@ msgid "New config from %s is is not in use!\n" msgstr "" -#: src/pam-config.c:225 src/pam-config.c:259 +#: src/pam-config.c:224 src/pam-config.c:258 #, c-format msgid "" "\n" "Couldn't load config file, aborted!\n" msgstr "" -#: src/pam-config.c:781 +#: src/pam-config.c:813 #, c-format msgid "%s: Too many arguments.\n" msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/src/load_config.c new/pam-config-0.16/src/load_config.c --- old/pam-config-0.15/src/load_config.c 2007-01-26 16:12:23.000000000 +0100 +++ new/pam-config-0.16/src/load_config.c 2007-06-21 14:03:29.000000000 +0200 @@ -29,6 +29,14 @@ #include "pam-config.h" static void +print_unknown_option_error (const char *module, const char *option) +{ + /* TRANSLATORS: first argument is name of a PAM module */ + fprintf (stderr, _("Unknown option for %s, ignored: '%s'\n"), + module, option); +} + +static void parse_pwcheck_options (config_file_t *conf, char *args) { while (args && strlen (args) > 0) @@ -69,9 +77,7 @@ else if (strcmp (cp, "no_obscure_checks") == 0) conf->pwcheck_no_obscure_checks = 1; else - fprintf (stderr, - _("Unknown option for pam_pwcheck.so, ignored: '%s'\n"), - cp); + print_unknown_option_error ("pam_pwcheck.so", cp); } return; } @@ -100,9 +106,7 @@ /* XXX strip krb5 and ldap modules from it */ conf->unix2_call_modules = strdup (&cp[13]); else - fprintf (stderr, - _("Unknown option for pam_unix2.so, ignored: '%s'\n"), - cp); + print_unknown_option_error ("pam_unix2.so", cp); } return; } @@ -128,9 +132,7 @@ else if (strcmp (cp, "ignore_unknown_principals") == 0) conf->krb5_ignore_unknown_principals = 1; else - fprintf (stderr, - _("Unknown option for pam_krb5.so, ignored: '%s'\n"), - cp); + print_unknown_option_error ("pam_krb5.so", cp); } return; } @@ -154,9 +156,7 @@ else if (strcmp (cp, "use_first_pass") == 0) { /* will be ignored */ } else - fprintf (stderr, - _("Unknown option for pam_ldap.so, ignored: '%s'\n"), - cp); + print_unknown_option_error ("pam_ldap.so", cp); } return; } @@ -180,9 +180,7 @@ else if (strcmp (cp, "use_first_pass") == 0) { /* will be ignored */ } else - fprintf (stderr, - _("Unknown option for pam_winbind.so, ignored: '%s'\n"), - cp); + print_unknown_option_error ("pam_winbind.so", cp); } return; } @@ -206,9 +204,7 @@ else if (strncmp (cp, "retry=", 6) == 0) conf->cracklib_retry = atoi (&cp[6]); else - fprintf (stderr, - _("Unknown option for pam_cracklib.so, ignored: '%s'\n"), - cp); + print_unknown_option_error ("pam_cracklib.so", cp); } return; } @@ -226,9 +222,7 @@ if (strcmp (cp, "debug") == 0) conf->umask_debug = 1; else - fprintf (stderr, - _("Unknown option for pam_umask.so, ignored: '%s'\n"), - cp); + print_unknown_option_error ("pam_umask.so", cp); } return; } @@ -248,9 +242,7 @@ else if (strncmp (cp, "conf=", 5) == 0) conf->capability_conf = strdup (&cp[5]); else - fprintf (stderr, - _("Unknown option for pam_capability.so, ignored: '%s'\n"), - cp); + print_unknown_option_error ("pam_capability.so", cp); } return; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/src/load_single_config.c new/pam-config-0.16/src/load_single_config.c --- old/pam-config-0.15/src/load_single_config.c 1970-01-01 01:00:00.000000000 +0100 +++ new/pam-config-0.16/src/load_single_config.c 2007-06-27 11:34:23.000000000 +0200 @@ -0,0 +1,94 @@ +/* Copyright (C) 2007 Thorsten Kukuk + Author: Thorsten Kukuk <kukuk(a)thkukuk.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <errno.h> +#include <stdio.h> +#include <ctype.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> + +#include "pam-config.h" + + +int +load_single_config (const char *config_name, config_content_t **ptr) +{ + char *file; + FILE *fp; + char *buf = NULL; + size_t buflen = 0; + config_content_t *cptr = NULL; + + *ptr = NULL; + + if (asprintf (&file, CONFDIR"/pam.d/%s", config_name) < 0) + return -1; + + if (debug) + printf ("*** load_single_config (%s)\n", file); + + fp = fopen(file, "r"); + if (fp == NULL) + { + int err = errno; + + free (file); + + if (err == ENOENT) + return 0; + else + return -1; + } + + free (file); + + while (!feof (fp)) + { + ssize_t n = getline (&buf, &buflen, fp); + + if (n < 1) + break; + + if (debug) + printf ("READ: %s", buf); + + if (cptr == NULL) + { + cptr = malloc (sizeof (config_content_t)); + *ptr = cptr; + } + else + { + cptr->next = malloc (sizeof (config_content_t)); + cptr = cptr->next; + } + cptr->line = strdup (buf); + cptr->next = NULL; + } + + fclose (fp); + + if (buf) + free (buf); + + return 0; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/src/Makefile.am new/pam-config-0.16/src/Makefile.am --- old/pam-config-0.15/src/Makefile.am 2006-08-22 17:24:15.000000000 +0200 +++ new/pam-config-0.16/src/Makefile.am 2007-06-27 13:47:48.000000000 +0200 @@ -19,12 +19,13 @@ pam_config_SOURCES = pam-config.c load_config.c write_config_session.c \ write_config_password.c write_config_auth.c write_config_account.c \ - load_obsolete_conf.c sanity_checks.c print_module.c + load_obsolete_conf.c sanity_checks.c print_module.c \ + load_single_config.c mod_pam_loginuid.c mod_pam_lastlog.c noinst_HEADERS = pam-config.h if ENABLE_REGENERATE_MAN -%.8: %.8.xml +pam-config.8: pam-config.8.xml $(XMLLINT) --nonet --xinclude --postvalid --noout $< $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/src/Makefile.in new/pam-config-0.16/src/Makefile.in --- old/pam-config-0.15/src/Makefile.in 2007-01-29 13:29:34.000000000 +0100 +++ new/pam-config-0.16/src/Makefile.in 2007-06-27 13:47:53.000000000 +0200 @@ -61,7 +61,8 @@ write_config_session.$(OBJEXT) write_config_password.$(OBJEXT) \ write_config_auth.$(OBJEXT) write_config_account.$(OBJEXT) \ load_obsolete_conf.$(OBJEXT) sanity_checks.$(OBJEXT) \ - print_module.$(OBJEXT) + print_module.$(OBJEXT) load_single_config.$(OBJEXT) \ + mod_pam_loginuid.$(OBJEXT) mod_pam_lastlog.$(OBJEXT) pam_config_OBJECTS = $(am_pam_config_OBJECTS) pam_config_LDADD = $(LDADD) DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ @@ -197,7 +198,8 @@ XMLS = pam-config.8.xml pam_config_SOURCES = pam-config.c load_config.c write_config_session.c \ write_config_password.c write_config_auth.c write_config_account.c \ - load_obsolete_conf.c sanity_checks.c print_module.c + load_obsolete_conf.c sanity_checks.c print_module.c \ + load_single_config.c mod_pam_loginuid.c mod_pam_lastlog.c noinst_HEADERS = pam-config.h all: all-am @@ -213,9 +215,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits src/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnits src/Makefile + $(AUTOMAKE) --gnu src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -256,22 +258,6 @@ clean-sbinPROGRAMS: -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS) - -installcheck-sbinPROGRAMS: $(sbin_PROGRAMS) - bad=0; pid=$$$$; list="$(sbin_PROGRAMS)"; for p in $$list; do \ - case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ - *" $$p "* | *" $(srcdir)/$$p "*) continue;; \ - esac; \ - f=`echo "$$p" | \ - sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - for opt in --help --version; do \ - if "$(DESTDIR)$(sbindir)/$$f" $$opt >c$${pid}_.out \ - 2>c$${pid}_.err </dev/null \ - && test -n "`cat c$${pid}_.out`" \ - && test -z "`cat c$${pid}_.err`"; then :; \ - else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ - done; \ - done; rm -f c$${pid}_.???; exit $$bad pam-config$(EXEEXT): $(pam_config_OBJECTS) $(pam_config_DEPENDENCIES) @rm -f pam-config$(EXEEXT) $(LINK) $(pam_config_OBJECTS) $(pam_config_LDADD) $(LIBS) @@ -284,6 +270,9 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_config.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_obsolete_conf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/load_single_config.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_lastlog.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mod_pam_loginuid.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam-config.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print_module.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sanity_checks.Po@am__quote@ @@ -493,7 +482,7 @@ install-ps: install-ps-am -installcheck-am: installcheck-sbinPROGRAMS +installcheck-am: maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) @@ -526,15 +515,14 @@ install-exec-am install-html install-html-am install-info \ install-info-am install-man install-man8 install-pdf \ install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \ - install-strip installcheck installcheck-am \ - installcheck-sbinPROGRAMS installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-man uninstall-man8 \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-man uninstall-man8 \ uninstall-sbinPROGRAMS -@ENABLE_REGENERATE_MAN_TRUE@%.8: %.8.xml +@ENABLE_REGENERATE_MAN_TRUE@pam-config.8: pam-config.8.xml @ENABLE_REGENERATE_MAN_TRUE@ $(XMLLINT) --nonet --xinclude --postvalid --noout $< @ENABLE_REGENERATE_MAN_TRUE@ $(XSLTPROC) -o $(srcdir)/$@ --path $(srcdir) --xinclude --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/src/mod_pam_lastlog.c new/pam-config-0.16/src/mod_pam_lastlog.c --- old/pam-config-0.15/src/mod_pam_lastlog.c 1970-01-01 01:00:00.000000000 +0100 +++ new/pam-config-0.16/src/mod_pam_lastlog.c 2007-06-27 13:27:05.000000000 +0200 @@ -0,0 +1,141 @@ +/* Copyright (C) 2007 Thorsten Kukuk + Author: Thorsten Kukuk <kukuk(a)thkukuk.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <sys/stat.h> + +#include <pam-config.h> + +void +print_module_lastlog (const char *service) +{ + config_content_t *ptr; + + load_single_config (service, &ptr); + + while (ptr != NULL) + { + if (strcasestr (ptr->line, "pam_lastlog.so") != NULL) + { + printf ("session:"); + printf ("\n"); + } + ptr = ptr->next; + } +} + + +int +pam_lastlog_modify (config_file_t *conf) +{ + FILE *fp; + int fd; + struct stat f_stat; + config_content_t *ptr; + int is_written = 0; + char *tmp_file = strdup (CONFDIR"/pam.d/pam-config.tmpXXXXXX"); + char *conffile, *oldfile; + + if (!conf->modify_lastlog) + return 0; + + load_single_config (conf->lastlog_service, &ptr); + + if (ptr == NULL) /* no config found */ + return 1; + + if (asprintf (&conffile, CONFDIR"/pam.d/%s", conf->lastlog_service) < 0) + return 1; + + if (asprintf (&oldfile, CONFDIR"/pam.d/%s.old", conf->lastlog_service) < 0) + return 1; + + stat (conffile, &f_stat); + fd = mkstemp (tmp_file); + fp = fdopen (fd, "w"); + if (fchmod (fd, f_stat.st_mode) < 0) + { + fprintf (stderr, _("Cannot set permissions for '%s': %m\n"), + tmp_file); + return 1; + } + if (fchown (fd, f_stat.st_uid, f_stat.st_gid) < 0) + { + fprintf (stderr, + _("Cannot change owner/group for `%s': %m\n"), + tmp_file); + return 1; + } + + fp = fopen (tmp_file, "w"); + if (fp == NULL) + { + fprintf (stderr, _("Cannot create %s: %m\n"), + tmp_file); + return 1; + } + + while (ptr != NULL) + { + if (conf->use_lastlog) + { + /* don't write old pam_lastlog.so line */ + if (strcasestr (ptr->line, "pam_lastlog.so") == NULL) + fprintf (fp, "%s", ptr->line); + + if (!is_written) + { + if (strcasestr (ptr->line, "common-session") != NULL) + { + fprintf (fp, + "session required pam_lastlog.so nowtmp\n"); + is_written = 1; + } + } + } + else + { + if (strcasestr (ptr->line, "pam_lastlog.so") == NULL) + fprintf (fp, "%s", ptr->line); + else + is_written = 1; + } + ptr = ptr->next; + } + + /* make sure we really write it if we have to add it. */ + if (!is_written && conf->use_lastlog) + { + fprintf (fp, "session required pam_lastlog.so nowtmp\n"); + } + + rename (conffile, oldfile); + rename (tmp_file, conffile); + + free (tmp_file); + free (conffile); + free (oldfile); + + return 0; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/src/mod_pam_loginuid.c new/pam-config-0.16/src/mod_pam_loginuid.c --- old/pam-config-0.15/src/mod_pam_loginuid.c 1970-01-01 01:00:00.000000000 +0100 +++ new/pam-config-0.16/src/mod_pam_loginuid.c 2007-06-27 13:02:49.000000000 +0200 @@ -0,0 +1,149 @@ +/* Copyright (C) 2007 Thorsten Kukuk + Author: Thorsten Kukuk <kukuk(a)thkukuk.de> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> +#include <sys/stat.h> + +#include <pam-config.h> + +void +print_module_loginuid (const char *service) +{ + config_content_t *ptr; + + load_single_config (service, &ptr); + + while (ptr != NULL) + { + if (strcasestr (ptr->line, "pam_loginuid.so") != NULL) + { + printf ("session:"); + if (strcasestr (ptr->line, "require_auditd") != NULL) + printf (" require_auditd"); + printf ("\n"); + } + ptr = ptr->next; + } +} + + +int +pam_loginuid_modify (config_file_t *conf) +{ + FILE *fp; + int fd; + struct stat f_stat; + config_content_t *ptr; + int is_written = 0; + char *tmp_file = strdup (CONFDIR"/pam.d/pam-config.tmpXXXXXX"); + char *conffile, *oldfile; + + if (!conf->modify_loginuid) + return 0; + + load_single_config (conf->loginuid_service, &ptr); + + if (ptr == NULL) /* no config found */ + return 1; + + if (asprintf (&conffile, CONFDIR"/pam.d/%s", conf->loginuid_service) < 0) + return 1; + + if (asprintf (&oldfile, CONFDIR"/pam.d/%s.old", conf->loginuid_service) < 0) + return 1; + + stat (conffile, &f_stat); + fd = mkstemp (tmp_file); + fp = fdopen (fd, "w"); + if (fchmod (fd, f_stat.st_mode) < 0) + { + fprintf (stderr, _("Cannot set permissions for '%s': %m\n"), + tmp_file); + return 1; + } + if (fchown (fd, f_stat.st_uid, f_stat.st_gid) < 0) + { + fprintf (stderr, + _("Cannot change owner/group for `%s': %m\n"), + tmp_file); + return 1; + } + + fp = fopen (tmp_file, "w"); + if (fp == NULL) + { + fprintf (stderr, _("Cannot create %s: %m\n"), + tmp_file); + return 1; + } + + while (ptr != NULL) + { + if (conf->use_loginuid) + { + if (!is_written) + { + if (strcasestr (ptr->line, "session") != NULL) + { + if (conf->loginuid_require_auditd) + fprintf (fp, + "session required pam_loginuid.so require_auditd\n"); + else + fprintf (fp, "session required pam_loginuid.so\n"); + is_written = 1; + } + } + + /* don't write old pam_loginuid.so line */ + if (strcasestr (ptr->line, "pam_loginuid.so") == NULL) + fprintf (fp, "%s", ptr->line); + } + else + { + if (strcasestr (ptr->line, "pam_loginuid.so") == NULL) + fprintf (fp, "%s", ptr->line); + else + is_written = 1; + } + ptr = ptr->next; + } + + /* make sure we really write it if we have to add it. */ + if (!is_written && conf->use_loginuid) + { + if (conf->loginuid_require_auditd) + fprintf (fp, "session required pam_loginuid.so require_auditd\n"); + else + fprintf (fp, "session required pam_loginuid.so\n"); + } + + rename (conffile, oldfile); + rename (tmp_file, conffile); + + free (tmp_file); + free (conffile); + free (oldfile); + + return 0; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/src/pam-config.8 new/pam-config-0.16/src/pam-config.8 --- old/pam-config-0.15/src/pam-config.8 2007-01-29 13:26:01.000000000 +0100 +++ new/pam-config-0.16/src/pam-config.8 2007-06-27 13:48:04.000000000 +0200 @@ -1,17 +1,17 @@ -.\" Title: pam\-config +.\" Title: pam-config .\" Author: -.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/> -.\" Date: 01/29/2007 -.\" Manual: NIS Reference Manual -.\" Source: NIS Reference Manual +.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/> +.\" Date: 06/27/2007 +.\" Manual: Reference Manual +.\" Source: Reference Manual .\" -.TH "PAM\-CONFIG" "8" "01/29/2007" "NIS Reference Manual" "NIS Reference Manual" +.TH "PAM\-CONFIG" "8" "06/27/2007" "Reference Manual" "Reference Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -pam\-config \- create or dump a ypserv database file +pam\-config \- Adjust common PAM config files .SH "SYNOPSIS" .HP 11 \fBpam\-config\fR [\-\-debug] \-a | \-c | \-d | \-q [\-f] [...] @@ -347,6 +347,26 @@ .RS 4 Specify a different config file for pam_capability.so. .RE +.PP +\fB\-\-loginuid=\fR\fIservice\fR +.RS 4 +Enable/Disable pam_loginuid.so module in session section of +\fBservice\fR. +.RE +.PP +\fB\-\-loginuid\-require\-auditd\fR +.RS 4 +Add +\fBrequire_auditd\fR +option to pam_loginuid.so, can only be used together with +\fB\-\-loginuid\fR. +.RE +.PP +\fB\-\-lastlog=\fR\fIservice\fR +.RS 4 +Enable/Disable pam_lastlog.so module in session section of +\fBservice\fR. +.RE .SH "SEE ALSO" .PP diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/src/pam-config.8.xml new/pam-config-0.16/src/pam-config.8.xml --- old/pam-config-0.15/src/pam-config.8.xml 2007-01-29 13:24:56.000000000 +0100 +++ new/pam-config-0.16/src/pam-config.8.xml 2007-06-27 13:48:01.000000000 +0200 @@ -7,12 +7,12 @@ <refmeta> <refentrytitle>pam-config</refentrytitle> <manvolnum>8</manvolnum> - <refmiscinfo class='setdesc'>NIS Reference Manual</refmiscinfo> + <refmiscinfo class='setdesc'>Reference Manual</refmiscinfo> </refmeta> <refnamediv id='name'> <refname>pam-config</refname> - <refpurpose>create or dump a ypserv database file</refpurpose> + <refpurpose>Adjust common PAM config files</refpurpose> </refnamediv>  @@ -503,6 +503,31 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><option>--loginuid=</option><replaceable>service</replaceable></term> + <listitem> + <para> + Enable/Disable pam_loginuid.so module in session section of <option>service</option>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--loginuid-require-auditd</option></term> + <listitem> + <para> + Add <option>require_auditd</option> option to pam_loginuid.so, can only be used together with + <option>--loginuid</option>. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><option>--lastlog=</option><replaceable>service</replaceable></term> + <listitem> + <para> + Enable/Disable pam_lastlog.so module in session section of <option>service</option>. + </para> + </listitem> + </varlistentry> </variablelist> </refsect1> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/src/pam-config.c new/pam-config-0.16/src/pam-config.c --- old/pam-config-0.15/src/pam-config.c 2007-01-29 13:23:03.000000000 +0100 +++ new/pam-config-0.16/src/pam-config.c 2007-06-27 13:25:54.000000000 +0200 @@ -176,7 +176,6 @@ argv++; } - if (argc < 2) { print_error (program); @@ -324,6 +323,9 @@ {"capability", no_argument, NULL, 2400 }, {"capability-debug", no_argument, NULL, 2401 }, {"capability-conf", required_argument, NULL, 2402 }, + {"loginuid", required_argument, NULL, 2450 }, + {"loginuid-require_auditd", no_argument, NULL, 2451 }, + {"lastlog", required_argument, NULL, 2460 }, {"debug", no_argument, NULL, 254 }, {"help", no_argument, NULL, 255 }, {NULL, 0, NULL, 0 } @@ -755,6 +757,36 @@ case 2402: config_password.capability_conf = optarg; break; + case 2450: + /* pam_loginuid.so */ + if (m_query) + print_module_loginuid (optarg); + else + { + if (check_for_pam_module ("pam_loginuid.so", force) != 0) + return 1; + config_session.use_loginuid = opt_val; + config_session.loginuid_service = optarg; + config_session.modify_loginuid = 1; + } + break; + case 2451: + config_session.modify_loginuid = 1; + config_password.loginuid_require_auditd = opt_val; + break; + case 2460: + /* pam_lastlog.so */ + if (m_query) + print_module_lastlog (optarg); + else + { + if (check_for_pam_module ("pam_lastlog.so", force) != 0) + return 1; + config_session.use_lastlog = opt_val; + config_session.lastlog_service = optarg; + config_session.modify_lastlog = 1; + } + break; case 254: debug = 1; break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/src/pam-config.h new/pam-config-0.16/src/pam-config.h --- old/pam-config-0.15/src/pam-config.h 2007-01-26 16:11:47.000000000 +0100 +++ new/pam-config-0.16/src/pam-config.h 2007-06-27 13:24:32.000000000 +0200 @@ -84,15 +84,32 @@ int use_capability; char *capability_conf; int capability_debug; + /* pam_loginuid, used by session, no common-*-pc file */ + int modify_loginuid; + int use_loginuid; + char *loginuid_service; + int loginuid_require_auditd; + /* pam_lastlog, used by session, no common-*-pc file */ + int modify_lastlog; + int use_lastlog; + char *lastlog_service; }; typedef struct config_file_t config_file_t; + +struct config_content_t { + char *line; + struct config_content_t *next; +}; +typedef struct config_content_t config_content_t; + extern int debug; int load_obsolete_conf (config_file_t *account, config_file_t *auth, config_file_t *password, config_file_t *session); int load_config (const char *file, const char *service, config_file_t *conf); +int load_single_config (const char *config_name, config_content_t **ptr); int write_config_account (const char *file, config_file_t *conf); int write_config_auth (const char *file, config_file_t *conf); int write_config_password (const char *file, config_file_t *conf); @@ -119,4 +136,11 @@ void print_module_umask (config_file_t *conf); void print_module_capability (config_file_t *conf); +void print_module_loginuid (const char *service); +void print_module_lastlog (const char *service); + +/* single config files */ +int pam_loginuid_modify (config_file_t *conf); +int pam_lastlog_modify (config_file_t *conf); + #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/src/write_config_session.c new/pam-config-0.16/src/write_config_session.c --- old/pam-config-0.15/src/write_config_session.c 2006-10-25 11:29:58.000000000 +0200 +++ new/pam-config-0.16/src/write_config_session.c 2007-06-27 13:18:30.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 Thorsten Kukuk +/* Copyright (C) 2006, 2007 Thorsten Kukuk Author: Thorsten Kukuk <kukuk(a)thkukuk.de> This program is free software; you can redistribute it and/or modify @@ -122,5 +122,8 @@ fclose (fp); + pam_loginuid_modify (conf); + pam_lastlog_modify (conf); + return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam-config-0.15/TODO new/pam-config-0.16/TODO --- old/pam-config-0.15/TODO 2007-01-26 15:11:09.000000000 +0100 +++ new/pam-config-0.16/TODO 2007-06-21 14:03:29.000000000 +0200 @@ -2,4 +2,16 @@ - call_modules= from pam_unix2.conf can have more than one entry - call_modules= from common-*-pc: strip of ldap and krb5 -- Add flag to add pam_loginuid to all relevant PAM config files +- Implement support for adding pam_loginuid to all relevant PAM + config files + +- Add minclass option for pam_cracklib + +- Add pam_mount support + +- Add plain pam_unix support + +- pam-config should print a list of all supported modules + currently only mentioned in the manual page + +- Sort modules in manual page alphabetical. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pdftk
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package pdftk checked in at Thu Jun 28 19:37:07 CEST 2007. -------- --- pdftk/pdftk.changes 2006-01-25 21:39:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/pdftk/pdftk.changes 2007-06-27 22:23:12.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 27 22:23:05 CEST 2007 - rguenther(a)suse.de + +- remove libgcj requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdftk.spec ++++++ --- /var/tmp/diff_new_pack.O18014/_old 2007-06-28 19:36:43.000000000 +0200 +++ /var/tmp/diff_new_pack.O18014/_new 2007-06-28 19:36:43.000000000 +0200 @@ -1,11 +1,11 @@ # # spec file for package pdftk (Version 1.12) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -14,21 +14,20 @@ BuildRequires: gcc-c++ gcc-java Summary: The PDF Toolkit Version: 1.12 -Release: 6 -License: GPL +Release: 82 +License: GNU General Public License (GPL) URL: http://www.accesspdf.com/pdftk/ Source0: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}.patch Group: Productivity/Publishing/PDF BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libgcj %description -Pdftk is a command-line tool for manipulating PDF documents. Use it to -merge, split PDF pages into a new document, decrypt input as necessary -(password required), encrypt output as desired, fill PDF forms with FDF -data, flatten forms, apply a background watermark, repair a corrupted -PDF (where possible), and many others. +Pdftk is a command line tool for manipulating PDF documents. Use it to +merge PDF files, split PDF pages into a new document, decrypt input as +necessary (password required), encrypt output as desired, fill PDF +forms with FDF data, flatten forms, apply a background watermark, +repair a corrupted PDF (where possible), and much more. @@ -61,7 +60,9 @@ %{_bindir}/* %{_mandir}/man1/* -%changelog -n pdftk +%changelog +* Wed Jun 27 2007 - rguenther(a)suse.de +- remove libgcj requires * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Nov 02 2005 - dmueller(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 osc
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package osc checked in at Thu Jun 28 19:36:31 CEST 2007. -------- --- osc/osc.changes 2007-06-14 16:32:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/osc/osc.changes 2007-06-26 15:22:35.000000000 +0200 @@ -1,0 +2,26 @@ +Tue Jun 26 15:22:08 CEST 2007 - poeml(a)suse.de + +- update to r1783: + - build: don't stumble over an empty list of packages when trying to verify packages + - ls: add verbose option to print extra information for packages + - for ls, co, meta, editmeta, linkpac, copypac, rebuildpac, and wipebinaries + (basically all the server-side commands), allow arguments "foo/bar" instead + of "foo bar" + +------------------------------------------------------------------- +Fri Jun 22 15:23:24 CEST 2007 - poeml(a)suse.de + +- update to r1769: + fix return values in metafile.sync() which I broke whey I applied + Marcus Huewe's patch... + +------------------------------------------------------------------- +Thu Jun 21 17:15:54 CEST 2007 - poeml(a)suse.de + +- update to r1763: + - set correct Content-Type header on PUT requests + (application/octet-stream). Rails 1.2 seems to be more strict + in this regard. Patch from Marcus Rueckert. + - init: make usage (and usage info) info more precise + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.m13434/_old 2007-06-28 19:35:56.000000000 +0200 +++ /var/tmp/diff_new_pack.m13434/_new 2007-06-28 19:35:56.000000000 +0200 @@ -13,7 +13,7 @@ Name: osc BuildRequires: python-devel Version: 0.96 -Release: 24 +Release: 26 Group: Development/Tools/Other License: GNU General Public License (GPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -21,12 +21,22 @@ # v=0.96; svn export https://forgesvn1.novell.com/svn/opensuse/trunk/buildservice/src/clientlib/… osc-$v; tar czf osc-$v.tar.gz osc-$v Source: osc-%{version}.tar.gz Summary: openSUSE (build service) commander -%if %{?suse_version:%suse_version}%{?!suse_version:1} < 1020 +Requires: python-urlgrabber +# +%if 0%{?suse_version} +%if %suse_version < 1020 Requires: python-elementtree %else Requires: python-xml %endif -Requires: python-urlgrabber +%endif +# +%if 0%{?fedora_version} +%if %fedora_version < 7 +Requires: python-elementtree +%endif +%endif +# %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %description @@ -63,6 +73,23 @@ %doc README TODO NEWS %changelog +* Tue Jun 26 2007 - poeml(a)suse.de +- update to r1783: + - build: don't stumble over an empty list of packages when trying to verify packages + - ls: add verbose option to print extra information for packages + - for ls, co, meta, editmeta, linkpac, copypac, rebuildpac, and wipebinaries + (basically all the server-side commands), allow arguments "foo/bar" instead + of "foo bar" +* Fri Jun 22 2007 - poeml(a)suse.de +- update to r1769: + fix return values in metafile.sync() which I broke whey I applied + Marcus Huewe's patch... +* Thu Jun 21 2007 - poeml(a)suse.de +- update to r1763: + - set correct Content-Type header on PUT requests + (application/octet-stream). Rails 1.2 seems to be more strict + in this regard. Patch from Marcus Rueckert. + - init: make usage (and usage info) info more precise * Thu Jun 14 2007 - poeml(a)suse.de - update to r1733: New features kindly implemented by Marcus Huewe: ++++++ debian.changelog ++++++ --- osc/debian.changelog 2007-05-14 12:16:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/osc/debian.changelog 2007-06-26 15:23:05.000000000 +0200 @@ -1,3 +1,67 @@ +osc (0.96-8) unstable; urgency=high + + * update to r1783: + - build: don't stumble over an empty list of packages when trying to verify packages + - ls: add verbose option to print extra information for packages + - for ls, co, meta, editmeta, linkpac, copypac, rebuildpac, and wipebinaries + (basically all the server-side commands), allow arguments "foo/bar" instead + of "foo bar" + + -- Peter Poeml <poeml(a)suse.de> Tue, 26 May 2007 00:00:00 +0200 + +osc (0.96-7) unstable; urgency=high + + * update to r1769: + - fix return values in metafile.sync() which I broke whey I applied Marcus + Huewe's patch... + + -- Peter Poeml <poeml(a)suse.de> Fri, 22 May 2007 00:00:00 +0200 + +osc (0.96-6) unstable; urgency=high + + * update to r1763: + - set correct Content-Type header on PUT requests + (application/octet-stream). Rails 1.2 seems to be more strict + in this regard. Patch from Marcus Rueckert. + - init: make usage (and usage info) info more precise + - update to r1733: + New features kindly implemented by Marcus Huewe: + - added wipebinaries command + - added abortbuild command + - improved handling of metadata editing if the server doesn't accept it + - update to r1731: + - adjust for change in build.rpm, where /usr/lib/build/debsort + was removed. Look for debtransform program instead in order to + determine if build.rpm is new enough. + - update cmdln.py to planned 1.0 version. The main changes are + related to points that were raised during employment in osc: + # v0.8.3 + - Fix a bug where errors with passing an incorrect number of args to + functions in do_foo() implementations would be masked. + # v1.0.0 + - [backward incompat] `Cmdln.main()` no longer takes an `optparser` + argument. Top-level option parsing has been changed so that top-level + options for a `Cmdln` subclass can more naturally be defined and + handled on the class definition. Changes: + - `Cmdln.main()` calls `self.get_optparser` to get an option handler. + Subclasses should overload this method for custom top-level options. + - After option parsing, but before sub-command handling, the + `self.postoptparse()` hook is called. + - Add a `version` attribute on `Cmdln` subclasses. If set, the default + top-level option parser will have a `--version` attribute. + - [backward incompat] Simplify the StopProcessing/opts.stop handling for + option handling in subcommands. The "opts" argument to "do_*" + sub-command functions will no longer have a "stop" value. + StopProcessing is now called StopOptionProcessing. This shouldn't + affect simple usage of cmdln.py. + - adjust osc.commandline for these changes. + - make startdir a module global + - add info about usage with the 'nosetests' test discovery tool + - add tests for commandline options + - results: remove obsolete code handling commandline arguments + + -- Peter Poeml <poeml(a)suse.de> Thu, 21 May 2007 00:00:00 +0200 + osc (0.96-5) unstable; urgency=high * update to r1657: - rebuildpac: fix mistyped repository parameter ++++++ osc-0.96.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/osc-0.96/NEWS new/osc-0.96/NEWS --- old/osc-0.96/NEWS 2007-06-14 16:30:36.000000000 +0200 +++ new/osc-0.96/NEWS 2007-06-26 15:21:09.000000000 +0200 @@ -1,4 +1,6 @@ since 0.96: +- ls: add verbose option to print extra information for packages +- for all server-side commands, allow arguments "foo/bar" instead of "foo bar" - new wipebinaries and abortbuild commands, by courtesy of Marcus Huewe - improved metadata error condition handling (thanks to Marcus Huewe) - build: add --userootforbuild option diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/osc-0.96/osc/commandline.py new/osc-0.96/osc/commandline.py --- old/osc-0.96/osc/commandline.py 2007-06-14 16:30:36.000000000 +0200 +++ new/osc-0.96/osc/commandline.py 2007-06-26 15:17:38.000000000 +0200 @@ -65,7 +65,7 @@ conf.init_basicauth(conf.config) - def do_init(self, subcmd, opts, *args): + def do_init(self, subcmd, opts, project, package): """${cmd_name}: Initialize a directory as working copy Initialize a directory to be a working copy of an @@ -75,43 +75,61 @@ package and then copying sources into the directory. It does NOT create a new package. To create a package, use createpac.) - ${cmd_usage} + usage: + osc init PRJ PAC ${cmd_option_list} """ - if len(args) != 2: - print >>sys.stderr, 'Must provide project and package name.' - return 2 - project = args[0] - package = args[1] init_package_dir(conf.config['apiurl'], project, package, os.path.curdir) print 'Initializing %s (Project: %s, Package: %s)' % (os.curdir, project, package) @cmdln.alias('ls') - #(a)cmdln.option('-l', '--long', action='store_true', - # help='print extra information') + @cmdln.option('-v', '--verbose', action='store_true', + help='print extra information') def do_list(self, subcmd, opts, *args): """${cmd_name}: List existing content on the server Examples: ls # list all projects ls Apache # list packages in a project - ls Apache subversion # list files of package of a project + ls Apache apache2 # list files of package of a project + ls -v Apache apache2 # verbosely list files of package of a project + + With --verbose, the following fields will be shown for each item: + MD5 hash of file + Revision number of the last commit + Size (in bytes) + Date and time of the last commit ${cmd_usage} ${cmd_option_list} """ + args = slash_split(args) + if not args: print '\n'.join(meta_get_project_list(conf.config['apiurl'])) + elif len(args) == 1: project = args[0] + if opts.verbose: + sys.exit('The verbose option is not implemented for projects.') print '\n'.join(meta_get_packagelist(conf.config['apiurl'], project)) + elif len(args) == 2: project = args[0] package = args[1] - print '\n'.join(meta_get_filelist(conf.config['apiurl'], project, package)) + l = meta_get_filelist(conf.config['apiurl'], + project, + package, + verbose=opts.verbose) + if opts.verbose: + for i in l: + print '%s %7d %9d %s %s' \ + % (i.md5, i.rev, i.size, shorttime(i.mtime), i.name) + else: + print '\n'.join(l) def do_meta(self, subcmd, opts, *args): @@ -172,16 +190,18 @@ If the named project or package does not exist, it will be created. Examples: - osc editmeta FooPrj # edit meta of project 'FooPrj' - osc editmeta FooPrj barpackage # edit meta of package 'barpackage' + osc editmeta Apache # edit meta of project 'Apache' + osc editmeta Apache apache2 # edit meta of package 'apache2' ${cmd_usage} ${cmd_option_list} """ + args = slash_split(args) + if not args: print >>sys.stderr, 'Missing argument.' - self.do_help(['foo', 'editmeta']) + self.do_help([None, 'editmeta']) return 2 if len(args) == 2: @@ -231,9 +251,11 @@ ${cmd_option_list} """ + args = slash_split(args) + if not args or len(args) < 3: print >>sys.stderr, 'Incorrect number of argument.' - self.do_help(['foo', 'linkpac']) + self.do_help([None, 'linkpac']) return 2 src_project = args[0] @@ -255,7 +277,8 @@ def do_copypac(self, subcmd, opts, *args): """${cmd_name}: Copy a package - A client-side copy implementation. It can be cross-project. + A client-side copy implementation. It can be done cross-project, or even + across buildservice instances, if the -t option is used. The DESTPAC name is optional; the source packages' name will be used if DESTPAC is omitted. @@ -265,9 +288,11 @@ ${cmd_option_list} """ + args = slash_split(args) + if not args or len(args) < 3: print >>sys.stderr, 'Incorrect number of argument.' - self.do_help(['foo', 'copypac']) + self.do_help([None, 'copypac']) return 2 src_project = args[0] @@ -414,14 +439,15 @@ examples: osc co Apache # entire project - osc co Apache subversion # a package - osc co Apache subversion foo # single file -> to current dir + osc co Apache apache2 # a package + osc co Apache apache2 foo # single file -> to current dir usage: osc co PROJECT [PACKAGE] [FILE] ${cmd_option_list} """ + args = slash_split(args) project = package = filename = None try: project = args[0] @@ -442,7 +468,7 @@ checkout_package(conf.config['apiurl'], project, package) else: print >>sys.stderr, 'Missing argument.' - self.do_help(['foo', 'checkout']) + self.do_help([None, 'checkout']) return 2 @@ -530,7 +556,7 @@ if not args: print >>sys.stderr, 'Missing argument.' - self.do_help(['foo', 'add']) + self.do_help([None, 'add']) return 2 filenames = parseargs(args) @@ -756,7 +782,7 @@ if not args: print >>sys.stderr, 'Missing argument.' - self.do_help(['foo', 'delete']) + self.do_help([None, 'delete']) return 2 args = parseargs(args) @@ -796,7 +822,7 @@ if not args: print >>sys.stderr, 'Missing argument.' - self.do_help(['foo', 'resolved']) + self.do_help([None, 'resolved']) return 2 args = parseargs(args) @@ -1191,9 +1217,11 @@ ${cmd_option_list} """ + args = slash_split(args) + if len(args) < 1: print >>sys.stderr, 'Missing argument.' - #self.do_help(['foo', 'rebuildpac']) + #self.do_help([None, 'rebuildpac']) return 2 package = repo = arch = code = None @@ -1271,6 +1299,8 @@ ${cmd_option_list} """ + args = slash_split(args) + if len(args) < 1: print >>sys.stderr, 'Missing <project> argument' return 2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/osc-0.96/osc/core.py new/osc-0.96/osc/core.py --- old/osc-0.96/osc/core.py 2007-06-14 16:30:36.000000000 +0200 +++ new/osc-0.96/osc/core.py 2007-06-26 15:17:38.000000000 +0200 @@ -73,7 +73,7 @@ --> </project> - """ +""" new_package_templ = """\ <package name="%s"> @@ -542,6 +542,18 @@ os.unlink(filename) +def shorttime(t): + """format time as Apr 02 18:19 + or Apr 02 2005 + depending on whether it is in the current year + """ + import time + + if time.localtime()[0] == time.localtime(t)[0]: + # same year + return time.strftime('%b %d %H:%M',time.localtime(t)) + else: + return time.strftime('%b %d %Y',time.localtime(t)) def is_project_dir(d): @@ -554,6 +566,16 @@ os.path.exists(os.path.join(d, store, '_package')) +def slash_split(l): + """Split command line arguments like 'foo/bar' into 'foo' 'bar'. + This is handy to allow copy/paste a project/package combination in this form. + """ + r = [] + for i in l: + r += i.split('/') + return r + + def findpacs(files): pacs = [] for f in files: @@ -656,6 +678,11 @@ req = urllib2.Request(url) req.get_method = lambda: method + # POST requests are application/x-www-form-urlencoded per default + # since we change the request into PUT, we also need to adjust the content type header + if method == 'PUT': + req.add_header('Content-Type', 'application/octet-stream') + if file and not data: size = os.path.getsize(file) if size < 1024*512: @@ -761,12 +788,28 @@ return [ node.get('name') for node in root.findall('entry') ] -def meta_get_filelist(apiurl, prj, package): +def meta_get_filelist(apiurl, prj, package, verbose=False): + """return a list of file names, + or a list File() instances if verbose=True""" u = makeurl(apiurl, ['source', prj, package]) f = http_GET(u) root = ET.parse(f).getroot() - return [ node.get('name') for node in root ] + + if not verbose: + return [ node.get('name') for node in root ] + + else: + l = [] + rev = int(root.get('rev')) + for node in root: + f = File(node.get('name'), + node.get('md5'), + int(node.get('size')), + int(node.get('mtime'))) + f.rev = rev + l.append(f) + return l def meta_get_project_list(apiurl): @@ -782,6 +825,12 @@ return f.readlines() +def show_project_conf(apiurl, prj): + url = makeurl(apiurl, ['source', prj, '_config']) + f = http_GET(url) + return f.readlines() + + def show_package_meta(apiurl, prj, pac): try: url = makeurl(apiurl, ['source', prj, pac, '_meta']) @@ -844,14 +893,14 @@ if self.change_is_required == True and os.path.getmtime(self.filename) == self.timestamp: print 'File unchanged. Not saving.' os.unlink(self.filename) - return + return True try: print 'Sending meta data...' http_PUT(self.url, file=self.filename) os.unlink(self.filename) print 'Done.' - return + return True except urllib2.HTTPError, e: # internal server error (probably the xml file is incorrect) if e.code == 500: @@ -866,6 +915,20 @@ print >> sys.stderr, 'cannot save meta data - an unexpected error occured' return False +#metatypes = { 'prj': { 'url': ['source', prj, '_meta'], +# 'template': new_project_templ, +# }, +# 'pkg': { 'url' : ['source', prj, pac, '_meta'], +# 'template': new_package_templ, +# }, +# 'prjconf': { 'url': ['source', prj, '_config'], +# 'template': None, +# }, +# 'user': { 'url': ['person', quote_plus(user)], +# 'template': new_user_template, +# }, +# } + def edit_meta(prj, pac, template=new_package_templ, change_is_required=True): f=metafile(prj, pac, template, change_is_required) @@ -882,6 +945,7 @@ else: break + def edit_user_meta(user, change_is_required=True): import tempfile @@ -1096,7 +1160,6 @@ tree.write(buf) src_meta = buf.getvalue() - edit_meta(dst_project, dst_package, template=src_meta, change_is_required=False) # create the _link file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/osc-0.96/osc/fetch.py new/osc-0.96/osc/fetch.py --- old/osc-0.96/osc/fetch.py 2007-05-02 21:17:10.000000000 +0200 +++ new/osc-0.96/osc/fetch.py 2007-06-26 13:19:41.000000000 +0200 @@ -129,7 +129,9 @@ """ - + if not pac_list: + return + # we can use os.popen4 because we don't care about the return value. # we check the output anyway, and rpm always writes to stdout. (i, o) = os.popen4(['/bin/rpm', '-K'] + pac_list) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/osc-0.96/TODO new/osc-0.96/TODO --- old/osc-0.96/TODO 2007-05-03 17:54:40.000000000 +0200 +++ new/osc-0.96/TODO 2007-06-22 16:04:47.000000000 +0200 @@ -1,25 +1,16 @@ - split functionality that needs prj/pac as commandline arguments into a seperate tool (oscremote? osc -r?) -- memorize used the api server on checkout - - implmement switch command -- implement 'info' command +- implmement (svn-like) switch command - implement 'mv' command -- editmeta: the API will return a 500 if the xml is broken... the document - could be presented for editing again in that case - updatepacmetafromspec -- is that useful? In which form would this be integrated best? - use urllib.urlencode for parameter encoding - _real_ SSL support, with certificate verification -- zsh completion, or even bash +- adjust zsh completion to work with cmdln.py implementation - add option to disable gpg key checking? - add support for adding tags to packages? -- plugin-ize subcommand implementation - - look at Susannes extensions -- Allow the package owners/users to signal an abort build. - Message-ID: <20070214120205.GA9629(a)suse.de> -- implement wipe command -- implement editing of project configuration (alrady works in api & backend) -- build: --extra-pkgs ... buildinfo -> &add=...&add=... +- write howto for plugin-izing subcommand implementation +- implement editing of project configuration (already works in api & backend) checkin: @@ -258,29 +249,3 @@ 21:31 <darix> :p - -18:48 <darix> darix@hydrogen:~/osc/server:http/GeoIP> osc results -18:48 <darix> Traceback (most recent call last): -18:48 <darix> File "/usr/bin/osc", line 7, in <module> -18:48 <darix> commandline.main() -18:48 <darix> File "/usr/lib64/python2.5/site-packages/osc/commandline.py", line 1077, in main -18:48 <darix> cmd(args) -18:48 <darix> File "/usr/lib64/python2.5/site-packages/osc/commandline.py", line 719, in results -18:48 <darix> print '\n'.join(get_results(project, package)) -18:48 <darix> File "/usr/lib64/python2.5/site-packages/osc/core.py", line 1169, in get_results -18:48 <darix> rmap['status'] += ': ' + statusnode.find('details').text -18:48 <darix> AttributeError: 'NoneType' object has no attribute 'text' - - -21:49 < darix> DuDE: osc editmeta -21:49 < darix> the template is stupid -21:49 < darix> it now has "your_name" as project maintainer -21:50 < darix> that requires you to edit the line everytime when creating a new package -21:50 < DuDE> hm, can't find that -21:50 < DuDE> is that the exact string? -21:52 < DuDE> ah, I find your_username -21:52 < darix> DuDE: http://rafb.net/p/TgxmfB83.txt -21:54 < DuDE> I think that was filled in the past -21:54 < DuDE> since the user account data is now stored in the config per api server, the (in the config) global user/passwd is no longer used otherwise, so it shows the default - --> hits also in edit_user() ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 newt
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package newt checked in at Thu Jun 28 19:35:59 CEST 2007. -------- --- newt/newt.changes 2007-06-13 18:17:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/newt/newt.changes 2007-06-26 15:00:09.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jun 26 14:16:28 CEST 2007 - lrupp(a)suse.de + +- update to 0.52.7: + + add support to snack for multiple selection and border in listbox + and cursorAtEnd in entry (patch by Shawn Starr) + + fix scrollbar positioning in listbox + + cope with backward system time jumps (RH#240691) + + free helplines and windows in newtFinished, check for overflow (RH#239992) +- remove included patches +- created doc package for tutorial (N#287087) + +------------------------------------------------------------------- Old: ---- newt-0.52.6-countitems.patch newt-0.52.6-cursor.patch newt-0.52.6-entry.patch newt-0.52.6-memleaks.patch newt-0.52.6.tar.bz2 New: ---- newt-0.52.7.tar.bz2 newt-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ newt.spec ++++++ --- /var/tmp/diff_new_pack.L12844/_old 2007-06-28 19:35:34.000000000 +0200 +++ /var/tmp/diff_new_pack.L12844/_new 2007-06-28 19:35:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package newt (Version 0.52.6) +# spec file for package newt (Version 0.52.7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,19 +11,18 @@ # norootforbuild Name: newt -URL: ftp://download.fedora.redhat.com/pub/fedora/linux/core/development/source/S… +URL: ftp://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/… Summary: Nifty Erik's Windowing Toolkit -Version: 0.52.6 -Release: 30 +Version: 0.52.7 +Release: 1 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Source: %{name}-%{version}.tar.bz2 -Patch1: newt-0.52.6-entry.patch -Patch2: newt-0.52.6-cursor.patch -Patch3: newt-0.52.6-countitems.patch -Patch4: newt-0.52.6-memleaks.patch +Source10: %name-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel slang-devel +# needed for tutorial.pdf +BuildRequires: docbook-toys %{py_requires} Provides: snack = %{version}-%{release} #################### @@ -46,14 +45,19 @@ Summary: Development files for the Newt windowing toolkit Provides: newtd = %{version} Requires: newt = %{version} +Requires: python Requires: slang-devel %{name} = %{version} Group: Development/Libraries/C and C++ Obsoletes: newtd <= %{version} # +%package doc +Summary: Tutorial for Nifty Erik's Windowing Toolkit +Group: Documentation/Howto +# %package static Summary: Nifty Erik's Windowing Toolkit Requires: newt-devel = %{version} -Group: System/Libraries +Group: Development/Libraries/C and C++ %description Newt is a programming library for color text-mode widget-based user @@ -87,6 +91,21 @@ Erik Troan <ewt(a)redhat.com> +%description doc +This package contains a tutorial about the Newt windowing toolkit. + +Newt is a programming library for color text-mode widget-based user +interfaces. Newt can be used to add stacked windows, entry widgets, +check boxes, radio buttons, labels, plain text fields, scrollbars, +etc., to text mode user interfaces. + + + +Authors: +-------- + Erik Troan <ewt(a)redhat.com> + + %description static Newt is a programming library for color text-mode widget-based user interfaces. Newt can be used to add stacked windows, entry widgets, @@ -104,21 +123,15 @@ %prep %setup -q -%patch1 -p0 -b .entry -%patch2 -p0 -b .cursor -%patch3 -p0 -b .countitems -%patch4 -p0 -b .memleaks %build -%{?suse_update_config:%{suse_update_config -f}} export CFLAGS="$RPM_OPT_FLAGS -fPIC -Wall -fno-strict-aliasing" %configure --without-tcl # gpm support seems to smash the stack # --with-gpm-support -make depend -make PYTHONVERS=python%{py_ver} +## make depend +make PYTHONVERS=python%{py_ver} %{?_smp_mflags} make shared PYTHONVERS=python%{py_ver} -chmod 0644 peanuts.py popcorn.py %install make instroot=%buildroot install PYTHONVERS=python%{py_ver} @@ -127,6 +140,15 @@ for lang in dz mg tl wo; do rm -rf %buildroot%_datadir/locale/$lang done +# install documentation +install -d -m 755 %buildroot/%_defaultdocdir/%name +for i in peanuts.py popcorn.py tutorial.sgml COPYING; do + install -m 644 %_builddir/%name-%version/$i %buildroot/%_defaultdocdir/%name/ +done +pushd %buildroot/%_defaultdocdir/%name/ 1>/dev/null +db2pdf tutorial.sgml +rm tutorial.{aux,log,out} CATALOG.* *.dsl +popd 1>/dev/null %find_lang %{name} %clean @@ -138,7 +160,8 @@ %files -f %{name}.lang %defattr (-,root,root) -%doc COPYING +%dir %_defaultdocdir/%name +%doc %_defaultdocdir/%name/COPYING %{_bindir}/whiptail %{_libdir}/libnewt.so.* %{py_sitedir}/* @@ -146,15 +169,28 @@ %files devel %defattr (-,root,root) -%doc tutorial.sgml peanuts.py popcorn.py +%doc %_defaultdocdir/%name/*.py %{_includedir}/newt.h %{_libdir}/libnewt.so +%files doc +%defattr (-,root,root) +%doc %_defaultdocdir/%name/tutorial.* + %files static %defattr (-,root,root) %{_libdir}/libnewt.a %changelog +* Tue Jun 26 2007 - lrupp(a)suse.de +- update to 0.52.7: + + add support to snack for multiple selection and border in listbox + and cursorAtEnd in entry (patch by Shawn Starr) + + fix scrollbar positioning in listbox + + cope with backward system time jumps (RH#240691) + + free helplines and windows in newtFinished, check for overflow (RH#239992) +- remove included patches +- created doc package for tutorial (N#287087) * Wed Jun 13 2007 - lrupp(a)suse.de - included patches from Miroslav Lichvar: + fix cursor positioning when setting entry or checkbox flags ++++++ newt-0.52.6.tar.bz2 -> newt-0.52.7.tar.bz2 ++++++ ++++ 7107 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/checkbox.c new/newt-0.52.7/checkbox.c --- old/newt-0.52.6/checkbox.c 2007-01-30 15:03:18.000000000 +0100 +++ new/newt-0.52.7/checkbox.c 2007-04-12 18:50:47.000000000 +0200 @@ -131,6 +131,7 @@ co->top = top; co->left = left; co->takesFocus = 1; + co->isMapped = 0; return co; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/checkboxtree.c new/newt-0.52.7/checkboxtree.c --- old/newt-0.52.6/checkboxtree.c 2007-01-30 15:03:18.000000000 +0100 +++ new/newt-0.52.7/checkboxtree.c 2007-04-12 19:03:57.000000000 +0200 @@ -38,8 +38,7 @@ static struct items * findItem(struct items * items, const void * data); static void buildFlatList(newtComponent co); static void doBuildFlatList(struct CheckboxTree * ct, struct items * item); -enum countWhat { COUNT_EXPOSED=0, COUNT_SELECTED=1 }; -static int countItems(struct items * item, enum countWhat justExposed); +static int countItems(struct items * item, int what); static inline void updateWidth(newtComponent co, struct CheckboxTree * ct, int maxField); @@ -60,13 +59,14 @@ ct->sb->left = co->left + co->width - 1; } -static int countItems(struct items * item, enum countWhat what) { +static int countItems(struct items * item, int what) { int count = 0; while (item) { - if ((!item->branch && item->selected == what) || (what == COUNT_EXPOSED)) + if (what < 0 || !item->branch && (what > 0 && item->selected == what + || what == 0 && item->selected)) count++; - if (item->branch || (what == COUNT_EXPOSED && item->selected)) + if (item->branch && (what >= 0 || what < 0 && item->selected)) count += countItems(item->branch, what); item = item->next; } @@ -88,7 +88,7 @@ struct CheckboxTree * ct = co->data; if (ct->flatList) free(ct->flatList); - ct->flatCount = countItems(ct->itemlist, COUNT_EXPOSED); + ct->flatCount = countItems(ct->itemlist, -1); ct->flatList = malloc(sizeof(*ct->flatList) * (ct->flatCount+1)); ct->flatCount = 0; @@ -273,7 +273,7 @@ static void listSelected(struct items * items, int * num, const void ** list, int seqindex) { while (items) { - if ((seqindex ? items->selected==seqindex : items->selected) && !items->branch) + if ((seqindex ? items->selected==seqindex : items->selected) && !items->branch) list[(*num)++] = (void *) items->data; if (items->branch) listSelected(items->branch, num, list, seqindex); @@ -312,7 +312,7 @@ seqindex = 0; } - *numitems = countItems(ct->itemlist, (seqindex ? seqindex : COUNT_SELECTED)); + *numitems = countItems(ct->itemlist, seqindex); if (!*numitems) return NULL; retval = malloc(*numitems * sizeof(void *)); @@ -531,19 +531,26 @@ (*ct->currItem ? (*ct->currItem)->depth : 0) * 3 + 4); } -static void ctDestroy(newtComponent co) { - struct CheckboxTree * ct = co->data; - struct items * item, * nextitem; - - nextitem = item = ct->itemlist; +static void destroyItems(struct items * item) { + struct items * nextitem; while (item != NULL) { nextitem = item->next; free(item->text); + if (item->branch) + destroyItems(item->branch); free(item); item = nextitem; } +} +static void ctDestroy(newtComponent co) { + struct CheckboxTree * ct = co->data; + + destroyItems(ct->itemlist); + free(ct->flatList); + if (ct->sb) + ct->sb->ops->destroy(ct->sb); free(ct->seq); free(ct); free(co); @@ -802,6 +809,7 @@ treeTop = item->branch; } + free(path); buildFlatList(co); item = findItem(ct->itemlist, data); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/entry.c new/newt-0.52.7/entry.c --- old/newt-0.52.6/entry.c 2006-10-11 17:19:39.000000000 +0200 +++ new/newt-0.52.7/entry.c 2007-04-04 17:17:51.000000000 +0200 @@ -25,6 +25,8 @@ void * filterData; }; +static int previous_char(const char *buf, int pos); +static int next_char(const char *buf, int pos); static void entryDraw(newtComponent co); static void entryDestroy(newtComponent co); static struct eventResult entryEvent(newtComponent co, @@ -103,6 +105,11 @@ strcpy(en->buf, initialValue); en->bufUsed = strlen(initialValue); en->cursorPosition = en->bufUsed; + + /* move cursor back if entry is full */ + if (en->cursorPosition && !(en->flags & NEWT_FLAG_SCROLL || + wstrlen(en->buf, -1) < co->width)) + en->cursorPosition = previous_char(en->buf, en->cursorPosition); } else { *en->buf = '\0'; en->bufUsed = 0; @@ -112,39 +119,57 @@ return co; } -static int visible_width(const char *str, int start, int end) -{ - int width = wstrlen(str + start, end-start); - int len, w = 0; - wchar_t wc; - - len = mbtowc(&wc, str+end, MB_CUR_MAX); - if (len == 0) - w = 1; - else if (len > 0) - w = wcwidth(wc); - return width + w; -} - static void scroll(struct entry *en, int width) { - wchar_t wc; - int len, w; - int newwidth = visible_width(en->buf, en->firstChar, en->cursorPosition); - - while (newwidth > width) { - len = mbtowc(&wc, en->buf+en->firstChar, MB_CUR_MAX); - if (!len) { - en->firstChar++; - break; - } - if (len < 0) - break; - w = wcwidth(wc); - if (w < 0) - break; - en->firstChar += len; - newwidth -= w; + int r, lv, rv, cntx, cw, cn, nc, pc, ncw, pcw; + + if (width <= 1) { + en->firstChar = en->cursorPosition; + return; + } + + cntx = width / 4; + if (cntx > 5) + cntx = 5; + + if (en->cursorPosition < en->firstChar) + en->firstChar = en->cursorPosition; + + cn = next_char(en->buf, en->cursorPosition); + cw = en->cursorPosition >= en->bufUsed ? 1 : + wstrlen(en->buf + en->cursorPosition, cn - en->cursorPosition); + + r = wstrlen(en->buf + cn, -1); + + lv = wstrlen(en->buf + en->firstChar, en->cursorPosition - en->firstChar); + rv = width - lv - cw; + +#define RC (ncw > 0 && (r > rv && lv - ncw >= cntx && rv < cntx)) +#define LC (pcw > 0 && (r + pcw <= rv || (lv < cntx && rv - pcw >= cntx))) + + nc = next_char(en->buf, en->firstChar); + ncw = wstrlen(en->buf + en->firstChar, nc - en->firstChar); + if (RC) { + do { + lv -= ncw; + rv += ncw; + en->firstChar = nc; + nc = next_char(en->buf, en->firstChar); + ncw = wstrlen(en->buf + en->firstChar, nc - en->firstChar); + } while (RC); + return; + } + + pc = previous_char(en->buf, en->firstChar); + pcw = wstrlen(en->buf + pc, en->firstChar - pc); + if (LC) { + do { + lv += pcw; + rv -= pcw; + en->firstChar = pc; + pc = previous_char(en->buf, en->firstChar); + pcw = wstrlen(en->buf + pc, en->firstChar - pc); + } while (LC); } } @@ -171,13 +196,8 @@ return; } - if (en->cursorPosition < en->firstChar) { - /* scroll to the left */ - en->firstChar = en->cursorPosition; - } else { - /* scroll to the right */ - scroll(en, co->width); - } + /* scroll if necessary */ + scroll(en, co->width); chptr = en->buf + en->firstChar; @@ -317,17 +337,15 @@ static int next_char(const char *buf, int pos) { int len = mblen(buf + pos, MB_CUR_MAX); - if (len < 0) + if (len <= 0) return pos; - if (len == 0) - return ++pos; return pos+len; } static struct eventResult entryHandleKey(newtComponent co, int key) { struct entry * en = co->data; struct eventResult er; - char * chptr, * insPoint; + char * chptr; er.result = ER_SWALLOWED; switch (key) { @@ -430,7 +448,7 @@ s[i] = SLang_getkey(); } - if (!i || !(en->flags & NEWT_FLAG_SCROLL) && wstrlen(en->buf, -1) >= co->width) { + if (!i || (!(en->flags & NEWT_FLAG_SCROLL) && wstrlen(en->buf, -1) + wstrlen(s, i) > co->width)) { /* FIXME this is broken */ SLtt_beep(); break; @@ -440,20 +458,12 @@ en->bufAlloced += 20; en->buf = realloc(en->buf, en->bufAlloced); if (en->resultPtr) *en->resultPtr = en->buf; - memset(en->buf + en->bufUsed + 1, 0, 20); + memset(en->buf + en->bufAlloced - 20, 0, 20); } if (en->cursorPosition != en->bufUsed) { /* insert the new character */ - - /* chptr is the last character in the string */ - chptr = (en->buf + en->bufUsed) - 2 + i; - insPoint = en->buf + en->cursorPosition; - - while (chptr >= insPoint) { - *(chptr + i) = *chptr; - chptr--; - } + memmove(en->buf + en->cursorPosition + i, en->buf + en->cursorPosition, en->bufUsed - en->cursorPosition); } en->bufUsed += i; for (l = 0; l < i; l++) @@ -463,6 +473,10 @@ } } + if (en->cursorPosition == en->bufUsed && en->cursorPosition && + !(en->flags & NEWT_FLAG_SCROLL || wstrlen(en->buf, -1) < co->width)) + en->cursorPosition = previous_char(en->buf, en->cursorPosition); + entryDraw(co); return er; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/form.c new/newt-0.52.7/form.c --- old/newt-0.52.6/form.c 2007-01-31 15:06:27.000000000 +0100 +++ new/newt-0.52.7/form.c 2007-05-21 15:15:11.000000000 +0200 @@ -942,16 +942,19 @@ if (form->timer) { /* Calculate when we next need to return with a timeout. Do this inside the loop in case a callback resets the timer. */ - if (!form->lastTimeout.tv_sec && !form->lastTimeout.tv_usec) - gettimeofday(&form->lastTimeout, NULL); + gettimeofday(&now, 0); + + if ((!form->lastTimeout.tv_sec && !form->lastTimeout.tv_usec) || + now.tv_sec < form->lastTimeout.tv_sec || + (now.tv_sec == form->lastTimeout.tv_sec && + now.tv_usec < form->lastTimeout.tv_usec)) + form->lastTimeout = now; nextTimeout.tv_sec = form->lastTimeout.tv_sec + (form->timer / 1000); nextTimeout.tv_usec = form->lastTimeout.tv_usec + (form->timer % 1000) * 1000; - gettimeofday(&now, 0); - if (now.tv_sec > nextTimeout.tv_sec) { timeout.tv_sec = timeout.tv_usec = 0; } else if (now.tv_sec == nextTimeout.tv_sec) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/listbox.c new/newt-0.52.7/listbox.c --- old/newt-0.52.6/listbox.c 2006-09-15 15:38:21.000000000 +0200 +++ new/newt-0.52.7/listbox.c 2007-06-08 12:59:14.000000000 +0200 @@ -74,7 +74,7 @@ if (li->sb) li->sb->ops->place(li->sb, co->left + co->width - li->bdxAdjust - 1, - co->top); + co->top + li->bdyAdjust); } newtComponent newtListbox(int left, int top, int height, int flags) { @@ -200,7 +200,8 @@ co->width = width; li->curWidth = co->width - li->sbAdjust - 2 * li->bdxAdjust; li->userHasSetWidth = 1; - if (li->sb) li->sb->left = co->width + co->left - 1; + if (li->sb) + li->sb->left = co->left + co->width - li->bdxAdjust - 1; listboxDraw(co); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/missing new/newt-0.52.7/missing --- old/newt-0.52.6/missing 2007-03-02 14:17:56.000000000 +0100 +++ new/newt-0.52.7/missing 1970-01-01 01:00:00.000000000 +0100 @@ -1,360 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2005-06-08.21 - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case "$1" in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Send bug reports to <bug-automake(a)gnu.org>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). -case "$1" in - lex|yacc) - # Not GNU programs, they don't have --version. - ;; - - tar) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case "$1" in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case "$f" in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison|yacc) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if [ ! -f y.tab.h ]; then - echo >y.tab.h - fi - if [ ! -f y.tab.c ]; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex|flex) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if [ $# -ne 1 ]; then - eval LASTARG="\${$#}" - case "$LASTARG" in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if [ ! -f lex.yy.c ]; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit 1 - fi - ;; - - makeinfo) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/newt.c new/newt-0.52.7/newt.c --- old/newt-0.52.6/newt.c 2007-02-28 18:35:01.000000000 +0100 +++ new/newt-0.52.7/newt.c 2007-05-15 12:38:09.000000000 +0200 @@ -321,6 +321,20 @@ * @returns int , 0. (no errors reported) */ int newtFinished(void) { + if (currentWindow) { + for (; currentWindow >= windowStack; currentWindow--) { + free(currentWindow->buffer); + free(currentWindow->title); + } + currentWindow = NULL; + } + + if (currentHelpline) { + for (; currentHelpline >= helplineStack; currentHelpline--) + free(*currentHelpline); + currentHelpline = NULL; + } + SLsmg_gotorc(SLtt_Screen_Rows - 1, 0); newtCursorOn(); SLsmg_refresh(); @@ -622,7 +636,7 @@ * @param width unsigned int * @param height unsigned int * @param title - title string - * @return zero on success (currently no errors reported) + * @return zero on success */ int newtOpenWindow(int left, int top, unsigned int width, unsigned int height, @@ -633,6 +647,10 @@ newtFlushInput(); + if (currentWindow && currentWindow - windowStack + 1 + >= sizeof (windowStack) / sizeof (struct Window)) + return 1; + if (!currentWindow) { currentWindow = windowStack; } else { @@ -711,7 +729,7 @@ * @param width - width in char cells * @param height - no. of char cells. * @param title - fixed title - * @returns 0. No errors reported + * @returns zero on success */ int newtCenteredWindow(unsigned int width,unsigned int height, const char * title) { @@ -724,9 +742,7 @@ left = (int)(SLtt_Screen_Cols - width) / 2; - newtOpenWindow(left, top, width, height, title); - - return 0; + return newtOpenWindow(left, top, width, height, title); } /** @@ -741,6 +757,9 @@ int j, row, col; int n = 0; + if (currentWindow == NULL) + return; + row = col = 0; row = currentWindow->top - 1; @@ -778,8 +797,13 @@ } void newtGetrc(int * row, int * col) { - *row = cursorRow; - *col = cursorCol; + *row = cursorRow; + *col = cursorCol; + + if (currentWindow) { + *row -= currentWindow->top; + *col -= currentWindow->left; + } } void newtGotorc(int newRow, int newCol) { @@ -902,6 +926,10 @@ } void newtPushHelpLine(const char * text) { + if (currentHelpline && currentHelpline - helplineStack + 1 + >= sizeof (helplineStack) / sizeof (char *)) + return; + if (!text) text = defaultHelpLine; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/newt.spec new/newt-0.52.7/newt.spec --- old/newt-0.52.6/newt.spec 2007-03-02 14:12:22.000000000 +0100 +++ new/newt-0.52.7/newt.spec 2007-06-15 14:53:12.000000000 +0200 @@ -1,12 +1,12 @@ Summary: A development library for text mode user interfaces Name: newt -Version: 0.52.6 +Version: 0.52.7 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# cvs -d :pserver:anonymous@elvis.redhat.com:/usr/local/CVS co -r r0-52-6 newt +# cvs -d :pserver:anonymous@elvis.redhat.com:/usr/local/CVS co -r r0-52-7 newt # cd newt; ./autogen.sh; ./configure; make create-archive Source: newt-%{version}.tar.gz BuildRequires: python, python-devel, slang-devel @@ -15,14 +15,14 @@ %package devel Summary: Newt windowing toolkit development files -Requires: slang-devel %{name} = %{version} +Requires: slang-devel %{name} = %{version}-%{release} Group: Development/Libraries # The loader portion of the installer needs to link statically against libnewt, # so the static library must be shipped. %package static Summary: Newt windowing toolkit static library -Requires: newt-devel = %{version} +Requires: %{name}-devel = %{version}-%{release} Group: Development/Libraries %Description @@ -88,6 +88,23 @@ %{_libdir}/libnewt.a %changelog +* Fri Jun 15 2007 Miroslav Lichvar <mlichvar(a)redhat.com> - 0.52.7-1 +- add support to snack for multiple selection and border in listbox + and cursorAtEnd in entry (patch by Shawn Starr) +- fix scrollbar positioning in listbox +- cope with backward system time jumps (#240691) +- free helplines and windows in newtFinished, check for overflow (#239992) +- add release to -devel and -static requires (#238784) + +* Thu Apr 12 2007 Miroslav Lichvar <mlichvar(a)redhat.com> - 0.52.6-3 +- fix cursor positioning when setting entry or checkbox flags +- fix counting of items in checkboxtree +- fix some memory leaks + +* Wed Apr 04 2007 Miroslav Lichvar <mlichvar(a)redhat.com> - 0.52.6-2 +- fix entry scrolling (#234829) +- fix multibyte character handling in entry + * Fri Mar 02 2007 Miroslav Lichvar <mlichvar(a)redhat.com> - 0.52.6-1 - add newtSetColor() to allow changing individual colors - add newtPopWindowNoRefresh() (patch by Forest Bond) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/snackmodule.c new/newt-0.52.7/snackmodule.c --- old/newt-0.52.6/snackmodule.c 2007-02-28 18:37:57.000000000 +0100 +++ new/newt-0.52.7/snackmodule.c 2007-06-13 19:17:53.000000000 +0200 @@ -200,6 +200,7 @@ static PyObject * widgetListboxIns(snackWidget * s, PyObject * args); static PyObject * widgetListboxDel(snackWidget * s, PyObject * args); static PyObject * widgetListboxGet(snackWidget * s, PyObject * args); +static PyObject * widgetListboxGetSel(snackWidget * s, PyObject * args); static PyObject * widgetListboxSet(snackWidget * s, PyObject * args); static PyObject * widgetListboxClear(snackWidget * s, PyObject * args); static PyObject * widgetTextboxText(snackWidget * s, PyObject * args); @@ -223,6 +224,7 @@ { "listboxAddItem", (PyCFunction) widgetListboxAdd, METH_VARARGS, NULL }, { "listboxInsertItem", (PyCFunction) widgetListboxIns, METH_VARARGS, NULL }, { "listboxGetCurrent", (PyCFunction) widgetListboxGet, METH_VARARGS, NULL }, + { "listboxGetSelection", (PyCFunction) widgetListboxGetSel, METH_VARARGS, NULL }, { "listboxSetCurrent", (PyCFunction) widgetListboxSet, METH_VARARGS, NULL }, { "listboxSetWidth", (PyCFunction) widgetListboxSetW, METH_VARARGS, NULL }, { "listboxDeleteItem", (PyCFunction) widgetListboxDel, METH_VARARGS, NULL }, @@ -654,16 +656,19 @@ static snackWidget * listboxWidget(PyObject * s, PyObject * args) { snackWidget * widget; int height; - int doScroll = 0, returnExit = 0, showCursor = 0 ; + int doScroll = 0, returnExit = 0, showCursor = 0, multiple = 0, border = 0; - if (!PyArg_ParseTuple(args, "i|iii", &height, &doScroll, &returnExit, &showCursor)) + if (!PyArg_ParseTuple(args, "i|iiiii", &height, &doScroll, &returnExit, + &showCursor, &multiple, &border)) return NULL; widget = snackWidgetNew (); widget->co = newtListbox(-1, -1, height, (doScroll ? NEWT_FLAG_SCROLL : 0) | (returnExit ? NEWT_FLAG_RETURNEXIT : 0) | - (showCursor ? NEWT_FLAG_SHOWCURSOR : 0) + (showCursor ? NEWT_FLAG_SHOWCURSOR : 0) | + (multiple ? NEWT_FLAG_MULTIPLE : 0) | + (border ? NEWT_FLAG_BORDER : 0) ); widget->anint = 1; @@ -968,11 +973,12 @@ static PyObject * widgetEntrySetValue(snackWidget * s, PyObject * args) { char * val; + int cursorAtEnd = 1; - if (!PyArg_ParseTuple(args, "s", &val)) + if (!PyArg_ParseTuple(args, "s|i", &val, &cursorAtEnd)) return NULL; - newtEntrySet(s->co, val, 1); + newtEntrySet(s->co, val, cursorAtEnd); Py_INCREF(Py_None); return Py_None; @@ -1032,6 +1038,32 @@ return PyInt_FromLong((long) newtListboxGetCurrent(s->co)); } +static PyObject * widgetListboxGetSel(snackWidget * s, PyObject * args) { + void ** selection; + int numselected; + int i; + PyObject * sel; + + if (!PyArg_ParseTuple(args, "")) + return NULL; + + selection = (void **) newtListboxGetSelection(s->co, &numselected); + + sel = PyList_New(0); + + if (!selection) { + return sel; + } + + sel = PyList_New(0); + for (i = 0; i < numselected; i++) { + PyList_Append(sel, PyInt_FromLong((long) selection[i])); + } + free(selection); + + return sel; +} + static PyObject * widgetListboxSet(snackWidget * s, PyObject * args) { int index; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/snack.py new/newt-0.52.7/snack.py --- old/newt-0.52.6/snack.py 2007-02-28 18:37:57.000000000 +0100 +++ new/newt-0.52.7/snack.py 2007-06-13 19:17:53.000000000 +0200 @@ -144,11 +144,12 @@ methods: - - Listbox(self,height, scroll = 0l returnExit = 0, width = 0, showCursor = 0) + - Listbox(self, height, scroll = 0, returnExit = 0, width = 0, showCursor = 0, multiple = 0, border = 0) - insert(self, text, item, before) : insert element; before = key to item to insert before, or None. - delete(self, item) : delete item from list. - replace(self, text,item) : Replace a given item's text - current(self) : returns currently selected item + - getSelection(self) : returns a list of selected items - setCurrent(self,i tem) : select current. - clear(self) : clear listbox """ @@ -181,6 +182,13 @@ def current(self): return self.key2item[self.w.listboxGetCurrent()] + def getSelection(self): + selection = [] + list = self.w.listboxGetSelection() + for key in list: + selection.append(self.key2item[key]) + return selection + def setCurrent(self, item): self.w.listboxSetCurrent(self.item2key[item]) @@ -189,8 +197,8 @@ self.item2key = {} self.w.listboxClear() - def __init__(self, height, scroll = 0, returnExit = 0, width = 0, showCursor = 0): - self.w = _snack.listbox(height, scroll, returnExit, showCursor) + def __init__(self, height, scroll = 0, returnExit = 0, width = 0, showCursor = 0, multiple = 0, border = 0): + self.w = _snack.listbox(height, scroll, returnExit, showCursor, multiple, border) self.key2item = {} self.item2key = {} if (width): @@ -260,14 +268,14 @@ if returnExit is set, return from Form when exiting this element, else proceed to next entry widget. - value(self): return value. - - set(text) : set the text + - set(text, cursorAtEnd = 1) : set the text - setFlags (flag, sense) : flags can be FLAG_DISABLED, FLAGS_SET, FLAGS_RESET, FLAGS_TOGGLE """ def value(self): return self.w.entryValue - def set(self, text): - return self.w.entrySetValue(text) + def set(self, text, cursorAtEnd = 1): + return self.w.entrySetValue(text, cursorAtEnd) def setFlags (self, flag, sense): return self.w.entrySetFlags(flag, sense) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/test.c new/newt-0.52.7/test.c --- old/newt-0.52.6/test.c 2006-08-25 14:15:24.000000000 +0200 +++ new/newt-0.52.7/test.c 2007-05-21 15:26:56.000000000 +0200 @@ -43,7 +43,7 @@ void ** selectedList; int i, numsel; char buf[20]; - const char * spinner = "-\\|/\\|/"; + const char * spinner = "-\\|/"; const char * spinState; struct newtExitStruct es; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/testtree.c new/newt-0.52.7/testtree.c --- old/newt-0.52.6/testtree.c 2006-08-25 14:15:24.000000000 +0200 +++ new/newt-0.52.7/testtree.c 2007-04-12 19:03:57.000000000 +0200 @@ -118,6 +118,8 @@ j = (int) *ptr++; printf("%d\n", j); } + free(result); + result = newtCheckboxTreeGetMultiSelection(checktree, &numselected, 'b'); ptr = result; if (!result || !numselected) @@ -137,6 +139,7 @@ for (i = 0; list && list[i] != NEWT_ARG_LAST; i++) printf(" %d", list[i]); printf("\n"); + free(list); newtFormDestroy(form); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/newt-0.52.6/textbox.c new/newt-0.52.7/textbox.c --- old/newt-0.52.6/textbox.c 2006-10-12 16:18:38.000000000 +0200 +++ new/newt-0.52.7/textbox.c 2007-04-12 19:03:57.000000000 +0200 @@ -451,6 +451,10 @@ int i; struct textbox * tb = co->data; + if (tb->sb) + tb->sb->ops->destroy(tb->sb); + if (tb->sb_act) + tb->sb_act->ops->destroy(tb->sb_act); for (i = 0; i < tb->numLines; i++) free(tb->lines[i]); free(tb->lines); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 metamail
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package metamail checked in at Thu Jun 28 19:33:26 CEST 2007. -------- --- metamail/metamail.changes 2007-03-29 17:30:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/metamail/metamail.changes 2007-06-28 15:58:30.829252000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 28 15:57:46 CEST 2007 - werner(a)suse.de + +- Add MIME check script usable e.g. in procmailrc filter rules + +------------------------------------------------------------------- New: ---- mimecheck mimecheck.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metamail.spec ++++++ --- /var/tmp/diff_new_pack.D27856/_old 2007-06-28 19:26:22.000000000 +0200 +++ /var/tmp/diff_new_pack.D27856/_new 2007-06-28 19:26:22.000000000 +0200 @@ -12,14 +12,16 @@ Name: metamail BuildRequires: ncurses-devel xorg-x11 xorg-x11-devel -License: BSD License and BSD-like +License: X11/MIT Group: Productivity/Networking/Email/Utilities Requires: sharutils Autoreqprov: on Version: 2.7.19 -Release: 1087 +Release: 1112 Summary: MIME Mail Handler Source: metamail-2.7-19.tar.gz +Source1: mimecheck +Source2: mimecheck.1 Patch: metamail-2.7-19.dif Patch1: metamail-2.7-19-security.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -45,6 +47,11 @@ # mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc # install -m 444 fonts/heb8x13B.pcf $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/ # gzip -9f $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/heb8x13B.pcf + install -m 755 %{S:1} $RPM_BUILD_ROOT/usr/bin/ + install -m 644 %{S:2} $RPM_BUILD_ROOT%{_mandir}/man1/ + ln -sf mimecheck $RPM_BUILD_ROOT/usr/bin/mimezip + ln -sf mimecheck $RPM_BUILD_ROOT/usr/bin/mimebzip + ln -sf mimecheck $RPM_BUILD_ROOT/usr/bin/mimegzip %files %defattr(-,root,root) @@ -61,6 +68,10 @@ /usr/bin/metasend /usr/bin/mimeit /usr/bin/mimencode +/usr/bin/mimecheck +/usr/bin/mimezip +/usr/bin/mimebzip +/usr/bin/mimegzip /usr/bin/mmencode /usr/bin/mgrep /usr/bin/patch-metamail @@ -92,6 +103,7 @@ %doc %{_mandir}/man1/mgrep.1.gz %doc %{_mandir}/man1/mime.1.gz %doc %{_mandir}/man1/mimencode.1.gz +%doc %{_mandir}/man1/mimecheck.1.gz %doc %{_mandir}/man1/mmencode.1.gz %doc %{_mandir}/man1/patch-metamail.1.gz %doc %{_mandir}/man1/richtext.1.gz @@ -104,6 +116,8 @@ %doc %{_mandir}/man4/mailcap.4.gz %changelog +* Thu Jun 28 2007 - werner(a)suse.de +- Add MIME check script usable e.g. in procmailrc filter rules * Thu Mar 29 2007 - rguenther(a)suse.de - Add ncurses-devel BuildRequires * Thu Feb 23 2006 - werner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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