Hello community,
here is the log from the commit of package yast2-installation
checked in at Tue Apr 4 18:25:34 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-04-03 18:35:06.000000000 +0200
+++ yast2-installation/yast2-installation.changes 2006-04-04 18:19:17.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Apr 4 18:11:34 CEST 2006 - jdsn@suse.de
+
+- fixed w3m registration again (#162462)
+- changed Requires to Recommends for suseRegister (hmuelle, aj)
+- 2.13.58
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.57.tar.bz2
New:
----
yast2-installation-2.13.58.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.11Frze/_old 2006-04-04 18:25:30.000000000 +0200
+++ /var/tmp/diff_new_pack.11Frze/_new 2006-04-04 18:25:30.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.57)
+# spec file for package yast2-installation (Version 2.13.58)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,19 +11,19 @@
# norootforbuild
Name: yast2-installation
-Version: 2.13.57
+Version: 2.13.58
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.57.tar.bz2
+Source0: yast2-installation-2.13.58.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
Requires: yast2 yast2-update
Requires: yast2-storage yast2-mouse yast2-country yast2-bootloader
Requires: yast2-packager yast2-network yast2-users
Requires: curl release-notes
-Requires: suseRegister
+Recommends: suseRegister
Requires: autoyast2-installation yast2-online-update
Provides: yast
Obsoletes: yast
@@ -48,7 +48,7 @@
Arvin Schnell
%prep
-%setup -n yast2-installation-2.13.57
+%setup -n yast2-installation-2.13.58
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,10 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Tue Apr 04 2006 - jdsn@suse.de
+- fixed w3m registration again (#162462)
+- changed Requires to Recommends for suseRegister (hmuelle, aj)
+- 2.13.58
* Mon Apr 03 2006 - jdsn@suse.de
- fixed w3m in ncuses registration (#162462)
- changes in suse_register to test new server side business logic
++++++ yast2-installation-2.13.57.tar.bz2 -> yast2-installation-2.13.58.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.57/VERSION new/yast2-installation-2.13.58/VERSION
--- old/yast2-installation-2.13.57/VERSION 2006-04-03 16:57:13.000000000 +0200
+++ new/yast2-installation-2.13.58/VERSION 2006-04-04 15:33:44.000000000 +0200
@@ -1 +1 @@
-2.13.57
+2.13.58
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.57/configure new/yast2-installation-2.13.58/configure
--- old/yast2-installation-2.13.57/configure 2006-04-03 18:28:14.000000000 +0200
+++ new/yast2-installation-2.13.58/configure 2006-04-04 18:17:38.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.57.
+# Generated by GNU Autoconf 2.59 for yast2-installation 2.13.58.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='2.13.57'
-PACKAGE_STRING='yast2-installation 2.13.57'
+PACKAGE_VERSION='2.13.58'
+PACKAGE_STRING='yast2-installation 2.13.58'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -728,7 +728,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-installation 2.13.57 to adapt to many kinds of systems.
+\`configure' configures yast2-installation 2.13.58 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -795,7 +795,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 2.13.57:";;
+ short | recursive ) echo "Configuration of yast2-installation 2.13.58:";;
esac
cat <<\_ACEOF
@@ -908,7 +908,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 2.13.57
+yast2-installation configure 2.13.58
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -922,7 +922,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-installation $as_me 2.13.57, which was
+It was created by yast2-installation $as_me 2.13.58, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1652,7 +1652,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='2.13.57'
+ VERSION='2.13.58'
cat >>confdefs.h <<_ACEOF
@@ -1863,7 +1863,7 @@
-VERSION="2.13.57"
+VERSION="2.13.58"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain "
@@ -2906,7 +2906,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-installation $as_me 2.13.57, which was
+This file was extended by yast2-installation $as_me 2.13.58, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2961,7 +2961,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-installation config.status 2.13.57
+yast2-installation config.status 2.13.58
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.57/configure.in new/yast2-installation-2.13.58/configure.in
--- old/yast2-installation-2.13.57/configure.in 2006-04-03 18:28:10.000000000 +0200
+++ new/yast2-installation-2.13.58/configure.in 2006-04-04 18:17:23.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.57, http://www.suse.de/feedback, yast2-installation)
+AC_INIT(yast2-installation, 2.13.58, http://www.suse.de/feedback, yast2-installation)
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.13.57"
+VERSION="2.13.58"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.57/control/control.xml new/yast2-installation-2.13.58/control/control.xml
--- old/yast2-installation-2.13.57/control/control.xml 2006-03-28 23:06:33.000000000 +0200
+++ new/yast2-installation-2.13.58/control/control.xml 2006-04-04 15:24:53.000000000 +0200
@@ -19,12 +19,10 @@
true
simple
false
- </globals>
- <register>
true
true
false
- </register>
+ </globals>
<software>
true
auto
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.13.57/src/clients/inst_suse_register.ycp new/yast2-installation-2.13.58/src/clients/inst_suse_register.ycp
--- old/yast2-installation-2.13.57/src/clients/inst_suse_register.ycp 2006-04-03 16:57:12.000000000 +0200
+++ new/yast2-installation-2.13.58/src/clients/inst_suse_register.ycp 2006-04-04 15:33:29.000000000 +0200
@@ -41,6 +41,15 @@
}
}
+ // error handling - skip if suseRegister is missing
+ integer sr_exist = (integer) SCR::Execute(.target.bash, "test -x /usr/bin/suse_register");
+ if (sr_exist != 0)
+ {
+ y2milestone("/usr/bin/suse_register does not exist - skipping registration");
+ Internet::do_you = false;
+ return `auto;
+ }
+
// Register::initialize() is mandatory - never remove it
Register::initialize();
@@ -53,6 +62,7 @@
// Transltors: This is title/brand - only translate the Configuration
string title_nccc = _("Novell Customer Center Configuration");
+ // following text is translated en->en in po file to "Configure Online Update"
string title_update = _("Update Configuration");
// for SLES/SLED and SL (2 months after release) use title_nccc
string title = title_update;
@@ -318,48 +328,41 @@
}
-string su_exec2(string user, string group, string command)
+string su_exec(string user, string group, string command)
{
- // create a script to run a system call as different user
string exec = sformat("
#!/bin/bash -x
user=%1
group=%2
cmd=\"%3\"
-", user, group, command )
-+
-"
+
fakehome=/var/lib/YaST2/$user-fakehome
-XA=/root/.xauth
+umask 0077
-umask 077
+XA=/root/.xauth
mkdir -p $XA
grep ^$user$ $XA/export >/dev/null 2>&1 || echo $user >> $XA/export
mkdir -p $fakehome
-trap \"rm -rf $fakehome\" EXIT INT HUP TERM
chmod 700 $fakehome
-chown $user:$group $fakehome
-
-su -s /bin/bash -- $user -c \"cd; $cmd\"
-
-exit 0";
-
- y2milestone("using su_exec to launch browser");
-
- return exec;
-}
+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
+trap \"rm -rf $fakehome\" EXIT INT HUP TERM
+cat > $tmpjail < /tmp/.screenrc.jail <