Hello community,
here is the log from the commit of package yast2-registration
checked in at Fri Apr 25 15:09:29 CEST 2008.
--------
--- yast2-registration/yast2-registration.changes 2008-03-05 22:38:24.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-registration/yast2-registration.changes 2008-04-24 18:36:07.997281000 +0200
@@ -1,0 +2,20 @@
+Tue Apr 24 17:15:09 CEST 2008 - jdsn@suse.de
+
+- fixed SMT autoyast bug (bnc#377929)
+- integrated SMT renaming (bnc#376000)
+- removed dependencies to limal for SMT support (bnc#380060)
+- cleaned gui layout
+- initial release of postinstallation workflow (piwo) (fate#303359)
+- 2.16.2
+
+-------------------------------------------------------------------
+Tue Apr 1 21:09:48 CEST 2008 - jdsn@suse.de
+
+- proper pluralization in autoYaST (bnc#184893)
+
+-------------------------------------------------------------------
+Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz
+
+- added 'StartupNotify=true' to the desktop file (bnc #304964)
+
+-------------------------------------------------------------------
Old:
----
yast2-registration-2.16.1.tar.bz2
New:
----
yast2-registration-2.16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-registration.spec ++++++
--- /var/tmp/diff_new_pack.E31500/_old 2008-04-25 15:09:19.000000000 +0200
+++ /var/tmp/diff_new_pack.E31500/_new 2008-04-25 15:09:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-registration (Version 2.16.1)
+# spec file for package yast2-registration (Version 2.16.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,16 +12,15 @@
Name: yast2-registration
-Version: 2.16.1
+Version: 2.16.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-registration-2.16.1.tar.bz2
+Source0: yast2-registration-2.16.2.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
@@ -29,7 +28,6 @@
%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
@@ -46,7 +44,7 @@
J. Daniel Schmidt
%prep
-%setup -n yast2-registration-2.16.1
+%setup -n yast2-registration-2.16.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -91,11 +89,24 @@
%{prefix}/share/applications/YaST2/*.desktop
/usr/share/YaST2/schema/autoyast/rnc/registration.rnc
/usr/share/YaST2/yastbrowser
+%dir /usr/share/YaST2/control
+/usr/share/YaST2/control/*.xml
# agents
/usr/share/YaST2/scrconf/cfg_suse_register.scr
#fillup
/var/adm/fillup-templates/sysconfig.suse_register-yast2-registration
%changelog
+* Thu Apr 24 2008 jdsn@suse.de
+- fixed SMT autoyast bug (bnc#377929)
+- integrated SMT renaming (bnc#376000)
+- removed dependencies to limal for SMT support (bnc#380060)
+- cleaned gui layout
+- initial release of postinstallation workflow (piwo) (fate#303359)
+- 2.16.2
+* Tue Apr 01 2008 jdsn@suse.de
+- proper pluralization in autoYaST (bnc#184893)
+* Mon Mar 17 2008 jsrain@suse.cz
+- added 'StartupNotify=true' to the desktop file (bnc #304964)
* Wed Mar 05 2008 jdsn@suse.de
- added support for SMT (registration proxy)
- 2.16.1
++++++ yast2-registration-2.16.1.tar.bz2 -> yast2-registration-2.16.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/configure new/yast2-registration-2.16.2/configure
--- old/yast2-registration-2.16.1/configure 2008-03-05 22:38:13.000000000 +0100
+++ new/yast2-registration-2.16.2/configure 2008-04-24 18:34:11.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.16.1.
+# Generated by GNU Autoconf 2.61 for yast2-registration 2.16.2.
#
# 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.1'
-PACKAGE_STRING='yast2-registration 2.16.1'
+PACKAGE_VERSION='2.16.2'
+PACKAGE_STRING='yast2-registration 2.16.2'
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.1 to adapt to many kinds of systems.
+\`configure' configures yast2-registration 2.16.2 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.1:";;
+ short | recursive ) echo "Configuration of yast2-registration 2.16.2:";;
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.1
+yast2-registration configure 2.16.2
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.1, which was
+It was created by yast2-registration $as_me 2.16.2, 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.1'
+ VERSION='2.16.2'
cat >>confdefs.h <<_ACEOF
@@ -2408,7 +2408,7 @@
-VERSION="2.16.1"
+VERSION="2.16.2"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
@@ -2861,7 +2861,7 @@
-ac_config_files="$ac_config_files Makefile agents/Makefile doc/Makefile src/modules/Makefile src/clients/Makefile src/config/Makefile src/yastbrowser/chrome/Makefile src/yastbrowser/components/Makefile src/yastbrowser/defaults/preferences/Makefile src/yastbrowser/defaults/Makefile src/yastbrowser/Makefile src/Makefile"
+ac_config_files="$ac_config_files Makefile agents/Makefile doc/Makefile src/modules/Makefile src/clients/Makefile src/config/Makefile src/control/Makefile src/yastbrowser/chrome/Makefile src/yastbrowser/components/Makefile src/yastbrowser/defaults/preferences/Makefile src/yastbrowser/defaults/Makefile src/yastbrowser/Makefile src/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -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.1, which was
+This file was extended by yast2-registration $as_me 2.16.2, 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.1
+yast2-registration config.status 2.16.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -3452,6 +3452,7 @@
"src/modules/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;;
"src/clients/Makefile") CONFIG_FILES="$CONFIG_FILES src/clients/Makefile" ;;
"src/config/Makefile") CONFIG_FILES="$CONFIG_FILES src/config/Makefile" ;;
+ "src/control/Makefile") CONFIG_FILES="$CONFIG_FILES src/control/Makefile" ;;
"src/yastbrowser/chrome/Makefile") CONFIG_FILES="$CONFIG_FILES src/yastbrowser/chrome/Makefile" ;;
"src/yastbrowser/components/Makefile") CONFIG_FILES="$CONFIG_FILES src/yastbrowser/components/Makefile" ;;
"src/yastbrowser/defaults/preferences/Makefile") CONFIG_FILES="$CONFIG_FILES src/yastbrowser/defaults/preferences/Makefile" ;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/configure.in new/yast2-registration-2.16.2/configure.in
--- old/yast2-registration-2.16.1/configure.in 2008-03-05 22:38:09.000000000 +0100
+++ new/yast2-registration-2.16.2/configure.in 2008-04-24 18:34:07.000000000 +0200
@@ -3,7 +3,7 @@
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.1, http://bugs.opensuse.org/, yast2-registration)
+AC_INIT(yast2-registration, 2.16.2, 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.1"
+VERSION="2.16.2"
RPMNAME="yast2-registration"
MAINTAINER="J. Daniel Schmidt "
@@ -154,6 +154,7 @@
src/modules/Makefile
src/clients/Makefile
src/config/Makefile
+src/control/Makefile
src/yastbrowser/chrome/Makefile
src/yastbrowser/components/Makefile
src/yastbrowser/defaults/preferences/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/src/clients/inst_suse_register.ycp new/yast2-registration-2.16.2/src/clients/inst_suse_register.ycp
--- old/yast2-registration-2.16.1/src/clients/inst_suse_register.ycp 2008-03-05 20:46:16.000000000 +0100
+++ new/yast2-registration-2.16.2/src/clients/inst_suse_register.ycp 2008-04-24 17:09:34.000000000 +0200
@@ -211,30 +211,39 @@
/* vv MAIN (WIZARD) LAYOUT vv */
term sr_layout=nil;
- sr_layout=`HVCenter( `VBox(
- `Left (
- `RadioButtonGroup( `id(`sr_perform), `VBox(
- `Left ( `Label( nccc_top ) ),
- `VSpacing(1),
- `Left ( `RadioButton(`id(`noconfigure), `opt(`notify), nccc_noconfigure )),
- `Left ( `RadioButton(`id(`configure), `opt(`notify), nccc_configure, true )),
- `Left ( `id(`includeinfo), `HBox( `HSpacing( 3.0 ),
- `VBox (
- `VSpacing(0.5),
- `Left( `Label( nccc_sub_comment ) ),
- `Left( `CheckBox(`id(`hwinfo), `opt(`notify), nccc_sub_hwinfo, Register::submit_hwdata ) ),
- `Left( `CheckBox(`id(`optional), `opt(`notify), nccc_sub_optional, Register::submit_optional ) ),
- Register::display_forcereg ? `Left( `CheckBox(`id(`forcereg), `opt(`notify), nccc_forcereg, false ) ):`Empty() ,
- `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)
- )))
+
+ sr_layout = `HVSquash(
+ `VBox(
+ `Label( nccc_top ),
+ `VSpacing(0.5),
+ `Frame( title,
+ `RadioButtonGroup( `id(`sr_perform),
+ `MarginBox( 2, 0.5,
+ `VBox(
+ `Left ( `RadioButton(`id(`noconfigure), `opt(`notify), nccc_noconfigure )),
+ `Left ( `RadioButton(`id(`configure), `opt(`notify), nccc_configure, true )),
+ `Left ( `id(`includeinfo),
+ `HBox( `HSpacing( 3.0 ),
+ `VBox (
+ `VSpacing(0.5),
+ `Left( `Label( nccc_sub_comment ) ),
+ `Left( `CheckBox(`id(`hwinfo), `opt(`notify), nccc_sub_hwinfo, Register::submit_hwdata ) ),
+ `Left( `CheckBox(`id(`optional), `opt(`notify), nccc_sub_optional, Register::submit_optional ) ),
+ Register::display_forcereg ? `Left( `CheckBox(`id(`forcereg), `opt(`notify), nccc_forcereg, false ) ):`Empty(),
+ `VSpacing(0.5),
+ // 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 ) ),
+ `Right( `PushButton(`id(`showinfo), nccc_sub_showbtn ) )
+ )
+ )
+ )
+ ))
+ ))
));
+
+
term contents = `VBox ( `VSpacing (0.5), sr_layout, `VSpacing (0.5));
/* ^^ END MAIN LAYOUT ^^ */
@@ -408,50 +417,16 @@
mkdir -p $fakehome
chmod 700 $fakehome
tmp=$(mktemp $fakehome/.Xauthority.XXXXXX) || exit 1
-tmpjail=$(mktemp $fakehome/.screenrc.jail.XXXXXX) || exit 1
-chmod 600 $tmp $tmpjail
-chown $user:$group $tmp $tmpjail $fakehome
+chmod 600 $tmp
+chown $user:$group $tmp $fakehome
trap \"rm -rf $fakehome\" EXIT INT HUP TERM
-cat > $tmpjail <
+ *
+ * $Id: piwo.ycp 41800 2008-04-24 17:00:00Z jdsn $
+ *
+ */
+
+{
+
+import "Mode";
+import "Wizard";
+import "ProductControl";
+textdomain "piwo";
+
+string piwoControlFile = "/usr/share/YaST2/control/piwo.xml";
+
+
+Wizard::CreateDialog();
+
+
+ProductControl::custom_control_file = piwoControlFile;
+
+if (!ProductControl::Init())
+{
+ y2error("control file %1 not found", ProductControl::custom_control_file );
+}
+
+
+symbol ret = ProductControl::Run();
+
+return ret;
+
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/src/clients/suse_register_auto.ycp new/yast2-registration-2.16.2/src/clients/suse_register_auto.ycp
--- old/yast2-registration-2.16.1/src/clients/suse_register_auto.ycp 2008-03-05 20:47:50.000000000 +0100
+++ new/yast2-registration-2.16.2/src/clients/suse_register_auto.ycp 2008-04-01 21:09:23.000000000 +0200
@@ -67,7 +67,8 @@
integer items_count = size (Register::registration_data);
// Translators: Sentence-like text for singular and plural (incl. zero) of items
- string items_msg = items_count == 1 ? _("1 item of registration data"):sformat(_("%1 items of registration data"), items_count);
+ string items_msg = _("%1 item of registration data", "%1 items of registration data", items_count);
+ items_msg = sformat(items_msg, items_count); // (bnc#184893)
if ( Register::do_registration )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/src/config/customer_center.desktop new/yast2-registration-2.16.2/src/config/customer_center.desktop
--- old/yast2-registration-2.16.1/src/config/customer_center.desktop 2007-07-17 17:17:45.000000000 +0200
+++ new/yast2-registration-2.16.2/src/config/customer_center.desktop 2008-04-01 21:06:14.000000000 +0200
@@ -16,3 +16,4 @@
Name=Novell Customer Center Configuration
GenericName=Novell Customer Center Configuration
+StartupNotify=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/src/config/registration.rnc new/yast2-registration-2.16.2/src/config/registration.rnc
--- old/yast2-registration-2.16.1/src/config/registration.rnc 2008-03-05 20:49:45.000000000 +0100
+++ new/yast2-registration-2.16.2/src/config/registration.rnc 2008-04-11 17:34:10.000000000 +0200
@@ -2,13 +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? & register_regularly? & smt_server? & smt_server_cert? }
+suse_register = element suse_register { do_registration? & submit_hwdata? & submit_optional? & registration_data? & register_regularly? & reg_server? & reg_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 }
+reg_server = element reg_server { text }
+reg_server_cert = element reg_server_cert { text }
registration_data =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/src/config/suse_register.desktop new/yast2-registration-2.16.2/src/config/suse_register.desktop
--- old/yast2-registration-2.16.1/src/config/suse_register.desktop 2007-07-17 17:17:45.000000000 +0200
+++ new/yast2-registration-2.16.2/src/config/suse_register.desktop 2008-04-01 21:06:14.000000000 +0200
@@ -15,3 +15,4 @@
Name=Online Update Configuration
GenericName=Online Update Configuration
+StartupNotify=true
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/src/control/Makefile.am new/yast2-registration-2.16.2/src/control/Makefile.am
--- old/yast2-registration-2.16.1/src/control/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.16.2/src/control/Makefile.am 2008-04-24 17:25:31.000000000 +0200
@@ -0,0 +1,6 @@
+controldir = $(yast2dir)/control
+
+control_DATA = \
+ piwo.xml
+
+EXTRA_DIST = $(control_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/src/control/Makefile.in new/yast2-registration-2.16.2/src/control/Makefile.in
--- old/yast2-registration-2.16.1/src/control/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.16.2/src/control/Makefile.in 2008-04-24 18:34:12.000000000 +0200
@@ -0,0 +1,358 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = src/control
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(controldir)"
+controlDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(control_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINTAINER = @MAINTAINER@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RPMNAME = @RPMNAME@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+STYLESHEET_CSS = @STYLESHEET_CSS@
+STYLESHEET_HTML = @STYLESHEET_HTML@
+STYLESHEET_PDF = @STYLESHEET_PDF@
+STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@
+STYLESHEET_YDOC = @STYLESHEET_YDOC@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
+YCPC = @YCPC@
+YCPDOC = @YCPDOC@
+YCPMAKEDEP = @YCPMAKEDEP@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+agentdir = @agentdir@
+am__leading_dot = @am__leading_dot@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+clientdir = @clientdir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+desktopdir = @desktopdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+execcompdir = @execcompdir@
+fillupdir = @fillupdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+imagedir = @imagedir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdatadir = @pkgconfigdatadir@
+pkgconfigdir = @pkgconfigdir@
+plugindir = @plugindir@
+potdir = @potdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+schemadir = @schemadir@
+scrconfdir = @scrconfdir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+themedir = @themedir@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+yast2dir = @yast2dir@
+ybindir = @ybindir@
+ydatadir = @ydatadir@
+yncludedir = @yncludedir@
+ystartupdir = @ystartupdir@
+controldir = $(yast2dir)/control
+control_DATA = \
+ piwo.xml
+
+EXTRA_DIST = $(control_DATA)
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/control/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/control/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+install-controlDATA: $(control_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(controldir)" || $(MKDIR_P) "$(DESTDIR)$(controldir)"
+ @list='$(control_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(controlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(controldir)/$$f'"; \
+ $(controlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(controldir)/$$f"; \
+ done
+
+uninstall-controlDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(control_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(controldir)/$$f'"; \
+ rm -f "$(DESTDIR)$(controldir)/$$f"; \
+ done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(controldir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-controlDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-controlDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+ distclean-generic distdir dvi dvi-am html html-am info info-am \
+ install install-am install-controlDATA install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-controlDATA
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/src/control/piwo.xml new/yast2-registration-2.16.2/src/control/piwo.xml
--- old/yast2-registration-2.16.1/src/control/piwo.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-registration-2.16.2/src/control/piwo.xml 2008-04-24 17:25:16.000000000 +0200
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!DOCTYPE productDefines SYSTEM "/usr/share/YaST2/control/control.dtd">
+http://www.suse.com/1.0/yast2ns"
+ xmlns:config="http://www.suse.com/1.0/configns">
+
+ <!--
+ Work around for the text domain
+ textdomain="piwo"
+ -->
+
+ <textdomain>piwo</textdomain>
+
+ <workflows config:type="list">
+ <workflow>
+ <defaults>
+ yes
+ yes
+ <archs>all</archs>
+ </defaults>
+ <stage>normal</stage>
+ <label>Finish Installation</label>
+ <mode>normal</mode>
+ <modules config:type="list">
+ <module>
+ <label>Registration</label>
+ <name>inst_suse_register</name>
+ no
+ </module>
+ <module>
+ <label>Software Repositories</label>
+ <name>inst_productsources</name>
+ yes
+ yes
+ </module>
+ <module>
+ <label>Online Update</label>
+ <name>online_update</name>
+ yes
+ yes
+ </module>
+ </modules>
+ </workflow>
+ </workflows>
+</productDefines>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/src/Makefile.am new/yast2-registration-2.16.2/src/Makefile.am
--- old/yast2-registration-2.16.1/src/Makefile.am 2007-05-21 16:01:22.000000000 +0200
+++ new/yast2-registration-2.16.2/src/Makefile.am 2008-04-24 17:17:24.000000000 +0200
@@ -2,4 +2,4 @@
# Makefile.am for installation/src
#
-SUBDIRS = modules clients config yastbrowser
+SUBDIRS = modules clients config control yastbrowser
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/src/Makefile.in new/yast2-registration-2.16.2/src/Makefile.in
--- old/yast2-registration-2.16.1/src/Makefile.in 2008-03-05 22:38:14.000000000 +0100
+++ new/yast2-registration-2.16.2/src/Makefile.in 2008-04-24 18:34:12.000000000 +0200
@@ -174,7 +174,7 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
-SUBDIRS = modules clients config yastbrowser
+SUBDIRS = modules clients config control yastbrowser
all: all-recursive
.SUFFIXES:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.1/src/modules/Register.ycp new/yast2-registration-2.16.2/src/modules/Register.ycp
--- old/yast2-registration-2.16.1/src/modules/Register.ycp 2008-03-05 20:48:52.000000000 +0100
+++ new/yast2-registration-2.16.2/src/modules/Register.ycp 2008-04-24 17:39:16.000000000 +0200
@@ -23,7 +23,6 @@
import "Linuxrc";
import "ProductFeatures";
import "SourceManager";
-import "RegisterCert";
// --------------------------------------------------------------
@@ -243,6 +242,9 @@
ay = true;
}
+ string smtpemPath = "/etc/ssl/certs";
+ string smtpemFile = smtpemPath + "/registration-server.pem";
+
// 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" )
@@ -290,6 +292,15 @@
string certTmpFile = sformat("%1/__tmpSMTcert.crt", SCR::Read(.target.tmpdir));
+ // check for existing certificate (bnc#376000)
+ integer certExists = nil;
+ certExists = (integer) SCR::Execute(.target.bash, sformat("[ -f %1 ]", smtpemFile));
+ if (certmode != `url && certExists == 0)
+ {
+ // do nothing to refetch the certificate if manual interaction is necessary
+ y2milestone("Existing SMT certificate found and keeping it. To renew the SMT certificate please assign a URL as value to the key 'regcert' in /var/lib/YaST2/install.inf");
+ return `ok;
+ }
if ( certmode == `url )
{
@@ -310,8 +321,15 @@
// 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)
+ if ( SCR::Execute(.target.bash, curlcmd) != 0)
{
+ if (certExists == 0)
+ {
+ // do nothing to refetch the certificate if manual interaction is necessary
+ y2milestone("Could not download the current SMT certificate but existing certificate found and keeping it. To renew the SMT certificate please make sure it is available on the registration server.");
+ return `ok;
+ }
+
y2error("Could not download the SMT certificate file from specified URL %1", smt_server_cert);
if (ay) return `conferror;
@@ -359,7 +377,7 @@
{
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)
+ if ( SCR::Execute(.target.bash, cp2tmp) != 0)
{
y2error("Could not copy the specified SMT certificate file from floppy disk.");
if (ay) return `silentskip;
@@ -484,68 +502,45 @@
- // in autoYaST mode we automatically trust - we are done here
- if ( trust || ay ) { return `ok; }
+ // in autoYaST mode we automatically trust
+ if ( !ay ) // (bnc#377929)
+ {
+ // ask user if he trusts the certificate
- // 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