May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit ocfs2-tools
by root＠suse.de 03 May '06

03 May '06

Hello community, here is the log from the commit of package ocfs2-tools checked in at Wed May 3 13:05:46 CEST 2006. -------- --- ocfs2-tools/ocfs2-tools.changes 2006-04-26 13:37:40.000000000 +0200 +++ STABLE/ocfs2-tools/ocfs2-tools.changes 2006-05-03 10:24:12.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 3 10:24:04 CEST 2006 - kukuk(a)suse.de + +- Fix compile with new glibc + +------------------------------------------------------------------- New: ---- offsetof.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocfs2-tools.spec ++++++ --- /var/tmp/diff_new_pack.LKDwst/_old 2006-05-03 13:04:20.000000000 +0200 +++ /var/tmp/diff_new_pack.LKDwst/_new 2006-05-03 13:04:20.000000000 +0200 @@ -14,12 +14,13 @@ BuildRequires: e2fsprogs-devel glib2-devel gnutls-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel python-devel python-gtk readline-devel update-desktop-files vte Summary: Oracle Cluster File System 2 Core Tools Version: 1.2.1 -Release: 2 +Release: 3 License: GPL Group: System/Filesystems Source: ocfs2-tools-%{version}.tar.bz2 Patch0: ocfs2-tools-suse.diff Patch1: blkid.m4.diff +Patch2: offsetof.diff URL: http://oss.oracle.com/projects/ocfs2-tools/ Requires: coreutils, net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 PreReq: %insserv_prereq %fillup_prereq @@ -62,6 +63,7 @@ %setup -n ocfs2-tools-%{version} %patch0 -p1 %patch1 -p1 +%patch2 %{?suse_update_config:%{suse_update_config -f}} %build @@ -143,6 +145,8 @@ /usr/share/man/man8/ocfs2console.8* %changelog -n ocfs2-tools +* Wed May 03 2006 - kukuk(a)suse.de +- Fix compile with new glibc * Wed Apr 26 2006 - lmb(a)suse.de - Update to 1.2.1 to match in-kernel version. * Mon Apr 24 2006 - lmb(a)suse.de ++++++ offsetof.diff ++++++ --- libocfs2/include/ocfs2.h +++ libocfs2/include/ocfs2.h 2006/05/03 07:47:12 @@ -43,6 +43,7 @@ #include <limits.h> #include <linux/types.h> +#include <linux/stddef.h> #include <et/com_err.h> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit multipath-tools
by root＠suse.de 03 May '06

03 May '06

Hello community, here is the log from the commit of package multipath-tools checked in at Wed May 3 13:04:14 CEST 2006. -------- --- multipath-tools/multipath-tools.changes 2006-04-10 09:49:07.000000000 +0200 +++ STABLE/multipath-tools/multipath-tools.changes 2006-05-02 14:39:51.000000000 +0200 @@ -1,0 +2,10 @@ +Tue May 2 12:48:56 CEST 2006 - hare(a)suse.de + +- Merge in fixes from upstream + - Merged local patches + - Added hds_modular prioritizer +- Remove merged patches +- Allow for setting of maximum number of open files (#149979) +- Implement 'stop' for init scripts + +------------------------------------------------------------------- Old: ---- multipath-tools-Makefile-cleanup.patch multipath-tools-compile-fixes.patch multipath-tools-shark-update New: ---- multipath-tools-remove-obsolete-option-from-manpage ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.uHmXTH/_old 2006-05-03 13:02:44.000000000 +0200 +++ /var/tmp/diff_new_pack.uHmXTH/_new 2006-05-03 13:02:44.000000000 +0200 @@ -20,7 +20,7 @@ %endif Autoreqprov: on Version: 0.4.6 -Release: 18 +Release: 23 Summary: Tools to Manage Multipathed Devices with the device-mapper Source: multipath-tools-%{version}.tar.bz2 Source1: multipathd @@ -29,15 +29,13 @@ Source5: mpath_id Source6: kpartx_del BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch0: multipath-tools-git-update.patch -Patch1: multipath-tools-shark-update -Patch2: multipath-tools-Makefile-cleanup.patch -Patch3: multipath-tools-compile-fixes.patch -Patch4: multipath-tools-ibm-3526-update -Patch5: multipath-tools-pp_tpc-disable-debug-output.patch -Patch10: multipath-tools-online-device.patch -Patch11: multipath-tools-no-gz-for-manpage +Patch0: %{name}-git-update.patch +Patch4: %{name}-ibm-3526-update +Patch5: %{name}-pp_tpc-disable-debug-output.patch +Patch10: %{name}-online-device.patch +Patch11: %{name}-no-gz-for-manpage Patch12: %{name}-split-off-DS6000 +Patch13: %{name}-remove-obsolete-option-from-manpage %description This package provides the tools to manage multipathed devices by @@ -64,13 +62,11 @@ %prep %setup -n multipath-tools-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %build make OPTFLAGS="$RPM_OPT_FLAGS" BUILD=glibc @@ -116,6 +112,7 @@ /sbin/mpath_prio_alua /sbin/mpath_prio_emc /sbin/mpath_prio_tpc +/sbin/mpath_prio_hds_modular %attr (0700, root, root) /var/cache/multipath %{_mandir}/man8/devmap_name.8* %{_mandir}/man8/multipath.8* @@ -124,6 +121,13 @@ %{_mandir}/man8/mpath_prio_alua.8* %changelog -n multipath-tools +* Tue May 02 2006 - hare(a)suse.de +- Merge in fixes from upstream +- Merged local patches +- Added hds_modular prioritizer +- Remove merged patches +- Allow for setting of maximum number of open files (#149979) +- Implement 'stop' for init scripts * Mon Apr 10 2006 - hare(a)suse.de - Lowering priority for pp_tpc - Split off DS6000 to fixup priority handler (#161347) ++++++ boot.multipath ++++++ --- multipath-tools/boot.multipath 2006-03-29 09:22:20.000000000 +0200 +++ STABLE/multipath-tools/boot.multipath 2006-05-02 14:38:34.000000000 +0200 @@ -17,6 +17,9 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin PROGRAM=/sbin/multipath +# Set the maximum number of open files +MAX_OPEN_FDS=4096 + test -x $PROGRAM || exit 5 # Shell functions sourced from /etc/rc.status: @@ -50,22 +53,19 @@ case "$1" in start) echo -n "Creating multipath targets" - # Check whether we should rescan for devices - if grep -q multipath /proc/cmdline && test -d /sys/class/scsi_host; then - pushd /sys/class/scsi_host 2> /dev/null - for host in *; do - if [ -d $host ]; then - echo "- - -" > $host/scan - fi - done - fi + # Load prerequisite module modprobe dm-multipath # Clear /dev/disk/by-name/ prior to start-up; multipath will # recreate them. rm -f /dev/disk/by-name/* 2>&1 >/dev/null - + + # Set the maximum number of open files + if [ -n "$MAX_OPEN_FDS" ] ; then + ulimit -n $MAX_OPEN_FDS + fi + # Start the program directly as checkproc doesn't work here $PROGRAM -v 0 @@ -77,6 +77,15 @@ sleep 1 ;; stop) + # Remove all partition mappings + if dmsetup ls | grep -q -- -part; then + /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -d -p -part" + fi + + # And remove the multipath mappings themselves + for map in $(/sbin/dmsetup ls --target multipath | cut -f 1); do + /sbin/dmsetup remove $map + done ;; *) echo "Usage: $0 {start|stop}" ++++++ multipath-tools-git-update.patch ++++++ ++++ 3102 lines (skipped) ++++ between multipath-tools/multipath-tools-git-update.patch ++++ and STABLE/multipath-tools/multipath-tools-git-update.patch ++++++ multipath-tools-ibm-3526-update ++++++ --- multipath-tools/multipath-tools-ibm-3526-update 2006-03-22 13:55:48.000000000 +0100 +++ STABLE/multipath-tools/multipath-tools-ibm-3526-update 2006-05-02 12:47:01.000000000 +0200 @@ -1,12 +1,24 @@ +Subject: [PATCH] hwtable: add IBM 3526 + +Adding support for IBM Netfinity FC RAID controller. + +Signed-off-by: Hannes Reinecke <hare(a)suse.de> + +--- + + libmultipath/hwtable.c | 16 ++++++++++++++++ + 1 files changed, 16 insertions(+), 0 deletions(-) + +807fdf4dc06ee4be11620b11ce0be3630a598d57 diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c -index 008e518..3966fea 100644 +index b991689..50cd4c7 100644 --- a/libmultipath/hwtable.c +++ b/libmultipath/hwtable.c @@ -236,6 +236,22 @@ static struct hwentry default_hw[] = { .checker_name = TUR, }, { -+ /* IBM EXT300 ? */ ++ /* IBM Netfinity Fibre Channel RAID Controller Unit */ + .vendor = "IBM", + .product = "3526", + .getuid = DEFAULT_GETUID, @@ -25,3 +37,5 @@ /* IBM DS4200 / FAStT200 */ .vendor = "IBM", .product = "3542", +-- +1.1.3 ++++++ multipath-tools-no-gz-for-manpage ++++++ --- multipath-tools/multipath-tools-no-gz-for-manpage 2006-03-13 13:00:13.000000000 +0100 +++ STABLE/multipath-tools/multipath-tools-no-gz-for-manpage 2006-05-02 11:47:12.000000000 +0200 @@ -1,20 +1,3 @@ -Subject: [PATCH] Do not install manpages as .gz - -SuSE autobuild does not allow to install compressed manpages. -We should rather install manpages uncompress and let rpm handle this. - -Signed-off-by: Hannes Reinecke <hare(a)suse.de> - ---- - - devmap_name/Makefile | 6 ++---- - kpartx/Makefile | 6 ++---- - multipath/Makefile | 6 ++---- - multipathd/Makefile | 5 ++--- - path_priority/pp_alua/Makefile | 9 +++------ - 5 files changed, 11 insertions(+), 21 deletions(-) - -c0ffc402463433d485691abf356225e9ad0ec361 diff --git a/devmap_name/Makefile b/devmap_name/Makefile index 380c85b..5551c9b 100644 --- a/devmap_name/Makefile @@ -155,5 +138,3 @@ main.o: main.c rtpg.h spc3.h rtpg.o: rtpg.c rtpg.h spc3.h --- -1.1.3 ++++++ multipath-tools-split-off-DS6000 ++++++ --- multipath-tools/multipath-tools-split-off-DS6000 2006-04-10 09:47:35.000000000 +0200 +++ STABLE/multipath-tools/multipath-tools-split-off-DS6000 2006-05-02 11:46:14.000000000 +0200 @@ -1,15 +1,34 @@ diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c -index 008e518..39274bd 100644 +index c9cf33c..b991689 100644 --- a/libmultipath/hwtable.c +++ b/libmultipath/hwtable.c -@@ -268,9 +268,25 @@ static struct hwentry default_hw[] = { +@@ -254,7 +254,7 @@ static struct hwentry default_hw[] = { + { + /* IBM ESS F20 aka Shark */ + .vendor = "IBM", +- .product = "2105{800,F20}", ++ .product = "2105(800|F20)", + .getuid = DEFAULT_GETUID, + .getprio = NULL, + .features = "1 queue_if_no_path", +@@ -268,9 +268,9 @@ static struct hwentry default_hw[] = { .checker_name = TUR, }, { - /* IBM DS6000 / SAN Volume Controller */ -+ /* IBM SAN Volume Controller */ ++ /* IBM DS6000 */ .vendor = "IBM", - .product = "{1750500,2145}", ++ .product = "1750500", + .getuid = DEFAULT_GETUID, + .getprio = "/sbin/mpath_prio_alua /dev/%n", + .features = "1 queue_if_no_path", +@@ -300,6 +300,22 @@ static struct hwentry default_hw[] = { + .checker_name = TUR, + }, + { ++ /* IBM SAN Volume Controller */ ++ .vendor = "IBM", + .product = "2145", + .getuid = DEFAULT_GETUID, + .getprio = "/sbin/mpath_prio_alua /dev/%n", @@ -24,9 +43,6 @@ + .checker_name = TUR, + }, + { -+ /* IBM DS6000 */ -+ .vendor = "IBM", -+ .product = "1750500", - .getuid = DEFAULT_GETUID, - .getprio = "/sbin/mpath_prio_alua /dev/%n", - .features = "1 queue_if_no_path", + /* IBM S/390 ECKD DASD */ + .vendor = "IBM", + .product = "S/390 DASD ECKD", ++++++ multipathd ++++++ --- multipath-tools/multipathd 2005-05-12 12:14:57.000000000 +0200 +++ STABLE/multipath-tools/multipathd 2006-05-02 14:27:14.000000000 +0200 @@ -22,6 +22,9 @@ DAEMON=/sbin/multipathd PIDFILE=/var/run/multipathd.pid +# Set the maximum number of open files +MAX_OPEN_FDS=4096 + test -x $DAEMON || exit 5 # Shell functions sourced from /etc/rc.status: @@ -58,6 +61,11 @@ modprobe dm-multipath + # Set the maximum number of open files + if [ -n "$MAX_OPEN_FDS" ] ; then + ulimit -n $MAX_OPEN_FDS + fi + if [ -f $PIDFILE ]; then PID="$(cat $PIDFILE)" PROCNAME="$(ps -o cmd --no-headers $PID)" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp
by root＠suse.de 03 May '06

03 May '06

Hello community, here is the log from the commit of package libzypp checked in at Wed May 3 12:55:39 CEST 2006. -------- --- libzypp/libzypp.changes 2006-05-03 12:24:29.000000000 +0200 +++ STABLE/libzypp/libzypp.changes 2006-05-03 12:54:13.000000000 +0200 @@ -4,0 +5,2 @@ +- add missing testsuite/utils/TestUtils.h +- rev 3330 @@ -7 +9 @@ -Wed May 3 01:43:39 CEST 2006 - ro(a)suse.de +Wed May 3 12:13:38 CEST 2006 - dmacvicar(a)suse.de @@ -9 +11,3 @@ -- add missing testsuite/utils/TestUtils.h +- more fixes for #171062, there were some files still not being + read from cache. +- r3327 Old: ---- restrict-backout.diff zypp-0.0.0.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.N7UZFz/_old 2006-05-03 12:55:28.000000000 +0200 +++ /var/tmp/diff_new_pack.N7UZFz/_new 2006-05-03 12:55:28.000000000 +0200 @@ -18,10 +18,8 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 0.0.8 -Release: 143 +Release: 145 Source: zypp-0.0.0.tar.bz2 -Patch1: zypp-0.0.0.dif -Patch2: restrict-backout.diff Prefix: /usr Provides: yast2-packagemanager Obsoletes: yast2-packagemanager @@ -65,8 +63,6 @@ %prep %setup -q -n zypp-0.0.0 -%patch1 -%patch2 %build mv configure.ac x @@ -109,8 +105,12 @@ %changelog -n libzypp * Wed May 03 2006 - kkaempf(a)suse.de - backout rev 3246->3275 of TargetImpl.cc -* Wed May 03 2006 - ro(a)suse.de - add missing testsuite/utils/TestUtils.h +- rev 3330 +* Wed May 03 2006 - dmacvicar(a)suse.de +- more fixes for #171062, there were some files still not being + read from cache. +- r3327 * Tue May 02 2006 - dmacvicar(a)suse.de - cache keys and signature. Remove lot of duplicated code. (#171062) - r3320 ++++++ zypp-0.0.0.tar.bz2 ++++++ libzypp/zypp-0.0.0.tar.bz2 STABLE/libzypp/zypp-0.0.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp
by root＠suse.de 03 May '06

03 May '06

Hello community, here is the log from the commit of package libzypp checked in at Wed May 3 12:26:02 CEST 2006. -------- --- libzypp/libzypp.changes 2006-05-03 01:43:47.000000000 +0200 +++ STABLE/libzypp/libzypp.changes 2006-05-03 12:24:29.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 3 12:23:36 CEST 2006 - kkaempf(a)suse.de + +- backout rev 3246->3275 of TargetImpl.cc + +------------------------------------------------------------------- New: ---- restrict-backout.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.a5u43Q/_old 2006-05-03 12:25:37.000000000 +0200 +++ /var/tmp/diff_new_pack.a5u43Q/_new 2006-05-03 12:25:37.000000000 +0200 @@ -18,9 +18,10 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 0.0.8 -Release: 141 +Release: 143 Source: zypp-0.0.0.tar.bz2 -Patch: zypp-0.0.0.dif +Patch1: zypp-0.0.0.dif +Patch2: restrict-backout.diff Prefix: /usr Provides: yast2-packagemanager Obsoletes: yast2-packagemanager @@ -64,7 +65,8 @@ %prep %setup -q -n zypp-0.0.0 -%patch +%patch1 +%patch2 %build mv configure.ac x @@ -105,6 +107,8 @@ %{_libdir}/pkgconfig/libzypp.pc %changelog -n libzypp +* Wed May 03 2006 - kkaempf(a)suse.de +- backout rev 3246->3275 of TargetImpl.cc * Wed May 03 2006 - ro(a)suse.de - add missing testsuite/utils/TestUtils.h * Tue May 02 2006 - dmacvicar(a)suse.de ++++++ restrict-backout.diff ++++++ Index: zypp/target/TargetImpl.cc =================================================================== --- zypp/target/TargetImpl.cc (revision 3275) +++ zypp/target/TargetImpl.cc (revision 3246) @@ -145,15 +145,8 @@ - ZYppCommitResult TargetImpl::commit( ResPool pool_r, const ZYppCommitPolicy & policy_rX ) + ZYppCommitResult TargetImpl::commit( ResPool pool_r, const ZYppCommitPolicy & policy_r ) { - // ----------------------------------------------------------------- // - // Fake outstanding YCP fix: Honour restriction to media 1 - // at installation, but install all remaining packages if post-boot. - ZYppCommitPolicy policy_r( policy_rX ); - if ( policy_r.restrictToMedia() > 1 ) - policy_r.allMedia(); - // ----------------------------------------------------------------- // MIL << "TargetImpl::commit(<pool>, " << policy_r << ")" << endl; ZYppCommitResult result; #warning Commit does not provide ZYppCommitResult::_errors @@ -178,29 +171,19 @@ TargetImpl::PoolItemList current_install; TargetImpl::PoolItemList current_srcinstall; - // Collect until the 1st package from an unwanted media occurs. - // Further collection could violate install order. - bool hitUnwantedMedia = false; for (TargetImpl::PoolItemList::iterator it = to_install.begin(); it != to_install.end(); ++it) { Resolvable::constPtr res( it->resolvable() ); Package::constPtr pkg( asKind<Package>(res) ); - if ( pkg ) - { - if ( hitUnwantedMedia || policy_r.restrictToMedia() != pkg->mediaId() ) - { - hitUnwantedMedia = true; - result._remaining.push_back( *it ); - } - else - { - current_install.push_back( *it ); - } - } + if (pkg && policy_r.restrictToMedia() != pkg->mediaId()) // check medianr for packages only + { + XXX << "Package " << *pkg << ", wrong media " << pkg->mediaId() << endl; + result._remaining.push_back( *it ); + } else - { - current_install.push_back( *it ); - } + { + current_install.push_back( *it ); + } } TargetImpl::PoolItemList bad = commit( current_install, policy_r, pool_r ); result._remaining.insert(result._remaining.end(), bad.begin(), bad.end()); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kernel-source
by root＠suse.de 03 May '06

03 May '06

Hello community, here is the log from the commit of package kernel-source checked in at Wed May 3 10:50:33 CEST 2006. -------- --- kernel-source/kernel-bigsmp.changes 2006-05-02 11:24:56.000000000 +0200 +++ STABLE/kernel-source/kernel-bigsmp.changes 2006-05-03 06:54:17.000000000 +0200 @@ -1,0 +2,30 @@ +Wed May 3 06:52:46 CEST 2006 - aj(a)suse.de + +- Move SL101_RC4 tag. + +------------------------------------------------------------------- +Tue May 2 22:07:45 CEST 2006 - gregkh(a)suse.de + +- Update to 2.6.16.13 + - NETFILTER: SCTP conntrack: fix infinite loop (CVE-2006-1527) + +------------------------------------------------------------------- +Tue May 2 22:48:13 CEST 2006 - jeffm(a)suse.de + +- patches.fixes/dm-proper-refcounting.diff: Fixed refcounting when + md != NULL but md->interface_ptr is. It would return NULL, but + allocate a reference that the caller has no way of freeing. + Fixes bug 170321. + +------------------------------------------------------------------- +Tue May 2 16:53:52 CEST 2006 - jack(a)suse.cz + +- patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff: Fix assertion + failure in ext3 (152664). + +------------------------------------------------------------------- +Tue May 2 12:14:07 CEST 2006 - aj(a)suse.de + +- Add SL101_RC4 tag. + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-iseries64.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-smp.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-um.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change New: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.w5a6yC/_old 2006-05-03 10:41:10.000000000 +0200 +++ /var/tmp/diff_new_pack.w5a6yC/_new 2006-05-03 10:41:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-bigsmp (Version 2.6.16.12) +# spec file for package kernel-bigsmp (Version 2.6.16.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.16.12 -Release: 1 +Version: 2.6.16.13 +Release: 2 Summary: Kernel with Multiprocessor Support and PAE License: GPL Group: System/Kernel @@ -29,7 +29,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.16.12-%release +Provides: kernel = 2.6.16.13-%release %endif %endif Provides: kernel-bigsmp-nongpl @@ -114,13 +114,13 @@ -Source Timestamp: 2006/05/02 08:02:44 UTC +Source Timestamp: 2006/05/03 04:53:23 UTC CVS Branch: SL101_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then - echo "The kernel-bigsmp-2.6.16.12.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.16.12.src.rpm." + echo "The kernel-bigsmp-2.6.16.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.16.13.src.rpm." exit 1 fi symbols=$( @@ -441,6 +441,21 @@ %files -f kernel.files %changelog -n kernel-bigsmp +* Wed May 03 2006 - aj(a)suse.de +- Move SL101_RC4 tag. +* Tue May 02 2006 - jeffm(a)suse.de +- patches.fixes/dm-proper-refcounting.diff: Fixed refcounting when + md != NULL but md->interface_ptr is. It would return NULL, but + allocate a reference that the caller has no way of freeing. + Fixes bug 170321. +* Tue May 02 2006 - gregkh(a)suse.de +- Update to 2.6.16.13 +- NETFILTER: SCTP conntrack: fix infinite loop (CVE-2006-1527) +* Tue May 02 2006 - jack(a)suse.cz +- patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff: Fix assertion + failure in ext3 (152664). +* Tue May 02 2006 - aj(a)suse.de +- Add SL101_RC4 tag. * Tue May 02 2006 - okir(a)suse.de - patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated returned random garbage. kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.w5a6yC/_old 2006-05-03 10:41:10.000000000 +0200 +++ /var/tmp/diff_new_pack.w5a6yC/_new 2006-05-03 10:41:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-dummy (Version 2.6.16.12) +# spec file for package kernel-dummy (Version 2.6.16.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ Autoreqprov: off Summary: Internal dummy package for synchronizing release numbers Group: System/Kernel -Version: 2.6.16.12 -Release: 1 +Version: 2.6.16.13 +Release: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -27,7 +27,7 @@ -------- Andreas Gruenbacher <agruen(a)suse.de> -Source Timestamp: 2006/05/02 08:02:44 UTC +Source Timestamp: 2006/05/03 04:53:23 UTC CVS Branch: SL101_BRANCH @@ -41,6 +41,21 @@ /etc/dummy %changelog -n kernel-dummy +* Wed May 03 2006 - aj(a)suse.de +- Move SL101_RC4 tag. +* Tue May 02 2006 - jeffm(a)suse.de +- patches.fixes/dm-proper-refcounting.diff: Fixed refcounting when + md != NULL but md->interface_ptr is. It would return NULL, but + allocate a reference that the caller has no way of freeing. + Fixes bug 170321. +* Tue May 02 2006 - gregkh(a)suse.de +- Update to 2.6.16.13 +- NETFILTER: SCTP conntrack: fix infinite loop (CVE-2006-1527) +* Tue May 02 2006 - jack(a)suse.cz +- patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff: Fix assertion + failure in ext3 (152664). +* Tue May 02 2006 - aj(a)suse.de +- Add SL101_RC4 tag. * Tue May 02 2006 - okir(a)suse.de - patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated returned random garbage. ++++++ kernel-iseries64.spec ++++++ --- /var/tmp/diff_new_pack.w5a6yC/_old 2006-05-03 10:41:10.000000000 +0200 +++ /var/tmp/diff_new_pack.w5a6yC/_new 2006-05-03 10:41:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-iseries64 (Version 2.6.16.12) +# spec file for package kernel-iseries64 (Version 2.6.16.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.16.12 -Release: 1 +Version: 2.6.16.13 +Release: 2 Summary: 64-Bit Kernel for iSeries License: GPL Group: System/Kernel @@ -29,7 +29,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.16.12-%release +Provides: kernel = 2.6.16.13-%release %endif %endif Provides: kernel-iseries64-nongpl @@ -115,13 +115,13 @@ -Source Timestamp: 2006/05/02 08:02:44 UTC +Source Timestamp: 2006/05/03 04:53:23 UTC CVS Branch: SL101_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then - echo "The kernel-iseries64-2.6.16.12.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.16.12.src.rpm." + echo "The kernel-iseries64-2.6.16.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.16.13.src.rpm." exit 1 fi symbols=$( @@ -442,6 +442,21 @@ %files -f kernel.files %changelog -n kernel-iseries64 +* Wed May 03 2006 - aj(a)suse.de +- Move SL101_RC4 tag. +* Tue May 02 2006 - jeffm(a)suse.de +- patches.fixes/dm-proper-refcounting.diff: Fixed refcounting when + md != NULL but md->interface_ptr is. It would return NULL, but + allocate a reference that the caller has no way of freeing. + Fixes bug 170321. +* Tue May 02 2006 - gregkh(a)suse.de +- Update to 2.6.16.13 +- NETFILTER: SCTP conntrack: fix infinite loop (CVE-2006-1527) +* Tue May 02 2006 - jack(a)suse.cz +- patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff: Fix assertion + failure in ext3 (152664). +* Tue May 02 2006 - aj(a)suse.de +- Add SL101_RC4 tag. * Tue May 02 2006 - okir(a)suse.de - patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated returned random garbage. kernel-kdump.spec: same change ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.w5a6yC/_old 2006-05-03 10:41:11.000000000 +0200 +++ /var/tmp/diff_new_pack.w5a6yC/_new 2006-05-03 10:41:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-ppc64 (Version 2.6.16.12) +# spec file for package kernel-ppc64 (Version 2.6.16.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,8 +19,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.16.12 -Release: 1 +Version: 2.6.16.13 +Release: 2 Summary: Kernel for ppc64 Systems License: GPL, LGPL Group: System/Kernel @@ -28,7 +28,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.16.12-%release +Provides: kernel = 2.6.16.13-%release %endif %endif Provides: kernel-ppc64-nongpl @@ -129,13 +129,13 @@ Tom Gall <tom_gall(a)vnet.ibm.com> see /usr/src/linux-pmac-benh/CREDITS for more details. -Source Timestamp: 2006/05/02 08:02:44 UTC +Source Timestamp: 2006/05/03 04:53:23 UTC CVS Branch: SL101_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then - echo "The kernel-ppc64-2.6.16.12.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.16.12.src.rpm." + echo "The kernel-ppc64-2.6.16.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.16.13.src.rpm." exit 1 fi symbols=$( @@ -456,6 +456,21 @@ %files -f kernel.files %changelog -n kernel-ppc64 +* Wed May 03 2006 - aj(a)suse.de +- Move SL101_RC4 tag. +* Tue May 02 2006 - jeffm(a)suse.de +- patches.fixes/dm-proper-refcounting.diff: Fixed refcounting when + md != NULL but md->interface_ptr is. It would return NULL, but + allocate a reference that the caller has no way of freeing. + Fixes bug 170321. +* Tue May 02 2006 - gregkh(a)suse.de +- Update to 2.6.16.13 +- NETFILTER: SCTP conntrack: fix infinite loop (CVE-2006-1527) +* Tue May 02 2006 - jack(a)suse.cz +- patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff: Fix assertion + failure in ext3 (152664). +* Tue May 02 2006 - aj(a)suse.de +- Add SL101_RC4 tag. * Tue May 02 2006 - okir(a)suse.de - patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated returned random garbage. ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.w5a6yC/_old 2006-05-03 10:41:11.000000000 +0200 +++ /var/tmp/diff_new_pack.w5a6yC/_new 2006-05-03 10:41:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-s390 (Version 2.6.16.12) +# spec file for package kernel-s390 (Version 2.6.16.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.16.12 -Release: 1 +Version: 2.6.16.13 +Release: 2 Summary: The Standard Kernel License: GPL Group: System/Kernel @@ -29,7 +29,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.16.12-%release +Provides: kernel = 2.6.16.13-%release %endif %endif Provides: kernel-s390-nongpl @@ -112,13 +112,13 @@ -Source Timestamp: 2006/05/02 08:02:44 UTC +Source Timestamp: 2006/05/03 04:53:23 UTC CVS Branch: SL101_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then - echo "The kernel-s390-2.6.16.12.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.16.12.src.rpm." + echo "The kernel-s390-2.6.16.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.16.13.src.rpm." exit 1 fi symbols=$( @@ -439,6 +439,21 @@ %files -f kernel.files %changelog -n kernel-s390 +* Wed May 03 2006 - aj(a)suse.de +- Move SL101_RC4 tag. +* Tue May 02 2006 - jeffm(a)suse.de +- patches.fixes/dm-proper-refcounting.diff: Fixed refcounting when + md != NULL but md->interface_ptr is. It would return NULL, but + allocate a reference that the caller has no way of freeing. + Fixes bug 170321. +* Tue May 02 2006 - gregkh(a)suse.de +- Update to 2.6.16.13 +- NETFILTER: SCTP conntrack: fix infinite loop (CVE-2006-1527) +* Tue May 02 2006 - jack(a)suse.cz +- patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff: Fix assertion + failure in ext3 (152664). +* Tue May 02 2006 - aj(a)suse.de +- Add SL101_RC4 tag. * Tue May 02 2006 - okir(a)suse.de - patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated returned random garbage. kernel-smp.spec: same change ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.w5a6yC/_old 2006-05-03 10:41:11.000000000 +0200 +++ /var/tmp/diff_new_pack.w5a6yC/_new 2006-05-03 10:41:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-source (Version 2.6.16.12) +# spec file for package kernel-source (Version 2.6.16.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -24,8 +24,8 @@ Obsoletes: linux lx-gdt lx-hack lx-suse lx1162_1 lx1162_2 lx1212_1 lx1212_2 lx1213_1 lx1213_2 lx121_1 lx121_2 lx126_1 lx126_2 lx129_1 lx129_2 lx_large kernel_headers lx_suse lx_sus22 lx_sus24 %endif PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status -Version: 2.6.16.12 -Release: 1 +Version: 2.6.16.13 +Release: 2 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 Source1: functions.sh Source2: source-post.sh @@ -93,7 +93,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006/05/02 08:02:44 UTC +Source Timestamp: 2006/05/03 04:53:23 UTC CVS Branch: SL101_BRANCH %prep @@ -117,16 +117,16 @@ # Apply the patches needed for this architecture. %_sourcedir/guards %symbols < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.16.12/kernel-source.patches -for patch in $(< %_builddir/kernel-source-2.6.16.12/kernel-source.patches); do - if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.16.12/$patch; then + > %_builddir/kernel-source-2.6.16.13/kernel-source.patches +for patch in $(< %_builddir/kernel-source-2.6.16.13/kernel-source.patches); do + if ! patch -s -E -p1 --no-backup-if-mismatch -i %_builddir/kernel-source-2.6.16.13/$patch; then echo "*** Patch $patch failed ***" exit 1 fi done -%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.16.12 %release -KERNELRELEASE=2.6.16.12-%release +%_sourcedir/install-configs %_sourcedir %_builddir/kernel-source-2.6.16.13 %release +KERNELRELEASE=2.6.16.13-%release cat > %_builddir/%{name}-%{version}/.rpm-defs <<EOF KERNELRELEASE=$KERNELRELEASE SYMBOLS=$symbols @@ -147,8 +147,8 @@ ;; esac %_sourcedir/guards %symbols kernel-$flavor < %_sourcedir/series.conf \ - > %_builddir/kernel-source-2.6.16.12/kernel-$flavor.patches - diff -q %_builddir/kernel-source-2.6.16.12/kernel-{source,$flavor}.patches \ + > %_builddir/kernel-source-2.6.16.13/kernel-$flavor.patches + diff -q %_builddir/kernel-source-2.6.16.13/kernel-{source,$flavor}.patches \ || continue o=$RPM_BUILD_ROOT/usr/src/linux-$KERNELRELEASE-obj/$arch/$flavor mkdir -p $o @@ -274,6 +274,21 @@ %files -f kernel-source.files %changelog -n kernel-source +* Wed May 03 2006 - aj(a)suse.de +- Move SL101_RC4 tag. +* Tue May 02 2006 - jeffm(a)suse.de +- patches.fixes/dm-proper-refcounting.diff: Fixed refcounting when + md != NULL but md->interface_ptr is. It would return NULL, but + allocate a reference that the caller has no way of freeing. + Fixes bug 170321. +* Tue May 02 2006 - gregkh(a)suse.de +- Update to 2.6.16.13 +- NETFILTER: SCTP conntrack: fix infinite loop (CVE-2006-1527) +* Tue May 02 2006 - jack(a)suse.cz +- patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff: Fix assertion + failure in ext3 (152664). +* Tue May 02 2006 - aj(a)suse.de +- Add SL101_RC4 tag. * Tue May 02 2006 - okir(a)suse.de - patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated returned random garbage. ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.w5a6yC/_old 2006-05-03 10:41:11.000000000 +0200 +++ /var/tmp/diff_new_pack.w5a6yC/_new 2006-05-03 10:41:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-syms (Version 2.6.16.12) +# spec file for package kernel-syms (Version 2.6.16.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -48,10 +48,10 @@ Autoreqprov: off Summary: Kernel Symbol Versions (modversions) Group: Development/Sources -Version: 2.6.16.12 -Release: 1 +Version: 2.6.16.13 +Release: 2 Requires: linux -Requires: kernel-source = 2.6.16.12-%release +Requires: kernel-source = 2.6.16.13-%release Source11: arch-symbols Source12: guards Source21: config.conf @@ -84,7 +84,7 @@ see /usr/src/linux/CREDITS for more details. -Source Timestamp: 2006/05/02 08:02:44 UTC +Source Timestamp: 2006/05/03 04:53:23 UTC CVS Branch: SL101_BRANCH @@ -128,6 +128,21 @@ /boot/symsets-*-*.tar.gz %changelog -n kernel-syms +* Wed May 03 2006 - aj(a)suse.de +- Move SL101_RC4 tag. +* Tue May 02 2006 - jeffm(a)suse.de +- patches.fixes/dm-proper-refcounting.diff: Fixed refcounting when + md != NULL but md->interface_ptr is. It would return NULL, but + allocate a reference that the caller has no way of freeing. + Fixes bug 170321. +* Tue May 02 2006 - gregkh(a)suse.de +- Update to 2.6.16.13 +- NETFILTER: SCTP conntrack: fix infinite loop (CVE-2006-1527) +* Tue May 02 2006 - jack(a)suse.cz +- patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff: Fix assertion + failure in ext3 (152664). +* Tue May 02 2006 - aj(a)suse.de +- Add SL101_RC4 tag. * Tue May 02 2006 - okir(a)suse.de - patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated returned random garbage. ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.w5a6yC/_old 2006-05-03 10:41:12.000000000 +0200 +++ /var/tmp/diff_new_pack.w5a6yC/_new 2006-05-03 10:41:12.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kernel-um (Version 2.6.16.12) +# spec file for package kernel-um (Version 2.6.16.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ # arch/ia64/scripts/unwcheck.py BuildRequires: python %endif -Version: 2.6.16.12 -Release: 1 +Version: 2.6.16.13 +Release: 2 Summary: The User Mode Linux kernel. License: GPL Group: System/Kernel @@ -29,7 +29,7 @@ #Conflicts: kernel %else %if !%build_xen -Provides: kernel = 2.6.16.12-%release +Provides: kernel = 2.6.16.13-%release %endif %endif Provides: kernel-um-nongpl @@ -115,13 +115,13 @@ -Source Timestamp: 2006/05/02 08:02:44 UTC +Source Timestamp: 2006/05/03 04:53:23 UTC CVS Branch: SL101_BRANCH %prep if ! [ -e %_sourcedir/linux-2.6.16.tar.bz2 ]; then - echo "The kernel-um-2.6.16.12.nosrc.rpm package does not contain the" \ - "complete sources. Please install kernel-source-2.6.16.12.src.rpm." + echo "The kernel-um-2.6.16.13.nosrc.rpm package does not contain the" \ + "complete sources. Please install kernel-source-2.6.16.13.src.rpm." exit 1 fi symbols=$( @@ -442,6 +442,21 @@ %files -f kernel.files %changelog -n kernel-um +* Wed May 03 2006 - aj(a)suse.de +- Move SL101_RC4 tag. +* Tue May 02 2006 - jeffm(a)suse.de +- patches.fixes/dm-proper-refcounting.diff: Fixed refcounting when + md != NULL but md->interface_ptr is. It would return NULL, but + allocate a reference that the caller has no way of freeing. + Fixes bug 170321. +* Tue May 02 2006 - gregkh(a)suse.de +- Update to 2.6.16.13 +- NETFILTER: SCTP conntrack: fix infinite loop (CVE-2006-1527) +* Tue May 02 2006 - jack(a)suse.cz +- patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff: Fix assertion + failure in ext3 (152664). +* Tue May 02 2006 - aj(a)suse.de +- Add SL101_RC4 tag. * Tue May 02 2006 - okir(a)suse.de - patches.fixes/nfs4-open-delegated: [NFSv4] nfs4_open_delegated returned random garbage. kernel-xen.spec: same change kernel-xenpae.spec: same change ++++++ build-source-timestamp ++++++ --- kernel-source/build-source-timestamp 2006-05-02 11:24:52.000000000 +0200 +++ STABLE/kernel-source/build-source-timestamp 2006-05-03 06:54:14.000000000 +0200 @@ -1,2 +1,2 @@ -2006/05/02 08:02:44 UTC +2006/05/03 04:53:23 UTC CVS Branch: SL101_BRANCH ++++++ minmem ++++++ --- kernel-source/minmem 2006-05-02 12:12:52.000000000 +0200 +++ STABLE/kernel-source/minmem 2006-05-03 06:54:26.000000000 +0200 @@ -1 +1 @@ -514000 +1048576 ++++++ patches.fixes.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/dm-proper-refcounting.diff new/patches.fixes/dm-proper-refcounting.diff --- old/patches.fixes/dm-proper-refcounting.diff 2006-05-02 07:05:51.000000000 +0200 +++ new/patches.fixes/dm-proper-refcounting.diff 2006-05-03 06:52:11.000000000 +0200 @@ -13,8 +13,8 @@ Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> -- drivers/md/dm-ioctl.c | 20 ++++++++++++++++---- - drivers/md/dm.c | 16 ++++------------ - 2 files changed, 20 insertions(+), 16 deletions(-) + drivers/md/dm.c | 20 ++++++++------------ + 2 files changed, 24 insertions(+), 16 deletions(-) diff -ruNpX ../dontdiff linux-2.6.16-staging1/drivers/md/dm.c linux-2.6.16-staging2/drivers/md/dm.c --- linux-2.6.16-staging1/drivers/md/dm.c 2006-04-13 16:18:22.000000000 -0400 @@ -37,7 +37,7 @@ } spin_unlock(&_minor_lock); -@@ -993,22 +995,12 @@ static struct mapped_device *dm_find_md( +@@ -993,24 +995,18 @@ static struct mapped_device *dm_find_md( return md; } @@ -60,7 +60,13 @@ + md = dm_get_md(dev); if (md) mdptr = md->interface_ptr; ++ ++ if (mdptr == NULL) ++ dm_put(md); ++ return mdptr; + } + diff -ruNpX ../dontdiff linux-2.6.16-staging1/drivers/md/dm-ioctl.c linux-2.6.16-staging2/drivers/md/dm-ioctl.c --- linux-2.6.16-staging1/drivers/md/dm-ioctl.c 2006-04-05 14:02:34.000000000 -0400 +++ linux-2.6.16-staging2/drivers/md/dm-ioctl.c 2006-04-13 16:18:22.000000000 -0400 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff new/patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff --- old/patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff 2006-05-02 16:58:42.000000000 +0200 @@ -0,0 +1,54 @@ +From: Jan Kara <jack(a)suse.cz> +Subject: Fix assertion failure in ext3 +References: 152664 +Patch-mainline: submitted 2006-04-23 + +Fix possible assertion failure in journal_commit_transaction() on +jh->b_next_transaction == NULL (when we are processing BJ_Forget list and +buffer is not jbddirty). !jbddirty buffers can be placed on BJ_Forget list +for example by journal_forget() or by __dispose_buffer() - generally such +buffer means that it has been freed by this transaction. Freed buffers should +not be reallocated until the transaction has committed (that's why we have +the assertion there) but they *can* be reallocated when the transaction +has already been committed to disk and we are just processing the BJ_Forget +list (as soon as we remove b_committed_data from the bitmap bh, ext3 will +be able to reallocate buffers freed by the committing transaction). So +we have to also count with the case that the buffer has been reallocated and +b_next_transaction has been already set. + And one more subtle point: it can happen that we manage to reallocate the +buffer and also mark it jbddirty. Then we also add the freed buffer to +the checkpoint list of the committing trasaction. But that should do no harm. + +Signed-off-by: Jan Kara <jack(a)suse.cz> + +diff -rupX /home/jack/.kerndiffexclude linux-2.6.16/fs/jbd/commit.c linux-2.6.16-1-realloc_freed_fix/fs/jbd/commit.c +--- linux-2.6.16/fs/jbd/commit.c 2006-01-15 00:20:12.000000000 +0100 ++++ linux-2.6.16-1-realloc_freed_fix/fs/jbd/commit.c 2006-04-20 10:32:15.000000000 +0200 +@@ -790,11 +790,22 @@ restart_loop: + jbd_unlock_bh_state(bh); + } else { + J_ASSERT_BH(bh, !buffer_dirty(bh)); +- J_ASSERT_JH(jh, jh->b_next_transaction == NULL); +- __journal_unfile_buffer(jh); +- jbd_unlock_bh_state(bh); +- journal_remove_journal_head(bh); /* needs a brelse */ +- release_buffer_page(bh); ++ /* The buffer on BJ_Forget list and not jbddirty means ++ * it has been freed by this transaction and hence it ++ * could not have been reallocated until this ++ * transaction has committed. *BUT* it could be ++ * reallocated once we have written all the data to ++ * disk and before we process the buffer on BJ_Forget ++ * list. */ ++ JBUFFER_TRACE(jh, "refile or unfile freed buffer"); ++ __journal_refile_buffer(jh); ++ if (!jh->b_transaction) { ++ jbd_unlock_bh_state(bh); ++ /* needs a brelse */ ++ journal_remove_journal_head(bh); ++ release_buffer_page(bh); ++ } else ++ jbd_unlock_bh_state(bh); + } + cond_resched_lock(&journal->j_list_lock); + } ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 9942 lines of diff (skipped) ++++++ series.conf ++++++ --- kernel-source/series.conf 2006-05-02 11:24:57.000000000 +0200 +++ STABLE/kernel-source/series.conf 2006-05-03 06:54:18.000000000 +0200 @@ -21,7 +21,7 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... - patches.kernel.org/patch-2.6.16.12 + patches.kernel.org/patch-2.6.16.13 patches.fixes/setuid-dumpable-wrongdir patches.fixes/git-kbuild.patch @@ -1010,6 +1010,9 @@ patches.drivers/ide-cd-confused patches.fixes/cfq-tune + # bug 152664 + patches.fixes/jbd-2.6.16-1-realloc_freed_fix.diff + # PLEASE KEEP THESE PATCHES AT THE END OF series.conf # (as all other arch specific patches should be kept at the end # for obvious reasons.) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit zmd
by root＠suse.de 03 May '06

03 May '06

Hello community, here is the log from the commit of package zmd checked in at Wed May 3 10:36:57 CEST 2006. -------- --- zmd/zmd.changes 2006-05-01 17:56:37.000000000 +0200 +++ STABLE/zmd/zmd.changes 2006-05-03 07:36:23.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 3 07:35:10 CEST 2006 - maw(a)suse.de + +- New source drop (r27768) which: +- Runs update-status after we call parse-metadata for zypp + services. (#170152) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.O9WLKk/_old 2006-05-03 10:35:26.000000000 +0200 +++ /var/tmp/diff_new_pack.O9WLKk/_new 2006-05-03 10:35:26.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel URL: http://www.novell.com Version: 7.1.1.0 -Release: 31 +Release: 33 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 @@ -155,6 +155,10 @@ # %{_libdir}/monodoc/sources/* %changelog -n zmd +* Wed May 03 2006 - maw(a)suse.de +- New source drop (r27768) which: +- Runs update-status after we call parse-metadata for zypp + services. (#170152) * Mon May 01 2006 - maw(a)suse.de - New source drop (r27683) which: - Marks a few bundle methods as view ++++++ zmd-7.1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/ChangeLog new/zmd-7.1.1.0/ChangeLog --- old/zmd-7.1.1.0/ChangeLog 2006-04-07 17:07:28.000000000 +0200 +++ new/zmd-7.1.1.0/ChangeLog 2006-05-02 17:07:36.000000000 +0200 @@ -1,3 +1,18 @@ +2006-05-02 Tambet Ingo <tambet(a)ximian.com> + + * Makefile.am: Install zmd.conf file with 0600 permissions. + +2006-05-01 James Willcox <james(a)ximian.com> + + * zmd.init.lsb.in: oops, making try-restart equivalent is to restart + is not what we want at all. Make SIGHUP cause zmd to restart + when it's ready, and have try-restart use that. + +2006-05-01 James Willcox <james(a)ximian.com> + + * zmd.init.lsb.in: don't send SIGQUIT to zmd. It doesn't handle it + at all anymore. + 2006-04-07 Dan Mills <thunder(a)ximian.com> * configure.in: Add a nano version. We are now version 7.1.1.0. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/Makefile.am new/zmd-7.1.1.0/Makefile.am --- old/zmd-7.1.1.0/Makefile.am 2006-03-15 20:56:39.000000000 +0100 +++ new/zmd-7.1.1.0/Makefile.am 2006-05-02 17:07:36.000000000 +0200 @@ -35,7 +35,7 @@ fi if test '!' -f $(DESTDIR)$(confdir)/zmd.conf; then \ - $(INSTALL_DATA) $(srcdir)/zmd.conf $(DESTDIR)$(confdir)/zmd.conf; \ + $(INSTALL_DATA) -m 0600 $(srcdir)/zmd.conf $(DESTDIR)$(confdir)/zmd.conf; \ fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/Makefile.in new/zmd-7.1.1.0/Makefile.in --- old/zmd-7.1.1.0/Makefile.in 2006-04-25 20:35:58.000000000 +0200 +++ new/zmd-7.1.1.0/Makefile.in 2006-05-02 23:27:04.000000000 +0200 @@ -771,7 +771,7 @@ fi if test '!' -f $(DESTDIR)$(confdir)/zmd.conf; then \ - $(INSTALL_DATA) $(srcdir)/zmd.conf $(DESTDIR)$(confdir)/zmd.conf; \ + $(INSTALL_DATA) -m 0600 $(srcdir)/zmd.conf $(DESTDIR)$(confdir)/zmd.conf; \ fi snap: dist diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/ChangeLog new/zmd-7.1.1.0/modules/ChangeLog --- old/zmd-7.1.1.0/modules/ChangeLog 2006-04-28 15:33:41.000000000 +0200 +++ new/zmd-7.1.1.0/modules/ChangeLog 2006-05-03 01:55:48.000000000 +0200 @@ -1,3 +1,13 @@ +2006-05-02 Chris Rivera <cmr(a)ximian.com> + + * linux/ZyppService.cs: call update-status after the metadata is parsed. + +2006-05-02 Tambet Ingo <tambet(a)ximian.com> + + * linux/RCEPackage.cs: Optimze the XML parser. Don't create new string + per each (possibly duplicate) dependency. Don't intern string since + they come from XmlNameTable already. + 2006-04-28 Tambet Ingo <tambet(a)ximian.com> * linux/RemotePackageManager.cs: Mark QueryLatest with "view" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RCEPackage.cs new/zmd-7.1.1.0/modules/linux/RCEPackage.cs --- old/zmd-7.1.1.0/modules/linux/RCEPackage.cs 2006-04-25 23:00:02.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/RCEPackage.cs 2006-05-02 17:07:35.000000000 +0200 @@ -32,7 +32,46 @@ } private static int GetDepKey (string name, string epoch, string version, string release, string op) { - return String.Format ("{0}{1}{2}{3}{4}", op, name, epoch, version, release).GetHashCode (); + int h = 0; + int i, len; + + // That's what other mono classes do to avoid creation of new strings to get the hash code + // of multiple strings. + + if (name != null) { + len = name.Length; + for (i = 0; i < len; i++) + h = (h << 5) - h + name[i]; + } + + if (epoch != null) { + len = epoch.Length; + for (i = 0; i < len; i++) + h = (h << 5) - h + epoch[i]; + } + + if (version != null) { + len = version.Length; + for (i = 0; i < len; i++) + h = (h << 5) - h + version[i]; + } + + if (release != null) { + len = release.Length; + for (i = 0; i < len; i++) + h = (h << 5) - h + release[i]; + } + + if (op != null) { + len = op.Length; + for (i = 0; i < len; i++) + h = (h << 5) - h + op[i]; + } + + // h must be be >= 0 + h &= 0x7FFFFFFF; + + return h; } private static void ParseDeps (ResolvableDepCollection collection, Hashtable dephash, XmlTextReader reader, @@ -53,8 +92,13 @@ if (!reader.HasAttributes) continue; - int key = GetDepKey (reader["name"], reader["epoch"], reader["version"], reader["release"], - reader["op"]); + string name = reader["name"]; + string epoch = reader["epoch"]; + string version = reader["version"]; + string release = reader["release"]; + string op = reader["op"]; + + int key = GetDepKey (name, epoch, version, release, op); ResolvableDep dep = (ResolvableDep) dephash[key]; if (dep != null) { @@ -63,29 +107,25 @@ } else { dep = new ResolvableDep (); } - - string tmp; - ResolvableOperation op = ResolvableOperation.Any; - tmp = reader["op"]; - if (tmp != null) - op = ResolvableDep.OperationFromString (tmp); - - dep.Name = String.Intern (reader["name"]); - - tmp = reader["epoch"]; - if (tmp != null) - dep.Epoch = XmlConvert.ToInt32 (tmp); + ResolvableOperation operation = ResolvableOperation.Any; + if (op != null) + operation = ResolvableDep.OperationFromString (op); + + dep.Name = name; + + if (epoch != null) + dep.Epoch = XmlConvert.ToInt32 (epoch); else dep.Epoch = 0; - if (reader["version"] != null) - dep.Version = String.Intern (reader["version"]); + if (version != null) + dep.Version = version; - if (reader["release"] != null) - dep.Release = String.Intern (reader["release"]); - - dep.Operation = op; + if (release != null) + dep.Release = release; + + dep.Operation = operation; collection.Add (dep); dephash[key] = dep; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/ZyppService.cs new/zmd-7.1.1.0/modules/linux/ZyppService.cs --- old/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-04-24 20:04:00.000000000 +0200 +++ new/zmd-7.1.1.0/modules/linux/ZyppService.cs 2006-05-02 23:18:03.000000000 +0200 @@ -131,6 +131,7 @@ private void DoRefresh () { Backend.Current.ParseMetadata ("zypp", typeof (ZyppPackage), uri, uri, catalog); BundleManager.Add (catalog); + RedCarpetBackend.UpdatePatchStatus (); lock (this) { refreshProgress.Finish (); Binary files old/zmd-7.1.1.0/po/de_DE.gmo and new/zmd-7.1.1.0/po/de_DE.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/de_DE.po new/zmd-7.1.1.0/po/de_DE.po --- old/zmd-7.1.1.0/po/de_DE.po 2006-05-01 17:33:34.000000000 +0200 +++ new/zmd-7.1.1.0/po/de_DE.po 2006-05-03 02:03:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-01 11:33-0400\n" +"POT-Creation-Date: 2006-05-02 20:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -449,16 +449,16 @@ msgid "Don't load initial services" msgstr "Ursprüngliche Dienste nicht laden" -#: src/Daemon.cs:233 +#: src/Daemon.cs:232 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Unbekannte Zertifikaterweiterung für: {0}" -#: src/Daemon.cs:248 +#: src/Daemon.cs:247 msgid "A daemon is already running" msgstr "Es wird bereits ein Daemon ausgeführt." -#: src/Daemon.cs:307 +#: src/Daemon.cs:306 msgid "Loading trusted certificates..." msgstr "Vertrauenswürdige Zertifikate werden geladen..." Binary files old/zmd-7.1.1.0/po/en_US.gmo and new/zmd-7.1.1.0/po/en_US.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/en_US.po new/zmd-7.1.1.0/po/en_US.po --- old/zmd-7.1.1.0/po/en_US.po 2006-05-01 17:33:34.000000000 +0200 +++ new/zmd-7.1.1.0/po/en_US.po 2006-05-03 02:03:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-01 11:33-0400\n" +"POT-Creation-Date: 2006-05-02 20:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -439,16 +439,16 @@ msgid "Don't load initial services" msgstr "Don't load initial services" -#: src/Daemon.cs:233 +#: src/Daemon.cs:232 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Unknown certificate extension for: {0}" -#: src/Daemon.cs:248 +#: src/Daemon.cs:247 msgid "A daemon is already running" msgstr "A daemon is already running" -#: src/Daemon.cs:307 +#: src/Daemon.cs:306 msgid "Loading trusted certificates..." msgstr "Loading trusted certificates..." Binary files old/zmd-7.1.1.0/po/es_ES.gmo and new/zmd-7.1.1.0/po/es_ES.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/es_ES.po new/zmd-7.1.1.0/po/es_ES.po --- old/zmd-7.1.1.0/po/es_ES.po 2006-05-01 17:33:34.000000000 +0200 +++ new/zmd-7.1.1.0/po/es_ES.po 2006-05-03 02:03:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-01 11:33-0400\n" +"POT-Creation-Date: 2006-05-02 20:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -447,16 +447,16 @@ msgid "Don't load initial services" msgstr "No cargar servicios iniciales" -#: src/Daemon.cs:233 +#: src/Daemon.cs:232 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Extensión de certificado desconocida para: {0}" -#: src/Daemon.cs:248 +#: src/Daemon.cs:247 msgid "A daemon is already running" msgstr "Ya hay un daemon ejecutándose" -#: src/Daemon.cs:307 +#: src/Daemon.cs:306 msgid "Loading trusted certificates..." msgstr "Cargando certificados de confianza..." Binary files old/zmd-7.1.1.0/po/fr_FR.gmo and new/zmd-7.1.1.0/po/fr_FR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/fr_FR.po new/zmd-7.1.1.0/po/fr_FR.po --- old/zmd-7.1.1.0/po/fr_FR.po 2006-05-01 17:33:34.000000000 +0200 +++ new/zmd-7.1.1.0/po/fr_FR.po 2006-05-03 02:03:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-01 11:33-0400\n" +"POT-Creation-Date: 2006-05-02 20:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -453,16 +453,16 @@ msgid "Don't load initial services" msgstr "Ne pas charger de services initiaux" -#: src/Daemon.cs:233 +#: src/Daemon.cs:232 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Extension du certificat inconnue pour : {0}" -#: src/Daemon.cs:248 +#: src/Daemon.cs:247 msgid "A daemon is already running" msgstr "Un daemon est déjà en cours d'exécution" -#: src/Daemon.cs:307 +#: src/Daemon.cs:306 msgid "Loading trusted certificates..." msgstr "Chargement des certificats autorisés..." Binary files old/zmd-7.1.1.0/po/pt_BR.gmo and new/zmd-7.1.1.0/po/pt_BR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/pt_BR.po new/zmd-7.1.1.0/po/pt_BR.po --- old/zmd-7.1.1.0/po/pt_BR.po 2006-05-01 17:33:35.000000000 +0200 +++ new/zmd-7.1.1.0/po/pt_BR.po 2006-05-03 02:03:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-01 11:33-0400\n" +"POT-Creation-Date: 2006-05-02 20:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" @@ -442,16 +442,16 @@ msgid "Don't load initial services" msgstr "Não carregar serviços iniciais" -#: src/Daemon.cs:233 +#: src/Daemon.cs:232 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "Extensão de certificado desconhecida para: {0}" -#: src/Daemon.cs:248 +#: src/Daemon.cs:247 msgid "A daemon is already running" msgstr "Já existe um daemon em execução" -#: src/Daemon.cs:307 +#: src/Daemon.cs:306 msgid "Loading trusted certificates..." msgstr "Carregando certificados confiáveis..." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/po/zmd.pot new/zmd-7.1.1.0/po/zmd.pot --- old/zmd-7.1.1.0/po/zmd.pot 2006-05-01 17:33:34.000000000 +0200 +++ new/zmd-7.1.1.0/po/zmd.pot 2006-05-03 02:03:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-01 11:33-0400\n" +"POT-Creation-Date: 2006-05-02 20:03-0400\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" @@ -437,16 +437,16 @@ msgid "Don't load initial services" msgstr "" -#: src/Daemon.cs:233 +#: src/Daemon.cs:232 #, csharp-format msgid "Unknown certificate extension for: {0}" msgstr "" -#: src/Daemon.cs:248 +#: src/Daemon.cs:247 msgid "A daemon is already running" msgstr "" -#: src/Daemon.cs:307 +#: src/Daemon.cs:306 msgid "Loading trusted certificates..." msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/BuildConfig.cs new/zmd-7.1.1.0/src/BuildConfig.cs --- old/zmd-7.1.1.0/src/BuildConfig.cs 2006-05-01 17:33:29.000000000 +0200 +++ new/zmd-7.1.1.0/src/BuildConfig.cs 2006-05-03 02:03:52.000000000 +0200 @@ -1,14 +1,14 @@ namespace Novell.Zenworks.Zmd { public class BuildConfig { - public const string PREFIX = "/opt/zypp"; - public const string SYSCONFDIR = "/opt/zypp/etc"; - public const string DATADIR = "/opt/zypp/share"; - public const string LIBDIR = "/opt/zypp/lib"; - public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib"; - public const string LOCALSTATEDIR = "/opt/zypp/var"; + public const string PREFIX = "/usr"; + public const string SYSCONFDIR = "/etc"; + public const string DATADIR = "/usr/share"; + public const string LIBDIR = "/usr/lib64"; + public const string LIBDIR_MANAGED = "/usr" + "/lib"; + public const string LOCALSTATEDIR = "/var"; - public const string LOGDIR = "/opt/zypp/var/log"; + public const string LOGDIR = "/var/log"; public const string LOGFILE = LOGDIR + "/zmd-messages.log"; public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/ChangeLog new/zmd-7.1.1.0/src/ChangeLog --- old/zmd-7.1.1.0/src/ChangeLog 2006-04-28 18:20:47.000000000 +0200 +++ new/zmd-7.1.1.0/src/ChangeLog 2006-05-02 17:07:35.000000000 +0200 @@ -1,3 +1,8 @@ +2006-05-02 Tambet Ingo <tambet(a)ximian.com> + + * Daemon.cs: Set IsSleepResume to false after initial services are + loaded. Fixes #171042. + 2006-04-28 Chris Rivera <cmr(a)ximian.com> * RemoteBundleManager.cs: Mark a few bundle methods with the view priv. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/Daemon.cs new/zmd-7.1.1.0/src/Daemon.cs --- old/zmd-7.1.1.0/src/Daemon.cs 2006-04-25 23:00:02.000000000 +0200 +++ new/zmd-7.1.1.0/src/Daemon.cs 2006-05-02 17:07:35.000000000 +0200 @@ -145,8 +145,7 @@ log.Info("Received signal " + sig.ToString ()); if (sig == Signum.SIGHUP) { - ModuleLoader.Load (); - ServiceManager.Refresh (); + ShutdownManager.Restart (false); } else { ShutdownManager.Shutdown (false); } @@ -334,6 +333,7 @@ progress.WaitForStop (); } + IsSleepResume = false; CreateChannelSinks (); RegisterRemotableObjects (); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/zmd.init.lsb.in new/zmd-7.1.1.0/zmd.init.lsb.in --- old/zmd-7.1.1.0/zmd.init.lsb.in 2006-04-05 21:20:18.000000000 +0200 +++ new/zmd-7.1.1.0/zmd.init.lsb.in 2006-05-02 17:07:35.000000000 +0200 @@ -15,7 +15,7 @@ # Visit http://www.novell.com for more information. ### END INIT INFO -# $Id: zmd.init.lsb.in 26734 2006-04-05 18:52:33Z rhunter $ +# $Id: zmd.init.lsb.in 27746 2006-05-01 23:53:34Z james $ # Source SuSE config PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -146,7 +146,7 @@ echo -n "Restarting ZENworks Management Daemon: " if check_running; then \ - kill -QUIT `cat /var/run/zmd.pid` + kill -HUP `cat /var/run/zmd.pid` fi rc_status -v ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-vm
by root＠suse.de 03 May '06

03 May '06

Hello community, here is the log from the commit of package yast2-vm checked in at Wed May 3 10:35:18 CEST 2006. -------- --- yast2-vm/yast2-vm.changes 2006-04-28 22:42:30.000000000 +0200 +++ STABLE/yast2-vm/yast2-vm.changes 2006-05-03 01:40:01.000000000 +0200 @@ -1,0 +2,19 @@ +Tue May 2 12:58:42 MDT 2006 - mgfritch(a)novell.com + +- Added patch for "srcid" not set in results from + Pkg::PkgPropertiesAll (#163609) +- Added a popup error message to VM_Common::CreateDiskImage() for + when the 'dd' command fails to create a disk image (#172083) +- Added an additional popup error message when installing/finalizing + a VM's settings. This new popup contains a details button with the + output (stdout/stderr) of a failed xm create command (#172084) +- Final text review in preparation for text freeze. +- 2.13.43 + +------------------------------------------------------------------- +Tue May 2 10:21:36 MDT 2006 - mgfritch(a)novell.com + +- Add a second yes/no pop-up warning the user about deleting a VM. +- 2.13.42 + +------------------------------------------------------------------- Old: ---- yast2-vm-2.13.41.tar.bz2 New: ---- yast2-vm-2.13.43.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-vm.spec ++++++ --- /var/tmp/diff_new_pack.LpvWJY/_old 2006-05-03 10:33:59.000000000 +0200 +++ /var/tmp/diff_new_pack.LpvWJY/_new 2006-05-03 10:33:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-vm (Version 2.13.41) +# spec file for package yast2-vm (Version 2.13.43) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-vm -Version: 2.13.41 +Version: 2.13.43 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-vm-2.13.41.tar.bz2 +Source0: yast2-vm-2.13.43.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 yast2-installation @@ -32,7 +32,7 @@ Ladislav Slezak <lslezak(a)suse.cz> %prep -%setup -n yast2-vm-2.13.41 +%setup -n yast2-vm-2.13.43 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +73,19 @@ %doc %{prefix}/share/doc/packages/yast2-vm %changelog -n yast2-vm +* Tue May 02 2006 - mgfritch(a)novell.com +- Added patch for "srcid" not set in results from + Pkg::PkgPropertiesAll (#163609) +- Added a popup error message to VM_Common::CreateDiskImage() for + when the 'dd' command fails to create a disk image (#172083) +- Added an additional popup error message when installing/finalizing + a VM's settings. This new popup contains a details button with the + output (stdout/stderr) of a failed xm create command (#172084) +- Final text review in preparation for text freeze. +- 2.13.43 +* Tue May 02 2006 - mgfritch(a)novell.com +- Add a second yes/no pop-up warning the user about deleting a VM. +- 2.13.42 * Thu Apr 27 2006 - mgfritch(a)novell.com - If AMD Pacifica (svm) processor, architecture is x86_64 and full virtualization, always write out 'cpus=0' (#169855) ++++++ yast2-vm-2.13.41.tar.bz2 -> yast2-vm-2.13.43.tar.bz2 ++++++ ++++ 2407 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/yast2-vm-2.13.41/VERSION new/yast2-vm-2.13.43/VERSION --- old/yast2-vm-2.13.41/VERSION 2006-04-28 00:16:34.000000000 +0200 +++ new/yast2-vm-2.13.43/VERSION 2006-05-02 20:58:32.000000000 +0200 @@ -1 +1 @@ -2.13.41 +2.13.43 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/yast2-vm-2.13.41/configure.in new/yast2-vm-2.13.43/configure.in --- old/yast2-vm-2.13.41/configure.in 2006-04-28 22:29:44.000000000 +0200 +++ new/yast2-vm-2.13.43/configure.in 2006-05-03 01:15:05.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-vm, 2.13.41, http://www.suse.de/feedback, yast2-vm) +AC_INIT(yast2-vm, 2.13.43, http://www.suse.de/feedback, yast2-vm) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.41" +VERSION="2.13.43" RPMNAME="yast2-vm" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" 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/yast2-vm-2.13.41/src/VM.ycp new/yast2-vm-2.13.43/src/VM.ycp --- old/yast2-vm-2.13.41/src/VM.ycp 2006-04-25 21:21:15.000000000 +0200 +++ new/yast2-vm-2.13.43/src/VM.ycp 2006-05-03 01:29:06.000000000 +0200 @@ -4,7 +4,7 @@ * Authors: Ladislav Slezak <lslezak(a)suse.cz> * Michael G. Fritch <mgfritch(a)novell.com> * - * $Id: VM.ycp 30476 2006-04-25 19:20:34Z mgfritch $ + * $Id: VM.ycp 30631 2006-05-02 23:28:44Z mgfritch $ */ { module "VM"; @@ -728,12 +728,12 @@ } } - global boolean ViewVirtualMachineConsole(string DomName, boolean isFullVirtualization, boolean isNetWare, boolean displayError) { - boolean(string, boolean, boolean, boolean) toEval = (boolean(string, boolean, boolean, boolean))functions["ViewVirtualMachineConsole"]:nil; + global boolean ViewVirtualMachineConsole(string DomName, boolean isFullVirtualization, boolean isNetWare, boolean background, boolean displayError) { + boolean(string, boolean, boolean, boolean, boolean) toEval = (boolean(string, boolean, boolean, boolean, boolean))functions["ViewVirtualMachineConsole"]:nil; if (toEval != nil) { - return toEval(DomName, isFullVirtualization, isNetWare, displayError); + return toEval(DomName, isFullVirtualization, isNetWare, background, displayError); } else { @@ -784,10 +784,6 @@ } } - global boolean Start(boolean background) { - return CallBooleanBooleanFunction("Start", background); - } - global boolean InstallPackages() { return CallBooleanFunction("InstallPackages"); } 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/yast2-vm-2.13.41/src/VM_Common.ycp new/yast2-vm-2.13.43/src/VM_Common.ycp --- old/yast2-vm-2.13.41/src/VM_Common.ycp 2006-04-28 02:33:55.000000000 +0200 +++ new/yast2-vm-2.13.43/src/VM_Common.ycp 2006-05-03 01:29:06.000000000 +0200 @@ -4,7 +4,7 @@ * Authors: Ladislav Slezak <lslezak(a)suse.cz> * Michael G. Fritch <mgfritch(a)novell.com> * - * $Id: VM_Common.ycp 30557 2006-04-28 00:33:15Z mgfritch $ + * $Id: VM_Common.ycp 30631 2006-05-02 23:28:44Z mgfritch $ */ { module "VM_Common"; @@ -239,6 +239,41 @@ virtualization_type = input["virtualization_type"]:default_type; } + /** + * Displays a formatted popup error message, with a details button. + * @param errorMessage string - a simple message describing the error + * @param out map - output of the executed command + * @param cmd string - the executed command + * @return void + */ + global void PopupErrorDetails(string errorMessage, map out, string cmd) ``{ + string message = _("Undefined Error"); + if (errorMessage != nil && errorMessage != "") message = errorMessage; + Popup::ClearFeedback(); // just in case there are leftovers. + if (!Popup::AnyQuestion( Label::ErrorMsg(), message, Label::OKButton(), _("Details"), `focus )) { + string description = sformat("<pre>command: %1 return \n %2 %3</pre>", cmd, out["stderr"]:"", out["stdout"]:""); + UI::OpenDialog (`opt(`decorated ), + `HBox( `VSpacing(16), + `VBox ( + `HSpacing (100), + // popup window header + `Heading (message), + `VSpacing (0.5), + `RichText (description), + `VSpacing (1.0), + // push button label + `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()) + ) + ) + ); + + UI::SetFocus (`id(`ok)); + UI::UserInput (); + UI::CloseDialog (); + } + } + + global string GetAutoYastProposal() { // proposal items return HTML::List([ sformat(_("AutoYaST Profile: %1"), (autoyast_profile != "") ? @@ -489,11 +524,21 @@ y2milestone("Creating disk image %1 (%2MB)", file, image_mb); y2debug("dd command: %1", cmd); - integer result = (integer) SCR::Execute (.target.bash, cmd); + map result = (map) SCR::Execute (.target.bash_output, cmd); + y2debug("result=%1", result); - if (result != 0) + if (result["exit"]:-1 != 0) { y2error("Cannot create disk image %1", file); + //PopupErrorDetails(sformat(_("Cannot create disk image %1"), file), result, cmd); // FIXME: somehow the output from the dd command is not captured by .target.bash_output + Report::Error(sformat(_("Cannot create the following disk image: +%1 + +Please, ensure there is enough free disk space +to create the specified disk image. + +"), file)); + // try to remove part of the image if it exists SCR::Execute (.target.bash, "/bin/rm -- '" + file + "'"); ret = false; @@ -880,40 +925,6 @@ } -/** - * Displays a formatted popup error message, with a details button. - * @param errorMessage string - a simple message describing the error - * @param out map - output of the executed command - * @param cmd string - the executed command - * @return void - */ -global void PopupErrorDetails(string errorMessage, map out, string cmd) ``{ - string message = _("Undefined Error"); - if (errorMessage != nil && errorMessage != "") message = errorMessage; - Popup::ClearFeedback(); // just in case there are leftovers. - if (!Popup::AnyQuestion( Label::ErrorMsg(), message, Label::OKButton(), _("Details"), `focus )) { - string description = sformat("<pre>command: %1 return \n %2 %3</pre>", cmd, out["stderr"]:"", out["stdout"]:""); - UI::OpenDialog (`opt(`decorated ), - `HBox( `VSpacing(16), - `VBox ( - `HSpacing (100), - // popup window header - `Heading (message), - `VSpacing (0.5), - `RichText (description), - `VSpacing (1.0), - // push button label - `PushButton (`id(`ok), `opt(`default, `key_F10), Label::OKButton()) - ) - ) - ); - - UI::SetFocus (`id(`ok)); - UI::UserInput (); - UI::CloseDialog (); - } -} - /* EOF */ } 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/yast2-vm-2.13.41/src/VM_XEN.ycp new/yast2-vm-2.13.43/src/VM_XEN.ycp --- old/yast2-vm-2.13.41/src/VM_XEN.ycp 2006-04-28 02:33:55.000000000 +0200 +++ new/yast2-vm-2.13.43/src/VM_XEN.ycp 2006-05-03 01:29:06.000000000 +0200 @@ -3,7 +3,7 @@ * Package: XEN specific functions and values * Authors: Ladislav Slezak <lslezak(a)suse.cz> * Michael G. Fritch <mgfritch(a)novell.com> - * $Id: VM_XEN.ycp 30557 2006-04-28 00:33:15Z mgfritch $ + * $Id: VM_XEN.ycp 30631 2006-05-02 23:28:44Z mgfritch $ */ { module "VM_XEN"; @@ -1550,7 +1550,7 @@ define boolean CreateDiskImages() { boolean ret = true; foreach(map<string,any> disk, disks, { - if (disk["type"]:"" == "loop-create") + if (disk["type"]:"" == "loop-create" && ret) { integer imgsize = disk["size"]:4096; boolean sparse = disk["sparse"]:true; @@ -1568,6 +1568,7 @@ ret = ret && VM_Common::CreateDiskImage(target_dir + disk["source"]:"hda", imgsize, sparse); } + if (ret == false) break; } ); @@ -1625,12 +1626,11 @@ } } - ret = WriteOption(configpath, "disk", formatDiskConfig(disks, VM_Common::GetVirtualizationType() == "full")); + ret = ret && WriteOption(configpath, "disk", formatDiskConfig(disks, VM_Common::GetVirtualizationType() == "full")); // create disk image file(s) y2milestone("Creating disk images..."); - CreateDiskImages(); - + ret = ret && CreateDiskImages(); // all following action are needed only in paravirtualization mode if (VM_Common::GetVirtualizationType() == "full") @@ -1709,7 +1709,7 @@ url = sformat("iso:///?iso=%1", VM_Common::custom_source); } - integer src_defined = VM_Common::IsInstSourceDefined(url); + integer src_defined = -1; // always call Pkg::SourceCreate if (src_defined < 0) { @@ -1831,7 +1831,9 @@ // create disk image file(s) y2milestone("Creating disk images..."); - CreateDiskImages(); + if (CreateDiskImages() == false) { + return false; + } if (new_src >= 0) { @@ -1902,26 +1904,31 @@ } - global define boolean ViewVirtualMachineConsole(string DomName, boolean isFullVirtualization, boolean isNetWare, boolean displayError) { - y2milestone("ViewVirtualMachineConsole(%1, %2, %3, %4)", DomName, isFullVirtualization, isNetWare, displayError); + global define boolean ViewVirtualMachineConsole(string DomName, boolean isFullVirtualization, boolean isNetWare, boolean background, boolean displayError) { + y2milestone("ViewVirtualMachineConsole(%1, %2, %3, %4, %5)", DomName, isFullVirtualization, isNetWare, background, displayError); if (DomName != nil && DomName != "") { string cmd = sformat("/usr/bin/xterm -geometry 80x%3 -T \"Xen - %2\" -e %1 console %2", xm, DomName, isNetWare ? 25 : 24); if ( isFullVirtualization ) { // start VNC viewer cmd = sformat("vncviewer localhost:%1", DomName); } + y2milestone("Executing: %1", cmd); -/* map ret = (map)SCR::Execute(.target.bash_output, cmd); - if (ret["exit"]:-1 != 0 && displayError) { - VM_Common::PopupErrorDetails(_("Cannot open the virtual machine console."), ret, cmd); - } - return (ret["exit"]:-1 == 0);*/ - integer ret = (integer) SCR::Execute(.target.bash_background, cmd); - if (displayError && ret != 0) { - Report::Error(_("Cannot open the virtual machine console.")); + if (background) { + integer ret = (integer) SCR::Execute(.target.bash_background, cmd); + if (displayError && ret != 0) { + Report::Error(_("Cannot open the virtual machine console.")); + } + return (ret == 0); + } + else { + map ret = (map)SCR::Execute(.target.bash_output, cmd); + if (displayError && ret["exit"]:-1 != 0) { + VM_Common::PopupErrorDetails(_("Cannot open the virtual machine console."), ret, cmd); + } + return (ret["exit"]:-1 == 0); } - return (ret == 0); } return false; } @@ -1961,7 +1968,11 @@ boolean success = false; map ret = (map)SCR::Execute(.target.bash_output, cmd); if (ret["exit"]:-1 != 0 && displayError) { - VM_Common::PopupErrorDetails(_("Cannot start the virtual machine."), ret, cmd); + string abortmsg = _("Cannot start the virtual machine."); + if (VM_Common::proposal_type == "install") { + abortmsg = abortmsg + "\n" + _("The installation will be aborted."); + } + VM_Common::PopupErrorDetails(abortmsg, ret, cmd); } success = (ret["exit"]:-1 == 0); @@ -1976,7 +1987,7 @@ } - +/* global define boolean Start(boolean background) { // FIXME: maybe this method should be merged into StartVirtualMachine() integer start_time = time(); @@ -2008,6 +2019,7 @@ return success; } +*/ global define boolean InstallPackages() { return VM_Common::InstallPackages(["xterm", "xorg-x11", "xen-tools"]); @@ -2169,7 +2181,6 @@ "ShutdownVirtualMachine" : VM_XEN::ShutdownVirtualMachine, "TerminateVirtualMachine" : VM_XEN::TerminateVirtualMachine, "StartVirtualMachine" : VM_XEN::StartVirtualMachine, - "Start" : VM_XEN::Start, "InstallPackages" : VM_XEN::InstallPackages ]; } 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/yast2-vm-2.13.41/src/inst_vm_kickoff.ycp new/yast2-vm-2.13.43/src/inst_vm_kickoff.ycp --- old/yast2-vm-2.13.41/src/inst_vm_kickoff.ycp 2006-04-24 20:09:13.000000000 +0200 +++ new/yast2-vm-2.13.43/src/inst_vm_kickoff.ycp 2006-05-03 01:29:06.000000000 +0200 @@ -6,7 +6,7 @@ * * Purpose: Prepare and start installation in a virtual machine. * - * $Id: inst_vm_kickoff.ycp 29839 2006-04-07 05:12:29Z mgfritch $ + * $Id: inst_vm_kickoff.ycp 30631 2006-05-02 23:28:44Z mgfritch $ */ { import "VM"; @@ -131,13 +131,22 @@ } } - // Do not start in background when installing. - success = VM::Start( (VM_Common::proposal_type != "install") ); - if (!success) - { - Report::Error(_("Cannot start the virtual machine.") + "\n" + abortmsg); - return `forceback; + Pkg::SourceReleaseAll(); + + // start the VM + success = VM::StartVirtualMachine(VM_Common::config_name, true); + if (!success) return `forceback; + + // open the XTerm console if para virtualized. + if (VM_Common::GetVirtualizationType() == "para") { + boolean isNetWare = false; + if (VM_Common::GetCustomKernel()) { + isNetWare = VM_Common::IsNetWareKernel(VM_Common::GetKernelImage()); + } + boolean background = (VM_Common::proposal_type != "install"); // Do not start in background when installing. + success = VM::ViewVirtualMachineConsole(VM_Common::config_name, (VM_Common::GetVirtualizationType() == "full"), isNetWare, background, true); } + if (!success) return `forceback; Progress::Finish (); Progress::set(progress_state); 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/yast2-vm-2.13.41/src/inst_vm_manage.ycp new/yast2-vm-2.13.43/src/inst_vm_manage.ycp --- old/yast2-vm-2.13.41/src/inst_vm_manage.ycp 2006-04-13 23:15:32.000000000 +0200 +++ new/yast2-vm-2.13.43/src/inst_vm_manage.ycp 2006-05-02 20:41:42.000000000 +0200 @@ -381,20 +381,30 @@ else if (ret == `delete) { if (selected_table_item != nil && selected_table_item >= 0) { if (Popup::AnyQuestion( _("Delete Virtual Machine"), _("You are about to completely remove the selected VM. -This action cannot be undone. Are you sure you want to delete the selected VM? "), Label::YesButton(), Label::NoButton(), `focus_no)) { - map item = SettingsList[selected_table_item]:$[]; - if (item["name"]:nil != nil && item["name"]:"" != "") { - Popup::ShowFeedback(_("Deleting Virtual Machine"), _("Please Wait...")); - boolean success = DeleteVirtualMachine(selected_table_item); - refresh_table(); - Popup::ClearFeedback(); -// if (!success) Report::Error(_("Cannot delete the virtual machine.")); + + if (Popup::AnyQuestion( _("Delete Virtual Machine"), _("The selected VM disk image and configuration file +will be completely destroyed. + +This action cannot be undone. + +Do you wish to continue? + +"), Label::YesButton(), Label::NoButton(), `focus_no)) { + + map item = SettingsList[selected_table_item]:$[]; + if (item["name"]:nil != nil && item["name"]:"" != "") { + Popup::ShowFeedback(_("Deleting Virtual Machine"), _("Please Wait...")); + boolean success = DeleteVirtualMachine(selected_table_item); + refresh_table(); + Popup::ClearFeedback(); + // if (!success) Report::Error(_("Cannot delete the virtual machine.")); + } + selected_table_item = 0; } - selected_table_item = 0; } } else { @@ -439,6 +449,7 @@ (isFullVirtualization(selected_table_item)) ? item["id"]:"" : item["name"]:"", // use VM id # to display VNC in full virtualizaion isFullVirtualization(selected_table_item), // show XTerm in para virt. VM_Common::IsNetWareKernel(item["kernel"]:""), // check for NetWare kernel + true, // always background this process. true // show any error messages ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xgl
by root＠suse.de 03 May '06

03 May '06

Hello community, here is the log from the commit of package xgl checked in at Wed May 3 10:33:53 CEST 2006. -------- --- xgl/xgl.changes 2006-04-30 15:09:19.000000000 +0200 +++ STABLE/xgl/xgl.changes 2006-05-03 00:01:11.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 3 00:00:21 CEST 2006 - dreveman(a)suse.de + +- Update to final enums for GLX_EXT_texture_from_pixmap. + +------------------------------------------------------------------- Old: ---- Mesa-CVS-20060413.tar.bz2 glproto-1.4.6.tar.bz2 New: ---- Mesa-CVS-20060502.tar.bz2 glproto-1.4.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xgl.spec ++++++ --- /var/tmp/diff_new_pack.W1dyBY/_old 2006-05-03 10:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.W1dyBY/_new 2006-05-03 10:32:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xgl (Version cvs_060430) +# spec file for package xgl (Version cvs_060503) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -23,7 +23,7 @@ PreReq: %fillup_prereq Requires: xgl-hardware-list Autoreqprov: on -Version: cvs_060430 +Version: cvs_060503 Release: 1 Summary: Xserver that uses OpenGL for its drawing operations. BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,11 +32,11 @@ Source1: glitz-0.5.4.tar.gz Source2: README.SUSE Source3: sysconfig.displaymanager.template -Source4: Mesa-CVS-20060413.tar.bz2 +Source4: Mesa-CVS-20060502.tar.bz2 Source6: fixesproto-4.0.tar.bz2 Source7: compositeproto-0.3.tar.bz2 Source8: scrnsaverproto-1.1.0.tar.bz2 -Source9: glproto-1.4.6.tar.bz2 +Source9: glproto-1.4.7.tar.bz2 ### /bin/ls *.{diff,patch} 2>/dev/null | perl -ne 'print "Patch$n: ".$_; $n++;' Patch: Xserver-suse-sysconfig.diff Patch1: xgl-security-file-dir.diff @@ -143,6 +143,8 @@ /var/adm/fillup-templates/sysconfig.displaymanager-%name %changelog -n xgl +* Wed May 03 2006 - dreveman(a)suse.de +- Update to final enums for GLX_EXT_texture_from_pixmap. * Sun Apr 30 2006 - dreveman(a)suse.de - Fix so events are correctly delivered when warping the pointer. * Mon Apr 24 2006 - jpr(a)suse.de ++++++ Mesa-CVS-20060413.tar.bz2 -> Mesa-CVS-20060502.tar.bz2 ++++++ ++++ 46393 lines of diff (skipped) ++++++ glproto-1.4.6.tar.bz2 -> glproto-1.4.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glproto-1.4.6/ChangeLog new/glproto-1.4.7/ChangeLog --- old/glproto-1.4.6/ChangeLog 2006-03-17 01:28:43.000000000 +0100 +++ new/glproto-1.4.7/ChangeLog 2006-05-01 03:11:46.000000000 +0200 @@ -1,3 +1,8 @@ +2006-04-30 Adam Jackson <ajax(a)freedesktop.org> + + * glxtokens.h: + Bump to 1.4.7 for final EXT_tfp tokens. + 2006-03-16 Kristian Høgsberg <krh(a)redhat.com> * configure.ac: Bump to 1.4.6 for FBO opcodes. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glproto-1.4.6/configure new/glproto-1.4.7/configure --- old/glproto-1.4.6/configure 2006-03-17 01:29:43.000000000 +0100 +++ new/glproto-1.4.7/configure 2006-05-02 00:20:52.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for GLProto 1.4.6. +# Generated by GNU Autoconf 2.59 for GLProto 1.4.7. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='GLProto' PACKAGE_TARNAME='glproto' -PACKAGE_VERSION='1.4.6' -PACKAGE_STRING='GLProto 1.4.6' +PACKAGE_VERSION='1.4.7' +PACKAGE_STRING='GLProto 1.4.7' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBOBJS LTLIBOBJS' @@ -722,7 +722,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GLProto 1.4.6 to adapt to many kinds of systems. +\`configure' configures GLProto 1.4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -784,7 +784,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GLProto 1.4.6:";; + short | recursive ) echo "Configuration of GLProto 1.4.7:";; esac cat <<\_ACEOF @@ -890,7 +890,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -GLProto configure 1.4.6 +GLProto configure 1.4.7 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -904,7 +904,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GLProto $as_me 1.4.6, which was +It was created by GLProto $as_me 1.4.7, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1547,7 +1547,7 @@ # Define the identity of the package. PACKAGE='glproto' - VERSION='1.4.6' + VERSION='1.4.7' cat >>confdefs.h <<_ACEOF @@ -2089,7 +2089,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by GLProto $as_me 1.4.6, which was +This file was extended by GLProto $as_me 1.4.7, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2144,7 +2144,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GLProto config.status 1.4.6 +GLProto config.status 1.4.7 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glproto-1.4.6/configure.ac new/glproto-1.4.7/configure.ac --- old/glproto-1.4.6/configure.ac 2006-03-17 01:27:45.000000000 +0100 +++ new/glproto-1.4.7/configure.ac 2006-05-01 03:10:45.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([GLProto], [1.4.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] +AC_INIT([GLProto], [1.4.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/glproto-1.4.6/glxtokens.h new/glproto-1.4.7/glxtokens.h --- old/glproto-1.4.6/glxtokens.h 2006-03-17 01:25:26.000000000 +0100 +++ new/glproto-1.4.7/glxtokens.h 2006-05-01 03:10:33.000000000 +0200 @@ -234,7 +234,44 @@ /* ** GLX_EXT_texture_from_pixmap */ -#define GLX_FRONT_LEFT_EXT 0x6005 +#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x20D0 +#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x20D1 +#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x20D2 +#define GLX_BIND_TO_TEXTURE_TARGETS_EXT 0x20D3 +#define GLX_Y_INVERTED_EXT 0x20D4 + +#define GLX_TEXTURE_FORMAT_EXT 0x20D5 +#define GLX_TEXTURE_TARGET_EXT 0x20D6 +#define GLX_MIPMAP_TEXTURE_EXT 0x20D7 + +#define GLX_TEXTURE_FORMAT_NONE_EXT 0x20D8 +#define GLX_TEXTURE_FORMAT_RGB_EXT 0x20D9 +#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x20DA + +#define GLX_TEXTURE_1D_BIT_EXT 0x00000001 +#define GLX_TEXTURE_2D_BIT_EXT 0x00000002 +#define GLX_TEXTURE_RECTANGLE_BIT_EXT 0x00000004 + +#define GLX_TEXTURE_1D_EXT 0x20DB +#define GLX_TEXTURE_2D_EXT 0x20DC +#define GLX_TEXTURE_RECTANGLE_EXT 0x20DD + +#define GLX_FRONT_LEFT_EXT 0x20DE +#define GLX_FRONT_RIGHT_EXT 0x20DF +#define GLX_BACK_LEFT_EXT 0x20E0 +#define GLX_BACK_RIGHT_EXT 0x20E1 +#define GLX_FRONT_EXT GLX_FRONT_LEFT_EXT +#define GLX_BACK_EXT GLX_BACK_LEFT_EXT +#define GLX_AUX0_EXT 0x20E2 +#define GLX_AUX1_EXT 0x20E3 +#define GLX_AUX2_EXT 0x20E4 +#define GLX_AUX3_EXT 0x20E5 +#define GLX_AUX4_EXT 0x20E6 +#define GLX_AUX5_EXT 0x20E7 +#define GLX_AUX6_EXT 0x20E8 +#define GLX_AUX7_EXT 0x20E9 +#define GLX_AUX8_EXT 0x20EA +#define GLX_AUX9_EXT 0x20EB /* * GLX 1.4 and later: ++++++ xorg-server-1.1.99.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/GL/glx/glxcmds.c new/xorg-server-1.1.99.1/GL/glx/glxcmds.c --- old/xorg-server-1.1.99.1/GL/glx/glxcmds.c 2006-04-09 16:59:20.000000000 +0200 +++ new/xorg-server-1.1.99.1/GL/glx/glxcmds.c 2006-05-02 01:48:07.000000000 +0200 @@ -1681,7 +1681,7 @@ reply.numAttribs = numAttribs; attributes[0] = GLX_TEXTURE_TARGET_EXT; - attributes[1] = GLX_NO_TEXTURE_EXT; + attributes[1] = GLX_TEXTURE_RECTANGLE_EXT; glxScreen = glxPixmap->pGlxScreen; if (glxScreen->textureFromPixmap) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/GL/glx/glxdri.c new/xorg-server-1.1.99.1/GL/glx/glxdri.c --- old/xorg-server-1.1.99.1/GL/glx/glxdri.c 2006-03-30 18:38:10.000000000 +0200 +++ new/xorg-server-1.1.99.1/GL/glx/glxdri.c 2006-05-02 01:54:31.000000000 +0200 @@ -35,6 +35,7 @@ #include <drm.h> #include <GL/gl.h> #include <GL/internal/dri_interface.h> +#include <GL/glxtokens.h> #include <windowstr.h> #include <os.h> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/GL/glx/glxserver.h new/xorg-server-1.1.99.1/GL/glx/glxserver.h --- old/xorg-server-1.1.99.1/GL/glx/glxserver.h 2006-04-08 21:43:29.000000000 +0200 +++ new/xorg-server-1.1.99.1/GL/glx/glxserver.h 2006-05-02 01:04:27.000000000 +0200 @@ -63,22 +63,6 @@ #include <GL/glxproto.h> #include <GL/glxint.h> -#ifndef GLX_TEXTURE_TARGET_EXT -#define GLX_TEXTURE_TARGET_EXT 0x6001 -#define GLX_TEXTURE_2D_EXT 0x6002 -#define GLX_TEXTURE_RECTANGLE_EXT 0x6003 -#define GLX_NO_TEXTURE_EXT 0x6004 -#define GLX_FRONT_LEFT_EXT 0x6005 -#define GLX_TEXTURE_FORMAT_EXT 0x6006 -#define GLX_TEXTURE_FORMAT_RGB_EXT 0x6007 -#define GLX_TEXTURE_FORMAT_RGBA_EXT 0x6008 -#define GLX_Y_INVERTED_EXT 0x6009 -#define GLX_BIND_TO_TEXTURE_RGB_EXT 0x600A -#define GLX_BIND_TO_TEXTURE_RGBA_EXT 0x600B -#define GLX_BIND_TO_MIPMAP_TEXTURE_EXT 0x600C -#define GLX_MIPMAP_TEXTURE_EXT 0x600D -#endif - /* For glxscreens.h */ typedef struct __GLXdrawable __GLXdrawable; typedef struct __GLXcontext __GLXcontext; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/configure new/xorg-server-1.1.99.1/configure --- old/xorg-server-1.1.99.1/configure 2006-04-03 01:57:46.000000000 +0200 +++ new/xorg-server-1.1.99.1/configure 2006-05-02 01:29:06.000000000 +0200 @@ -26670,12 +26670,12 @@ pkg_cv_GL_CFLAGS="$GL_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.6\"") >&5 - ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.6") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.7\"") >&5 + ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.7") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "glproto >= 1.4.6" 2>/dev/null` + pkg_cv_GL_CFLAGS=`$PKG_CONFIG --cflags "glproto >= 1.4.7" 2>/dev/null` else pkg_failed=yes fi @@ -26688,12 +26688,12 @@ pkg_cv_GL_LIBS="$GL_LIBS" else if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.6\"") >&5 - ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.6") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glproto >= 1.4.7\"") >&5 + ($PKG_CONFIG --exists --print-errors "glproto >= 1.4.7") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "glproto >= 1.4.6" 2>/dev/null` + pkg_cv_GL_LIBS=`$PKG_CONFIG --libs "glproto >= 1.4.7" 2>/dev/null` else pkg_failed=yes fi @@ -26712,14 +26712,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glproto >= 1.4.6"` + GL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glproto >= 1.4.7"` else - GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glproto >= 1.4.6"` + GL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glproto >= 1.4.7"` fi # Put the nasty error message in config.log where it belongs echo "$GL_PKG_ERRORS" >&5 - { { echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.6) were not met: + { { echo "$as_me:$LINENO: error: Package requirements (glproto >= 1.4.7) were not met: $GL_PKG_ERRORS @@ -26730,7 +26730,7 @@ and GL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -echo "$as_me: error: Package requirements (glproto >= 1.4.6) were not met: +echo "$as_me: error: Package requirements (glproto >= 1.4.7) were not met: $GL_PKG_ERRORS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/configure.ac new/xorg-server-1.1.99.1/configure.ac --- old/xorg-server-1.1.99.1/configure.ac 2006-04-03 01:53:54.000000000 +0200 +++ new/xorg-server-1.1.99.1/configure.ac 2006-05-02 01:05:37.000000000 +0200 @@ -565,7 +565,7 @@ if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then PKG_CHECK_MODULES([XLIB], [x11]) - PKG_CHECK_MODULES([GL], [glproto >= 1.4.6]) + PKG_CHECK_MODULES([GL], [glproto >= 1.4.7]) AC_SUBST(XLIB_CFLAGS) AC_DEFINE(GLXEXT, 1, [Build GLX extension]) GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/hw/xfree86/common/xf86Build.h new/xorg-server-1.1.99.1/hw/xfree86/common/xf86Build.h --- old/xorg-server-1.1.99.1/hw/xfree86/common/xf86Build.h 2006-04-11 14:32:13.000000000 +0200 +++ new/xorg-server-1.1.99.1/hw/xfree86/common/xf86Build.h 2006-05-02 01:29:51.000000000 +0200 @@ -1 +1 @@ -#define BUILD_DATE 20060411 +#define BUILD_DATE 20060502 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.1.99.1/hw/xgl/glxext/xglglxext.c new/xorg-server-1.1.99.1/hw/xgl/glxext/xglglxext.c --- old/xorg-server-1.1.99.1/hw/xgl/glxext/xglglxext.c 2006-04-05 23:09:25.000000000 +0200 +++ new/xorg-server-1.1.99.1/hw/xgl/glxext/xglglxext.c 2006-05-02 02:04:34.000000000 +0200 @@ -30,6 +30,7 @@ #include <GL/gl.h> #include <GL/glext.h> #include <GL/internal/glcore.h> +#include <GL/glxtokens.h> #include "glxserver.h" #include "glxdrawable.h" @@ -6310,7 +6311,7 @@ xglGetTexTarget (__GLXscreen *screen, __GLXpixmap *pixmap) { - int target = GLX_NO_TEXTURE_EXT; + int target = GLX_TEXTURE_2D_EXT; XGL_DRAWABLE_PIXMAP (pixmap->pDraw); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit sabayon
by root＠suse.de 03 May '06

03 May '06

Hello community, here is the log from the commit of package sabayon checked in at Wed May 3 10:32:27 CEST 2006. -------- --- GNOME/sabayon/sabayon.changes 2006-04-13 15:28:09.000000000 +0200 +++ STABLE/sabayon/sabayon.changes 2006-05-03 06:58:28.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 3 06:53:43 CEST 2006 - hpj(a)suse.de + +- Added patch to use gnome-vfs instead of gamin for file change + monitoring (Novell bug #167621). + +------------------------------------------------------------------- New: ---- sabayon-2.12.3-gnomevfs-monitoring.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sabayon.spec ++++++ --- /var/tmp/diff_new_pack.FoNSic/_old 2006-05-03 10:32:00.000000000 +0200 +++ /var/tmp/diff_new_pack.FoNSic/_new 2006-05-03 10:32:00.000000000 +0200 @@ -12,7 +12,7 @@ Name: sabayon Version: 2.12.3 -Release: 12 +Release: 18 Summary: Tool to maintain user profiles in a GNOME desktop Group: System/GUI/GNOME License: GPL @@ -46,6 +46,7 @@ Patch5: sabayon-2.12.3-use-subprocess.patch Patch6: sabayon-2.12.3-desktop-file.patch Patch7: sabayon-2.12.3-ooo-support.patch +Patch8: sabayon-2.12.3-gnomevfs-monitoring.patch %description Sabayon is a tool to help system administrators and users change and @@ -87,6 +88,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build rename no nb po/no.* @@ -180,6 +182,9 @@ %{python_sitelib}/%{name}/lockdown %changelog -n sabayon +* Wed May 03 2006 - hpj(a)suse.de +- Added patch to use gnome-vfs instead of gamin for file change + monitoring (Novell bug #167621). * Thu Apr 13 2006 - jpr(a)suse.de - Regenerate patch with new file (#163735) * Fri Mar 24 2006 - hpj(a)suse.de ++++++ sabayon-2.12.3-gnomevfs-monitoring.patch ++++++ diff -Nurp sabayon-2.12.3-pre/lib/dirmonitor.py sabayon-2.12.3-post/lib/dirmonitor.py --- sabayon-2.12.3-pre/lib/dirmonitor.py 2005-07-29 06:21:21.000000000 -0500 +++ sabayon-2.12.3-post/lib/dirmonitor.py 2006-05-02 17:34:04.000000000 -0500 @@ -21,15 +21,15 @@ import os import os.path import gobject -import gamin +import gnomevfs import util import fnmatch N_WATCHES_LIMIT = 200 -CHANGED = gamin.GAMChanged -DELETED = gamin.GAMDeleted -CREATED = gamin.GAMCreated +CHANGED = gnomevfs.MONITOR_EVENT_CHANGED +DELETED = gnomevfs.MONITOR_EVENT_DELETED +CREATED = gnomevfs.MONITOR_EVENT_CREATED def dprint (fmt, *args): util.debug_print (util.DEBUG_DIRMONITOR, fmt % args) @@ -49,21 +49,16 @@ class DirectoryMonitor: self.directory = directory self.callback = callback self.data = data - self.mon = None self.watches = {} self.too_many_watches = False - self.fd = -1 - self.io_watch = None self.dirs_to_ignore = [] self.files_to_ignore = [] def set_directories_to_ignore (self, dirs): - assert self.mon == None self.dirs_to_ignore = dirs dprint ("Ignoring directories %s", self.dirs_to_ignore) def set_files_to_ignore (self, files): - assert self.mon == None self.files_to_ignore = files dprint ("Ignoring files %s", self.files_to_ignore) @@ -77,33 +72,26 @@ class DirectoryMonitor: self.callback (path, event) # - # Called from the main loop when we have data + # Processing of a gnomevfs callback # - def __pending_data (self, fd, condition): - try: - ret = self.mon.handle_events () - except: - util.print_exception () - return True - - # - # Processing of a gamin callback - # - def __handle_gamin_event (self, path, event, monitor_file): + def __handle_gnomevfs_event (self, dir_uri, file_uri, event): if event == CHANGED or event == DELETED or event == CREATED: - if not os.path.isabs (path): - path = os.path.join (monitor_file, path) + # Strip 'file://'. + path = file_uri [7:] - dprint ("Got gamin event '%s' on '%s'", event_to_string (event), path) + # Strip trailing '/'. + path = os.path.normpath (path) + + dprint ("Got gnomevfs event '%s' on '%s'", event_to_string (event), path) if event == CREATED and os.path.isdir (path): self.__monitor_dir_recurse (path, True) elif event == DELETED: if path != self.directory and self.watches.has_key (path): + gnomevfs.monitor_cancel (self.watches [path]) del self.watches[path] if len (self.watches) < N_WATCHES_LIMIT: self.too_many_watches = False - self.mon.stop_watch (path) if not self.__should_ignore_dir (path) and \ not self.__should_ignore_file (path): @@ -136,6 +124,8 @@ class DirectoryMonitor: return self.__should_ignore_dir (os.path.dirname (file)) def __monitor_dir (self, dir): + dir = os.path.normpath (dir) + if len (self.watches) >= N_WATCHES_LIMIT: if not self.too_many_watches: print "Too many directories to watch on %s" % (self.directory) @@ -146,9 +136,9 @@ class DirectoryMonitor: return try: - self.mon.watch_directory (dir, self.__handle_gamin_event, dir) + self.watches [dir] = gnomevfs.monitor_add (dir, gnomevfs.MONITOR_DIRECTORY, self.__handle_gnomevfs_event) except: - print _("Failed to add monitor for %s") % (dir) + print ("Failed to add monitor for %s") % (dir) util.print_exception () def __monitor_dir_recurse (self, dir, new_dir = False): @@ -167,39 +157,16 @@ class DirectoryMonitor: self.__monitor_dir_recurse (path, new_dir) def start (self): - if self.mon != None: - return - dprint ("Starting to recursively monitor '%s'", self.directory) - self.mon = gamin.WatchMonitor () - # ignore (End)Exists events since we scan the tree ourselves - try: - self.mon.no_exists () - except: - pass - self.fd = self.mon.get_fd () - self.io_watch = gobject.io_add_watch (self.fd, - gobject.IO_IN|gobject.IO_PRI, - self.__pending_data) self.__monitor_dir (self.directory) self.__monitor_dir_recurse (self.directory) def stop (self): - if self.mon == None: - return - dprint ("Stopping recursive monitoring of '%s'", self.directory) for path in self.watches: - self.mon.stop_watch (path) - - gobject.source_remove (self.io_watch) - self.io_watch = 0 - - self.mon.disconnect () - self.mon = None - self.fd = -1 + gnomevfs.monitor_cancel (self.watches [path]) def run_unit_tests (): import tempfile @@ -228,7 +195,7 @@ def run_unit_tests (): expected = [] def should_not_be_reached (expected): for (path, event) in expected: - print _("Expected event: %s %s") % (path, event_to_string (event)) + print ("Expected event: %s %s") % (path, event_to_string (event)) assert False return True timeout = gobject.timeout_add (5 * 1000, should_not_be_reached, expected) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit rug
by root＠suse.de 03 May '06

03 May '06

Hello community, here is the log from the commit of package rug checked in at Wed May 3 10:31:51 CEST 2006. -------- --- rug/rug.changes 2006-04-26 20:29:50.000000000 +0200 +++ STABLE/rug/rug.changes 2006-05-03 07:38:03.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 3 07:37:23 CEST 2006 - maw(a)suse.de + +- New source drop (r?????) which: +- Fixes up the status of patches if there is an exact match + installed. #170152 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rug.spec ++++++ --- /var/tmp/diff_new_pack.pXP9El/_old 2006-05-03 10:31:11.000000000 +0200 +++ /var/tmp/diff_new_pack.pXP9El/_new 2006-05-03 10:31:11.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: gtkdoc mono-basic mono-data-sqlite mono-devel zmd-devel URL: http://www.novell.com Version: 7.1.1.0 -Release: 12 +Release: 17 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Command Line Client for zmd @@ -78,6 +78,10 @@ %_mandir/*/*/*.gz %changelog -n rug +* Wed May 03 2006 - maw(a)suse.de +- New source drop (r?????) which: +- Fixes up the status of patches if there is an exact match + installed. #170152 * Wed Apr 26 2006 - maw(a)suse.de - New source drop (r27526) which: - Adds bundle locking commands. ++++++ rug-7.1.1.0.tar.bz2 ++++++ ++++ 7589 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0