Hello community,
here is the log from the commit of package yast2-registration
checked in at Thu Mar 6 02:47:06 CET 2008.
--------
--- yast2-registration/yast2-registration.changes 2007-11-02 16:53:59.000000000 +0100
+++ yast2-registration/yast2-registration.changes 2008-03-05 22:38:24.236161000 +0100
@@ -1,0 +2,6 @@
+Wed Mar 5 20:56:16 CET 2008 - jdsn@suse.de
+
+- added support for SMT (registration proxy)
+- 2.16.1
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-2.16.0.tar.bz2
New:
----
yast2-registration-2.16.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.Zc3226/_old 2008-03-06 02:46:48.000000000 +0100
+++ /var/tmp/diff_new_pack.Zc3226/_new 2008-03-06 02:46:48.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-registration (Version 2.16.0)
+# spec file for package yast2-registration (Version 2.16.1)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 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.
#
@@ -10,16 +10,18 @@
# norootforbuild
+
Name: yast2-registration
-Version: 2.16.0
+Version: 2.16.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-registration-2.16.0.tar.bz2
+Source0: yast2-registration-2.16.1.tar.bz2
Prefix: /usr
Requires: yast2 >= 2.16.6
Requires: suseRegister
+Requires: perl-TimeDate limal limal-perl limal-ca-mgm-perl
# because of SourceManager
Requires: yast2-packager >= 2.13.152
%if %sles_version
@@ -27,6 +29,7 @@
%endif
PreReq: %fillup_prereq
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-testsuite
+BuildRequires: limal limal-ca-mgm-perl limal-perl perl-TimeDate
# Internet YCP module
BuildRequires: yast2 >= 2.16.6
BuildArch: noarch
@@ -43,7 +46,7 @@
J. Daniel Schmidt
%prep
-%setup -n yast2-registration-2.16.0
+%setup -n yast2-registration-2.16.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -82,6 +85,7 @@
%defattr(-,root,root)
%doc %{prefix}/share/doc/packages/yast2-registration
/usr/share/YaST2/clients/*.ycp
+/usr/share/YaST2/modules/*.pm
/usr/share/YaST2/modules/*.ycp
/usr/share/YaST2/modules/*.ybc
%{prefix}/share/applications/YaST2/*.desktop
@@ -92,54 +96,57 @@
#fillup
/var/adm/fillup-templates/sysconfig.suse_register-yast2-registration
%changelog
-* Fri Nov 02 2007 - locilka@suse.cz
+* Wed Mar 05 2008 jdsn@suse.de
+- added support for SMT (registration proxy)
+- 2.16.1
+* Fri Nov 02 2007 locilka@suse.cz
- Removed dependency on yast2-network, Internet YCP module has been
moved to yast2.rpm.
- 2.16.0
-* Fri Sep 07 2007 - jdsn@suse.de
+* Fri Sep 07 2007 jdsn@suse.de
- importing PackageCallbacks (#307764)
- 2.15.3
-* Sat Sep 01 2007 - jdsn@suse.de
+* Sat Sep 01 2007 jdsn@suse.de
- adapted source management changes (#304310)
- wrapping of detailled error messages (#239570)
- 2.15.2
-* Tue Aug 21 2007 - jdsn@suse.de
+* Tue Aug 21 2007 jdsn@suse.de
- handling sysconfig file with fillup (#300064)
- code cleanup - nonroot user not supported
- 2.15.1
-* Fri Aug 03 2007 - jdsn@suse.de
+* Fri Aug 03 2007 jdsn@suse.de
- new version
- 2.15.0
-* Tue Jul 17 2007 - jdsn@suse.de
+* Tue Jul 17 2007 jdsn@suse.de
- made multiline texts gettext compatible (#230388)
- reactivated skip button in case of error (#240174)
- ensure that Sources are initialized on startup (#270899)
- 2.14.6
-* Fri May 25 2007 - jsrain@suse.cz
+* Fri May 25 2007 jsrain@suse.cz
- removed X-SuSE-translate in order to build
- 2.14.5
-* Mon Apr 02 2007 - jdsn@suse.de
+* Mon Apr 02 2007 jdsn@suse.de
- fixed category in desktop files (#259914)
- 2.14.4
-* Mon Mar 19 2007 - jdsn@suse.de
+* Mon Mar 19 2007 jdsn@suse.de
- improved dependecies in spec file (#253975)
- 2.14.3
-* Tue Nov 21 2006 - jdsn@suse.de
+* Tue Nov 21 2006 jdsn@suse.de
- added autoyast schema file (#219408)
- 2.14.2
-* Fri Nov 17 2006 - jdsn@suse.de
+* Fri Nov 17 2006 jdsn@suse.de
- yastbrowser update, support for mozilla-xulrunner181 (#219354)
- removed dependencies to rug and zmd for openSUSE (#220807)
- hard dependencies to rug and zmd for SLE (#220807)
- check for wrong proxy settings (#208651)
- removed SuSEregister.pango call (FATE #300947)
- 2.14.1
-* Mon Nov 13 2006 - jsrain@suse.cz
+* Mon Nov 13 2006 jsrain@suse.cz
- 2.14.0
-* Thu Nov 09 2006 - jsrain@suse.cz
+* Thu Nov 09 2006 jsrain@suse.cz
- fixed textdomain (#219378)
- 2.13.4
-* Tue Oct 31 2006 - jdsn@suse.de
+* Tue Oct 31 2006 jdsn@suse.de
- using own icon in installation workflow (#211552)
- check for rug and zmd to be installed (#191135)
- show message if no product to be registered (#191258)
@@ -147,13 +154,13 @@
- do not log sensitive data from autoyast (#195624)
- renamed the _not_ missing file (inst_)suse_register.ycp
- 2.13.3
-* Wed Oct 04 2006 - jsrain@suse.cz
+* Wed Oct 04 2006 jsrain@suse.cz
- added missing inst_suse_register.ycp
- 2.13.2
-* Mon Oct 02 2006 - locilka@suse.cz
+* Mon Oct 02 2006 locilka@suse.cz
- Added missing yast2-packager into BuildRequires
- 2.13.1
-* Sat Aug 26 2006 - jdsn@suse.de
+* Sat Aug 26 2006 jdsn@suse.de
- initial version
- split off registration from installation (#203551)
- fixed desktop files (#165891)
++++++ yast2-registration-2.16.0.tar.bz2 -> yast2-registration-2.16.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.0/configure new/yast2-registration-2.16.1/configure
--- old/yast2-registration-2.16.0/configure 2007-11-02 16:56:43.000000000 +0100
+++ new/yast2-registration-2.16.1/configure 2008-03-05 22:38:13.000000000 +0100
@@ -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.16.0.
+# Generated by GNU Autoconf 2.61 for yast2-registration 2.16.1.
#
# 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.16.0'
-PACKAGE_STRING='yast2-registration 2.16.0'
+PACKAGE_VERSION='2.16.1'
+PACKAGE_STRING='yast2-registration 2.16.1'
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.16.0 to adapt to many kinds of systems.
+\`configure' configures yast2-registration 2.16.1 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.16.0:";;
+ short | recursive ) echo "Configuration of yast2-registration 2.16.1:";;
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.16.0
+yast2-registration configure 2.16.1
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.16.0, which was
+It was created by yast2-registration $as_me 2.16.1, 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.16.0'
+ VERSION='2.16.1'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.16.0"
+VERSION="2.16.1"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
@@ -3303,7 +3303,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.16.0, which was
+This file was extended by yast2-registration $as_me 2.16.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3346,7 +3346,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-registration config.status 2.16.0
+yast2-registration config.status 2.16.1
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.16.0/configure.in new/yast2-registration-2.16.1/configure.in
--- old/yast2-registration-2.16.0/configure.in 2007-11-02 16:56:39.000000000 +0100
+++ new/yast2-registration-2.16.1/configure.in 2008-03-05 22:38:09.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-registration
dnl
-dnl -- This file is generated by y2autoconf 2.16.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-registration, 2.16.0, http://bugs.opensuse.org/, yast2-registration)
+AC_INIT(yast2-registration, 2.16.1, http://bugs.opensuse.org/, yast2-registration)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.16.0"
+VERSION="2.16.1"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.0/COPYRIGHT.english new/yast2-registration-2.16.1/COPYRIGHT.english
--- old/yast2-registration-2.16.0/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.16.1/COPYRIGHT.english 2008-03-05 22:38:18.000000000 +0100
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C) <year> <name of author>
+
+ 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.
+
+ 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.
+
+ 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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.0/Makefile.am new/yast2-registration-2.16.1/Makefile.am
--- old/yast2-registration-2.16.0/Makefile.am 2007-11-02 16:56:39.000000000 +0100
+++ new/yast2-registration-2.16.1/Makefile.am 2008-03-05 22:38:09.000000000 +0100
@@ -23,7 +23,7 @@
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
-COPYRIGHT_files_gpl = README COPYING
+COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.0/Makefile.in new/yast2-registration-2.16.1/Makefile.in
--- old/yast2-registration-2.16.0/Makefile.in 2007-11-02 16:56:45.000000000 +0100
+++ new/yast2-registration-2.16.1/Makefile.in 2008-03-05 22:38:15.000000000 +0100
@@ -217,7 +217,7 @@
DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
-COPYRIGHT_files_gpl = README COPYING
+COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.0/README new/yast2-registration-2.16.1/README
--- old/yast2-registration-2.16.0/README 2007-11-02 16:58:18.000000000 +0100
+++ new/yast2-registration-2.16.1/README 2008-03-05 22:38:18.000000000 +0100
@@ -1,2 +1,2 @@
This program/library is part of YaST2
-See the file COPYING for license terms
+See the file COPYRIGHT.english for license terms
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.0/src/clients/inst_suse_register.ycp new/yast2-registration-2.16.1/src/clients/inst_suse_register.ycp
--- old/yast2-registration-2.16.0/src/clients/inst_suse_register.ycp 2007-09-10 09:52:33.000000000 +0200
+++ new/yast2-registration-2.16.1/src/clients/inst_suse_register.ycp 2008-03-05 20:46:16.000000000 +0100
@@ -33,6 +33,16 @@
import "Package";
import "PackageCallbacks";
+
+ // this operation MUST be first and run in any case, even if registration should be skipped (FATE #302966)
+ symbol confRegSrv = Register::configureRegistrationServer();
+ if (confRegSrv == `conferror || confRegSrv == `notrust || confRegSrv == `silentskip)
+ {
+ y2debug("Registration can not be run due to SMT configuration error.");
+ return `auto;
+ }
+
+
// no network - no suse_register
if (!Mode::normal())
{
@@ -99,7 +109,8 @@
string nccc_success_msg = _("Your configuration was successful.");
string nccc_success_server_added = _("An update server has been added to your configuration.");
string nccc_error_no_server_added = _("No update server could be added to your configuration.");
- string success_detail_label =("New Update Server");
+ /* caption for details view */
+ string success_detail_label =_("New Update Server");
/* strings for manual interaction popup */
string mi_required = _("Manual Interaction Required");
@@ -109,6 +120,8 @@
the configuration on the opened Web site.");
+ string title_regularly_run = _("Regularly Synchronize with the Customer Center");
+
/* string for show information popup */
string transmit_info = _("Registration and Privacy Information");
@@ -122,7 +135,7 @@
in the Online Update YaST module. If you continue and later want
to update with Online Update, the source must be added manually.
Other tools, such as Software Updater in the panel, can still be
-used. Alternatively, cancel then register through YaST as root
+used. Alternatively, cancel then register through YaST as root
so the sources are available to all tools.");
@@ -169,8 +182,15 @@
the transmitted information in the log file <tt>~/.suse_register.log</tt>.
</p>");
-string help = help_title + help_para1 + help_para2 + (Register::display_forcereg ? help_para3:"") + help_para4;
+string help_para5 = _("<p>
+<b>Regularly Synchronize with the Customer Center</b> checks that your update
+sources are still valid and adds any new ones that may be available.
+It additionally sends any modifications to your included data to Novell, such
+as hardware information if <b>Hardware Information</b> is activated.
+This option does not remove any sources added manually.
+</p>");
+string help = help_title + help_para1 + help_para2 + (Register::display_forcereg ? help_para3:"") + help_para4;
/* further strings */
@@ -208,6 +228,9 @@
`VSpacing(0.5),
`Right( `PushButton(`id(`showinfo), nccc_sub_showbtn ) )
) ) ) ,
+ // active in SLE products only - merged here for consistency
+ //`VSpacing(0.5),
+ //`Left( `CheckBox(`id(`regularly_run), `opt(`notify), title_regularly_run, Register::register_regularly ) ),
`VSpacing(0.5)
)))
));
@@ -291,9 +314,9 @@
/* ^^ END CCC ERROR ^^ */
- /* vv CCC ERROR POPUP PLAINTEXT vv */
+ /* vv CCC ERROR POPUP PLAINTEXT vv */
term error_message_details_pt=
- `MinSize( 50, 15, `VBox(
+ `MinSize( 60, 20, `VBox(
`Left( `Label( `opt(`boldFont), error_msg ) ),
`VSpacing( 0.5 ),
`RichText(`id(`errordetail), `opt(`plainText), "" ),
@@ -500,7 +523,7 @@
if (Register::use_proxy)
{
- // (#165891)
+ // (#165891) - (#208651) fixed in Register.ycp
bcmd = " http_proxy='" + Register::http_proxy + "' " + bcmd;
bcmd = " https_proxy='" + Register::https_proxy + "' " + bcmd;
}
@@ -582,11 +605,12 @@
{
configure_status = (boolean) UI::QueryWidget(`id(`configure), `Value);
}
- else if (ret == `hwinfo || ret == `optional || ret == `forcereg)
+ else if (ret == `hwinfo || ret == `optional || ret == `forcereg || ret == `regularly_run )
{
Register::submit_hwdata = (boolean) UI::QueryWidget(`id(`hwinfo), `Value);
Register::submit_optional= (boolean) UI::QueryWidget(`id(`optional), `Value);
Register::force_registration = (boolean) UI::QueryWidget(`id(`forcereg), `Value);
+ Register::register_regularly = (boolean) UI::QueryWidget(`id(`regularly_run), `Value);
}
else if (ret == `showinfo)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.0/src/clients/suse_register_auto.ycp new/yast2-registration-2.16.1/src/clients/suse_register_auto.ycp
--- old/yast2-registration-2.16.0/src/clients/suse_register_auto.ycp 2007-07-18 08:36:15.000000000 +0200
+++ new/yast2-registration-2.16.1/src/clients/suse_register_auto.ycp 2008-03-05 20:47:50.000000000 +0100
@@ -81,6 +81,16 @@
summary = Summary::CloseList(summary);
}
+ if ( Register::smt_server != "")
+ {
+ summary = Summary::AddHeader (summary, _("SMT Server Settings") );
+ summary = Summary::OpenList(summary);
+ summary = Summary::AddListItem (summary, sformat(_("SMT Server: %1"), Register::smt_server) );
+ if ( Register::smt_server_cert != "")
+ summary = Summary::AddListItem (summary, sformat(_("SMT Certificate: %1"), Register::smt_server_cert) );
+ summary = Summary::CloseList(summary);
+ }
+
return summary;
}
@@ -177,14 +187,24 @@
string help_text_caption = sformat("<p><b>%1</b></p>", caption);
string help_text_para1 = _("<p>Product registration includes your product in Novell's database, enabling you to get online updates and technical support. To register while installing automatically, select <b>Run Product Registration</b>. To simplify the procedure, include information from your system with <b>Hardware Profile</b> and <b>Optional Information</b>.</p>");
string help_text_para2 = _("<p>Get more information about the registration process with <tt>suse_register -h</tt>.</p>");
- string help_text_para3 = _("<p>Other information used for registration is shown in <b>Registration Data</b>. Add a new key and value pair by pressing <b>Add</b> then entering the appropriate values. These parameters are those that can be passed with <tt>suse_register -a</tt>. Get more information about them with <tt>suse_register -p</tt>. Remove a pair with <b>Delete</b> or modify an existing pair with <b>Edit</b>.</p>");
+ string help_text_para3 = _("<p>Other information used for registration is shown in <b>Registration Data</b>.<br>Add a new key and value pair by pressing <b>Add</b> and then entering the appropriate values. These parameters are the ones that can be passed with <tt>suse_register -a</tt>.<br>Get more information about them with <tt>suse_register -p</tt>. Remove a pair with <b>Delete</b> or modify an existing pair with <b>Edit</b>.</p>");
+
+ string help_text_para4 = _("<p>If your network deploys a custom SMT server, please set the URL of the SMT Server and the location of the SMT Certificate in <b>SMT Server Settings</b>. Please see your SMT manual for further assistance.</p>");
- string help_text = help_text_caption + help_text_para1 + help_text_para2 + help_text_para3;
- term contents = `VBox(
- `VBox (
- // Translators: Text for UI Label - capitalized
- `Left( `CheckBox(`id(`run), `opt(`notify), _("Run Product Registration"), false )),
+ string help_text = help_text_caption + help_text_para1 + help_text_para2 + help_text_para3 + help_text_para4;
+
+ term smtsettings = `VBox(
+ // Translators: Text for UI Label - capitalized
+ `Left( `Label(_("SMT Server Settings"))),
+ // Translators: Text for UI Label - capitalized
+ `TextEntry(`id(`smturl), `opt(`hstretch, `notify), _("SMT Server"), ""),
+ // Translators: Text for UI Label - capitalized
+ `TextEntry(`id(`smtcert), `opt(`hstretch, `notify), _("SMT Certificate"), "")
+ );
+
+ term regsettings = `VBox(
+ `Left( `CheckBox(`id(`run), `opt(`notify), _("Run Product Registration"), false )),
`HBox( `HSpacing (3.0) , `VBox(
// Translators: Text for UI Label - capitalized
`Left( `Label( _("Include in Registration") ) ),
@@ -192,13 +212,18 @@
`Left( `CheckBox(`id(`sub_hw), `opt(`notify), _("Hardware Profile"), false )),
// Translators: Text for UI Label - capitalized
`Left( `CheckBox(`id(`sub_opt), `opt(`notify), _("Optional Information"), false ))
- ))
- ),
+ )
+ ),
+ `VSpacing(1));
+
+
+ term contents = `VBox(
+ `HBox ( regsettings, smtsettings ),
`VBox ( `VSpacing(0.5),
// Translators: Text for UI Label - capitalized
`Left( `Label( _("Registration Data to Use")) ),
`MinSize(10,5, `Table( `id(`table), `opt(`notify, `vstretch) , `header( _("Key"), _("Value")), [] )),
- `HBox(
+ `HBox(
`PushButton(`id(`add), _("Ad&d")),
`PushButton(`id(`edit), `opt(`disabled), _("&Edit")),
`PushButton(`id(`delete), `opt(`disabled), _("De&lete"))
@@ -226,6 +251,8 @@
UI::ChangeWidget(`id(`run), `Value, Register::do_registration);
UI::ChangeWidget(`id(`sub_hw ), `Value, Register::submit_hwdata);
UI::ChangeWidget(`id(`sub_opt), `Value, Register::submit_optional);
+ UI::ChangeWidget(`id(`smturl), `Value, Register::smt_server);
+ UI::ChangeWidget(`id(`smtcert), `Value, Register::smt_server_cert);
integer items=size(table_items);
UI::ChangeWidget(`id(`edit), `Enabled, items > 0);
UI::ChangeWidget(`id(`delete), `Enabled, items > 0);
@@ -298,9 +325,35 @@
}
else if ( ret == `abort || ret == `cancel )
{
- if(Popup::ReallyAbort(true)) break;
- else continue;
- }
+ if(Popup::ReallyAbort(true)) break;
+ else continue;
+ }
+ else if ( ret == `next )
+ {
+ string smtServer = (string) UI::QueryWidget(`id(`smturl), `Value);
+ string smtServerCert = (string) UI::QueryWidget(`id(`smtcert), `Value);
+
+ if ( (! regexpmatch(smtServer, "^https://.+") && smtServer != "" ) ||
+ ( smtServer == "" && smtServerCert != "" )
+ )
+ {
+ Popup::Message(_("SMT Server URL must start with https://"));
+ ret = nil;
+ }
+
+ if (! regexpmatch(smtServerCert, "^(https?|ftp)://.+") &&
+ ! regexpmatch(smtServerCert, "^floppy/.+") &&
+ ! regexpmatch(smtServerCert, "^/.+") &&
+ ! regexpmatch(smtServerCert, "^(ask|done)$") &&
+ smtServerCert != ""
+ )
+ {
+ Popup::Message(_("Location of SMT Certificate invalid.\nPlease see your SMT documentation."));
+ ret = nil;
+ }
+ Register::smt_server = smtServer;
+ Register::smt_server_cert = smtServerCert;
+ }
// refresh counter and buttons
items = size(table_items);
@@ -326,6 +379,8 @@
y2debug("submit_hwdata: %1", Register::submit_hwdata);
y2debug("submit_optional: %1", Register::submit_optional);
y2debug("registration_data: %1", Register::registration_data);
+ y2debug("smt_server: %1", Register::smt_server);
+ y2debug("smt_server_cert: %1", Register::smt_server_cert);
}
UI::CloseDialog();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.0/src/config/registration.rnc new/yast2-registration-2.16.1/src/config/registration.rnc
--- old/yast2-registration-2.16.0/src/config/registration.rnc 2007-05-18 10:44:17.000000000 +0200
+++ new/yast2-registration-2.16.1/src/config/registration.rnc 2008-03-05 20:49:45.000000000 +0100
@@ -2,10 +2,13 @@
namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
namespace config = "http://www.suse.com/1.0/configns"
-suse_register = element suse_register { do_registration? & submit_hwdata? & submit_optional? & registration_data? }
+suse_register = element suse_register { do_registration? & submit_hwdata? & submit_optional? & registration_data? & register_regularly? & smt_server? & smt_server_cert? }
do_registration = element do_registration { BOOLEAN }
submit_hwdata = element submit_hwdata { BOOLEAN }
submit_optional = element submit_optional { BOOLEAN }
+register_regularly = element register_regularly { BOOLEAN }
+smt_server = element smt_server { text }
+smt_server_cert = element smt_server_cert { text }
registration_data =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.0/src/modules/Makefile.am new/yast2-registration-2.16.1/src/modules/Makefile.am
--- old/yast2-registration-2.16.0/src/modules/Makefile.am 2007-05-18 10:44:17.000000000 +0200
+++ new/yast2-registration-2.16.1/src/modules/Makefile.am 2008-02-08 19:59:01.000000000 +0100
@@ -2,7 +2,7 @@
# Makefile.am for registration/modules
#
-module_DATA = Register.ycp
+module_DATA = Register.ycp RegisterCert.pm
EXTRA_DIST = $(module_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.0/src/modules/Makefile.in new/yast2-registration-2.16.1/src/modules/Makefile.in
--- old/yast2-registration-2.16.0/src/modules/Makefile.in 2007-11-02 16:56:44.000000000 +0100
+++ new/yast2-registration-2.16.1/src/modules/Makefile.in 2008-03-05 22:38:14.000000000 +0100
@@ -177,7 +177,7 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
-module_DATA = Register.ycp
+module_DATA = Register.ycp RegisterCert.pm
EXTRA_DIST = $(module_DATA)
modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA))
modulebindir = $(moduledir)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.0/src/modules/RegisterCert.pm new/yast2-registration-2.16.1/src/modules/RegisterCert.pm
--- old/yast2-registration-2.16.0/src/modules/RegisterCert.pm 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.16.1/src/modules/RegisterCert.pm 2008-02-08 19:46:53.000000000 +0100
@@ -0,0 +1,84 @@
+#!/usr/bin/perl -w
+
+package RegisterCert;
+
+use strict;
+use LIMAL;
+use LIMAL::CaMgm;
+use Date::Format;
+use YaST::YCP qw(:LOGGING);
+use Data::Dumper;
+
+our %TYPEINFO;
+
+BEGIN { $TYPEINFO{parseCertificate} = ["function", ["map", "string", "any"], "string"]; }
+sub parseCertificate
+{
+ my $self = shift;
+ my $file = shift;
+
+ #my $file = "/etc/ssl/certs/YaST-CA.pem";
+ my $result = {
+ SUBJECT => [],
+ ISSUER => [],
+ STARTDATE => "",
+ ENDDATE => "",
+ FINGERPRINT => ""
+ };
+
+ if(!-e $file)
+ {
+ y2error("File not found ($file)");
+ return undef;
+ }
+
+ my $certData = LIMAL::CaMgm::LocalManagement::getCertificate($file, $LIMAL::CaMgm::E_PEM);
+
+ my $rdnlist = $certData->getSubjectDN()->getDN();
+
+ my @SUBJECT = ();
+
+ for(my $it = $rdnlist->begin();
+ !$rdnlist->iterator_equal($it, $rdnlist->end());
+ $rdnlist->iterator_incr($it))
+ {
+ my $hash = {};
+ $hash->{$rdnlist->iterator_value($it)->getType()} = $rdnlist->iterator_value($it)->getValue();
+
+ push @SUBJECT, $hash;
+ }
+
+ $result->{SUBJECT} = \@SUBJECT;
+
+ $rdnlist = $certData->getIssuerDN()->getDN();
+
+ my @ISSUER = ();
+
+ for(my $it = $rdnlist->begin();
+ !$rdnlist->iterator_equal($it, $rdnlist->end());
+ $rdnlist->iterator_incr($it))
+ {
+ my $hash = {};
+ $hash->{$rdnlist->iterator_value($it)->getType()} = $rdnlist->iterator_value($it)->getValue();
+
+ push @ISSUER, $hash;
+ }
+
+ $result->{ISSUER} = \@ISSUER;
+
+ my $datestr = time2str('%Y-%m-%d %X GMT', $certData->getStartDate());
+
+ $result->{STARTDATE} = $datestr;
+
+ $datestr = time2str('%Y-%m-%d %X GMT', $certData->getEndDate());
+
+ $result->{ENDDATE} = $datestr;
+ $result->{FINGERPRINT} = $certData->getFingerprint();
+
+ y2milestone("Return certificate data: ".Data::Dumper->Dump([$result]));
+ return $result;
+}
+
+
+
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.0/src/modules/Register.ycp new/yast2-registration-2.16.1/src/modules/Register.ycp
--- old/yast2-registration-2.16.0/src/modules/Register.ycp 2007-08-22 10:10:37.000000000 +0200
+++ new/yast2-registration-2.16.1/src/modules/Register.ycp 2008-03-05 20:48:52.000000000 +0100
@@ -18,9 +18,12 @@
import "Misc";
import "Stage";
import "Label";
+import "Popup";
+import "URL";
+import "Linuxrc";
import "ProductFeatures";
import "SourceManager";
-
+import "RegisterCert";
// --------------------------------------------------------------
@@ -45,10 +48,13 @@
global boolean submit_hwdata = false;
global boolean force_registration = false;
global boolean display_forcereg = false;
+global boolean register_regularly = false; // (FATE #301822)
global boolean disable_w3m = false;
global boolean use_proxy = false;
global string http_proxy = "";
global string https_proxy = "";
+global string smt_server = ""; // (FATE #302966)
+global string smt_server_cert = ""; // (FATE #302966)
global map registration_data = $[];
@@ -78,6 +84,534 @@
}
+
+/*
+ * mountFloppy()
+ *
+ * mount a floppy disk
+ * @return map with status information
+ *
+ */
+map mountFloppy()
+{
+ // floppy mount support (FATE #303335)
+ list drives = (list) SCR::Read(.probe.floppy);
+
+ if ( size(drives) == 0 )
+ {
+ return $[ "mounted" : false ];
+ }
+
+ string fddevice = drives[0, "dev_name"]:"/dev/fd0";
+ string tmpdir = (string) SCR::Read(.target.tmpdir);
+ if (tmpdir == nil) tmpdir = "/tmp";
+ string mpoint = tmpdir + "/fd";
+
+ // create mount point directory
+ SCR::Execute(.target.mkdir, mpoint);
+
+ y2milestone("Trying to mount %1 as floppy drive to load the SMT certificate file from.", fddevice);
+
+ boolean result = (boolean) SCR::Execute(.target.mount, [fddevice, mpoint], "-o ro" );
+
+ return $[ "mounted" : result, "mpoint" : mpoint, "device" : fddevice ];
+}
+
+
+
+/*
+ * umountFloppy()
+ *
+ * umount a floppy disk
+ * @return void
+ *
+ */
+void umountFloppy(string mpoint)
+{
+ if (mpoint == nil || mpoint == "") return;
+ SCR::Execute(.target.umount, mpoint);
+}
+
+
+/*
+ * certificateError()
+ *
+ * report error messages if SMT certificate file is not found
+ * @return symbol yes, no or retry
+ *
+ */
+symbol certificateError(string heading, symbol type)
+{
+ if (heading == nil || heading == "") heading = _("Unknown error");
+
+ string errorrMessage = "";
+ string question = _("Do you want to skip Registration?");
+ string otherwise = sformat( _("If you select %1 the Registration will most likely fail.
+Otherwise you may copy the certificate file to the system manually
+and then specify its path by choosing %2."), deletechars(Label::ContinueButton(), "&"), deletechars(Label::FileName(), "&") );
+ string errorMessage = "";
+
+ if (type == `floppy)
+ {
+ errorMessage = _("Could not load the SMT certificate file from floppy disk.");
+ }
+ else if (type == `url)
+ {
+ errorMessage = _("Could not download the SMT certificate file from specified URL.");
+ }
+ else if (type == `file)
+ {
+ errorMessage = _("Could not find the SMT certificate file in specified path.");
+ }
+ else
+ {
+ errorMessage = _("Unknown error occurred while retrieving SMT certificate file");
+ }
+
+ errorMessage = errorMessage + "\n\n" + question + "\n\n" + otherwise;
+ return Popup::AnyQuestion3(heading, errorMessage, _("Skip"), Label::ContinueButton(), Label::FileName(), `focus_yes );
+}
+
+
+
+
+
+/*
+ * suseRegisterURL()
+ *
+ * get or set the suseRegisterURL
+ * @return current url
+ */
+string suseRegisterURL(string url)
+{
+ // nil, empty string, unparsable urls and non-https urls as parameter means 'get url' else 'set url'
+
+ string cururl = nil;
+ map urlmap = $[];
+ string suseRegisterConf = "/etc/suseRegister.conf";
+
+ SCR::RegisterAgent (.temporary_suseregister_agent, `ag_ini(
+ `IniAgent( suseRegisterConf,
+ $[
+ "options" : [ "line_can_continue", "global_values", "join_multiline", "comments_last", "flat" ],
+ "comments": [ "^[ \t]*#.*$", "^[ \t]*$" ],
+ "params" : [ $[ "match" : [ "([a-zA-Z0-9_-]+)[ \t]*=[ \t]*([^ \t]*)", "%s = %s" ] ] ]
+ ]
+ )));
+
+ // in case the smt server was already changed do not change it again (to support mobile PCs in different environments)
+ string mod = (string) SCR::Read(.temporary_suseregister_agent.smturlmodified);
+ if ( mod == "true" )
+ {
+ url = nil;
+ y2milestone("SMT server has already been modified. I will not change it again.");
+ }
+
+ cururl = (string) SCR::Read(.temporary_suseregister_agent.url);
+ urlmap = URL::Parse(url);
+
+ if ( url != nil && url != "" && urlmap != $[] && urlmap["scheme"]:"" == "https" )
+ {
+ SCR::Write(.temporary_suseregister_agent.url, url);
+ cururl = (string) SCR::Read(.temporary_suseregister_agent.url);
+ if (url == cururl) SCR::Write(.temporary_suseregister_agent.smturlmodified, "true");
+ }
+
+ SCR::UnregisterAgent (.temporary_suseregister_agent);
+ return cururl;
+}
+
+
+
+/*
+ * setupRegistrationServer()
+ *
+ * write SMT server settings to (FATE #302966)
+ * @return symbol that says if we can perform the registration
+ *
+ */
+symbol setupRegistrationServer(symbol mode)
+{
+ // in case smt_server is undefined nothing needs to be done
+ if (smt_server == nil || smt_server == "") return `ok;
+
+ boolean ay = false; // are we running in autoYaST mode?
+ boolean trust = false;
+ if (mode == `autoyast)
+ {
+ trust = true;
+ ay = true;
+ }
+
+ // check if smt_server is a valid url
+ map smt_server_parsed = URL::Parse(smt_server);
+ if (smt_server_parsed == $[] || smt_server_parsed["host"]:"" == "" || smt_server_parsed["scheme"]:"" != "https" )
+ {
+ y2milestone("The string '%1' could not be parsed and validated as URL to be used as SMT server.", smt_server);
+ if (ay) return `conferror;
+
+ string no_smt_server = sformat( _("The SMT server URL could not be validated as URL.
+Registration can not be performed. Please modify /etc/suseRegister.conf and run Registration manually.
+The SMT server URL that was configured was
+%1"), smt_server);
+ Popup::Message(no_smt_server);
+ return `conferror;
+ }
+
+
+ // write SMT server URL to /etc/suseRegister.conf
+ if (smt_server == suseRegisterURL(smt_server) )
+ { y2milestone("Setup custom SMT server as registration server successful: %1", smt_server); }
+ else
+ { y2error("Failed to setup custom SMT server as registration server: %1", smt_server); }
+
+
+
+ // ----------===============================================-------------- //
+
+ symbol certmode = nil;
+
+ // never ever load a certificate file for a *.novell.com smt server
+ if ( regexpmatch(smt_server_parsed["host"]:"", ".+\.novell\.com$")) { certmode = `none; }
+ else if (smt_server_cert == nil || smt_server_cert == "") { certmode = `url; }
+ else if ( regexpmatch(smt_server_cert, "^(https?|ftp)://.+") ) { certmode = `url; }
+ else if ( regexpmatch(smt_server_cert, "^floppy/.+") ) { certmode = `floppy; }
+ else if ( regexpmatch(smt_server_cert, "^/.+") ) { certmode = `path; }
+ else if ( regexpmatch(smt_server_cert, "^ask$") ) { certmode = `ask; }
+ else if ( regexpmatch(smt_server_cert, "^done$") ) { certmode = `done; }
+ else { certmode = `none; }
+
+
+ if (! contains([`none, `done, `url, `floppy, `ask, `path], certmode) )
+ {
+ y2error("No SMT certificate file retrieval-mode found to handle current configuration. This should not happen!");
+ return `conferror;
+ }
+
+ string certTmpFile = sformat("%1/__tmpSMTcert.crt", SCR::Read(.target.tmpdir));
+
+
+ if ( certmode == `url )
+ {
+ map certParse = URL::Parse(smt_server_cert);
+
+ // if no smt_server_cert is passed then we fall back to predefined smt_server_cert
+ if (smt_server_cert == nil || smt_server_cert == "" || certParse == $[])
+ {
+ map certUrl = smt_server_parsed;
+ certUrl["scheme"] = "http";
+ certUrl["port"] = "80";
+ certUrl["path"] = "/smt.crt";
+ smt_server_cert = URL::Build(certUrl);
+ certParse=certUrl;
+
+ }
+ y2milestone("Using %1 as URL to download the SMT certificate file.", smt_server_cert);
+
+ // download cert
+ string curlcmd = sformat("curl -f --connect-timeout 60 --max-time 120 '%1' -o %2", smt_server_cert, certTmpFile);
+ if ( SCR::Execute (.target.bash, curlcmd) != 0)
+ {
+ y2error("Could not download the SMT certificate file from specified URL %1", smt_server_cert);
+ if (ay) return `conferror;
+
+ // translators: this is a heading for an error message - so no punctuation
+ string urlError = _("Downloading SMT certificate file failed");
+ symbol errret = certificateError( urlError, `url);
+
+ certTmpFile = nil;
+ }
+ }
+
+ if (certmode == `floppy)
+ {
+ // mount and copy
+ map mf = mountFloppy();
+ if (!mf["mounted"]:false)
+ {
+ umountFloppy(mf["mpoint"]:"/dev/fd0");
+ y2error("Could not mount floppy disk to copy the SMT certificte file from. The device that was used was %1", mf["device"]:"");
+ if (ay)
+ {
+ y2error("No SMT certificate file available. As we are in autoYaST mode Registration will be skipped. Please run it manually.");
+ return `silentskip;
+ }
+ else
+ {
+ // translators: this is a heading for an error message - so no punctuation
+ string fdMountError = _("Could not mount floppy disk");
+ symbol errret = certificateError( fdMountError, `floppy);
+
+ if ( errret == `yes )
+ {
+ y2warning("No SMT certificate could be retrieved (floppy mount error). User selected to skip Registration.");
+ return `silentskip;
+ }
+ else if ( errret == `no )
+ {
+ y2warning("No SMT certificate could be retrieved (floppy mount error). User selected to NOT skip Registration. Most likely Registration will fail now.");
+ return `ok;
+ }
+ else { certmode = `ask; }
+ }
+ }
+ else
+ {
+ string fdpath = regexpsub( smt_server_cert , "^floppy/(.+)$","\\1");
+ string cp2tmp = sformat("/bin/cp -a %1 %2 ", mf["mpoint"]:"/media/floppy" + "/" + fdpath, certTmpFile );
+ if ( SCR::Execute (.target.bash, cp2tmp) != 0)
+ {
+ y2error("Could not copy the specified SMT certificate file from floppy disk.");
+ if (ay) return `silentskip;
+
+ // translators: this is a heading for an error message - so no punctuation
+ string fdCopyError = _("Could not read file floppy disk");
+ symbol errret = certificateError( fdCopyError, `floppy);
+
+ if ( errret == `yes )
+ {
+ y2warning("No SMT certificate could be retrieved (could not copy from floppy). User selected to skip Registration.");
+ return `silentskip;
+ }
+ else if ( errret == `no )
+ {
+ y2warning("No SMT certificate could be retrieved (could not copy from floppy). User selected to NOT skip Registration. Most likely Registration will fail now.");
+ return `ok;
+ }
+ else { certmode = `ask; }
+
+ }
+
+ umountFloppy(mf["mpoint"]:"/dev/fd0");
+ }
+
+ }
+
+ if (certmode == `path)
+ {
+ // try to copy cert if valid path, else ask // copy
+
+ string cp2tmp = sformat("/bin/cp -a %1 %2 ", smt_server_cert, certTmpFile );
+ if ( SCR::Execute(.target.bash, cp2tmp ) != 0 )
+ {
+ y2error("Could not copy local SMT certificate file");
+ if (ay) return `silentskip;
+
+ // translators: this is a heading for an error message - so no punctuation
+ string fileCopyError = _("Could find SMT certificate file in local path");
+ symbol errret = certificateError( fileCopyError, `file);
+ if ( errret == `yes )
+ {
+ y2warning("No SMT certificate could be retrieved (could not copy local file). User selected to skip Registration.");
+ return `silentskip;
+ }
+ else if ( errret == `no )
+ {
+ y2warning("No SMT certificate could be retrieved (could not copy local file). User selected to NOT skip Registration. Most likely Registration will fail now.");
+ return `ok;
+ }
+ else { certmode = `ask; }
+ }
+ }
+
+ if (certmode == `ask)
+ {
+ if (ay)
+ {
+ y2error("SMT certificate was configured to be asked for. AutoYaST does not support interactive dialogs. Registration will be skipped.");
+ return `silentskip;
+ }
+
+ string basepath = "/tmp";
+ string certFile = "";
+ string selectCertLabel = _("Select SMT certificate file");
+ boolean exitloop = false;
+
+ do
+ {
+ do
+ {
+ certFile = UI::AskForExistingFile(basepath, "*.crt", selectCertLabel);
+ } while (certFile == "");
+
+ if (certFile == nil)
+ {
+ string skipReg = _("Do you really want to cancel and thereby skip the Registration?");
+ if (Popup::YesNo(skipReg))
+ {
+ y2milestone("User selected to cancel manual certificate dialog and thereby skip registration");
+ return `conferror;
+ }
+ }
+
+ string cp2tmp = sformat("/bin/cp -a %1 %2 ", certFile , certTmpFile );
+ if (SCR::Execute(.target.bash, cp2tmp) == 0)
+ {
+ y2milestone("Found user specified SMT certificate file");
+ exitloop = true;
+ }
+ else
+ {
+ y2milestone("Could not copy local file as SMT certificate");
+ string fileErrorHeader = _("Could not copy certificate file");
+ string fileErrorMsg = _("Do you want to retry?");
+ if (!Popup::YesNoHeadline(fileErrorHeader, fileErrorMsg))
+ {
+ y2milestone("User selected to skip the setup of a SMT certificate");
+ return `conferror;
+ }
+ }
+
+ } while ( !exitloop );
+
+
+ }
+
+ if (certmode == `done)
+ {
+ y2milestone("User configured to do nothing to retrieve a SMT certificate file.");
+ y2milestone("I hope you know what you do. Registration will be run but may fail due to missing certificate.");
+ return `ok;
+ }
+
+ if (certmode == `none)
+ {
+ y2warning("The string that was passed to get the SMT certificate file does not match any handler.");
+ y2warning("The string was: %1", smt_server_cert);
+ y2warning("No certificate could be retrieved. Registration process will not be run!");
+ return `conferror;
+ }
+
+
+
+ // in autoYaST mode we automatically trust - we are done here
+ if ( trust || ay ) { return `ok; }
+
+ // ask user if he trusts the certificate
+ map cP = RegisterCert::parseCertificate(certTmpFile);
+ y2milestone("SMT certificate file information: %1", cP);
+
+ string trustQuestion = _("Do you want to trust this certificate?");
+ string trustMessage = _("This certificate will be used to connect to the SMT server.\nYou have to trust this certificate in order to continue with the Registration.");
+
+ string certInfo = "";
+ list issueList = (list) cP["ISSUER"]:[];
+ //translators: this is certificate context
+ certInfo = certInfo + _("<p><b>Issued For:</b></p>");
+ if (size (issueList) > 0)
+ {
+ certInfo = certInfo + "<pre>";
+ foreach (map keyval, (list