May 2006 - openSUSE Commits - openSUSE Mailing Lists

commit zmd-inventory
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package zmd-inventory checked in at Thu Jun 1 00:39:50 CEST 2006. -------- --- zmd-inventory/zmd-inventory.changes 2006-04-07 16:19:01.000000000 +0200 +++ zmd-inventory/zmd-inventory.changes 2006-06-01 00:15:53.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 1 00:15:30 CEST 2006 - maw(a)suse.de + +- New source drop (r29477) which: +- Implements software inventory for Novell Update services. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd-inventory.spec ++++++ --- /var/tmp/diff_new_pack.PkkjgR/_old 2006-06-01 00:39:42.000000000 +0200 +++ /var/tmp/diff_new_pack.PkkjgR/_new 2006-06-01 00:39:42.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: hwinfo-devel log4net mono-basic mono-data-sqlite mono-devel update-desktop-files zmd-devel URL: http://www.novell.com Version: 7.1.1.0 -Release: 1 +Release: 8 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 @@ -59,6 +59,9 @@ %{_prefix}/lib/zmd/modules/* %changelog -n zmd-inventory +* Thu Jun 01 2006 - maw(a)suse.de +- New source drop (r29477) which: +- Implements software inventory for Novell Update services. * Fri Apr 07 2006 - thunder(a)suse.de - New source drop (svn r26837): - Fix so it builds with latest zmd. ++++++ zmd-inventory-7.1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-inventory-7.1.1.0/src/ChangeLog new/zmd-inventory-7.1.1.0/src/ChangeLog --- old/zmd-inventory-7.1.1.0/src/ChangeLog 2006-04-07 16:09:22.000000000 +0200 +++ new/zmd-inventory-7.1.1.0/src/ChangeLog 2006-05-31 19:43:07.000000000 +0200 @@ -1,3 +1,16 @@ +2006-05-30 Dan Mills <thunder(a)ximian.com> + + * Makefile.am: Link with CookComputing.XmlRpc.dll (from the zmd + module directory), and add NUXmlRpcClient.cs. + + * NUInventory.cs: Flesh out software inventory. Should be pretty + much complete now; except for some severity strings that need to + be added to the comparison function. Hardware inventory still + MIA. + + * NUXmlRpcClient.cs: Interface and static class for talking to the + Novell Update XML-RPC inventory service. + 2006-04-07 Dan Mills <thunder(a)ximian.com> * SoftwareInventory.cs: PackageCollection -> ResolvableCatalog. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-inventory-7.1.1.0/src/Makefile.am new/zmd-inventory-7.1.1.0/src/Makefile.am --- old/zmd-inventory-7.1.1.0/src/Makefile.am 2006-03-30 06:26:25.000000000 +0200 +++ new/zmd-inventory-7.1.1.0/src/Makefile.am 2006-05-31 19:43:07.000000000 +0200 @@ -10,6 +10,7 @@ ASSEMBLIES = \ -r:System.Web.Services \ + -r:${zmdmoduledir}/CookComputing.XmlRpc.dll \ -pkg:zmd,zmd-package-management INVENTORY_SOURCES = \ @@ -21,7 +22,8 @@ Scanner.cs \ SoftwareInventory.cs \ Util.cs \ - NUInventory.cs + NUInventory.cs \ + NUXmlRpcClient.cs Novell.Zenworks.Zmd.Inventory.dll: $(INVENTORY_SOURCES) $(MCS) -target:library $(ASSEMBLIES) $(INVENTORY_SOURCES) -out:$@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-inventory-7.1.1.0/src/Makefile.in new/zmd-inventory-7.1.1.0/src/Makefile.in --- old/zmd-inventory-7.1.1.0/src/Makefile.in 2006-04-07 16:10:16.000000000 +0200 +++ new/zmd-inventory-7.1.1.0/src/Makefile.in 2006-05-31 20:15:19.000000000 +0200 @@ -195,6 +195,7 @@ netadapter_bindir = ${libder}/zmd ASSEMBLIES = \ -r:System.Web.Services \ + -r:${zmdmoduledir}/CookComputing.XmlRpc.dll \ -pkg:zmd,zmd-package-management INVENTORY_SOURCES = \ @@ -206,7 +207,8 @@ Scanner.cs \ SoftwareInventory.cs \ Util.cs \ - NUInventory.cs + NUInventory.cs \ + NUXmlRpcClient.cs CLEANFILES = $(zmdmodule_DATA) netadapter-mapping-glue EXTRA_DIST = \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-inventory-7.1.1.0/src/NUInventory.cs new/zmd-inventory-7.1.1.0/src/NUInventory.cs --- old/zmd-inventory-7.1.1.0/src/NUInventory.cs 2006-03-30 06:26:25.000000000 +0200 +++ new/zmd-inventory-7.1.1.0/src/NUInventory.cs 2006-05-31 19:43:07.000000000 +0200 @@ -1,5 +1,8 @@ using System; +using System.IO; +using System.Text; using System.Collections; +using System.Security.Cryptography; using System.Threading; using Novell.Zenworks.Utility; using Novell.Zenworks.Zmd; @@ -7,6 +10,7 @@ using Novell.Zenworks.Zmd.Scheduling; using Novell.Zenworks.Zmd.Packaging; using log4net; +using CookComputing.XmlRpc; using ZENInventory; namespace Novell.Zenworks.Zmd.Inventory { @@ -22,7 +26,7 @@ public static void ServiceAddedHandler (Service svc) { if (svc.ServiceType.Alias.Equals ("nu")) { log.Debug ("Novell Update Service added to inventory list"); - Uris.Add (svc.Uri); + Uris.Add (svc.Uri + ((svc.Uri.EndsWith ("/"))? "" : "/") + "data/RPC2/redcarpet-client.php"); // TODO: we may want to move these somewhere else, but // it doesn't currently matter too much, because there @@ -61,6 +65,7 @@ public class NUSoftwareInventory : InventoryRefresh { private static readonly ILog log = LogManager.GetLogger (typeof (NUSoftwareInventory)); + private static readonly string ChecksumFile = BuildConfig.LOCALSTATEDIR + "/lib/zmd/nu-software-inventory-checksum"; public NUSoftwareInventory () : base () { this.name = "Novell Update Service software inventory"; @@ -68,49 +73,185 @@ } protected override bool SendInventory () { - PatchInfo[] patches = MakePatchInfo (Patch.GetAll ()); - ProductInfo[] products = MakeProductInfo (Product.GetAll ()); + string deviceid = PreferenceManager.GetDeviceID (); + string secret = NUUtil.GetMD5 (deviceid + ":Express:" + PreferenceManager.GetSecret ()); + string target = DaemonProperties.Target.Name; + + ArrayList inventory = new ArrayList (); + inventory.AddRange (MakeXmlRpcResolvable (PackageManager.InstalledPackages.ToResolvables (), "package")); + inventory.AddRange (MakeXmlRpcResolvable (Patch.GetAll (), "patch")); + inventory.AddRange (MakeXmlRpcResolvable (Product.GetAll (), "product")); + + string checksum = NeedUpdate ((XmlRpcResolvable[]) inventory.ToArray (typeof (XmlRpcResolvable))); + if (checksum == null) { + log.Info ("Software inventory has not changed since last inventory refresh; sending updates only."); + inventory.Clear (); + } + + ArrayList updates = new ArrayList (); + updates.AddRange (MakeXmlRpcResolvable (Patch.GetUpdates (), "patch")); + + string maxSeverity = FindMaxSeverity ((XmlRpcResolvable[]) updates.ToArray (typeof (XmlRpcResolvable))); + + bool error = false; foreach (string uri in (string[]) NUInventoryManager.Uris.ToArray (typeof (string))) { - log.Debug (uri); - log.Debug ("FIXME: We don't do anything yet"); + log.Debug (String.Format ("Sending software inventory to NU server '{0}'", uri)); + + try { + INUXmlRpcService nuServer = NUXmlRpcService.Create (uri); + + log.Info (String.Format ("Sending {0} resolvables and {1} resolvable updates. Args:", inventory.Count, updates.Count)); + log.Debug (String.Format ("\tDevice ID: {0}", deviceid)); + log.Debug (String.Format ("\tSecret: {0}", secret)); + log.Debug (String.Format ("\tTarget: {0}", target)); + log.Debug (String.Format ("\tMax Severity: {0}", maxSeverity)); + + if (inventory.Count >= 1) + nuServer.SetResolvables (deviceid, secret, target, (XmlRpcResolvable[]) inventory.ToArray (typeof (XmlRpcResolvable))); + + nuServer.SetResolvableUpdates (deviceid, secret, target, maxSeverity, (XmlRpcResolvable[]) updates.ToArray (typeof (XmlRpcResolvable))); + + } catch (XmlRpcFaultException e) { + log.Error (String.Format ("Error sending software inventory to NU server '{0}': {1} (code {2})", uri, e.FaultString, e.FaultCode), e); + error = true; + return false; + } catch (Exception e) { + log.Error (String.Format ("Error sending software inventory to NU server '{0}'", uri), e); + error = true; + return false; + } finally { + if (!error && checksum != null) { + using (StreamWriter sw = new StreamWriter (ChecksumFile)) { + sw.Write (checksum); + sw.Write ("\n"); + } + } + } } return true; } - private static PatchInfo[] MakePatchInfo (Patch[] patches) { - ArrayList infos = new ArrayList (); - foreach (Patch p in patches) { - infos.Add (MakePatchInfo (p)); + // returns the new checksum that will have to be saved to the + // file if the inventory is successfully sent, or null + // otherwise. + + private static string NeedUpdate (XmlRpcResolvable[] resolvables) { + string newChecksum = GetResolvablesChecksum (resolvables); + + if (!File.Exists (ChecksumFile)) + return newChecksum; + + string oldChecksum; + using (StreamReader sr = new StreamReader (ChecksumFile)) { + oldChecksum = sr.ReadLine (); } - return (PatchInfo[]) infos.ToArray (typeof (PatchInfo)); - } - private static PatchInfo MakePatchInfo (Patch patch) { - PatchInfo p = new PatchInfo (); - return p; + if (oldChecksum == newChecksum) + return null; + + return newChecksum; } - private static ProductInfo[] MakeProductInfo (Product[] products) { - ArrayList infos = new ArrayList (); - foreach (Product p in products) { - infos.Add (MakeProductInfo (p)); + private static string GetResolvablesChecksum (XmlRpcResolvable[] resolvables) { + StringBuilder sb = new StringBuilder (); + + foreach (XmlRpcResolvable r in resolvables) { + sb.Append (r.name); + sb.Append (r.epoch); + sb.Append (r.version); + sb.Append (r.release); + sb.Append (r.arch); + sb.Append (r.type); } - return (ProductInfo[]) infos.ToArray (typeof (ProductInfo)); + + return NUUtil.GetMD5 (sb.ToString ()); } - private static ProductInfo MakeProductInfo (Product product) { - ProductInfo p = new ProductInfo (); - return p; + private static string FindMaxSeverity (XmlRpcResolvable[] resolvables) { + string max = ""; + + foreach (XmlRpcResolvable r in resolvables) { + if (CompareSeverity (r.severity, max) == 1) + max = r.severity; + } + + return max; } - private class PatchInfo { - public PatchInfo () { + // wow, this sucks so hard. + + private static int CompareSeverity (string a, string b) { + string foo = (a == null)? "" : a.ToLower (); + string bar = (b == null)? "" : b.ToLower (); + + if (foo == "" && bar == "") + return 0; + if (foo != "" && bar == "") + return 1; + if (foo == "" && bar != "") + return -1; + + switch (foo) { + case "recommended": + switch (bar) { + case "recommended": + return 0; + case "security": + return -1; + } + break; + case "security": + switch (bar) { + case "recommended": + return 1; + case "security": + return 0; + } + break; } + + log.Error (String.Format ("Unknown severity strings '{0}' / '{1}'", foo, bar)); + return 0; // fixme ? } - private class ProductInfo { - public ProductInfo () { + private static XmlRpcResolvable[] MakeXmlRpcResolvable (IResolvable[] resolvables, string type) { + ArrayList structs = new ArrayList (); + foreach (IResolvable r in resolvables) { + structs.Add (MakeXmlRpcResolvable (r, type)); } + return (XmlRpcResolvable[]) structs.ToArray (typeof (XmlRpcResolvable)); + } + + private static XmlRpcResolvable MakeXmlRpcResolvable (IResolvable resolvable, string type) { + XmlRpcResolvable r = new XmlRpcResolvable (); + r.name = resolvable.Name; + r.epoch = resolvable.Epoch; + r.version = resolvable.Version; + r.release = resolvable.Release; + r.arch = ArchUtility.ToString (resolvable.Arch); + r.type = type; + if (resolvable.Category != null) + r.severity = resolvable.Category; + else + r.severity = ""; + return r; + } + } + + public class NUUtil { + public static string GetMD5 (string input) { + UTF8Encoding encoder = new UTF8Encoding (); + Byte[] bytes = new Byte[input.Length]; + int count = encoder.GetBytes (input, 0, input.Length, bytes, 0); + + HashAlgorithm digest = HashAlgorithm.Create ("MD5"); + byte[] byteHash = digest.ComputeHash (bytes, 0, count); + + string result = ""; + foreach (Byte b in byteHash) + result += b.ToString("x02"); + + return result; } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-inventory-7.1.1.0/src/NUXmlRpcClient.cs new/zmd-inventory-7.1.1.0/src/NUXmlRpcClient.cs --- old/zmd-inventory-7.1.1.0/src/NUXmlRpcClient.cs 1970-01-01 01:00:00.000000000 +0100 +++ new/zmd-inventory-7.1.1.0/src/NUXmlRpcClient.cs 2006-05-31 19:43:07.000000000 +0200 @@ -0,0 +1,31 @@ +using CookComputing.XmlRpc; + +namespace Novell.Zenworks.Zmd.Inventory { + + public struct XmlRpcResolvable { + public string name; + public int epoch; + public string version; + public string release; + public string arch; + public string type; + public string severity; + } + + public interface INUXmlRpcService { + [XmlRpcMethod ("rcserver.machine.setResolvableUpdates")] + void SetResolvableUpdates (string user, string pass, string distro, string maxSeverity, XmlRpcResolvable[] updates); + + [XmlRpcMethod ("rcserver.machine.setResolvables")] + void SetResolvables (string user, string pass, string distro, XmlRpcResolvable[] inventory); + } + + public class NUXmlRpcService { + static public INUXmlRpcService Create (string url) { + XmlRpcClientProtocol proxy = (XmlRpcClientProtocol) XmlRpcProxyGen.Create (typeof (INUXmlRpcService)); + proxy.Url = url; + return (INUXmlRpcService) proxy; + } + } +} + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

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

31 May '06

Hello community, here is the log from the commit of package libzypp checked in at Thu Jun 1 00:39:36 CEST 2006. -------- --- libzypp/libzypp.changes 2006-05-31 18:39:01.000000000 +0200 +++ libzypp/libzypp.changes 2006-06-01 00:35:12.000000000 +0200 @@ -6 +6 @@ -- rev 3479 +- rev 3481 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.QLaITg/_old 2006-06-01 00:39:30.000000000 +0200 +++ /var/tmp/diff_new_pack.QLaITg/_new 2006-06-01 00:39:30.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 1.1.0 -Release: 4 +Release: 5 Source: zypp-1.1.0.tar.bz2 Prefix: /usr Provides: yast2-packagemanager @@ -106,7 +106,7 @@ * Wed May 31 2006 - dmacvicar(a)suse.de - Dont download twice if starting from 1st time - fix typo -- rev 3479 +- rev 3481 * Wed May 31 2006 - dmacvicar(a)suse.de - set cache dir only if storeMetadata is called as a public method.´ - rev 3475 ++++++ zypp-1.1.0.tar.bz2 ++++++ libzypp/zypp-1.1.0.tar.bz2 libzypp/zypp-1.1.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit gdm
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package gdm checked in at Thu Jun 1 00:39:22 CEST 2006. -------- --- GNOME/gdm/gdm.changes 2006-05-24 18:06:48.000000000 +0200 +++ gdm/gdm.changes 2006-06-01 00:32:01.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 1 00:29:36 CEST 2006 - dreveman(a)suse.de + +- Fix bg patch and change gdm.conf patch so we pass -br to X + server for black root window. (bnc 179847) + +------------------------------------------------------------------- Old: ---- gdm-2.8.0.7-bg-3.patch New: ---- gdm-2.8.0.7-bg-4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.U1poba/_old 2006-06-01 00:38:59.000000000 +0200 +++ /var/tmp/diff_new_pack.U1poba/_new 2006-06-01 00:38:59.000000000 +0200 @@ -22,7 +22,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 2.8.0.7 -Release: 63 +Release: 65 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -46,7 +46,7 @@ Patch15: gdm-2.8.0.0-setup-no-flicker.patch Patch16: gdm-2.8.0.0-timed-login-enact.patch Patch18: gdm-gnome-screensaver.patch -Patch19: gdm-2.8.0.7-bg-3.patch +Patch19: gdm-2.8.0.7-bg-4.patch Patch20: gdm-2.8.0.7-domain-entry.patch Patch21: gdm-2.8.0.7-halt-needs-root.patch Patch22: gdm-2.8.0.7-onlyshow-in-gnome.diff @@ -239,6 +239,9 @@ %endif %changelog -n gdm +* Thu Jun 01 2006 - dreveman(a)suse.de +- Fix bg patch and change gdm.conf patch so we pass -br to X + server for black root window. (bnc 179847) * Wed May 24 2006 - sbrabec(a)suse.cz - Do not display Japanese string in terminal, which doesn't support it (#168736). ++++++ gdm-2.8.0.7-bg-3.patch -> gdm-2.8.0.7-bg-4.patch ++++++ --- GNOME/gdm/gdm-2.8.0.7-bg-3.patch 2006-05-15 22:28:16.000000000 +0200 +++ gdm/gdm-2.8.0.7-bg-4.patch 2006-06-01 00:04:11.000000000 +0200 @@ -41,7 +41,7 @@ #include "gdm.h" #include "gdmcommon.h" #include "greeter.h" -@@ -193,6 +199,125 @@ +@@ -193,6 +199,127 @@ c->pixel = 0; } @@ -93,7 +93,7 @@ + * it at the same time. (This assumes that they follow the + * same conventions we do) + */ -+static void ++static gboolean +set_root_pixmap (GdkPixmap *pixmap) +{ + Atom type; @@ -162,6 +162,8 @@ + XClearWindow (display, RootWindow (display, screen_num)); + XUngrabServer (display); + XFlush (display); ++ ++ return FALSE; +} + void @@ -172,7 +174,7 @@ if (item->data.pixmap.pixbufs[GREETER_ITEM_STATE_NORMAL] != NULL) + { -+ static int bg_set = 0; ++ static int bg_set = 1; /* disabled */ + item->item = gnome_canvas_item_new (group, GNOME_TYPE_CANVAS_PIXBUF, ++++++ gdm-conf.patch ++++++ --- /var/tmp/diff_new_pack.U1poba/_old 2006-06-01 00:39:01.000000000 +0200 +++ /var/tmp/diff_new_pack.U1poba/_new 2006-06-01 00:39:01.000000000 +0200 @@ -144,3 +144,12 @@ #SoundOnLoginFile= # If SoundOnLoginSuccess, then the greeter will play a sound (as above) # when a user successfully logs in +@@ -478,7 +472,7 @@ + # Definition of the standard X server. + [server-Standard] + name=Standard server +-command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ ++command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ -br + flexible=true + + # To use this server type you should add -query host or -indirect host ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit qt3
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package qt3 checked in at Thu Jun 1 00:15:18 CEST 2006. -------- --- KDE/qt3/qt3-devel-doc.changes 2006-05-31 17:12:26.000000000 +0200 +++ qt3/qt3-devel-doc.changes 2006-06-01 00:14:36.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 31 15:51:01 CEST 2006 - adrian(a)suse.de + +- remove BuildRequires libdrm-devel + +------------------------------------------------------------------- qt3-extensions.changes: same change qt3-static.changes: same change qt3.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.vdrgYa/_old 2006-06-01 00:14:48.000000000 +0200 +++ /var/tmp/diff_new_pack.vdrgYa/_new 2006-06-01 00:14:48.000000000 +0200 @@ -11,14 +11,14 @@ # norootforbuild Name: qt3-devel-doc -BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libdrm-devel libjpeg-devel libmng-devel libpng-devel pkgconfig qt3 update-desktop-files +BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libmng-devel libpng-devel pkgconfig qt3-devel update-desktop-files Url: http://www.trolltech.com/ License: GPL, QPL Autoreqprov: on Summary: Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.6 -Release: 5 +Release: 6 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -236,6 +236,8 @@ /usr/share/pixmaps/assistant3.png %changelog -n qt3-devel-doc +* Wed May 31 2006 - adrian(a)suse.de +- remove BuildRequires libdrm-devel * Wed May 31 2006 - dmueller(a)suse.de - fix xpm image loading problem - add performance regression fix ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.vdrgYa/_old 2006-06-01 00:14:48.000000000 +0200 +++ /var/tmp/diff_new_pack.vdrgYa/_new 2006-06-01 00:14:48.000000000 +0200 @@ -11,10 +11,10 @@ # norootforbuild Name: qt3-extensions -BuildRequires: cups-devel krb5-devel libdrm-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files +BuildRequires: cups-devel krb5-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files License: GPL, QPL Version: 3.3.6 -Release: 5 +Release: 6 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -476,6 +476,8 @@ %{_mandir}/man*/* %changelog -n qt3-extensions +* Wed May 31 2006 - adrian(a)suse.de +- remove BuildRequires libdrm-devel * Wed May 31 2006 - dmueller(a)suse.de - fix xpm image loading problem - add performance regression fix ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.vdrgYa/_old 2006-06-01 00:14:48.000000000 +0200 +++ /var/tmp/diff_new_pack.vdrgYa/_new 2006-06-01 00:14:48.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: static program library for developing applications with graphical user interfaces Version: 3.3.6 -Release: 5 +Release: 6 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -245,6 +245,8 @@ #/usr/lib/qt3/%{_lib}/libqt-mini.a %changelog -n qt3-static +* Wed May 31 2006 - adrian(a)suse.de +- remove BuildRequires libdrm-devel * Wed May 31 2006 - dmueller(a)suse.de - fix xpm image loading problem - add performance regression fix ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.vdrgYa/_old 2006-06-01 00:14:48.000000000 +0200 +++ /var/tmp/diff_new_pack.vdrgYa/_new 2006-06-01 00:14:48.000000000 +0200 @@ -19,7 +19,7 @@ Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.6 -Release: 5 +Release: 6 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -376,6 +376,8 @@ /etc/profile.d/qt3.* %changelog -n qt3 +* Wed May 31 2006 - adrian(a)suse.de +- remove BuildRequires libdrm-devel * Wed May 31 2006 - dmueller(a)suse.de - fix xpm image loading problem - add performance regression fix ++++++ qt3-devel-doc.spec.in ++++++ --- KDE/qt3/qt3-devel-doc.spec.in 2006-05-29 08:25:26.000000000 +0200 +++ qt3/qt3-devel-doc.spec.in 2006-05-31 18:09:01.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: qt3-devel-doc -BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libdrm-devel libjpeg-devel libmng-devel libpng-devel pkgconfig update-desktop-files qt3 +BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libmng-devel libpng-devel pkgconfig update-desktop-files qt3-devel URL: http://www.trolltech.com/ License: GPL, QPL Autoreqprov: on ++++++ qt3-extensions.spec.in ++++++ --- KDE/qt3/qt3-extensions.spec.in 2006-05-29 08:25:26.000000000 +0200 +++ qt3/qt3-extensions.spec.in 2006-05-31 18:09:01.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: qt3-extensions -BuildRequires: cups-devel krb5-devel libdrm-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files +BuildRequires: cups-devel krb5-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files License: GPL, QPL Version: 3.3.6 Release: 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit pam_ssh
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package pam_ssh checked in at Thu Jun 1 00:14:07 CEST 2006. -------- --- pam_ssh/pam_ssh.changes 2006-01-25 21:39:15.000000000 +0100 +++ pam_ssh/pam_ssh.changes 2006-05-31 23:28:58.000000000 +0200 @@ -1,0 +2,9 @@ +Wed May 31 23:28:20 CEST 2006 - stark(a)suse.de + +- update to version 1.92 + * allow working as session module without authentication + (workaround for #173803) + * incorporated include fixes +- fixed syslog logging (part of #177885) + +------------------------------------------------------------------- Old: ---- pam_ssh-1.91.diff pam_ssh-1.91.tar.bz2 New: ---- logging.patch pam_ssh-1.92.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_ssh.spec ++++++ --- /var/tmp/diff_new_pack.e2PjeB/_old 2006-06-01 00:13:58.000000000 +0200 +++ /var/tmp/diff_new_pack.e2PjeB/_new 2006-06-01 00:13:58.000000000 +0200 @@ -1,11 +1,11 @@ # -# spec file for package pam_ssh (Version 1.91) +# spec file for package pam_ssh (Version 1.92) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -15,12 +15,12 @@ License: BSD Group: Productivity/Networking/SSH Autoreqprov: on -Version: 1.91 -Release: 7 +Version: 1.92 +Release: 1 Summary: PAM Module for SSH Authentication -URL: http://sourceforge.net/projects/pam-ssh/ -Source: pam_ssh-1.91.tar.bz2 -Patch: pam_ssh-1.91.diff +URL: http://developer.novell.com/wiki/index.php/Pam_ssh +Source: %{name}-%{version}.tar.bz2 +Patch1: logging.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -37,15 +37,17 @@ Roderick Schertler %prep -%setup -q -n pam_ssh-1.91 -%patch +%setup -q +%patch1 %build %{suse_update_config -f} autoreconf --verbose --force --install CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ -./configure --libdir=/%{_lib} --with-pamdir=/%{_lib}/security \ - --prefix=/usr --mandir=%{_mandir} +./configure --libdir=/%{_lib} \ + --with-pamdir=/%{_lib}/security \ + --prefix=%{_prefix} \ + --mandir=%{_mandir} make %install @@ -65,6 +67,12 @@ %attr(444,root,root) %_mandir/man*/*.* %changelog -n pam_ssh +* Wed May 31 2006 - stark(a)suse.de +- update to version 1.92 + * allow working as session module without authentication + (workaround for #173803) + * incorporated include fixes +- fixed syslog logging (part of #177885) * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Oct 14 2005 - ro(a)suse.de ++++++ logging.patch ++++++ --- pam_ssh.c +++ pam_ssh.c @@ -147,16 +147,19 @@ pam_ssh_log(int priority, const char *fmt, ...) { va_list ap; /* variable argument list */ - int errno_saved; /* for caching errno */ - char *tagged; /* format tagged with module name */ + //int errno_saved; /* for caching errno */ + //char *tagged; /* format tagged with module name */ - errno_saved = errno; - asprintf(&tagged, "%s: %s", MODULE_NAME, fmt); + openlog(MODULE_NAME, LOG_PID, LOG_AUTHPRIV); + //errno_saved = errno; + //asprintf(&tagged, "%s: %s", MODULE_NAME, fmt); va_start(ap, fmt); - errno = errno_saved; - vsyslog(priority, tagged ? tagged : fmt, ap); - free(tagged); + //errno = errno_saved; + //vsyslog(priority, tagged ? tagged : fmt, ap); + vsyslog(priority, fmt, ap); + //free(tagged); va_end(ap); + closelog(); } @@ -355,7 +358,7 @@ int retval; /* from calls */ const char *user; /* username */ - log_init(MODULE_NAME, SYSLOG_LEVEL_ERROR, SYSLOG_FACILITY_AUTHPRIV, 0); + //log_init(MODULE_NAME, SYSLOG_LEVEL_ERROR, SYSLOG_FACILITY_AUTHPRIV, 0); allow_blank_passphrase = 0; keyfiles = kfspec = NULL; @@ -517,7 +520,7 @@ const char *tty_raw; /* raw tty or display name */ char *tty_nodir; /* tty without / chars */ - log_init(MODULE_NAME, SYSLOG_LEVEL_ERROR, SYSLOG_FACILITY_AUTHPRIV, 0); + //log_init(MODULE_NAME, SYSLOG_LEVEL_ERROR, SYSLOG_FACILITY_AUTHPRIV, 0); /* dump output of ssh-agent in ~/.ssh */ if ((retval = pam_get_data(pamh, "ssh_passwd_entry", ++++++ pam_ssh-1.91.tar.bz2 -> pam_ssh-1.92.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/AUTHORS new/pam_ssh-1.92/AUTHORS --- old/pam_ssh-1.91/AUTHORS 2002-04-07 20:49:16.000000000 +0200 +++ new/pam_ssh-1.92/AUTHORS 2006-05-31 23:03:57.000000000 +0200 @@ -1,3 +1,3 @@ -$Id: AUTHORS,v 1.1 2002/04/07 18:49:16 akorty Exp $ - -Written by Andrew J. Korty <ajk(a)iu.edu>. +Andrew J. Korty <ajk(a)iu.edu> +Roderick Schertler +Patrice Dumas diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/COPYING new/pam_ssh-1.92/COPYING --- old/pam_ssh-1.91/COPYING 2004-02-19 21:47:56.000000000 +0100 +++ new/pam_ssh-1.92/COPYING 2006-05-31 23:05:00.000000000 +0200 @@ -1,5 +1,3 @@ -$Id: COPYING,v 1.5 2004/02/19 20:47:56 akorty Exp $ - Copyright (c) 1999, 2000, 2001, 2002, 2004 Andrew J. Korty All rights reserved. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/ChangeLog new/pam_ssh-1.92/ChangeLog --- old/pam_ssh-1.91/ChangeLog 2004-04-12 16:34:51.000000000 +0200 +++ new/pam_ssh-1.92/ChangeLog 2006-05-31 23:02:20.000000000 +0200 @@ -1,3 +1,13 @@ +Version 1.92 released +===================== + +2006-05-31 Wolfgang Rosenauer + + * cipher.c, openpam_borrow_cred.c, openpam_restore_cred.c, pam_ssh.c: + added some needed includes + * pam_ssh.c: don't rely on authentication for the session functions + and don't save the passwd entry for them + Version 1.91 released ===================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/NEWS new/pam_ssh-1.92/NEWS --- old/pam_ssh-1.91/NEWS 2004-04-12 16:21:38.000000000 +0200 +++ new/pam_ssh-1.92/NEWS 2006-05-31 23:07:55.000000000 +0200 @@ -1,4 +1,8 @@ -$Id: NEWS,v 1.9 2004/04/12 14:21:38 akorty Exp $ +Version 1.92 +============ + +The module is usable now for session use only if wanted. It starts +an ssh-agent without adding keys to it in that case. Version 1.91 ============ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/README new/pam_ssh-1.92/README --- old/pam_ssh-1.91/README 2004-04-12 14:13:00.000000000 +0200 +++ new/pam_ssh-1.92/README 2006-05-31 22:51:42.000000000 +0200 @@ -1,5 +1,3 @@ -$Id: README,v 1.2 2004/02/21 14:41:38 akorty Exp $ - This PAM module provides single sign-on behavior for SSH. The user types an SSH passphrase when logging in (probably to GDM, KDM, or XDM) and is authenticated if the passphrase successfully decrypts the @@ -8,4 +6,5 @@ user can SSH to other hosts that accept key authentication without typing any passwords. -http://sourceforge.net/projects/pam-ssh/ +http://developer.novell.com/wiki/index.php/Pam_ssh +(http://sourceforge.net/projects/pam-ssh/) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/TODO new/pam_ssh-1.92/TODO --- old/pam_ssh-1.91/TODO 2002-08-09 20:59:00.000000000 +0200 +++ new/pam_ssh-1.92/TODO 2006-05-31 23:12:32.000000000 +0200 @@ -1,4 +1,4 @@ -$Id: TODO,v 1.4 2002/08/09 18:59:00 akorty Exp $ +* fix and cleanup logging stuff * Unit testing diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/cipher.c new/pam_ssh-1.92/cipher.c --- old/pam_ssh-1.91/cipher.c 2004-02-19 19:58:20.000000000 +0100 +++ new/pam_ssh-1.92/cipher.c 2006-05-31 22:50:48.000000000 +0200 @@ -39,6 +39,7 @@ #include <string.h> #include <openssl/evp.h> +#include <openssl/md5.h> #include <config.h> #include "cipher.h" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/configure new/pam_ssh-1.92/configure --- old/pam_ssh-1.91/configure 2004-04-12 16:31:40.000000000 +0200 +++ new/pam_ssh-1.92/configure 2006-05-31 23:17:32.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.58 for pam_ssh 1.91. +# Generated by GNU Autoconf 2.58 for pam_ssh 1.92. # # Report bugs to <ajk(a)waterspout.com>. # @@ -428,8 +428,8 @@ # Identity of this package. PACKAGE_NAME='pam_ssh' PACKAGE_TARNAME='pam_ssh' -PACKAGE_VERSION='1.91' -PACKAGE_STRING='pam_ssh 1.91' +PACKAGE_VERSION='1.92' +PACKAGE_STRING='pam_ssh 1.92' PACKAGE_BUGREPORT='ajk(a)waterspout.com' ac_unique_file="pam_ssh.c" @@ -939,7 +939,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures pam_ssh 1.91 to adapt to many kinds of systems. +\`configure' configures pam_ssh 1.92 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1006,7 +1006,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pam_ssh 1.91:";; + short | recursive ) echo "Configuration of pam_ssh 1.92:";; esac cat <<\_ACEOF @@ -1133,7 +1133,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -pam_ssh configure 1.91 +pam_ssh configure 1.92 generated by GNU Autoconf 2.58 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1147,7 +1147,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pam_ssh $as_me 1.91, which was +It was created by pam_ssh $as_me 1.92, which was generated by GNU Autoconf 2.58. Invocation command line was $ $0 $@ @@ -1865,7 +1865,7 @@ # Define the identity of the package. PACKAGE=pam_ssh - VERSION=1.91 + VERSION=1.92 cat >>confdefs.h <<_ACEOF @@ -11291,7 +11291,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by pam_ssh $as_me 1.91, which was +This file was extended by pam_ssh $as_me 1.92, which was generated by GNU Autoconf 2.58. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11354,7 +11354,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -pam_ssh config.status 1.91 +pam_ssh config.status 1.92 configured by $0, generated by GNU Autoconf 2.58, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/configure.ac new/pam_ssh-1.92/configure.ac --- old/pam_ssh-1.91/configure.ac 2004-04-12 16:21:48.000000000 +0200 +++ new/pam_ssh-1.92/configure.ac 2006-05-31 23:14:07.000000000 +0200 @@ -26,12 +26,12 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([pam_ssh],[1.91],[ajk(a)waterspout.com]) +AC_INIT([pam_ssh],[1.92],[ajk(a)waterspout.com]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([pam_ssh.c]) AC_CANONICAL_TARGET([]) AM_DISABLE_STATIC -AM_INIT_AUTOMAKE(pam_ssh, 1.91) +AM_INIT_AUTOMAKE(pam_ssh, 1.92) AM_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/openpam_borrow_cred.c new/pam_ssh-1.92/openpam_borrow_cred.c --- old/pam_ssh-1.91/openpam_borrow_cred.c 2004-02-19 19:58:46.000000000 +0100 +++ new/pam_ssh-1.92/openpam_borrow_cred.c 2006-05-31 22:50:48.000000000 +0200 @@ -43,6 +43,7 @@ #include <unistd.h> #include <pam_appl.h> +#include <security/pam_modules.h> #include <config.h> #include "openpam_cred.h" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/openpam_restore_cred.c new/pam_ssh-1.92/openpam_restore_cred.c --- old/pam_ssh-1.91/openpam_restore_cred.c 2004-02-19 20:01:00.000000000 +0100 +++ new/pam_ssh-1.92/openpam_restore_cred.c 2006-05-31 22:50:48.000000000 +0200 @@ -43,6 +43,7 @@ #include <unistd.h> #include <pam_appl.h> +#include <security/pam_modules.h> #include <config.h> #include "openpam_cred.h" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/pam_ssh.c new/pam_ssh-1.92/pam_ssh.c --- old/pam_ssh-1.91/pam_ssh.c 2004-04-12 15:55:08.000000000 +0200 +++ new/pam_ssh-1.92/pam_ssh.c 2006-05-31 22:50:48.000000000 +0200 @@ -41,6 +41,7 @@ #include <sys/param.h> #include <sys/stat.h> #include <config.h> +#include <syslog.h> #if HAVE_SYS_WAIT_H # include <sys/wait.h> #endif @@ -350,7 +351,6 @@ #endif const char *pass; /* passphrase */ const struct passwd *pwent; /* user's passwd entry */ - struct passwd *pwent_keep; /* our own copy */ int retval; /* from calls */ const char *user; /* username */ @@ -461,22 +461,6 @@ return PAM_AUTH_ERR; } - /* copy the passwd entry (in case successive calls are made) and - save it for the session phase */ - - if (!(pwent_keep = malloc(sizeof *pwent))) { - pam_ssh_log(LOG_CRIT, "out of memory"); - openpam_restore_cred(pamh); - return PAM_SERVICE_ERR; - } - memcpy(pwent_keep, pwent, sizeof *pwent_keep); - if ((retval = pam_set_data(pamh, "ssh_passwd_entry", pwent_keep, - ssh_cleanup)) != PAM_SUCCESS) { - free(pwent_keep); - openpam_restore_cred(pamh); - return retval; - } - openpam_restore_cred(pamh); return PAM_SUCCESS; } @@ -515,14 +499,16 @@ int start_agent; /* start agent? */ const char *tty_raw; /* raw tty or display name */ char *tty_nodir; /* tty without / chars */ + const char *user; /* username */ log_init(MODULE_NAME, SYSLOG_LEVEL_ERROR, SYSLOG_FACILITY_AUTHPRIV, 0); /* dump output of ssh-agent in ~/.ssh */ - if ((retval = pam_get_data(pamh, "ssh_passwd_entry", - (const void **)(void *)&pwent)) - != PAM_SUCCESS) + if ((retval = pam_get_user(pamh, &user, NULL)) != PAM_SUCCESS) return retval; + if (!(user && (pwent = getpwnam(user)) && pwent->pw_dir && + *pwent->pw_dir)) + return PAM_AUTH_ERR; retval = openpam_borrow_cred(pamh, pwent); if (retval != PAM_SUCCESS && retval != PAM_PERM_DENIED) { @@ -842,10 +828,13 @@ const char *ssh_agent_pid; /* ssh-agent pid string */ const struct passwd *pwent; /* user's passwd entry */ struct stat sb; /* to check st_nlink */ + const char *user; /* username */ - if ((retval = pam_get_data(pamh, "ssh_passwd_entry", - (const void **)(void *)&pwent)) != PAM_SUCCESS) + if ((retval = pam_get_user(pamh, &user, NULL)) != PAM_SUCCESS) return retval; + if (!(user && (pwent = getpwnam(user)) && pwent->pw_dir && + *pwent->pw_dir)) + return PAM_AUTH_ERR; retval = openpam_borrow_cred(pamh, pwent); if (retval != PAM_SUCCESS && retval != PAM_PERM_DENIED) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pam_ssh-1.91/pam_ssh.spec new/pam_ssh-1.92/pam_ssh.spec --- old/pam_ssh-1.91/pam_ssh.spec 2004-04-12 16:33:27.000000000 +0200 +++ new/pam_ssh-1.92/pam_ssh.spec 2006-05-31 23:36:56.000000000 +0200 @@ -1,16 +1,15 @@ -Name: pam_ssh -Version: 1.91 -Release: 0.fdr.1 -Epoch: 0 -Summary: A Pluggable Authentication Module (PAM) for use with SSH. -Source: http://belnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar… -URL: http://sourceforge.net/projects/pam-ssh/ - -License: BSD -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: pam, openssh, openssh-clients -BuildRequires: pam-devel -Group: System Environment/Base +# norootforbuild + +Name: pam_ssh +BuildRequires: pam-devel +License: BSD +Group: Productivity/Networking/SSH +Version: 1.92 +Release: 1 +Summary: A Pluggable Authentication Module (PAM) for use with SSH. +URL: http://developer.novell.com/wiki/index.php/Pam_ssh +Source: http://belnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar… +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This PAM module provides single sign-on behavior for UNIX using SSH. Users @@ -24,12 +23,11 @@ %build %configure make clean -make %{?_smp_mflags} +make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -#%find_lang %{name} find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

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

31 May '06

Hello community, here is the log from the commit of package libzypp checked in at Thu Jun 1 00:13:54 CEST 2006. -------- --- libzypp/libzypp.changes 2006-05-31 18:03:33.000000000 +0200 +++ libzypp/libzypp.changes 2006-05-31 18:39:01.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 31 18:32:58 CEST 2006 - dmacvicar(a)suse.de + +- Dont download twice if starting from 1st time +- fix typo +- rev 3479 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.1Rh7Ac/_old 2006-06-01 00:13:45.000000000 +0200 +++ /var/tmp/diff_new_pack.1Rh7Ac/_new 2006-06-01 00:13:45.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 1.1.0 -Release: 3 +Release: 4 Source: zypp-1.1.0.tar.bz2 Prefix: /usr Provides: yast2-packagemanager @@ -104,6 +104,10 @@ %changelog -n libzypp * Wed May 31 2006 - dmacvicar(a)suse.de +- Dont download twice if starting from 1st time +- fix typo +- rev 3479 +* Wed May 31 2006 - dmacvicar(a)suse.de - set cache dir only if storeMetadata is called as a public method.´ - rev 3475 * Wed May 31 2006 - kkaempf(a)suse.de ++++++ zypp-1.1.0.tar.bz2 ++++++ libzypp/zypp-1.1.0.tar.bz2 libzypp/zypp-1.1.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit kbd
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package kbd checked in at Thu Jun 1 00:13:37 CEST 2006. -------- --- kbd/kbd.changes 2006-04-25 19:49:02.000000000 +0200 +++ kbd/kbd.changes 2006-05-31 18:26:16.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 31 18:24:14 CEST 2006 - jw(a)suse.de + +- added consolefonts/cp850-full-* (#179528) + derived from cp850 via setfont; loadunimap cp850; setfont -O + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbd.spec ++++++ --- /var/tmp/diff_new_pack.px51yY/_old 2006-06-01 00:13:17.000000000 +0200 +++ /var/tmp/diff_new_pack.px51yY/_new 2006-06-01 00:13:17.000000000 +0200 @@ -15,7 +15,7 @@ Group: System/Console Autoreqprov: on Version: 1.12 -Release: 60 +Release: 64 Summary: Keyboard and Font Utilities Source: ftp://ftp.win.tue.nl/pub/home/aeb/linux-local/utils/kbd/%{name}-%{version}.tar.bz2 Source1: kbd_fonts.tar.bz2 @@ -314,6 +314,9 @@ #rm -rf $RPM_BUILD_DIR/kbd-%{version} %changelog -n kbd +* Wed May 31 2006 - jw(a)suse.de +- added consolefonts/cp850-full-* (#179528) + derived from cp850 via setfont; loadunimap cp850; setfont -O * Tue Apr 25 2006 - jw(a)suse.de - added keymaps/i386/qwerty/cn-latin1.map (#158951) * Sun Apr 02 2006 - olh(a)suse.de ++++++ suse-add.tar.bz2 ++++++ Binary files old/data/consolefonts/cp850-full-8x14.psfu and new/data/consolefonts/cp850-full-8x14.psfu differ Binary files old/data/consolefonts/cp850-full-8x16.psfu and new/data/consolefonts/cp850-full-8x16.psfu differ Binary files old/data/consolefonts/cp850-full-8x8.psfu and new/data/consolefonts/cp850-full-8x8.psfu differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit gnome-session
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package gnome-session checked in at Thu Jun 1 00:13:09 CEST 2006. -------- --- GNOME/gnome-session/gnome-session.changes 2006-05-24 22:43:40.000000000 +0200 +++ gnome-session/gnome-session.changes 2006-05-31 22:10:05.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 31 22:09:41 CEST 2006 - jpr(a)suse.de + +- Don't run the migration script for new users (#179332) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.cH9dwh/_old 2006-06-01 00:12:51.000000000 +0200 +++ /var/tmp/diff_new_pack.cH9dwh/_new 2006-06-01 00:12:51.000000000 +0200 @@ -18,7 +18,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 2.12.0 -Release: 112 +Release: 114 Summary: Session Tools for the GNOME 2.x Desktop Source: gnome-session-%{version}.tar.bz2 Source1: gnome @@ -150,6 +150,8 @@ %dir /usr/share/xsessions %changelog -n gnome-session +* Wed May 31 2006 - jpr(a)suse.de +- Don't run the migration script for new users (#179332) * Wed May 24 2006 - joeshaw(a)suse.de - Fix the gnome script to not break when setting the background on multihead setups. Patch from Erik Jacobsen. (bnc #178388) ++++++ gnome ++++++ --- GNOME/gnome-session/gnome 2006-05-24 22:42:23.000000000 +0200 +++ gnome-session/gnome 2006-05-29 19:54:26.000000000 +0200 @@ -167,7 +167,7 @@ [ -e $HOME/.skel/sled10-run ] && return # dump the existing config for backup -PANEL_BACKUP=panel-gconf-`date '+%m%d%y%H%M%S'`.xml +PANEL_BACKUP=panel-settings-backup-`date '+%m%d%y%H%M%S'`.xml gconftool-2 --dump /apps/panel > $PANEL_BACKUP # unset the current panel configuration @@ -198,7 +198,7 @@ # reset the SLED 10 UI only if upgrading from NLD9/SLES9, anything newer we # ignore (like SL 9.3), the logic here is redundant but its low risk TRY_SLED10=1 -if [ -e $HOME/.skel/gnome2-run-9.2 ] ; then +if [ ! -e $HOME/.skel/gnome2-run ] || [ -e $HOME/.skel/gnome2-run-9.2 ] ; then TRY_SLED10=0 fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit evolution-data-server
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package evolution-data-server checked in at Thu Jun 1 00:12:28 CEST 2006. -------- --- GNOME/evolution-data-server/evolution-data-server.changes 2006-05-29 13:59:14.000000000 +0200 +++ evolution-data-server/evolution-data-server.changes 2006-05-31 23:23:41.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 31 23:23:11 CEST 2006 - fejj(a)suse.de + +- Added bnc-176277-2.patch which fixes a deadlock condition + +------------------------------------------------------------------- New: ---- bnc-176277-2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.nvV6ah/_old 2006-06-01 00:12:10.000000000 +0200 +++ /var/tmp/diff_new_pack.nvV6ah/_new 2006-06-01 00:12:10.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Evolution Data Server Version: 1.6.0 -Release: 54 +Release: 55 Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.6/%{name}-%{v… #Patch3: evolution-data-server-gcc4.patch Patch5: evolution-data-server-configure.patch @@ -90,6 +90,7 @@ Patch69: eds-updated-translations.diff Patch70: camel-vfs-stream.diff Patch71: bnc-174255-honour-system-proxy-settings.patch +Patch72: bnc-176277-2.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libsoup >= 2.2.6 mozilla-nss @@ -191,6 +192,7 @@ %patch69 %patch70 %patch71 +%patch72 %build rename no nb po/no.* @@ -241,6 +243,8 @@ %{prefix}/share/gtk-doc/html/* %changelog -n evolution-data-server +* Wed May 31 2006 - fejj(a)suse.de +- Added bnc-176277-2.patch which fixes a deadlock condition * Mon May 29 2006 - vvaradhan(a)novell.com - Fixes (bnc) 174255 - Honour desktop proxy setting. ++++++ bnc-176277-2.patch ++++++ Index: libedataserver/e-msgport.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-msgport.c,v retrieving revision 1.6 diff -u -r1.6 e-msgport.c --- libedataserver/e-msgport.c 10 Jan 2006 07:59:04 -0000 1.6 +++ libedataserver/e-msgport.c 31 May 2006 21:06:57 -0000 @@ -70,7 +70,13 @@ e_pipe (int *fds) { #ifndef G_OS_WIN32 - return pipe (fds); + if (pipe (fds) != -1) + return 0; + + fds[0] = -1; + fds[1] = -1; + + return -1; #else SOCKET temp, socket1 = -1, socket2 = -1; struct sockaddr_in saddr; @@ -180,8 +186,11 @@ closesocket (socket1); out0: closesocket (temp); - errno = EIO; /* XXX */ - + errno = EMFILE; /* FIXME: use the real syscall errno? */ + + fds[0] = -1; + fds[1] = -1; + return -1; #endif @@ -487,9 +496,12 @@ } fd; } pipe; #ifdef HAVE_NSS - struct { - PRFileDesc *read; - PRFileDesc *write; + union { + PRFileDesc *pipe[2]; + struct { + PRFileDesc *read; + PRFileDesc *write; + } fd; } prpipe; #endif /* @#@$#$ glib stuff */ @@ -497,6 +509,26 @@ GMutex *lock; }; + +#ifdef HAVE_NSS +static int +e_prpipe (PRFileDesc **fds) +{ +#ifdef G_OS_WIN32 + if (PR_NewTCPSocketPair (fds) != PR_FAILURE) + return 0; +#else + if (PR_CreatePipe (&fds[0], &fds[1]) != PR_FAILURE) + return 0; +#endif + + fds[0] = NULL; + fds[1] = NULL; + + return -1; +} +#endif + EMsgPort *e_msgport_new(void) { EMsgPort *mp; @@ -505,11 +537,9 @@ e_dlist_init(&mp->queue); mp->lock = g_mutex_new(); mp->cond = g_cond_new(); - mp->pipe.fd.read = -1; - mp->pipe.fd.write = -1; + e_pipe (mp->pipe.pipe); #ifdef HAVE_NSS - mp->prpipe.read = NULL; - mp->prpipe.write = NULL; + e_prpipe (mp->prpipe.pipe); #endif mp->condwait = 0; @@ -525,9 +555,9 @@ E_CLOSE(mp->pipe.fd.write); } #ifdef HAVE_NSS - if (mp->prpipe.read) { - PR_Close(mp->prpipe.read); - PR_Close(mp->prpipe.write); + if (mp->prpipe.fd.read) { + PR_Close(mp->prpipe.fd.read); + PR_Close(mp->prpipe.fd.write); } #endif g_free(mp); @@ -536,40 +566,13 @@ /* get a fd that can be used to wait on the port asynchronously */ int e_msgport_fd(EMsgPort *mp) { - int fd; - - g_mutex_lock(mp->lock); - fd = mp->pipe.fd.read; - if (fd == -1) { - e_pipe(mp->pipe.pipe); - fd = mp->pipe.fd.read; - } - g_mutex_unlock(mp->lock); - - return fd; + return mp->pipe.fd.read; } #ifdef HAVE_NSS PRFileDesc *e_msgport_prfd(EMsgPort *mp) { - PRFileDesc *fd; - - g_mutex_lock(mp->lock); - fd = mp->prpipe.read; - if (fd == NULL) { -#ifdef G_OS_WIN32 - PRFileDesc *fds[2]; - PR_NewTCPSocketPair (fds); - mp->prpipe.read = fds[0]; - mp->prpipe.write = fds[1]; -#else - PR_CreatePipe(&mp->prpipe.read, &mp->prpipe.write); -#endif - fd = mp->prpipe.read; - } - g_mutex_unlock(mp->lock); - - return fd; + return mp->prpipe.fd.read; } #endif @@ -579,7 +582,7 @@ #ifdef HAVE_NSS PRFileDesc *prfd; #endif - + m(printf("put:\n")); g_mutex_lock(mp->lock); e_dlist_addtail(&mp->queue, &msg->ln); @@ -587,9 +590,10 @@ m(printf("put: condwait > 0, waking up\n")); g_cond_signal(mp->cond); } + fd = mp->pipe.fd.write; #ifdef HAVE_NSS - prfd = mp->prpipe.write; + prfd = mp->prpipe.fd.write; #endif g_mutex_unlock(mp->lock); @@ -626,7 +630,7 @@ fd_set rfds; int retry; - m(printf("wait: waitng on pipe\n")); + m(printf("wait: waiting on pipe\n")); g_mutex_unlock(mp->lock); do { FD_ZERO(&rfds); @@ -637,14 +641,14 @@ g_mutex_lock(mp->lock); m(printf("wait: got pipe\n")); #ifdef HAVE_NSS - } else if (mp->prpipe.read != NULL) { + } else if (mp->prpipe.fd.read != NULL) { PRPollDesc polltable[1]; int retry; m(printf("wait: waitng on pr pipe\n")); g_mutex_unlock(mp->lock); do { - polltable[0].fd = mp->prpipe.read; + polltable[0].fd = mp->prpipe.fd.read; polltable[0].in_flags = PR_POLL_READ|PR_POLL_ERR; retry = PR_Poll(polltable, 1, PR_INTERVAL_NO_TIMEOUT) == -1 && PR_GetError() == PR_PENDING_INTERRUPT_ERROR; pthread_testcancel(); @@ -681,9 +685,9 @@ if (mp->pipe.fd.read != -1) E_READ(mp->pipe.fd.read, dummy, 1); #ifdef HAVE_NSS - if (mp->prpipe.read != NULL) { + if (mp->prpipe.fd.read != NULL) { int c; - c = PR_Read(mp->prpipe.read, dummy, 1); + c = PR_Read(mp->prpipe.fd.read, dummy, 1); g_assert(c == 1); } #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit SDL
by root＠suse.de 31 May '06

31 May '06

Hello community, here is the log from the commit of package SDL checked in at Thu Jun 1 00:12:02 CEST 2006. -------- --- SDL/SDL.changes 2006-03-10 18:55:45.000000000 +0100 +++ SDL/SDL.changes 2006-05-31 17:47:48.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 31 17:47:04 CEST 2006 - nadvornik(a)suse.cz + +- do not use depth 32 visuals [#178725] + +------------------------------------------------------------------- New: ---- SDL-1.2.9-no-32bit-visual.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL.spec ++++++ --- /var/tmp/diff_new_pack.9j0HtN/_old 2006-06-01 00:11:55.000000000 +0200 +++ /var/tmp/diff_new_pack.9j0HtN/_new 2006-06-01 00:11:55.000000000 +0200 @@ -17,7 +17,7 @@ Group: System/Libraries Autoreqprov: on Version: 1.2.9 -Release: 10 +Release: 19 Summary: Simple DirectMedia Layer Library Source: SDL-%{version}.tar.bz2 Patch: SDL-%{version}.dif @@ -34,6 +34,7 @@ Patch16: nonexec-stack.diff Patch17: SDL-%{version}-try_alsa_first.patch Patch18: SDL-%{version}-padding.patch +Patch19: SDL-%{version}-no-32bit-visual.patch Provides: sdl Obsoletes: sdl URL: http://www.libsdl.org/ @@ -84,6 +85,7 @@ %patch16 %patch17 %patch18 +%patch19 %build # Check for which CPU requirement we opimize and @@ -145,6 +147,8 @@ %{_mandir}/*/* %changelog -n SDL +* Wed May 31 2006 - nadvornik(a)suse.cz +- do not use depth 32 visuals [#178725] * Fri Mar 10 2006 - bk(a)suse.de - remove the ifnarch s390 s390x for Requires: alsa-devel (obsolete) * Thu Mar 09 2006 - bk(a)suse.de ++++++ SDL-1.2.9-no-32bit-visual.patch ++++++ --- src/video/x11/SDL_x11modes.c +++ src/video/x11/SDL_x11modes.c @@ -506,7 +506,7 @@ #endif /* HAVE_XIGXME */ { - static int depth_list[] = { 32, 24, 16, 15, 8 }; + static int depth_list[] = { 24, 16, 15, 8 }; int j, np; int use_directcolor = 1; XPixmapFormatValues *pf; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0