October 2008 - openSUSE Commits - openSUSE Mailing Lists

commit system-config-printer
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package system-config-printer checked in at Mon Oct 27 17:16:45 CET 2008. -------- --- GNOME/system-config-printer/system-config-printer.changes 2008-10-24 00:17:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/system-config-printer/system-config-printer.changes 2008-10-27 15:41:41.000000000 +0100 @@ -1,0 +2,16 @@ +Mon Oct 27 14:48:16 CET 2008 - vuntz(a)novell.com + +- Add cups-pk-helper-acceptjobs.patch to make cups-pk-helper + correctly handle AcceptJobs requests. This is essential to have + new printers configured with system-config-printer working. + Fix bnc#433634. +- Add system-config-printer-hide-my-default-printer.patch to hide + my-default-printer from the menus. Note that + system-config-printer already provides this functionality. +- Update system-config-printer-policykit.patch so that we don't + show the old password prompt after changing something in a + printer. +- Obsoletes gnome-cups-manager. No Provides, since it's not the + same application... + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- cups-pk-helper-acceptjobs.patch system-config-printer-hide-my-default-printer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ system-config-printer.spec ++++++ --- /var/tmp/diff_new_pack.SS5445/_old 2008-10-27 17:16:20.000000000 +0100 +++ /var/tmp/diff_new_pack.SS5445/_new 2008-10-27 17:16:20.000000000 +0100 @@ -22,7 +22,7 @@ License: GPL v2 or later Group: Hardware/Printing Version: 1.0.8 -Release: 2 +Release: 3 %define pycups_version 1.9.42 %define pysmbc_version 1.0.5 %define cups_pk_helper_version 0.0.1 @@ -48,7 +48,12 @@ Patch15: system-config-printer-policykit.patch # PATCH-FIX-OPENSUSE system-config-printer-cups-autoconfig-notifications.patch vuntz(a)novell.com -- Integration with cups-autoconfig. This will be removed after 11.1, since we'll move to hal-cups-utils. Patch16: system-config-printer-cups-autoconfig-notifications.patch +# PATCH-FIX-OPENSUSE system-config-printer-hide-my-default-printer.patch vuntz(a)novell.com -- Hide my-default-printer in the menus +Patch17: system-config-printer-hide-my-default-printer.patch +# PATCH-FIX-OPENSUSE cups-pk-helper-acceptjobs.patch vuntz(a)novell.com -- Make cups-pk-helper correctly handle AcceptJobs requests. +Patch18: cups-pk-helper-acceptjobs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Obsoletes: gnome-cups-manager <= 0.33 # For cups-pk-helper: BuildRequires: PolicyKit-devel BuildRequires: cups-devel @@ -103,6 +108,10 @@ %patch13 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 +pushd cups-pk-helper-%{cups_pk_helper_version} +%patch18 -p1 +popd %build autoreconf -f -i @@ -175,6 +184,19 @@ %files lang -f %{name}.lang %changelog +* Mon Oct 27 2008 vuntz(a)novell.com +- Add cups-pk-helper-acceptjobs.patch to make cups-pk-helper + correctly handle AcceptJobs requests. This is essential to have + new printers configured with system-config-printer working. + Fix bnc#433634. +- Add system-config-printer-hide-my-default-printer.patch to hide + my-default-printer from the menus. Note that + system-config-printer already provides this functionality. +- Update system-config-printer-policykit.patch so that we don't + show the old password prompt after changing something in a + printer. +- Obsoletes gnome-cups-manager. No Provides, since it's not the + same application... * Fri Oct 24 2008 vuntz(a)novell.com - Add system-config-printer-cups-autoconfig-notifications.patch. We display notifications for printers automatically configured ++++++ cups-pk-helper-acceptjobs.patch ++++++ diff --git a/src/cups-pk-helper-mechanism.c b/src/cups-pk-helper-mechanism.c index 45c5fd9..c31e567 100644 --- a/src/cups-pk-helper-mechanism.c +++ b/src/cups-pk-helper-mechanism.c @@ -678,6 +678,9 @@ cph_mechanism_printer_set_accept_jobs (CphMechanism *mechanism, if (!_check_polkit_for_action (mechanism, context, "printeraddremove")) return FALSE; + if (reason && reason[0] == '\0') + reason = NULL; + ret = cph_cups_printer_set_accept_jobs (mechanism->priv->cups, name, enabled, reason); _cph_mechanism_return_error (mechanism, context, !ret); diff --git a/src/cups.c b/src/cups.c index f8b2b9e..ea387a9 100644 --- a/src/cups.c +++ b/src/cups.c @@ -97,6 +97,13 @@ printFiles */ +typedef enum +{ + CPH_RESOURCE_ROOT, + CPH_RESOURCE_ADMIN, + CPH_RESOURCE_JOBS +} CphResource; + G_DEFINE_TYPE (CphCups, cph_cups, G_TYPE_OBJECT) #define CPH_CUPS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CPH_TYPE_CUPS, CphCupsPrivate)) @@ -256,25 +263,51 @@ _cph_cups_handle_reply (CphCups *cups, return retval; } +static const char * +_cph_cups_get_resource (CphResource resource) +{ + switch (resource) + { + case CPH_RESOURCE_ROOT: + return "/"; + case CPH_RESOURCE_ADMIN: + return "/admin/"; + case CPH_RESOURCE_JOBS: + return "/jobs/"; + default: + /* that's a fallback -- we don't use + * g_assert_not_reached() to avoir crashing. */ + g_critical ("Asking for a resource with no match."); + return "/"; + } +} + static gboolean -_cph_cups_send_request (CphCups *cups, - ipp_t *request) +_cph_cups_send_request (CphCups *cups, + ipp_t *request, + CphResource resource) { - ipp_t *reply; + ipp_t *reply; + const char *resource_char; - reply = cupsDoRequest (cups->priv->connection, request, "/"); + resource_char = _cph_cups_get_resource (resource); + reply = cupsDoRequest (cups->priv->connection, request, resource_char); return _cph_cups_handle_reply (cups, reply); } static gboolean -_cph_cups_post_request (CphCups *cups, - ipp_t *request, - const char *file) +_cph_cups_post_request (CphCups *cups, + ipp_t *request, + const char *file, + CphResource resource) { ipp_t *reply; + const char *resource_char; - reply = cupsDoFileRequest (cups->priv->connection, request, "/", file); + resource_char = _cph_cups_get_resource (resource); + reply = cupsDoFileRequest (cups->priv->connection, request, + resource_char, file); return _cph_cups_handle_reply (cups, reply); } @@ -282,7 +315,8 @@ _cph_cups_post_request (CphCups *cups, static gboolean _cph_cups_send_new_simple_request (CphCups *cups, ipp_op_t op, - const char *printer_name) + const char *printer_name, + CphResource resource) { ipp_t *request; @@ -293,7 +327,7 @@ _cph_cups_send_new_simple_request (CphCups *cups, request = ippNewRequest (op); _cph_cups_add_printer_uri (request, printer_name); - return _cph_cups_send_request (cups, request); + return _cph_cups_send_request (cups, request, resource); } static gboolean @@ -310,7 +344,7 @@ _cph_cups_send_new_printer_class_request (CphCups *cups, _cph_cups_add_printer_uri (request, printer_name); ippAddString (request, group, type, name, NULL, value); - if (_cph_cups_send_request (cups, request)) + if (_cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN)) return TRUE; /* it failed, maybe it was a class? */ @@ -321,7 +355,7 @@ _cph_cups_send_new_printer_class_request (CphCups *cups, _cph_cups_add_class_uri (request, printer_name); ippAddString (request, group, type, name, NULL, value); - return _cph_cups_send_request (cups, request); + return _cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN); } /****************************************************** @@ -369,7 +403,7 @@ cph_cups_printer_add (CphCups *cups, "printer-location", NULL, location); } - return _cph_cups_send_request (cups, request); + return _cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN); } gboolean @@ -403,7 +437,8 @@ cph_cups_printer_add_with_ppd_file (CphCups *cups, "printer-location", NULL, location); } - return _cph_cups_post_request (cups, request, ppd_filename); + return _cph_cups_post_request (cups, request, ppd_filename, + CPH_RESOURCE_ADMIN); } gboolean @@ -413,7 +448,8 @@ cph_cups_printer_delete (CphCups *cups, g_return_val_if_fail (CPH_IS_CUPS (cups), FALSE); return _cph_cups_send_new_simple_request (cups, CUPS_DELETE_PRINTER, - printer_name); + printer_name, + CPH_RESOURCE_ADMIN); } gboolean @@ -423,7 +459,8 @@ cph_cups_printer_set_default (CphCups *cups, g_return_val_if_fail (CPH_IS_CUPS (cups), FALSE); return _cph_cups_send_new_simple_request (cups, CUPS_SET_DEFAULT, - printer_name); + printer_name, + CPH_RESOURCE_ADMIN); } gboolean @@ -437,7 +474,8 @@ cph_cups_printer_set_enabled (CphCups *cups, op = enabled ? IPP_RESUME_PRINTER : IPP_PAUSE_PRINTER; - return _cph_cups_send_new_simple_request (cups, op, printer_name); + return _cph_cups_send_new_simple_request (cups, op, printer_name, + CPH_RESOURCE_ADMIN); } gboolean @@ -457,7 +495,7 @@ cph_cups_printer_set_uri (CphCups *cups, ippAddString (request, IPP_TAG_PRINTER, IPP_TAG_URI, "device-uri", NULL, printer_uri); - return _cph_cups_send_request (cups, request); + return _cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN); } /* reason must be NULL if accept is TRUE */ @@ -477,7 +515,8 @@ cph_cups_printer_set_accept_jobs (CphCups *cups, if (accept) return _cph_cups_send_new_simple_request (cups, CUPS_ACCEPT_JOBS, - printer_name); + printer_name, + CPH_RESOURCE_ADMIN); /* !accept */ request = ippNewRequest (CUPS_REJECT_JOBS); @@ -487,7 +526,7 @@ cph_cups_printer_set_accept_jobs (CphCups *cups, ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_TEXT, "printer-state-message", NULL, reason); - return _cph_cups_send_request (cups, request); + return _cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN); } /* Functions that can work on printer and class */ @@ -540,7 +579,7 @@ cph_cups_printer_class_set_shared (CphCups *cups, ippAddBoolean (request, IPP_TAG_OPERATION, "printer-is-shared", shared ? 1 : 0); - if (_cph_cups_send_request (cups, request)) + if (_cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN)) return TRUE; /* it failed, maybe it was a class? */ @@ -552,7 +591,7 @@ cph_cups_printer_class_set_shared (CphCups *cups, ippAddBoolean (request, IPP_TAG_OPERATION, "printer-is-shared", shared ? 1 : 0); - return _cph_cups_send_request (cups, request); + return _cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN); } gboolean @@ -573,7 +612,7 @@ cph_cups_printer_class_set_job_sheets (CphCups *cups, ippAddStrings (request, IPP_TAG_PRINTER, IPP_TAG_NAME, "job-sheets-default", 2, NULL, values); - if (_cph_cups_send_request (cups, request)) + if (_cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN)) return TRUE; /* it failed, maybe it was a class? */ @@ -585,7 +624,7 @@ cph_cups_printer_class_set_job_sheets (CphCups *cups, ippAddStrings (request, IPP_TAG_PRINTER, IPP_TAG_NAME, "job-sheets-default", 2, NULL, values); - return _cph_cups_send_request (cups, request); + return _cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN); } gboolean @@ -695,7 +734,7 @@ cph_cups_printer_class_set_option_default (CphCups *cups, } } - if (_cph_cups_send_request (cups, request)) { + if (_cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN)) { retval = TRUE; goto out; } @@ -726,7 +765,7 @@ cph_cups_printer_class_set_option_default (CphCups *cups, } } - retval = _cph_cups_send_request (cups, request); + retval = _cph_cups_send_request (cups, request, CPH_RESOURCE_ADMIN); out: g_free (option_name); ++++++ system-config-printer-hide-my-default-printer.patch ++++++ Index: system-config-printer-1.0.8/my-default-printer.desktop.in =================================================================== --- system-config-printer-1.0.8.orig/my-default-printer.desktop.in +++ system-config-printer-1.0.8/my-default-printer.desktop.in @@ -6,3 +6,4 @@ Exec=my-default-printer Terminal=false Type=Application Icon=system-config-printer +Hidden=true ++++++ system-config-printer-policykit.patch ++++++ --- /var/tmp/diff_new_pack.SS5445/_old 2008-10-27 17:16:20.000000000 +0100 +++ /var/tmp/diff_new_pack.SS5445/_new 2008-10-27 17:16:21.000000000 +0100 @@ -11,7 +11,7 @@ errordialogs.py \ jobviewer.py \ diff --git a/authconn.py b/authconn.py -index 6244eee..ad3bfb0 100644 +index eb2dd23..3795c3b 100644 --- a/authconn.py +++ b/authconn.py @@ -18,6 +18,7 @@ @@ -532,3 +532,16 @@ +# renewSubscription +# printFile +# printFiles +diff --git a/system-config-printer.py b/system-config-printer.py +index 9b5830e..3587e75 100755 +--- a/system-config-printer.py ++++ b/system-config-printer.py +@@ -1537,7 +1537,7 @@ class GUI(GtkGUI, monitor.Watcher): + return True + self.changed = set() # of options + +- if not self.__dict__.has_key ("server_settings"): ++ if not self.cups._use_pk and not self.__dict__.has_key ("server_settings"): + # We can authenticate with the server correctly at this point, + # but we have never fetched the server settings to see whether + # the server is publishing shared printers. Fetch the settings ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 selfphp
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package selfphp checked in at Mon Oct 27 17:16:05 CET 2008. -------- --- selfphp/selfphp.changes 2006-10-26 11:59:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/selfphp/selfphp.changes 2008-10-27 16:41:06.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 27 13:32:34 CET 2008 - cwh(a)suse.de + +- update to v5.1.7 +- using fdupes to avoid duplicate files + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- selfphp_4.1_.tar.bz2 New: ---- selfphp_5.1.7_.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ selfphp.spec ++++++ --- /var/tmp/diff_new_pack.ZZ3797/_old 2008-10-27 17:15:51.000000000 +0100 +++ /var/tmp/diff_new_pack.ZZ3797/_new 2008-10-27 17:15:51.000000000 +0100 @@ -1,25 +1,34 @@ # -# spec file for package selfphp (Version 4.1) +# spec file for package selfphp (Version 5.1.7) # -# 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. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: selfphp -URL: http://www.selfphp.info/ +Url: http://www.selfphp.info/ License: Public Domain, Freeware Group: Documentation/Other -Autoreqprov: off -Version: 4.1 +AutoReqProv: off +BuildRequires: fastjar fdupes +Version: 5.1.7 Release: 1 Summary: PHP reference and tutorial BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArchitectures: noarch +BuildArch: noarch Source: selfphp_%{version}_.tar.bz2 %description @@ -33,13 +42,16 @@ -------- Damir Enseleit <mail(a)selfphp3.de> +%prep + +%build %install -rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/share/doc/selfphp cd $RPM_BUILD_ROOT/usr/share/doc/selfphp ls -l %SOURCE0 tar xjf %SOURCE0 +%fdupes -s $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -48,31 +60,34 @@ %defattr(644,root,root,755) %doc /usr/share/doc/selfphp -%changelog -n selfphp -* Thu Oct 26 2006 - cwh(a)suse.de +%changelog +* Mon Oct 27 2008 cwh(a)suse.de +- update to v5.1.7 +- using fdupes to avoid duplicate files +* Thu Oct 26 2006 cwh(a)suse.de update to 4.1: - Now includes a Cookbook. - bugfixes and some other extensions -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Tue Jan 10 2006 - cwh(a)suse.de +* Tue Jan 10 2006 cwh(a)suse.de updated to v3.0: - some updates of the reference documentation - added a complete PHP tutorial - new design - added printing functionality, quick navigation and additional search options -* Tue May 24 2005 - cwh(a)suse.de +* Tue May 24 2005 cwh(a)suse.de - update to 2.0 -* Wed Feb 23 2005 - ro(a)suse.de +* Wed Feb 23 2005 ro(a)suse.de - update to 1.2 -* Mon Feb 23 2004 - hmacht(a)suse.de +* Mon Feb 23 2004 hmacht(a)suse.de - building as non-root -* Mon Jul 21 2003 - coolo(a)suse.de +* Mon Jul 21 2003 coolo(a)suse.de - use %%defattr -* Wed May 21 2003 - coolo(a)suse.de +* Wed May 21 2003 coolo(a)suse.de - use %%doc -* Tue Sep 17 2002 - ro(a)suse.de +* Tue Sep 17 2002 ro(a)suse.de - removed bogus self-provides -* Fri Apr 19 2002 - ray(a)suse.de +* Fri Apr 19 2002 ray(a)suse.de - inital version 1.0.1 ++++++ selfphp_4.1_.tar.bz2 -> selfphp_5.1.7_.tar.bz2 ++++++ selfphp/selfphp_4.1_.tar.bz2 /mounts/work_src_done/STABLE/selfphp/selfphp_5.1.7_.tar.bz2 differ: byte 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 seahorse
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package seahorse checked in at Mon Oct 27 17:15:53 CET 2008. -------- --- GNOME/seahorse/seahorse.changes 2008-10-07 14:05:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/seahorse/seahorse.changes 2008-10-19 23:39:40.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Oct 20 08:37:03 EST 2008 - mboman(a)suse.de + +- Update to version 2.24.1: + + Fix problems with seahorse crashing when searching for + remote keys. + + Build fixes on Solaris + + Fix selection of keys in libcryptui. + + I18n fixes. + +------------------------------------------------------------------- @@ -6,0 +17,25 @@ +Wed Sep 24 11:53:13 CDT 2008 - maw(a)suse.de + +- Update to version 2.24.0: + + Some tweaks to the password prompt window, including allowing + minimizing to release the keyboard grab + + Return a 'cancelled' error when from the daemon crypto dbus + methods when a user cancels out of a password prompt + + Show revoked subkeys properly in details view of PGP keys + + Fix problem deleting SSH keys + + Fix dialog prompt column widths, and elipsize long text in + key listing + + Fix problem with 'no keys available' when trying to sign a + PGP key from within the key manager + + Add 'exportable' flag to objects/keys and don't enable export + UI if selected objects are not exportable + + Misc. other fixes. + +------------------------------------------------------------------- +Wed Sep 24 09:38:23 CEST 2008 - wr(a)opensuse.org + +- removed traces of unused subpackages (part of bnc#420641) +- added libnotify support +- removed obsolete configure options + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- seahorse-2.23.92.tar.bz2 New: ---- seahorse-2.24.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seahorse.spec ++++++ --- /var/tmp/diff_new_pack.Wf3136/_old 2008-10-27 17:15:39.000000000 +0100 +++ /var/tmp/diff_new_pack.Wf3136/_new 2008-10-27 17:15:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package seahorse (Version 2.23.92) +# spec file for package seahorse (Version 2.24.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,19 +19,19 @@ Name: seahorse -BuildRequires: epiphany-devel fdupes gedit-devel gnome-doc-utils-devel +BuildRequires: fdupes gedit-devel gnome-doc-utils-devel BuildRequires: gnome-panel-devel gnome-themes gpg2 gpgme-devel gvfs-devel BuildRequires: intltool libavahi-glib-devel libglade2-devel BuildRequires: libgnomeprintui-devel libgpg-error-devel libsoup-devel BuildRequires: libwnck-devel libxml2-devel nautilus-devel openldap2-devel BuildRequires: openssh perl-XML-Parser update-desktop-files -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ libnotify-devel License: GPL v2 or later -Group: System/GUI/GNOME +Group: Productivity/Security AutoReqProv: on PreReq: gconf2 -Version: 2.23.92 -Release: 2 +Version: 2.24.1 +Release: 1 Requires: %{name}-lang = %{version} Summary: GNOME2 interface for gnupg Source: ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2 @@ -74,53 +74,6 @@ Nate Nielsen <nielsen(a)memberwebs.com> Adam Schreiber <sadam(a)clemson.edu> -%package gedit-plugin -License: GPL v2 or later -Summary: Seahorse plugin for gedit -Group: System/GUI/GNOME -Requires: %{name} = %{version}-%{release} -# Requires: gedit = %(rpm -q --qf '%%{version}' gedit) -Requires: gedit - -%description gedit-plugin -Seahorse is a gnome2 interface for gnupg. It uses gpgme as the backend. - -This package provides a plugin for the gedit text editor. - - - -Authors: --------- - Jacob Perkins <jap1(a)users.sourceforge.net> - Jose Carlos Garcia Sogo <jsogo(a)users.sourceforge.net> - Jean Schurger <jk24(a)users.sourceforge.net> - Nate Nielsen <nielsen(a)memberwebs.com> - Adam Schreiber <sadam(a)clemson.edu> - -%package epiphany-plugin -# When epiphany is updated, _epiphany_major_version will need to be too. -%define _epiphany_major_version 2.22 -License: GPL v2 or later -Summary: GNOME2 interface for epiphany -Group: System/GUI/GNOME -Requires: %{name} = %{version}-%{release} -Requires: epiphany - -%description epiphany-plugin -Seahorse is a gnome2 interface for gnupg. It uses gpgme as the backend. - -This package provides a plugin for the epiphany web browser. - - - -Authors: --------- - Jacob Perkins <jap1(a)users.sourceforge.net> - Jose Carlos Garcia Sogo <jsogo(a)users.sourceforge.net> - Jean Schurger <jk24(a)users.sourceforge.net> - Nate Nielsen <nielsen(a)memberwebs.com> - Adam Schreiber <sadam(a)clemson.edu> - %lang_package %prep %setup @@ -130,10 +83,8 @@ %{?suse_update_config:%{suse_update_config -f}} autoreconf -f -i export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DWITH_SSH" -%configure \ - --with-ssh \ - --enable-gedit -make +%configure +make %{?jobs:-j%jobs} %install export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 @@ -143,9 +94,6 @@ # ...everywhere. rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib*.*a -#rm $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0/*.*a -#rm $RPM_BUILD_ROOT/%{_libdir}/gedit-2/plugins/*.*a -#rm $RPM_BUILD_ROOT/%{_libdir}/epiphany/%_epiphany_major_version/extensions/*.*a ( cd ${RPM_BUILD_ROOT}/%{_datadir}/mime/ && rm -rf XMLnamespaces globs mime application magic ) unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL %suse_update_desktop_file %{name} Security -G "Passwords and Encryption Keys" -N "Seahorse" @@ -180,23 +128,15 @@ %doc AUTHORS ChangeLog NEWS README %defattr (-, root, root) %{_prefix}/bin/* -%dir %{_libdir}/seahorse +%{_libdir}/seahorse %{_libdir}/*.so* -%{_libdir}/seahorse/* %{_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/org.gnome.seahorse.service -%{_datadir}/icons/hicolor/*/apps/*.svg -%{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/man/man1/*.1.gz %dir %{_datadir}/omf/seahorse %{_datadir}/omf/seahorse/*.omf -%{_datadir}/pixmaps/*.svg -%dir %{_datadir}/pixmaps/seahorse -%dir %{_datadir}/pixmaps/seahorse/22x22 -%dir %{_datadir}/pixmaps/seahorse/48x48 -%dir %{_datadir}/pixmaps/seahorse/scalable -%{_datadir}/pixmaps/seahorse/*/*.svg -%{_datadir}/pixmaps/seahorse/*/*.png +%{_datadir}/pixmaps/seahorse %{_datadir}/seahorse %files lang -f %{name}.lang @@ -208,9 +148,35 @@ %{_includedir}/libcryptui/*.h %changelog +* Mon Oct 20 2008 mboman(a)suse.de +- Update to version 2.24.1: + + Fix problems with seahorse crashing when searching for + remote keys. + + Build fixes on Solaris + + Fix selection of keys in libcryptui. + + I18n fixes. * Tue Oct 07 2008 meissner(a)suse.de - removed xulrunner requires (since plugin is gone too) -* Tue Sep 09 2008 mboman(a)novell.com +* Wed Sep 24 2008 maw(a)suse.de +- Update to version 2.24.0: + + Some tweaks to the password prompt window, including allowing + minimizing to release the keyboard grab + + Return a 'cancelled' error when from the daemon crypto dbus + methods when a user cancels out of a password prompt + + Show revoked subkeys properly in details view of PGP keys + + Fix problem deleting SSH keys + + Fix dialog prompt column widths, and elipsize long text in + key listing + + Fix problem with 'no keys available' when trying to sign a + PGP key from within the key manager + + Add 'exportable' flag to objects/keys and don't enable export + UI if selected objects are not exportable + + Misc. other fixes. +* Wed Sep 24 2008 wr(a)opensuse.org +- removed traces of unused subpackages (part of bnc#420641) +- added libnotify support +- removed obsolete configure options +* Mon Sep 08 2008 mboman(a)novell.com - Update to version 2.23.92: + Fix crash when changing a stored Gnome Keyring password. + Fix certain crashes on syncing, searching and other operations. @@ -291,7 +257,7 @@ * Fri Mar 14 2008 maw(a)suse.de - Update to version 2.22.0: + Cosmetic version bump. -* Wed Mar 05 2008 maw(a)suse.de +* Tue Mar 04 2008 maw(a)suse.de - Update to version 2.21.92: + Documentation updates + Translation fixes. @@ -308,7 +274,7 @@ + Fix build problems with nautilus 2.21.x and later + Install nautilus extension to correct directory + Support better dropping of text keys onto main window. -* Thu Jan 10 2008 maw(a)suse.de +* Wed Jan 09 2008 maw(a)suse.de - Update to 2.21.4: + Remove ssh proxy since gnome-keyring now has a proper ssh agent + Don't hardcode epiphany extensions directories @@ -326,7 +292,7 @@ * Other UI and code fixes - Remove upstreamed patch seahourse-abuild-warnings.patch - Annotate seahourse-desktop.patch -* Wed Dec 05 2007 maw(a)suse.de +* Tue Dec 04 2007 maw(a)suse.de - Don't require openldap2 to build. * Wed Nov 21 2007 maw(a)suse.de - Rename abuild.patch to seahorse-abuild-warnings.patch @@ -366,17 +332,17 @@ + Updated translations - Respin abuild.patch - Remove seahorse-gpg-version.patch, which has been upstreamed. -* Thu Sep 06 2007 maw(a)suse.de +* Wed Sep 05 2007 maw(a)suse.de - Correct a .desktop file (#272535). * Tue Aug 07 2007 maw(a)suse.de - Use %%fdupes - Split off a -lang subpackage - s#%%run_ldconfig#/sbin/ldconfig# in %%post and %%postun. -* Sat Jun 23 2007 maw(a)suse.de +* Fri Jun 22 2007 maw(a)suse.de - s/gpg/gpg2/ in the buildreq - Add seahorse-gpg-version.patch to allow builds when only gpg2 is installed. -* Wed Jun 06 2007 ro(a)suse.de +* Tue Jun 05 2007 ro(a)suse.de - added gpg to buildreq * Mon Apr 16 2007 maw(a)suse.de - Create a -devel subpackage (#262572). @@ -400,11 +366,11 @@ * Other minor fixes - Updated translations for the ar, bg, ca, da, dz, el, es, et, fi, fr, it, gu, ja, lt, mk, nb, pt, pt_BR, sv, and th locales. -* Wed Apr 11 2007 maw(a)suse.de +* Tue Apr 10 2007 maw(a)suse.de - Add abuild.patch, to silence some warnings. * Tue Apr 10 2007 maw(a)suse.de - Add openssh as an additional build requirement. -* Tue Apr 10 2007 maw(a)suse.de +* Mon Apr 09 2007 maw(a)suse.de - Update to version 1.0 - Remove seahorse-uninited.patch which no longer appears to apply - Many fixes for bugzilla.gnome.org incl. #415808, #408774, #414078, @@ -425,9 +391,9 @@ and #342005 - No longer try to rename certain localizations - Buildrequire gnome-doc-utils-devel -* Mon Apr 02 2007 ro(a)suse.de +* Sun Apr 01 2007 ro(a)suse.de - updated gconf scriptlets -* Mon Feb 05 2007 ro(a)suse.de +* Sun Feb 04 2007 ro(a)suse.de - GNOME moved to /usr * Thu Dec 07 2006 sbrabec(a)suse.cz - Fixed MIME database path in scriptlets (#225666). @@ -435,13 +401,13 @@ - Do not touch obsolete run-scrollkeeper-update. * Mon Dec 04 2006 jhargadon(a)suse.de - removed ownership of /opt/gnome/share/mime (#225667) -* Mon Sep 04 2006 ro(a)suse.de +* Sun Sep 03 2006 ro(a)suse.de - fix build (find icon file) * Tue Jul 18 2006 nadvornik(a)suse.cz - fixed check for minimal gpgme version * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Sun Jan 15 2006 kukuk(a)suse.de +* Sat Jan 14 2006 kukuk(a)suse.de - Add gpgme-devel to nfb -* Sat Jan 07 2006 gekker(a)suse.de +* Fri Jan 06 2006 gekker(a)suse.de - Initial import into autobuild, version 0.8 (#131375) ++++++ seahorse-2.23.92.tar.bz2 -> seahorse-2.24.1.tar.bz2 ++++++ ++++ 193859 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sblim-sfcb
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package sblim-sfcb checked in at Mon Oct 27 17:15:41 CET 2008. -------- --- sblim-sfcb/sblim-sfcb.changes 2008-10-15 11:09:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/sblim-sfcb/sblim-sfcb.changes 2008-10-24 08:32:46.563580000 +0200 @@ -1,0 +2,15 @@ +Wed Oct 22 14:57:46 MDT 2008 - bwhiteley(a)suse.de + +- The following bugs from the sblim tracker address bnc#425457 + - [ 2164750 ] sfcb does not handle some malformed HTTP requests correctly + - [ 2172888 ] http content-length is not constrained + - [ 2169514 ] spRcvMsg doesn't check malloc return + - [ 2169527 ] Some XML parsing error strings do not have sufficient space + - [ 2169607 ] sqlLexer assumes line lengths under MAXBUF + - [ 2175426 ] possible int overflow + - [ 2158198 ] syslog call incorrect + - [ 2172023 ] mlogf call cleanups + - [ 2175507 ] sockaddr_un not allocated for localconnect server +- Some code cleanup. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sblim-sfcb-1.3.0-root_only_auth.patch sblim-sfcb-1.3.0-uds_auth.patch sblim-sfcb-1.3.2-automake.patch sblim-sfcb-1.3.2-Werror.patch sblim-sfcb-align.patch New: ---- 0001-uds_auth.patch 0002-root_only_auth.patch 0003-align.patch 0006-Werror.patch 0007-automake.patch 0008-enable-hex-trace-mask.patch 0009-clean-up-semaphore-array-index-calculation.patch 0011-check-prevent-various-buffer-overflows.patch 0015-fix-potential-memory-leak.patch 0016-check-result-from-_methProvider.patch 0017-abort-on-socket-error-with-better-error-msg.patch 0018-buffer-size-check-in-localConnectServer.patch 0019-internal_provider.patch 0100-check_length_sanity.patch 0110-2164750-sfcb_handle_malformed_requests.patch 0120-max_content_length.patch 0130-2169514-check_malloc.patch 0140-2169527-attrsOk_alloca_fix.patch 0150-2169607-strcpy.patch 0160-2158198-syslog.patch 0170-2172023-mlogf.patch 0180-2175507-alloca_sockaddr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-sfcb.spec ++++++ --- /var/tmp/diff_new_pack.z32654/_old 2008-10-27 17:14:46.000000000 +0100 +++ /var/tmp/diff_new_pack.z32654/_new 2008-10-27 17:14:46.000000000 +0100 @@ -21,7 +21,7 @@ Name: sblim-sfcb Version: 1.3.2 -Release: 7 +Release: 8 Group: System/Management License: Other uncritical OpenSource License; CPL 1.0 Url: http://sblim.sf.net/ @@ -31,11 +31,28 @@ Source2: sblim-sfcb.init %endif Source3: autoconfiscate.sh-mofc -Patch1: sblim-sfcb-1.3.0-uds_auth.patch -Patch2: sblim-sfcb-1.3.0-root_only_auth.patch -Patch3: sblim-sfcb-align.patch -Patch4: sblim-sfcb-1.3.2-Werror.patch -Patch5: sblim-sfcb-1.3.2-automake.patch +Patch1: 0001-uds_auth.patch +Patch2: 0002-root_only_auth.patch +Patch3: 0003-align.patch +Patch6: 0006-Werror.patch +Patch7: 0007-automake.patch +Patch8: 0008-enable-hex-trace-mask.patch +Patch9: 0009-clean-up-semaphore-array-index-calculation.patch +Patch11: 0011-check-prevent-various-buffer-overflows.patch +Patch15: 0015-fix-potential-memory-leak.patch +Patch16: 0016-check-result-from-_methProvider.patch +Patch17: 0017-abort-on-socket-error-with-better-error-msg.patch +Patch18: 0018-buffer-size-check-in-localConnectServer.patch +Patch19: 0019-internal_provider.patch +Patch100: 0100-check_length_sanity.patch +Patch110: 0110-2164750-sfcb_handle_malformed_requests.patch +Patch120: 0120-max_content_length.patch +Patch130: 0130-2169514-check_malloc.patch +Patch140: 0140-2169527-attrsOk_alloca_fix.patch +Patch150: 0150-2169607-strcpy.patch +Patch160: 0160-2158198-syslog.patch +Patch170: 0170-2172023-mlogf.patch +Patch180: 0180-2175507-alloca_sockaddr.patch Provides: cimserver Provides: cim-server %if 0%{?suse_version} >= 1030 @@ -66,11 +83,28 @@ %prep %setup -q -%patch1 -b .uds_auth.patch -%patch2 -b .root_only_auth.patch -%patch3 -%patch4 -%patch5 +%patch1 -p1 -b .0001-uds_auth.patch +%patch2 -p1 -b .0002-root_only_auth.patch +%patch3 -p1 -b .0003-align.patch +%patch6 -p1 -b .0006-Werror.patch +%patch7 -p1 -b .0007-automake.patch +%patch8 -p1 -b .0008-enable-hex-trace-mask.patch +%patch9 -p1 -b .0009-clean-up-semaphore-array-index-calculation.patch +%patch11 -p1 -b .0011-check-prevent-various-buffer-overflows.patch +%patch15 -p1 -b .0015-fix-potential-memory-leak.patch +%patch16 -p1 -b .0016-check-result-from-_methProvider.patch +%patch17 -p1 -b .0017-abort-on-socket-error-with-better-error-msg.patch +%patch18 -p1 -b .0018-buffer-size-check-in-localConnectServer.patch +%patch19 -p0 -b .0019-internal_provider.patch +%patch100 -p0 -b .0100-check_length_sanity.patch +%patch110 -p0 -b .0110-2164750-sfcb_handle_malformed_requests.patch +%patch120 -p0 -b .0120-max_content_length.patch +%patch130 -p0 -b .0130-2169514-check_malloc.patch +%patch140 -p0 -b .0140-2169527-attrsOk_alloca_fix.patch +%patch150 -p0 -b .0150-2169607-strcpy.patch +%patch160 -p0 -b .0160-2158198-syslog.patch +%patch170 -p0 -b .0170-2172023-mlogf.patch +%patch180 -p0 -b .0180-2175507-alloca_sockaddr.patch export PATCH_GET=0 %build @@ -78,9 +112,10 @@ cp %SOURCE1 . cp %SOURCE3 mofc/autoconfiscate.sh chmod +x mofc/autoconfiscate.sh -sh autoconfiscate.sh +sh ./autoconfiscate.sh #if test -d mofc; then cd mofc && autoreconf -f -i; fi #%%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CIMSCHEMA_SOURCE=%{SOURCE1} CIMSCHEMA_MOF=cimv216.mof CIMSCHEMA_SUBDIRS=y +mkdir -p m4 %configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 make @@ -156,6 +191,18 @@ %files -f _pkg_list %changelog +* Wed Oct 22 2008 bwhiteley(a)suse.de +- The following bugs from the sblim tracker address bnc#425457 + - [ 2164750 ] sfcb does not handle some malformed HTTP requests correctly + - [ 2172888 ] http content-length is not constrained + - [ 2169514 ] spRcvMsg doesn't check malloc return + - [ 2169527 ] Some XML parsing error strings do not have sufficient space + - [ 2169607 ] sqlLexer assumes line lengths under MAXBUF + - [ 2175426 ] possible int overflow + - [ 2158198 ] syslog call incorrect + - [ 2172023 ] mlogf call cleanups + - [ 2175507 ] sockaddr_un not allocated for localconnect server +- Some code cleanup. * Wed Oct 15 2008 kkaempf(a)suse.de - help Buildservice executing shell scripts. * Tue Oct 14 2008 kkaempf(a)suse.de @@ -173,24 +220,24 @@ - Added RTLD_GLOBAL to ldflags when loading providers. * Mon Aug 18 2008 bwhiteley(a)suse.de - don't remove buildroot in %%install -* Tue Aug 12 2008 bwhiteley(a)suse.de +* Mon Aug 11 2008 bwhiteley(a)suse.de - Added RequiredStart and RequiredStop to init script. -* Wed Jul 23 2008 bwhiteley(a)suse.de +* Tue Jul 22 2008 bwhiteley(a)suse.de - Fix SSL options to disable SSLv2 and weak ciphers. - Fix XML parser to unescape newlines. -* Tue Jul 22 2008 bwhiteley(a)suse.de +* Mon Jul 21 2008 bwhiteley(a)suse.de - Fixed limited length error strings in XML. -* Fri May 30 2008 bwhiteley(a)suse.de +* Thu May 29 2008 bwhiteley(a)suse.de - Enhanced to support HTTP connections over unix domain sockets, including unix socket peer credential authentication without passwords. - Changed authentication module to only allow users with uid 0 to log in. -* Sat May 17 2008 bwhiteley(a)suse.de +* Fri May 16 2008 bwhiteley(a)suse.de - Moved back to 1.3.0. 1.3.1 has problems. Removed schema package, and placed a dependency on cim-schema package instead. -* Wed May 14 2008 bwhiteley(a)suse.de +* Tue May 13 2008 bwhiteley(a)suse.de - Updated to 1.3.1. Other packaging changes. -* Sat May 03 2008 bwhiteley(a)suse.de +* Fri May 02 2008 bwhiteley(a)suse.de - Initial checkin ++++++ sblim-sfcb-1.3.0-uds_auth.patch -> 0001-uds_auth.patch ++++++ --- sblim-sfcb/sblim-sfcb-1.3.0-uds_auth.patch 2008-10-15 11:09:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/sblim-sfcb/0001-uds_auth.patch 2008-10-24 08:32:27.566596000 +0200 @@ -1,5 +1,16 @@ ---- ./sfcb.cfg.pre.in.orig 2008-08-27 09:54:44.000000000 -0600 -+++ ./sfcb.cfg.pre.in 2008-08-27 09:55:06.000000000 -0600 +From 488d9b89c806e41bf0bda9979429d220139eb178 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> +Date: Wed, 22 Oct 2008 10:26:45 +0200 +Subject: [PATCH] uds_auth.patch + +--- + sfcb.cfg.pre.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in +index b0e2de7..80c1f88 100644 +--- a/sfcb.cfg.pre.in ++++ b/sfcb.cfg.pre.in @@ -2,7 +2,7 @@ # Sample Configuration for Small Footprint CIM Broker httpPort: 5988 @@ -9,3 +20,6 @@ httpProcs: 8 httpsPort: 5989 enableHttps: @SFCB_CONF_HTTPS@ +-- +1.6.0.2 + ++++++ sblim-sfcb-1.3.0-root_only_auth.patch -> 0002-root_only_auth.patch ++++++ --- sblim-sfcb/sblim-sfcb-1.3.0-root_only_auth.patch 2008-10-15 11:09:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/sblim-sfcb/0002-root_only_auth.patch 2008-10-24 08:32:28.196965000 +0200 @@ -1,5 +1,16 @@ ---- ./sfcBasicPAMAuthentication.c.orig 2008-05-29 14:17:19.000000000 -0600 -+++ ./sfcBasicPAMAuthentication.c 2008-05-29 14:40:07.000000000 -0600 +From 6458c05b58be2e39f0fb39815514671fa4f490a1 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> +Date: Wed, 22 Oct 2008 10:27:14 +0200 +Subject: [PATCH] root_only_auth.patch + +--- + sfcBasicPAMAuthentication.c | 20 ++++++++++++++++++++ + 1 files changed, 20 insertions(+), 0 deletions(-) + +diff --git a/sfcBasicPAMAuthentication.c b/sfcBasicPAMAuthentication.c +index c03e34d..de4786b 100644 +--- a/sfcBasicPAMAuthentication.c ++++ b/sfcBasicPAMAuthentication.c @@ -23,6 +23,10 @@ #include <stdio.h> #include <stdlib.h> @@ -11,7 +22,7 @@ #include <security/pam_appl.h> -@@ -58,7 +62,23 @@ +@@ -58,7 +62,23 @@ static int _sfcBasicAuthenticateRemote(char *user, char *pw, char *rhost) }; pam_handle_t *pamh = NULL; int rc, retval; @@ -35,3 +46,6 @@ rc = pam_start(SFCB_PAM_APP, user, &sfcConvStruct, & pamh); +-- +1.6.0.2 + ++++++ sblim-sfcb-align.patch -> 0003-align.patch ++++++ --- sblim-sfcb/sblim-sfcb-align.patch 2008-10-15 11:09:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/sblim-sfcb/0003-align.patch 2008-10-24 08:32:28.723438000 +0200 @@ -1,5 +1,16 @@ ---- objectImpl.h -+++ objectImpl.h +From 9df6a7399ddb15428e6afe6f6aafb5e3f4087bbf Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> +Date: Wed, 22 Oct 2008 10:27:43 +0200 +Subject: [PATCH] align.patch + +--- + objectImpl.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/objectImpl.h b/objectImpl.h +index 7eb1298..0ad14e6 100644 +--- a/objectImpl.h ++++ b/objectImpl.h @@ -52,7 +52,7 @@ #define GetMax(f) (GetLo15b((f))) #define IsMallocedMax(x) (GetHi1b((x))) @@ -9,3 +20,6 @@ #define CLEXTRA 0 #define ALIGN(x,y) (x == 0 ? 0 : ((((x-1)/y)+1)*y)) +-- +1.6.0.2 + ++++++ sblim-sfcb-1.3.2-Werror.patch -> 0006-Werror.patch ++++++ --- sblim-sfcb/sblim-sfcb-1.3.2-Werror.patch 2008-10-15 11:09:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/sblim-sfcb/0006-Werror.patch 2008-10-24 08:32:29.309853000 +0200 @@ -1,6 +1,25 @@ -diff -wruN ../orig-sblim-sfcb-1.3.2/cimcClientSfcbLocal.c ./cimcClientSfcbLocal.c ---- ../orig-sblim-sfcb-1.3.2/cimcClientSfcbLocal.c 2008-10-03 02:24:47.000000000 +0200 -+++ ./cimcClientSfcbLocal.c 2008-10-14 11:45:47.000000000 +0200 +From ab48a48bef2a5cecb35c5c72ee9b236af5f7b6cb Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> +Date: Wed, 22 Oct 2008 10:32:34 +0200 +Subject: [PATCH] Werror.patch + +keep gcc happy even with -Werror +--- + cimcClientSfcbLocal.c | 2 +- + httpAdapter.c | 2 +- + httpComm.c | 2 +- + mofc/mofparse.c | 2 +- + mofc/mofs.l | 2 +- + objectImplSwapI32toP32.c | 4 ++++ + queryParser.y | 2 +- + selectcond.c | 2 +- + sfcbdumpP32onI32.c | 12 ++++++------ + 9 files changed, 17 insertions(+), 13 deletions(-) + +diff --git a/cimcClientSfcbLocal.c b/cimcClientSfcbLocal.c +index 67ad0ca..3f79540 100644 +--- a/cimcClientSfcbLocal.c ++++ b/cimcClientSfcbLocal.c @@ -29,7 +29,7 @@ @@ -10,10 +29,11 @@ (st)->msg=NewCMPIString((chars),NULL); }} #define NewCMPIString sfcb_native_new_CMPIString -diff -wruN ../orig-sblim-sfcb-1.3.2/httpAdapter.c ./httpAdapter.c ---- ../orig-sblim-sfcb-1.3.2/httpAdapter.c 2008-08-09 04:15:51.000000000 +0200 -+++ ./httpAdapter.c 2008-10-14 11:46:36.000000000 +0200 -@@ -814,7 +814,7 @@ +diff --git a/httpAdapter.c b/httpAdapter.c +index 69c8f98..8671b84 100644 +--- a/httpAdapter.c ++++ b/httpAdapter.c +@@ -814,7 +814,7 @@ static int doHttpRequest(CommHndl conn_fd) int authorized = 0; if (!discardInput && doUdsAuth) { struct ucred cr; @@ -22,10 +42,11 @@ if (getsockopt(conn_fd.socket, SOL_SOCKET, SO_PEERCRED, &cr, &cl) == 0) { if (cr.uid == 0) { authorized = 1; -diff -wruN ../orig-sblim-sfcb-1.3.2/httpComm.c ./httpComm.c ---- ../orig-sblim-sfcb-1.3.2/httpComm.c 2006-03-06 05:11:08.000000000 +0100 -+++ ./httpComm.c 2008-10-14 11:47:10.000000000 +0200 -@@ -122,7 +122,7 @@ +diff --git a/httpComm.c b/httpComm.c +index 00a70a5..66aa2b5 100644 +--- a/httpComm.c ++++ b/httpComm.c +@@ -122,7 +122,7 @@ void commFlush(CommHndl hndl) #if defined USE_SSL if (hndl.bio) { @@ -34,10 +55,11 @@ } else #endif if (hndl.file) { -diff -wruN ../orig-sblim-sfcb-1.3.2/mofc/mofparse.c ./mofc/mofparse.c ---- ../orig-sblim-sfcb-1.3.2/mofc/mofparse.c 2006-10-27 15:14:21.000000000 +0200 -+++ ./mofc/mofparse.c 2008-10-14 11:51:40.000000000 +0200 -@@ -112,7 +112,7 @@ +diff --git a/mofc/mofparse.c b/mofc/mofparse.c +index 64af1dc..af22686 100644 +--- a/mofc/mofparse.c ++++ b/mofc/mofparse.c +@@ -112,7 +112,7 @@ static void version() static void help(const char * name) { usage(name); @@ -46,9 +68,10 @@ printf(" Allowed options are\n"); printf(" -h display this message\n"); printf(" -v print some extra information\n"); -diff -wruN ../orig-sblim-sfcb-1.3.2/mofc/mofs.l ./mofc/mofs.l ---- ../orig-sblim-sfcb-1.3.2/mofc/mofs.l 2007-06-22 12:34:44.000000000 +0200 -+++ ./mofc/mofs.l 2008-10-14 11:52:07.000000000 +0200 +diff --git a/mofc/mofs.l b/mofc/mofs.l +index 5eead61..ec14b31 100644 +--- a/mofc/mofs.l ++++ b/mofc/mofs.l @@ -24,7 +24,7 @@ # include <ctype.h> # include <hash.h> @@ -58,10 +81,11 @@ # if defined SCANDEBUG /* for debugging */ # undef YY_DECL typedef YY_CHAR * TOKENTYPE; -diff -wruN ../orig-sblim-sfcb-1.3.2/objectImplSwapI32toP32.c ./objectImplSwapI32toP32.c ---- ../orig-sblim-sfcb-1.3.2/objectImplSwapI32toP32.c 2008-01-29 23:38:26.000000000 +0100 -+++ ./objectImplSwapI32toP32.c 2008-10-14 11:48:28.000000000 +0200 -@@ -262,7 +262,11 @@ +diff --git a/objectImplSwapI32toP32.c b/objectImplSwapI32toP32.c +index 68d67ea..19dea1d 100644 +--- a/objectImplSwapI32toP32.c ++++ b/objectImplSwapI32toP32.c +@@ -262,7 +262,11 @@ static long copyI32toP32Parameters(int ofs, char *to, CLP32_ClSection * ts, tp->quals = bswap_16(fp->quals); tp->parameter.type=bswap_16(fp->parameter.type); tp->parameter.arraySize=bswap_32(fp->parameter.arraySize); @@ -73,9 +97,10 @@ if (fp->qualifiers.used) l += copyI32toP32Qualifiers(ofs + l, to, &tp->qualifiers, from, &fp->qualifiers); } -diff -wruN ../orig-sblim-sfcb-1.3.2/queryParser.y ./queryParser.y ---- ../orig-sblim-sfcb-1.3.2/queryParser.y 2007-03-20 10:36:49.000000000 +0100 -+++ ./queryParser.y 2008-10-14 11:49:20.000000000 +0200 +diff --git a/queryParser.y b/queryParser.y +index 762c1db..d9212a3 100644 +--- a/queryParser.y ++++ b/queryParser.y @@ -71,7 +71,7 @@ #define YYLEX_PARAM parm #define YYERROR_VERBOSE 1 @@ -85,10 +110,11 @@ extern void sfcQueryErr(char*,char*,char*); extern void yyError(char*); extern void yyerror(char*); -diff -wruN ../orig-sblim-sfcb-1.3.2/selectcond.c ./selectcond.c ---- ../orig-sblim-sfcb-1.3.2/selectcond.c 2005-12-13 09:56:49.000000000 +0100 -+++ ./selectcond.c 2008-10-14 11:49:51.000000000 +0200 -@@ -36,7 +36,7 @@ +diff --git a/selectcond.c b/selectcond.c +index b31958d..421fdde 100644 +--- a/selectcond.c ++++ b/selectcond.c +@@ -36,7 +36,7 @@ typedef struct native_selectcond { int type; } NativeSelectCond; @@ -97,10 +123,11 @@ /*****************************************************************************/ -diff -wruN ../orig-sblim-sfcb-1.3.2/sfcbdumpP32onI32.c ./sfcbdumpP32onI32.c ---- ../orig-sblim-sfcb-1.3.2/sfcbdumpP32onI32.c 2007-09-14 14:41:34.000000000 +0200 -+++ ./sfcbdumpP32onI32.c 2008-10-14 11:51:09.000000000 +0200 -@@ -130,7 +130,7 @@ +diff --git a/sfcbdumpP32onI32.c b/sfcbdumpP32onI32.c +index fd57e3e..ec86728 100644 +--- a/sfcbdumpP32onI32.c ++++ b/sfcbdumpP32onI32.c +@@ -130,7 +130,7 @@ int main(int argc, char * argv[]) } else if (bswap_32(clv.size) != sizeof(CLP32_ClVersionRecord)) { rc = 1; fprintf(stderr, "%s: version record size mismatch, is %d expected %d\n", @@ -109,7 +136,7 @@ state = REC_QUIT; } else { printf("%s: Size of version record: %d, version: %hx\n", -@@ -149,7 +149,7 @@ +@@ -149,7 +149,7 @@ int main(int argc, char * argv[]) } else if (bswap_32(coh.size) < sizeof(CLP32_ClObjectHdr)) { rc = 1; fprintf(stderr, "%s: header record size mismatch, is %d expected at least %d\n", @@ -118,7 +145,7 @@ state = REC_QUIT; } else { printf("%s: Header size: %d, type: %hx\n", -@@ -216,8 +216,8 @@ +@@ -216,8 +216,8 @@ int main(int argc, char * argv[]) if ((numRead=read(fdSchema, fillBuf+sizeof(CLP32_ClObjectHdr), numFill)) != numFill) { rc = 1; fprintf(stderr, "%s: structure record short, is %d expected %d\n", @@ -129,7 +156,7 @@ state = REC_QUIT; } else { state = fillState; -@@ -381,7 +381,7 @@ +@@ -381,7 +381,7 @@ static int dumpArrayBuffer(const CLP32_ClObjectHdr *hdr, const char *prefix) for (i=0; i < bswap_16(ab->iUsed); i++) { printf("%s ab[%3d]=(%hx,%hx,%016llx)\n",prefix,i, bswap_16(ab->buf[bswap_32(index[i])].type), bswap_16(ab->buf[bswap_32(index[i])].state), @@ -138,7 +165,7 @@ } } } else { -@@ -391,7 +391,7 @@ +@@ -391,7 +391,7 @@ static int dumpArrayBuffer(const CLP32_ClObjectHdr *hdr, const char *prefix) } } else { fprintf(stderr,"%s invalid array buffer offset %d, must be < %d\n", @@ -147,3 +174,6 @@ rc = 2; } return rc; +-- +1.6.0.2 + ++++++ sblim-sfcb-1.3.2-automake.patch -> 0007-automake.patch ++++++ --- sblim-sfcb/sblim-sfcb-1.3.2-automake.patch 2008-10-15 11:09:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/sblim-sfcb/0007-automake.patch 2008-10-24 08:32:29.925236000 +0200 @@ -1,18 +1,20 @@ -diff -wruN ../orig-sblim-sfcb-1.3.2/configure.ac ./configure.ac ---- ../orig-sblim-sfcb-1.3.2/configure.ac 2008-10-06 19:45:25.000000000 +0200 -+++ ./configure.ac 2008-10-14 11:02:05.000000000 +0200 -@@ -24,6 +24,7 @@ - - AC_INIT(Small Footprint CIM Broker, 1.3.2, sblim-devel(a)lists.sourceforge.net, sblim-sfcb) - AC_CONFIG_SRCDIR([providerDrv.c]) -+AC_CONFIG_MACRO_DIR([m4]) - - #disable "seems to ignore the --datarootdir setting" warnings - #AC_DEFUN([AC_DATAROOTDIR_CHECKED]) -diff -wruN ../orig-sblim-sfcb-1.3.2/Makefile.am ./Makefile.am ---- ../orig-sblim-sfcb-1.3.2/Makefile.am 2008-09-05 22:01:56.000000000 +0200 -+++ ./Makefile.am 2008-10-14 11:01:31.000000000 +0200 -@@ -35,7 +35,7 @@ +From 9cec87d244c49b85262a2424ebd1af67eb7575d3 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> +Date: Wed, 22 Oct 2008 10:34:02 +0200 +Subject: [PATCH] automake.patch + +Adapt to automake-1.10 and autoconf 2.63 +--- + Makefile.am | 2 +- + configure.ac | 1 + + mofc/configure.ac | 1 + + 3 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index a836389..54c967f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -35,7 +35,7 @@ MANFILES=man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \ BUILT_SOURCES=queryParser.c queryLexer.c sqlParser.c sqlLexer.c cimXmlOps.c cimXmlParserProcessed.c $(MANFILES) AM_YFLAGS=-d @@ -21,13 +23,30 @@ AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sfcbconfdir)\" \ -DSFCB_STATEDIR=\"$(sfcbstatedir)\" \ -DSFCB_LIBDIR=\"$(libdir)\" \ -diff -wruN ../orig-sblim-sfcb-1.3.2/mofc/configure.ac ./mofc/configure.ac ---- ../orig-sblim-sfcb-1.3.2/mofc/configure.ac 2008-04-16 20:43:05.000000000 +0200 -+++ ./mofc/configure.ac 2008-10-14 11:03:10.000000000 +0200 -@@ -73,6 +73,7 @@ +diff --git a/configure.ac b/configure.ac +index b4d8fe6..1c5d450 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,6 +24,7 @@ + + AC_INIT(Small Footprint CIM Broker, 1.3.2, sblim-devel(a)lists.sourceforge.net, sblim-sfcb) + AC_CONFIG_SRCDIR([providerDrv.c]) ++AC_CONFIG_MACRO_DIR([m4]) + + #disable "seems to ignore the --datarootdir setting" warnings + #AC_DEFUN([AC_DATAROOTDIR_CHECKED]) +diff --git a/mofc/configure.ac b/mofc/configure.ac +index cd286b4..0362d07 100644 +--- a/mofc/configure.ac ++++ b/mofc/configure.ac +@@ -73,6 +73,7 @@ fi # Checks for programs. AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_YACC AC_PROG_LEX + +-- +1.6.0.2 + ++++++ 0008-enable-hex-trace-mask.patch ++++++ >From 95cda191df6e023febf55f6f9929998465a40b5b Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Wed, 22 Oct 2008 11:22:18 +0200 Subject: [PATCH] enable hex trace mask Now trace level (-t) can be specified hexdecimal (-t 0x1234) also adds TRACE_SEMAPHORE --- sfcBroker.c | 7 ++++++- trace.h | 45 ++++++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/sfcBroker.c b/sfcBroker.c index 95e3e18..827eb7b 100644 --- a/sfcBroker.c +++ b/sfcBroker.c @@ -605,8 +605,13 @@ int main(int argc, char *argv[]) if (*optarg == '?') { fprintf(stdout, "--- Traceable Components: Int Hex\n"); for (i = 0; traceIds[i].id; i++) - fprintf(stdout, "--- \t%18s: %d\t0x%05X\n", traceIds[i].id, traceIds[i].code, traceIds[i].code); + fprintf(stdout, "--- \t%18s: %d\t0x%07X\n", traceIds[i].id, traceIds[i].code, traceIds[i].code); exit(0); + } else if (*optarg == 0 && *(optarg+1) == 'x') { + if (sscanf(optarg,"0x%lx",&tmask) != 1) { + fprintf(stderr,"-t argument not proper hex value\n"); + exit(1); + } } else if (isdigit(*optarg)) { char *ep; tmask = strtol(optarg, &ep, 0); diff --git a/trace.h b/trace.h index e72fa88..f892689 100644 --- a/trace.h +++ b/trace.h @@ -123,27 +123,30 @@ int colorTrace; #define MAX_MSG_SIZE 1024 /* max length of trace message */ -#define TRACE_PROVIDERMGR 1 -#define TRACE_PROVIDERDRV 2 -#define TRACE_CIMXMLPROC 4 -#define TRACE_HTTPDAEMON 8 -#define TRACE_UPCALLS 16 -#define TRACE_ENCCALLS 32 -#define TRACE_PROVIDERINSTMGR 64 -#define TRACE_PROVIDERASSOCMGR 128 -#define TRACE_PROVIDERS 256 -#define TRACE_INDPROVIDER 512 -#define TRACE_INTERNALPROVIDER 1024 -#define TRACE_OBJECTIMPL 2048 -#define TRACE_XMLIN 4096 -#define TRACE_XMLOUT 8192 -#define TRACE_SOCKETS 16384 -#define TRACE_MEMORYMGR 32768 -#define TRACE_MSGQUEUE 65536 -#define TRACE_XMLPARSING 131072 -#define TRACE_RESPONSETIMING 262144 -#define TRACE_DBPDAEMON 524288 -#define TRACE_SLP 1048576 +#define TRACE_PROVIDERMGR 1 /* 0x00.0001 */ +#define TRACE_PROVIDERDRV 2 /* 0x00.0002 */ +#define TRACE_CIMXMLPROC 4 /* 0x00.0004 */ +#define TRACE_HTTPDAEMON 8 /* 0x00.0008 */ +#define TRACE_UPCALLS 16 /* 0x00.0010 */ +#define TRACE_ENCCALLS 32 /* 0x00.0020 */ +#define TRACE_PROVIDERINSTMGR 64 /* 0x00.0040 */ +#define TRACE_PROVIDERASSOCMGR 128 /* 0x00.0080 */ +#define TRACE_PROVIDERS 256 /* 0x00.0100 */ +#define TRACE_INDPROVIDER 512 /* 0x00.0200 */ +#define TRACE_INTERNALPROVIDER 1024 /* 0x00.0400 */ +#define TRACE_OBJECTIMPL 2048 /* 0x00.0800 */ +#define TRACE_XMLIN 4096 /* 0x00.1000 */ +#define TRACE_XMLOUT 8192 /* 0x00.2000 */ +#define TRACE_SOCKETS 16384 /* 0x00.4000 */ +#define TRACE_MEMORYMGR 32768 /* 0x00.8000 */ +#define TRACE_MSGQUEUE 65536 /* 0x01.0000 */ +#define TRACE_XMLPARSING 131072 /* 0x02.0000 */ +#define TRACE_RESPONSETIMING 262144 /* 0x04.0000 */ +#define TRACE_DBPDAEMON 524288 /* 0x08.0000 */ +#define TRACE_SLP 1048576 /* 0x10.0000 */ +#define TRACE_SEMAPHORE 2097152 /* 0x20.0000 */ +/* 4194304 0x40.000 */ +/* 8388608 0x80.000 */ typedef void sigHandler(int); -- 1.6.0.2 ++++++ 0009-clean-up-semaphore-array-index-calculation.patch ++++++ >From 441bc5ea7fd160643521e1a4387d229b6914265f Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Wed, 22 Oct 2008 11:39:11 +0200 Subject: [PATCH] clean up semaphore array index calculation - make constants recognizable as such - provide macros for semaphore array index calculations --- msgqueue.c | 14 +++++++------- msgqueue.h | 21 +++++++++++++-------- providerDrv.c | 44 ++++++++++++++++++++++---------------------- providerMgr.c | 8 ++++---- 4 files changed, 46 insertions(+), 41 deletions(-) diff --git a/msgqueue.c b/msgqueue.c index 8834052..80e3354 100644 --- a/msgqueue.c +++ b/msgqueue.c @@ -130,20 +130,20 @@ int initSem(int https, int shttps, int provs) } sun.val=1; - semctl(sfcbSem,httpGuardId,SETVAL,sun); + semctl(sfcbSem,HTTP_GUARD_ID,SETVAL,sun); sun.val=https; - semctl(sfcbSem,httpProcsId,SETVAL,sun); + semctl(sfcbSem,HTTP_PROCS_ID,SETVAL,sun); sun.val=1; - semctl(sfcbSem,shttpGuardId,SETVAL,sun); + semctl(sfcbSem,SHTTP_GUARD_ID,SETVAL,sun); sun.val=shttps; - semctl(sfcbSem,shttpProcsId,SETVAL,sun); + semctl(sfcbSem,SHTTP_PROCS_ID,SETVAL,sun); for (i=0; i<provs; i++) { sun.val=1; - semctl(sfcbSem,(i*3)+provProcGuardId+provProcBaseId,SETVAL,sun); + semctl(sfcbSem,PROV_GUARD(i),SETVAL,sun); sun.val=0; - semctl(sfcbSem,(i*3)+provProcInuseId+provProcBaseId,SETVAL,sun); - semctl(sfcbSem,(i*3)+provProcAliveId+provProcBaseId,SETVAL,sun); + semctl(sfcbSem,PROV_INUSE(i),SETVAL,sun); + semctl(sfcbSem,PROV_ALIVE(i),SETVAL,sun); } return 0; } diff --git a/msgqueue.h b/msgqueue.h index 612cdb9..41b40c0 100644 --- a/msgqueue.h +++ b/msgqueue.h @@ -157,14 +157,19 @@ extern char *provPauseStr; extern int noHttpPause; extern char *httpPauseStr; -#define httpGuardId 0 -#define httpProcsId 1 -#define shttpGuardId 2 -#define shttpProcsId 3 -#define provProcBaseId 4 -#define provProcGuardId 0 -#define provProcInuseId 1 -#define provProcAliveId 2 +/* relative Ids within the semaphore set */ +#define HTTP_GUARD_ID 0 +#define HTTP_PROCS_ID 1 +#define SHTTP_GUARD_ID 2 +#define SHTTP_PROCS_ID 3 +#define PROV_PROC_BASE_ID 4 +#define PROV_PROC_GUARD_ID 0 +#define PROV_PROC_INUSE_ID 1 +#define PROV_PROC_ALIVE_ID 2 + +#define PROV_GUARD(id) ((id*3)+PROV_PROC_GUARD_ID+PROV_PROC_BASE_ID) +#define PROV_INUSE(id) ((id*3)+PROV_PROC_INUSE_ID+PROV_PROC_BASE_ID) +#define PROV_ALIVE(id) ((id*3)+PROV_PROC_ALIVE_ID+PROV_PROC_BASE_ID) extern ComSockets *sPairs; extern int ptBase,htBase,stBase,htMax,stMax; diff --git a/providerDrv.c b/providerDrv.c index 4299b4e..62aca9d 100644 --- a/providerDrv.c +++ b/providerDrv.c @@ -380,8 +380,8 @@ void* providerIdleThread() if (pInfo) { proc=curProvProc; if (proc) { - semAcquireUnDo(sfcbSem,(proc->id*3)+provProcGuardId+provProcBaseId); - if ((val=semGetValue(sfcbSem,(proc->id*3)+provProcInuseId+provProcBaseId))==0) { + semAcquireUnDo(sfcbSem,PROV_GUARD(proc->id)); + if ((val=semGetValue(sfcbSem,PROV_INUSE(proc->id)))==0) { if ((now-proc->lastActivity)>provTimeoutInterval) { ctx = native_new_CMPIContext(MEM_TRACKED,NULL); noBreak=0; @@ -416,7 +416,7 @@ void* providerIdleThread() } } } - semRelease(sfcbSem,(proc->id*3)+provProcGuardId+provProcBaseId); + semRelease(sfcbSem,PROV_GUARD(proc->id)); } } } @@ -536,9 +536,9 @@ static int getProcess(ProviderInfo * info, ProviderProcess ** proc) for (i = 0; i < provProcMax; i++) { if ((provProc+i) && provProc[i].pid && provProc[i].group && strcmp(provProc[i].group,info->group)==0) { - semAcquire(sfcbSem,(provProc[i].id*3)+provProcGuardId+provProcBaseId); - semRelease(sfcbSem,(provProc[i].id*3)+provProcInuseId+provProcBaseId); - semRelease(sfcbSem,(provProc[i].id*3)+provProcGuardId+provProcBaseId); + semAcquire(sfcbSem,PROV_GUARD(provProc[i].id)); + semRelease(sfcbSem,PROV_INUSE(provProc[i].id)); + semRelease(sfcbSem,PROV_GUARD(provProc[i].id)); info->pid=provProc[i].pid; info->providerSockets=provProc[i].providerSockets; _SFCB_TRACE(1,("--- Process %d shared by %s and %s",provProc[i].pid,info->providerName, @@ -593,12 +593,12 @@ static int getProcess(ProviderInfo * info, ProviderProcess ** proc) info->proc=*proc; info->pid=currentProc; - semSetValue(sfcbSem,((*proc)->id*3)+provProcGuardId+provProcBaseId,0); - semSetValue(sfcbSem,((*proc)->id*3)+provProcInuseId+provProcBaseId,0); - semSetValue(sfcbSem,((*proc)->id*3)+provProcAliveId+provProcBaseId,0); - semReleaseUnDo(sfcbSem,((*proc)->id*3)+provProcAliveId+provProcBaseId); - semReleaseUnDo(sfcbSem,((*proc)->id*3)+provProcInuseId+provProcBaseId); - semRelease(sfcbSem,((*proc)->id*3)+provProcGuardId+provProcBaseId); + semSetValue(sfcbSem,PROV_GUARD((*proc)->id),0); + semSetValue(sfcbSem,PROV_INUSE((*proc)->id),0); + semSetValue(sfcbSem,PROV_ALIVE((*proc)->id),0); + semReleaseUnDo(sfcbSem,PROV_ALIVE((*proc)->id)); + semReleaseUnDo(sfcbSem,PROV_INUSE((*proc)->id)); + semRelease(sfcbSem,PROV_GUARD((*proc)->id)); processProviderInvocationRequests(info->providerName); _SFCB_RETURN(0); @@ -628,15 +628,15 @@ int forkProvider(ProviderInfo * info, OperationHdr * req, char **msg) if (info->pid ) { proc=info->proc; - semAcquire(sfcbSem,(proc->id*3)+provProcGuardId+provProcBaseId); - if ((val=semGetValue(sfcbSem,(proc->id*3)+provProcAliveId+provProcBaseId))) { - semRelease(sfcbSem,(proc->id*3)+provProcInuseId+provProcBaseId); - semRelease(sfcbSem,(proc->id*3)+provProcGuardId+provProcBaseId); + semAcquire(sfcbSem,PROV_GUARD(proc->id)); + if ((val=semGetValue(sfcbSem,PROV_ALIVE(proc->id)))) { + semRelease(sfcbSem,PROV_INUSE(proc->id)); + semRelease(sfcbSem,PROV_GUARD(proc->id)); _SFCB_TRACE(1, ("--- Provider %s still loaded",info->providerName)); _SFCB_RETURN(CMPI_RC_OK) } - semRelease(sfcbSem,(proc->id*3)+provProcGuardId+provProcBaseId); + semRelease(sfcbSem,PROV_GUARD(proc->id)); _SFCB_TRACE(1, ("--- Provider has been unloaded prevously, will reload")); info->pid=0; @@ -2377,7 +2377,7 @@ static BinResponseHdr *loadProvider(BinRequestHdr * hdr, ProviderInfo * info, in BinResponseHdr *resp; char dlName[512]; - _SFCB_TRACE(1, ("--- Loading Provide %s %s %s", (char *) req->className.data, + _SFCB_TRACE(1, ("--- Loading provider %s %s %s", (char *) req->className.data, (char *) req->provName.data, (char *) req->libName.data)); info = (ProviderInfo *) calloc(1, sizeof(*info)); @@ -2518,7 +2518,7 @@ static void *processProviderInvocationRequestsThread(void *prms) int i,requestor=0,initRc=0; _SFCB_ENTER(TRACE_PROVIDERDRV, "processProviderInvocationRequestsThread"); - + for (i = 0; i < req->count; i++) if (req->object[i].length) req->object[i].data=(void*)((long)req->object[i].data+(char*)req); @@ -2567,7 +2567,7 @@ static void *processProviderInvocationRequestsThread(void *prms) } else { - _SFCB_TRACE(1, ("--- Provider request for %s %p %x", + _SFCB_TRACE(1, ("--- Provider request for op:%s pInfo:%p prov:%x", opsName[req->operation],pInfo,req->provId)); if (req->flags & FL_chunked) requestor=parms->requestor; @@ -2673,7 +2673,7 @@ void processProviderInvocationRequests(char *name) debugMode=pauseProvider(name); for (;;) { - _SFCB_TRACE(1, ("--- Waiting for provider request to %d-%lu", + _SFCB_TRACE(1, ("--- Waiting for provider request to R%d-%lu", providerSockets.receive,getInode(providerSockets.receive))); parms = (Parms *) malloc(sizeof(*parms)); @@ -2683,7 +2683,7 @@ void processProviderInvocationRequests(char *name) int debug_break = 0; if (rc!=0)mlogf(M_ERROR,M_SHOW,"oops\n"); - _SFCB_TRACE(1, ("--- Got something %d-%p on %d-%lu", + _SFCB_TRACE(1, ("--- Got something op:%d-prov:%p on R%d-%lu", parms->req->operation,parms->req->provId, providerSockets.receive,getInode(providerSockets.receive))); diff --git a/providerMgr.c b/providerMgr.c index 595c8e7..99e0292 100644 --- a/providerMgr.c +++ b/providerMgr.c @@ -922,10 +922,10 @@ static void setInuseSem(void *id) ids.ids=id; - semAcquire(sfcbSem,(ids.procId*3)+provProcGuardId+provProcBaseId); - semAcquire(sfcbSem,(ids.procId*3)+provProcInuseId+provProcBaseId); - semReleaseUnDo(sfcbSem,(ids.procId*3)+provProcInuseId+provProcBaseId); - semRelease(sfcbSem,(ids.procId*3)+provProcGuardId+provProcBaseId); + semAcquire(sfcbSem,PROV_GUARD(ids.procId)); + semAcquire(sfcbSem,PROV_INUSE(ids.procId)); + semReleaseUnDo(sfcbSem,PROV_INUSE(ids.procId)); + semRelease(sfcbSem,PROV_GUARD(ids.procId)); _SFCB_EXIT(); } -- 1.6.0.2 ++++++ 0011-check-prevent-various-buffer-overflows.patch ++++++ >From 5bd0849109748dc6cdb4fcf84c2ec8719514158c Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Wed, 22 Oct 2008 11:47:58 +0200 Subject: [PATCH] check/prevent various buffer overflows --- msgqueue.c | 3 ++- providerRegister.c | 4 ++-- support.c | 30 +++++++++++++++++++++++++----- 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/msgqueue.c b/msgqueue.c index 8834052..f08cf13 100644 --- a/msgqueue.c +++ b/msgqueue.c @@ -697,6 +697,7 @@ void localConnectServer() } /* any other error, just return (should probably be more graceful) */ else { + perror("Other accept error"); return; } } diff --git a/providerRegister.c b/providerRegister.c index 8ad6faf..3671b4c 100644 --- a/providerRegister.c +++ b/providerRegister.c @@ -130,7 +130,7 @@ ProviderRegister *newProviderRegister(char *fn) dir = "/var/lib/sfcb/registration"; } - strcpy(fin, dir); + strncpy(fin, dir, sizeof(fin)-18); /* 18 = strlen("/providerRegister")+1 */ strcat(fin, "/providerRegister"); in = fopen(fin, "r"); if (in == NULL) @@ -144,7 +144,7 @@ ProviderRegister *newProviderRegister(char *fn) bb->ht = UtilFactory->newHashTable(61, UtilHashTable_charKey | UtilHashTable_ignoreKeyCase); - while (fgets(fin, 1024, in)) { + while (fgets(fin, sizeof(fin), in)) { n++; if (stmt) free(stmt); stmt = strdup(fin); diff --git a/support.c b/support.c index 2f53812..144b4f7 100644 --- a/support.c +++ b/support.c @@ -52,7 +52,11 @@ int localClientMode=0; /**< flag determining whether local client connect void *loadLibib(const char *libname) { char filename[255]; - sprintf(filename, "lib%s.so", libname); + if (snprintf(filename, 255, "lib%s.so", libname) >= 255) + { + mlogf(M_ERROR,M_SHOW,"--- loadLibib: output truncated\n"); + return NULL; + } return dlopen(filename, RTLD_LAZY); } @@ -61,7 +65,11 @@ static void *getGenericEntryPoint(void *library, const char *ptype) { char entry_point[255]; void *sym; - sprintf(entry_point, "_Generic_Create_%sMI", ptype); + if (snprintf(entry_point, 255, "_Generic_Create_%sMI", ptype) >= 255) + { + mlogf(M_ERROR,M_SHOW,"--- getGenericEntryPoint: output truncated\n"); + return NULL; + } sym = dlsym(library, entry_point); return sym; } @@ -72,7 +80,11 @@ static void *getFixedEntryPoint(const char *provider, { char entry_point[255]; void *sym; - sprintf(entry_point, "%s_Create_%sMI", provider, ptype); + if (snprintf(entry_point, 255, "%s_Create_%sMI", provider, ptype) >= 255) + { + mlogf(M_ERROR,M_SHOW,"--- getFixedEntryPoint: output truncated\n"); + return NULL; + } sym = dlsym(library, entry_point); return sym; } @@ -366,7 +378,11 @@ int memAdd(void *ptr, int *memId); void *tool_mm_load_lib(const char *libname) { char filename[255]; - sprintf(filename, "lib%s.so", libname); + if (snprintf(filename, 255, "lib%s.so", libname) >= 255) + { + mlogf(M_ERROR,M_SHOW,"--- tool_mm_load_lib: output truncated\n"); + return NULL; + } return dlopen(filename, RTLD_LAZY); } @@ -919,7 +935,11 @@ void dumpTiming(int pid) if (collectStat==0) return; - sprintf(buffer,"/proc/%d/stat",pid); + if (snprintf(buffer,4096,"/proc/%d/stat",pid) >= 4096) + { + mlogf(M_ERROR,M_SHOW,"--- dumpTiming: output truncated\n"); + return; + } f=fopen(buffer,"r"); l=fread(buffer,1,4095,f); fclose(f); -- 1.6.0.2 ++++++ 0015-fix-potential-memory-leak.patch ++++++ >From c803538579ac7d8d852c42085b43d75da6b2215d Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Wed, 22 Oct 2008 13:40:02 +0200 Subject: [PATCH] fix potential memory leak forkProvider is passed a 'msg' pointer address which is set by strdup but never used. Make this parameter optional (in providerDrv.c) and pass NULL for each call (in providerMgr.c) --- providerDrv.c | 8 +++++--- providerMgr.c | 39 +++++++++++---------------------------- 2 files changed, 16 insertions(+), 31 deletions(-) diff --git a/providerDrv.c b/providerDrv.c index 62aca9d..d06a91f 100644 --- a/providerDrv.c +++ b/providerDrv.c @@ -676,10 +676,12 @@ int forkProvider(ProviderInfo * info, OperationHdr * req, char **msg) resp = invokeProvider(&binCtx); resp->rc--; - if (resp->rc) { - *msg = strdup((char *) resp->object[0].data); + if (msg) { + if (resp->rc) { + *msg = strdup((char *) resp->object[0].data); + } + else *msg = NULL; } - else *msg = NULL; rc=resp->rc; _SFCB_TRACE(1, ("--- rc: %d", resp->rc)); diff --git a/providerMgr.c b/providerMgr.c index 99e0292..b300937 100644 --- a/providerMgr.c +++ b/providerMgr.c @@ -371,7 +371,6 @@ static void lookupProviderList(long type, int *requestor, OperationHdr * req) unsigned long count,n; ProviderInfo *info; int dmy = 0, rc,indFound=0; - char *msg = NULL; CMPIStatus st = {CMPI_RC_OK, NULL}; providers = lookupProviders(type,className,nameSpace,&st); @@ -383,7 +382,7 @@ static void lookupProviderList(long type, int *requestor, OperationHdr * req) for (info = providers->ft->getFirst(providers); info; info = providers->ft->getNext(providers), n--) { if (info->type!=FORCE_PROVIDER_NOTFOUND && - (rc = forkProvider(info, req, &msg)) == CMPI_RC_OK) { + (rc = forkProvider(info, req, NULL)) == CMPI_RC_OK) { _SFCB_TRACE(1,("--- responding with %s %p %d",info->providerName,info,count)); spSendCtlResult(requestor, &info->providerSockets.send, MSG_X_PROVIDER, count--, getProvIds(info).ids, req->options); @@ -395,7 +394,6 @@ static void lookupProviderList(long type, int *requestor, OperationHdr * req) }; spSendCtlResult(requestor, &dmy, MSG_X_PROVIDER_NOT_FOUND, 0, NULL, req->options); - if (msg) free(msg); break; } } @@ -414,7 +412,6 @@ static void findProvider(long type, int *requestor, OperationHdr * req) char *className = (char *) req->className.data; char *nameSpace = (char *) req->nameSpace.data; ProviderInfo *info; - char *msg=NULL; int rc; CMPIStatus st; @@ -422,14 +419,13 @@ static void findProvider(long type, int *requestor, OperationHdr * req) if ((info = lookupProvider(type,className,nameSpace,&st)) != NULL) { if (info->type!=FORCE_PROVIDER_NOTFOUND && - (rc = forkProvider(info, req, &msg)) == CMPI_RC_OK) { + (rc = forkProvider(info, req, NULL)) == CMPI_RC_OK) { spSendCtlResult(requestor, &info->providerSockets.send, MSG_X_PROVIDER, 0, getProvIds(info).ids, req->options); } else { spSendCtlResult(requestor, &sfcbSockets.send, MSG_X_PROVIDER_NOT_FOUND, 0, NULL, req->options); - if (msg) free(msg); } } else { @@ -599,7 +595,6 @@ static void assocProviderList(int *requestor, OperationHdr * req) long count = 0; ProviderInfo *info; int dmy = 0, rc; - char *msg=NULL; if (className==NULL || *className == 0) className = "$ASSOCCLASSES$"; @@ -611,7 +606,7 @@ static void assocProviderList(int *requestor, OperationHdr * req) for (info = providers->ft->getFirst(providers); info; info = providers->ft->getNext(providers)) { if (info->type!=FORCE_PROVIDER_NOTFOUND && - (rc = forkProvider(info, req, &msg)) == CMPI_RC_OK) { + (rc = forkProvider(info, req, NULL)) == CMPI_RC_OK) { _SFCB_TRACE(1,("--- responding with %s %p %d",info->providerName,info,count)); spSendCtlResult(requestor, &info->providerSockets.send, MSG_X_PROVIDER, count--, getProvIds(info).ids, req->options); @@ -619,10 +614,8 @@ static void assocProviderList(int *requestor, OperationHdr * req) else { spSendCtlResult(requestor, &dmy, MSG_X_PROVIDER_NOT_FOUND, 0, NULL, req->options); - if (msg) free(msg); break; } - } } else { @@ -634,7 +627,7 @@ static void assocProviderList(int *requestor, OperationHdr * req) /* When there is no provider for an assocClass we do not want to produce * an error message. So we return the default provider and expect it * to produce a nice and empty result */ - if((rc = forkProvider(defaultProvInfoPtr, req, &msg)) == CMPI_RC_OK) { + if((rc = forkProvider(defaultProvInfoPtr, req, NULL)) == CMPI_RC_OK) { _SFCB_TRACE(1,("--- responding with %s %p %d", defaultProvInfoPtr->providerName, defaultProvInfoPtr,count)); @@ -705,10 +698,8 @@ static ProviderInfo *getMethodProvider(char *className, char *nameSpace) static void classProvider(int *requestor, OperationHdr * req) { - char *msg; - _SFCB_ENTER(TRACE_PROVIDERMGR, "classProvider"); - forkProvider(classProvInfoPtr, req, &msg); + forkProvider(classProvInfoPtr, req, NULL); _SFCB_TRACE(1,("--- result %d-%lu to with %d-%lu", *requestor,getInode(*requestor), classProvInfoPtr->providerSockets.send, @@ -716,16 +707,13 @@ static void classProvider(int *requestor, OperationHdr * req) spSendCtlResult(requestor, &classProvInfoPtr->providerSockets.send, MSG_X_PROVIDER, 0, getProvIds(classProvInfoPtr).ids, req->options); - _SFCB_EXIT(); } static void qualiProvider(int *requestor, OperationHdr * req) { - char *msg; - _SFCB_ENTER(TRACE_PROVIDERMGR, "qualiProvider"); - forkProvider(qualiProvInfoPtr, req, &msg); + forkProvider(qualiProvInfoPtr, req, NULL); _SFCB_TRACE(1,("--- result %d-%lu to with %d-%lu", *requestor,getInode(*requestor), qualiProvInfoPtr->providerSockets.send, @@ -738,7 +726,6 @@ static void qualiProvider(int *requestor, OperationHdr * req) static void methProvider(int *requestor, OperationHdr * req) { - char *msg=NULL; int rc; char *className = (char *) req->className.data; char *nameSpace = (char *) req->nameSpace.data; @@ -749,7 +736,7 @@ static void methProvider(int *requestor, OperationHdr * req) classProvider(requestor, req); else if ((info = getMethodProvider(className,nameSpace)) != NULL) { if (info->type!=FORCE_PROVIDER_NOTFOUND && - (rc = forkProvider(info, req, &msg)) == CMPI_RC_OK) { + (rc = forkProvider(info, req, NULL)) == CMPI_RC_OK) { _SFCB_TRACE(1,("--- responding with %s %p",info->providerName,info)); spSendCtlResult(requestor, &info->providerSockets.send, MSG_X_PROVIDER, 0, getProvIds(info).ids, req->options); @@ -757,7 +744,6 @@ static void methProvider(int *requestor, OperationHdr * req) else { spSendCtlResult(requestor, &sfcbSockets.send, MSG_X_PROVIDER_NOT_FOUND, 0, NULL, req->options); - if (msg) free(msg); } } else @@ -773,32 +759,30 @@ static int _methProvider(BinRequestContext * ctx, OperationHdr * req) char *nameSpace = (char *) req->nameSpace.data; ProviderInfo *info; int rc; - char *msg; ctx->chunkedMode=ctx->xmlAs=0; if (strcmp(className, "$ClassProvider$") == 0) { - forkProvider(classProvInfoPtr, req, &msg); + forkProvider(classProvInfoPtr, req, NULL); ctx->provA.ids = getProvIds(classProvInfoPtr); ctx->provA.socket = classProvInfoPtr->providerSockets.send; ctx->pAs=NULL; _SFCB_RETURN(MSG_X_PROVIDER); } else if (strcmp(className, "$InterOpProvider$") == 0) { - forkProvider(interOpProvInfoPtr, req, &msg); + forkProvider(interOpProvInfoPtr, req, NULL); ctx->provA.ids = getProvIds(interOpProvInfoPtr); ctx->provA.socket = interOpProvInfoPtr->providerSockets.send; ctx->pAs=NULL; _SFCB_RETURN(MSG_X_PROVIDER); } else if ((info = getMethodProvider(className,nameSpace)) != NULL) { - if ((rc = forkProvider(info, req, &msg)) == CMPI_RC_OK) { + if ((rc = forkProvider(info, req, NULL)) == CMPI_RC_OK) { ctx->provA.ids = getProvIds(info); ctx->provA.socket = info->providerSockets.send; ctx->pAs=NULL; _SFCB_RETURN(MSG_X_PROVIDER); } else { - free(msg); _SFCB_RETURN(MSG_X_PROVIDER_NOT_FOUND); } } @@ -1324,7 +1308,6 @@ static CMPIConstClass *_getConstClass(const char *ns, const char *cn, CMPIStatus BinRequestContext binCtx; OperationHdr req = { OPS_GetClass, 2 }; int irc; - char *msg; path = NewCMPIObjectPath(ns, cn, st); sreq.objectPath = setObjectPathMsgSegment(path); @@ -1333,7 +1316,7 @@ static CMPIConstClass *_getConstClass(const char *ns, const char *cn, CMPIStatus req.nameSpace = setCharsMsgSegment((char *) ns); req.className = setCharsMsgSegment((char *) cn); - forkProvider(classProvInfoPtr, &req, &msg); + forkProvider(classProvInfoPtr, &req, NULL); memset(&binCtx,0,sizeof(BinRequestContext)); binCtx.oHdr = &req; -- 1.6.0.2 ++++++ 0016-check-result-from-_methProvider.patch ++++++ >From 320252d97c88e90e3e15350209ffdedf1f5331b7 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Wed, 22 Oct 2008 14:43:19 +0200 Subject: [PATCH] check result from _methProvider --- providerMgr.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/providerMgr.c b/providerMgr.c index b300937..97ec578 100644 --- a/providerMgr.c +++ b/providerMgr.c @@ -1414,7 +1414,7 @@ int isChild(const char *ns, const char *parent, const char* child) irc = _methProvider(&binCtx, &req); - if (irc) { + if (irc == MSG_X_PROVIDER) { localInvokeMethod(&binCtx, path, "ischild", in, &out, &rc,0); irc=(rc.rc==CMPI_RC_OK); } @@ -1444,7 +1444,7 @@ static int startUpProvider(const char* ns, const char *name) irc = _methProvider(&binCtx, &req); - if (irc) { + if (irc == MSG_X_PROVIDER) { localInvokeMethod(&binCtx, path, "_startup", in, &out, &rc, 1); irc=(rc.rc==CMPI_RC_OK); } @@ -1480,7 +1480,7 @@ static UtilList *_getConstClassChildren(const char *ns, const char *cn) irc = _methProvider(&binCtx, &req); - if (irc) { + if (irc == MSG_X_PROVIDER) { data = localInvokeMethod(&binCtx, path, "getchildren", in, &out, &rc, 0); if (out) { ar = CMGetArg(out, "children", &rc).value.array; @@ -1522,7 +1522,7 @@ static UtilList *_getAssocClassNames(const char *ns) memset(&binCtx,0,sizeof(BinRequestContext)); irc = _methProvider(&binCtx, &req); - if (irc) { + if (irc == MSG_X_PROVIDER) { data = localInvokeMethod(&binCtx, path, "getassocs", in, &out, &rc,0); if (out) { ar = CMGetArg(out, "assocs", &rc).value.array; -- 1.6.0.2 ++++++ 0017-abort-on-socket-error-with-better-error-msg.patch ++++++ >From 15d47d39d7f586ea9ccb32d18ff067c7e2f25097 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Wed, 22 Oct 2008 15:00:42 +0200 Subject: [PATCH] abort() on socket error with better error msg --- msgqueue.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/msgqueue.c b/msgqueue.c index 0917f62..ed2e055 100644 --- a/msgqueue.c +++ b/msgqueue.c @@ -170,9 +170,9 @@ static int spHandleError(int *s, char *m) { _SFCB_ENTER(TRACE_MSGQUEUE, "handleError"); char *emsg=strerror(errno); - mlogf(M_ERROR,M_SHOW,"%s %d %d-%d %s\n", m, *s, currentProc, errno,emsg); - // _SFCB_ABORT(); - return -1; + mlogf(M_ERROR,M_SHOW,"%s %d pid:%d-errno:%d : %s\n", m, *s, currentProc, errno,emsg); + _SFCB_ABORT(); + //return -1; } @@ -651,7 +651,7 @@ void localConnectServer() int nsocket,ssocket; unsigned int cl, notDone=1; char *path,cMsg[264]; - + struct _msg { unsigned int size; char oper; @@ -660,7 +660,7 @@ void localConnectServer() } msg; mlogf(M_INFO,M_SHOW,"--- localConnectServer started\n"); - + if (getControlChars("localSocketPath", &path)!=0) { mlogf(M_INFO,M_SHOW,"--- localConnectServer failed to start\n"); } -- 1.6.0.2 ++++++ 0018-buffer-size-check-in-localConnectServer.patch ++++++ >From 47618054258fc564b86d30212fddd8e459bbabc0 Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Klaus=20K=C3=A4mpf?= <kkaempf(a)suse.de> Date: Wed, 22 Oct 2008 15:32:44 +0200 Subject: [PATCH] buffer size check in localConnectServer --- msgqueue.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/msgqueue.c b/msgqueue.c index ed2e055..c608dd8 100644 --- a/msgqueue.c +++ b/msgqueue.c @@ -682,6 +682,7 @@ void localConnectServer() listen(ssocket,1); + mlogf(M_INFO,M_SHOW,"--- localConnectServer listening on %d\n", ssocket); do { // sfcbSockets.send; cl=sizeof(clientAddr); @@ -703,10 +704,14 @@ void localConnectServer() } read(nsocket, &msg.size, sizeof(msg.size)); + if (msg.size > sizeof(struct _msg) - offsetof(struct _msg, oper)) { + mlogf(M_INFO,M_SHOW,"--- localConnectServer buffer overflow %d > %d\n", msg.size, sizeof(struct _msg) - offsetof(struct _msg, oper)); + abort(); + } read(nsocket, &msg.oper, msg.size); if (msg.size!=0) { - sprintf(cMsg,"--- Local Client connect - pid: %d user: %s\n",msg.pid,msg.id); + snprintf(cMsg,264,"--- Local Client connect - pid: %d user: %s\n",msg.pid,msg.id); mlogf(M_INFO,M_SHOW,cMsg); spSendCtlResult(&nsocket, &sfcbSockets.send, MSG_X_LOCAL, 0, 0, 0); } -- 1.6.0.2 ++++++ 0019-internal_provider.patch ++++++ --- ./providerDrv.c.orig 2008-10-15 11:15:51.000000000 -0600 +++ ./providerDrv.c 2008-10-15 11:18:14.000000000 -0600 @@ -2120,7 +2120,7 @@ resp->rc=1; _SFCB_TRACE(1, ("--- pid: %d activFilters %p",currentProc,activFilters)); - if (activFilters==NULL) _SFCB_RETURN(resp); + if (info->indicationMI==NULL || activFilters==NULL) _SFCB_RETURN(resp); for (se = activFilters; se; se = se->next) { if (se->filterId == req->filterId) { ++++++ 0100-check_length_sanity.patch ++++++ Index: indCIMXMLExport.c =================================================================== RCS file: /cvsroot/sblim/sfcb/indCIMXMLExport.c,v retrieving revision 1.12 diff -u -p -r1.12 indCIMXMLExport.c --- indCIMXMLExport.c 9 Oct 2008 19:18:18 -0000 1.12 +++ indCIMXMLExport.c 17 Oct 2008 20:16:40 -0000 @@ -130,7 +130,13 @@ static void initializeHeaders(CurlData * static size_t writeCb(void *ptr, size_t size, size_t nmemb, void *stream) { UtilStringBuffer *sb = (UtilStringBuffer*)stream; - int length = size * nmemb; + unsigned int length = 0; + unsigned long long calcLength = (unsigned long)size * nmemb; + if(calcLength > UINT_MAX) { + mlogf(M_ERROR, M_SHOW, "--- Cannot allocate for %d members of size $d\n", nmemb, size); + return 0; + } + length = calcLength & UINT_MAX; char c=((char*)ptr)[length]; ((char*)ptr)[length]=0; sb->ft->appendChars(sb,(char*)ptr); ++++++ 0110-2164750-sfcb_handle_malformed_requests.patch ++++++ --- ./httpAdapter.c.0110-2164750-sfcb_handle_malformed_requests.patch 2008-10-24 18:16:41.000000000 -0600 +++ ./httpAdapter.c 2008-10-24 18:19:32.000000000 -0600 @@ -75,6 +75,7 @@ static long keepaliveTimeout=15; static long keepaliveMaxRequest=10; static long numRequest; +struct timeval httpSelectTimeout = {5, 0}; /* 5 sec. timeout for select() before read() */ #if defined USE_SSL static SSL_CTX *ctx; @@ -339,21 +340,36 @@ static int readData(CommHndl conn_fd, char *into, int length) { - int c = 0, r; + int c = 0, r, isReady; + fd_set httpfds; + FD_ZERO(&httpfds); + FD_SET(conn_fd.socket,&httpfds); while (c < length) { + isReady = select(conn_fd.socket+1,&httpfds,NULL,NULL,&httpSelectTimeout); + if (isReady == 0) { + c = -1; + break; + } r = commRead(conn_fd, into + c, length - c); if (r < 0 && (errno == EINTR || errno == EAGAIN)) { continue; } + /* r==0 is a success condition for read(), but the loop should complete prior to this */ + else if (r == 0) { + mlogf(M_INFO,M_SHOW,"--- commRead hit EOF sooner than expected\n"); + c = -2; + break; + } c += r; } return c; } -static void getPayload(CommHndl conn_fd, Buffer * b) +static int getPayload(CommHndl conn_fd, Buffer * b) { int c = b->length - b->ptr; + int rc = 0; b->content = (char *) malloc(b->content_length + 8); if (c) memcpy(b->content, (b->data) + b->ptr, c); @@ -362,8 +378,9 @@ c = b->content_length; } - readData(conn_fd, (b->content) + c, b->content_length - c); + rc = readData(conn_fd, (b->content) + c, b->content_length - c); *((b->content) + b->content_length) = 0; + return rc; } void dumpResponse(RespSegments * rs) @@ -582,30 +599,37 @@ #define hdrBufsize 5000 #define hdrLimmit 5000 -static int getHdrs(CommHndl conn_fd, Buffer * b, char *cmd) +static int getHdrs(CommHndl conn_fd, Buffer * b, char *cmd) { int first=1,total=0,isReady; - struct timeval httpTimeout; fd_set httpfds; int state=0; FD_ZERO(&httpfds); FD_SET(conn_fd.socket,&httpfds); - httpTimeout.tv_sec=5; - httpTimeout.tv_usec=0; - isReady = select(conn_fd.socket+1,&httpfds,NULL,NULL,&httpTimeout); - if (isReady == 0) return 3; for (;;) { + isReady = select(conn_fd.socket+1,&httpfds,NULL,NULL,&httpSelectTimeout); + if (isReady == 0) return 3; + char buf[hdrBufsize]; int r = commRead(conn_fd, buf, sizeof(buf)); if (r < 0 && (errno == EINTR || errno == EAGAIN)) continue; - if (r <= 0) break; + if (r == 0) { + if (b->size == 0 || + (strstr(b->data, "\r\n\r\n") == NULL && + strstr(b->data, "\n\n") == NULL)) { + mlogf(M_ERROR,M_SHOW,"-#- HTTP header ended prematurely\n"); + state = 3; + break; + } + } add2buffer(b, buf, r); total+=r; -// fprintf(stderr,"+++ buf: >%s<\n",buf); + + /* on first run through, ensure that this is a POST req. */ if (r && first) { if (strncasecmp(buf,cmd,strlen(cmd)) != 0) { /* not what we expected - still continue to read to @@ -614,7 +638,8 @@ } first=0; } - + + /* success condition: end of header */ if (strstr(b->data, "\r\n\r\n") != NULL || strstr(b->data, "\n\n") != NULL) { break; @@ -688,7 +713,7 @@ int badReq = 0; rc=getHdrs(conn_fd, &inBuf,"POST "); - + if (rc==1) { genError(conn_fd, &inBuf, 501, "Not Implemented", NULL); /* we continue to parse headers and empty the socket @@ -851,7 +876,13 @@ len += hl = sprintf(hdr, "\n\n", inBuf.authorization); - getPayload(conn_fd, &inBuf); + rc = getPayload(conn_fd, &inBuf); + if (rc < 0) { + genError(conn_fd, &inBuf, 400, "Bad Request", NULL); + _SFCB_TRACE(1, ("--- exiting after request timeout.")); + commClose(conn_fd); + exit(1); + } if (discardInput) { free(hdr); freeBuffer(&inBuf); @@ -1293,12 +1324,10 @@ /* still in handshake */ FD_ZERO(&httpfds); FD_SET(connFd,&httpfds); - httpTimeout.tv_sec=5; - httpTimeout.tv_usec=0; if (sslerr == SSL_ERROR_WANT_WRITE) { - isReady = select(connFd+1,NULL,&httpfds,NULL,&httpTimeout); + isReady = select(connFd+1,NULL,&httpfds,NULL,&httpSelectTimeout); } else { - isReady = select(connFd+1,&httpfds,NULL,NULL,&httpTimeout); + isReady = select(connFd+1,&httpfds,NULL,NULL,&httpSelectTimeout); } if (isReady == 0) { intSSLerror("Timeout error accepting SSL connection"); ++++++ 0120-max_content_length.patch ++++++ Index: control.c =================================================================== RCS file: /cvsroot/sblim/sfcb/control.c,v retrieving revision 1.24 diff -u -p -r1.24 control.c --- control.c 5 Sep 2008 20:01:56 -0000 1.24 +++ control.c 16 Oct 2008 21:03:18 -0000 @@ -109,6 +109,7 @@ Control init[] = { {"traceLevel", 1, "0"}, {"traceMask", 1, "0"}, + {"httpMaxContentLength", 1, "0"}, }; void sunsetControl() Index: httpAdapter.c =================================================================== RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v retrieving revision 1.61 diff -u -p -r1.61 httpAdapter.c --- httpAdapter.c 15 Oct 2008 21:22:55 -0000 1.61 +++ httpAdapter.c 16 Oct 2008 21:03:18 -0000 @@ -779,6 +779,14 @@ static int doHttpRequest(CommHndl conn_f cp = &hdr[15]; cp += strspn(cp, " \t"); inBuf.content_length = atol(cp); + int maxLen; + getControlNum("httpMaxContentLength", &maxLen); + if((maxLen) && (inBuf.content_length > maxLen)) { + genError(conn_fd, &inBuf, 413, "Request Entity Too Large", NULL); + _SFCB_TRACE(1, ("--- exiting: content-length too big")); + commClose(conn_fd); + exit(1); + } } else if (strncasecmp(hdr, "Content-Type:", 13) == 0) { cp = &hdr[13]; ++++++ 0130-2169514-check_malloc.patch ++++++ Index: msgqueue.c =================================================================== RCS file: /cvsroot/sblim/sfcb/msgqueue.c,v retrieving revision 1.23 diff -u -p -r1.23 msgqueue.c --- msgqueue.c 2 Oct 2008 21:34:59 -0000 1.23 +++ msgqueue.c 15 Oct 2008 21:04:29 -0000 @@ -290,6 +290,9 @@ static int spRcvMsg(int *s, int *from, v if (*length) { *data = malloc(spMsg.totalSize + 8); + if(*data == NULL) { + return spHandleError(s, em); + } do { if ((spGetMsg(s, NULL, *data, *length, mqg)) == -1) return spHandleError(s, em); ++++++ 0140-2169527-attrsOk_alloca_fix.patch ++++++ Index: cimXmlParser.c =================================================================== RCS file: /cvsroot/sblim/sfcb/cimXmlParser.c,v retrieving revision 1.29 diff -u -p -r1.29 cimXmlParser.c --- cimXmlParser.c 15 Aug 2008 19:05:13 -0000 1.29 +++ cimXmlParser.c 15 Oct 2008 21:16:29 -0000 @@ -42,7 +42,7 @@ typedef struct tags { } Tags; - +/* TODO: be more graceful than just exit() */ static void Throw(XmlBuffer * xb, char *msg) { printf("*** Error: %s\n", msg); @@ -281,13 +281,15 @@ static int attrsOk(XmlBuffer * xb, const return 1; } - ptr = (char *) alloca(strlen(tag) + strlen(msg2) + 48); + /* build error message for Throw(): "Bad attribute list for: <TAG>: <chars...> */ + ptr = (char*)alloca(strlen(msg2) + strlen(tag) + sizeof(char)*2 + strlen(word)); strcpy(ptr, msg2); strcat(ptr, tag); strcat(ptr, ": "); - strncpy(word, xb->cur, 10); - strcat(ptr, word); - strcat(ptr, tag); + /* ensure we have at least 10 chars left in the XML */ + int wlen = (xb->cur < (xb->last - 10)) ? 10 : (xb->last - xb->cur); + strncpy(word, xb->cur, wlen); + strncat(ptr, word, wlen); Throw(xb, ptr); return -1; } ++++++ 0150-2169607-strcpy.patch ++++++ Index: sqlLexer.l =================================================================== RCS file: /cvsroot/sblim/sfcb/sqlLexer.l,v retrieving revision 1.3 diff -u -p -r1.3 sqlLexer.l --- sqlLexer.l 20 Nov 2005 17:43:55 -0000 1.3 +++ sqlLexer.l 15 Oct 2008 21:44:20 -0000 @@ -64,7 +64,8 @@ IDENT_CHAR [A-Za-z_] \n.* { - strcpy(linebuf, yytext+1);//save next line + strncpy(linebuf, yytext+1, MAXBUF);//save next line + linebuf[MAXBUF - 1] = '\0'; // make sure the string is null terminated lineno++; tokenpos = 0; yyless(1);//alles außer dem \n zum erneuten Scannen zurückgeben ++++++ 0160-2158198-syslog.patch ++++++ Index: mlog.c =================================================================== RCS file: /cvsroot/sblim/sfcb/mlog.c,v retrieving revision 1.4 diff -u -p -r1.4 mlog.c --- mlog.c 20 Nov 2005 17:43:54 -0000 1.4 +++ mlog.c 10 Oct 2008 21:29:31 -0000 @@ -53,7 +53,7 @@ void mlogf(int priority, int errout, con va_start(ap,fmt); vsnprintf(buf,4096,fmt,ap); - syslog(priosysl,buf); + syslog(priosysl,"%s",buf); if (errout) { va_start(apc,fmt); ++++++ 0170-2172023-mlogf.patch ++++++ Index: httpAdapter.c =================================================================== RCS file: /cvsroot/sblim/sfcb/httpAdapter.c,v retrieving revision 1.60 diff -r1.60 httpAdapter.c 1765c1765 < "--- Certificate authentication exit not configured\n",dlName); --- > "--- Certificate authentication exit not configured\n"); Index: mlog.c =================================================================== RCS file: /cvsroot/sblim/sfcb/mlog.c,v retrieving revision 1.5 diff -r1.5 mlog.c 33a34,45 > /** \brief mlogf - Create syslog entries > * > * This should be called with a format string in fmt, with > * the variables to be inserted in it as the arguments > * following (...) > * eg > * mlogf(M_ERROR,M_SHOW,"--- %s failed rc=%d\n",oper,rc); > * > * Don't allow user input into the format string as it > * is not to be trusted. No need to use sprintf to build > * the string before passing it to mlogf. > */ Index: providerDrv.c =================================================================== RCS file: /cvsroot/sblim/sfcb/providerDrv.c,v retrieving revision 1.66 diff -r1.66 providerDrv.c 2396c2396 < sprintf(msg, "*** Failed to load %s for %s\n", dlName, --- > snprintf(msg,739,"*** Failed to load %s for %s\n", dlName, 2405c2405 < sprintf(msg, "*** Inconsistent provider registration for %s (1)\n", --- > snprintf(msg,739,"*** Inconsistent provider registration for %s (1)\n", Index: providerMgr.c =================================================================== RCS file: /cvsroot/sblim/sfcb/providerMgr.c,v retrieving revision 1.51 diff -r1.51 providerMgr.c 123,138d122 < /* < static void handleSigterm(int sig) < { < mlogf(M_ERROR,M_SHOW, "%s: exiting due to signal %d\n", "provider", sig); < exit(1); < } < < static void handleSigSegv(int sig) < { < mlogf(M_ERROR,M_SHOW, "()%d): exiting due to a SIGSEGV signal %d - %s(%d)\n", < currentProc, sig, __FILE__, __LINE__); < abort(); < } < */ < < ++++++ 0180-2175507-alloca_sockaddr.patch ++++++ Index: msgqueue.c =================================================================== RCS file: /cvsroot/sblim/sfcb/msgqueue.c,v retrieving revision 1.25 diff -u -p -r1.25 msgqueue.c --- msgqueue.c 16 Oct 2008 15:53:36 -0000 1.25 +++ msgqueue.c 17 Oct 2008 21:17:40 -0000 @@ -30,6 +30,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> +#include <stddef.h> extern unsigned long exFlags; @@ -621,7 +622,7 @@ int getControlChars(char *id, char **val void stopLocalConnectServer() { - static struct sockaddr_un serverAddr; + static struct sockaddr_un *serverAddr; int sock,size=0; unsigned long int l; char *path; @@ -635,11 +636,13 @@ void stopLocalConnectServer() return; } - serverAddr.sun_family=AF_UNIX; - strcpy(serverAddr.sun_path,path); + socklen_t serverAddrLen = offsetof(struct sockaddr_un, sun_path) + + strlen(path) + 1; + serverAddr = alloca(serverAddrLen); + serverAddr->sun_family=AF_UNIX; + strcpy(serverAddr->sun_path,path); - if (connect(sock,(const struct sockaddr*)&serverAddr, - sizeof(serverAddr.sun_family)+strlen(serverAddr.sun_path))<0) { + if (connect(sock,(const struct sockaddr*)serverAddr, serverAddrLen)<0) { perror("connect error"); return; } @@ -650,7 +653,7 @@ void stopLocalConnectServer() void localConnectServer() { - static struct sockaddr_un clientAddr,serverAddr; + static struct sockaddr_un clientAddr,*serverAddr; int nsocket,ssocket; unsigned int cl, notDone=1; char *path; @@ -667,18 +670,20 @@ void localConnectServer() if (getControlChars("localSocketPath", &path)!=0) { mlogf(M_INFO,M_SHOW,"--- localConnectServer failed to start\n"); } - + if ((ssocket=socket(PF_UNIX, SOCK_STREAM, 0))<0) { perror("socket creation error"); return; } - serverAddr.sun_family=AF_UNIX; - strcpy(serverAddr.sun_path,path); + socklen_t serverAddrLen = offsetof(struct sockaddr_un, sun_path) + + strlen(path) + 1; + serverAddr = alloca(serverAddrLen); + serverAddr->sun_family=AF_UNIX; + strncpy(serverAddr->sun_path,path,sizeof(serverAddr->sun_path)); unlink(path); - if (bind(ssocket,(const struct sockaddr*)&serverAddr, - sizeof(serverAddr.sun_family)+strlen(serverAddr.sun_path))<0) { + if (bind(ssocket,(const struct sockaddr*)serverAddr, serverAddrLen)<0) { perror("bind error"); return; } @@ -688,12 +693,12 @@ void localConnectServer() do { // sfcbSockets.send; cl=sizeof(clientAddr); - if ((nsocket=accept(ssocket,(struct sockaddr*)&serverAddr,&cl))<0) { + if ((nsocket=accept(ssocket,(struct sockaddr*)serverAddr,&cl))<0) { perror("accept error"); /* Being interrupted isn't necessarily bad; try once more */ if (errno == EINTR) { - if ((nsocket=accept(ssocket,(struct sockaddr*)&serverAddr,&cl))<0) { + if ((nsocket=accept(ssocket,(struct sockaddr*)serverAddr,&cl))<0) { perror("accept error (2)"); return; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 scpm
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package scpm checked in at Mon Oct 27 17:15:31 CET 2008. -------- --- scpm/scpm.changes 2008-08-18 18:12:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/scpm/scpm.changes 2008-10-22 12:39:08.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Oct 22 12:36:00 CEST 2008 - helmut.schaa(a)gmail.com + +- update to 1.1.7 final + * added bash completion (bnc#400354) + * fix build with gcc 4.3 +- remove patch scpm-gcc43.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- scpm-1.1.6.tar.bz2 scpm-gcc43.diff New: ---- scpm-1.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scpm.spec ++++++ --- /var/tmp/diff_new_pack.RJ2384/_old 2008-10-27 17:15:12.000000000 +0100 +++ /var/tmp/diff_new_pack.RJ2384/_new 2008-10-27 17:15:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package scpm (Version 1.1.6) +# spec file for package scpm (Version 1.1.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,13 +21,12 @@ Name: scpm BuildRequires: doxygen gcc-c++ graphviz libjpeg-devel libpng-devel mhash-devel Summary: System Configuration Profile Management -Version: 1.1.6 -Release: 94 +Version: 1.1.7 +Release: 1 Group: System/Base License: GPL v2 or later Source: scpm-%{version}.tar.bz2 Source1: logrotate-scpm -Patch0: scpm-gcc43.diff Patch1: fix_boot_script.patch Requires: diffutils textutils BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,7 +62,6 @@ %prep %setup scpm -%patch0 -p1 %patch1 -p0 %build @@ -111,6 +109,7 @@ %config(noreplace) /etc/scpm.users %config /etc/init.d/boot.scpm /etc/logrotate.d/scpm +/etc/bash_completion.d/scpm_completion.sh %{_sbindir}/scpm /sbin/conf.d/SuSEconfig.scpm %{_libdir}/libscpm.so* @@ -137,6 +136,11 @@ test "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 22 2008 helmut.schaa(a)gmail.com +- update to 1.1.7 final + * added bash completion (bnc#400354) + * fix build with gcc 4.3 +- remove patch scpm-gcc43.diff * Mon Aug 18 2008 mrueckert(a)suse.de - remove outdated options in the fillup_and_insserv call - replace deprecated run_ldconfig ++++++ scpm-1.1.6.tar.bz2 -> scpm-1.1.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/CHANGES new/scpm-1.1.7/CHANGES --- old/scpm-1.1.6/CHANGES 2007-09-14 17:57:40.000000000 +0200 +++ new/scpm-1.1.7/CHANGES 2008-10-22 12:13:32.000000000 +0200 @@ -1,3 +1,7 @@ +1.1.7 + - added bash completion support + - fixed build with gcc 4.3 + 1.1.6 - updated translations diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/include/tokenizer.h new/scpm-1.1.7/include/tokenizer.h --- old/scpm-1.1.6/include/tokenizer.h 2005-05-11 11:03:12.000000000 +0200 +++ new/scpm-1.1.7/include/tokenizer.h 2008-10-22 12:12:41.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: tokenizer.h,v 1.1.1.1 2005/05/11 09:03:12 gleissner Exp $ + * $Id: tokenizer.h,v 1.2 2008/10/22 10:12:41 hschaa Exp $ * * * Project : SCPM (System Configuration Profile Management) @@ -21,6 +21,7 @@ #define _GNU_SOURCE #endif +#include <cstdlib> #include <cstring> #include <string> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/Makefile new/scpm-1.1.7/Makefile --- old/scpm-1.1.6/Makefile 2005-07-23 15:08:13.000000000 +0200 +++ new/scpm-1.1.7/Makefile 2008-10-22 13:03:22.000000000 +0200 @@ -2,7 +2,7 @@ include Makefile.vars -SUBDIRS=include src lib doc po +SUBDIRS=include src lib doc po scripts .PHONY: $(SUBDIRS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/Makefile.vars new/scpm-1.1.7/Makefile.vars --- old/scpm-1.1.6/Makefile.vars 2007-09-14 17:57:40.000000000 +0200 +++ new/scpm-1.1.7/Makefile.vars 2008-10-22 12:09:28.000000000 +0200 @@ -1,4 +1,4 @@ -VERSION=1.1.6 +VERSION=1.1.7 LIBVERSION=1.1 APIVERSION=1 VERSIONFLAGS=-DSCPM_VERSION=\"$(VERSION)\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/scripts/Makefile new/scpm-1.1.7/scripts/Makefile --- old/scpm-1.1.6/scripts/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/scpm-1.1.7/scripts/Makefile 2008-10-22 13:02:22.000000000 +0200 @@ -0,0 +1,5 @@ +all: + +install: + mkdir -p $(PREFIX)/etc/bash_completion.d + install -m 644 scpm_completion.sh $(PREFIX)/etc/bash_completion.d/ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/scripts/scpm_completion.sh new/scpm-1.1.7/scripts/scpm_completion.sh --- old/scpm-1.1.6/scripts/scpm_completion.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/scpm-1.1.7/scripts/scpm_completion.sh 2008-06-23 11:39:34.000000000 +0200 @@ -0,0 +1,40 @@ +# scpm completion v0.1 aplha 1 :-) +# A gift from Marek Stopka <mstopka(a)opensuse.org> + +_scpm() { + SCPM_CMDLIST=() + SCPM=`which scpm` + local opts cur prev prevprev + if test ${#SCPM_CMDLIST[*]} = 0; then + for foo in $(LC_ALL=C $SCPM 2>&1 | sed -e "1,/command may be:/d" | egrep ^[a-z] | awk -F ' ' '{print $1}'); do + SCPM_CMDLIST="$SCPM_CMDLIST $foo" + done + SCPM_CMDLIST="$SCPM_CMDLIST" + fi + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + if [[ ${#COMP_WORDS[@]} -ge 3 ]]; then + prevprev=${COMP_WORDS[COMP_CWORD-2]} + fi + + case "$prev" in + scpm) + opts=$SCPM_CMDLIST + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + ;; + switch) + opts=`$SCPM list` + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + ;; + rename) + opts=`$SCPM list` + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + ;; + delete) + opts=`$SCPM list` + COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + ;; + esac +} + +complete -F _scpm -X -o default scpm diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/cli/db_commands.cc new/scpm-1.1.7/src/cli/db_commands.cc --- old/scpm-1.1.6/src/cli/db_commands.cc 2005-07-28 16:46:51.000000000 +0200 +++ new/scpm-1.1.7/src/cli/db_commands.cc 2008-10-22 12:12:41.000000000 +0200 @@ -1,6 +1,6 @@ /* - * $Id: db_commands.cc,v 1.2 2005/07/28 14:46:51 gleissner Exp $ + * $Id: db_commands.cc,v 1.3 2008/10/22 10:12:41 hschaa Exp $ * * * Project : SCPM (System Configuration Profile Management) @@ -21,6 +21,7 @@ #include <vector> #include <scdb.h> #include <scdb_util.h> +#include <cstdlib> #include <iostream> #include <fstream> #include <libintl.h> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/main/executor.cc new/scpm-1.1.7/src/main/executor.cc --- old/scpm-1.1.6/src/main/executor.cc 2006-02-06 13:25:48.000000000 +0100 +++ new/scpm-1.1.7/src/main/executor.cc 2008-10-22 12:12:41.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: executor.cc,v 1.2 2006/02/06 12:25:48 gleissner Exp $ + * $Id: executor.cc,v 1.3 2008/10/22 10:12:41 hschaa Exp $ * * * Project : SCPM (System Configuration Profile Management) @@ -21,6 +21,7 @@ #include <sstream> #include <iostream> #include <fstream> +#include <stdlib.h> #include <vector> #include <unistd.h> #include <fcntl.h> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/main/journal.cc new/scpm-1.1.7/src/main/journal.cc --- old/scpm-1.1.6/src/main/journal.cc 2006-09-21 09:47:58.000000000 +0200 +++ new/scpm-1.1.7/src/main/journal.cc 2008-10-22 12:12:42.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: journal.cc,v 1.2 2006/09/21 07:47:58 hschaa Exp $ + * $Id: journal.cc,v 1.3 2008/10/22 10:12:42 hschaa Exp $ * * * Project : SCPM (System Configuration Profile Management) @@ -19,6 +19,7 @@ #include "scpm_conf.hh" #include <sys/stat.h> #include <signal.h> +#include <limits.h> #include <fstream> #include <sstream> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/main/scpm_conf.cc new/scpm-1.1.7/src/main/scpm_conf.cc --- old/scpm-1.1.6/src/main/scpm_conf.cc 2005-12-13 17:30:15.000000000 +0100 +++ new/scpm-1.1.7/src/main/scpm_conf.cc 2008-10-22 12:12:42.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: scpm_conf.cc,v 1.3 2005/12/13 16:30:15 gleissner Exp $ + * $Id: scpm_conf.cc,v 1.4 2008/10/22 10:12:42 hschaa Exp $ * * * Project : SCPM (System Configuration Profile Management) @@ -21,6 +21,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> +#include <stdlib.h> SCPM_conf::SCPM_conf( ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/modules/file.cc new/scpm-1.1.7/src/modules/file.cc --- old/scpm-1.1.6/src/modules/file.cc 2006-09-21 15:00:57.000000000 +0200 +++ new/scpm-1.1.7/src/modules/file.cc 2008-10-22 12:12:42.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: file.cc,v 1.11 2006/09/21 13:00:57 hschaa Exp $ + * $Id: file.cc,v 1.12 2008/10/22 10:12:42 hschaa Exp $ * * * Project : SCPM (System Configuration Profile Management) @@ -31,6 +31,7 @@ #include <scdb.hh> #include <progress.hh> #include <executor.hh> +#include <cstring> #define module_name "file" @@ -748,7 +749,7 @@ // } // return; // } - int difffd = open( difffile, O_WRONLY|O_TRUNC|O_CREAT ); + int difffd = open( difffile, O_WRONLY|O_TRUNC|O_CREAT, 0600 ); if (difffd == -1 ) { LOGWARN( "executing diff command failed (could not open temp file)"); return; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/scdb/scdb_file.hh new/scpm-1.1.7/src/scdb/scdb_file.hh --- old/scpm-1.1.6/src/scdb/scdb_file.hh 2006-09-21 09:47:59.000000000 +0200 +++ new/scpm-1.1.7/src/scdb/scdb_file.hh 2008-10-22 12:12:42.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: scdb_file.hh,v 1.2 2006/09/21 07:47:59 hschaa Exp $ + * $Id: scdb_file.hh,v 1.3 2008/10/22 10:12:42 hschaa Exp $ * * * Project : SCPM (System Configuration Profile Management) @@ -18,6 +18,7 @@ #define SCDB_FILE_H #include <iostream> #include <string> +#include <cstdlib> #include <vector> #include <list> #include <utility> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scpm-1.1.6/src/scdb/xml.cc new/scpm-1.1.7/src/scdb/xml.cc --- old/scpm-1.1.6/src/scdb/xml.cc 2005-05-11 11:03:12.000000000 +0200 +++ new/scpm-1.1.7/src/scdb/xml.cc 2008-10-22 12:12:42.000000000 +0200 @@ -1,5 +1,5 @@ /* - * $Id: xml.cc,v 1.1.1.1 2005/05/11 09:03:12 gleissner Exp $ + * $Id: xml.cc,v 1.2 2008/10/22 10:12:42 hschaa Exp $ * * * Project : SCPM (System Configuration Profile Management) @@ -16,6 +16,7 @@ */ #include "xml.hh" #include <sstream> +#include <cstring> XML::XML( ) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sax2
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package sax2 checked in at Mon Oct 27 17:14:39 CET 2008. -------- --- sax2/sax2.changes 2008-10-23 17:11:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2008-10-26 16:33:56.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Oct 26 16:33:08 CET 2008 - sndirsch(a)suse.de + +- Identity.map: renamed "AST1000/2000" to "ASPEED Graphics Family" + (bnc #439053) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.P28119/_old 2008-10-27 17:13:15.000000000 +0100 +++ /var/tmp/diff_new_pack.P28119/_new 2008-10-27 17:13:15.000000000 +0100 @@ -47,7 +47,7 @@ PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq Summary: SuSE advanced X Window System-configuration Version: 8.1 -Release: 528 +Release: 529 Group: System/X11/Utilities License: GPL v2 or later Source: sax2.tar.bz2 @@ -522,13 +522,16 @@ %endif %changelog +* Sun Oct 26 2008 sndirsch(a)suse.de +- Identity.map: renamed "AST1000/2000" to "ASPEED Graphics Family" + (bnc #439053) * Thu Oct 23 2008 ms(a)suse.de - fixed setPrimaryChip option setup (bnc #432732) * Thu Oct 23 2008 sndirsch(a)suse.de - Identity.map: remove fglrx driver entries (bnc #436727, #437935) * Wed Oct 22 2008 sndirsch(a)suse.de - updated translations from LCN SVN (20081022) -* Tue Oct 21 2008 sndirsch(a)suse.de +* Mon Oct 20 2008 sndirsch(a)suse.de - removed HP preload monitor entries and profile, since these are no longer required; fixes also bnc #436905 * Thu Oct 16 2008 sndirsch(a)suse.de @@ -543,13 +546,13 @@ * Wed Oct 15 2008 sndirsch(a)suse.de - allow to select also COM5 (ttyS4) as device for tablets/touchscreens (bnc #432350) -* Wed Oct 15 2008 sndirsch(a)suse.de +* Tue Oct 14 2008 sndirsch(a)suse.de - accept vmmouse as standard mouse, i.e. no longer add default mouse if vmmouse detected (Matthias Hopf, bnc #433339) * Tue Oct 14 2008 sndirsch(a)suse.de - Identity.map: use vesa driver for IBM 855GM (8086:3582:8086:3582) (bnc #410305) -* Tue Oct 14 2008 sndirsch(a)suse.de +* Mon Oct 13 2008 sndirsch(a)suse.de - added 1024x576 as possible VESA mode to sysp * Thu Oct 09 2008 sndirsch(a)suse.de - fixed mixed up MinY/MaxY values for ELO 2300 touchscreen @@ -663,16 +666,16 @@ a long time - AFAIK; replaced with the logic also used by Intel.pl, RadeonHD.pl, which make sure that 'Option "monitor-<output>"' is used (bnc #420124) -* Sat Aug 23 2008 sndirsch(a)suse.de +* Fri Aug 22 2008 sndirsch(a)suse.de - Extended existing serial 'Wacom ISDV4 TabletPC' entry with Touch device. Added new generic entry for TabletPCs based on internal Wacom USB devices. (Danny Kukawka) -* Sat Aug 23 2008 sndirsch(a)suse.de +* Fri Aug 22 2008 sndirsch(a)suse.de - Added new entries for TabletPCs with internal WACOM USB Tablet devices from ASUS (R1E and R1F). (Danny Kukawka) -* Sat Aug 23 2008 sndirsch(a)suse.de +* Fri Aug 22 2008 sndirsch(a)suse.de - This patch allows to use for Tablets (as also TabletPCs) devices which are not /dev/input/event* as e.g.: * /dev/input/wacom @@ -681,7 +684,7 @@ This allows to use persistend device names as e.g. needed for new Wacom USB based TabletPC devices. (Danny Kukawka) -* Sat Aug 23 2008 sndirsch(a)suse.de +* Fri Aug 22 2008 sndirsch(a)suse.de - Fixed handling of serial tablet ports in the SaX2 GUI. Solved problem that ttyS1 and ttyS2 was mapped both to ttyS1. (Danny Kukawka) @@ -690,7 +693,7 @@ * no longer set *Edge values; these are now detected and set by the synaptics driver itself, which appears to work fine at least on ALPS touchpads used in Macbooks -* Tue Aug 12 2008 sndirsch(a)suse.de +* Mon Aug 11 2008 sndirsch(a)suse.de - added 'Virtual2k' for Intel < 965; still useful for hotplugging a monitor in cloned mode (bnc #414156) * Tue Aug 05 2008 sndirsch(a)suse.de @@ -763,11 +766,11 @@ - don't call no longer existing function GetRgbPath * Mon Jul 07 2008 sndirsch(a)suse.de - updated translations from LCN SVN (20080707) -* Sat Jul 05 2008 sndirsch(a)suse.de +* Fri Jul 04 2008 sndirsch(a)suse.de - fixed build for xorg-server 1.5 * Thu Jul 03 2008 sndirsch(a)suse.de - another x11DB update -* Thu Jul 03 2008 sndirsch(a)suse.de +* Wed Jul 02 2008 sndirsch(a)suse.de - update x11DB * Mon Jun 30 2008 sndirsch(a)suse.de - allow to select also COM2/COM3 as device for touchscreens @@ -922,7 +925,7 @@ * Sat Mar 29 2008 ms(a)suse.de - yet another gt3 to qt4 porting bug, fixed importing keyboard configuration information (bnc #373700) -* Sat Mar 22 2008 sndirsch(a)suse.de +* Fri Mar 21 2008 sndirsch(a)suse.de - disable-vmmouse.diff * no longer use vmmouse driver by default (bnc #372189) * Thu Mar 20 2008 sndirsch(a)suse.de @@ -2314,7 +2317,7 @@ - added HP zv5000 monitor to the database (#71797) * Wed Mar 09 2005 ms(a)suse.de - fixed image file format of sax2.xpm (#71793) -* Tue Mar 08 2005 ms(a)suse.de +* Mon Mar 07 2005 ms(a)suse.de - don't use Bitstream fonts in documentation * Mon Mar 07 2005 ms(a)suse.de - update Identity maps for [i386,x86_64] ++++++ sax2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/svnbuild new/sax/svnbuild --- old/sax/svnbuild 2008-10-23 17:18:42.000000000 +0200 +++ new/sax/svnbuild 2008-10-26 16:39:42.000000000 +0100 @@ -1 +1 @@ -1748 +1749 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/arch/Identity.map.i386 new/sax/sysp/maps/arch/Identity.map.i386 --- old/sax/sysp/maps/arch/Identity.map.i386 2008-10-23 06:47:27.000000000 +0200 +++ new/sax/sysp/maps/arch/Identity.map.i386 2008-10-26 16:31:51.000000000 +0100 @@ -70,7 +70,7 @@ #-----------------------------------# # ASPEED Technology Inc. Cards #-----------------------------------# -NAME=ASPEED Technology Inc.&DEVICE=AST1000/2000&VID=0x1A03&DID=0x2000&SERVER=ast&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT +NAME=ASPEED Technology Inc.&DEVICE=ASPEED Graphics Family&VID=0x1A03&DID=0x2000&SERVER=ast&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT #-----------------------------------# # Asustek Computer, Inc. Cards diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/arch/Identity.map.ia64 new/sax/sysp/maps/arch/Identity.map.ia64 --- old/sax/sysp/maps/arch/Identity.map.ia64 2008-10-23 06:47:27.000000000 +0200 +++ new/sax/sysp/maps/arch/Identity.map.ia64 2008-10-26 16:31:51.000000000 +0100 @@ -65,7 +65,7 @@ #-----------------------------------# # ASPEED Technology Inc. Cards #-----------------------------------# -NAME=ASPEED Technology Inc.&DEVICE=AST1000/2000&VID=0x1A03&DID=0x2000&SERVER=ast&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT +NAME=ASPEED Technology Inc.&DEVICE=ASPEED Graphics Family&VID=0x1A03&DID=0x2000&SERVER=ast&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT #-----------------------------------# # Asustek Computer, Inc. Cards diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/arch/Identity.map.ppc new/sax/sysp/maps/arch/Identity.map.ppc --- old/sax/sysp/maps/arch/Identity.map.ppc 2008-10-23 06:47:27.000000000 +0200 +++ new/sax/sysp/maps/arch/Identity.map.ppc 2008-10-26 16:31:51.000000000 +0100 @@ -65,7 +65,7 @@ #-----------------------------------# # ASPEED Technology Inc. Cards #-----------------------------------# -NAME=ASPEED Technology Inc.&DEVICE=AST1000/2000&VID=0x1A03&DID=0x2000&SERVER=ast&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT +NAME=ASPEED Technology Inc.&DEVICE=ASPEED Graphics Family&VID=0x1A03&DID=0x2000&SERVER=ast&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT #-----------------------------------# # ATI Technologies Inc Cards diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/arch/Identity.map.x86_64 new/sax/sysp/maps/arch/Identity.map.x86_64 --- old/sax/sysp/maps/arch/Identity.map.x86_64 2008-10-23 06:47:27.000000000 +0200 +++ new/sax/sysp/maps/arch/Identity.map.x86_64 2008-10-26 16:31:51.000000000 +0100 @@ -65,7 +65,7 @@ #-----------------------------------# # ASPEED Technology Inc. Cards #-----------------------------------# -NAME=ASPEED Technology Inc.&DEVICE=AST1000/2000&VID=0x1A03&DID=0x2000&SERVER=ast&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT +NAME=ASPEED Technology Inc.&DEVICE=ASPEED Graphics Family&VID=0x1A03&DID=0x2000&SERVER=ast&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT #-----------------------------------# # Asustek Computer, Inc. Cards diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/Identity.map new/sax/sysp/maps/Identity.map --- old/sax/sysp/maps/Identity.map 2008-10-23 06:47:27.000000000 +0200 +++ new/sax/sysp/maps/Identity.map 2008-10-26 16:31:51.000000000 +0100 @@ -70,7 +70,7 @@ #-----------------------------------# # ASPEED Technology Inc. Cards #-----------------------------------# -NAME=ASPEED Technology Inc.&DEVICE=AST1000/2000&VID=0x1A03&DID=0x2000&SERVER=ast&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT +NAME=ASPEED Technology Inc.&DEVICE=ASPEED Graphics Family&VID=0x1A03&DID=0x2000&SERVER=ast&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT #-----------------------------------# # Asustek Computer, Inc. Cards ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 samba
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package samba checked in at Mon Oct 27 17:14:37 CET 2008. -------- --- samba/samba.changes 2008-10-03 17:08:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2008-10-27 15:53:19.000000000 +0100 @@ -1,0 +2,25 @@ +Fri Oct 24 13:18:53 CEST 2008 - anschneider(a)suse.de + +- Fix the pam_winbind build. + +------------------------------------------------------------------- +Tue Oct 21 16:32:56 CEST 2008 - anschneider(a)suse.de + +- Delete the krb5 ccname variable from the PAM environment if set. + +------------------------------------------------------------------- +Thu Oct 16 14:49:16 CEST 2008 - anschneider(a)suse.de + +- Move the nss_info modules to the samba-winbind package. + +------------------------------------------------------------------- +Thu Oct 16 11:40:17 CEST 2008 - anschneider(a)suse.de + +- Add version branding for CODE 11. + +------------------------------------------------------------------- +Wed Oct 15 17:24:25 CEST 2008 - anschneider(a)suse.de + +- Restart smbfs even with the traditional network setup; (bnc#425058); + +------------------------------------------------------------------- @@ -613,0 +639,6 @@ +Fri May 16 13:20:11 CEST 2008 - hhetter(a)suse.de + +- Prevent errors during the cache validation when ua keys reach a size larger + than 1024; [bnc#372558]. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.r27870/_old 2008-10-27 17:13:11.000000000 +0100 +++ /var/tmp/diff_new_pack.r27870/_new 2008-10-27 17:13:11.000000000 +0100 @@ -26,7 +26,7 @@ License: GPL v3 or later Url: http://www.samba.org/ Version: 3.2.4 -Release: 2 +Release: 3 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -127,8 +127,8 @@ else product_suffix="-OBS" fi - case "0%{?suse_version}" in - 1010) product_suffix="-CODE${major_version}" ;; + case "%{?suse_version}" in + 1010|1110) product_suffix="-CODE${major_version}" ;; esac fi # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file @@ -319,7 +319,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.r27870/_old 2008-10-27 17:13:11.000000000 +0100 +++ /var/tmp/diff_new_pack.r27870/_new 2008-10-27 17:13:11.000000000 +0100 @@ -51,7 +51,7 @@ Url: http://www.samba.org/ AutoReqProv: on Version: 3.2.4 -Release: 2 +Release: 3 Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 Recommends: cron logrotate @@ -128,7 +128,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package client @@ -165,7 +165,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -186,7 +186,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -216,7 +216,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -243,7 +243,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %if %{make_utils} @@ -289,7 +289,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -324,7 +324,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %else @@ -338,7 +338,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -372,7 +372,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libnetapi0 @@ -391,7 +391,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libnetapi-devel @@ -411,7 +411,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -438,7 +438,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %else @@ -452,7 +452,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -483,7 +483,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %if %{make_ldapsmb} @@ -504,7 +504,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libtalloc-devel @@ -524,7 +524,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libtdb1 @@ -543,7 +543,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libtdb-devel @@ -563,7 +563,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libwbclient0 @@ -582,7 +582,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n libwbclient-devel @@ -602,7 +602,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %package -n ldapsmb @@ -611,7 +611,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 241 +Release: 242 Requires: perl-ldap %description -n ldapsmb @@ -624,7 +624,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -646,7 +646,7 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -658,7 +658,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 0.3.6b -Release: 245 +Release: 246 Provides: samba3-vscan = 0.3.6b Obsoletes: samba3-vscan Requires: samba = %{samba_ver} @@ -676,7 +676,7 @@ -------- Rainer Link <rainer(a)openantivirus.org> -Source Timestamp: 1931 +Source Timestamp: 1971 Branch : 3.2.4 %endif @@ -744,8 +744,8 @@ else product_suffix="-OBS" fi - case "0%{?suse_version}" in - 1010) product_suffix="-CODE${major_version}" ;; + case "%{?suse_version}" in + 1010|1110) product_suffix="-CODE${major_version}" ;; esac fi # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file @@ -943,8 +943,6 @@ touch ${RPM_BUILD_ROOT}/var/lock/subsys/smbfs cp -p config/swat.xinetd ${RPM_BUILD_ROOT}/%{_sysconfdir}/xinetd.d/swat cp -p config/samba.reg ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d/ -install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/NetworkManager/dispatcher.d/ -cp -p tools/smbfs ${RPM_BUILD_ROOT}/%{_sysconfdir}/NetworkManager/dispatcher.d/smbfs %if 0%{?suse_version} && 0%{?suse_version} < 921 cp -p config/samba.pamd ${RPM_BUILD_ROOT}/%{_sysconfdir}/pam.d/samba %else @@ -952,11 +950,11 @@ %endif cp -p config/dhcp.conf ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf cp -p config/sysconfig.dhcp-samba-client ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/ -for script in dhcpcd-hook-samba samba-winbindd; do +for script in dhcpcd-hook-samba samba-winbindd smbfs; do cp -p "tools/${script}" "${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/" done # Create ghosts for the symlinks -for script in 21-dhcpcd-hook-samba 55-samba-winbindd; do +for script in 21-dhcpcd-hook-samba 21-smbfs 55-samba-winbindd; do touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} done # Add logrotate settings for nmbd and smbd only on systems newer than 8.1. @@ -1140,12 +1138,18 @@ %{?fillup_and_insserv -fy smbfs} ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba + ln -fs %{_sysconfdir}/sysconfig/network/scripts/smbfs %{_sysconfdir}/sysconfig/network/if-down.d/21-smbfs + ln -fs %{_sysconfdir}/sysconfig/network/scripts/smbfs %{_sysconfdir}/sysconfig/network/if-up.d/21-smbfs else for if_case in if-down.d if-up.d; do test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba || \ continue rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-dhcpcd-hook-samba + test -h %{_sysconfdir}/sysconfig/network/${if_case}/smbfs || \ + continue + rm -f %{_sysconfdir}/sysconfig/network/${if_case}/smbfs + ln -fs %{_sysconfdir}/sysconfig/network/scripts/smbfs %{_sysconfdir}/sysconfig/network/${if_case}/21-smbfs done fi if ! test -e %{_bindir}/get_printing_ticket; then @@ -1363,11 +1367,11 @@ %attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/samba3.schema %ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba %ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba -%dir %{_sysconfdir}/NetworkManager -%dir %{_sysconfdir}/NetworkManager/dispatcher.d -%{_sysconfdir}/NetworkManager/dispatcher.d/smbfs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba-functions +%ghost %{_sysconfdir}/sysconfig/network/if-down.d/21-smbfs +%ghost %{_sysconfdir}/sysconfig/network/if-up.d/21-smbfs +%{_sysconfdir}/sysconfig/network/scripts/smbfs %{_bindir}/eventlogadm %{_bindir}/findsmb %{_bindir}/ldbadd @@ -1406,10 +1410,6 @@ %{_libdir}/samba/lowcase.dat %{_libdir}/samba/upcase.dat %{_libdir}/samba/valid.dat -%dir %{_libdir}/samba/nss_info -%{_libdir}/samba/nss_info/rfc2307.so -%{_libdir}/samba/nss_info/sfu.so -%{_libdir}/samba/nss_info/sfu20.so %doc %{_mandir}/man1/findsmb.1.* %doc %{_mandir}/man1/ldbadd.1.* %doc %{_mandir}/man1/ldbdel.1.* @@ -1483,6 +1483,7 @@ /%{_lib}/libnss_winbind.so.2 /%{_lib}/security/pam_winbind.so %{_libdir}/samba/idmap +%{_libdir}/samba/nss_info %doc %{_mandir}/man7/pam_winbind.7.* %doc %{_mandir}/man8/idmap_ad.8.* %doc %{_mandir}/man8/idmap_ldap.8.* @@ -1647,6 +1648,16 @@ %endif %changelog +* Fri Oct 24 2008 anschneider(a)suse.de +- Fix the pam_winbind build. +* Tue Oct 21 2008 anschneider(a)suse.de +- Delete the krb5 ccname variable from the PAM environment if set. +* Thu Oct 16 2008 anschneider(a)suse.de +- Move the nss_info modules to the samba-winbind package. +* Thu Oct 16 2008 anschneider(a)suse.de +- Add version branding for CODE 11. +* Wed Oct 15 2008 anschneider(a)suse.de +- Restart smbfs even with the traditional network setup; (bnc#425058); * Fri Oct 03 2008 lmuelle(a)suse.de - Only call the stop_on_removal, restart_on_update, or insserv_cleanup macro if available. @@ -2079,6 +2090,9 @@ - Cleanup the use of the suse_version macro to achieve consistent defaults. * Fri May 16 2008 lmuelle(a)suse.de - Set CODEPAGEDIR while make to fit the install location. +* Fri May 16 2008 hhetter(a)suse.de +- Prevent errors during the cache validation when ua keys reach a size larger + than 1024; [bnc#372558]. * Thu May 15 2008 lmuelle(a)suse.de - Package man page files independent of the used compression method (gz,lzma). * Wed May 14 2008 lmuelle(a)suse.de ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.r27870/_old 2008-10-27 17:13:11.000000000 +0100 +++ /var/tmp/diff_new_pack.r27870/_new 2008-10-27 17:13:11.000000000 +0100 @@ -1,2 +1,2 @@ -1931 +1971 Branch : 3.2.4 ++++++ patches.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/e7b0d1c984a37600a234c1f4c95b06e9b5898f30 new/patches/samba.org/e7b0d1c984a37600a234c1f4c95b06e9b5898f30 --- old/patches/samba.org/e7b0d1c984a37600a234c1f4c95b06e9b5898f30 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/e7b0d1c984a37600a234c1f4c95b06e9b5898f30 2008-10-22 18:00:05.000000000 +0200 @@ -0,0 +1,27 @@ +commit e7b0d1c984a37600a234c1f4c95b06e9b5898f30 +Author: Andreas Schneider <mail(a)cynapses.org> +Date: Mon Oct 20 17:35:42 2008 +0200 + + Delete the krb5 ccname variable from the PAM environment if set. + + If winbind sets the KRB5CCNAME variable it should unset it when + the cache gets destroyed. + +Index: source/nsswitch/pam_winbind.c +=================================================================== +--- source/nsswitch/pam_winbind.c.orig ++++ source/nsswitch/pam_winbind.c +@@ -2358,6 +2358,13 @@ int pam_sm_close_session(pam_handle_t *p + } + + out: ++ /* ++ * Delete the krb5 ccname variable from the PAM environment ++ * if it was set by winbind. ++ */ ++ if (ctx->ctrl & WINBIND_KRB5_AUTH) { ++ pam_putenv(pamh, "KRB5CCNAME"); ++ } + + _PAM_LOG_FUNCTION_LEAVE("pam_sm_close_session", ctx, retval); + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/series new/patches/series --- old/patches/series 2008-09-29 16:38:43.000000000 +0200 +++ new/patches/series 2008-10-22 18:00:05.000000000 +0200 @@ -6,6 +6,7 @@ # Samba patches from upstream, svnanon.Samba.org samba.org/0a0426650e596453b4b8aa6536f4fe8b1d890451 -p0 # bnc 416598 +samba.org/e7b0d1c984a37600a234c1f4c95b06e9b5898f30 -p0 # SuSE specific changes # disabled -> WIP lmuelle ++++++ vendor-files.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2008-10-03 23:20:55.000000000 +0200 +++ new/vendor-files/tools/package-data 2008-10-27 15:53:40.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="1931" +SAMBA_PACKAGE_SVN_VERSION="1971" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/tools/smbfs new/vendor-files/tools/smbfs --- old/vendor-files/tools/smbfs 2008-09-20 12:41:42.000000000 +0200 +++ new/vendor-files/tools/smbfs 2008-10-20 20:48:33.000000000 +0200 @@ -1,17 +1,75 @@ -#! /bin/sh +#! /bin/bash # -# smbfs dispatcher script for NetworkManager +# This program is free software; you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. # -# Andreas Schneider <anschneider(a)suse.de> +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. # -case "$2" in - up) - /sbin/chkconfig --check smbfs && /etc/init.d/smbfs restart - ;; - down) - /sbin/chkconfig --check smbfs && /etc/init.d/smbfs restart - ;; - *) - exit 0 - ;; +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., 59 Temple +# Place, Suite 330, Boston, MA 02111-1307 USA +# +# Author: Andreas Schneider <anschneider(a)suse.de> + +# smbfs +# +# Script to restart smbfs + +unset ${!LC_*} LANGUAGE +export LANG="POSIX" +export PATH="/sbin:/usr/sbin:/bin/:/usr/bin" + +numArgs=$# +configname="$1" +shift +interface="$1" +if [ $interface = "lo" ]; then + exit 0 +fi +shift +# And shift away the '-o'. +shift +options="$@" + +# Log functions +function log_dbg() +{ + case "${options}" in + *debug*) + logger -t $0 -p daemon.debug "$1" + ;; + esac +} +function log_err() +{ + logger -t $0 -p daemon.err "$1" + exit 1 +} + +# Main case switch +case "$0" in + *if-up.d*) + if chkconfig -c nmb; then + log_msg=$( rcnmb start 2>&1) + log_dbg "${log_msg}" + fi + if chkconfig -c smbfs; then + log_msg=$( rcsmbfs restart 2>&1) + log_dbg "${log_msg}" + fi + ;; + *if-down.d*) + if chkconfig -c smbfs; then + log_msg=$( rcsmbfs restart 2>&1) + log_dbg "${log_msg}" + fi + ;; + *) + log_err "Don't know what to do. This script used to be called from dir if-{up,down}.d/." + ;; esac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 s390-tools
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package s390-tools checked in at Mon Oct 27 17:13:03 CET 2008. -------- --- arch/s390/s390-tools/s390-tools.changes 2008-10-22 10:29:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/s390-tools/s390-tools.changes 2008-10-27 14:28:47.644104000 +0100 @@ -1,0 +2,11 @@ +Mon Oct 27 14:04:32 CET 2008 - hare(a)suse.de + +- Update 59-dasd.rules (bnc#436980) +- Use udevadm instead of udevsettle (bnc#437349) + +------------------------------------------------------------------- +Mon Oct 27 13:34:40 CET 2008 - jjolly(a)suse.de + +- Updated to 1.8.0 v6 tarball from IBM (bnc#417514) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- s390-tools-1.8.0-v5.tar.bz2 New: ---- 59-dasd.rules s390-tools-1.8.0-v6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ s390-tools.spec ++++++ --- /var/tmp/diff_new_pack.W24042/_old 2008-10-27 17:12:46.000000000 +0100 +++ /var/tmp/diff_new_pack.W24042/_new 2008-10-27 17:12:46.000000000 +0100 @@ -22,12 +22,12 @@ Url: http://www10.software.ibm.com/developerworks/opensource/linux390 Summary: S/390 tools like zipl and dasdfmt Version: 1.8.0 -Release: 10 +Release: 11 PreReq: %insserv_prereq %fillup_prereq License: GPL v2 or later Provides: s390utils:/sbin/dasdfmt Group: System/Kernel -Source: s390-tools-%{version}-v5.tar.bz2 +Source: s390-tools-%{version}-v6.tar.bz2 AutoReqProv: yes Source1: s390-tools-rpmlintrc Source2: zipl.conf @@ -57,6 +57,7 @@ Source55: blktrace_api.h Source56: boot.cpi Source57: sysconfig.cpi +Source100: 59-dasd.rules Patch0: s390tools-150.patch Patch1: s390tools-160-pardasdfmt.patch Patch2: s390tools-160-osasnmpd_makefile.patch @@ -137,6 +138,7 @@ install -D -m644 zfcpdump_v2/zfcpdump $RPM_BUILD_ROOT%{_datadir}/s390-tools install -D -m644 etc/sysconfig/dumpconf $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.dumpconf install -D -m755 etc/init.d/dumpconf $RPM_BUILD_ROOT/etc/init.d/dumpconf +install -D -m644 %{S:100} $RPM_BUILD_ROOT/etc/udev/rules.d/59-dasd.rules #install -D -m644 etc/udev/rules.d/59-dasd.rules $RPM_BUILD_ROOT/etc/udev/rules.d/59-dasd.rules install -D -m644 etc/udev/rules.d/57-osasnmpd.rules $RPM_BUILD_ROOT/etc/udev/rules.d/57-osasnmpd.rules install -D -m644 etc/sysconfig/mon_statd $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.mon_statd @@ -255,6 +257,11 @@ /usr/lib/%{snmp}/agents/osasnmpd %changelog +* Mon Oct 27 2008 hare(a)suse.de +- Update 59-dasd.rules (bnc#436980) +- Use udevadm instead of udevsettle (bnc#437349) +* Mon Oct 27 2008 jjolly(a)suse.de +- Updated to 1.8.0 v6 tarball from IBM (bnc#417514) * Wed Oct 22 2008 hare(a)suse.de - Update zfcp_san_disc to work with automatic port discovery (bnc#433863) @@ -387,7 +394,7 @@ (#159552 - LTC22536) * Thu May 18 2006 hare(a)suse.de - mkdump.sh: fix check_devsize (#165818) -* Wed May 10 2006 ihno(a)suse.de +* Tue May 09 2006 ihno(a)suse.de - fixed activation of XPRAM devices. (#161352) * Fri Apr 28 2006 hare(a)suse.de - mkdump.sh: use sfdisk instead of parted; @@ -395,7 +402,7 @@ * Fri Apr 21 2006 hare(a)suse.de - dasd_configure: Remove hwcfg file on deconfiguring device even if no ccw device exists. -* Thu Apr 20 2006 ihno(a)suse.de +* Wed Apr 19 2006 ihno(a)suse.de - create mountpoint, if it does not exist (#157108) - force the creation of swap/filesystem (#161363) * Thu Apr 13 2006 uli(a)suse.de ++++++ 59-dasd.rules ++++++ # # Rules for unique DASD device nodes created in /dev/disk/ # This file should be installed in /etc/udev/rules.d # SUBSYSTEM!="block", GOTO="dasd_symlinks_end" ACTION!="change", GOTO="dasd_block_end" # by-id (hardware serial number) KERNEL=="dasd*[!0-9]", ATTRS{status}=="online", IMPORT{program}="/sbin/dasdinfo -a -e -b $kernel" KERNEL=="dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}" KERNEL=="dasd*[!0-9]", ENV{ID_UID}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_UID}" KERNEL=="dasd*[!0-9]", ENV{ID_XUID}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_XUID}" LABEL="dasd_block_end" ACTION!="add", GOTO="dasd_partition_end" # for partitions import parent information KERNEL=="*[0-9]", IMPORT{parent}=="ID_*" KERNEL=="dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n" KERNEL=="dasd*[0-9]", ENV{ID_UID}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_UID}-part%n" KERNEL=="dasd*[0-9]", ENV{ID_XUID}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_XUID}-part%n" LABEL="dasd_partition_end" ENV{ID_SERIAL}!="?*", GOTO="dasd_symlinks_end" # by-label/by-uuid (filesystem properties) IMPORT{program}="/sbin/vol_id --export $tempnode" ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}" ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}" LABEL="dasd_symlinks_end" ++++++ dasd_configure ++++++ --- /var/tmp/diff_new_pack.W24042/_old 2008-10-27 17:12:46.000000000 +0100 +++ /var/tmp/diff_new_pack.W24042/_new 2008-10-27 17:12:46.000000000 +0100 @@ -127,7 +127,7 @@ # Unconditionally load the cpint module, loader might be broken [ -x /sbin/modprobe ] && /sbin/modprobe -q vmcp # Wait until udev is settled - [ -x /sbin/udevsettle ] && /sbin/udevsettle --timeout=30 + [ -x /sbin/udevadm ] && /sbin/udevadm settle --timeout=30 # Check read-only status of virtual DASDs from z/VM if /sbin/vmcp q v dasd > /dasd_attr.lst 2> /dev/null; then ++++++ s390-tools-1.8.0-v5.tar.bz2 -> s390-tools-1.8.0-v6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/s390-tools-1.8.0/zconf/lszfcp new/s390-tools-1.8.0/zconf/lszfcp --- old/s390-tools-1.8.0/zconf/lszfcp 2008-03-26 14:23:21.000000000 +0100 +++ new/s390-tools-1.8.0/zconf/lszfcp 2008-10-21 08:44:26.000000000 +0200 @@ -43,7 +43,11 @@ check_fcp_devs() { - ignore=`ls $SYSFS/devices/css0/*/*/host* 2>&1` + if $FC_CLASS; then + ignore=`ls $SYSFS/class/fc_host/host* 2>&1` + else + ignore=`ls $SYSFS/devices/css0/[0-9]*/[0-9]*/host* 2>&1` + fi if [ $? -ne 0 ]; then echo "Error: No fcp devices found." @@ -127,7 +131,7 @@ show_hosts() { - HOST_LIST=`ls -dX $SYSFS/devices/css0/*/*/host*` + HOST_LIST=`ls -dX $SYSFS/devices/css0/[0-9]*/[0-9]*/host*` for HOST_PATH in $HOST_LIST; do SCSI_HOST=`basename $HOST_PATH` @@ -222,7 +226,7 @@ if $FC_CLASS; then SCSI_DEVICE_LIST=`ls -d \ $SYSFS/devices/css0/*/*/host*/rport*/target*/*/ |\ - grep -v fc_transport` + grep -P '\d+:\d+:\d+:\d+'` else SCSI_DEVICE_LIST=`ls -d $SYSFS/devices/css0/*/*/host*/*/` fi @@ -305,8 +309,8 @@ check_sysfs check_zfcp_support -check_fcp_devs check_fc_class +check_fcp_devs default=1 if [ $SHOW_HOSTS -eq 1 ]; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/s390-tools-1.8.0/ziomon/ziomon new/s390-tools-1.8.0/ziomon/ziomon --- old/s390-tools-1.8.0/ziomon/ziomon 2008-10-10 10:23:29.000000000 +0200 +++ new/s390-tools-1.8.0/ziomon/ziomon 2008-10-16 10:36:31.000000000 +0200 @@ -251,7 +251,7 @@ # we do this synchronously, as some of the volumes affected by this action # might be the ones to monitor echo -n "Collecting configuration data..."; - command="ziomon_fcpconf $verbose $WRP_LOGFILE"; + command="ziomon_fcpconf -o $WRP_LOGFILE"; debug "collect system data: $command"; $command > $WRP_MSG_Q_PATH/ziomon_fcpconf.log; echo "done"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/s390-tools-1.8.0/ziomon/ziomon.8 new/s390-tools-1.8.0/ziomon/ziomon.8 --- old/s390-tools-1.8.0/ziomon/ziomon.8 2008-10-02 12:39:30.000000000 +0200 +++ new/s390-tools-1.8.0/ziomon/ziomon.8 2008-10-22 19:06:49.000000000 +0200 @@ -57,6 +57,10 @@ interval length. .TP +.BR "\-o" " or " "\-\-outfile" +Basename for output files. + +.TP .BR device specifies a device to collect respective data for. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/s390-tools-1.8.0/ziomon/ziomon_fcpconf new/s390-tools-1.8.0/ziomon/ziomon_fcpconf --- old/s390-tools-1.8.0/ziomon/ziomon_fcpconf 2008-08-14 13:41:05.000000000 +0200 +++ new/s390-tools-1.8.0/ziomon/ziomon_fcpconf 2008-10-16 10:36:31.000000000 +0200 @@ -1,466 +1,63 @@ -#!/bin/bash - +#!/usr/bin/perl ############################################################################### -# collect some configuration, trace, and debug -# information about the S390 Linux system +# Script to collect all system information required for analysis # -# Copyright IBM Corp. 2002, 2008. -############################################################################### - - -# variables +# Copyright IBM Corp. 2008. # - -SCRIPTNAME="ziomon_fcpconf.sh" -WORKDIR=ziomon_fcpconf -rc_check_zvm=0 -# write output to following directory -WORKPFX=/tmp -WORKPATH=$WORKPFX/$WORKDIR -# write output to following files -CMDOUTPUT=runtime.out -VM_CMDOUTPUT=zvm_runtime.out -SYSFSFILELIST=sysfsfiles.out -MOUNT_POINT_DEBUGFS="/sys/kernel/debug" -kernel_version_tmp=0 -OUTFILENAME=""; -DEBUG=0; - -LOGFILE=dbginfo.log - -pwd=$PWD; - -# procfs entries to be collected (except s390dbf and scsi) -PROCFILES=" \ - /proc/sysinfo \ - /proc/version \ - /proc/cpuinfo \ - /proc/meminfo \ - /proc/buddyinfo \ - /proc/slabinfo \ - /proc/modules \ - /proc/mounts \ - /proc/partitions \ - /proc/stat \ - /proc/devices \ - /proc/misc \ - /proc/qeth \ - /proc/qeth_perf \ - /proc/qeth_ipa_takeover \ - /proc/cmdline \ - /proc/crypto \ - /proc/diskstats \ - /proc/dasd/devices \ - /proc/dasd/statistics \ - /proc/sys/vm/cmm_pages \ - /proc/sys/vm/cmm_timed_pages \ - /proc/sys/vm/cmm_timeout \ - " -PROCFILES_24=" \ - /proc/subchannels \ - /proc/chpids \ - /proc/chandev \ - /proc/ksyms \ - /proc/lvm/global \ - " - -# log files to be collected -LOGFILES=" \ - /var/log/messages \ - /var/log/IBMtape.trace \ - /var/log/IBMtape.errorlog - /var/log/lin_tape.trace - /var/log/lin_tape.errorlog - " -# config files to be collected; -# additional all files "modules.dep" are collected -CONFIGFILES=" \ - /etc/ccwgroup.conf \ - /etc/chandev.conf \ - /etc/modules.conf \ - /etc/modprobe.conf - /etc/fstab \ - /etc/syslog.conf \ - /etc/sysconfig \ - /etc/crontab \ - /etc/exports \ - /etc/sysctl.conf \ - /etc/zipl.conf \ - /etc/lvm \ - /etc/IBMtaped.conf \ - /etc/lin_taped.conf \ - /etc/multipath.conf \ - /etc/zfcp.conf \ - " - -# collect output of following commands; -# commands are separated by ':' -CMDS="uname -a\ - :ps aux\ - :ps axX\ - :dmesg -s 1048576\ - :route -n\ - :dmsetup ls\ - :dmsetup table\ - :dmsetup status\ - :multipath -v6 -ll\ - :lscss\ - :lsdasd\ - :lsmod\ - :lsdev\ - :lsscsi\ - :lstape\ - :lszfcp\ - :SPident\ - :sysctl -a\ - :mount\ - :df -h\ - :pvpath -qa - " - -# -# function definitions -# - - -function debug() { - if [ $DEBUG -ne 0 ]; then - echo " === $@"; - fi -} - - -# print version info -printversion() -{ - cat <<EOF -$SCRIPTNAME: Configuration data collector, version %S390_TOOLS_VERSION% -Copyright IBM Corp. 2002, 2008. -EOF -} - -# print usage and help -printhelp() -{ - cat <<EOF -Usage: $SCRIPTNAME [-h] [-v] [-V] OUTFILE - -Collect fcp-related configuration information. -OUTFILE is the basename for the output file. - --h, --help Print usage information and exit. --v, --version Print version information and exit. --V, --verbose Be verbose -EOF -} - -# copy file $1 to $WORKPATH -collect_file_contents() -{ - echo " $1" >> $LOGFILE - if [ ! -e $1 ] - then - echo " WARNING: No such file: \"$1\"" >> $LOGFILE - return 1 - elif [ ! -r $1 ] - then - echo " WARNING: Permission denied: \"$1\"" >> $LOGFILE - return 1 - else - if [ ! -e $WORKPATH`dirname $1` ] - then - mkdir --parents $WORKPATH`dirname $1` - fi - cp -r -d -L --parents $1 $WORKPATH 2>> $LOGFILE -# head -c 10m $1 >> $2 - if [ $? -ne 0 ] - then - echo " WARNING: cp failed for file: \"$1\"" >> $LOGFILE - return 1 - else - return 0 - fi - fi -} - -# append output of command $1 to file $2 -collect_cmd_output() -{ - echo "#######################################################">>$2 - echo "$USER@$HOST> $1">>$2 - $1 1>>$2 2>&1 - echo "" >>$2 - if [ $? -ne 0 ] - then - echo " WARNING: Command not successfully completed: \"$1\"">> $2 - return 1 - else - return 0 - fi - -} - -# check cmd line arguments -check_cmdline() -{ - while [ $# -ne 0 ]; do - case $1 in - --help|-h) - printhelp; - exit 1;; - --version|-v) - printversion; - exit 1;; - --verbose|-V) - DEBUG=1;; - -*) - echo "$SCRIPTNAME: Invalid option -- $1"; - echo "Try '$SCRIPTNAME --help' for more information."; - exit 1;; - *) - OUTFILENAME=$1; - esac; - shift; - done -} - -# change into temporary directory; if necessary create the directory -prepare_workdir() -{ - if [ ! -e $WORKPFX ] - then - mkdir $WORKPFX - fi - - if [ -e $WORKPATH ] - then - # remove old stuff - debug "Clean up target directory $WORKPATH" - rm -rf $WORKPATH/* - else - debug "Create target directory $WORKPATH" - mkdir $WORKPATH - fi - debug "Change to target directory $WORKPATH" - cd $WORKPATH -} - -# collect single proc fs entries -# (PRCFILES should not contain /proc/scsi and /proc/s390dbf) -collect_procfs() -{ - debug "Get procfs entries" - echo "Get procfs entries" > $LOGFILE - for i in $* - do - collect_file_contents $i - done -} - -# collect procfs entries of /proc/s390dbf -collect_s390dbf() -{ - debug "Get entries of /proc/s390dbf"; - echo "Get entries of /proc/s390dbf" > $LOGFILE - if [ -e /proc/s390dbf ] - then - for i in `find /proc/s390dbf -type f \ - -not -path "*/raw" -not -path "*/flush"` - do - collect_file_contents $i - done - else - echo " WARNING: /proc/s390dbf not found" | tee -a $LOGFILE - fi -} - -# collect procfs entries of /proc/scsi -collect_procfs_scsi() -{ - debug "Get entries of /proc/scsi"; - echo "Get entries of /proc/scsi" > $LOGFILE - if [ -e /proc/scsi ] - then - for i in `find /proc/scsi -type f \ - -perm +0444` - do - collect_file_contents $i - done - else - echo " WARNING: /proc/scsi not found" >> $LOGFILE - fi -} - -# collect sysfs entries -collect_sysfs() -{ - local rc_mount="" - # check if debugfs is mounted - mount | grep -q $MOUNT_POINT_DEBUGFS - rc_mount=$? - if [ $rc_mount -eq 1 ] && [ $kernel_version_tmp -ge 13 ]; then - mount -t debugfs debugfs $MOUNT_POINT_DEBUGFS - fi - - debug "Get file list of /sys"; - echo "Get file list of /sys" > $LOGFILE - collect_cmd_output "ls -Rl /sys" $SYSFSFILELIST - - debug "Get entries of /sys"; - echo "Get entries of /sys" > $LOGFILE - for i in `find /sys -noleaf -type f -perm +444` - do - if [ -e $i ] - then - collect_file_contents $i - else - echo " WARNING: $i not found" | tee -a $LOGFILE - fi - done - #unmount debugfs if not mounted at the beginning - if [ $rc_mount -eq 1 ] && [ $kernel_version_tmp -ge 13 ]; then - umount $MOUNT_POINT_DEBUGFS - fi - -} - -# collect output of commands -collect_cmdsout() -{ - local commands=$1 - local outputfile=$2 - if [ $rc_check_zvm -eq 1 ]; then - debug "Saving z/VM runtime information into $outputfile"; - echo "Saving z/VM runtime information into $outputfile" > $LOGFILE - else - debug "Saving runtime information into $outputfile"; - echo "Saving runtime information into $outputfile" > $LOGFILE - fi - _IFS_ORIG=$IFS - IFS=: - for i in $commands - do - IFS=$_IFS_ORIG - if [ $rc_check_zvm -eq 1 ]; then - i="$cp_tool $i" - fi - collect_cmd_output "$i" "$outputfile" - IFS=: - done - IFS=$_IFS_ORIG -} - -# config files and module dependencies -collect_config() -{ - debug "Copy config files"; - echo "Copy config files" > $LOGFILE - for i in $CONFIGFILES - do - collect_file_contents $i - done -} - -# Check if we run under z/VM and which Linux cp tool is installed -check_zvm() -{ - cp_tool='' - debug "Check if we run under z/VM"; - echo "Check if we run under z/VM" > $LOGFILE - # Are we running under z/VM - cat /proc/sysinfo | grep -q "z/VM" - if [ $? -eq 1 ] - then - debug " Running in LPAR" - echo " Running in LPAR" > $LOGFILE - return 0 - else - debug " Running under z/VM"; - echo " Running under z/VM" > $LOGFILE - # Is vmcp installed - which vmcp > /dev/null 2>&1 - if [ $? -eq 1 ] - then - # is hcp installed - which hcp > /dev/null 2>&1 - if [ $? -eq 1 ] - then - debug " No cp tool installed"; - echo " No cp tool installed" > $LOGFILE - return 0 - else - cp_tool=hcp - debug " Installed CP tool: $cp_tool"; - echo " Installed CP tool: $cp_tool" > $LOGFILE - return 1 - fi - else - cp_tool=vmcp - debug " Installed CP tool: $cp_tool"; - echo " Installed CP tool: $cp_tool" > $LOGFILE - return 1 - fi - fi -} - -# log files -collect_log() -{ - debug "Copy log files"; - echo "Copy log files" > $LOGFILE - for i in $LOGFILES - do - collect_file_contents $i - done -} - -# create gzip-ped tar file -create_package() -{ - cd $WORKPATH/.. - tar -czf $pwd/$OUTFILENAME.cfg $WORKDIR 2>/dev/null && rm -rf $WORKPATH - debug - debug "Collected data was saved to:" - debug " $pwd/$OUTFILENAME.cfg" -} - -# -# start of script -# -if [ $# -eq 0 ]; then - printhelp; - exit 1; -fi - - -kernel_version=`uname -r` -kernel_version_tmp=`echo ${kernel_version:4:2} | sed s/[^0-9]//g` -check_cmdline $@ -prepare_workdir -printversion >$LOGFILE -if [ $kernel_version_tmp -lt 13 ] - then - collect_s390dbf - fi -collect_procfs $PROCFILES -collect_cmdsout "$CMDS" "$CMDOUTPUT" -if [ "${kernel_version:2:1}" \> 4 ] - then - collect_sysfs - else - collect_procfs $PROCFILES_24 -fi -collect_procfs_scsi -check_zvm -rc_check_zvm=$? -collect_config -collect_log -create_package - -exit 0; - -# -# end of script +# Author(s): Swen Schillig <swen(a)vnet.ibm.com> # +############################################################################### -#EOF +use strict; +use warnings; +use English; +use Cwd; +use File::Temp qw/ tempdir /; +use Getopt::Long; + +sub version { + print "$PROGRAM_NAME: version %S390_TOOLS_VERSION%.\n"; + print "Copyright IBM Corp. 2008.\n"; +} + +sub usage +{ + print <<MSG +Usage: $PROGRAM_NAME [<options>] + +$PROGRAM_NAME collects all system information required for analysis. + +Options: + + -h, --help + print this help text and exit. + + -v, --version + print version information and exit. + + -o, --output + specify the name of the output file +MSG +} + +my $out_file="config"; +my $temp_dir = tempdir( CLEANUP => 1); + +Getopt::Long::Configure(qw/ bundling /); +GetOptions('h|help' => sub {usage(); exit 0;}, + 'v|version' => sub {version(); exit 0;}, + 'o|output=s' => \$out_file, + ) or do { + print "Invalid usage !\n"; + usage(); + exit 1; + }; + +system("mkdir -p $temp_dir/sys/block"); +system("mkdir -p $temp_dir/sys/devices"); +system("mkdir -p $temp_dir/sys/class"); +system("rsync -a --inplace /sys/block/dm* /sys/block/sd* $temp_dir/sys/block 2>/dev/null"); +system("rsync -a --inplace --exclude=chpd* /sys/devices/css0 $temp_dir/sys/devices 2>/dev/null"); +system("rsync -a --inplace /sys/class/fc_host /sys/class/scsi_device /sys/class/scsi_tape /sys/class/fc_remote_ports $temp_dir/sys/class 2>/dev/null"); +system("rsync -a --inplace /dev/mapper $temp_dir/dev 2>/dev/null"); +system("tar -czf $out_file.cfg -C $temp_dir sys dev 2>/dev/null"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/s390-tools-1.8.0/ziomon/ziomon_fcpconf.8 new/s390-tools-1.8.0/ziomon/ziomon_fcpconf.8 --- old/s390-tools-1.8.0/ziomon/ziomon_fcpconf.8 2008-09-30 23:29:06.000000000 +0200 +++ new/s390-tools-1.8.0/ziomon/ziomon_fcpconf.8 2008-10-16 10:36:31.000000000 +0200 @@ -1,16 +1,15 @@ .TH ZIOMON_ZFCPCONF 8 "Jul 2008" "s390-tools" .SH NAME -ziomon_zfcpconf \- Collect configuration data for fcp adapters. +ziomon_fcpconf \- Collect configuration data for fcp adapters. .SH SYNOPSIS -.B ziomon_zfcpconf -[-h] [-V] [-v] outfile +.B ziomon_fcpconf +[-h] [-v] [-o <outfile>] .SH DESCRIPTION -.B ziomon_zfcpconf -collects various configuration-related data and writes to a file -.IR outfile .cfg. +.B ziomon_fcpconf +collects various fcp configuration-related data and writes to a file. .SH OPTIONS .TP @@ -22,12 +21,8 @@ Print version information, then exit. .TP -.BR "\-V" " or " "\-\-verbose" -Be verbose. - -.TP -.BR outfile -specifies the base name of the file to collect the information in. +.BR "\-o" " or " "\-\-output" +Specify the outfile basename. The suffix .cfg will be appended. Defaults to 'config'. .SH AUTHORS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/s390-tools-1.8.0/ziomon/ziomon_zfcpdd.c new/s390-tools-1.8.0/ziomon/ziomon_zfcpdd.c --- old/s390-tools-1.8.0/ziomon/ziomon_zfcpdd.c 2008-10-05 12:44:20.000000000 +0200 +++ new/s390-tools-1.8.0/ziomon/ziomon_zfcpdd.c 2008-10-21 11:00:47.000000000 +0200 @@ -118,7 +118,7 @@ static struct hist_log2 clat = { .first = 0, - .delta = 1, + .delta = 1000, .num = BLKIOMON_CHAN_LAT_BUCKETS }; @@ -251,12 +251,12 @@ stat = &dstat->msg.stat; update_stat_variance(&stat->chan_lat, dd->chan_lat); - update_stat_variance(&stat->fabr_lat, dd->fabr_lat); + update_stat_variance(&stat->fabr_lat, dd->fabr_lat / 1000); update_stat_variance(&stat->inb, dd->inb_usage); update_stat_variance(&stat->outb, dd->outb_usage); - zfcpdd_account_hist_log2(stat->chan_lat_hist, dd->chan_lat / 1024, + zfcpdd_account_hist_log2(stat->chan_lat_hist, dd->chan_lat, &clat); - zfcpdd_account_hist_log2(stat->fabr_lat_hist, dd->fabr_lat / 1024, + zfcpdd_account_hist_log2(stat->fabr_lat_hist, dd->fabr_lat / 1000, &flat); stat->count++; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rhythmbox
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package rhythmbox checked in at Mon Oct 27 17:12:41 CET 2008. -------- --- GNOME/rhythmbox/rhythmbox.changes 2008-10-07 13:16:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/rhythmbox/rhythmbox.changes 2008-10-27 13:48:58.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 27 13:47:45 CET 2008 - vuntz(a)novell.com + +- Don't call "autoreconf -f -i": we don't need it, and for some + weird reason, it blocks the python plugins build. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rhythmbox.spec ++++++ --- /var/tmp/diff_new_pack.D23130/_old 2008-10-27 17:12:29.000000000 +0100 +++ /var/tmp/diff_new_pack.D23130/_new 2008-10-27 17:12:29.000000000 +0100 @@ -30,7 +30,7 @@ Requires: gstreamer010-plugins-base gstreamer010-plugins-good Requires: python-gstreamer-0_10 Version: 0.11.6 -Release: 6 +Release: 7 Requires: %{name}-lang = %{version} Source: %{name}-%{version}.tar.bz2 Patch: libmtp8.patch @@ -117,7 +117,6 @@ %patch -p0 %build -autoreconf -f -i # needed for rhythmbox-0.11.4: export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" # FIXME: */rhythmbox.xml:*: parser error : Entity 'mdash' not defined @@ -179,6 +178,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Mon Oct 27 2008 vuntz(a)novell.com +- Don't call "autoreconf -f -i": we don't need it, and for some + weird reason, it blocks the python plugins build. * Tue Oct 07 2008 meissner(a)suse.de - build with xulrunner190 instead of 181 * Mon Aug 25 2008 vuntz(a)novell.com ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 python-pywbem
by root＠Hilbert.suse.de 27 Oct '08

27 Oct '08

Hello community, here is the log from the commit of package python-pywbem checked in at Mon Oct 27 17:12:20 CET 2008. -------- --- python-pywbem/python-pywbem.changes 2008-09-27 20:17:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-pywbem/python-pywbem.changes 2008-10-24 08:18:55.310667000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 23 21:17:00 MDT 2008 - bwhiteley(a)suse.de + +- update to latest svn +- symlink new wbemcli utility to /usr/bin/ + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pywbem-0.6.20080927.1.tar.gz New: ---- pywbem-0.6.20081023.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pywbem.spec ++++++ --- /var/tmp/diff_new_pack.L19821/_old 2008-10-27 17:11:22.000000000 +0100 +++ /var/tmp/diff_new_pack.L19821/_new 2008-10-27 17:11:22.000000000 +0100 @@ -17,12 +17,12 @@ # norootforbuild -%define srcversion 0.6.20080927.1 +%define srcversion 0.6.20081023.1 Name: python-pywbem BuildRequires: python-devel python-xml Version: 0.7 -Release: 4 +Release: 5 Group: System/Management Summary: Python module for making CIM operation calls using the WBEM protocol License: LGPL v2.1 or later @@ -53,8 +53,10 @@ python setup.py install --prefix=%{_prefix} \ --root $RPM_BUILD_ROOT --record-rpm=INSTALLED_FILES chmod +x $RPM_BUILD_ROOT%{py_sitedir}/pywbem/mof_compiler.py +chmod +x $RPM_BUILD_ROOT%{py_sitedir}/pywbem/wbemcli.py install -d $RPM_BUILD_ROOT/usr/bin ln -s %{py_sitedir}/pywbem/mof_compiler.py $RPM_BUILD_ROOT/usr/bin/mofcomp +ln -s %{py_sitedir}/pywbem/wbemcli.py $RPM_BUILD_ROOT/usr/bin/pywbemcli # END OF INSTALL %clean @@ -63,9 +65,13 @@ %files -f INSTALLED_FILES %defattr(-,root,root,-) /usr/bin/mofcomp +/usr/bin/pywbemcli %doc README %changelog +* Thu Oct 23 2008 bwhiteley(a)suse.de +- update to latest svn +- symlink new wbemcli utility to /usr/bin/ * Sat Sep 27 2008 bwhiteley(a)suse.de - Updated to latest svn in preparation for update to soon-to-be- released 0.7. @@ -117,14 +123,14 @@ * Add InvokeMethod() support in Twisted Python client. (Tim Potter) plus lots of bugfixes -* Thu Nov 02 2006 bwhiteley(a)suse.de +* Wed Nov 01 2006 bwhiteley(a)suse.de - Update to pywbem-0.5 * Sat Sep 23 2006 aj(a)suse.de - Fix build with python 2.5. * Wed Apr 26 2006 bwhiteley(a)suse.de - Renamed package from python-wbem to python-pywbem per request from upstream maintainer -* Fri Apr 07 2006 bwhiteley(a)suse.de +* Thu Apr 06 2006 bwhiteley(a)suse.de - Update to CVS snapshot. This includes several fixes which enable method invocation. * Tue Feb 28 2006 jmatejek(a)suse.cz @@ -136,5 +142,5 @@ * Tue Nov 15 2005 bwhiteley(a)suse.de - Updated to real version 0.4. Previously version 0.4 was a pre- release "under the table" distribution from Tim Potter -* Fri Oct 07 2005 bwhiteley(a)suse.de +* Thu Oct 06 2005 bwhiteley(a)suse.de - Initial package ++++++ pywbem-0.6.20080927.1.tar.gz -> pywbem-0.6.20081023.1.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pywbem-0.6.20080927.1/cim_provider2.py new/pywbem-0.6.20081023.1/cim_provider2.py --- old/pywbem-0.6.20080927.1/cim_provider2.py 2008-09-20 01:58:30.000000000 +0200 +++ new/pywbem-0.6.20081023.1/cim_provider2.py 2008-10-06 22:58:14.000000000 +0200 @@ -90,29 +90,6 @@ _fbp = Py_FooBarProvider() return {'Py_Foo':_fbp, 'Py_Bar':_fbp} - get_initial_polling_interval(env): - Return the number of seconds before the first call to poll. - - If this method returns zero, then the poll method is never called. - - Arguments: - env -- Provider Environment (pycimmb.ProviderEnvironment) - - poll(env): - Do some work, and return the number of seconds until the next poll. - - A polled provider's poll function will be called periodically by - the CIMOM. The polled provider can use this opportunity to do - some work, such as checking on some conditions, and generating - indications. The poll function returns the number of seconds the - CIMOM should wait before calling poll again. A return value of -1 - indicates to the CIMOM that the previous poll value should be used. - A return value of 0 indicates that the poll function should never - be called again. - - Arguments: - env -- Provider Environment (pycimmb.ProviderEnvironment) - can_unload(env): Return True if the provider can be unloaded. @@ -139,27 +116,54 @@ Arguments: env -- Provider Environment (pycimmb.ProviderEnvironment) - ns -- The namespace where the even occurred + ns -- The namespace where the event occurred handler_instance -- indication_instance -- The indication + authorize_filter (env, filter, ns, classes, + owner): + Allow or disallow an indication subscription request. + + Arguments: + env -- Provider Environment (pycimmb.ProviderEnvironment) + filter -- The WQL select statement + namespace -- The namepace where the indication is registered for + classes -- The classpath of the indication registered for + owner -- The name of the principal (cimom user) + activate_filter (env, filter, ns, classes, first_activation): + Activate an indication subscription. + Arguments: env -- Provider Environment (pycimmb.ProviderEnvironment) - filter -- - namespace -- - classes -- - first_activation -- + filter -- The WQL select statement + namespace -- The namepace where the indication is registered for + classes -- The classpath of the indication registered for + first_activation -- boolean - whether first activation deactivate_filter(env, filter, ns, classes, last_activation): + Deactivate an indication subscription. + + Arguments: + env -- Provider Environment (pycimmb.ProviderEnvironment) + filter -- The WQL select statement + ns -- The namepace where the indication is registered for + classes -- The classpath of the indication registered for + last_activation -- boolean - whether last activation + + enable_indications(env): + Enable indications. + + Arguments: + env -- Provider Environment (pycimmb.ProviderEnvironment) + + disable_indications(env): + Disable indications. + Arguments: env -- Provider Environment (pycimmb.ProviderEnvironment) - filter -- - ns -- - classes -- - last_activation -- Provider Environment @@ -873,8 +877,7 @@ (rval, outs) = method(env=env, object_name=objectName, **new_inputs) except TypeError, e: - raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER, - e.message) + raise pywbem.CIMError(pywbem.CIM_ERR_INVALID_PARAMETER, str(e)) def add_type(v): if isinstance(v, pywbem.CIMParameter): @@ -921,6 +924,62 @@ continue del inst.properties[pname] + def authorize_filter (env, filter, ns, classes, + owner): + """Allow or disallow an indication subscription request. + + Arguments: + env -- Provider Environment (pycimmb.ProviderEnvironment) + filter -- The WQL select statement + namespace -- The namepace where the indication is registered for + classes -- The classpath of the indication registered for + owner -- The name of the principal (cimom user) + """ + pass + + def activate_filter (env, filter, ns, classes, + first_activation): + """Activate an indication subscription. + + Arguments: + env -- Provider Environment (pycimmb.ProviderEnvironment) + filter -- The WQL select statement + namespace -- The namepace where the indication is registered for + classes -- The classpath of the indication registered for + first_activation -- boolean - whether first activation + """ + pass + + def deactivate_filter(env, filter, ns, classes, + last_activation): + """Deactivate an indication subscription. + + Arguments: + env -- Provider Environment (pycimmb.ProviderEnvironment) + filter -- The WQL select statement + ns -- The namepace where the indication is registered for + classes -- The classpath of the indication registered for + last_activation -- boolean - whether last activation + """ + pass + + def enable_indications(env): + """Enable indications. + + Arguments: + env -- Provider Environment (pycimmb.ProviderEnvironment) + """ + pass + + def disable_indications(env): + """Disable indications. + + Arguments: + env -- Provider Environment (pycimmb.ProviderEnvironment) + """ + pass + + def codegen (cc): """Generate a Python Provider template. @@ -1096,6 +1155,7 @@ mappings = {'classname':cc.classname, 'classname_l':cc.classname.lower()} isAssoc = 'association' in cc.qualifiers + isIndication = 'indication' in cc.qualifiers code = '''"""Python Provider for %(classname)s @@ -1405,12 +1465,105 @@ code+= ''' ## end of class %(classname)sProvider - + +## get_providers() for associating CIM Class Name to python provider class name + def get_providers(env): %(classname_l)s_prov = %(classname)s(env) return {'%(classname)s': %(classname_l)s_prov} ''' % mappings + if isIndication: + code+= ''' + +## Indication support methods... +## Use these methods if this class will deliver indications. +## Remove these methods if this class will not deliver indications.''' + args = inspect.getargspec(CIMProvider2.authorize_filter)[0] + args = format_desc(', '.join(args), 19).strip() + code+= ''' + + +def authorize_filter(%s): + """%s""" + + logger = env.get_logger() + logger.log_debug('Entering %%s.authorize_filter()' \\ + %% self.__class__.__name__) + ch = env.get_cimom_handle() + #raise pywbem.CIMError(pywbem.CIM_ERR_***) to indicate failure + #otherwise just fall through for success''' % \ + (args, CIMProvider2.authorize_filter.__doc__ or "Doc Goes Here") + + args = inspect.getargspec(CIMProvider2.enable_indications)[0] + args = format_desc(', '.join(args), 19).strip() + code+= ''' + + +def enable_indications(%s): + """%s""" + + logger = env.get_logger() + logger.log_debug('Entering %%s.enable_indications()' \\ + %% self.__class__.__name__) + ch = env.get_cimom_handle() + #raise pywbem.CIMError(pywbem.CIM_ERR_***) to indicate failure + #otherwise just fall through for success''' % \ + (args, CIMProvider2.enable_indications.__doc__ or "Doc Goes Here") + + args = inspect.getargspec(CIMProvider2.disable_indications)[0] + args = format_desc(', '.join(args), 19).strip() + code+= ''' + + +def disable_indications(%s): + """%s""" + + logger = env.get_logger() + logger.log_debug('Entering %%s.disable_indications()' \\ + %% self.__class__.__name__) + ch = env.get_cimom_handle() + #raise pywbem.CIMError(pywbem.CIM_ERR_***) to indicate failure + #otherwise just fall through for success''' % \ + (args, CIMProvider2.disable_indications.__doc__ or "Doc Goes Here") + + args = inspect.getargspec(CIMProvider2.activate_filter)[0] + args = format_desc(', '.join(args), 19).strip() + code+= ''' + + +def activate_filter(%s): + """%s""" + + logger = env.get_logger() + logger.log_debug('Entering %%s.activate_filter()' \\ + %% self.__class__.__name__) + ch = env.get_cimom_handle() + #raise pywbem.CIMError(pywbem.CIM_ERR_***) to indicate failure + #otherwise just fall through for success''' % \ + (args, CIMProvider2.activate_filter.__doc__ or "Doc Goes Here") + + + args = inspect.getargspec(CIMProvider2.deactivate_filter)[0] + args = format_desc(', '.join(args), 19).strip() + code+= ''' + + +def deactivate_filter(%s): + """%s""" + + logger = env.get_logger() + logger.log_debug('Entering %%s.deactivate_filter()' \\ + %% self.__class__.__name__) + ch = env.get_cimom_handle() + #raise pywbem.CIMError(pywbem.CIM_ERR_***) to indicate failure + #otherwise just fall through for success''' % \ + (args, CIMProvider2.deactivate_filter.__doc__ or "Doc Goes Here") + + code+= ''' + +## End of Indication Support Methods''' + owtypes = ['1', 'Instance'] pegtypes = ['2', 'Instance'] sfcbtypes = 'instance' @@ -1565,15 +1718,22 @@ """Check timestamp of loaded python provider module, and if it has changed since load, then reload the provider module. """ - if (sys.modules[self.provider_module_name].provmod_timestamp \ - != os.path.getmtime(self.provid)): + try: + mod = sys.modules[self.provider_module_name] + except KeyError: + mod = None + if (mod is None or \ + mod.provmod_timestamp != os.path.getmtime(self.provid)): print "Need to reload provider at %s" %self.provid #first unload the module - if hasattr(self.provmod, "shutdown"): + if self.provmod and hasattr(self.provmod, "shutdown"): self.provmod.shutdown(env) #now reload and reinit module - del sys.modules[self.provider_module_name] + try: + del sys.modules[self.provider_module_name] + except KeyError: + pass try: self._load_provider_source() self._init_provider(env) @@ -1853,36 +2013,6 @@ return rval ############################################################################## - def MI_poll (self, env): - logger = env.get_logger() - logger.log_debug('CIMProvider2 MI_poll called') - self._reload_if_necessary(env) - if hasattr(self.provmod, 'poll'): - rval = self.provmod.poll(env) - elif hasattr(self.provmod, 'MI_poll'): - rval = self.provmod.MI_poll(env) - else: - raise pywbem.CIMError(pywbem.CIM_ERR_FAILED, - "Provider %s has no support for polling"%self.provid) - logger.log_debug('CIMProvider2 MI_poll returning %s' % str(rval)) - return rval - -############################################################################## - def MI_getInitialPollingInterval (self, env): - logger = env.get_logger() - logger.log_debug('CIMProvider2 MI_poll called') - self._reload_if_necessary(env) - if hasattr(self.provmod, 'get_initial_polling_interval'): - rval = self.provmod.get_initial_polling_interval(env) - elif hasattr(self.provmod, 'MI_getInitialPollingInterval'): - rval = self.provmod.MI_getInitialPollingInterval(env) - else: - raise pywbem.CIMError(pywbem.CIM_ERR_FAILED, - "Provider %s has no support for polling"%self.provid) - logger.log_debug('CIMProvider2 MI_poll returning %s' % str(rval)) - return rval - -############################################################################## def MI_authorizeFilter (self, env, filter, @@ -1893,16 +2023,16 @@ logger.log_debug('CIMProvider2 MI_authorizeFilter called') self._reload_if_necessary(env) if hasattr(self.provmod, 'authorize_filter'): - rval = self.provmod.authorize_filter(env, filter, classname, + self.provmod.authorize_filter(env, filter, classname, classPath, owner) elif hasattr(self.provmod, 'MI_authorizeFilter'): - rval = self.provmod.MI_authorizeFilter(env, filter, classname, + self.provmod.MI_authorizeFilter(env, filter, classname, classPath, owner) else: - raise pywbem.CIMError(pywbem.CIM_ERR_FAILED, - "Provider %s has no support for authorize filter"%self.provid) + # if not instrumented in provider, assume success + logger.log_debug("Provider %s has no support for authorize filter"%self.provid) logger.log_debug('CIMProvider2 MI_authorizeFilter returning') - return rval + return ############################################################################## @@ -1921,10 +2051,11 @@ elif hasattr(self.provmod, 'MI_activateFilter'): self.provmod.MI_activateFilter(env, filter, namespace, classes, firstActivation) - else: - raise pywbem.CIMError(pywbem.CIM_ERR_FAILED, - "Provider %s has no support for activate filter"%self.provid) + else: + # if not instrumented in provider, assume success + logger.log_debug("Provider %s has no support for activate filter"%self.provid) logger.log_debug('CIMProvider2 MI_activateFilter returning') + return ############################################################################## @@ -1944,9 +2075,44 @@ self.provmod.MI_deActivateFilter(env, filter, namespace, classes, lastActivation) else: - raise pywbem.CIMError(pywbem.CIM_ERR_FAILED, - "Provider %s has no support for deactivate filter"%self.provid) + # if not instrumented in provider, assume success + logger.log_debug("Provider %s has no support for deactivate filter"%self.provid) logger.log_debug('CIMProvider2 MI_deActivateFilter returning') + return + + +############################################################################## + def MI_enableIndications(self, + env): + logger = env.get_logger() + logger.log_debug('CIMProvider2 MI_enableIndications called') + self._reload_if_necessary(env) + if hasattr(self.provmod, 'enable_indications'): + self.provmod.enable_indications(env) + elif hasattr(self.provmod, 'MI_enableIndications'): + self.provmod.MI_enableIndications(env) + else: + # if not instrumented in provider, assume success + logger.log_debug("Provider %s has no support for enable indications"%self.provid) + logger.log_debug('CIMProvider2 MI_enableIndications returning') + return + + +############################################################################## + def MI_disableIndications(self, + env): + logger = env.get_logger() + logger.log_debug('CIMProvider2 MI_disableIndications called') + self._reload_if_necessary(env) + if hasattr(self.provmod, 'disable_indications'): + self.provmod.disable_indications(env) + elif hasattr(self.provmod, 'MI_disableIndications'): + self.provmod.MI_disableIndications(env) + else: + # if not instrumented in provider, assume success + logger.log_debug("Provider %s has no support for disable indications"%self.provid) + logger.log_debug('CIMProvider2 MI_disableIndications returning') + return ############################################################################## diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pywbem-0.6.20080927.1/mof_compiler.py new/pywbem-0.6.20081023.1/mof_compiler.py --- old/pywbem-0.6.20080927.1/mof_compiler.py 2008-09-27 01:09:55.000000000 +0200 +++ new/pywbem-0.6.20081023.1/mof_compiler.py 2008-09-30 22:04:06.000000000 +0200 @@ -165,6 +165,9 @@ def p_error(p): ex = MOFParseError() + if p is None: + ex.message = 'Unexpected end of file' + raise ex ex.file = p.lexer.parser.file ex.lineno = p.lineno ex.column = _find_column(p.lexer.parser.mof, p) @@ -1596,8 +1599,12 @@ return rv except MOFParseError, pe: self.parser.log('Syntax error:') - self.parser.log('%s:%s:' % (pe.file, pe.lineno)) - self.parser.log('\n'.join(pe.context)) + if hasattr(pe, 'file') and hasattr(pe, 'lineno'): + self.parser.log('%s:%s:' % (pe.file, pe.lineno)) + if hasattr(pe, 'context'): + self.parser.log('\n'.join(pe.context)) + if pe.message: + self.parser.log(pe.message) raise except CIMError, ce: if hasattr(ce, 'file_line'): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pywbem-0.6.20080927.1/PKG-INFO new/pywbem-0.6.20081023.1/PKG-INFO --- old/pywbem-0.6.20080927.1/PKG-INFO 2008-09-27 19:45:06.000000000 +0200 +++ new/pywbem-0.6.20081023.1/PKG-INFO 2008-10-24 05:11:55.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: pywbem -Version: 0.6.20080927.1 +Version: 0.6.20081023.1 Summary: Python WBEM client library Home-page: http://pywbem.sf.net/ Author: Tim Potter diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pywbem-0.6.20080927.1/setup.py new/pywbem-0.6.20081023.1/setup.py --- old/pywbem-0.6.20080927.1/setup.py 2008-09-27 18:51:14.000000000 +0200 +++ new/pywbem-0.6.20081023.1/setup.py 2008-10-24 05:11:51.000000000 +0200 @@ -35,7 +35,7 @@ 'long_description': __doc__, 'platforms': ['any'], 'url': 'http://pywbem.sf.net/', - 'version': '0.6.20080927.1', + 'version': '0.6.20081023.1', 'license': 'LGPLv2', 'packages': ['pywbem'], # Make packages in root dir appear in pywbem module diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pywbem-0.6.20080927.1/twisted_client.py new/pywbem-0.6.20081023.1/twisted_client.py --- old/pywbem-0.6.20080927.1/twisted_client.py 2007-12-03 01:49:49.000000000 +0100 +++ new/pywbem-0.6.20081023.1/twisted_client.py 2008-10-16 01:42:48.000000000 +0200 @@ -29,7 +29,12 @@ from twisted.web import http, client, error from pywbem import CIMClass, CIMClassName, CIMInstance, CIMInstanceName, CIMError, cim_types, cim_xml -from elementtree.ElementTree import fromstring, tostring + +try: + from elementtree.ElementTree import fromstring, tostring +except ImportError, arg: + from xml.etree.ElementTree import fromstring, tostring + import string from types import StringTypes from datetime import datetime, timedelta diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pywbem-0.6.20080927.1/wbemcli.py new/pywbem-0.6.20081023.1/wbemcli.py --- old/pywbem-0.6.20080927.1/wbemcli.py 1970-01-01 01:00:00.000000000 +0100 +++ new/pywbem-0.6.20081023.1/wbemcli.py 2008-10-24 02:45:17.000000000 +0200 @@ -0,0 +1,296 @@ +#!/usr/bin/python + +# (C) Copyright 2008 Hewlett-Packard Development Company, L.P. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. + +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +# Author: Tim Potter <tpot(a)hp.com> + +# +# A small utility to wrap up a PyWBEM session in a Python interactive +# console. +# +# Usage: +# +# wbemcli.py HOSTNAME [-u USERNAME -p PASSWORD] [-n namespace] [--no-ssl] \ +# [--port PORT] +# +# CIM operations can be executed by using the PyWBEM connection object +# called 'cli' in the global scope. There are two sets of aliases +# available for usage in the interpreter. For example the following +# three commands are equivalent: +# +# >>> cli.EnumerateInstanceNames('SMX_ComputerSystem') +# >>> EnumerateInstanceNames('SMX_ComputerSystem') +# >>> ein('SMX_ComputerSystem') +# +# Pretty-printing of results is also available using the 'pp' +# function. For example: +# +# >>> cs = ei('SMX_ComputerSystem')[0] +# >>> pp(cs.items()) +# [(u'RequestedState', 12L), +# (u'Dedicated', [1L]), +# (u'StatusDescriptions', [u'System is Functional']), +# (u'IdentifyingNumber', u'6F880AA1-F4F5-11D5-8C45-C0116FBAE02A'), +# ... +# + +import os, stat, sys, string, getpass, errno +from pywbem import * +from code import InteractiveConsole +from optparse import OptionParser +from pprint import pprint as pp + +# Conditional support of readline module + +have_readline = False + +try: + import readline + have_readline = True +except ImportError, arg: + pass + +# +# Parse command line args +# + +optparser = OptionParser( + usage = '%prog HOSTNAME [-u USER -p PASS] [-n NAMESPACE] [--no-ssl]') + +# Username and password + +optparser.add_option('-u', '--user', dest = 'user', + action = 'store', type = 'string', + help = 'user to connect as') + +optparser.add_option('-p', '--password', dest = 'password', + action = 'store', type = 'string', + help = 'password to connect user as') + +# Change the default namespace used + +optparser.add_option('-n', '--namespace', dest = 'namespace', + action = 'store', type = 'string', default = 'root/cimv2', + help = 'default namespace to use') + +# Don't use SSL for remote connections + +optparser.add_option('--no-ssl', dest = 'no_ssl', action = 'store_true', + help = 'don\'t use SSL') + +# Specify non-standard port + +optparser.add_option('--port', dest = 'port', action = 'store', type = 'int', + help = 'port to connect as', default = None) + +# Check usage + +(opts, argv) = optparser.parse_args() + +if len(argv) != 1: + optparser.print_usage() + sys.exit(1) + +# +# Set up a client connection +# + +def remote_connection(): + """Initiate a remote connection, via PyWBEM.""" + + if argv[0][0] == '/': + url = argv[0] + else: + proto = 'https' + + if opts.no_ssl: + proto = 'http' + + url = '%s://%s' % (proto, argv[0]) + + if opts.port is not None: + url += ':%d' % opts.port + + creds = None + + if opts.user is not None and opts.password is None: + opts.password = getpass.getpass('Enter password for %s: ' % opts.user) + + if opts.user is not None or opts.password is not None: + creds = (opts.user, opts.password) + + cli = WBEMConnection(url, creds, default_namespace = opts.namespace) + + cli.debug = True + + return cli + +cli = remote_connection() + +# +# Create some convenient global functions to reduce typing +# + +def EnumerateInstanceNames(classname, namespace = None): + """Enumerate the names of the instances of a CIM Class (including the + names of any subclasses) in the target namespace.""" + + return cli.EnumerateInstanceNames(classname, namespace = namespace) + +def EnumerateInstances(classname, namespace = None, LocalOnly = True, + DeepInheritance = True, IncludeQualifiers = False, + IncludeClassOrigin = False): + """Enumerate instances of a CIM Class (includeing the instances of + any subclasses in the target namespace.""" + + return cli.EnumerateInstances(classname, + namespace = namespace, + DeepInheritance = DeepInheritance, + IncludeQualifiers = IncludeQualifiers, + IncludeClassOrigin = IncludeClassOrigin) + + +def GetInstance(instancename, LocalOnly = True, IncludeQualifiers = False, + IncludeClassOrigin = False): + """Return a single CIM instance corresponding to the instance name + given.""" + + return cli.GetInstance(instancename, + LocalOnly = LocalOnly, + IncludeQualifiers = IncludeQualifiers, + IncludeClassOrigin = IncludeClassOrigin) + +def DeleteInstance(instancename): + """Delete a single CIM instance.""" + + return cli.DeleteInstance(instancename) + +def ModifyInstance(*args, **kwargs): + return cli.ModifyInstance(*args, **kwargs) + +def CreateInstance(*args, **kwargs): + return cli.CreateInstance(*args, **kwargs) + +def InvokeMethod(*args, **kwargs): + return cli.InvokeMethod(*args, **kwargs) + +def AssociatorNames(*args, **kwargs): + return cli.AssociatorNames(*args, **kwargs) + +def Associators(*args, **kwargs): + return cli.Associators(*args, **kwargs) + +def ReferenceNames(*args, **kwargs): + return cli.ReferenceNames(*args, **kwargs) + +def References(*args, **kwargs): + return cli.References(*args, **kwargs) + +def EnumerateClassNames(*args, **kwargs): + return cli.EnumerateClassNames(*args, **kwargs) + +def EnumerateClasses(*args, **kwargs): + return cli.EnumerateClasses(*args, **kwargs) + +def GetClass(*args, **kwargs): + return cli.GetClass(*args, **kwargs) + +def DeleteClass(*args, **kwargs): + return cli.DeleteClass(*args, **kwargs) + +def ModifyClass(*args, **kwargs): + return cli.ModifyClass(*args, **kwargs) + +def CreateClass(*args, **kwargs): + return cli.CreateClass(*args, **kwargs) + +def EnumerateQualifiers(*args, **kwargs): + return cli.EnumerateQualifiers(*args, **kwargs) + +def GetQualifier(*args, **kwargs): + return cli.GetQualifier(*args, **kwargs) + +def SetQualifier(*args, **kwargs): + return cli.SetQualifier(*args, **kwargs) + +def DeleteQualifier(*args, **kwargs): + return cli.DeleteQualifier(*args, **kwargs) + +# Aliases for global functions above + +ein = EnumerateInstanceNames +ei = EnumerateInstances +gi = GetInstance +di = DeleteInstance +mi = ModifyInstance +ci = CreateInstance + +im = InvokeMethod + +an = AssociatorNames +ao = Associators +rn = ReferenceNames +re = References + +ecn = EnumerateClassNames +ec = EnumerateClasses +gc = GetClass +dc = DeleteClass +mc = ModifyClass +cc = CreateClass + +eq = EnumerateQualifiers +gq = GetQualifier +sq = SetQualifier +dq = DeleteQualifier + +# +# Enter interactive console +# + +def get_banner(): + + result = '' + + # Note how we are connected + + result += 'Connected to %s' % cli.url + if cli.creds is not None: + result += ' as %s' % cli.creds[0] + + return result + +# Read previous command line history + +histfile = '%s/.wbemcli_history' % os.environ['HOME'] + +try: + if have_readline: + readline.read_history_file(histfile) +except IOError, arg: + if arg[0] != errno.ENOENT: + raise + +# Interact + +i = InteractiveConsole(globals()) +i.interact(get_banner()) + +# Save command line history + +if have_readline: + readline.write_history_file(histfile) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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