Hello community, here is the log from the commit of package yast2-samba-client checked in at Fri Apr 25 15:09:27 CEST 2008. -------- --- yast2-samba-client/yast2-samba-client.changes 2008-04-11 14:19:47.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-samba-client/yast2-samba-client.changes 2008-04-25 13:26:32.413511000 +0200 @@ -1,0 +2,15 @@ +Fri Apr 25 11:47:52 CEST 2008 - jsuchome@suse.cz + +- correctly create machine account: transform DN, use correct + argument, do not try with default value (bnc#383360) +- use temporary krb5.conf also for obtaining machine accounts +- remove AD info from smb.conf when domain was left (bnc#383374) +- 2.16.7 + +------------------------------------------------------------------- +Thu Apr 24 12:55:40 CEST 2008 - jsuchome@suse.cz + +- text fixes (bnc#383229) +- 2.16.6 + +------------------------------------------------------------------- Old: ---- yast2-samba-client-2.16.5.tar.bz2 New: ---- yast2-samba-client-2.16.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.j31613/_old 2008-04-25 15:09:22.000000000 +0200 +++ /var/tmp/diff_new_pack.j31613/_new 2008-04-25 15:09:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-samba-client (Version 2.16.5) +# spec file for package yast2-samba-client (Version 2.16.7) # # 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-samba-client -Version: 2.16.5 +Version: 2.16.7 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-client-2.16.5.tar.bz2 +Source0: yast2-samba-client-2.16.7.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite Requires: yast2-kerberos-client @@ -39,7 +39,7 @@ Stanislav Visnovsky <visnov@suse.cz> %prep -%setup -n yast2-samba-client-2.16.5 +%setup -n yast2-samba-client-2.16.7 %build %{prefix}/bin/y2tool y2autoconf @@ -76,6 +76,15 @@ /usr/share/YaST2/schema/autoyast/rnc/samba-client.rnc %doc %{prefix}/share/doc/packages/yast2-samba-client %changelog +* Fri Apr 25 2008 jsuchome@suse.cz +- correctly create machine account: transform DN, use correct + argument, do not try with default value (bnc#383360) +- use temporary krb5.conf also for obtaining machine accounts +- remove AD info from smb.conf when domain was left (bnc#383374) +- 2.16.7 +* Thu Apr 24 2008 jsuchome@suse.cz +- text fixes (bnc#383229) +- 2.16.6 * Fri Apr 11 2008 jsuchome@suse.cz - added button for leaving AD domain (fate#300458) - 2.16.5 ++++++ yast2-samba-client-2.16.5.tar.bz2 -> yast2-samba-client-2.16.7.tar.bz2 ++++++ ++++ 8278 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.16.5/configure.in new/yast2-samba-client-2.16.7/configure.in --- old/yast2-samba-client-2.16.5/configure.in 2006-06-19 17:55:15.000000000 +0200 +++ new/yast2-samba-client-2.16.7/configure.in 2008-04-25 13:14:56.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-samba-client dnl -dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-samba-client, 2.13.19, http://bugs.opensuse.org/, yast2-samba-client) +AC_INIT(yast2-samba-client, 2.16.7, http://bugs.opensuse.org/, yast2-samba-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -14,10 +14,11 @@ AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs +dnl long filenames; we use GNU Make extensions and that's ok +AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.13.19" +VERSION="2.16.7" RPMNAME="yast2-samba-client" MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>" @@ -107,9 +108,11 @@ 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` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +145,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile agents/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.16.5/COPYRIGHT.english new/yast2-samba-client-2.16.7/COPYRIGHT.english --- old/yast2-samba-client-2.16.5/COPYRIGHT.english 2008-04-11 14:15:50.000000000 +0200 +++ new/yast2-samba-client-2.16.7/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.16.5/Makefile.am new/yast2-samba-client-2.16.7/Makefile.am --- old/yast2-samba-client-2.16.5/Makefile.am 2006-06-19 17:55:16.000000000 +0200 +++ new/yast2-samba-client-2.16.7/Makefile.am 2008-04-25 13:14:56.000000000 +0200 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,21 +19,22 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english +COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 +# less strict; prefer bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -67,7 +67,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH @@ -211,8 +211,7 @@ # For po/ modules checkpo: - test ! -d $(srcdir)/po || $(MAKE) -C po checkpo -# test ! -d $(srcdir)/po \ -# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } + test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo +# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am SUBDIRS = agents doc src testsuite diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.16.5/Makefile.am.common new/yast2-samba-client-2.16.7/Makefile.am.common --- old/yast2-samba-client-2.16.5/Makefile.am.common 2006-06-19 17:55:16.000000000 +0200 +++ new/yast2-samba-client-2.16.7/Makefile.am.common 2008-04-25 13:14:56.000000000 +0200 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + 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"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.16.5/missing new/yast2-samba-client-2.16.7/missing --- old/yast2-samba-client-2.16.5/missing 2006-06-19 17:55:21.000000000 +0200 +++ new/yast2-samba-client-2.16.7/missing 2008-04-25 13:15:01.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]([^ ]*).*/\1/p' +sed_minuso='s/.* -o ([^ ]*).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file `aclocal.m4' autoconf touch file `configure' autoheader touch file `config.h.in' + autom4te touch the output file, or create a stub one automake touch all `Makefile.in' files bison create `y.tab.[ch]', if possible, from existing .[ch] flex create `lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get `$1' as part of `Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*([^ ]*).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get `Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get `Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ `Help2man' package in order for those modifications to take effect. You can get `Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=([^ ]*).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the `Texinfo' package or the `GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o ([^ ]*).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* ([^ ]*) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* ([^ ]*) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* ([^ ]*) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.16.5/README new/yast2-samba-client-2.16.7/README --- old/yast2-samba-client-2.16.5/README 2008-04-11 14:15:50.000000000 +0200 +++ new/yast2-samba-client-2.16.7/README 2008-04-25 13:26:09.000000000 +0200 @@ -1,2 +1,2 @@ This program/library is part of YaST2 -See the file COPYRIGHT.english for license terms +See the file COPYING for license terms diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.16.5/src/dialogs.ycp new/yast2-samba-client-2.16.7/src/dialogs.ycp --- old/yast2-samba-client-2.16.5/src/dialogs.ycp 2008-04-11 14:09:12.000000000 +0200 +++ new/yast2-samba-client-2.16.7/src/dialogs.ycp 2008-04-25 13:25:57.000000000 +0200 @@ -3,7 +3,7 @@ * Summary: Dialogs definitions * Authors: Stanislav Visnovsky <visnov@suse.cz> * - * $Id: dialogs.ycp 46291 2008-04-09 14:04:56Z jsuchome $ + * $Id: dialogs.ycp 47068 2008-04-25 11:25:57Z jsuchome $ */ { @@ -136,6 +136,7 @@ `ReplacePoint (`id(`rpstatus), `Empty()) ); map pw_data = Samba::password_data; + string left_domain = ""; // internal function: update the status line void check_domain_membership (string domain) { @@ -300,8 +301,10 @@ string workgroup = (string)UI::QueryWidget(`id(`workgroup), `Value); if (LeaveDomain (workgroup) == `ok) { + left_domain = workgroup; check_domain_membership (workgroup); UI::ChangeWidget(`id(`winbind), `Value, false); + SambaAD::SetADS (""); } } else if (ret == `winbind) { @@ -336,7 +339,8 @@ } else if(ret == `next) { string workgroup = (string)UI::QueryWidget(`id(`workgroup), `Value); - if (workgroup != Samba::GetWorkgroup ()) + if (workgroup != Samba::GetWorkgroup () && + (left_domain == "" || workgroup != left_domain)) { check_domain_membership (workgroup); workgroup = Samba::GetWorkgroup (); @@ -392,7 +396,9 @@ settings in smb.conf to the default values: %1"), mergestring (["domain master", "domain logons"], "\n"))); } - if (!Stage::cont()) { + if (!Stage::cont() && + (left_domain=="" || use_winbind || left_domain != workgroup)) + { // return `ok, `fail or `nojoin in_domain = AskJoinDomain(workgroup, workgroup_type); if (in_domain == `fail) continue; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.16.5/src/routines.ycp new/yast2-samba-client-2.16.7/src/routines.ycp --- old/yast2-samba-client-2.16.5/src/routines.ycp 2008-04-11 13:47:07.000000000 +0200 +++ new/yast2-samba-client-2.16.7/src/routines.ycp 2008-04-25 13:25:57.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Miscelanous functions for configuration of samba-client. * Authors: Stanislav Visnovsky <visnov@suse.cz> * - * $Id: routines.ycp 46292 2008-04-09 14:05:13Z jsuchome $ + * $Id: routines.ycp 47068 2008-04-25 11:25:57Z jsuchome $ */ { @@ -37,8 +37,9 @@ map<string, string> passwordUserPopup (string message, string defaultuser, string domain, symbol what) { term machine_term = `Empty (); + string default_id = "default_entry"; // default value of Machine Account - string default_entry= _("(default)"); + term default_entry= `item (`id (default_id), _("(default)")); if (SambaAD::ADS () != "" && what != `leave) { list machines = [ default_entry ]; @@ -46,12 +47,12 @@ `ReplacePoint (`id (`rpcombo), `Left (`ComboBox (`id (`machines), `opt (`hstretch), // combo box label - _("&Machine Account"), machines) + _("&Machine Account OU"), machines) ) ), `VBox ( `Label (""), - `PushButton (`id (`acquire), _("&Acquire")) + `PushButton (`id (`acquire), _("O&btain list")) ) ); } @@ -96,13 +97,15 @@ for listing the machine accounts.")); continue; } - list machines = SambaAD::GetMachines (domain, user, pass); + list<string> machines = SambaAD::GetMachines (domain, user, pass); if (machines != nil) { - machines = prepend (machines, default_entry); + list items = maplist (string m, machines, ``( + `item (`id (m), m))); + items = prepend (items, default_entry); UI::ReplaceWidget (`id (`rpcombo), `Left ( `ComboBox (`id (`machines), `opt (`hstretch), - _("&Machine Account"), machines) + _("&Machine Account"), items) )); UI::ChangeWidget (`id (`machines), `Enabled, true); } @@ -114,7 +117,11 @@ "password" : pass ] : nil; if (SambaAD::ADS () != "" && ret == `ok) - result["machine"]= (string)UI::QueryWidget (`id (`machines), `Value); + { + string machine = (string)UI::QueryWidget (`id (`machines), `Value); + if (machine != default_id) + result["machine"] = machine; + } UI::CloseDialog(); return result; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.16.5/src/SambaAD.pm new/yast2-samba-client-2.16.7/src/SambaAD.pm --- old/yast2-samba-client-2.16.5/src/SambaAD.pm 2008-04-09 16:05:13.000000000 +0200 +++ new/yast2-samba-client-2.16.7/src/SambaAD.pm 2008-04-25 13:25:57.000000000 +0200 @@ -4,7 +4,7 @@ # Summary: Manage AD issues for samba-client # Authors: Jiri Suchomel <jsuchome@suse.cz> # -# $Id: SambaAD.pm 46292 2008-04-09 14:05:13Z jsuchome $ +# $Id: SambaAD.pm 47068 2008-04-25 11:25:57Z jsuchome $ # package SambaAD; @@ -51,12 +51,13 @@ my $tmpdir = SCR->Read (".target.tmpdir"); my $conf_file = $tmpdir."/smb.conf"; - my $cmd = "net ads search "(objectclass=organizationalUnit)" distinguishedName -s $conf_file -U '$user%". ($passwd||"") . "'"; + my $krb_file = $tmpdir."/krb5.conf"; + my $cmd = "KRB5_CONFIG=$krb_file net ads search "(objectclass=organizationalUnit)" distinguishedName -s $conf_file -U '$user%". ($passwd||"") . "'"; + SCR->Write (".target.string", $krb_file, "[realms]\n\t$realm = {\n\tkdc = $ads\n\t}\n"); SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n"); my $result = SCR->Execute(".target.bash_output", $cmd); - if ($result->{"exit"} eq 0) { foreach my $line (split (/\n/,$result->{"stdout"} || "")) { if ($line =~ m/^distinguishedName:/) { @@ -95,6 +96,7 @@ if (FileUtils->Exists ("/usr/bin/dig")) { # we have to select server from correct site - see bug #238249. + # TODO use +short instead? my $out = SCR->Execute (".target.bash_output", "dig -t srv _ldap._tcp.dc._msdcs.$workgroup +noall +answer"); y2debug ("dig output: ", Dumper ($out)); my $tmpserver = ""; @@ -103,7 +105,7 @@ y2debug ("line: $line"); next if $server ne ""; - if ($line =~ m/$workgroup/) { + if ($line =~ m/$workgroup/ && $line !~ m/^;/) { $tmpserver = ""; $tmpserver = (split (/[ \t]/, $line))[7] || "."; chop $tmpserver; @@ -112,11 +114,11 @@ my $cmd = "LANG=C net ads lookup -S $tmpserver"; $out = SCR->Execute (".target.bash_output", $cmd); if ($out->{"exit"} eq 0) { - foreach my $line (split (/\n/,$out->{"stdout"} || "")) { + foreach my $l (split (/\n/,$out->{"stdout"} || "")) { next if $server; - $server = $tmpserver if ($line =~ m/Is the closest DC/ && $line =~ m/yes/); - if ($line =~ m/Client Site Name/ && $line !~ m/Default-First-Site-Name/) { - my $site = $line; + $server = $tmpserver if ($l =~ m/Is the closest DC/ && $l =~ m/yes/); + if ($l =~ m/Client Site Name/ && $l !~ m/Default-First-Site-Name/) { + my $site = $l; $site =~ s/^Client Site Name:([\t ]*)//g; } } @@ -137,7 +139,7 @@ if ($out->{"exit"} eq 0) { foreach my $line (split (/\n/,$out->{"stdout"} || "")) { next if $server; - if ($line =~ m/$workgroup/) { + if ($line =~ m/$workgroup/ && $line !~ m/^;/) { $server = (split (/[ \t]/, $line))[7] || "."; chop $server; } @@ -319,10 +321,11 @@ BEGIN{$TYPEINFO{AdjustSambaConfig}=["function","void","boolean"]} sub AdjustSambaConfig { my ($self, $status) = @_; + + my $workgroup = SambaConfig->GlobalGetStr ("workgroup", ""); + # remove special AD values if AD is not used + my $remove = (($ads || "") eq ""); if ($status) { - my $workgroup = SambaConfig->GlobalGetStr ("workgroup", ""); - # remove special AD values if AD is not used - my $remove = (($ads || "") eq ""); SambaConfig->GlobalSetMap({ "security" => $remove ? "domain" : "ADS", "realm" => $remove ? undef : $realm, @@ -340,6 +343,14 @@ SambaConfig->GlobalSetStr ("domain master", "Auto") } } + else { + SambaConfig->GlobalSetMap({ + "security" => $remove ? "domain" : "ADS", + "realm" => $remove ? undef : $realm, + "template homedir" => $remove ? undef : "/home/%D/%U", + "winbind refresh tickets" => $remove ? undef : "yes" + }); + } } # Change Kerberos configuration (for AD). Uses current (previously read) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.16.5/src/samba-client.ycp new/yast2-samba-client-2.16.7/src/samba-client.ycp --- old/yast2-samba-client-2.16.5/src/samba-client.ycp 2008-04-11 12:13:13.000000000 +0200 +++ new/yast2-samba-client-2.16.7/src/samba-client.ycp 2008-04-11 14:19:56.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Main file * Authors: Stanislav Visnovsky <visnov@suse.cz> * - * $Id: samba-client.ycp 46292 2008-04-09 14:05:13Z jsuchome $ + * $Id: samba-client.ycp 46403 2008-04-11 12:19:56Z jsuchome $ * * Main file for samba-client configuration. Uses all other files. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.16.5/src/SambaNetJoin.pm new/yast2-samba-client-2.16.7/src/SambaNetJoin.pm --- old/yast2-samba-client-2.16.5/src/SambaNetJoin.pm 2008-04-11 13:59:41.000000000 +0200 +++ new/yast2-samba-client-2.16.7/src/SambaNetJoin.pm 2008-04-25 13:25:57.000000000 +0200 @@ -4,7 +4,7 @@ # Summary: Manage samba configuration data (smb.conf). # Authors: Martin Lazar <mlazar@suse.cz> # -# $Id: SambaNetJoin.pm 46292 2008-04-09 14:05:13Z jsuchome $ +# $Id: SambaNetJoin.pm 47068 2008-04-25 11:25:57Z jsuchome $ # package SambaNetJoin; @@ -99,7 +99,12 @@ . (($protocol ne "ads" && $netbios_name)?" -n '$netbios_name'":"") . " -U '" . ($user||"") . "%" . ($passwd||"") . "'"; - $cmd = $cmd. " -createcomputer="$machine"" if $machine; + if ($machine) { + $machine =~ s/dc=([^,]*)//gi; # remove DC=* parts + $machine =~ s/([^,]*)=//gi; # leave only values from the rest + my $m = join ('/', reverse (split (/,/,$machine))); + $cmd = $cmd. " createcomputer="$m"" if $m; + } my $result = SCR->Execute(".target.bash_output", $cmd); $cmd =~ s/(-U '[^%]*)%[^']*'/$1'/; # hide password in debug diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-client-2.16.5/VERSION new/yast2-samba-client-2.16.7/VERSION --- old/yast2-samba-client-2.16.5/VERSION 2008-04-11 14:09:51.000000000 +0200 +++ new/yast2-samba-client-2.16.7/VERSION 2008-04-25 13:14:41.000000000 +0200 @@ -1 +1 @@ -2.16.5 +2.16.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org