Hello community,
here is the log from the commit of package yast2-sshd
checked in at Wed Apr 16 16:23:19 CEST 2008.
--------
--- yast2-sshd/yast2-sshd.changes 2008-04-02 16:23:54.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-sshd/yast2-sshd.changes 2008-04-16 15:42:47.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 16 11:04:43 CEST 2008 - locilka@suse.cz
+
+- Added support for AutoYaST (bnc #375850).
+- 2.16.2
+
+-------------------------------------------------------------------
Old:
----
yast2-sshd-2.16.1.tar.bz2
New:
----
yast2-sshd-2.16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-sshd.spec ++++++
--- /var/tmp/diff_new_pack.L18872/_old 2008-04-16 16:20:45.000000000 +0200
+++ /var/tmp/diff_new_pack.L18872/_new 2008-04-16 16:20:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-sshd (Version 2.16.1)
+# spec file for package yast2-sshd (Version 2.16.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-sshd
-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-sshd-2.16.1.tar.bz2
+Source0: yast2-sshd-2.16.2.tar.bz2
Prefix: /usr
Requires: yast2 >= 2.16.41
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
@@ -35,7 +35,7 @@
Katarina Machalkova
%prep
-%setup -n yast2-sshd-2.16.1
+%setup -n yast2-sshd-2.16.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,8 +67,12 @@
/usr/share/YaST2/modules/*.ybc
/usr/share/YaST2/modules/*.ycp
%{prefix}/share/applications/YaST2/sshd.desktop
+/usr/share/YaST2/schema/autoyast/rnc/sshd_config.rnc
%doc %{prefix}/share/doc/packages/yast2-sshd
%changelog
+* Wed Apr 16 2008 locilka@suse.cz
+- Added support for AutoYaST (bnc #375850).
+- 2.16.2
* Wed Apr 02 2008 locilka@suse.cz
- SCR Agent has been moved to yast2-2.16.41.
- Adapted to new agent paths.
++++++ yast2-sshd-2.16.1.tar.bz2 -> yast2-sshd-2.16.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/aclocal.m4 new/yast2-sshd-2.16.2/aclocal.m4
--- old/yast2-sshd-2.16.1/aclocal.m4 2007-11-16 20:48:59.000000000 +0100
+++ new/yast2-sshd-2.16.2/aclocal.m4 2008-04-16 12:56:16.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file 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.
@@ -11,12 +11,15 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf. If you want to use that,
-you should regenerate the build system entirely.], [63])])
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -31,7 +34,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10], [],
+m4_if([$1], [1.10.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -47,8 +50,10 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -141,13 +146,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
+# 2005, 2006, 2008 Free Software Foundation, Inc.
#
# This file 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.
-# serial 12
+# serial 13
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -252,16 +257,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
+_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $1 | $1:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -498,7 +504,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/agents/Makefile.in new/yast2-sshd-2.16.2/agents/Makefile.in
--- old/yast2-sshd-2.16.1/agents/Makefile.in 2008-04-02 16:26:36.000000000 +0200
+++ new/yast2-sshd-2.16.2/agents/Makefile.in 2008-04-16 12:56:18.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 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.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/config.guess new/yast2-sshd-2.16.2/config.guess
--- old/yast2-sshd-2.16.1/config.guess 2007-11-16 20:49:02.000000000 +0100
+++ new/yast2-sshd-2.16.2/config.guess 2008-04-16 12:56:18.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2006-07-02'
+timestamp='2008-01-08'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -171,6 +171,7 @@
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -339,7 +340,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -541,7 +542,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -790,7 +791,7 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -800,12 +801,18 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -839,10 +846,17 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
@@ -960,6 +974,9 @@
x86_64:Linux:*:*)
echo x86_64-${VENDOR}-linux-gnu
exit ;;
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1218,6 +1235,15 @@
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/config.sub new/yast2-sshd-2.16.2/config.sub
--- old/yast2-sshd-2.16.1/config.sub 2007-11-16 20:49:02.000000000 +0100
+++ new/yast2-sshd-2.16.2/config.sub 2008-04-16 12:56:18.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2006-09-20'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -245,12 +245,12 @@
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -324,7 +324,7 @@
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -369,10 +369,14 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -475,8 +487,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -668,6 +680,14 @@
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -683,6 +703,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
@@ -809,6 +833,14 @@
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -925,6 +957,9 @@
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1014,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -1219,7 +1258,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1414,6 +1453,9 @@
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/configure new/yast2-sshd-2.16.2/configure
--- old/yast2-sshd-2.16.1/configure 2007-11-16 20:49:01.000000000 +0100
+++ new/yast2-sshd-2.16.2/configure 2008-04-16 12:56:17.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-sshd 2.16.0.
+# Generated by GNU Autoconf 2.61 for yast2-sshd 2.16.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-sshd'
PACKAGE_TARNAME='yast2-sshd'
-PACKAGE_VERSION='2.16.0'
-PACKAGE_STRING='yast2-sshd 2.16.0'
+PACKAGE_VERSION='2.16.2'
+PACKAGE_STRING='yast2-sshd 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-sshd 2.16.0 to adapt to many kinds of systems.
+\`configure' configures yast2-sshd 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-sshd 2.16.0:";;
+ short | recursive ) echo "Configuration of yast2-sshd 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-sshd configure 2.16.0
+yast2-sshd 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-sshd $as_me 2.16.0, which was
+It was created by yast2-sshd $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-sshd'
- VERSION='2.16.0'
+ VERSION='2.16.2'
cat >>confdefs.h <<_ACEOF
@@ -2409,7 +2409,7 @@
-VERSION="2.16.0"
+VERSION="2.16.2"
RPMNAME="yast2-sshd"
MAINTAINER="Lukas Ocilka "
@@ -2651,8 +2651,8 @@
if test -z "$XGETTEXT" ; then
- { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-devel." >&5
-echo "$as_me: error: xgettext is missing; please install gettext-devel." >&2;}
+ { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-tools." >&5
+echo "$as_me: error: xgettext is missing; please install gettext-tools." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -3304,7 +3304,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-sshd $as_me 2.16.0, which was
+This file was extended by yast2-sshd $as_me 2.16.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3347,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-sshd config.status 2.16.0
+yast2-sshd config.status 2.16.2
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-sshd-2.16.1/configure.in new/yast2-sshd-2.16.2/configure.in
--- old/yast2-sshd-2.16.1/configure.in 2007-11-16 20:48:55.000000000 +0100
+++ new/yast2-sshd-2.16.2/configure.in 2008-04-16 12:56:12.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-sshd
dnl
-dnl -- This file is generated by y2autoconf 2.16.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-sshd, 2.16.0, http://bugs.opensuse.org/, yast2-sshd)
+AC_INIT(yast2-sshd, 2.16.2, http://bugs.opensuse.org/, yast2-sshd)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.0"
+VERSION="2.16.2"
RPMNAME="yast2-sshd"
MAINTAINER="Lukas Ocilka "
@@ -108,7 +108,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/doc/autodocs/Makefile.in new/yast2-sshd-2.16.2/doc/autodocs/Makefile.in
--- old/yast2-sshd-2.16.1/doc/autodocs/Makefile.in 2007-11-16 20:49:02.000000000 +0100
+++ new/yast2-sshd-2.16.2/doc/autodocs/Makefile.in 2008-04-16 12:56:18.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 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.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/doc/Makefile.in new/yast2-sshd-2.16.2/doc/Makefile.in
--- old/yast2-sshd-2.16.1/doc/Makefile.in 2007-11-16 20:49:02.000000000 +0100
+++ new/yast2-sshd-2.16.2/doc/Makefile.in 2008-04-16 12:56:18.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 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.
@@ -329,8 +329,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -355,8 +355,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -366,13 +366,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/install-sh new/yast2-sshd-2.16.2/install-sh
--- old/yast2-sshd-2.16.1/install-sh 2007-11-16 20:49:02.000000000 +0100
+++ new/yast2-sshd-2.16.2/install-sh 2008-04-16 12:56:18.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-10-14.15
+scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -48,7 +48,7 @@
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
@@ -58,34 +58,49 @@
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
-posix_glob=
posix_mkdir=
# Desired mode of installed file.
mode=0755
+chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
-chgrpcmd=
-stripcmd=
+mvcmd=$mvprog
rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
src=
dst=
dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
no_target_directory=
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -95,65 +110,55 @@
In the 4th, create DIRECTORIES.
Options:
--c (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
+ --help display this help and exit.
+ --version display version info and exit.
+
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
- -c) shift
- continue;;
+ -c) ;;
+
+ -C) copy_on_change=true;;
- -d) dir_arg=true
- shift
- continue;;
+ -d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- shift
- shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
- continue;;
+ shift;;
-o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd=$stripprog
- shift
- continue;;
-
- -t) dstarg=$2
- shift
- shift
- continue;;
-
- -T) no_target_directory=true
- shift
- continue;;
+ shift;;
+
+ -s) stripcmd=$stripprog;;
+
+ -t) dst_arg=$2
+ shift;;
+
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
@@ -165,21 +170,22 @@
*) break;;
esac
+ shift
done
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
# Otherwise, the last argument is the destination. Remove it from $@.
for arg
do
- if test -n "$dstarg"; then
+ if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
+ set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
- dstarg=$arg
+ dst_arg=$arg
done
fi
@@ -224,7 +230,7 @@
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src ;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -242,22 +248,22 @@
exit 1
fi
- if test -z "$dstarg"; then
+ if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dstarg
+ dst=$dst_arg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst ;;
+ -*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
+ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
@@ -378,26 +384,19 @@
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix=/ ;;
- -*) prefix=./ ;;
- *) prefix= ;;
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
esac
- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
- posix_glob=true
- else
- posix_glob=false
- fi ;;
- esac
+ eval "$initialize_posix_glob"
oIFS=$IFS
IFS=/
- $posix_glob && set -f
+ $posix_glob set -f
set fnord $dstdir
shift
- $posix_glob && set +f
+ $posix_glob set +f
IFS=$oIFS
prefixes=
@@ -459,41 +458,54 @@
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
-
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- if test -f "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
- || {
- echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
- }
- } || exit 1
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
+
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
trap '' 0
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/Makefile.in new/yast2-sshd-2.16.2/Makefile.in
--- old/yast2-sshd-2.16.1/Makefile.in 2007-11-16 20:49:02.000000000 +0100
+++ new/yast2-sshd-2.16.2/Makefile.in 2008-04-16 12:56:18.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 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.
@@ -389,8 +389,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -415,8 +415,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -426,13 +426,12 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -505,6 +504,10 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -531,6 +534,8 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -687,10 +692,10 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
- distclean-generic distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
+ dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+ distclean distclean-generic distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
install-data-local 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 \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/src/dialogs.ycp new/yast2-sshd-2.16.2/src/dialogs.ycp
--- old/yast2-sshd-2.16.1/src/dialogs.ycp 2007-11-16 20:26:44.000000000 +0100
+++ new/yast2-sshd-2.16.2/src/dialogs.ycp 2008-04-16 11:10:35.000000000 +0200
@@ -37,14 +37,14 @@
/* A table header */
`Table(`id("Port"), `header("Port"), [])
),
- `HBox (
+ `Left (`HBox (
/* a push button */
`PushButton(`id("add_port"), _("&Add...")),
/* a push button */
`PushButton(`id("edit_port"), _("&Edit...")),
/* a push button */
`PushButton(`id("delete_port"), _("&Delete"))
- ),
+ )),
`VSpacing(1),
`MarginBox (mbox_x, mbox_y, `Frame (
/* a dialog frame caption */
@@ -80,7 +80,7 @@
_("Authentication Settings"),
`VBox (
/* A text entry */
- `Left(`TextEntry(`id("MaxAuthTries"), _("Ma&ximum Authentication Tries"))),
+ `Left(`InputField(`id("MaxAuthTries"), _("Ma&ximum Authentication Tries"))),
/* A check box */
`Left(`CheckBox (`id("PasswordAuthentication"), _("Pa&ssword Authentication"))),
/* A check box */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/src/Makefile.am new/yast2-sshd-2.16.2/src/Makefile.am
--- old/yast2-sshd-2.16.1/src/Makefile.am 2007-07-30 14:01:45.000000000 +0200
+++ new/yast2-sshd-2.16.2/src/Makefile.am 2008-04-16 10:48:37.000000000 +0200
@@ -19,11 +19,14 @@
Sshd.ycp \
SshdCommandLine.ycp
+rncdir = $(schemadir)/autoyast/rnc
+rnc_DATA = sshd_config.rnc
+
# create a symlink for local build, #145327
sshd:
ln -sf . $@
ycpchook = sshd
-EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA)
+EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA)
include $(top_srcdir)/Makefile.am.common
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/src/Makefile.in new/yast2-sshd-2.16.2/src/Makefile.in
--- old/yast2-sshd-2.16.1/src/Makefile.in 2007-11-16 20:49:02.000000000 +0100
+++ new/yast2-sshd-2.16.2/src/Makefile.in 2008-04-16 12:56:18.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 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.
@@ -57,14 +57,15 @@
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" \
"$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" \
- "$(DESTDIR)$(yncludedir)"
+ "$(DESTDIR)$(rncdir)" "$(DESTDIR)$(yncludedir)"
clientDATA_INSTALL = $(INSTALL_DATA)
desktopDATA_INSTALL = $(INSTALL_DATA)
moduleDATA_INSTALL = $(INSTALL_DATA)
modulebinDATA_INSTALL = $(INSTALL_DATA)
+rncDATA_INSTALL = $(INSTALL_DATA)
yncludeDATA_INSTALL = $(INSTALL_DATA)
DATA = $(client_DATA) $(desktop_DATA) $(module_DATA) $(modulebin_DATA) \
- $(ynclude_DATA)
+ $(rnc_DATA) $(ynclude_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -198,8 +199,10 @@
Sshd.ycp \
SshdCommandLine.ycp
+rncdir = $(schemadir)/autoyast/rnc
+rnc_DATA = sshd_config.rnc
ycpchook = sshd
-EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA)
+EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA)
modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA))
modulebindir = $(moduledir)
ybcfiles = $(filter %.ybc,$(modulebin_DATA))
@@ -313,6 +316,23 @@
echo " rm -f '$(DESTDIR)$(modulebindir)/$$f'"; \
rm -f "$(DESTDIR)$(modulebindir)/$$f"; \
done
+install-rncDATA: $(rnc_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(rncdir)" || $(MKDIR_P) "$(DESTDIR)$(rncdir)"
+ @list='$(rnc_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(rncDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rncdir)/$$f'"; \
+ $(rncDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rncdir)/$$f"; \
+ done
+
+uninstall-rncDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(rnc_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(rncdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(rncdir)/$$f"; \
+ done
install-yncludeDATA: $(ynclude_DATA)
@$(NORMAL_INSTALL)
test -z "$(yncludedir)" || $(MKDIR_P) "$(DESTDIR)$(yncludedir)"
@@ -370,7 +390,7 @@
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(yncludedir)"; do \
+ for dir in "$(DESTDIR)$(clientdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(moduledir)" "$(DESTDIR)$(modulebindir)" "$(DESTDIR)$(rncdir)" "$(DESTDIR)$(yncludedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -418,7 +438,8 @@
info-am:
install-data-am: install-clientDATA install-desktopDATA \
- install-moduleDATA install-modulebinDATA install-yncludeDATA
+ install-moduleDATA install-modulebinDATA install-rncDATA \
+ install-yncludeDATA
install-dvi: install-dvi-am
@@ -453,7 +474,7 @@
ps-am:
uninstall-am: uninstall-clientDATA uninstall-desktopDATA \
- uninstall-moduleDATA uninstall-modulebinDATA \
+ uninstall-moduleDATA uninstall-modulebinDATA uninstall-rncDATA \
uninstall-yncludeDATA
.MAKE: install-am install-strip
@@ -465,12 +486,12 @@
install-dvi-am install-exec install-exec-am install-html \
install-html-am install-info install-info-am install-man \
install-moduleDATA install-modulebinDATA install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- install-yncludeDATA installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-clientDATA uninstall-desktopDATA \
- uninstall-moduleDATA uninstall-modulebinDATA \
+ install-pdf-am install-ps install-ps-am install-rncDATA \
+ install-strip install-yncludeDATA installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
+ uninstall-am uninstall-clientDATA uninstall-desktopDATA \
+ uninstall-moduleDATA uninstall-modulebinDATA uninstall-rncDATA \
uninstall-yncludeDATA
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/src/sshd_auto.ycp new/yast2-sshd-2.16.2/src/sshd_auto.ycp
--- old/yast2-sshd-2.16.1/src/sshd_auto.ycp 2007-07-30 14:05:29.000000000 +0200
+++ new/yast2-sshd-2.16.2/src/sshd_auto.ycp 2008-04-15 11:10:20.000000000 +0200
@@ -15,6 +15,8 @@
textdomain "sshd";
+import "Progress";
+
/* The main () */
y2milestone ("----------------------------------------");
y2milestone ("sshd_auto module started");
@@ -42,10 +44,15 @@
break;
// reset the current configuration to the default one
- case "Reset" : break;
+ case "Reset" :
+ boolean orig = Progress::set (false);
+ ret = Sshd::Read();
+ Progress::set (orig);
+ break;
// define map of lists of packages
- case "Packages" : break;
+ // case "Packages" :
+ // break;
// call the AutoYaST sequence here
case "Change" :
@@ -55,22 +62,38 @@
break;
// import the configuration here
- case "Import" : break;
+ case "Import" :
+ ret = Sshd::Import ((map) param);
+ break;
// read the current configuration from system
- case "Read" : break;
+ case "Read" :
+ boolean orig1 = Progress::set (false);
+ ret = Sshd::Read();
+ Progress::set (orig1);
+ break;
// export the current configuration from memory
- case "Export" : break;
+ case "Export" :
+ ret = Sshd::Export();
+ break;
// return the modified flag
- case "GetModified" : break;
+ case "GetModified" :
+ ret = Sshd::GetModified();
+ break;
// set the modified flag
- case "SetModified" : break;
+ case "SetModified" :
+ Sshd::SetModified();
+ break;
// write the confuguration to the system
- case "Write" : break;
+ case "Write" :
+ boolean orig2 = Progress::set (false);
+ ret = Sshd::Write();
+ Progress::set (orig2);
+ break;
y2error("Unknown function: %1, Params %2", func, param);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/src/sshd_config.rnc new/yast2-sshd-2.16.2/src/sshd_config.rnc
--- old/yast2-sshd-2.16.1/src/sshd_config.rnc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-sshd-2.16.2/src/sshd_config.rnc 2008-04-16 11:02:37.000000000 +0200
@@ -0,0 +1,119 @@
+default namespace = "http://www.suse.com/1.0/yast2ns"
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+namespace config = "http://www.suse.com/1.0/configns"
+
+y2_sshd_config =
+ Port
+ | AddressFamily
+ | ListenAddress
+ | Protocol
+ | HostKey
+ | HostKeys
+ | Lifetime
+ | KeyRegenerationInterval
+ | ServerKeyBits
+ | SyslogFacility
+ | LogLevel
+ | LoginGraceTime
+ | PermitRootLogin
+ | StrictModes
+ | MaxAuthTries
+ | RSAAuthentication
+ | PubkeyAuthentication
+ | AuthorizedKeysFile
+ | RhostsRSAAuthentication
+ | HostbasedAuthentication
+ | IgnoreUserKnownHosts
+ | IgnoreRhosts
+ | PasswordAuthentication
+ | PermitEmptyPasswords
+ | ChallengeResponseAuthentication
+ | KerberosAuthentication
+ | KerberosOrLocalPasswd
+ | KerberosTicketCleanup
+ | KerberosGetAFSToken
+ | GSSAPIAuthentication
+ | GSSAPICleanupCredentials
+ | GSSAPIEnableMITMAttack
+ | UsePAM
+ | AllowTcpForwarding
+ | GatewayPorts
+ | X11Forwarding
+ | X11DisplayOffset
+ | X11UseLocalhost
+ | PrintMotd
+ | PrintLastLog
+ | TCPKeepAlive
+ | UseLogin
+ | UsePrivilegeSeparation
+ | PermitUserEnvironment
+ | Compression
+ | ClientAliveInterval
+ | ClientAliveCountMax
+ | UseDNS
+ | PidFile
+ | MaxStartups
+ | PermitTunnel
+ | Banner
+ | Subsystem
+ | AcceptEnv
+
+sshd = element sshd {
+ status? &
+ y2_sshd_config*
+}
+status = element status { text }
+Port = element Port { text }
+AddressFamily = element AddressFamily { text }
+ListenAddress = element ListenAddress { text }
+Protocol = element Protocol { text }
+HostKey = element HostKey { text }
+HostKeys = element HostKeys { text }
+Lifetime = element Lifetime { text }
+KeyRegenerationInterval = element KeyRegenerationInterval { text }
+ServerKeyBits = element ServerKeyBits { text }
+SyslogFacility = element SyslogFacility { text }
+LogLevel = element LogLevel { text }
+LoginGraceTime = element LoginGraceTime { text }
+PermitRootLogin = element PermitRootLogin { text }
+StrictModes = element StrictModes { text }
+MaxAuthTries = element MaxAuthTries { text }
+RSAAuthentication = element RSAAuthentication { text }
+PubkeyAuthentication = element PubkeyAuthentication { text }
+AuthorizedKeysFile = element AuthorizedKeysFile { text }
+RhostsRSAAuthentication = element RhostsRSAAuthentication { text }
+HostbasedAuthentication = element HostbasedAuthentication { text }
+IgnoreUserKnownHosts = element IgnoreUserKnownHosts { text }
+IgnoreRhosts = element IgnoreRhosts { text }
+PasswordAuthentication = element PasswordAuthentication { text }
+PermitEmptyPasswords = element PermitEmptyPasswords { text }
+ChallengeResponseAuthentication = element ChallengeResponseAuthentication { text }
+KerberosAuthentication = element KerberosAuthentication { text }
+KerberosOrLocalPasswd = element KerberosOrLocalPasswd { text }
+KerberosTicketCleanup = element KerberosTicketCleanup { text }
+KerberosGetAFSToken = element KerberosGetAFSToken { text }
+GSSAPIAuthentication = element GSSAPIAuthentication { text }
+GSSAPICleanupCredentials = element GSSAPICleanupCredentials { text }
+GSSAPIEnableMITMAttack = element GSSAPIEnableMITMAttack { text }
+UsePAM = element UsePAM { text }
+AllowTcpForwarding = element AllowTcpForwarding { text }
+GatewayPorts = element GatewayPorts { text }
+X11Forwarding = element X11Forwarding { text }
+X11DisplayOffset = element X11DisplayOffset { text }
+X11UseLocalhost = element X11UseLocalhost { text }
+PrintMotd = element PrintMotd { text }
+PrintLastLog = element PrintLastLog { text }
+TCPKeepAlive = element TCPKeepAlive { text }
+UseLogin = element UseLogin { text }
+UsePrivilegeSeparation = element UsePrivilegeSeparation { text }
+PermitUserEnvironment = element PermitUserEnvironment { text }
+Compression = element Compression { text }
+ClientAliveInterval = element ClientAliveInterval { text }
+ClientAliveCountMax = element ClientAliveCountMax { text }
+UseDNS = element UseDNS { text }
+PidFile = element PidFile { text }
+MaxStartups = element MaxStartups { text }
+PermitTunnel = element PermitTunnel { text }
+Banner = element Banner { text }
+Subsystem = element Subsystem { text }
+AcceptEnv = element AcceptEnv { text }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/src/Sshd.ycp new/yast2-sshd-2.16.2/src/Sshd.ycp
--- old/yast2-sshd-2.16.1/src/Sshd.ycp 2008-04-02 16:14:20.000000000 +0200
+++ new/yast2-sshd-2.16.2/src/Sshd.ycp 2008-04-15 11:06:18.000000000 +0200
@@ -147,6 +147,34 @@
}
/**
+ * Exports the current configuration.
+ *
+ * @return map of a current configuration
+ *
+ * @struct $[
+ * "config" : (map ) SETTINGS,
+ * "status" : (boolean) service_status,
+ * ]
+ */
+global map Export () {
+ return $[
+ "config" : SETTINGS,
+ "status" : sshd_is_running,
+ ];
+}
+
+/**
+ * Imports a configuration
+ */
+global boolean Import (map import_map) {
+ SETTINGS = (map ) import_map["config"]:$[];
+ sshd_is_running = (import_map["status"]:false == true);
+ SetModified();
+ y2milestone ("Configuration has been imported");
+ return true;
+}
+
+/**
* Restarts the sshd when the daemon was running when starting the configuration
*/
boolean WriteSSHDService () {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/testsuite/Makefile.in new/yast2-sshd-2.16.2/testsuite/Makefile.in
--- old/yast2-sshd-2.16.1/testsuite/Makefile.in 2007-11-16 20:49:02.000000000 +0100
+++ new/yast2-sshd-2.16.2/testsuite/Makefile.in 2008-04-16 12:56:18.000000000 +0200
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 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.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-sshd-2.16.1/VERSION new/yast2-sshd-2.16.2/VERSION
--- old/yast2-sshd-2.16.1/VERSION 2008-04-02 16:23:58.000000000 +0200
+++ new/yast2-sshd-2.16.2/VERSION 2008-04-16 11:04:37.000000000 +0200
@@ -1 +1 @@
-2.16.1
+2.16.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org