commit zmd

1 May 2006

Hello community,

here is the log from the commit of package zmd
checked in at Mon May 1 21:04:04 CEST 2006.

--------

--- zmd/zmd.changes	2006-04-27 09:29:59.000000000 +0200
+++ STABLE/zmd/zmd.changes	2006-05-01 17:56:37.000000000 +0200
@@ -1,0 +2,9 @@
+Mon May  1 17:55:02 CEST 2006 - maw@suse.de
+
+- New source drop (r27683) which:
+- Marks a few bundle methods as view
+- Allows RCEService to resume from sleep correctly.
+
+- Remove the patch aj added on 27 April, as it is now in svn.
+
+-------------------------------------------------------------------

Old:
----
  zmd.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.obV45c/_old	2006-05-01 21:03:41.000000000 +0200
+++ /var/tmp/diff_new_pack.obV45c/_new	2006-05-01 21:03:41.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:        27
+Release:        31
 License:        LGPL
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
@@ -22,7 +22,6 @@
 Patch1:         verified-certs.patch
 Patch2:         dont-run-transaction-test.patch
 Patch3:         zmd-networkmanager-reconnect.diff
-Patch4:         zmd.patch
 Summary:        Novell ZENworks Linux Management daemon
 Group:          System/Daemons
 Autoreqprov:    on
@@ -69,7 +68,6 @@
 %patch1
 %patch2
 %patch3
-%patch4 -p1
 
 %build
 libtoolize -f
@@ -157,6 +155,11 @@
 # %{_libdir}/monodoc/sources/*
 
 %changelog -n zmd
+* Mon May 01 2006 - maw@suse.de
+- New source drop (r27683) which:
+- Marks a few bundle methods as view
+- Allows RCEService to resume from sleep correctly.
+- Remove the patch aj added on 27 April, as it is now in svn.
 * Thu Apr 27 2006 - aj@suse.de
 - Apply patch from Chris Rivera to handle scripts correctly
   (#169805).

++++++ zmd-7.1.1.0.tar.bz2 ++++++
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-26 17:05:40.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog	2006-04-28 15:33:41.000000000 +0200
@@ -1,3 +1,23 @@
+2006-04-28  Tambet Ingo  <tambet@ximian.com>
+
+	* linux/RemotePackageManager.cs: Mark QueryLatest with "view"
+	privilege. Fixes #170347.
+
+2006-04-27  James Willcox  <james@ximian.com>
+
+	* linux/SqlPackage.cs: write SqlPackage.RemoteFileName into the
+	database, makes RCEService actually work after resuming from sleep.
+
+2006-04-26  James Willcox  <james@ximian.com>
+
+	* linux/red-carpet-backend/yum-xml.c: ignore packages with archs
+	that we can't handle.
+
+2006-04-26  Chris Rivera  <cmr@ximian.com>
+
+	* linux/RedCarpetBackend.cs: handle looking up Messages and Scripts
+	after dependency resolution
+
 2006-04-26  James Willcox  <james@ximian.com>
 
 	* linux/ResolvableCatalog.cs: when adding packages, don't search the
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs
--- old/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs	2006-04-26 17:05:40.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs	2006-04-26 21:21:19.000000000 +0200
@@ -1033,7 +1033,7 @@
             }
 
             private static IResolvable GetResolvableById (Int64 id) {
-                // FIXME: This isn't very efficient and it works onyl with packages and patches
+                // FIXME: This isn't very efficient
 
                 // First, look at existing packages.
                 foreach (Package package in PackageManager.Query ("Id", QueryType.Equal, id))
@@ -1044,7 +1044,19 @@
                 if (ret != null)
                     return ret;
 
-                return Patch.GetById (id);
+                Patch patch = Patch.GetById (id);
+                if (patch != null)
+                    return patch;
+
+                Message msg = Message.GetById (id);
+                if (msg != null)
+                    return msg;
+
+                Script script = Script.GetById (id);
+                if (script != null)
+                    return script;
+
+                return null;
             }
         }
     }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs new/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs
--- old/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs	2006-04-21 21:42:45.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RemotePackageManager.cs	2006-04-28 15:33:41.000000000 +0200
@@ -145,6 +145,7 @@
             return GetPackageInfoArray (PackageManager.Query (query));
         }
 
+        [Privilege ("view")]
         public PackageInfo[] QueryLatest (IList query) {
             return GetPackageInfoArray (PackageManager.QueryLatest (query));
         }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/SqlPackage.cs new/zmd-7.1.1.0/modules/linux/SqlPackage.cs
--- old/zmd-7.1.1.0/modules/linux/SqlPackage.cs	2006-04-25 23:00:02.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/SqlPackage.cs	2006-04-27 18:37:35.000000000 +0200
@@ -276,6 +276,7 @@
             private IDataParameter resolvableId;
             private IDataParameter summary;
             private IDataParameter description;
+            private IDataParameter packageUrl;
             private IDataParameter packageFilename;
             private IDataParameter fileSize;
             private IDataParameter installOnly;
@@ -316,9 +317,9 @@
                 // package_details table
 
                 sql = 
-                    "INSERT INTO package_details (resolvable_id, summary, description, package_filename," +
-                    "                             file_size, install_only) " +
-                    "VALUES (?, ?, ?, ?, ?, ?)";
+                    "INSERT INTO package_details (resolvable_id, summary, description, package_url," +
+                    "                             package_filename, file_size, install_only) " +
+                    "VALUES (?, ?, ?, ?, ?, ?, ?)";
 
                 pkgCommand = (SqliteCommand) Database.Connection.CreateCommand ();
                 pkgCommand.CommandText = sql;
@@ -326,6 +327,7 @@
                 resolvableId    = new SqliteParameter ("resolvable_id", DbType.Int64);
                 summary         = new SqliteParameter ("summary", DbType.String);
                 description     = new SqliteParameter ("description", DbType.String);
+                packageUrl      = new SqliteParameter ("package_url", DbType.String);
                 packageFilename = new SqliteParameter ("package_filename", DbType.String);
                 fileSize          = new SqliteParameter ("file_size", DbType.Int32);
                 installOnly       = new SqliteParameter ("install_only", DbType.Int32);
@@ -333,6 +335,7 @@
                 pkgCommand.Parameters.Add (resolvableId);
                 pkgCommand.Parameters.Add (summary);
                 pkgCommand.Parameters.Add (description);
+                pkgCommand.Parameters.Add (packageUrl);
                 pkgCommand.Parameters.Add (packageFilename);
                 pkgCommand.Parameters.Add (fileSize);
                 pkgCommand.Parameters.Add (installOnly);
@@ -386,6 +389,13 @@
                 resolvableId.Value = package.Id;
                 summary.Value = Database.SqlString (package.Summary);
                 description.Value = Database.SqlString (package.Description);
+
+                if (package is SqlPackage) {
+                    packageUrl.Value = Database.SqlString ((package as SqlPackage).RemoteFileName);
+                } else {
+                    packageUrl.Value = null;
+                }
+
                 packageFilename.Value = Database.SqlString (package.FileName);
                 fileSize.Value = package.FileSize;
                 installOnly.Value = Convert.ToInt32 (package.IsInstallOnly);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/red-carpet-backend/yum-xml.c new/zmd-7.1.1.0/modules/linux/red-carpet-backend/yum-xml.c
--- old/zmd-7.1.1.0/modules/linux/red-carpet-backend/yum-xml.c	2006-03-22 22:08:01.000000000 +0100
+++ new/zmd-7.1.1.0/modules/linux/red-carpet-backend/yum-xml.c	2006-04-27 18:37:35.000000000 +0200
@@ -29,6 +29,8 @@
     RCPackageUpdate *current_update;
     RCPackageDepSList **current_dep_list;
 
+    GSList *arch_compat_list;
+
     char *text_buffer;
 };
 
@@ -358,10 +360,14 @@
         p->install_only = is_install_only (name);
     } else if (!strcmp (name, "arch")) {
         /* Ignore source packages */
-        if (!strcmp (ctx->text_buffer, "src"))
+        if (!strcmp (ctx->text_buffer, "src")) {
             ctx->ignore_package = TRUE;
-        else
+        } else {
             p->spec.arch = rc_arch_from_string (rc_xml_strip (ctx->text_buffer));
+            if (rc_arch_get_compat_score (ctx->arch_compat_list, p->spec.arch) < 0) {
+                ctx->ignore_package = TRUE;
+            }
+        }
     } else if (!strcmp (name, "summary")) {
         p->summary = rc_xml_strip (ctx->text_buffer);
         ctx->text_buffer = NULL;
@@ -543,6 +549,7 @@
     }
 
     g_free (ctx->text_buffer);
+    g_slist_free (ctx->arch_compat_list);
 
     all_packages = ctx->all_packages;
 
@@ -558,6 +565,7 @@
 
     ctx = g_new0(RCDYumSAXContext, 1);
     ctx->channel = channel;
+    ctx->arch_compat_list = rc_arch_get_compat_list (rc_arch_get_system_arch ());
 
     if (getenv ("RC_SPEW_XML"))
         rc_debug (RC_DEBUG_LEVEL_ALWAYS, "* Context created (%p)", ctx);
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-04-26 20:48:54.000000000 +0200
+++ new/zmd-7.1.1.0/po/de_DE.po	2006-05-01 17:33:34.000000000 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-26 14:48-0400\n"
+"POT-Creation-Date: 2006-05-01 11:33-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <smaher@novell.com>\n"
 "Language-Team: LANGUAGE <language@novell.com>\n"
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-04-26 20:48:55.000000000 +0200
+++ new/zmd-7.1.1.0/po/en_US.po	2006-05-01 17:33:34.000000000 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-26 14:48-0400\n"
+"POT-Creation-Date: 2006-05-01 11:33-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <smaher@novell.com>\n"
 "Language-Team: LANGUAGE <language@novell.com>\n"
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-04-26 20:48:55.000000000 +0200
+++ new/zmd-7.1.1.0/po/es_ES.po	2006-05-01 17:33:34.000000000 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-26 14:48-0400\n"
+"POT-Creation-Date: 2006-05-01 11:33-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <smaher@novell.com>\n"
 "Language-Team: LANGUAGE <language@novell.com>\n"
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-04-26 20:48:55.000000000 +0200
+++ new/zmd-7.1.1.0/po/fr_FR.po	2006-05-01 17:33:34.000000000 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-26 14:48-0400\n"
+"POT-Creation-Date: 2006-05-01 11:33-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <smaher@novell.com>\n"
 "Language-Team: LANGUAGE <language@novell.com>\n"
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-04-26 20:48:55.000000000 +0200
+++ new/zmd-7.1.1.0/po/pt_BR.po	2006-05-01 17:33:35.000000000 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-26 14:48-0400\n"
+"POT-Creation-Date: 2006-05-01 11:33-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <smaher@novell.com>\n"
 "Language-Team: LANGUAGE <language@novell.com>\n"
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-04-26 20:48:54.000000000 +0200
+++ new/zmd-7.1.1.0/po/zmd.pot	2006-05-01 17:33:34.000000000 +0200
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-26 14:48-0400\n"
+"POT-Creation-Date: 2006-05-01 11:33-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
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-26 20:48:17.000000000 +0200
+++ new/zmd-7.1.1.0/src/ChangeLog	2006-04-28 18:20:47.000000000 +0200
@@ -1,3 +1,7 @@
+2006-04-28  Chris Rivera  <cmr@ximian.com>
+
+	* RemoteBundleManager.cs: Mark a few bundle methods with the view priv.
+
 2006-04-26  Chris Rivera  <cmr@ximian.com>
 
 	* BundleManager.cs: lock the catalog list.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/RemoteBundleManager.cs new/zmd-7.1.1.0/src/RemoteBundleManager.cs
--- old/zmd-7.1.1.0/src/RemoteBundleManager.cs	2006-04-25 21:51:48.000000000 +0200
+++ new/zmd-7.1.1.0/src/RemoteBundleManager.cs	2006-04-28 18:12:42.000000000 +0200
@@ -149,6 +149,7 @@
             return (Catalog) catalogRef.Target;
         }
         
+        [Privilege ("view")]
         public BundleInfo[] GetUpgrades (CatalogInfo info) {
             return GetBundleInfo (BundleManager.GetUpgrades (GetCatalog (info)));
         }
@@ -158,14 +159,17 @@
             return GetBundleInfo (BundleManager.GetUpgrades ());
         }
 
+        [Privilege ("view")]
         public BundleInfo LookupBundle (string name) {
             return GetBundleInfo (BundleManager.LookupBundle (name));
         }
         
+        [Privilege ("view")]
         public BundleInfo LookupBundle (string name, bool installed) {
             return GetBundleInfo (BundleManager.LookupBundle (name, installed));
         }
 
+        [Privilege ("view")]
         public CatalogInfo LookupCatalog (string name) {
             return GetCatalogInfo (BundleManager.LookupCatalog (name));
         }


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)