Hello community, here is the log from the commit of package yast2-samba-client for openSUSE:13.1 checked in at 2013-10-24 14:18:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/yast2-samba-client (Old) and /work/SRC/openSUSE:13.1/.yast2-samba-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-client" Changes: -------- --- /work/SRC/openSUSE:13.1/yast2-samba-client/yast2-samba-client.changes 2013-09-23 11:16:25.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.yast2-samba-client.new/yast2-samba-client.changes 2013-10-24 14:18:39.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Oct 23 08:49:18 CEST 2013 - [email protected] + +- CLI; read AD settings, so the write command does not fallback + to non-AD defaults (bnc#845878) +- 3.0.1 + +------------------------------------------------------------------- Old: ---- yast2-samba-client-3.0.0.tar.bz2 New: ---- yast2-samba-client-3.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.SSGNLQ/_old 2013-10-24 14:18:39.000000000 +0200 +++ /var/tmp/diff_new_pack.SSGNLQ/_new 2013-10-24 14:18:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-samba-client # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,17 @@ Name: yast2-samba-client -Version: 3.0.0 +Version: 3.0.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-samba-client-%{version}.tar.bz2 -BuildRequires: perl-XML-Writer -BuildRequires: update-desktop-files -BuildRequires: yast2-devtools -BuildRequires: yast2-pam -BuildRequires: yast2-perl-bindings -BuildRequires: yast2-testsuite -Requires: perl-XML-LibXML -Requires: yast2-kerberos-client + +Group: System/YaST +License: GPL-2.0 +BuildRequires: yast2-pam yast2-devtools yast2-perl-bindings perl-XML-Writer yast2-testsuite update-desktop-files +Requires: yast2-kerberos-client perl-XML-LibXML # new Pam.ycp API Requires: yast2-pam >= 2.14.0 @@ -39,13 +36,11 @@ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 -BuildArch: noarch +BuildArchitectures: noarch Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Samba Client Configuration -License: GPL-2.0 -Group: System/YaST %description This package contains the YaST2 component for configuration of an SMB @@ -75,6 +70,7 @@ %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + %clean rm -rf "$RPM_BUILD_ROOT" @@ -91,5 +87,3 @@ /usr/lib/YaST2/servers_non_y2/ag_pam_mount /usr/share/YaST2/schema/autoyast/rnc/samba-client.rnc %doc %{_prefix}/share/doc/packages/yast2-samba-client - -%changelog ++++++ yast2-samba-client-3.0.0.tar.bz2 -> yast2-samba-client-3.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.0.0/Makefile.am.common new/yast2-samba-client-3.0.1/Makefile.am.common --- old/yast2-samba-client-3.0.0/Makefile.am.common 2013-07-31 10:45:13.000000000 +0200 +++ new/yast2-samba-client-3.0.1/Makefile.am.common 2013-10-23 08:55:37.000000000 +0200 @@ -15,6 +15,7 @@ CLEANFILES = ${ybcfiles} DISTCLEANFILES = .dep +if HAS_YCP_MODULES # Needs to be outside "." because of cases # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. @@ -26,14 +27,16 @@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} cat ${NEWDEP} > .dep rm ${NEWDEP} +-include .dep +endif 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"; \ @@ -43,5 +46,18 @@ 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-samba-client-3.0.0/Makefile.in new/yast2-samba-client-3.0.1/Makefile.in --- old/yast2-samba-client-3.0.0/Makefile.in 2013-07-31 10:45:17.000000000 +0200 +++ new/yast2-samba-client-3.0.1/Makefile.in 2013-10-23 08:55:41.000000000 +0200 @@ -684,7 +684,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) + chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.0.0/VERSION new/yast2-samba-client-3.0.1/VERSION --- old/yast2-samba-client-3.0.0/VERSION 2013-07-30 14:29:00.000000000 +0200 +++ new/yast2-samba-client-3.0.1/VERSION 2013-10-23 08:55:35.000000000 +0200 @@ -1 +1 @@ -3.0.0 +3.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.0.0/autodocs-ycp.ami new/yast2-samba-client-3.0.1/autodocs-ycp.ami --- old/yast2-samba-client-3.0.0/autodocs-ycp.ami 2013-07-31 10:45:13.000000000 +0200 +++ new/yast2-samba-client-3.0.1/autodocs-ycp.ami 2013-10-23 08:55:37.000000000 +0200 @@ -17,8 +17,11 @@ htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs +# find all files in Yast/ subdirectory if it exists +YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f) + # use nobase_ prefix to keep the directory structure -nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES) CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.0.0/configure new/yast2-samba-client-3.0.1/configure --- old/yast2-samba-client-3.0.0/configure 2013-07-31 10:45:16.000000000 +0200 +++ new/yast2-samba-client-3.0.1/configure 2013-10-23 08:55:40.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-samba-client 3.0.0. +# Generated by GNU Autoconf 2.69 for yast2-samba-client 3.0.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-samba-client' PACKAGE_TARNAME='yast2-samba-client' -PACKAGE_VERSION='3.0.0' -PACKAGE_STRING='yast2-samba-client 3.0.0' +PACKAGE_VERSION='3.0.1' +PACKAGE_STRING='yast2-samba-client 3.0.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -588,6 +588,8 @@ ac_default_prefix=/usr ac_subst_vars='LTLIBOBJS LIBOBJS +HAS_YCP_MODULES_FALSE +HAS_YCP_MODULES_TRUE YCPC YCPMAKEDEP YCPDOC @@ -1247,7 +1249,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-samba-client 3.0.0 to adapt to many kinds of systems. +\`configure' configures yast2-samba-client 3.0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1319,7 +1321,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-samba-client 3.0.0:";; + short | recursive ) echo "Configuration of yast2-samba-client 3.0.1:";; esac cat <<\_ACEOF @@ -1399,7 +1401,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-samba-client configure 3.0.0 +yast2-samba-client configure 3.0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1416,7 +1418,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-samba-client $as_me 3.0.0, which was +It was created by yast2-samba-client $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2355,7 +2357,7 @@ # Define the identity of the package. PACKAGE='yast2-samba-client' - VERSION='3.0.0' + VERSION='3.0.1' cat >>confdefs.h <<_ACEOF @@ -2478,7 +2480,7 @@ -VERSION="3.0.0" +VERSION="3.0.1" RPMNAME="yast2-samba-client" MAINTAINER="Jiri Suchomel <[email protected]>" @@ -2842,6 +2844,29 @@ fi +# handle .dep files in Makefile.am.common if any YCP module is present +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for YCP modules" >&5 +$as_echo_n "checking for YCP modules... " >&6; } + +# YCP module file name starts with an upper case letter +find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1 + if test -n "$has_ycp_modules"; then + HAS_YCP_MODULES_TRUE= + HAS_YCP_MODULES_FALSE='#' +else + HAS_YCP_MODULES_TRUE='#' + HAS_YCP_MODULES_FALSE= +fi + + +if test -n "$has_ycp_modules"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 +$as_echo "found" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +$as_echo "not found" >&6; } +fi + ac_config_files="$ac_config_files Makefile agent-pam_mount/Makefile agents/Makefile doc/autodocs/Makefile doc/Makefile src/Makefile testsuite/Makefile" @@ -3007,6 +3032,10 @@ as_fn_error $? "conditional \"CREATE_PKGCONFIG_NOARCH\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAS_YCP_MODULES_TRUE}" && test -z "${HAS_YCP_MODULES_FALSE}"; then + as_fn_error $? "conditional \"HAS_YCP_MODULES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -3404,7 +3433,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-samba-client $as_me 3.0.0, which was +This file was extended by yast2-samba-client $as_me 3.0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3457,7 +3486,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-samba-client config.status 3.0.0 +yast2-samba-client 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-samba-client-3.0.0/configure.ac new/yast2-samba-client-3.0.1/configure.ac --- old/yast2-samba-client-3.0.0/configure.ac 2013-07-31 10:45:13.000000000 +0200 +++ new/yast2-samba-client-3.0.1/configure.ac 2013-10-23 08:55:37.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2-samba-client dnl -dnl -- This file is generated by y2autoconf 2.24.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-samba-client, 3.0.0, http://bugs.opensuse.org/, yast2-samba-client) +AC_INIT(yast2-samba-client, 3.0.1, http://bugs.opensuse.org/, yast2-samba-client) 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-samba-client" MAINTAINER="Jiri Suchomel <[email protected]>" @@ -149,6 +149,19 @@ AC_MSG_WARN([yast2-testsuite.rpm is not installed]) ]) +# handle .dep files in Makefile.am.common if any YCP module is present +AC_MSG_CHECKING([for YCP modules]) + +# YCP module file name starts with an upper case letter +[find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1] +AM_CONDITIONAL([HAS_YCP_MODULES], [test -n "$has_ycp_modules"]) + +if test -n "$has_ycp_modules"; then + AC_MSG_RESULT([found]) +else + AC_MSG_RESULT([not found]) +fi + AC_CONFIG_FILES(Makefile agent-pam_mount/Makefile agents/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.0.0/doc/autodocs/Makefile.in new/yast2-samba-client-3.0.1/doc/autodocs/Makefile.in --- old/yast2-samba-client-3.0.0/doc/autodocs/Makefile.in 2013-07-31 10:45:17.000000000 +0200 +++ new/yast2-samba-client-3.0.1/doc/autodocs/Makefile.in 2013-10-23 08:55:41.000000000 +0200 @@ -237,8 +237,11 @@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ +# find all files in Yast/ subdirectory if it exists +YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f) + # use nobase_ prefix to keep the directory structure -nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES) CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.0.0/src/Makefile.in new/yast2-samba-client-3.0.1/src/Makefile.in --- old/yast2-samba-client-3.0.0/src/Makefile.in 2013-07-31 10:45:17.000000000 +0200 +++ new/yast2-samba-client-3.0.1/src/Makefile.in 2013-10-23 08:55:41.000000000 +0200 @@ -272,7 +272,7 @@ # Needs to be outside "." because of cases # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. -NEWDEP = ${top_builddir}/.dep.new +@HAS_YCP_MODULES_TRUE@NEWDEP = ${top_builddir}/.dep.new CHECK_SYNTAX = true all: all-am @@ -670,16 +670,17 @@ # generate dependencies # two steps not to lose the file if the command fails # hook: create the links before we look for files -.dep: $(wildcard *.ycp) ${ycpchook} - ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} - cat ${NEWDEP} > .dep - rm ${NEWDEP} +@[email protected]: $(wildcard *.ycp) ${ycpchook} +@HAS_YCP_MODULES_TRUE@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} +@HAS_YCP_MODULES_TRUE@ cat ${NEWDEP} > .dep +@HAS_YCP_MODULES_TRUE@ rm ${NEWDEP} +@HAS_YCP_MODULES_TRUE@-include .dep 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"; \ @@ -689,8 +690,20 @@ echo "Syntax check disabled"; \ fi; \ fi - --include .dep + @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 # 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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-3.0.0/src/clients/samba-client.rb new/yast2-samba-client-3.0.1/src/clients/samba-client.rb --- old/yast2-samba-client-3.0.0/src/clients/samba-client.rb 2013-07-30 13:06:23.000000000 +0200 +++ new/yast2-samba-client-3.0.1/src/clients/samba-client.rb 2013-10-23 08:49:03.000000000 +0200 @@ -186,6 +186,13 @@ command = CommandLine.UniqueOption(options, ["enable", "disable"]) return false if command == nil + # read AD settings, so the write command does not fallback to non-AD default + #(bnc#845878) + domain = Samba.GetWorkgroupOrRealm + SambaAD.ReadADS(domain) + Samba.SetWorkgroup(domain) + SambaAD.ReadRealm + Samba.SetWinbind(command == "enable") end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
