May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit tomboy
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package tomboy checked in at Sun May 7 16:36:34 CEST 2006. -------- --- GNOME/tomboy/tomboy.changes 2006-04-18 23:39:14.000000000 +0200 +++ STABLE/tomboy/tomboy.changes 2006-05-04 18:32:30.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 4 18:31:34 CEST 2006 - gekker(a)suse.de + +- Add 24x24 icon and uses tomboy instead of stock_notes (#171753) + +------------------------------------------------------------------- New: ---- tomboy-24.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomboy.spec ++++++ --- /var/tmp/diff_new_pack.SbtcIc/_old 2006-05-07 16:35:41.000000000 +0200 +++ /var/tmp/diff_new_pack.SbtcIc/_new 2006-05-07 16:35:41.000000000 +0200 @@ -19,15 +19,16 @@ Autoreqprov: on Requires: mono Version: 0.3.3 -Release: 33 +Release: 41 Summary: GNOME note taking application. URL: http://www.beatniksoftware.com/tomboy/ Source: %{name}-%{version}.tar.bz2 Source1: tomboy-48.png -Source2: tomboy-22.png -Source3: tomboy-16.png -Source4: tomboy.svg -Source5: stock_search.png +Source2: tomboy-24.png +Source3: tomboy-22.png +Source4: tomboy-16.png +Source5: tomboy.svg +Source6: stock_search.png Patch: tomboy-implicit.patch Patch1: tomboy-secure-paths.patch Patch2: tomboy-mono-1-1-9.patch @@ -69,10 +70,11 @@ %patch8 cp %SOURCE1 data/images/tomboy.png cp %SOURCE1 data/images/tomboy-48.png -cp %SOURCE2 data/images/tomboy-22.png -cp %SOURCE3 data/images/tomboy-16.png -cp %SOURCE4 data/images/tomboy.svg -cp %SOURCE5 data/images/stock_search.png +cp %SOURCE2 data/images/tomboy-24.png +cp %SOURCE3 data/images/tomboy-22.png +cp %SOURCE4 data/images/tomboy-16.png +cp %SOURCE5 data/images/tomboy.svg +cp %SOURCE6 data/images/stock_search.png %build rename no nb po/no.* @@ -129,6 +131,8 @@ %{prefix}/%_lib/dbus-1.0/services/com.beatniksoftware.Tomboy.service %changelog -n tomboy +* Thu May 04 2006 - gekker(a)suse.de +- Add 24x24 icon and uses tomboy instead of stock_notes (#171753) * Tue Apr 18 2006 - joeshaw(a)suse.de - Add a patch to make the "Export to HTML" plugin use the newer GtkFileChooser. (bnc #118247, bgo #320967) ++++++ tomboy-gtk-file-chooser.patch ++++++ --- /var/tmp/diff_new_pack.SbtcIc/_old 2006-05-07 16:35:41.000000000 +0200 +++ /var/tmp/diff_new_pack.SbtcIc/_new 2006-05-07 16:35:41.000000000 +0200 @@ -1,11 +1,8 @@ Index: Tomboy/Plugins/ExportToHTML.cs -=================================================================== -RCS file: /cvs/gnome/tomboy/Tomboy/Plugins/ExportToHTML.cs,v -retrieving revision 1.11 -diff -u -p -u -r1.11 ExportToHTML.cs ---- Tomboy/Plugins/ExportToHTML.cs 8 Jun 2005 18:19:13 -0000 1.11 -+++ Tomboy/Plugins/ExportToHTML.cs 18 Apr 2006 21:29:35 -0000 -@@ -3,6 +3,7 @@ using System; +================================================================================ +--- Tomboy/Plugins/ExportToHTML.cs ++++ Tomboy/Plugins/ExportToHTML.cs +@@ -3,6 +3,7 @@ using System.IO; using System.Collections; using System.Reflection; @@ -13,7 +10,7 @@ using System.Xml; using System.Xml.XPath; using System.Xml.Xsl; -@@ -156,18 +157,28 @@ class NoteNameResolver : XmlResolver +@@ -156,18 +157,28 @@ } } @@ -46,7 +43,7 @@ ShowAll (); LoadPreferences (default_file); -@@ -179,6 +190,10 @@ class ExportToHTMLDialog : Gtk.FileSelec +@@ -179,6 +190,10 @@ set { export_linked.Active = value; } } @@ -57,7 +54,7 @@ protected void OnResponseCb (object sender, Gtk.ResponseArgs args) { if (args.ResponseId == Gtk.ResponseType.Ok) -@@ -190,8 +205,9 @@ class ExportToHTMLDialog : Gtk.FileSelec +@@ -190,8 +205,9 @@ string last_dir = (string) Preferences.Get (Preferences.EXPORTHTML_LAST_DIRECTORY); if (last_dir == "") last_dir = Environment.GetEnvironmentVariable ("HOME"); @@ -69,7 +66,7 @@ ExportLinked = (bool) Preferences.Get (Preferences.EXPORTHTML_EXPORT_LINKED); } -@@ -203,5 +219,35 @@ class ExportToHTMLDialog : Gtk.FileSelec +@@ -203,5 +219,35 @@ Preferences.Set (Preferences.EXPORTHTML_EXPORT_LINKED, ExportLinked); } ++++++ tomboy-no-highlight.patch ++++++ --- /var/tmp/diff_new_pack.SbtcIc/_old 2006-05-07 16:35:41.000000000 +0200 +++ /var/tmp/diff_new_pack.SbtcIc/_new 2006-05-07 16:35:41.000000000 +0200 @@ -1,11 +1,8 @@ Index: Tomboy/Utils.cs -=================================================================== -RCS file: /cvs/gnome/tomboy/Tomboy/Utils.cs,v -retrieving revision 1.21 -diff -u -r1.21 Utils.cs ---- Tomboy/Utils.cs 1 Jan 2006 01:57:05 -0000 1.21 -+++ Tomboy/Utils.cs 27 Jan 2006 22:12:13 -0000 -@@ -50,10 +50,6 @@ +================================================================================ +--- Tomboy/Utils.cs ++++ Tomboy/Utils.cs +@@ -56,10 +56,6 @@ IntPtr.Zero, (ev == null) ? 0 : ev.Button, (ev == null) ? Gtk.Global.CurrentEventTime : ev.Time); @@ -15,4 +12,4 @@ - menu.AttachWidget.State = Gtk.StateType.Selected; } - public static Gdk.Pixbuf GetIcon (string resource_name) + public static Gdk.Pixbuf GetIcon (string resource_name, int size) ++++++ tomboy-plugins-folder-fixes.patch ++++++ --- /var/tmp/diff_new_pack.SbtcIc/_old 2006-05-07 16:35:41.000000000 +0200 +++ /var/tmp/diff_new_pack.SbtcIc/_new 2006-05-07 16:35:41.000000000 +0200 @@ -3,13 +3,10 @@ ? data/DefaultPlugins.desktop.in ? data/tomboy-plugins.pc Index: Tomboy/PluginManager.cs -=================================================================== -RCS file: /cvs/gnome/tomboy/Tomboy/PluginManager.cs,v -retrieving revision 1.12 -diff -u -p -u -r1.12 PluginManager.cs ---- Tomboy/PluginManager.cs 25 Jan 2006 00:01:37 -0000 1.12 -+++ Tomboy/PluginManager.cs 24 Mar 2006 23:46:37 -0000 -@@ -171,21 +171,10 @@ namespace Tomboy +================================================================================ +--- Tomboy/PluginManager.cs ++++ Tomboy/PluginManager.cs +@@ -142,21 +142,10 @@ public void ShowPluginsDirectory () { // Run file manager for ~/.tomboy/Plugins @@ -35,7 +32,7 @@ } } -@@ -299,6 +288,9 @@ namespace Tomboy +@@ -270,6 +259,9 @@ void OnPluginCreated (object sender, FileSystemEventArgs args) { ++++++ tomboy-tango-icon-theme.patch ++++++ --- /var/tmp/diff_new_pack.SbtcIc/_old 2006-05-07 16:35:41.000000000 +0200 +++ /var/tmp/diff_new_pack.SbtcIc/_new 2006-05-07 16:35:41.000000000 +0200 @@ -39,7 +39,7 @@ static NoteWindow () { - stock_notes = new Gdk.Pixbuf (null, "stock_notes.png"); -+ stock_notes = GuiUtils.GetIcon ("stock_notes", 16); ++ stock_notes = GuiUtils.GetIcon ("tomboy", 16); } // @@ -65,8 +65,8 @@ // FIXME: Get a better recent notes window icon - recent_icon = new Gdk.Pixbuf (null, "stock_notes.png"); - stock_notes = GuiUtils.GetMiniIcon ("stock_notes.png"); -+ recent_icon = GuiUtils.GetIcon ("stock_notes", 16); -+ stock_notes = GuiUtils.GetIcon ("stock_notes", 16); ++ recent_icon = GuiUtils.GetIcon ("tomboy", 16); ++ stock_notes = GuiUtils.GetIcon ("tomboy", 16); } public NoteRecentChanges (NoteManager manager) @@ -91,7 +91,7 @@ + search_image = GuiUtils.GetIcon ("gnome-stock-searchtool", 16); + search_image_large = GuiUtils.GetIcon ("gnome-stock-searchtool", 48); +#endif -+ stock_notes = GuiUtils.GetIcon ("stock_notes", 16); ++ stock_notes = GuiUtils.GetIcon ("tomboy", 16); } public static NoteFindDialog GetInstance (Note note) @@ -116,10 +116,10 @@ static TomboyTray () { +#if ENABLE_TANGO -+ tintin = GuiUtils.GetIcon ("tomboy", 22); ++ tintin = GuiUtils.GetIcon ("tomboy", 24); + tintin_tiny = GuiUtils.GetIcon ("tomboy", 16); + tintin_large = GuiUtils.GetIcon ("tomboy", 48); -+ stock_notes = GuiUtils.GetIcon ("stock_notes", 16); ++ stock_notes = GuiUtils.GetIcon ("tomboy", 16); +#else tintin = GuiUtils.GetMiniIcon ("tintin.png"); + tintin_tiny = GuiUtils.GetMiniIcon ("tintin.png"); @@ -225,7 +225,7 @@ @INTLTOOL_SERVER_RULE@ --- data/images/Makefile.am +++ data/images/Makefile.am -@@ -1,10 +1,43 @@ +@@ -1,10 +1,46 @@ pixmapdir = $(datadir)/pixmaps +if ENABLE_TANGO @@ -245,6 +245,8 @@ + $(INSTALL_DATA) $(srcdir)/tomboy-16.png $(DESTDIR)$(hicolordir)/16x16/apps/tomboy.png + $(mkinstalldirs) $(DESTDIR)$(hicolordir)/22x22/apps + $(INSTALL_DATA) $(srcdir)/tomboy-22.png $(DESTDIR)$(hicolordir)/22x22/apps/tomboy.png ++ $(mkinstalldirs) $(DESTDIR)$(hicolordir)/24x24/apps ++ $(INSTALL_DATA) $(srcdir)/tomboy-24.png $(DESTDIR)$(hicolordir)/24x24/apps/tomboy.png + $(mkinstalldirs) $(DESTDIR)$(hicolordir)/48x48/apps + $(INSTALL_DATA) $(srcdir)/tomboy-48.png $(DESTDIR)$(hicolordir)/48x48/apps/tomboy.png + @@ -252,6 +254,7 @@ + rm -f $(DESTDIR)$(hicolordir)/scalable/apps/tomboy.svg + rm -f $(DESTDIR)$(hicolordir)/16x16/apps/tomboy.png + rm -f $(DESTDIR)$(hicolordir)/22x22/apps/tomboy.png ++ rm -f $(DESTDIR)$(hicolordir)/24x24/apps/tomboy.png + rm -f $(DESTDIR)$(hicolordir)/48x48/apps/tomboy.png + +pixmap_DATA = \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit suseRegister
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package suseRegister checked in at Sun May 7 16:35:35 CEST 2006. -------- --- suseRegister/suseRegister.changes 2006-04-28 15:12:36.000000000 +0200 +++ STABLE/suseRegister/suseRegister.changes 2006-05-04 17:25:34.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 4 16:41:10 CEST 2006 - mc(a)suse.de + +- add support for type 'nu' [#172336] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suseRegister.spec ++++++ --- /var/tmp/diff_new_pack.thBAKq/_old 2006-05-07 16:35:27.000000000 +0200 +++ /var/tmp/diff_new_pack.thBAKq/_new 2006-05-07 16:35:27.000000000 +0200 @@ -13,7 +13,7 @@ Name: suseRegister BuildRequires: mono-core Version: 1.0 -Release: 55 +Release: 58 Summary: Registration tool Group: Productivity/Other License: GPL @@ -67,6 +67,8 @@ /usr/lib/suseRegister/bin/* %changelog -n suseRegister +* Thu May 04 2006 - mc(a)suse.de +- add support for type 'nu' [#172336] * Fri Apr 28 2006 - mc(a)suse.de - require rug and zmd in sles; recommend in suse linux - log installed products ++++++ suseRegister-1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/suseRegister-1.0/suse_register new/suseRegister-1.0/suse_register --- old/suseRegister-1.0/suse_register 2006-04-28 14:47:37.000000000 +0200 +++ new/suseRegister-1.0/suse_register 2006-05-04 16:40:37.000000000 +0200 @@ -13,6 +13,7 @@ use File::Temp qw(tempfile); use Sys::Syslog; use IPC::Open3; +use Fcntl qw(:DEFAULT); use URI; use Time::HiRes qw(gettimeofday tv_interval); @@ -24,6 +25,7 @@ my $configFile = "/etc/suseRegister.conf"; my $GUID_FILE = "/etc/zmd/deviceid"; +my $SECRET_FILE = "/etc/zmd/secret"; my $SYSCONFIG_CLOCK = "/etc/sysconfig/clock"; my $CA_PATH = "/etc/ssl/certs"; @@ -382,6 +384,18 @@ @arguments = split(/\s+/, $1); } } + elsif ($command =~ /^zmd-secret$/) + { + $cmd = undef; + open(SEC, "< $SECRET_FILE") or do { + logPrintExit("cannot open file $SECRET_FILE: $!\n", 12); + }; + while(<SEC>) + { + $out .= $_; + } + close SEC; + } else { $out = "DISCARDED"; # command not allowed; reply DISCARDED @@ -624,7 +638,8 @@ my $tree = shift || undef; my $serviceName = shift || undef; my $paramName = shift || undef; - + my $catalogURL = shift || undef; + if (!defined $tree) { logPrintExit("No data.\n", 14); @@ -647,7 +662,7 @@ } elsif (ref($tree->[$i]) eq "ARRAY") { - walkResultZmdconfig($tree->[$i], $serviceName, $paramName); + walkResultZmdconfig($tree->[$i], $serviceName, $paramName, $catalogURL); if (defined $paramName) { @@ -669,7 +684,19 @@ } elsif (exists $tree->[$i+1]->[0]->{name}) { - $paramName = $tree->[$i+1]->[0]->{name} + $paramName = $tree->[$i+1]->[0]->{name}; + + if($paramName eq "catalog") + { + if(exists $tree->[$i+1]->[0]->{url}) + { + $catalogURL = $tree->[$i+1]->[0]->{url}; + } + else + { + $catalogURL = undef; + } + } } } elsif ($serviceName && @@ -679,7 +706,7 @@ $i++; if ($paramName eq "catalog") # more than one catalog allowed { - push @{$zmdConfig->{$serviceName}->{$paramName}}, $tree->[$i]; + $zmdConfig->{$serviceName}->{catalog}->{$tree->[$i]} = $catalogURL; } else { @@ -1392,20 +1419,21 @@ my @rugArgs = ("--quiet", "sa", "--ignore-failure", "-t", "$type", "$url"); - - foreach my $num (keys %availableSources) + if(defined $id) { - if(defined $availableSources{$num} && - $availableSources{$num} eq $id) + foreach my $num (keys %availableSources) { - # delete this service - - rugServiceDelete($id); + if(defined $availableSources{$num} && + $availableSources{$num} eq $id) + { + # delete this service + + rugServiceDelete($id); + } } - } + push @rugArgs, $id; + } - push @rugArgs, $id; - print STDERR "rug add service command: $rug ".join(" ",@rugArgs)."\n" if($debug >= 1); my $pid = open3(\*IN, \*OUT, \*ERR, $rug, @rugArgs) or do { @@ -1509,13 +1537,13 @@ return 0; } - if (!defined $catalogs || ref($catalogs) ne "ARRAY") + if (!defined $catalogs || ref($catalogs) ne "HASH") { print STDERR "No catalogs to subscribe\n"; return 1; } - foreach my $catalog (@$catalogs) + foreach my $catalog (keys %$catalogs) { my @rugArgs = ("--terse", "sub", "$catalog"); @@ -1636,14 +1664,41 @@ # HACK: write urls for yast if(defined $dumpfilehack && $dumpfilehack ne "") { - my $exc = open(XMLD, "> $dumpfilehack") and do + my $exc = sysopen(XMLD, $dumpfilehack, O_CREAT|O_TRUNC|O_WRONLY, 0600) and do { foreach my $service (keys %$zmdConfig) { next if($service eq "globalzmdoptions"); - - print XMLD $zmdConfig->{$service}->{url}."\n"; - syslog("info", "dumpfile write:".$zmdConfig->{$service}->{url}); + + if($zmdConfig->{$service}->{type} eq "yum" || + $zmdConfig->{$service}->{type} eq "zypp") + { + print XMLD $zmdConfig->{$service}->{url}."\n"; + syslog("info", "dumpfile write(zypp/yum):".$zmdConfig->{$service}->{url}); + } + elsif($zmdConfig->{$service}->{type} eq "nu") + { + my $secret = ""; + open(SEC, "< $SECRET_FILE") or do { + logPrintExit("cannot open file $SECRET_FILE: $!\n", 12); + }; + while(<SEC>) + { + $secret .= $_; + } + close SEC; + + foreach my $u (keys %{$zmdConfig->{$service}->{catalog}}) + { + my $curi = URI->new($zmdConfig->{$service}->{catalog}->{$u}); + print $curi->as_string."\n"; + $curi->userinfo("$guid:$secret"); + $curi->query("auth=digest"); + + print XMLD $curi->as_string."\n"; + syslog("info", "dumpfile write(nu):".$u); + } + } } close XMLD; }; @@ -1669,32 +1724,38 @@ { my ($ret, $msg) = (0, ""); my $name = undef; - my $catalogs = []; + my $catalogs = {}; next if($service eq "globalzmdoptions"); if($zmdConfig->{$service}->{type} eq "yum" || $zmdConfig->{$service}->{type} eq "zypp") { - if(exists $zmdConfig->{$service}->{catalog}->[0] && - defined $zmdConfig->{$service}->{catalog}->[0] && - $zmdConfig->{$service}->{catalog}->[0] ne "") + if(exists $zmdConfig->{$service}->{catalog} && + ref($zmdConfig->{$service}->{catalog}) eq "HASH") + { - $name = $zmdConfig->{$service}->{catalog}->[0]; + my @x = keys %{$zmdConfig->{$service}->{catalog}}; + + if(exists $x[0] && defined $x[0] && $x[0] ne "") + { + $name = $x[0]; + } } else { $name = $service; } - push @$catalogs, $name; + $catalogs->{$name} = undef; } - elsif($zmdConfig->{$service}->{type} eq "zenworks") + elsif($zmdConfig->{$service}->{type} eq "zenworks" || + $zmdConfig->{$service}->{type} eq "nu") { - $name = undef; + $name = $zmdConfig->{$service}->{url}; $catalogs = $zmdConfig->{$service}->{catalog}; } - + ($ret, $msg) = rugServiceAdd($zmdConfig->{$service}->{url}, $zmdConfig->{$service}->{type}, $name); @@ -1704,7 +1765,8 @@ logPrintExit($msg, $ret); } - if($zmdConfig->{$service}->{type} eq "zenworks") + if($zmdConfig->{$service}->{type} eq "zenworks" || + $zmdConfig->{$service}->{type} eq "nu") { ($ret, $msg) = rugRegister($zmdConfig->{$service}->{url}, $zmdConfig->{$service}->{regcode}); @@ -1761,6 +1823,8 @@ my $p = new XML::Parser(Style => 'Tree'); my $tree = $p->parse($res); + #print Data::Dumper->Dump([$tree])."\n"; + if (defined $tree && $tree->[0] eq "needinfo" && ref($tree->[1]) eq "ARRAY") { my $ret = addAutomaticArgs($tree); @@ -1962,7 +2026,6 @@ elsif (defined $tree && $tree->[0] eq "zmdconfig" && ref($tree->[1]) eq "ARRAY") { # HACK: write <zmdconfig> xml for yast - if(defined $dumpxmlfilehack && $dumpxmlfilehack ne "") { my $exc = open(XMLD, "> $dumpxmlfilehack") and do ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit reiserfs
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package reiserfs checked in at Sun May 7 16:32:43 CEST 2006. -------- --- reiserfs/reiserfs.changes 2006-03-03 00:13:07.000000000 +0100 +++ STABLE/reiserfs/reiserfs.changes 2006-05-04 20:45:04.000000000 +0200 @@ -1,0 +2,9 @@ +Thu May 4 20:37:48 CEST 2006 - jeffm(a)suse.com + +- Added fix for off-by-one in memory allocation of oid map. Would + cause crash on file systems with OID 2^32-2 in use. + +- Added patch to use better defaults for journals on external + devices.. + +------------------------------------------------------------------- New: ---- reiserfsprogs-external-journal-changes.diff reiserfsprogs-fsck-mapid.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ reiserfs.spec ++++++ --- /var/tmp/diff_new_pack.057koW/_old 2006-05-07 16:32:17.000000000 +0200 +++ /var/tmp/diff_new_pack.057koW/_new 2006-05-07 16:32:17.000000000 +0200 @@ -15,7 +15,7 @@ URL: http://www.namesys.com/download.html Conflicts: libreiserfs-progs Version: 3.6.19 -Release: 9 +Release: 18 Summary: Reiser File System utilities License: GPL, Other License(s), see package Group: System/Filesystems @@ -24,6 +24,8 @@ Patch1: 02-mkreiserfs-quiet.diff Patch2: broken-inline.diff Patch3: reiserfs-large-block-warning.diff +Patch4: reiserfsprogs-fsck-mapid.diff +Patch5: reiserfsprogs-external-journal-changes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -38,6 +40,8 @@ %patch1 -p1 %patch2 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build CFLAGS="$RPM_OPT_FLAGS" \ @@ -60,6 +64,11 @@ rm -rf $RPM_BUILD_ROOT %changelog -n reiserfs +* Thu May 04 2006 - jeffm(a)suse.com +- Added fix for off-by-one in memory allocation of oid map. Would + cause crash on file systems with OID 2^32-2 in use. +- Added patch to use better defaults for journals on external + devices.. * Fri Mar 03 2006 - jeffm(a)suse.com - Added warning for block sizes > 4k * Wed Jan 25 2006 - mls(a)suse.de ++++++ reiserfsprogs-external-journal-changes.diff ++++++ From: Jeff Mahoney <jeffm(a)suse.com> Subject: [PATCH] reiserfsprogs: changes for better external journal defaults SUSE-Bugzilla: 133999 Currently, when presented with an external journal device, reiserfsprogs will use the entire device. This is fine when the external device is, say, a 128 MB NVRAM "disk", but when it is another external partition it can cause problems on 32-bit machines and 64-bit machines with limited memory capacity. This patch does a few things, all related: * It changes the default external journal size to be journal_default_size, just like the internal size. * If an external journal device is larger than the used space, it warns the user that they are wasting space. * Changes the warning re: journal sizes > default size to be more descriptive. * Checks to see if the journal size is larger than the max size. If it is an error is issued with a description why and instructions to use -f if the action is truly desired. * Adds a "force" mode to reiserfs_create_journal() This may all sound theoretical, but it actually causes machines to crash. We recenly saw a bug report where the user chose an external journal device of ~ 8 GB. When journal_init() tried to allocate cnodes, it failed silently and then panicked the node when it needed to actually use a cnode. A patch to address that issue follows. Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> diff -ruNpx '*~' reiserfsprogs-3.6.19/include/reiserfs_lib.h reiserfsprogs-3.6.19-jeffm/include/reiserfs_lib.h --- reiserfsprogs-3.6.19/include/reiserfs_lib.h 2004-10-01 12:19:34.000000000 -0400 +++ reiserfsprogs-3.6.19-jeffm/include/reiserfs_lib.h 2005-11-23 18:31:33.000000000 -0500 @@ -346,7 +346,7 @@ int reiserfs_open_journal (reiserfs_fils int reiserfs_journal_params_check(reiserfs_filsys_t *fs); int reiserfs_create_journal (reiserfs_filsys_t * fs, char * j_filename, unsigned long offset, unsigned long len, - int transaction_max_size); + int transaction_max_size, int force); int reiserfs_journal_opened (reiserfs_filsys_t *); void reiserfs_flush_journal (reiserfs_filsys_t * fs); void reiserfs_free_journal (reiserfs_filsys_t * fs); diff -ruNpx '*~' reiserfsprogs-3.6.19/mkreiserfs/mkreiserfs.c reiserfsprogs-3.6.19-jeffm/mkreiserfs/mkreiserfs.c --- reiserfsprogs-3.6.19/mkreiserfs/mkreiserfs.c 2004-09-30 17:04:21.000000000 -0400 +++ reiserfsprogs-3.6.19-jeffm/mkreiserfs/mkreiserfs.c 2005-11-23 17:55:08.000000000 -0500 @@ -697,7 +697,7 @@ int main (int argc, char **argv) } if (!reiserfs_create_journal (fs, jdevice_name, Offset, Journal_size, - Max_trans_size)) + Max_trans_size, force)) { return 1; } diff -ruNpx '*~' reiserfsprogs-3.6.19/reiserfscore/journal.c reiserfsprogs-3.6.19-jeffm/reiserfscore/journal.c --- reiserfsprogs-3.6.19/reiserfscore/journal.c 2004-10-13 09:05:15.000000000 -0400 +++ reiserfsprogs-3.6.19-jeffm/reiserfscore/journal.c 2005-11-23 18:53:25.000000000 -0500 @@ -545,7 +545,8 @@ int reiserfs_create_journal( char * j_device, /* journal device name */ unsigned long offset, /* journal offset on the j_device */ unsigned long len, /* including journal header */ - int transaction_max_size) + int transaction_max_size, + int force) { struct stat st; struct buffer_head * bh; @@ -596,21 +597,46 @@ int reiserfs_create_journal( "%lu, blocks on device %lu\n", offset, blocks); return 0; } - len = blocks - offset; + /* XXX jdm: This can end up being huge and could result + * in an unmountable file system: + * len = blocks - offset; */ + len = journal_default_size(fs->fs_super_bh->b_blocknr, + fs->fs_blocksize) + 1; + } - if (len > journal_default_size (fs->fs_super_bh->b_blocknr, + if (!force && len > journal_default_size (fs->fs_super_bh->b_blocknr, fs->fs_blocksize) + 1) { + unsigned long journal_max = journal_max_size (fs->fs_super_bh->b_blocknr, fs->fs_blocksize); fflush(stderr); - reiserfs_warning (stdout, "NOTE: journal new size %lu is greater " - "than default size %lu:\nthis may slow down initializing and " - "mounting of the journal. Hope it is ok.\n\n", len, - journal_default_size(fs->fs_super_bh->b_blocknr, - fs->fs_blocksize) + 1); + reiserfs_warning (stdout, "\n*** You've specified a journal " + "size larger than the default size of " + "%lu\n*** blocks. This may slow down " + "journal initialization and mounting " + "of\n*** the file system.%s", + journal_default_size(fs->fs_super_bh->b_blocknr, fs->fs_blocksize) + 1, + len > journal_max ? " " : "\n"); + if (len > journal_max) + reiserfs_warning (stdout, "On 32-bit systems, and on " + "64-bit systems with\n*** limited " + "memory, this may also cause the file " + "system to be unmountable.\n*** Please " + "consider using a journal size " + "<= %lu blocks.\n\nFile system creation " + "failed. You may override this behavior " + "with the -f option.\n", journal_max); + return 0; } + if (len < blocks) + reiserfs_warning (stdout, "\n\n*** Your journal device is %lu " + "blocks, but your journal is only %lu " + "blocks.\n*** You may want to consider " + "resizing the journal device to avoid " + "wasting space.\n\n", blocks, len); + if (blocks < offset + len) { reiserfs_warning (stderr, "reiserfs_create_journal: no enough " "blocks on device %lu, needed %lu\n", blocks, offset + len); diff -ruNpx '*~' reiserfsprogs-3.6.19/tune/tune.c reiserfsprogs-3.6.19-jeffm/tune/tune.c --- reiserfsprogs-3.6.19/tune/tune.c 2004-08-19 07:23:57.000000000 -0400 +++ reiserfsprogs-3.6.19-jeffm/tune/tune.c 2005-11-23 18:33:09.000000000 -0500 @@ -710,7 +710,7 @@ int main (int argc, char **argv) reiserfs_close_journal (fs); if (!reiserfs_create_journal (fs, j_new_device_name, Offset, - Journal_size, Max_trans_size)) { + Journal_size, Max_trans_size, Force)) { message ("Could not create new journal"); reiserfs_close (fs); return 1; ++++++ reiserfsprogs-fsck-mapid.diff ++++++ From: Jeff Mahoney <jeffm(a)suse.com> Subject: [PATCH] reiserfsprogs: id_map_init off-by-one The following patch fixes a bug where reiserfsck will crash if OIDs up around the maximum are in use. The problem is that INDEX_COUNT ends up rounding down and the last chunk isn't allocated, causing a segfault. diff -rup reiserfsprogs-3.6.19/fsck/uobjectid.c reiserfsprogs-3.6.19.devel/fsck/uobjectid.c --- reiserfsprogs-3.6.19/fsck/uobjectid.c 2004-06-17 15:57:39.000000000 -0400 +++ reiserfsprogs-3.6.19.devel/fsck/uobjectid.c 2006-04-20 15:18:26.000000000 -0400 @@ -15,7 +15,7 @@ /* 2 bytes for the counter */ #define BM_SIZE (ALLOC_SIZE - sizeof(__u16)) #define BM_INTERVAL (BM_SIZE * 8) -#define INDEX_COUNT (MAX_ID / BM_INTERVAL) +#define INDEX_COUNT ((MAX_ID / BM_INTERVAL) + 1) #define id_map_interval(map, id) (map->index + (id / BM_INTERVAL)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit rdesktop
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package rdesktop checked in at Sun May 7 16:32:12 CEST 2006. -------- --- rdesktop/rdesktop.changes 2006-03-20 12:13:15.000000000 +0100 +++ STABLE/rdesktop/rdesktop.changes 2006-05-04 18:01:18.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 4 17:52:21 CEST 2006 - mc(a)suse.de + +- add xgl fix [#164671] + +------------------------------------------------------------------- New: ---- rdesktop-1.4.1-fs-fix-1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rdesktop.spec ++++++ --- /var/tmp/diff_new_pack.MIA54A/_old 2006-05-07 16:31:53.000000000 +0200 +++ /var/tmp/diff_new_pack.MIA54A/_new 2006-05-07 16:31:53.000000000 +0200 @@ -17,11 +17,12 @@ Group: Productivity/Networking/Other Autoreqprov: on Version: 1.4.1 -Release: 8 +Release: 16 Summary: a Remote Desktop Protocol client Source: %{name}-%{version}.tar.bz2 Patch0: rdesktop-1.4.0-lib64.dif Patch1: rdesktop-1.4.1-no-ARGB-visual.dif +Patch2: rdesktop-1.4.1-fs-fix-1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,6 +41,7 @@ %setup %patch0 %patch1 +%patch2 %build %{suse_update_config} @@ -70,6 +72,8 @@ %{_mandir}/man1/rdesktop.1.gz %changelog -n rdesktop +* Thu May 04 2006 - mc(a)suse.de +- add xgl fix [#164671] * Mon Mar 20 2006 - mc(a)suse.de - fix Compiz makes rdesktop window entirely transparent [# 155335] ++++++ rdesktop-1.4.1-fs-fix-1.patch ++++++ diff -u ../rdesktop-1.4.1/xwin.c ./xwin.c --- ../rdesktop-1.4.1/xwin.c 2006-04-21 00:12:57.000000000 +0200 +++ ./xwin.c 2006-04-21 00:12:42.000000000 +0200 @@ -20,6 +20,7 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> +#include <X11/Xatom.h> #include <unistd.h> #include <sys/time.h> #include <time.h> @@ -1174,7 +1175,7 @@ attribs.background_pixel = BlackPixelOfScreen(g_screen); attribs.border_pixel = WhitePixelOfScreen(g_screen); attribs.backing_store = g_ownbackstore ? NotUseful : Always; - attribs.override_redirect = g_fullscreen; + attribs.override_redirect = 0; attribs.colormap = g_xcolmap; g_wnd = XCreateWindow(g_display, RootWindowOfScreen(g_screen), g_xpos, g_ypos, wndwidth, @@ -1182,6 +1183,17 @@ CWBackPixel | CWBackingStore | CWOverrideRedirect | CWColormap | CWBorderPixel, &attribs); + if (g_fullscreen) + { + Atom state; + + state = XInternAtom (g_display, "_NET_WM_STATE_FULLSCREEN", 0); + XChangeProperty (g_display, g_wnd, + XInternAtom (g_display, "_NET_WM_STATE", 0), + XA_ATOM, 32, PropModeReplace, + (unsigned char *) &state, 1); + } + if (g_gc == NULL) g_gc = XCreateGC(g_display, g_wnd, 0, NULL); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit php5
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package php5 checked in at Sun May 7 16:30:53 CEST 2006. -------- --- php5/php5.changes 2006-04-12 16:54:30.000000000 +0200 +++ STABLE/php5/php5.changes 2006-05-03 15:19:00.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 3 15:16:05 CEST 2006 - postadal(a)suse.cz + +- fixed completely broken SplTempFileObject [php#37257] + (phpbug-37257.patch) +- fixed problem with with $_POST array [php#37276] + (phpbug-37276.patch) + +------------------------------------------------------------------- New: ---- php-5.1.2-phpbug-37257.patch php-5.1.2-phpbug-37276.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.u0TjZ9/_old 2006-05-07 16:30:12.000000000 +0200 +++ /var/tmp/diff_new_pack.u0TjZ9/_new 2006-05-07 16:30:12.000000000 +0200 @@ -30,7 +30,7 @@ ### ### Version: 5.1.2 -Release: 21 +Release: 28 License: Other uncritical OpenSource License, Other License(s), see package Group: Productivity/Networking/Web/Servers Provides: php zend php-xml php-spl php-simplexml php-session php-pcre @@ -86,6 +86,8 @@ Patch47: php-%{version}-CVE-2006-0996.patch Patch48: php-%{version}-CVE-2006-1490.patch Patch49: php-%{version}-CVE-2006-1017.patch +Patch50: php-%{version}-phpbug-37257.patch +Patch51: php-%{version}-phpbug-37276.patch URL: http://www.php.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Icon: php5.xpm @@ -1465,6 +1467,8 @@ %patch47 %patch48 %patch49 +%patch50 +%patch51 # we build three SAPI mkdir -p build-apache2 mkdir -p build-fastcgi/sapi/cgi/libfcgi @@ -2003,6 +2007,11 @@ %config(noreplace) %{php_sysconf}/conf.d/zlib.ini %changelog -n php5 +* Wed May 03 2006 - postadal(a)suse.cz +- fixed completely broken SplTempFileObject [php#37257] + (phpbug-37257.patch) +- fixed problem with with $_POST array [php#37276] + (phpbug-37276.patch) * Wed Apr 12 2006 - postadal(a)suse.cz - fixed security problem in copy() and tempname() [#164845] (CVE-2006-1494-1608.patch) ++++++ php-5.1.2-phpbug-37257.patch ++++++ --- ext/standard/php_fopen_wrapper.c 2006/01/01 12:50:15 1.45.2.3 +++ ext/standard/php_fopen_wrapper.c 2006/05/01 16:02:07 1.45.2.4 @@ -158,9 +158,29 @@ int mode_rw = 0; php_stream * stream = NULL; char *p, *token, *pathdup; + long max_memory; - if (!strncasecmp(path, "php://", 6)) + if (!strncasecmp(path, "php://", 6)) { path += 6; + } + + if (!strncasecmp(path, "temp", 4)) { + path += 4; + max_memory = PHP_STREAM_MAX_MEM; + if (!strncasecmp(path, "/maxmemory:", 11)) { + path += 11; + max_memory = strtol(path, NULL, 10); + if (max_memory < 0) { + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Max memory must be >= 0"); + return NULL; + } + } + return php_stream_temp_create(TEMP_STREAM_DEFAULT, max_memory); + } + + if (!strcasecmp(path, "memory")) { + return php_stream_memory_create(TEMP_STREAM_DEFAULT); + } if (!strcasecmp(path, "output")) { return php_stream_alloc(&php_stream_output_ops, NULL, 0, "wb"); ++++++ php-5.1.2-phpbug-37276.patch ++++++ --- main/php_variables.c 2006/04/18 06:58:54 1.126 +++ main/php_variables.c 2006/05/03 11:24:51 1.127 @@ -177,7 +177,7 @@ is_array = 1; *ip = 0; } else { - is_array = 0; + goto plain_var; } } } else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit pcsc-cyberjack
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package pcsc-cyberjack checked in at Sun May 7 16:29:47 CEST 2006. -------- --- pcsc-cyberjack/pcsc-cyberjack.changes 2006-04-02 00:00:14.000000000 +0200 +++ STABLE/pcsc-cyberjack/pcsc-cyberjack.changes 2006-05-06 08:50:26.000000000 +0200 @@ -1,0 +2,5 @@ +Sat May 6 08:50:16 CEST 2006 - kukuk(a)suse.de + +- Fix inclusion of kernel headers + +------------------------------------------------------------------- New: ---- ctapi-cyberjack-2.0.10.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-cyberjack.spec ++++++ --- /var/tmp/diff_new_pack.iUuyjE/_old 2006-05-07 16:29:43.000000000 +0200 +++ /var/tmp/diff_new_pack.iUuyjE/_new 2006-05-07 16:29:43.000000000 +0200 @@ -13,7 +13,7 @@ Name: pcsc-cyberjack BuildRequires: pcsc-lite-devel pkgconfig readline-devel Version: 2.0.10 -Release: 7 +Release: 13 Provides: locale(MozillaFirefox:de_BE;en_BE;fr_BE;nl_BE;wa_BE) Group: System/Libraries License: LGPL @@ -25,6 +25,7 @@ Patch2: ctapi-cyberjack-%{version}-make.patch Patch3: ctapi-cyberjack-%{version}-rpath.patch Patch4: ctapi-cyberjack-%{version}-libso.patch +Patch5: ctapi-cyberjack-2.0.10.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %define ifddir %{_libdir}/readers %package -n ctapi-cyberjack @@ -78,6 +79,7 @@ %patch2 %patch3 %patch4 +%patch5 %build make all COPTS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" RPATH="-Wl,-rpath -Wl,%{ifddir}" @@ -116,6 +118,8 @@ %{_bindir}/* %changelog -n pcsc-cyberjack +* Sat May 06 2006 - kukuk(a)suse.de +- Fix inclusion of kernel headers * Sun Apr 02 2006 - sndirsch(a)suse.de - added missing locale provides (Bug #161867) * Mon Mar 27 2006 - schwab(a)suse.de ++++++ ctapi-cyberjack-2.0.10.dif ++++++ --- ctapi/ausb/ausb.h +++ ctapi/ausb/ausb.h 2006/05/06 06:39:56 @@ -15,6 +15,7 @@ #ifdef CONFIG_COMPAT #undef CONFIG_COMPAT #endif +#include <linux/compiler.h> #include <linux/usbdevice_fs.h> #define AUSB_USBDEVFS_URB_TYPES 4 --- ctapi/ausb/usb.c +++ ctapi/ausb/usb.c 2006/05/06 06:49:19 @@ -8,6 +8,7 @@ #ifdef CONFIG_COMPAT #undef CONFIG_COMPAT #endif +#include <linux/compiler.h> #include <linux/usbdevice_fs.h> #define MAX_READ_WRITE 4096 --- ctapi/ecom/cj.h +++ ctapi/ecom/cj.h 2006/05/06 06:47:56 @@ -26,6 +26,7 @@ #define H_CJ #include <limits.h> +#include <linux/compiler.h> #include <linux/usbdevice_fs.h> /* Return codes */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit pango
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package pango checked in at Sun May 7 16:28:53 CEST 2006. -------- --- GNOME/pango/pango.changes 2006-04-24 23:34:52.000000000 +0200 +++ STABLE/pango/pango.changes 2006-05-02 21:54:01.000000000 +0200 @@ -1,0 +2,9 @@ +Tue May 2 21:53:44 CEST 2006 - federico(a)novell.com + +- Added pango-104365-use-hinted-metrics.diff to fix the Pango-related + part of https://bugzilla.novell.com/show_bug.cgi?id=104365. This + makes Pango request hinted font metrics from Cairo/Fontconfig, even + when we are using unhinted rendering. This is what applications + expect; they would draw overlapping glyphs otherwise. + +------------------------------------------------------------------- New: ---- pango-104365-use-hinted-metrics.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pango.spec ++++++ --- /var/tmp/diff_new_pack.HovgfI/_old 2006-05-07 16:28:34.000000000 +0200 +++ /var/tmp/diff_new_pack.HovgfI/_new 2006-05-07 16:28:34.000000000 +0200 @@ -18,7 +18,7 @@ Group: System/Libraries Autoreqprov: on Version: 1.10.2 -Release: 18 +Release: 22 Summary: System for Layout and Rendering of Internationalised Text Source: ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.10/%{name}-%{version}.tar.bz2 Source1: SuSEconfig.pango @@ -27,6 +27,7 @@ Patch1: pango-ottest.patch Patch2: bugzilla-53228-artificial-bold-and-italic.patch Patch3: pango-131128-font-extents-rounding.diff +Patch4: pango-104365-use-hinted-metrics.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: filesystem /usr/bin/touch /bin/rm /bin/rmdir Requires: cairo @@ -92,6 +93,7 @@ %patch1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %{?suse_update_config:%{suse_update_config -f}} @@ -181,6 +183,12 @@ %{prefix}/share/gtk-doc/html/pango %changelog -n pango +* Tue May 02 2006 - federico(a)novell.com +- Added pango-104365-use-hinted-metrics.diff to fix the Pango-related + part of https://bugzilla.novell.com/show_bug.cgi?id=104365. This + makes Pango request hinted font metrics from Cairo/Fontconfig, even + when we are using unhinted rendering. This is what applications + expect; they would draw overlapping glyphs otherwise. * Mon Apr 24 2006 - federico(a)novell.com - Added pango-131128-font-extents-rounding.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=131128. This makes ++++++ pango-104365-use-hinted-metrics.diff ++++++ https://bugzilla.novell.com/show_bug.cgi?id=104365 http://bugzilla.gnome.org/show_bug.cgi?id=307196 Index: pangocairo-fcfont.c =================================================================== RCS file: /cvs/gnome/pango/pango/pangocairo-fcfont.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -p -r1.33 -r1.34 --- pango/pango/pangocairo-fcfont.c 11 Apr 2006 08:31:43 -0000 1.33 +++ pango/pango/pangocairo-fcfont.c 29 Apr 2006 05:52:35 -0000 1.34 @@ -645,5 +645,10 @@ _pango_cairo_fc_font_new (PangoCairoFcFo cffont->options = cairo_font_options_copy (_pango_cairo_context_get_merged_font_options (context)); + /* fcfont's is_hinted controls metric hinting + */ + PANGO_FC_FONT(cffont)->is_hinted = + (cairo_font_options_get_hint_metrics(cffont->options) != CAIRO_HINT_METRICS_OFF); + return PANGO_FC_FONT (cffont); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit pam
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package pam checked in at Sun May 7 16:28:27 CEST 2006. -------- --- pam/pam.changes 2006-04-21 13:48:29.000000000 +0200 +++ STABLE/pam/pam.changes 2006-05-05 15:16:43.000000000 +0200 @@ -1,0 +2,5 @@ +Fri May 5 15:16:29 CEST 2006 - kukuk(a)suse.de + +- Fix pam_tally LFS support [#172492] + +------------------------------------------------------------------- New: ---- pam_tally-large-uid.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam.spec ++++++ --- /var/tmp/diff_new_pack.5rWzef/_old 2006-05-07 16:28:06.000000000 +0200 +++ /var/tmp/diff_new_pack.5rWzef/_new 2006-05-07 16:28:06.000000000 +0200 @@ -19,7 +19,7 @@ Group: System/Libraries Autoreqprov: on Version: 0.99.3.0 -Release: 24 +Release: 28 Summary: A security tool that provides authentication for applications Obsoletes: pam-laus Source: Linux-PAM-%{version}.tar.bz2 @@ -48,6 +48,7 @@ Patch1: pam_listfile.diff Patch2: pam_lastlog.diff Patch3: libpam.pam_item.diff +Patch4: pam_tally-large-uid.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -79,6 +80,7 @@ %patch1 %patch2 %patch3 +%patch4 # # Install docu # @@ -226,6 +228,8 @@ %{_libdir}/libpam_misc.so %changelog -n pam +* Fri May 05 2006 - kukuk(a)suse.de +- Fix pam_tally LFS support [#172492] * Fri Apr 21 2006 - kukuk(a)suse.de - Update fr.po and pl.po * Tue Apr 11 2006 - kukuk(a)suse.de ++++++ pam_tally-large-uid.diff ++++++ --- configure.in +++ configure.in 2006/05/05 13:26:30 @@ -390,7 +390,7 @@ AC_PROG_GCC_TRADITIONAL AC_FUNC_MEMCMP AC_FUNC_VPRINTF -AC_CHECK_FUNCS(gethostname gettimeofday lckpwdf mkdir select) +AC_CHECK_FUNCS(fseeko gethostname gettimeofday lckpwdf mkdir select) AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname) AC_CHECK_FUNCS(getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r) AC_CHECK_FUNCS(getgrouplist getline getdelim) --- modules/pam_tally/pam_tally.c +++ modules/pam_tally/pam_tally.c 2006/05/05 13:27:08 @@ -34,11 +34,6 @@ #include <sys/param.h> #include "faillog.h" -#ifndef TRUE -#define TRUE 1L -#define FALSE 0L -#endif - /* * here, we make a definition for the externally accessible function * in this file (this definition is required for static a module @@ -55,6 +50,15 @@ #include <security/pam_modutil.h> #include <security/pam_ext.h> +#ifndef TRUE +#define TRUE 1L +#define FALSE 0L +#endif + +#ifndef HAVE_FSEEKO +#define fseeko fseek +#endif + /*---------------------------------------------------------------------*/ #define DEFAULT_LOGFILE "/var/log/faillog" @@ -64,8 +68,6 @@ #define TALLY_FMT "%hu" #define TALLY_HI ((tally_t)~0L) -#define UID_FMT "%hu" - #ifndef FILENAME_MAX # define FILENAME_MAX MAXPATHLEN #endif @@ -345,7 +347,7 @@ return PAM_AUTH_ERR; } - if ( fseek( *TALLY, uid * sizeof(struct faillog), SEEK_SET ) ) { + if ( fseeko( *TALLY, (off_t) uid * sizeof(struct faillog), SEEK_SET ) ) { pam_syslog(pamh, LOG_ALERT, "fseek failed for %s", filename); fclose(*TALLY); return PAM_AUTH_ERR; @@ -381,7 +383,7 @@ { if ( tally!=TALLY_HI ) { - if ( fseek( *TALLY, uid * sizeof(struct faillog), SEEK_SET ) ) { + if ( fseeko( *TALLY, uid * sizeof(struct faillog), SEEK_SET ) ) { pam_syslog(pamh, LOG_ALERT, "fseek failed for %s", filename); return PAM_AUTH_ERR; } @@ -517,9 +519,9 @@ if ( lock_time + oldtime > time(NULL) ) { pam_syslog(pamh, LOG_NOTICE, - "user %s ("UID_FMT") has time limit [%lds left]" + "user %s (%lu) has time limit [%lds left]" " since last failure.", - user,uid, + user, (unsigned long int) uid, oldtime+lock_time -time(NULL)); return PAM_AUTH_ERR; @@ -538,8 +540,8 @@ ( ((opts->ctrl & OPT_DENY_ROOT) || uid) ) /* even_deny stops uid check */ ) { pam_syslog(pamh, LOG_NOTICE, - "user %s ("UID_FMT") tally "TALLY_FMT", deny "TALLY_FMT, - user, uid, tally, deny); + "user %s (%lu) tally "TALLY_FMT", deny "TALLY_FMT, + user, (unsigned long int) uid, tally, deny); return PAM_AUTH_ERR; /* Only unconditional failure */ } } @@ -807,7 +809,8 @@ } if ( !cline_quiet ) - printf("User %s\t("UID_FMT")\t%s "TALLY_FMT"\n",cline_user,uid, + printf("User %s\t(%lu)\t%s "TALLY_FMT"\n",cline_user, + (unsigned long int) uid, (cline_reset!=TALLY_HI)?"had":"has",tally); i=set_tally(NULL, cline_reset, uid, cline_filename, &TALLY, fsp); @@ -833,11 +836,13 @@ tally = fsp->fs_faillog.fail_cnt; if ( ( pw=getpwuid(uid) ) ) { - printf("User %s\t("UID_FMT")\t%s "TALLY_FMT"\n",pw->pw_name,uid, + printf("User %s\t(%lu)\t%s "TALLY_FMT"\n",pw->pw_name, + (unsigned long int) uid, (cline_reset!=TALLY_HI)?"had":"has",tally); } else { - printf("User [NONAME]\t("UID_FMT")\t%s "TALLY_FMT"\n",uid, + printf("User [NONAME]\t(%lu)\t%s "TALLY_FMT"\n", + (unsigned long int) uid, (cline_reset!=TALLY_HI)?"had":"has",tally); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit oprofile
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package oprofile checked in at Sun May 7 16:28:00 CEST 2006. -------- --- oprofile/oprofile.changes 2006-02-27 18:33:19.000000000 +0100 +++ STABLE/oprofile/oprofile.changes 2006-05-04 14:53:21.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 4 14:52:58 CEST 2006 - schwab(a)suse.de + +- Fix last change. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oprofile.spec ++++++ --- /var/tmp/diff_new_pack.2vKJ5E/_old 2006-05-07 16:27:50.000000000 +0200 +++ /var/tmp/diff_new_pack.2vKJ5E/_new 2006-05-07 16:27:50.000000000 +0200 @@ -17,7 +17,7 @@ Group: Development/Tools/Other Autoreqprov: on Version: 0.9.1 -Release: 5 +Release: 16 Summary: System-Wide Profiler for Linux Systems BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.gz @@ -94,6 +94,8 @@ %doc doc/oprofile.html COPYING README TODO ChangeLog %changelog -n oprofile +* Thu May 04 2006 - schwab(a)suse.de +- Fix last change. * Mon Feb 27 2006 - schwab(a)suse.de - Add events for power5+ [#152494]. * Fri Jan 27 2006 - mls(a)suse.de ++++++ power5+-events.diff ++++++ --- /var/tmp/diff_new_pack.2vKJ5E/_old 2006-05-07 16:27:50.000000000 +0200 +++ /var/tmp/diff_new_pack.2vKJ5E/_new 2006-05-07 16:27:51.000000000 +0200 @@ -12,14 +12,10 @@ * utils/ophelp.c: Add support for Power5+ Index: events/Makefile.am -=================================================================== -RCS file: /cvsroot/oprofile/oprofile/events/Makefile.am,v -retrieving revision 1.12 -retrieving revision 1.13 -diff -u -a -p -r1.12 -r1.13 ---- events/Makefile.am 17 Oct 2005 23:35:00 -0000 1.12 -+++ events/Makefile.am 22 Feb 2006 14:36:36 -0000 1.13 -@@ -16,6 +16,7 @@ event_files = \ +================================================================================ +--- events/Makefile.am ++++ events/Makefile.am +@@ -16,6 +16,7 @@ ia64/itanium/events ia64/itanium/unit_masks \ ppc64/power4/events ppc64/power4/event_mappings ppc64/power4/unit_masks \ ppc64/power5/events ppc64/power5/event_mappings ppc64/power5/unit_masks \ @@ -27,12 +23,18 @@ ppc64/970/events ppc64/970/event_mappings ppc64/970/unit_masks \ rtc/events rtc/unit_masks \ x86-64/hammer/events x86-64/hammer/unit_masks \ -Index: events/ppc64/power5+/event_mappings -=================================================================== -RCS file: events/ppc64/power5+/event_mappings -diff -N events/ppc64/power5+/event_mappings ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ events/ppc64/power5+/event_mappings 22 Feb 2006 14:36:40 -0000 1.1 +--- events/Makefile.in ++++ events/Makefile.in +@@ -197,6 +197,7 @@ + ia64/itanium/events ia64/itanium/unit_masks \ + ppc64/power4/events ppc64/power4/event_mappings ppc64/power4/unit_masks \ + ppc64/power5/events ppc64/power5/event_mappings ppc64/power5/unit_masks \ ++ ppc64/power5+/events ppc64/power5+/event_mappings ppc64/power5+/unit_masks \ + ppc64/970/events ppc64/970/event_mappings ppc64/970/unit_masks \ + rtc/events rtc/unit_masks \ + x86-64/hammer/events x86-64/hammer/unit_masks \ +--- events/ppc64/power5+/event_mappings ++++ events/ppc64/power5+/event_mappings @@ -0,0 +1,1232 @@ +#Mapping of event groups to MMCR values + @@ -1266,12 +1268,8 @@ +event:0X993 mmcr0:0X00000000 mmcr1:0X0030000012501220 mmcra:0X00000000 +event:0X994 mmcr0:0X00000000 mmcr1:0X0030000012501220 mmcra:0X00000000 +event:0X995 mmcr0:0X00000000 mmcr1:0X0030000012501220 mmcra:0X00000000 -Index: events/ppc64/power5+/events -=================================================================== -RCS file: events/ppc64/power5+/events -diff -N events/ppc64/power5+/events ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ events/ppc64/power5+/events 22 Feb 2006 14:36:40 -0000 1.1 +--- events/ppc64/power5+/events ++++ events/ppc64/power5+/events @@ -0,0 +1,1242 @@ +#PPC64 Power5+ events +# @@ -2515,26 +2513,16 @@ +event:0X993 counters:3 um:zero minimum:1000 name:PM_LD_REF_L1_GRP153 : (Group 153 pm_eprof2) L1 D cache load references +event:0X994 counters:4 um:zero minimum:1000 name:PM_RUN_INST_CMPL_GRP153 : (Group 153 pm_eprof2) Run instructions completed +event:0X995 counters:5 um:zero minimum:10000 name:PM_RUN_CYC_GRP153 : (Group 153 pm_eprof2) Run cycles -Index: events/ppc64/power5+/unit_masks -=================================================================== -RCS file: events/ppc64/power5+/unit_masks -diff -N events/ppc64/power5+/unit_masks ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ events/ppc64/power5+/unit_masks 22 Feb 2006 14:36:40 -0000 1.1 +--- events/ppc64/power5+/unit_masks ++++ events/ppc64/power5+/unit_masks @@ -0,0 +1,4 @@ +# ppc64 Power5+ possible unit masks +# +name:zero type:mandatory default:0x0 + 0x0 No unit mask -Index: libop/op_cpu_type.c -=================================================================== -RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.c,v -retrieving revision 1.32 -retrieving revision 1.33 -diff -u -a -p -r1.32 -r1.33 ---- libop/op_cpu_type.c 17 Oct 2005 23:35:00 -0000 1.32 -+++ libop/op_cpu_type.c 22 Feb 2006 14:36:40 -0000 1.33 -@@ -45,6 +45,7 @@ static struct cpu_descr const cpu_descrs +--- libop/op_cpu_type.c ++++ libop/op_cpu_type.c +@@ -45,6 +45,7 @@ { "ARM/XScale PMU2", "arm/xscale2", CPU_ARM_XSCALE2, 5 }, { "ppc64 POWER4", "ppc64/power4", CPU_PPC64_POWER4, 8 }, { "ppc64 POWER5", "ppc64/power5", CPU_PPC64_POWER5, 6 }, @@ -2542,15 +2530,9 @@ { "ppc64 970", "ppc64/970", CPU_PPC64_970, 8 }, { "MIPS 24K", "mips/24K", CPU_MIPS_24K, 2}, { "MIPS R10000", "mips/r10000", CPU_MIPS_R10000, 2 }, -Index: libop/op_cpu_type.h -=================================================================== -RCS file: /cvsroot/oprofile/oprofile/libop/op_cpu_type.h,v -retrieving revision 1.25 -retrieving revision 1.26 -diff -u -a -p -r1.25 -r1.26 ---- libop/op_cpu_type.h 17 Oct 2005 23:35:00 -0000 1.25 -+++ libop/op_cpu_type.h 22 Feb 2006 14:36:40 -0000 1.26 -@@ -41,6 +41,7 @@ typedef enum { +--- libop/op_cpu_type.h ++++ libop/op_cpu_type.h +@@ -41,6 +41,7 @@ CPU_ARM_XSCALE2, /**< ARM XScale 2 */ CPU_PPC64_POWER4, /**< ppc64 POWER4 family */ CPU_PPC64_POWER5, /**< ppc64 POWER5 family */ @@ -2558,15 +2540,9 @@ CPU_PPC64_970, /**< ppc64 970 family */ CPU_MIPS_24K, /**< MIPS 24K */ CPU_MIPS_R10000, /**< MIPS R10000 */ -Index: libop/op_events.c -=================================================================== -RCS file: /cvsroot/oprofile/oprofile/libop/op_events.c,v -retrieving revision 1.68 -retrieving revision 1.69 -diff -u -a -p -r1.68 -r1.69 ---- libop/op_events.c 17 Oct 2005 23:35:00 -0000 1.68 -+++ libop/op_events.c 22 Feb 2006 14:36:40 -0000 1.69 -@@ -643,6 +643,7 @@ char const * find_mapping_for_event(u32 +--- libop/op_events.c ++++ libop/op_events.c +@@ -648,6 +648,7 @@ case CPU_PPC64_970: case CPU_PPC64_POWER4: case CPU_PPC64_POWER5: @@ -2574,7 +2550,7 @@ if (!fp) { fprintf(stderr, "oprofile: could not open event mapping file %s\n", filename); exit(EXIT_FAILURE); -@@ -782,6 +783,7 @@ void op_default_event(op_cpu cpu_type, s +@@ -787,6 +788,7 @@ case CPU_PPC64_970: case CPU_PPC64_POWER4: case CPU_PPC64_POWER5: @@ -2582,15 +2558,9 @@ descr->name = "CYCLES"; break; -Index: utils/opcontrol -=================================================================== -RCS file: /cvsroot/oprofile/oprofile/utils/opcontrol,v -retrieving revision 1.126 -retrieving revision 1.127 -diff -u -a -p -r1.126 -r1.127 ---- utils/opcontrol 10 Feb 2006 14:18:13 -0000 1.126 -+++ utils/opcontrol 22 Feb 2006 14:36:41 -0000 1.127 -@@ -998,7 +998,7 @@ set_ctr_param() +--- utils/opcontrol ++++ utils/opcontrol +@@ -933,7 +933,7 @@ check_event_mapping_data() { @@ -2599,15 +2569,9 @@ MMCR0=`echo $EVENT_STR | awk '{print $2}'` MMCR1=`echo $EVENT_STR | awk '{print $3}'` MMCRA=`echo $EVENT_STR | awk '{print $4}'` -Index: utils/ophelp.c -=================================================================== -RCS file: /cvsroot/oprofile/oprofile/utils/ophelp.c,v -retrieving revision 1.4 -retrieving revision 1.5 -diff -u -a -p -r1.4 -r1.5 ---- utils/ophelp.c 17 Oct 2005 23:35:00 -0000 1.4 -+++ utils/ophelp.c 22 Feb 2006 14:36:41 -0000 1.5 -@@ -411,6 +411,7 @@ int main(int argc, char const * argv[]) +--- utils/ophelp.c ++++ utils/ophelp.c +@@ -413,6 +413,7 @@ case CPU_PPC64_POWER4: case CPU_PPC64_POWER5: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit nautilus-share
by root＠suse.de 07 May '06

07 May '06

Hello community, here is the log from the commit of package nautilus-share checked in at Sun May 7 16:26:40 CEST 2006. -------- --- GNOME/nautilus-share/nautilus-share.changes 2006-02-22 01:56:55.000000000 +0100 +++ STABLE/nautilus-share/nautilus-share.changes 2006-05-03 23:42:01.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 3 23:39:33 CEST 2006 - federico(a)novell.com + +- Added nautilus-share-170212-restore-modified-permissions.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=170212. We now restore + the permissions of a folder when unsharing it. + +------------------------------------------------------------------- New: ---- nautilus-share-170212-restore-modified-permissions.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus-share.spec ++++++ --- /var/tmp/diff_new_pack.bUzUlG/_old 2006-05-07 16:26:28.000000000 +0200 +++ /var/tmp/diff_new_pack.bUzUlG/_new 2006-05-07 16:26:28.000000000 +0200 @@ -13,7 +13,7 @@ Name: nautilus-share BuildRequires: eel-devel gnome-patch-translation gnutls-devel intltool libgnomeprintui-devel libwnck-devel mDNSResponder-devel nautilus-devel perl-XML-Parser update-desktop-files Version: 0.6.4 -Release: 17 +Release: 30 URL: http://gentoo.ovibes.net/nautilus-share/ Group: Productivity/Networking/Samba License: GPL @@ -22,6 +22,7 @@ Patch: %{name}-include.patch Patch1: nautilus-share-net-usershare.diff Patch2: nautilus-share-potfiles.patch +Patch3: nautilus-share-170212-restore-modified-permissions.diff Requires: gnome-icon-theme samba >= 3.0.21a-4.2 Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,6 +63,7 @@ gnome-patch-translation-prepare %patch %patch1 -p0 +%patch3 -p1 # NOTE: You can ignore iter.* uninitialized warnings in nautilus-share.c: # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22197 gnome-patch-translation-update @@ -92,6 +94,10 @@ /opt/gnome/share/nautilus-share %changelog -n nautilus-share +* Wed May 03 2006 - federico(a)novell.com +- Added nautilus-share-170212-restore-modified-permissions.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=170212. We now restore + the permissions of a folder when unsharing it. * Wed Feb 22 2006 - federico(a)novell.com - Updated nautilus-share-net-usershare.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=152552. Now we don't ++++++ nautilus-share-170212-restore-modified-permissions.diff ++++++ 2006-05-03 Federico Mena Quintero <federico(a)novell.com> Fix https://bugzilla.novell.com/show_bug.cgi?id=170212 - restore the permissions of folders when unsharing them if we had to modify them. * src/nautilus-share.c (save_changed_permissions): New function; creates a GKeyFile in ~/.gnome2/nautilus-share-modified-permissions to save a list of the folders for which we had to add permissions. (restore_saved_permissions): New function; the counterpart to restore_saved_permissions(). Restores the permissions of a directory. (confirm_sharing_permissions): Call save_changed_permissions() after chmod() succeeds. Return an enum rather than a boolean. (property_page_commit): Call restore_saved_permissions() if we are unsharing a folder, or if we failed to share the folder. Index: nautilus-share/src/nautilus-share.c =================================================================== RCS file: /cvsroot/nautilus-share/src/nautilus-share.c,v retrieving revision 1.17 diff -u -r1.17 nautilus-share.c --- nautilus-share/src/nautilus-share.c 22 Feb 2006 00:10:23 -0000 1.17 +++ nautilus-share/src/nautilus-share.c 3 May 2006 21:16:42 -0000 @@ -56,6 +56,7 @@ #include "shares.h" + static GObjectClass *parent_class; /* Structure to hold all the information for a share's property page. If @@ -252,7 +253,124 @@ gtk_widget_destroy (dialog); } -static gboolean +static char * +get_key_file_path (void) +{ + return g_build_filename (g_get_home_dir (), ".gnome2", "nautilus-share-modified-permissions", NULL); +} + +static void +save_key_file (const char *filename, GKeyFile *key_file) +{ + char *contents; + gsize length; + + /* NULL GError */ + contents = g_key_file_to_data (key_file, &length, NULL); + if (!contents) + return; + + /* NULL GError */ + g_file_set_contents (filename, contents, length, NULL); + + g_free (contents); +} + +static void +save_changed_permissions (const char *path, gboolean need_r, gboolean need_w, gboolean need_x) +{ + GKeyFile *key_file; + char *key_file_path; + + key_file = g_key_file_new (); + key_file_path = get_key_file_path (); + + /* NULL GError + * + * We don't check the return value of this. If the file doesn't exist, we'll + * simply want to create it. + */ + g_key_file_load_from_file (key_file, key_file_path, 0, NULL); + + g_key_file_set_boolean (key_file, path, "need_r", need_r); + g_key_file_set_boolean (key_file, path, "need_w", need_w); + g_key_file_set_boolean (key_file, path, "need_x", need_x); + + save_key_file (key_file_path, key_file); + + g_key_file_free (key_file); + g_free (key_file_path); +} + +static void +remove_permissions (const char *path, gboolean need_r, gboolean need_w, gboolean need_x) +{ + struct stat st; + mode_t new_mode; + + if (!need_r && !need_w && !need_x) + return; + + if (stat (path, &st) != 0) + return; + + new_mode = st.st_mode; + + if (need_r) + new_mode &= ~S_IROTH; + + if (need_w) + new_mode &= ~S_IWOTH; + + if (need_x) + new_mode &= ~S_IXOTH; + + /* Bleah, no error checking */ + chmod (path, new_mode); +} + +static void +restore_saved_permissions (const char *path) +{ + GKeyFile *key_file; + char *key_file_path; + + key_file = g_key_file_new (); + key_file_path = get_key_file_path (); + + if (!g_key_file_load_from_file (key_file, key_file_path, 0, NULL)) + goto out; + + if (g_key_file_has_group (key_file, path)) + { + gboolean need_r, need_w, need_x; + + /* NULL GError */ + need_r = g_key_file_get_boolean (key_file, path, "need_r", NULL); + need_w = g_key_file_get_boolean (key_file, path, "need_w", NULL); + need_x = g_key_file_get_boolean (key_file, path, "need_x", NULL); + + remove_permissions (path, need_r, need_w, need_x); + + /* NULL GError */ + g_key_file_remove_group (key_file, path, NULL); + + save_key_file (key_file_path, key_file); + } + + out: + + g_key_file_free (key_file); + g_free (key_file_path); +} + +typedef enum { + CONFIRM_CANCEL_OR_ERROR, + CONFIRM_NO_MODIFICATIONS, + CONFIRM_MODIFIED +} ConfirmPermissionsStatus; + +static ConfirmPermissionsStatus confirm_sharing_permissions (GtkWidget *widget, const char *path, gboolean is_shared, gboolean is_writable) { struct stat st; @@ -262,10 +380,10 @@ gboolean need_x; if (!is_shared) - return TRUE; + return CONFIRM_NO_MODIFICATIONS; if (stat (path, &st) != 0) - return TRUE; /* We'll just let "net usershare" give back an error if the file disappears */ + return CONFIRM_NO_MODIFICATIONS; /* We'll just let "net usershare" give back an error if the file disappears */ mode = st.st_mode; new_mode = mode; @@ -283,16 +401,23 @@ if (need_r || need_w || need_x) { if (!message_confirm_missing_permissions (widget, path, need_r, need_w, need_x)) - return FALSE; + return CONFIRM_CANCEL_OR_ERROR; if (chmod (path, new_mode) != 0) { error_when_changing_permissions (widget, path); - return FALSE; + return CONFIRM_CANCEL_OR_ERROR; } + + save_changed_permissions (path, need_r, need_w, need_x); + + return CONFIRM_MODIFIED; } + else + return CONFIRM_NO_MODIFICATIONS; - return TRUE; + g_assert_not_reached (); + return CONFIRM_CANCEL_OR_ERROR; } static gboolean @@ -300,6 +425,7 @@ { gboolean is_shared; ShareInfo share_info; + ConfirmPermissionsStatus status; GError *error; gboolean retval; @@ -310,7 +436,8 @@ share_info.comment = (char *) gtk_entry_get_text (GTK_ENTRY (page->entry_share_comment)); share_info.is_writable = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->checkbutton_share_rw_ro)); - if (!confirm_sharing_permissions (page->main, page->path, is_shared, share_info.is_writable)) + status = confirm_sharing_permissions (page->main, page->path, is_shared, share_info.is_writable); + if (status == CONFIRM_CANCEL_OR_ERROR) return FALSE; /* the user didn't want us to change his folder's permissions */ error = NULL; @@ -320,6 +447,10 @@ { property_page_set_error (page, error->message); g_error_free (error); + + /* Since the operation failed, we restore things to the way they were */ + if (status == CONFIRM_MODIFIED) + restore_saved_permissions (page->path); } else { @@ -327,6 +458,9 @@ nautilus_file_info_invalidate_extension_info (page->fileinfo); } + if (!is_shared) + restore_saved_permissions (page->path); + return retval; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0