Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2013-08-12 11:04:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-users" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2013-08-01 11:10:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-users.new/yast2-users.changes 2013-08-12 11:04:52.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 7 12:23:46 CEST 2013 - [email protected] + +- do not recrypt group password provided in autoYaST profile + (backport of bnc#722421) +- 3.0.1 + +------------------------------------------------------------------- Old: ---- yast2-users-3.0.0.tar.bz2 New: ---- yast2-users-3.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.tp2YkK/_old 2013-08-12 11:04:53.000000000 +0200 +++ /var/tmp/diff_new_pack.tp2YkK/_new 2013-08-12 11:04:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-users -Version: 3.0.0 +Version: 3.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-users-3.0.0.tar.bz2 -> yast2-users-3.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.0.0/Makefile.am.common new/yast2-users-3.0.1/Makefile.am.common --- old/yast2-users-3.0.0/Makefile.am.common 2013-07-31 11:07:10.000000000 +0200 +++ new/yast2-users-3.0.1/Makefile.am.common 2013-08-07 18:43:45.000000000 +0200 @@ -30,10 +30,10 @@ dist-hook: check-syntax CHECK_SYNTAX = true -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ echo "Checking syntax of $${TO_CHECK}"; \ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ @@ -42,6 +42,20 @@ else \ echo "Syntax check disabled"; \ fi; \ + fi + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ fi -include .dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.0.0/VERSION new/yast2-users-3.0.1/VERSION --- old/yast2-users-3.0.0/VERSION 2013-07-30 14:05:31.000000000 +0200 +++ new/yast2-users-3.0.1/VERSION 2013-08-07 12:56:07.000000000 +0200 @@ -1 +1 @@ -3.0.0 +3.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.0.0/configure new/yast2-users-3.0.1/configure --- old/yast2-users-3.0.0/configure 2013-07-31 11:07:22.000000000 +0200 +++ new/yast2-users-3.0.1/configure 2013-08-07 18:43:55.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-users 3.0.0. +# Generated by GNU Autoconf 2.69 for yast2-users 3.0.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='yast2-users' PACKAGE_TARNAME='yast2-users' -PACKAGE_VERSION='3.0.0' -PACKAGE_STRING='yast2-users 3.0.0' +PACKAGE_VERSION='3.0.1' +PACKAGE_STRING='yast2-users 3.0.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1377,7 +1377,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-users 3.0.0 to adapt to many kinds of systems. +\`configure' configures yast2-users 3.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1448,7 +1448,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-users 3.0.0:";; + short | recursive ) echo "Configuration of yast2-users 3.0.1:";; esac cat <<\_ACEOF @@ -1566,7 +1566,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-users configure 3.0.0 +yast2-users configure 3.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2110,7 +2110,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-users $as_me 3.0.0, which was +It was created by yast2-users $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3049,7 +3049,7 @@ # Define the identity of the package. PACKAGE='yast2-users' - VERSION='3.0.0' + VERSION='3.0.1' cat >>confdefs.h <<_ACEOF @@ -3172,7 +3172,7 @@ -VERSION="3.0.0" +VERSION="3.0.1" RPMNAME="yast2-users" MAINTAINER="Jiri Suchomel <[email protected]>" @@ -16927,7 +16927,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-users $as_me 3.0.0, which was +This file was extended by yast2-users $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16993,7 +16993,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-users config.status 3.0.0 +yast2-users config.status 3.0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.0.0/configure.ac new/yast2-users-3.0.1/configure.ac --- old/yast2-users-3.0.0/configure.ac 2013-07-31 11:07:10.000000000 +0200 +++ new/yast2-users-3.0.1/configure.ac 2013-08-07 18:43:45.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2-users dnl -dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.2 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-users, 3.0.0, http://bugs.opensuse.org/, yast2-users) +AC_INIT(yast2-users, 3.0.1, http://bugs.opensuse.org/, yast2-users) 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="3.0.0" +VERSION="3.0.1" RPMNAME="yast2-users" MAINTAINER="Jiri Suchomel <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.0.0/src/Makefile.in new/yast2-users-3.0.1/src/Makefile.in --- old/yast2-users-3.0.0/src/Makefile.in 2013-07-31 11:07:24.000000000 +0200 +++ new/yast2-users-3.0.1/src/Makefile.in 2013-08-07 18:43:57.000000000 +0200 @@ -792,10 +792,10 @@ rm ${NEWDEP} dist-hook: check-syntax -check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) - @if test "$(filter %.ycp,client_DATA)"; then \ +check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) + @if test "$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; then \ if $(CHECK_SYNTAX); then \ - TO_CHECK="$(filter %.ycp,$^)"; \ + TO_CHECK="$(filter %.ycp, $(client_DATA) $(ydata_DATA))"; \ echo "Checking syntax of $${TO_CHECK}"; \ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ @@ -804,6 +804,20 @@ else \ echo "Syntax check disabled"; \ fi; \ + fi + @if test "$(filter %.rb, $^)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.rb, $^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + for f in $${TO_CHECK}; do \ + if ! ruby -c $$f > /dev/null; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + done; \ + else \ + echo "Syntax check disabled"; \ + fi; \ fi -include .dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-3.0.0/src/modules/Users.pm new/yast2-users-3.0.1/src/modules/Users.pm --- old/yast2-users-3.0.0/src/modules/Users.pm 2013-07-30 14:05:31.000000000 +0200 +++ new/yast2-users-3.0.1/src/modules/Users.pm 2013-08-07 12:56:07.000000000 +0200 @@ -1660,6 +1660,10 @@ undef %user_in_work; $users{$type}{$id} = \%user; } + # do not re-crypt group password value (bnc#722421) + foreach my $id (keys %{$groups{$type}}) { + $groups{$type}{$id}{"encrypted"} = YaST::YCP::Boolean (1); + } } } @@ -6011,8 +6015,22 @@ } } } + my $encrypted = $group{"encrypted"}; + $encrypted = YaST::YCP::Boolean (1) if !defined $encrypted; + if (defined $encrypted && ref ($encrypted) ne "YaST::YCP::Boolean") { + $encrypted = YaST::YCP::Boolean ($encrypted); + } + my $pass = $group{"group_password"}; + if ((!defined $encrypted || !bool ($encrypted)) && + (defined $pass) && !Mode->config ()) + { + $pass = $self->CryptPassword ($pass, $type); + $encrypted = YaST::YCP::Boolean (1); + } + my %ret = ( - "userPassword" => $group{"group_password"}, + "userPassword" => $pass, + "encrypted" => $encrypted, "cn" => $groupname, "gidNumber" => $gid, "userlist" => \%userlist, @@ -6482,6 +6500,12 @@ $ret{"gid"} = $group->{"gidNumber"}; } if (defined $group->{"userPassword"}) { + + my $encrypted = bool ($group->{"encrypted"}); + if (!defined $group->{"encrypted"}) { + $encrypted = 1; + } + $ret{"encrypted"} = YaST::YCP::Boolean ($encrypted); $ret{"group_password"} = $group->{"userPassword"}; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
