Hello community,
here is the log from the commit of package yast2-registration
checked in at Thu Oct 16 14:37:32 CEST 2008.
--------
--- yast2-registration/yast2-registration.changes 2008-10-14 19:49:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-registration/yast2-registration.changes 2008-10-16 13:14:09.385378000 +0200
@@ -1,0 +2,9 @@
+Thu Oct 16 13:12:43 CEST 2008 - jdsn@suse.de
+
+- call to saveLastZmdConfig added (bnc#435696)
+- removed installing the certificate to zmd (bnc#435631)
+- add credetials information to services url (bnc#435645)
+- fix xulrunner dependency (bnc#435872)
+- 2.17.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-registration-2.17.3.tar.bz2
New:
----
yast2-registration-2.17.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.C12785/_old 2008-10-16 14:37:12.000000000 +0200
+++ /var/tmp/diff_new_pack.C12785/_new 2008-10-16 14:37:12.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-registration (Version 2.17.3)
+# spec file for package yast2-registration (Version 2.17.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,20 +19,18 @@
Name: yast2-registration
-Version: 2.17.3
+Version: 2.17.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-registration-2.17.3.tar.bz2
+Source0: yast2-registration-2.17.4.tar.bz2
Prefix: /usr
Requires: yast2 >= 2.16.6
Requires: suseRegister
# because of SourceManager
Requires: yast2-packager >= 2.13.152
-%if %sles_version
-Requires: zmd rug
-%endif
+Requires: mozilla-xulrunner190
PreReq: %fillup_prereq
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-testsuite
# Internet YCP module
@@ -52,7 +50,7 @@
J. Daniel Schmidt
%prep
-%setup -n yast2-registration-2.17.3
+%setup -n yast2-registration-2.17.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -108,6 +106,12 @@
/var/adm/fillup-templates/sysconfig.suse_register-yast2-registration
/var/adm/fillup-templates/sysconfig.automatic_online_update-yast2-registration
%changelog
+* Thu Oct 16 2008 jdsn@suse.de
+- call to saveLastZmdConfig added (bnc#435696)
+- removed installing the certificate to zmd (bnc#435631)
+- add credetials information to services url (bnc#435645)
+- fix xulrunner dependency (bnc#435872)
+- 2.17.4
* Tue Oct 14 2008 jdsn@suse.de
- check if initialization of SuseRegister succeeds (bnc#435188)
- initialize the target to prevent repeated key import (bnc#435192)
++++++ yast2-registration-2.17.3.tar.bz2 -> yast2-registration-2.17.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.3/configure new/yast2-registration-2.17.4/configure
--- old/yast2-registration-2.17.3/configure 2008-10-14 20:40:03.000000000 +0200
+++ new/yast2-registration-2.17.4/configure 2008-10-16 13:21:54.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-registration 2.17.3.
+# Generated by GNU Autoconf 2.61 for yast2-registration 2.17.4.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-registration'
PACKAGE_TARNAME='yast2-registration'
-PACKAGE_VERSION='2.17.3'
-PACKAGE_STRING='yast2-registration 2.17.3'
+PACKAGE_VERSION='2.17.4'
+PACKAGE_STRING='yast2-registration 2.17.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1197,7 +1197,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-registration 2.17.3 to adapt to many kinds of systems.
+\`configure' configures yast2-registration 2.17.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1268,7 +1268,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-registration 2.17.3:";;
+ short | recursive ) echo "Configuration of yast2-registration 2.17.4:";;
esac
cat <<\_ACEOF
@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-registration configure 2.17.3
+yast2-registration configure 2.17.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-registration $as_me 2.17.3, which was
+It was created by yast2-registration $as_me 2.17.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2181,7 +2181,7 @@
# Define the identity of the package.
PACKAGE='yast2-registration'
- VERSION='2.17.3'
+ VERSION='2.17.4'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.17.3"
+VERSION="2.17.4"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-registration $as_me 2.17.3, which was
+This file was extended by yast2-registration $as_me 2.17.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-registration config.status 2.17.3
+yast2-registration config.status 2.17.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.3/configure.in new/yast2-registration-2.17.4/configure.in
--- old/yast2-registration-2.17.3/configure.in 2008-10-14 20:39:54.000000000 +0200
+++ new/yast2-registration-2.17.4/configure.in 2008-10-16 13:21:50.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-registration, 2.17.3, http://bugs.opensuse.org/, yast2-registration)
+AC_INIT(yast2-registration, 2.17.4, http://bugs.opensuse.org/, yast2-registration)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.3"
+VERSION="2.17.4"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.3/src/clients/inst_suse_register.ycp new/yast2-registration-2.17.4/src/clients/inst_suse_register.ycp
--- old/yast2-registration-2.17.3/src/clients/inst_suse_register.ycp 2008-10-14 19:39:24.000000000 +0200
+++ new/yast2-registration-2.17.4/src/clients/inst_suse_register.ycp 2008-10-16 13:07:32.000000000 +0200
@@ -532,11 +532,17 @@
}
else
{
- // check for and install mozilla-xulrunner if needed (#175166), modified due to (#304310)
- string required_package = "mozilla-xulrunner181";
- if (!Package::Installed(required_package))
+ // see if xulrunner is already there (bnc#435872)
+ cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false;
+
+ if ( ! cmd_ok )
{
- Package::InstallAllMsg([required_package], nil);
+ // check for and install mozilla-xulrunner if needed (#175166), modified due to (#304310), modified due to (bnc#435872)
+ string required_package = "mozilla-xulrunner190";
+ if (!Package::Installed(required_package))
+ {
+ Package::InstallAllMsg([required_package], nil);
+ }
}
cmd_ok = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/xulrunner") == 0 ? true:false;
bcmd = " MOZ_DISABLE_PANGO=1 /usr/bin/xulrunner /usr/share/YaST2/yastbrowser/application.ini -url ";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.3/src/modules/Register.ycp new/yast2-registration-2.17.4/src/modules/Register.ycp
--- old/yast2-registration-2.17.3/src/modules/Register.ycp 2008-10-14 20:38:35.000000000 +0200
+++ new/yast2-registration-2.17.4/src/modules/Register.ycp 2008-10-16 13:18:04.000000000 +0200
@@ -36,6 +36,7 @@
map contextDataSR = nil;
map > argsDataSR = nil;
integer initialSRstatus = nil;
+boolean repoUpdateSuccessful = true; // flag success of repo changes for saveLastZmdConfig (bnc#435696)
// ------------------------------------------------------------------
// END: Locally defined data
@@ -563,22 +564,16 @@
if ( trust )
{
string installCert = sformat("cp -a %1 %2 && c_rehash %3", certTmpFile, smtpemFile, smtpemPath);
- string installCertZMD = sformat("[ -d /etc/zmd/trusted-certs ] && cp -a %1 /etc/zmd/trusted-certs/registration-server.cer", certTmpFile);
+ // removed installing the certificate as well to zmd (bnc#435631)
- integer instret = (integer) SCR::Execute(.target.bash, installCert);
- integer instretZMD = (integer) SCR::Execute(.target.bash, installCertZMD);
-
- if ( instret == 0 && instretZMD == 0)
+ if ( (integer) SCR::Execute(.target.bash, installCert) == 0 )
{
y2milestone("Successfully installed SMT certificate. Registration will now proceed.");
return `ok;
}
else
{
- if (instret == 0 )
- y2error("Failed to install SMT certificate to common cert storage. Registration would fail and thus will be skipped.");
- if (instretZMD == 0)
- y2error("Failed to install SMT certificate for ZMD. Registration would fail and thus will be skipped.");
+ y2error("Failed to install SMT certificate to common cert storage. Registration would fail and thus will be skipped.");
if (!ay) Popup::Message(_("Installation of the SMT certificates failed.\nPlease see the logs for further information."));
return `silentskip;
@@ -852,10 +847,12 @@
if ( ! is(pAny, map) )
{
y2error("A catalog returned by SuseRegister did not contain any details: %1", catalog);
+ repoUpdateSuccessful = false;
}
else if ( catalog == nil || catalog == "" )
{
y2error("A catalog returned by SuseRegister has no or an invalid name.");
+ repoUpdateSuccessful = false;
}
else
{
@@ -864,12 +861,14 @@
if ( catDetail["ALIAS"]:"" == nil || catDetail["ALIAS"]:"" == "" )
{
y2error("A catalog returned by SuseRegister has no or an invalid alias name.");
+ repoUpdateSuccessful = false;
}
else
{
if ( catDetail["TASK"]:"" == nil || catDetail["TASK"]:"" == "" )
{
y2error("A catalog returned by SuseRegister has an invalid task: %1", catalog);
+ repoUpdateSuccessful = false;
}
else if ( catDetail["TASK"]:"" == "le" || catDetail["TASK"]:"" == "le" )
{
@@ -890,12 +889,13 @@
else
{
y2error("A catalog returned by SuseRegister has an unsupported task: %1 (%2)", catalog, service);
+ repoUpdateSuccessful = false;
}
}
}
});
-
+ // FIXME: this should be done via the Pkg API - but these function is not available yet - so do it manually for now
foreach (string fService, list<string> fCatalogs, catalogToDisable, {
string toDisableString = "\"" + mergestring(fCatalogs, "\" \"") + "\"";
integer retval = (integer) SCR::Execute(.target.bash, sformat(" [ -f /etc/zypp/services.d/%1.service ] && cat >> /etc/zypp/services.d/%2.service <> /etc/zypp/services.d/%1.service <> /etc/zypp/services.d/%2.service < 0 )
+ {
+ queryJoinChar = "&";
+ }
+ serviceAddUrl["query"] = (string) serviceAddUrl["query"]:"" + queryJoinChar + "credentials=NCCcredentials";
+
+ if ( Pkg::ServiceAdd( ((map) pAny)["ALIAS"]:"", URL::Build(serviceAddUrl) ) )
{
y2milestone("Successfully added a new service: %1", pService);
y2milestone("Now checking the catalogs of the service: %1", pService);
summary = add(summary, sformat(_("Added Service: %1"), pService ));
-// ------------------->>>>> FIXME
- // need to save service to the system first??
- // documentation of Pkg::ServiceRefresh says : "Refresh the service, the service must already be saved on the system!"
- // is this done with Pkg::SourceSaveAll() ??
- // service != source ??
-/*
- if ( Pkg::SourceSaveAll() )
- {
- y2milestone("Successfully saved all sources.");
- }
- else
- {
- y2error("Could not save all sources.");
- }
-*/
-
- // need to call Pkg::ServiceRefresh() before checking the catalogs
- if ( Pkg::ServiceRefresh(pService) )
- {
- y2milestone("Successfully refreshed service: %1", pService);
- }
- else
+ // because the Pkg bindings do not operate on the system directly we need to save them before we can continue
+// if ( Pkg::ServiceSave ) // function not yet available
+ if ( true )
{
- y2error("Could not refresh service: %1", pService);
- }
+ y2milestone("Successfully saved services.");
- // then iterate over catalogs
- any catalogsMap = ((map) pAny)["CATALOGS"]:$[];
- if ( is( catalogsMap , map) && catalogsMap != $[] )
- {
- y2milestone("A new service returned by SuseRegister has catalogs that will be checked now.");
- list<string> cSummary = checkCatalogs( (map) catalogsMap, pService );
- summary = (list<string>) merge(summary, cSummary);
+ if ( Pkg::ServiceRefresh(pService) )
+ {
+ y2milestone("Successfully refreshed service: %1", pService);
+
+ // then iterate over catalogs
+ any catalogsMap = ((map) pAny)["CATALOGS"]:$[];
+ if ( is( catalogsMap , map) && catalogsMap != $[] )
+ {
+ y2milestone("A new service returned by SuseRegister has catalogs that will be checked now.");
+ list<string> cSummary = checkCatalogs( (map) catalogsMap, pService );
+ summary = (list<string>) merge(summary, cSummary);
+ }
+ else
+ {
+ y2error("A new service returned by SuseRegister did not contain any catalogs.");
+ repoUpdateSuccessful = false;
+ }
+ }
+ else
+ {
+ y2error("Could not refresh service: %1", pService);
+ repoUpdateSuccessful = false;
+ }
}
else
{
- y2error("A new service returned by SuseRegister did not contain any catalogs.");
+ y2error("Could not save services to the system.");
+ repoUpdateSuccessful = false;
}
-
}
else
{
y2error("Adding a new service failed: %1", pService);
+ repoUpdateSuccessful = false;
}
}
@@ -1142,16 +1160,19 @@
else
{
y2error("Could not delete a service: %1", pService);
+ repoUpdateSuccessful = false;
}
}
else
{
y2error("A service returned by SuseRegister has an unsupported task: %1 (%2)", pService, ((map) pAny)["TASK"]:"" );
+ repoUpdateSuccessful = false;
}
}
else
{
y2error("A service returned by SuseRegister has an unsupported type: %1 (%2)", pService, ((map) pAny)["TYPE"]:"" );
+ repoUpdateSuccessful = false;
}
}
@@ -1175,6 +1196,17 @@
}
}
+ if ( repoUpdateSuccessful )
+ {
+ y2error("SuseRegister will now save the lastZmdConfig.");
+ YSR::saveLastZmdConfig();
+ }
+ else
+ {
+ y2error("Error occurred while changing the systems repositories according to the instructions of SuseRegister. SuseRegister will not save this status as lastZmdConfig.");
+ }
+
+
return summary;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.17.3/VERSION new/yast2-registration-2.17.4/VERSION
--- old/yast2-registration-2.17.3/VERSION 2008-10-14 18:06:13.000000000 +0200
+++ new/yast2-registration-2.17.4/VERSION 2008-10-16 13:09:59.000000000 +0200
@@ -1 +1 @@
-2.17.3
+2.17.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org