Hello community,
here is the log from the commit of package zmd
checked in at Wed Apr 5 01:06:08 CEST 2006.
--------
--- zmd/zmd.changes 2006-04-01 00:15:34.000000000 +0200
+++ zmd/zmd.changes 2006-04-04 19:51:53.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 4 18:45:42 CEST 2006 - maw@suse.de
+
+- New source drop (r26656) which:
+- Has an updated copyright string in Daemon Health
+- Implements a service helper for service remover.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zmd.spec ++++++
--- /var/tmp/diff_new_pack.Acsslb/_old 2006-04-05 01:05:45.000000000 +0200
+++ /var/tmp/diff_new_pack.Acsslb/_new 2006-04-05 01:05:45.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
-Release: 36
+Release: 37
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-7.1.1.tar.bz2
@@ -156,6 +156,10 @@
# %{_libdir}/monodoc/sources/*
%changelog -n zmd
+* Tue Apr 04 2006 - maw@suse.de
+- New source drop (r26656) which:
+- Has an updated copyright string in Daemon Health
+- Implements a service helper for service remover.
* Fri Mar 31 2006 - maw@suse.de
- New source drop (r26565) which:
- Reverts lots of brokenness
++++++ zmd-7.1.1.tar.bz2 ++++++
++++ 11938 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/zmd-7.1.1/modules/ChangeLog new/zmd-7.1.1/modules/ChangeLog
--- old/zmd-7.1.1/modules/ChangeLog 2006-03-31 18:52:53.000000000 +0200
+++ new/zmd-7.1.1/modules/ChangeLog 2006-04-04 16:58:27.000000000 +0200
@@ -1,3 +1,49 @@
+2006-04-04 Dan Mills
+
+ * linux/Backend.cs:
+ * linux/RedCarpetBackend.cs:
+
+ Implement a "service-delete helper".
+
+ * linux/ZyppService.cs:
+ * linux/YumService.cs:
+ * linux/NUService.cs:
+
+ Call Backend.Current.ServiceDelete when the service is being
+ removed.
+
+ * linux/ResolvableBase.cs (ReadDependencies):
+ * linux/SqlPackage.cs (ReadDependencies):
+
+ Parse the dep_target column.
+
+ * linux/SharedInterfaces.cs (ResolvableType): Add more dependency
+ target types.
+
+2006-04-03 Dan Mills
+
+ * linux/ResolvableBase.cs: Implement a new abstract class,
+ ResolvableBaseDB, which inherits from ResolvableBase but
+ implements the auto-getting of dependency information also in
+ SqlPackage.cs (which derives from Package, so it's there still).
+
+ * linux/Message.cs:
+ * linux/Product.cs:
+ * linux/Patch.cs:
+ * linux/Script.cs:
+ * linux/Pattern.cs:
+ * linux/ResolvableQuery.cs (Dep):
+
+ Derive from ResolvableBaseDB.
+
+ * linux/SharedInterfaces.cs: PackageDepsInfo ->
+ ResolvableDepsInfo, since we use it for resolvables in general
+ now. Add the ResolvableType to DepInfo.
+
+ * linux/RemotePackageManager.cs: PackageDepsInfo ->
+ ResolvableDepsInfo, and implement a GetPatchDependencyInfo call
+ for the client.
+
2006-03-31 Tambet Ingo
* linux/ResolvableBase.cs:
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/zmd-7.1.1/modules/linux/Backend.cs new/zmd-7.1.1/modules/linux/Backend.cs
--- old/zmd-7.1.1/modules/linux/Backend.cs 2006-03-30 22:36:23.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/Backend.cs 2006-04-04 16:58:27.000000000 +0200
@@ -28,6 +28,8 @@
public abstract void ParseMetadata (string type, string path, Catalog catalog);
+ public abstract void ServiceDelete ();
+
public abstract ResolverResult ResolveDependencies (IResolvable[] installs,
IResolvable[] upgrades,
IResolvable[] removals);
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/zmd-7.1.1/modules/linux/Message.cs new/zmd-7.1.1/modules/linux/Message.cs
--- old/zmd-7.1.1/modules/linux/Message.cs 2006-02-14 00:39:00.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/Message.cs 2006-04-03 20:04:03.000000000 +0200
@@ -5,7 +5,7 @@
namespace Novell.Zenworks.Zmd.Packaging {
- public class Message : ResolvableBase {
+ public class Message : ResolvableBaseDB {
private string content;
public string Content {
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/zmd-7.1.1/modules/linux/NUService.cs new/zmd-7.1.1/modules/linux/NUService.cs
--- old/zmd-7.1.1/modules/linux/NUService.cs 2006-03-09 23:13:53.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/NUService.cs 2006-04-04 16:58:27.000000000 +0200
@@ -99,6 +99,7 @@
if (!disposed) {
if (disposing) {
Remove ();
+ Backend.Current.ServiceDelete ();
}
disposed = true;
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/zmd-7.1.1/modules/linux/Patch.cs new/zmd-7.1.1/modules/linux/Patch.cs
--- old/zmd-7.1.1/modules/linux/Patch.cs 2006-03-28 03:10:57.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/Patch.cs 2006-04-03 20:04:03.000000000 +0200
@@ -7,7 +7,7 @@
namespace Novell.Zenworks.Zmd.Packaging {
- public class Patch : ResolvableBase {
+ public class Patch : ResolvableBaseDB {
private string patchId;
private DateTime creationTime;
private bool rebootRequired;
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/zmd-7.1.1/modules/linux/Pattern.cs new/zmd-7.1.1/modules/linux/Pattern.cs
--- old/zmd-7.1.1/modules/linux/Pattern.cs 2006-03-28 03:10:57.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/Pattern.cs 2006-04-03 20:04:03.000000000 +0200
@@ -5,7 +5,7 @@
namespace Novell.Zenworks.Zmd.Packaging {
- public class Pattern : ResolvableBase {
+ public class Pattern : ResolvableBaseDB {
private static ResolvableQuery engine = new ResolvableQuery (typeof (Pattern));
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/zmd-7.1.1/modules/linux/Product.cs new/zmd-7.1.1/modules/linux/Product.cs
--- old/zmd-7.1.1/modules/linux/Product.cs 2006-03-28 03:10:57.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/Product.cs 2006-04-03 20:04:03.000000000 +0200
@@ -5,7 +5,7 @@
namespace Novell.Zenworks.Zmd.Packaging {
- public class Product : ResolvableBase {
+ public class Product : ResolvableBaseDB {
private static ResolvableQuery engine = new ResolvableQuery (typeof (Product));
public static IEnumerable Query (IList query) {
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/zmd-7.1.1/modules/linux/RedCarpetBackend.cs new/zmd-7.1.1/modules/linux/RedCarpetBackend.cs
--- old/zmd-7.1.1/modules/linux/RedCarpetBackend.cs 2006-03-28 03:10:57.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/RedCarpetBackend.cs 2006-04-04 16:58:27.000000000 +0200
@@ -218,6 +218,16 @@
}
}
+ public override void ServiceDelete () {
+ try {
+ Database.GetLock (false);
+ RCProgress progress = new RCProgress (Path.Combine (prefix, "service-delete"), "");
+ progress.WaitForStop ();
+ } finally {
+ Database.ReleaseLock (false);
+ }
+ }
+
public override Package[] FindFile (string file) {
Int64[] ids = null;
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/zmd-7.1.1/modules/linux/RemotePackageManager.cs new/zmd-7.1.1/modules/linux/RemotePackageManager.cs
--- old/zmd-7.1.1/modules/linux/RemotePackageManager.cs 2006-03-28 03:10:57.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/RemotePackageManager.cs 2006-04-03 20:04:03.000000000 +0200
@@ -30,8 +30,8 @@
using Novell.Zenworks.Zmd.Public;
using Novell.Zenworks.Zmd.Packaging.Public;
using Novell.Zenworks.Utility;
-
using ResolverInfo = Novell.Zenworks.Zmd.Packaging.Public.ResolverInfo;
+using log4net;
namespace Novell.Zenworks.Zmd.Packaging {
@@ -108,6 +108,7 @@
public class RemotePackageManager : MarshalByRefObject, IPackageManager {
+ private static readonly ILog log = LogManager.GetLogger (typeof (RemotePackageManager));
private static Hashtable refs = new Hashtable ();
[Privilege ("view")]
@@ -162,12 +163,12 @@
}
[Privilege ("view")]
- public PackageDepsInfo GetPackageDependencyInfo (PackageInfo info) {
+ public ResolvableDepsInfo GetPackageDependencyInfo (PackageInfo info) {
Package pkg = GetPackage (info);
if (pkg == null)
- return PackageDepsInfo.Empty;
+ return ResolvableDepsInfo.Empty;
- PackageDepsInfo ret = new PackageDepsInfo ();
+ ResolvableDepsInfo ret = new ResolvableDepsInfo ();
ret.Provides = GetDepInfoArray (pkg.Provides);
ret.Requires = GetDepInfoArray (pkg.Requires);
@@ -407,6 +408,21 @@
}
[Privilege ("view")]
+ public ResolvableDepsInfo GetPatchDependencyInfo (PatchInfo info) {
+ Patch patch = GetPatch (info);
+ if (patch == null)
+ return ResolvableDepsInfo.Empty;
+
+ ResolvableDepsInfo ret = new ResolvableDepsInfo ();
+ ret.Provides = GetDepInfoArray (patch.Provides);
+ ret.Requires = GetDepInfoArray (patch.Requires);
+ ret.Conflicts = GetDepInfoArray (patch.Conflicts);
+ ret.Obsoletes = GetDepInfoArray (patch.Obsoletes);
+
+ return ret;
+ }
+
+ [Privilege ("view")]
public ResolvableInfo[] GetPatterns () {
return GetPatterns (null);
}
@@ -734,6 +750,7 @@
ResolvableDep dep = ResolvableDep.VersionFromString (info.Version);
dep.Name = info.Name;
dep.Operation = ResolvableDep.OperationFromString (info.Relation);
+ dep.Target = info.Target;
return dep;
}
@@ -746,11 +763,15 @@
info.Name = dep.Name;
info.Version = dep.VersionToString ();
info.Relation = ResolvableDep.OperationToString (dep.Operation);
+ info.Target = dep.Target;
return info;
}
private static DepInfo[] GetDepInfoArray (IEnumerable input) {
+ if (input == null)
+ return new DepInfo[0];
+
ArrayList list = new ArrayList ();
foreach (ResolvableDep dep in input) {
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/zmd-7.1.1/modules/linux/ResolvableBase.cs new/zmd-7.1.1/modules/linux/ResolvableBase.cs
--- old/zmd-7.1.1/modules/linux/ResolvableBase.cs 2006-03-31 18:52:53.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/ResolvableBase.cs 2006-04-04 16:58:27.000000000 +0200
@@ -144,4 +144,57 @@
resolvable.category = reader.GetString (offset + 11);
}
}
+
+ public abstract class ResolvableBaseDB : ResolvableBase {
+ public override ICollection Requires {
+ get { return ReadDependencies (SqlDep.Require); }
+ }
+
+ public override ICollection Provides {
+ get { return ReadDependencies (SqlDep.Provide); }
+ }
+
+ public override ICollection Conflicts {
+ get { return ReadDependencies (SqlDep.Conflict); }
+ }
+
+ public override ICollection Obsoletes {
+ get { return ReadDependencies (SqlDep.Obsolete); }
+ }
+
+ private ResolvableDep[] ReadDependencies (SqlDep type) {
+ string query = String.Format ("SELECT name, version, release, epoch, arch, relation, dep_target " +
+ "FROM dependencies " +
+ "WHERE resolvable_id = {0} AND dep_type = {1}",
+ id, (int) type);
+
+ ResolvableDepCollection deps = new ResolvableDepCollection ();
+
+ IDbCommand command = Database.Connection.CreateCommand ();
+ command.CommandText = query;
+ Database.GetLock (true);
+
+ try {
+ IDataReader reader = command.ExecuteReader ();
+ while (reader.Read ()) {
+ ResolvableDep dep = new ResolvableDep ();
+
+ dep.Name = reader.GetString (0);
+ dep.Epoch = reader.GetInt32 (3);
+ dep.Version = reader.GetString (1);
+ dep.Release = reader.GetString (2);
+ dep.Arch = (Arch) reader.GetInt32 (4);
+ dep.Operation = (ResolvableOperation) reader.GetInt32 (5);
+ dep.Target = (ResolvableType) reader.GetInt32 (6);
+
+ deps.Add (dep);
+ }
+ } finally {
+ Database.ReleaseLock (true);
+ command.Dispose ();
+ }
+
+ return deps.ToArray ();
+ }
+ }
}
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/zmd-7.1.1/modules/linux/ResolvableQuery.cs new/zmd-7.1.1/modules/linux/ResolvableQuery.cs
--- old/zmd-7.1.1/modules/linux/ResolvableQuery.cs 2006-03-28 03:10:57.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/ResolvableQuery.cs 2006-04-03 20:04:03.000000000 +0200
@@ -158,7 +158,7 @@
}
}
- private class Dep : ResolvableBase {
+ private class Dep : ResolvableBaseDB {
private ResolvableDep dep;
public Dep () {
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/zmd-7.1.1/modules/linux/Script.cs new/zmd-7.1.1/modules/linux/Script.cs
--- old/zmd-7.1.1/modules/linux/Script.cs 2006-02-14 00:39:00.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/Script.cs 2006-04-03 20:04:03.000000000 +0200
@@ -5,7 +5,7 @@
namespace Novell.Zenworks.Zmd.Packaging {
- public class Script : ResolvableBase {
+ public class Script : ResolvableBaseDB {
private string doScript;
private string undoScript;
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/zmd-7.1.1/modules/linux/SharedInterfaces.cs new/zmd-7.1.1/modules/linux/SharedInterfaces.cs
--- old/zmd-7.1.1/modules/linux/SharedInterfaces.cs 2006-03-28 03:10:57.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/SharedInterfaces.cs 2006-04-04 16:58:27.000000000 +0200
@@ -67,7 +67,7 @@
string[] FileList (PackageInfo pkg);
- PackageDepsInfo GetPackageDependencyInfo (PackageInfo pkg);
+ ResolvableDepsInfo GetPackageDependencyInfo (PackageInfo pkg);
PackageInfo[] FindPackageForFile (string filename);
@@ -123,6 +123,7 @@
PatchInfo GetLatestPatch (string name, bool subscribedOnly);
PatchInfo[] GetPatchUpdates ();
PatchInfo[] GetPatchUpdates (CatalogInfo info);
+ ResolvableDepsInfo GetPatchDependencyInfo (PatchInfo patch);
// Patterns
ResolvableInfo[] GetPatterns ();
@@ -168,7 +169,11 @@
Message = 2,
Patch = 3,
Pattern = 4,
- Product = 5
+ Product = 5,
+ Selection = 6,
+ Language = 7,
+ Atom = 8,
+ SrcPackage = 9
}
public enum ResolvableStatus {
@@ -250,18 +255,19 @@
public string Name;
public string Version;
public string Relation;
+ public ResolvableType Target;
public static DepInfo Empty = new DepInfo ();
}
[Serializable]
- public struct PackageDepsInfo {
+ public struct ResolvableDepsInfo {
public DepInfo[] Provides;
public DepInfo[] Requires;
public DepInfo[] Conflicts;
public DepInfo[] Obsoletes;
- public static PackageDepsInfo Empty = new PackageDepsInfo ();
+ public static ResolvableDepsInfo Empty = new ResolvableDepsInfo ();
}
[Serializable]
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/zmd-7.1.1/modules/linux/SqlPackage.cs new/zmd-7.1.1/modules/linux/SqlPackage.cs
--- old/zmd-7.1.1/modules/linux/SqlPackage.cs 2006-03-31 18:52:53.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/SqlPackage.cs 2006-04-04 16:58:27.000000000 +0200
@@ -3,6 +3,7 @@
using Mono.Data.SqliteClient;
using System.Collections;
using Novell.Zenworks.Zmd.Public;
+using Novell.Zenworks.Zmd.Packaging.Public;
namespace Novell.Zenworks.Zmd.Packaging {
@@ -35,7 +36,7 @@
}
private ResolvableDep[] ReadDependencies (SqlDep type) {
- string query = String.Format ("SELECT name, version, release, epoch, arch, relation " +
+ string query = String.Format ("SELECT name, version, release, epoch, arch, relation, dep_target " +
"FROM dependencies " +
"WHERE resolvable_id = {0} AND dep_type = {1}",
id, (int) type);
@@ -57,6 +58,7 @@
dep.Release = reader.GetString (2);
dep.Arch = (Arch) reader.GetInt32 (4);
dep.Operation = (ResolvableOperation) reader.GetInt32 (5);
+ dep.Target = (ResolvableType) reader.GetInt32 (6);
deps.Add (dep);
}
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/zmd-7.1.1/modules/linux/YumService.cs new/zmd-7.1.1/modules/linux/YumService.cs
--- old/zmd-7.1.1/modules/linux/YumService.cs 2006-03-30 22:36:23.000000000 +0200
+++ new/zmd-7.1.1/modules/linux/YumService.cs 2006-04-04 16:58:27.000000000 +0200
@@ -94,6 +94,7 @@
if (disposing) {
Remove ();
RedCarpetBackend.UpdatePatchStatus ();
+ Backend.Current.ServiceDelete ();
}
disposed = true;
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/zmd-7.1.1/modules/linux/ZyppService.cs new/zmd-7.1.1/modules/linux/ZyppService.cs
--- old/zmd-7.1.1/modules/linux/ZyppService.cs 2006-03-13 17:55:33.000000000 +0100
+++ new/zmd-7.1.1/modules/linux/ZyppService.cs 2006-04-04 16:58:27.000000000 +0200
@@ -78,6 +78,7 @@
if (!disposed) {
if (disposing) {
Remove ();
+ Backend.Current.ServiceDelete ();
}
disposed = true;
Binary files old/zmd-7.1.1/po/de_DE.gmo and new/zmd-7.1.1/po/de_DE.gmo differ
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/zmd-7.1.1/po/de_DE.po new/zmd-7.1.1/po/de_DE.po
--- old/zmd-7.1.1/po/de_DE.po 2006-03-31 22:44:49.000000000 +0200
+++ new/zmd-7.1.1/po/de_DE.po 2006-04-01 19:59:42.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-31 14:44-0600\n"
+"POT-Creation-Date: 2006-04-01 12:59-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Binary files old/zmd-7.1.1/po/en_US.gmo and new/zmd-7.1.1/po/en_US.gmo differ
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/zmd-7.1.1/po/en_US.po new/zmd-7.1.1/po/en_US.po
--- old/zmd-7.1.1/po/en_US.po 2006-03-31 22:44:49.000000000 +0200
+++ new/zmd-7.1.1/po/en_US.po 2006-04-01 19:59:42.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-31 14:44-0600\n"
+"POT-Creation-Date: 2006-04-01 12:59-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Binary files old/zmd-7.1.1/po/es_ES.gmo and new/zmd-7.1.1/po/es_ES.gmo differ
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/zmd-7.1.1/po/es_ES.po new/zmd-7.1.1/po/es_ES.po
--- old/zmd-7.1.1/po/es_ES.po 2006-03-31 22:44:49.000000000 +0200
+++ new/zmd-7.1.1/po/es_ES.po 2006-04-01 19:59:42.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-31 14:44-0600\n"
+"POT-Creation-Date: 2006-04-01 12:59-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Binary files old/zmd-7.1.1/po/fr_FR.gmo and new/zmd-7.1.1/po/fr_FR.gmo differ
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/zmd-7.1.1/po/fr_FR.po new/zmd-7.1.1/po/fr_FR.po
--- old/zmd-7.1.1/po/fr_FR.po 2006-03-31 22:44:49.000000000 +0200
+++ new/zmd-7.1.1/po/fr_FR.po 2006-04-01 19:59:42.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-31 14:44-0600\n"
+"POT-Creation-Date: 2006-04-01 12:59-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Binary files old/zmd-7.1.1/po/pt_BR.gmo and new/zmd-7.1.1/po/pt_BR.gmo differ
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/zmd-7.1.1/po/pt_BR.po new/zmd-7.1.1/po/pt_BR.po
--- old/zmd-7.1.1/po/pt_BR.po 2006-03-31 22:44:49.000000000 +0200
+++ new/zmd-7.1.1/po/pt_BR.po 2006-04-01 19:59:42.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-31 14:44-0600\n"
+"POT-Creation-Date: 2006-04-01 12:59-0500\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 --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/zmd-7.1.1/src/BuildConfig.cs new/zmd-7.1.1/src/BuildConfig.cs
--- old/zmd-7.1.1/src/BuildConfig.cs 2006-03-31 22:44:44.000000000 +0200
+++ new/zmd-7.1.1/src/BuildConfig.cs 2006-04-04 18:38:49.000000000 +0200
@@ -1,14 +1,14 @@
namespace Novell.Zenworks.Zmd {
public class BuildConfig {
- public const string PREFIX = "/usr/local";
- public const string SYSCONFDIR = "/usr/local/etc";
- public const string DATADIR = "/usr/local/share";
- public const string LIBDIR = "/usr/local/lib";
- public const string LIBDIR_MANAGED = "/usr/local" + "/lib";
- public const string LOCALSTATEDIR = "/usr/local/var";
+ 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 LOGDIR = "/usr/local/var/log";
+ public const string LOGDIR = "/opt/zypp/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 --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/zmd-7.1.1/src/ChangeLog new/zmd-7.1.1/src/ChangeLog
--- old/zmd-7.1.1/src/ChangeLog 2006-03-31 18:52:52.000000000 +0200
+++ new/zmd-7.1.1/src/ChangeLog 2006-04-04 16:58:26.000000000 +0200
@@ -1,3 +1,17 @@
+2006-04-04 Tambet Ingo
+
+ * DaemonHealth.cs: Update the copyright string we return to "ping"
+ command. Fixed #162911.
+
+2006-04-01 Chris Rivera
+
+ * Makefile.am: add BuildConfig.cs to CLEANFILES
+
+2006-03-31 James Willcox
+
+ * util.c: add signal handling stuff
+ * UnixSignal.cs: use the unmanaged signal handling bits
+
2006-03-31 Tambet Ingo
* Identity.cs (IsWellFormedUsername): Fix a typo, add '-' to the 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/zmd-7.1.1/src/DaemonHealth.cs new/zmd-7.1.1/src/DaemonHealth.cs
--- old/zmd-7.1.1/src/DaemonHealth.cs 2006-03-30 22:36:20.000000000 +0200
+++ new/zmd-7.1.1/src/DaemonHealth.cs 2006-04-04 16:58:26.000000000 +0200
@@ -55,7 +55,7 @@
DaemonInfo info;
info.Started = start;
- info.Version = String.Format ("ZMD {0}.{1}.{2}, Copyright (C) 2005 Novell, Inc.",
+ info.Version = String.Format ("ZMD {0}.{1}.{2}, Copyright (C) 2006 Novell, Inc.",
BuildConfig.MAJOR_VERSION,
BuildConfig.MINOR_VERSION,
BuildConfig.MICRO_VERSION);
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/zmd-7.1.1/src/Makefile.am new/zmd-7.1.1/src/Makefile.am
--- old/zmd-7.1.1/src/Makefile.am 2006-03-09 23:13:43.000000000 +0100
+++ new/zmd-7.1.1/src/Makefile.am 2006-04-01 19:51:22.000000000 +0200
@@ -274,6 +274,7 @@
CLEANFILES = \
zmd \
zmd_bin \
+ $(srcdir)/BuildConfig.cs \
$(ZMD_ASSEMBLIES) \
$(GAC_ASSEMBLIES)
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/zmd-7.1.1/src/Prefs.cs new/zmd-7.1.1/src/Prefs.cs
--- old/zmd-7.1.1/src/Prefs.cs 2006-03-30 22:36:20.000000000 +0200
+++ new/zmd-7.1.1/src/Prefs.cs 2006-03-29 02:26:06.000000000 +0200
@@ -564,7 +564,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) false;
+ this.default_value = (bool) true;
}
}
}
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/zmd-7.1.1/src/UnixSignal.cs new/zmd-7.1.1/src/UnixSignal.cs
--- old/zmd-7.1.1/src/UnixSignal.cs 2006-02-08 21:18:38.000000000 +0100
+++ new/zmd-7.1.1/src/UnixSignal.cs 2006-04-01 19:14:55.000000000 +0200
@@ -33,35 +33,22 @@
namespace Novell.Zenworks.Zmd {
public delegate void SignalHandler (Signum sig);
- public delegate void SignalRestorer ();
-
- [StructLayout(LayoutKind.Sequential)]
- internal struct SigActionData {
- public SignalHandler handler;
- public UInt64 flags;
- public SignalRestorer restorer;
- public UInt64 mask; // The actual struct has one long[2] type here but this works.
- public UInt64 mask2;
-
- public SigActionData (SignalHandler handler) {
- this.handler = handler;
- flags = 0;
- restorer = null;
- mask = 0;
- mask2 = 0;
- }
- }
public class UnixSignal {
private static readonly ILog log = LogManager.GetLogger (typeof (UnixSignal));
- private static bool dummy;
- private static Signum lastSignal;
+ private static SignalHandler handlerRef;
private static Hashtable handlers;
- [DllImport ("libc")]
- private static extern int sigaction (int signum, ref SigActionData action, IntPtr blah);
+ [DllImport ("zmdutil")]
+ private static extern void zmd_signal_handler_start (SignalHandler handler);
+
+ [DllImport ("zmdutil")]
+ private static extern void zmd_signal_handle (Signum sig);
+
+ [DllImport ("zmdutil")]
+ private static extern void zmd_signal_unhandle (Signum sig);
[DllImport ("libc")]
private static extern int sigemptyset (IntPtr sigs);
@@ -73,48 +60,27 @@
private static extern int pthread_sigmask (int how, IntPtr mask, IntPtr oldmask);
static UnixSignal () {
- // JIT the handler method now
- dummy = true;
- InternalHandler (0);
- dummy = false;
-
handlers = new Hashtable ();
- Thread eventThread = new Thread (new ThreadStart (SignalEventLoop));
- eventThread.IsBackground = true;
- eventThread.Start ();
+
+ handlerRef = new SignalHandler (InternalHandler);
+ zmd_signal_handler_start (handlerRef);
}
- private static void SignalEventLoop () {
- while (true) {
- Thread.Sleep (1000);
-
- Signum sig = lastSignal;
- lastSignal = 0;
-
- try {
- if ((int) sig > 0 && handlers[sig] != null) {
- SignalHandler handler = (SignalHandler) handlers[sig];
- handler (sig);
- }
- } catch (Exception e) {
- log.Info ("Exception in signal handler: " + e);
+ private static void InternalHandler (Signum sig) {
+ try {
+ if ((int) sig > 0 && handlers[sig] != null) {
+ SignalHandler handler = (SignalHandler) handlers[sig];
+ handler (sig);
}
+ } catch (Exception e) {
+ log.Error ("Exception in signal handler: " + e.Message, e);
}
}
- private static void InternalHandler (Signum sig) {
- if (dummy)
- return;
-
- lastSignal = sig;
- }
-
public static void RegisterHandler (Signum signal,
SignalHandler handler) {
handlers[signal] = handler;
-
- SigActionData data = new SigActionData (new SignalHandler (InternalHandler));
- sigaction ((int) signal, ref data, IntPtr.Zero);
+ zmd_signal_handle (signal);
}
public static void Block (Signum sig) {
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/zmd-7.1.1/src/util.c new/zmd-7.1.1/src/util.c
--- old/zmd-7.1.1/src/util.c 2006-02-28 18:41:48.000000000 +0100
+++ new/zmd-7.1.1/src/util.c 2006-04-01 19:14:55.000000000 +0200
@@ -2,10 +2,20 @@
#include
#include
#include
+#include
+
+#define PIPE_DATA "woo"
+#define PIPE_DATA_LEN 4
int zmd_get_socket_uid (int fd);
char *zmd_get_arch (void);
+typedef void (* SignalHandler) (int signum);
+
+static int signal_read_pipe;
+static int signal_write_pipe;
+static int last_signal;
+
int
zmd_get_socket_uid (int fd)
{
@@ -33,3 +43,52 @@
return NULL;
}
}
+
+static void
+signal_reader (SignalHandler handler)
+{
+ for (;;) {
+ fd_set fds;
+
+ FD_ZERO (&fds);
+ FD_SET (signal_read_pipe, &fds);
+
+ if (select (signal_read_pipe+1, &fds, NULL, NULL, NULL) > 0) {
+ int buf[PIPE_DATA_LEN];
+ read (signal_read_pipe, buf, PIPE_DATA_LEN);
+
+ handler (last_signal);
+ }
+ }
+}
+
+static void
+signal_handler (int signum)
+{
+ last_signal = signum;
+ write (signal_write_pipe, PIPE_DATA, PIPE_DATA_LEN);
+}
+
+void
+zmd_signal_handler_start (SignalHandler *handler)
+{
+ pthread_t thread;
+ int pipes[2];
+
+ pipe (pipes);
+ signal_read_pipe = pipes[0];
+ signal_write_pipe = pipes[1];
+ pthread_create (&thread, NULL, signal_reader, handler);
+}
+
+void
+zmd_signal_handle (int sig)
+{
+ signal (sig, signal_handler);
+}
+
+void
+zmd_signal_unhandle (int sig)
+{
+ signal (sig, SIG_DFL);
+}
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/zmd-7.1.1/zmd.conf new/zmd-7.1.1/zmd.conf
--- old/zmd-7.1.1/zmd.conf 2006-03-28 03:10:58.000000000 +0200
+++ new/zmd-7.1.1/zmd.conf 2006-03-22 17:08:44.000000000 +0100
@@ -1,9 +1,5 @@
[Server]
bind-ip=127.0.0.1
-<<<<<<< .mine
-remote-enabled=False
-=======
refresh-interval=86400
remote-enabled=false
->>>>>>> .r26285
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...