Hello community,
here is the log from the commit of package zmd
checked in at Wed Jun 21 17:55:21 CEST 2006.
--------
--- zmd/zmd.changes 2006-06-20 16:38:50.000000000 +0200
+++ zmd/zmd.changes 2006-06-21 17:24:03.000000000 +0200
@@ -1,0 +2,19 @@
+Wed Jun 21 17:22:39 CEST 2006 - thunder@suse.de
+
+- New source drop (r30777):
+- Hide username and password part of service uris if the caller
+ doesn't have 'superuser' privilege. Fixes zmd part of #186842.
+
+-------------------------------------------------------------------
+Wed Jun 21 17:15:59 CEST 2006 - thunder@suse.de
+
+- Added a patch to disable inventory by default.
+
+-------------------------------------------------------------------
+Wed Jun 21 16:06:28 CEST 2006 - thunder@suse.de
+
+- New source drop (r30771):
+- Reload system resolvables even if transaction fails. Fixes 186895.
+- Add "updateinfo" file type to repomd.xml.
+
+-------------------------------------------------------------------
New:
----
zmd-inventory-disable.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.jUJxFc/_old 2006-06-21 17:55:05.000000000 +0200
+++ /var/tmp/diff_new_pack.jUJxFc/_new 2006-06-21 17:55:05.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: dbus-1-mono libzypp-zmd-backend 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: 56
+Release: 57
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
@@ -28,6 +28,7 @@
Patch6: sysconfig-zmd.patch
Patch7: zmd-init.patch
Patch8: logrotate.patch
+Patch9: zmd-inventory-disable.patch
Summary: Novell ZENworks Linux Management daemon
Group: System/Daemons
Autoreqprov: on
@@ -79,6 +80,7 @@
%patch6
%patch7
%patch8
+%patch9
%build
libtoolize -f
@@ -171,6 +173,16 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Wed Jun 21 2006 - thunder@suse.de
+- New source drop (r30777):
+- Hide username and password part of service uris if the caller
+ doesn't have 'superuser' privilege. Fixes zmd part of #186842.
+* Wed Jun 21 2006 - thunder@suse.de
+- Added a patch to disable inventory by default.
+* Wed Jun 21 2006 - thunder@suse.de
+- New source drop (r30771):
+- Reload system resolvables even if transaction fails. Fixes 186895.
+- Add "updateinfo" file type to repomd.xml.
* Tue Jun 20 2006 - thunder@suse.de
- New source drop (r30715):
- For yum and nu services, don't use WebCache.Exists() at all.
++++++ 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-06-19 15:22:40.000000000 +0200
+++ new/zmd-7.1.1.0/ChangeLog 2006-06-21 02:29:50.000000000 +0200
@@ -1,3 +1,8 @@
+2006-06-20 Dan Mills
+
+ * build-buddy.conf: Use novell-zenworks-mono for all builds except
+ the 'devel' one.
+
2006-06-17 Dan Mills
* build-buddy.conf: Add a "devel" build with less strict
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-06-20 15:49:23.000000000 +0200
+++ new/zmd-7.1.1.0/modules/ChangeLog 2006-06-21 15:37:05.000000000 +0200
@@ -1,3 +1,12 @@
+2006-06-21 Tambet Ingo
+
+ * linux/RedCarpetBackend.cs: Reload system resolvables even if
+ transaction fails, sigh. Fixes #186895.
+
+ * linux/YumService.cs: Add "updateinfo" file type to repomd.xml. The
+ latest fedora updates tree has it (since yesterday) and our parse
+ choked on it.
+
2006-06-20 Tambet Ingo
* linux/YumService.cs: Revert the previous command and don't use
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-06-19 15:22:40.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/RedCarpetBackend.cs 2006-06-21 15:37:05.000000000 +0200
@@ -886,6 +886,14 @@
if (mediaChangeNeeded) {
log.Info ("Waiting for media change");
} else if (!success && !IsStopped) {
+
+ // Sigh. This is needed because "some" libraries have their
+ // own definition for a word "transaction"...
+ if (transFlags != TransactionFlags.DryRun &&
+ transFlags != TransactionFlags.DownloadOnly) {
+ Backend.Current.OnInstalledPackagesChanged ();
+ }
+
Fail (GetLastError ());
} else if (success) {
Update (99, "Finishing...");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/modules/linux/YumService.cs new/zmd-7.1.1.0/modules/linux/YumService.cs
--- old/zmd-7.1.1.0/modules/linux/YumService.cs 2006-06-20 15:49:23.000000000 +0200
+++ new/zmd-7.1.1.0/modules/linux/YumService.cs 2006-06-21 15:37:05.000000000 +0200
@@ -365,6 +365,9 @@
[XmlEnum (Name = "group")]
Group,
+ [XmlEnum (Name = "updateinfo")]
+ UpdateInfo,
+
// SuSE specific extensions
[XmlEnum (Name = "product")]
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-06-20 16:02:59.000000000 +0200
+++ new/zmd-7.1.1.0/po/zmd.pot 2006-06-21 16:52:31.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-20 10:02-0400\n"
+"POT-Creation-Date: 2006-06-21 10:52-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \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-06-19 20:15:11.000000000 +0200
+++ new/zmd-7.1.1.0/src/ChangeLog 2006-06-21 16:51:26.000000000 +0200
@@ -1,3 +1,9 @@
+2006-06-21 Tambet Ingo
+
+ * RemoteService.cs: Hide username and password part of service uris
+ if the caller doesn't have 'superuser' privilege. Fixes zmd part of
+ #186842.
+
2006-06-19 Tambet Ingo
* Daemon.cs:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-7.1.1.0/src/RemoteService.cs new/zmd-7.1.1.0/src/RemoteService.cs
--- old/zmd-7.1.1.0/src/RemoteService.cs 2006-05-31 19:42:56.000000000 +0200
+++ new/zmd-7.1.1.0/src/RemoteService.cs 2006-06-21 16:51:26.000000000 +0200
@@ -20,6 +20,7 @@
using System;
using System.Collections;
+using System.Security.Principal;
using Novell.Zenworks.Zmd.Public;
namespace Novell.Zenworks.Zmd {
@@ -40,7 +41,14 @@
public string Uri {
[Privilege ("view")]
- get { return service.Uri; }
+ get {
+ IPrincipal principal = IdentityManager.Instance.CurrentPrincipal;
+ if (principal != null && principal.IsInRole (PrivilegeManager.DefaultRequiredPrivilege) == true)
+ return service.Uri;
+
+ Uri uri = new Uri (service.Uri);
+ return UriToHiddenString (uri);
+ }
}
public string Name {
@@ -69,5 +77,16 @@
this.service = service;
}
+
+
+ private static string UriToHiddenString (Uri uri) {
+ string userInfo = uri.UserInfo;
+ string uriStr = uri.ToString ();
+
+ if (userInfo == String.Empty || userInfo == null)
+ return uriStr;
+
+ return uriStr.Replace (userInfo, "****");
+ }
}
}
++++++ zmd-inventory-disable.patch ++++++
--- src/Prefs.cs.orig 2006-06-21 10:28:04.000000000 -0400
+++ src/Prefs.cs 2006-06-21 10:28:35.000000000 -0400
@@ -584,7 +584,7 @@
this.description = GettextCatalog.GetString ("If true, inventory information will be collected and sent to the server");
this.category = GettextCatalog.GetString ("Server");
this.type = typeof (bool);
- this.default_value = (bool) true;
+ this.default_value = (bool) false;
}
}
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org