May 2008 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-installation
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package yast2-installation checked in at Sat May 31 12:15:06 CEST 2008. -------- --- yast2-installation/yast2-installation.changes 2008-05-19 16:55:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-installation/yast2-installation.changes 2008-05-28 16:53:45.226064000 +0200 @@ -1,0 +2,8 @@ +Wed May 28 16:23:22 CEST 2008 - ug(a)suse.de + +- timeout in case of hardware probing problems + when autoyast is in use (especially for harddisk Reports) + bnc#395099 +- 2.16.48 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.16.47.tar.bz2 New: ---- yast2-installation-2.16.48.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.B10574/_old 2008-05-31 12:14:59.000000000 +0200 +++ /var/tmp/diff_new_pack.B10574/_new 2008-05-31 12:14:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.16.47) +# spec file for package yast2-installation (Version 2.16.48) # # 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-installation -Version: 2.16.47 +Version: 2.16.48 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.16.47.tar.bz2 +Source0: yast2-installation-2.16.48.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # PackageCallbacks::RegisterEmptyProgressCallbacks() @@ -107,7 +107,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.16.47 +%setup -n yast2-installation-2.16.48 %build %{prefix}/bin/y2tool y2autoconf @@ -172,7 +172,13 @@ %doc %{prefix}/share/doc/packages/yast2-installation %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README + %changelog +* Wed May 28 2008 ug(a)suse.de +- timeout in case of hardware probing problems + when autoyast is in use (especially for harddisk Reports) + bnc#395099 +- 2.16.48 * Mon May 19 2008 locilka(a)suse.cz - Creating SuSEConfig hook file at installation_settings_finish in case of update. The file has to be created to force the ++++++ yast2-installation-2.16.47.tar.bz2 -> yast2-installation-2.16.48.tar.bz2 ++++++ ++++ 4829 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-installation-2.16.47/configure.in new/yast2-installation-2.16.48/configure.in --- old/yast2-installation-2.16.47/configure.in 2008-05-15 17:46:05.000000000 +0200 +++ new/yast2-installation-2.16.48/configure.in 2008-05-28 16:49:31.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.16.46, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.16.48, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -14,11 +14,10 @@ AC_PREFIX_DEFAULT(/usr) -dnl long filenames; we use GNU Make extensions and that's ok -AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) +AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.16.46" +VERSION="2.16.48" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -108,7 +107,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-tools.) + AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` 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-installation-2.16.47/control/docs/control-doc.xml new/yast2-installation-2.16.48/control/docs/control-doc.xml --- old/yast2-installation-2.16.47/control/docs/control-doc.xml 2008-04-17 11:08:34.000000000 +0200 +++ new/yast2-installation-2.16.48/control/docs/control-doc.xml 2007-05-21 12:30:24.000000000 +0200 @@ -28,7 +28,7 @@ 0.1 </revnumber> <date> - $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $ + $Date: 2004-10-27 16:25:24 +0200 (Mi, 27 Okt 2004) $ </date> <revremark>Initial Release as PDF</revremark> </revision> 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-installation-2.16.47/COPYRIGHT.english new/yast2-installation-2.16.48/COPYRIGHT.english --- old/yast2-installation-2.16.47/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-2.16.48/COPYRIGHT.english 2008-05-28 16:49:50.000000000 +0200 @@ -0,0 +1,340 @@ + 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-installation-2.16.47/Makefile.am new/yast2-installation-2.16.48/Makefile.am --- old/yast2-installation-2.16.47/Makefile.am 2008-05-15 17:46:05.000000000 +0200 +++ new/yast2-installation-2.16.48/Makefile.am 2008-05-28 16:49:31.000000000 +0200 @@ -23,14 +23,13 @@ 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_files_gpl = README COPYING COPYRIGHT.english 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)) -# less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally 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-installation-2.16.47/README new/yast2-installation-2.16.48/README --- old/yast2-installation-2.16.47/README 2008-05-19 17:00:35.000000000 +0200 +++ new/yast2-installation-2.16.48/README 2008-05-28 16:49:50.000000000 +0200 @@ -1,2 +1,2 @@ This program/library is part of YaST2 -See the file COPYING for license terms +See the file COPYRIGHT.english 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-installation-2.16.47/src/clients/inst_system_analysis.ycp new/yast2-installation-2.16.48/src/clients/inst_system_analysis.ycp --- old/yast2-installation-2.16.47/src/clients/inst_system_analysis.ycp 2008-04-17 11:08:36.000000000 +0200 +++ new/yast2-installation-2.16.48/src/clients/inst_system_analysis.ycp 2008-05-28 16:35:06.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Jiri Srain <jsrain(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * $Id: inst_system_analysis.ycp 46736 2008-04-16 13:11:00Z locilka $ + * $Id: inst_system_analysis.ycp 47922 2008-05-28 14:35:05Z ug $ * */ @@ -32,6 +32,12 @@ include "installation/misc.ycp"; include "packager/storage_include.ycp"; + if( Mode::autoinst() ) { + Report::Import( $[ "messages":$[ "timeout":10 ], + "errors":$[ "timeout":10 ], + "warnings":$[ "timeout":10 ]]); + } + // This dialog in not interactive // always return `back when came from the previous dialog if (GetInstArgs::going_back()) { 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-installation-2.16.47/VERSION new/yast2-installation-2.16.48/VERSION --- old/yast2-installation-2.16.47/VERSION 2008-05-19 16:55:38.000000000 +0200 +++ new/yast2-installation-2.16.48/VERSION 2008-05-28 16:46:58.000000000 +0200 @@ -1 +1 @@ -2.16.47 +2.16.48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vim
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package vim checked in at Sat May 31 12:14:35 CEST 2008. -------- --- vim/vim.changes 2008-04-30 17:35:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/vim/vim.changes 2008-05-28 13:34:40.162995000 +0200 @@ -1,0 +2,7 @@ +Wed May 28 13:40:09 CEST 2008 - rodrigo(a)suse.de + +- Added vim-7.1-remove-terrible-hack.patch to remove a "terrible" + hack that was moving the mouse 100 pixels to the top left for + KDE 3.1 window manager (bnc#392061) + +------------------------------------------------------------------- New: ---- vim-7.1-remove-terrible-hack.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vim.spec ++++++ --- /var/tmp/diff_new_pack.Ar8368/_old 2008-05-31 12:14:23.000000000 +0200 +++ /var/tmp/diff_new_pack.Ar8368/_new 2008-05-31 12:14:23.000000000 +0200 @@ -13,7 +13,7 @@ Name: vim Version: 7.1 -Release: 115 +Release: 125 # License: Other uncritical OpenSource License; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi @@ -86,6 +86,7 @@ Patch19: vim-7.1-diff_check.patch Patch20: vim-7.1-netrw_urlencode.patch Patch21: vim-7.1-filetype_changes.patch +Patch22: vim-7.1-remove-terrible-hack.patch # tbd??? %name-6.3-ga-utf8.diff # tbd??? %name-6.3-initvals.diff # tbd??? vim64-svn-crash.patch @@ -294,6 +295,7 @@ %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 cp %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{S:10} . rename no nb $RPM_BUILD_DIR/vim*/src/po/no.* rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no* @@ -656,6 +658,10 @@ %endif %changelog +* Wed May 28 2008 rodrigo(a)suse.de +- Added vim-7.1-remove-terrible-hack.patch to remove a "terrible" + hack that was moving the mouse 100 pixels to the top left for + KDE 3.1 window manager (bnc#392061) * Wed Apr 30 2008 mkoenig(a)suse.de - use Utility as primary category for the desktop file [bnc#382779] * Wed Mar 12 2008 mkoenig(a)suse.de ++++++ vim-7.1-remove-terrible-hack.patch ++++++ Index: src/gui_gtk.c =================================================================== --- src/gui_gtk.c.orig +++ src/gui_gtk.c @@ -2320,19 +2320,6 @@ gui_mch_dialog(int type, /* type of gtk_widget_destroy(dialog); } - /* Terrible hack: When the text area still has focus when we remove the - * dialog, somehow gvim loses window focus. This is with "point to type" - * in the KDE 3.1 window manager. Warp the mouse pointer to outside the - * window and back to avoid that. */ - if (!gui.in_focus) - { - int x, y; - - gdk_window_get_pointer(gui.drawarea->window, &x, &y, NULL); - gui_mch_setmouse(-100, -100); - gui_mch_setmouse(x, y); - } - return response > 0 ? response : 0; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-registration
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package yast2-registration checked in at Sat May 31 12:14:11 CEST 2008. -------- --- yast2-registration/yast2-registration.changes 2008-05-29 14:31:28.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-registration/yast2-registration.changes 2008-05-30 08:26:37.066257000 +0200 @@ -1,0 +2,13 @@ +Fri May 30 08:02:51 CEST 2008 - lslezak(a)suse.cz + +- initialize the target to read the GPG keys (bnc#394662) +- 2.16.7 + +------------------------------------------------------------------- +Thu May 29 17:33:18 CEST 2008 - locilka(a)suse.cz + +- Lslezak's patch for inst_suse_register to save all sources but + not to disable them (bnc #395333). +- 2.16.6 + +------------------------------------------------------------------- Old: ---- yast2-registration-2.16.5.tar.bz2 New: ---- yast2-registration-2.16.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.AL7283/_old 2008-05-31 12:14:05.000000000 +0200 +++ /var/tmp/diff_new_pack.AL7283/_new 2008-05-31 12:14:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-registration (Version 2.16.5) +# spec file for package yast2-registration (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-registration -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-registration-2.16.5.tar.bz2 +Source0: yast2-registration-2.16.7.tar.bz2 Prefix: /usr Requires: yast2 >= 2.16.6 Requires: suseRegister @@ -44,7 +44,7 @@ J. Daniel Schmidt <jdsn(a)suse.de> %prep -%setup -n yast2-registration-2.16.5 +%setup -n yast2-registration-2.16.7 %build %{prefix}/bin/y2tool y2autoconf @@ -95,7 +95,15 @@ /usr/share/YaST2/scrconf/cfg_suse_register.scr #fillup /var/adm/fillup-templates/sysconfig.suse_register-yast2-registration + %changelog +* Fri May 30 2008 lslezak(a)suse.cz +- initialize the target to read the GPG keys (bnc#394662) +- 2.16.7 +* Thu May 29 2008 locilka(a)suse.cz +- Lslezak's patch for inst_suse_register to save all sources but + not to disable them (bnc #395333). +- 2.16.6 * Thu May 29 2008 jdsn(a)suse.de - call Pkg::SourceRestore before adding new source (bnc#395333) - 2.16.5 ++++++ yast2-registration-2.16.5.tar.bz2 -> yast2-registration-2.16.7.tar.bz2 ++++++ ++++ 1859 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-registration-2.16.5/configure.in new/yast2-registration-2.16.7/configure.in --- old/yast2-registration-2.16.5/configure.in 2008-05-29 15:07:44.000000000 +0200 +++ new/yast2-registration-2.16.7/configure.in 2008-05-30 08:04:45.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-registration dnl -dnl -- This file is generated by y2autoconf 2.15.9 - 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-registration, 2.16.5, http://bugs.opensuse.org/, yast2-registration) +AC_INIT(yast2-registration, 2.16.7, http://bugs.opensuse.org/, yast2-registration) 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.16.5" +VERSION="2.16.7" RPMNAME="yast2-registration" MAINTAINER="J. Daniel Schmidt <jdsn(a)suse.de>" @@ -107,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 --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-registration-2.16.5/COPYRIGHT.english new/yast2-registration-2.16.7/COPYRIGHT.english --- old/yast2-registration-2.16.5/COPYRIGHT.english 2008-05-29 15:07:54.000000000 +0200 +++ new/yast2-registration-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-registration-2.16.5/Makefile.am new/yast2-registration-2.16.7/Makefile.am --- old/yast2-registration-2.16.5/Makefile.am 2008-05-29 15:07:44.000000000 +0200 +++ new/yast2-registration-2.16.7/Makefile.am 2008-05-30 08:04:45.000000000 +0200 @@ -23,13 +23,14 @@ 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)) +# less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally 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-registration-2.16.5/README new/yast2-registration-2.16.7/README --- old/yast2-registration-2.16.5/README 2008-05-29 15:07:54.000000000 +0200 +++ new/yast2-registration-2.16.7/README 2008-05-30 08:11:22.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-registration-2.16.5/src/clients/inst_suse_register.ycp new/yast2-registration-2.16.7/src/clients/inst_suse_register.ycp --- old/yast2-registration-2.16.5/src/clients/inst_suse_register.ycp 2008-05-29 14:21:53.000000000 +0200 +++ new/yast2-registration-2.16.7/src/clients/inst_suse_register.ycp 2008-05-30 08:00:42.000000000 +0200 @@ -856,7 +856,7 @@ { // (bnc#395333) y2milestone ("Current sources: %1", Pkg::SourceGetCurrent (true)); // #172665 - Pkg::SourceFinishAll (); + Pkg::SourceSaveAll(); Pkg::TargetFinish (); Wizard::CloseDialog(); } 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-registration-2.16.5/src/clients/piwo.ycp new/yast2-registration-2.16.7/src/clients/piwo.ycp --- old/yast2-registration-2.16.5/src/clients/piwo.ycp 2008-05-09 14:20:17.000000000 +0200 +++ new/yast2-registration-2.16.7/src/clients/piwo.ycp 2008-05-30 08:02:22.000000000 +0200 @@ -19,6 +19,12 @@ Wizard::CreateDialog(); +// initialize the target - read GPG keys (bnc#394662) +// (only in running system) +if (Mode::normal()) +{ + Pkg::TargetInit("/", true); +} ProductControl::custom_control_file = piwoControlFile; 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-registration-2.16.5/VERSION new/yast2-registration-2.16.7/VERSION --- old/yast2-registration-2.16.5/VERSION 2008-05-29 14:31:34.000000000 +0200 +++ new/yast2-registration-2.16.7/VERSION 2008-05-30 08:03:54.000000000 +0200 @@ -1 +1 @@ -2.16.5 +2.16.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit syslogd
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package syslogd checked in at Sat May 31 12:14:00 CEST 2008. -------- --- syslogd/syslogd.changes 2008-05-20 16:59:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/syslogd/syslogd.changes 2008-05-30 12:33:01.424824000 +0200 @@ -1,0 +2,11 @@ +Fri May 30 12:32:52 CEST 2008 - werner(a)suse.de + +- No flock() as this seems to be broken in newer glibc (bnc#395114) +- No fortify, make sylog function of klogd private (bnc#395666) + +------------------------------------------------------------------- +Wed May 28 12:15:37 CEST 2008 - werner(a)suse.de + +- Be able to write errors on writing pid file to tty (bnc#394787) + +------------------------------------------------------------------- New: ---- sysklogd-1.4.1-clearing.patch sysklogd-1.4.1-nofortify.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslogd.spec ++++++ --- /var/tmp/diff_new_pack.WR4530/_old 2008-05-31 12:13:39.000000000 +0200 +++ /var/tmp/diff_new_pack.WR4530/_new 2008-05-31 12:13:39.000000000 +0200 @@ -20,7 +20,7 @@ Provides: syslog AutoReqProv: on Version: 1.4.1 -Release: 674 +Release: 676 Summary: The Syslog daemon Source: sysklogd-1.4.1.tar.bz2 Source1: logrotate.syslog @@ -49,6 +49,8 @@ Patch17: sysklogd-1.4.1-ksym.patch Patch18: sysklogd-1.4.1-dontsleep.patch Patch19: sysklogd-1.4.1-signal.dif +Patch20: sysklogd-1.4.1-clearing.patch +Patch21: sysklogd-1.4.1-nofortify.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -113,6 +115,8 @@ %patch17 -p1 -b .ksym %patch18 -p1 -b .sleep %patch19 -p0 -b .signal +%patch20 -p0 -b .clear +%patch21 -p0 -b .nofortify %patch0 -p0 %build @@ -227,6 +231,11 @@ %{omc_svcdir}/syslog.xml %changelog +* Fri May 30 2008 werner(a)suse.de +- No flock() as this seems to be broken in newer glibc (bnc#395114) +- No fortify, make sylog function of klogd private (bnc#395666) +* Wed May 28 2008 werner(a)suse.de +- Be able to write errors on writing pid file to tty (bnc#394787) * Tue May 20 2008 mt(a)suse.de - Added syslog(8) meta manual page to klogd package describing the syslog service (SYSLOG_DAEMON variable) handling (bnc#373960). ++++++ sysklogd-1.4.1-clearing.patch ++++++ ! ! Be able to write errors on creating of pid file on ! the current terminal (bug #394787) ! --- klogd.c +++ klogd.c 2008-05-28 12:01:46.000000000 +0200 @@ -1098,6 +1098,10 @@ int main(argc, argv) auto int fl; int num_fds = getdtablesize(); + /* tuck my process id away */ + if (!write_pid(PidFile)) + Terminate(); + /* This is the child closing its file descriptors. */ for (fl= 0; fl <= num_fds; ++fl) { @@ -1117,19 +1121,18 @@ int main(argc, argv) fputs("klogd: Already running.\n", stderr); exit(1); } - } - - - /* tuck my process id away */ - if (!check_pid(PidFile)) - { - if (!write_pid(PidFile)) + } else { + /* tuck my process id away */ + if (!check_pid(PidFile)) + { + if (!write_pid(PidFile)) + Terminate(); + } + else + { + fputs("klogd: Already running.\n", stderr); Terminate(); - } - else - { - fputs("klogd: Already running.\n", stderr); - Terminate(); + } } #endif --- pidfile.c +++ pidfile.c 2008-05-29 23:43:35.280028303 +0200 @@ -23,6 +23,7 @@ * Sat Aug 19 13:24:33 MET DST 1995: Martin Schulze * First version (v0.2) released */ +#define USE_FCNTL 1 #include <stdio.h> #include <unistd.h> @@ -31,6 +32,10 @@ #include <string.h> #include <errno.h> #include <signal.h> +#if defined(USE_FCNTL) && (USE_FCNTL != 0) +# include <unistd.h> +# include <fcntl.h> +#endif /* read_pid * @@ -86,6 +91,9 @@ int write_pid (char *pidfile) FILE *f; int fd; int pid; +#if defined(USE_FCNTL) && (USE_FCNTL != 0) + struct flock lck; +#endif if ( ((fd = open(pidfile, O_RDWR|O_CREAT, 0644)) == -1) || ((f = fdopen(fd, "r+")) == NULL) ) { @@ -93,23 +101,46 @@ int write_pid (char *pidfile) return 0; } +#if defined(USE_FCNTL) && (USE_FCNTL != 0) + memset(&lck, 0, sizeof (struct flock)); + lck.l_type = F_WRLCK; + lck.l_whence = SEEK_SET; + + if (fcntl(fd, F_SETLK, &lck) == -1) { + fclose(f); + memset(&lck, 0, sizeof (struct flock)); + fcntl(fd, F_GETLK, &lck); + fprintf(stderr, "Can't lock, lock is held by pid %d.\n", lck.l_pid); + return 0; + } +#else if (flock(fd, LOCK_EX|LOCK_NB) == -1) { fscanf(f, "%d", &pid); fclose(f); - printf("Can't lock, lock is held by pid %d.\n", pid); + fprintf(stderr, "Can't lock, lock is held by pid %d.\n", pid); return 0; } +#endif pid = getpid(); if (!fprintf(f,"%d\n", pid)) { - printf("Can't write pid , %s.\n", strerror(errno)); + fprintf(stderr, "Can't write pid , %s.\n", strerror(errno)); close(fd); return 0; } fflush(f); - if (flock(fd, LOCK_UN) == -1) { - printf("Can't unlock pidfile %s, %s.\n", pidfile, strerror(errno)); +#if defined(USE_FCNTL) && (USE_FCNTL != 0) + memset(&lck, 0, sizeof (struct flock)); + lck.l_type = F_UNLCK; + lck.l_whence = SEEK_SET; + + if (fcntl(fd, F_SETLK, &lck) == -1) +#else + if (flock(fd, LOCK_UN) == -1) +#endif + { + fprintf(stderr,"Can't unlock pidfile %s, %s.\n", pidfile, strerror(errno)); close(fd); return 0; } --- syslogd.c +++ syslogd.c 2008-05-28 12:12:25.000000000 +0200 @@ -22,7 +22,7 @@ char copyright2[] = #endif /* not lint */ #if !defined(lint) && !defined(NO_SCCS) -static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88"; +static char sccsid[] __attribute__ ((unused)) = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88"; #endif /* not lint */ /* @@ -821,8 +821,10 @@ int main(argc, argv) int len, num_fds; #else /* __GLIBC__ */ #ifndef TESTING +#ifdef SYSLOG_INET size_t len; #endif +#endif int num_fds; #endif /* __GLIBC__ */ /* @@ -841,7 +843,9 @@ int main(argc, argv) fd_set readfds; #ifndef TESTING +#ifdef SYSLOG_UNIXAF int fd; +#endif #ifdef SYSLOG_INET #ifdef INET6 struct sockaddr_storage frominet; @@ -856,7 +860,9 @@ int main(argc, argv) int ch; struct hostent *hent; +#if defined(SYSLOG_UNIXAF) || defined(TESTING) char line[MAXLINE +1]; +#endif extern int optind; extern char *optarg; int maxfds; @@ -975,10 +981,19 @@ int main(argc, argv) case 0: signal (SIGTERM, SIG_DFL); + /* tuck my process id away */ + dprintf("Writing pidfile.\n"); + if (!write_pid(PidFile)) + { + dprintf("Can't write pid.\n"); + exit(1); + } + num_fds = getdtablesize(); for (i = 0; i < num_fds; i++) (void) close(i); untty(); + break; } } else @@ -988,32 +1003,32 @@ int main(argc, argv) } } else + { #endif debugging_on = 1; #ifndef SYSV - else setlinebuf(stdout); #endif - #ifndef TESTING - /* tuck my process id away */ - if ( !Debug ) - { - dprintf("Writing pidfile.\n"); - if (!check_pid(PidFile)) + /* tuck my process id away */ + if ( !Debug ) { - if (!write_pid(PidFile)) + dprintf("Writing pidfile.\n"); + if (!check_pid(PidFile)) { - dprintf("Can't write pid.\n"); + if (!write_pid(PidFile)) + { + dprintf("Can't write pid.\n"); + exit(1); + } + } + else + { + dprintf("Pidfile (and pid) already exist.\n"); exit(1); } - } - else - { - dprintf("Pidfile (and pid) already exist.\n"); - exit(1); - } - } /* if ( !Debug ) */ + } /* if ( !Debug ) */ + } #endif consfile.f_type = F_CONSOLE; @@ -1659,8 +1674,13 @@ void logmsg(pri, msg, from, flags) int flags; { register struct filed *f; - int fac, prilev, lognum; + int fac, prilev; int msglen; +#ifndef SYSV + int omask; +#else + int lognum; +#endif char *timestamp; dprintf("logmsg: %s, flags %x, from %s, msg %s\n", textpri(pri), flags, from, msg); @@ -2402,11 +2422,9 @@ void init() register int i, lognum; register FILE *cf; register struct filed *f; -#ifndef TESTING #ifndef SYSV register struct filed **nextp = (struct filed **) 0; #endif -#endif register char *p; register unsigned int Forwarding = 0; #ifdef CONT_LINE @@ -2487,7 +2505,7 @@ void init() #else *nextp = (struct filed *)calloc(1, sizeof(*f)); cfline("*.ERR\t" _PATH_CONSOLE, *nextp); - (*nextp)->f_next = (struct filed *)calloc(1, sizeof(*f)) /* ASP */ + (*nextp)->f_next = (struct filed *)calloc(1, sizeof(*f)); /* ASP */ cfline("*.PANIC\t*", (*nextp)->f_next); #endif Initialized = 1; ++++++ sysklogd-1.4.1.dif ++++++ --- /var/tmp/diff_new_pack.WR4530/_old 2008-05-31 12:13:40.000000000 +0200 +++ /var/tmp/diff_new_pack.WR4530/_new 2008-05-31 12:13:40.000000000 +0200 @@ -1,6 +1,6 @@ --- .pkgextract +++ .pkgextract 2006-02-08 17:29:50.000000000 +0100 -@@ -0,0 +1,19 @@ +@@ -0,0 +1,20 @@ +patch -p0 -b --suffix=.dgram -s < ../sysklogd-1.4.1-dgram.patch +patch -p0 -b --suffix=.sparc -s < ../sysklogd-1.4.1-sparc.patch +patch -p0 -b --suffix=.forw -s < ../sysklogd-1.4.1-forw.patch @@ -20,6 +20,7 @@ +patch -p1 -b --suffix=.ksym -s < ../sysklogd-1.4.1-ksym.patch +patch -p1 -b --suffix=.sleep -s < ../sysklogd-1.4.1-dontsleep.patch +patch -p0 -b --suffix=.signal -s < ../sysklogd-1.4.1-signal.dif ++patch -p0 -b --suffix=.clear -s < ../sysklogd-1.4.1-clearing.patch --- Makefile +++ Makefile 2006-02-08 17:29:50.000000000 +0100 @@ -1,14 +1,17 @@ @@ -44,7 +45,7 @@ MANDIR = /usr/man # There is one report that under an all ELF system there may be a need to -@@ -25,7 +28,7 @@ +@@ -25,7 +28,7 @@ MANDIR = /usr/man # Define the following to impart start-up delay in klogd. This is # useful if klogd is started simultaneously or in close-proximity to syslogd. @@ -53,7 +54,7 @@ # The following define determines whether the package adheres to the # file system standard. -@@ -112,11 +115,12 @@ +@@ -112,11 +115,12 @@ clobber: clean rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd install_exec: syslogd klogd @@ -73,8 +74,8 @@ + ${INSTALL} -m 644 syslog.conf.5 ${DESTDIR}${MANDIR}/man5/syslog.conf.5 + ${INSTALL} -m 644 klogd.8 ${DESTDIR}${MANDIR}/man8/klogd.8 --- klogd.c -+++ klogd.c 2006-02-08 17:38:21.000000000 +0100 -@@ -275,15 +275,29 @@ ++++ klogd.c 2008-05-30 12:23:07.616318420 +0200 +@@ -275,15 +275,21 @@ _syscall3(int,ksyslog,int, type, char *, #define ksyslog klogctl #endif @@ -95,19 +96,12 @@ -#else +# else static char *PidFile = "/etc/klogd.pid"; +-#endif +# endif #endif -+ -+#if defined(__USE_FORTIFY_LEVEL) -+# undef syslog -+# undef vsyslog -+# undef openlog -+# undef closelog -+# undef setlogmask - #endif - static int kmsg, -@@ -295,6 +309,8 @@ + #include "fortify.h" +@@ -297,6 +303,8 @@ static int kmsg, static int use_syscall = 0, one_shot = 0, @@ -116,7 +110,7 @@ symbol_lookup = 1, no_fork = 0; /* don't fork - don't run in daemon mode */ -@@ -868,8 +884,7 @@ +@@ -872,8 +880,7 @@ static void LogLine(char *ptr, int len) value = strtoul(sym_start+1, (char **) 0, 16); *(line-1) = '>'; /* put back delim */ @@ -126,7 +120,7 @@ { parse_state = PARSING_TEXT; break; -@@ -910,7 +925,7 @@ +@@ -914,7 +921,7 @@ static void LogLine(char *ptr, int len) static void LogKernelLine(void) { @@ -135,7 +129,7 @@ /* * Zero-fill the log buffer. This should cure a multitude of -@@ -919,6 +934,11 @@ +@@ -923,6 +930,11 @@ static void LogKernelLine(void) * messages into this fresh buffer. */ memset(log_buffer, '\0', log_buf_size); @@ -147,7 +141,7 @@ if ( (rdcnt = ksyslog(2, log_buffer, log_buf_size-1)) < 0 ) { if ( errno == EINTR ) -@@ -1010,10 +1030,15 @@ +@@ -1014,10 +1026,15 @@ int main(argc, argv) *output = (char *) 0; #ifndef TESTING @@ -165,7 +159,7 @@ switch((char)ch) { case '2': /* Print lines with symbols twice. */ -@@ -1044,6 +1069,14 @@ +@@ -1048,6 +1065,14 @@ int main(argc, argv) case 'o': /* One-shot mode. */ one_shot = 1; break; @@ -180,7 +174,7 @@ case 'p': SetParanoiaLevel(1); /* Load symbols on oops. */ break; -@@ -1164,8 +1197,11 @@ +@@ -1171,8 +1196,11 @@ int main(argc, argv) if ( one_shot ) { if (symbol_lookup) { @@ -194,7 +188,7 @@ } if ( (logsrc = GetKernelLogSrc()) == kernel ) LogKernelLine(); -@@ -1180,8 +1216,11 @@ +@@ -1187,8 +1215,11 @@ int main(argc, argv) #endif logsrc = GetKernelLogSrc(); if (symbol_lookup) { @@ -209,8 +203,8 @@ /* The main loop. */ --- pidfile.c -+++ pidfile.c 2006-02-08 17:29:50.000000000 +0100 -@@ -41,11 +41,11 @@ ++++ pidfile.c 2008-05-30 00:04:24.000000000 +0200 +@@ -46,11 +46,11 @@ int read_pid (char *pidfile) { FILE *f; @@ -224,24 +218,32 @@ fclose(f); return pid; } -@@ -85,7 +85,7 @@ +@@ -90,7 +90,7 @@ int write_pid (char *pidfile) { FILE *f; int fd; - int pid; + int pid = 0; - - if ( ((fd = open(pidfile, O_RDWR|O_CREAT, 0644)) == -1) - || ((f = fdopen(fd, "r+")) == NULL) ) { -@@ -94,7 +94,7 @@ + #if defined(USE_FCNTL) && (USE_FCNTL != 0) + struct flock lck; + #endif +@@ -115,14 +115,14 @@ int write_pid (char *pidfile) } - + #else if (flock(fd, LOCK_EX|LOCK_NB) == -1) { - fscanf(f, "%d", &pid); + (void)fscanf(f, "%d", &pid); fclose(f); - printf("Can't lock, lock is held by pid %d.\n", pid); + fprintf(stderr, "Can't lock, lock is held by pid %d.\n", pid); return 0; + } + #endif + +- pid = getpid(); ++ pid = (int)getpid(); + if (!fprintf(f,"%d\n", pid)) { + fprintf(stderr, "Can't write pid , %s.\n", strerror(errno)); + close(fd); --- resolve.c +++ resolve.c 2006-02-08 17:29:50.000000000 +0100 @@ -13,6 +13,7 @@ @@ -252,7 +254,7 @@ #if defined(__GLIBC__) #define dprintf mydprintf -@@ -208,7 +209,7 @@ +@@ -208,7 +209,7 @@ do_query(int fd, int family, const char { struct sockaddr_storage ss; struct addrinfo hints, *res; @@ -261,7 +263,7 @@ memset(&hints, 0, sizeof(hints)); hints.ai_socktype = SOCK_DGRAM; -@@ -244,6 +245,20 @@ +@@ -244,6 +245,20 @@ do_query(int fd, int family, const char } else { memcpy(&ss, res->ai_addr, res->ai_addrlen); } @@ -412,7 +414,7 @@ +local6,local7.* -/var/log/localmessages --- syslog.c +++ syslog.c 2006-02-08 17:29:50.000000000 +0100 -@@ -70,7 +70,20 @@ +@@ -70,7 +70,13 @@ static char sccsid[] = "@(#)syslog.c 5.2 #include <paths.h> #include <stdio.h> @@ -424,19 +426,12 @@ +# define _PATH_LOGNAME "/dev/log" +#endif + -+#if defined(__USE_FORTIFY_LEVEL) -+# undef syslog -+# undef vsyslog -+# undef openlog -+# undef closelog -+# undef setlogmask -+#endif - static int LogFile = -1; /* fd for log */ - static int connected; /* have done connect */ + #include "fortify.h" + --- syslogd.c -+++ syslogd.c 2006-02-08 17:29:50.000000000 +0100 -@@ -466,6 +466,7 @@ ++++ syslogd.c 2008-05-28 12:14:25.000000000 +0200 +@@ -466,6 +466,7 @@ static char sccsid[] __attribute__ ((un #include <sys/types.h> #endif #include <utmp.h> @@ -444,7 +439,7 @@ #include <ctype.h> #include <string.h> #include <setjmp.h> -@@ -579,7 +580,11 @@ +@@ -579,7 +580,11 @@ int funix[MAXFUNIX] = { -1, }; # define UNAMESZ 8 /* length of a login name */ #endif #define MAXUNAMES 20 /* maximum number of user names */ @@ -457,7 +452,7 @@ #define INTERNAL_NOPRI 0x10 /* the "no priority" priority */ #define TABLE_NOPRI 0 /* Value to indicate no priority in f_pmask */ -@@ -659,8 +664,8 @@ +@@ -659,8 +664,8 @@ struct filed { * in seconds after previous message is logged. After each flush, * we move to the next interval until we reach the largest. */ @@ -468,25 +463,25 @@ #define REPEATTIME(f) ((f)->f_time + repeatinterval[(f)->f_repeatcount]) #define BACKOFF(f) { if (++(f)->f_repeatcount > MAXREPEAT) \ (f)->f_repeatcount = MAXREPEAT; \ -@@ -771,7 +776,7 @@ - char **crunch_list(char *list); - int usage(void); +@@ -774,7 +779,7 @@ int usage(void); + static pid_t sid; + #endif void untty(void); -void printchopped(const char *hname, char *msg, int len, int fd); +void printchopped(const char *hname, char *msg, size_t len, int fd); void printline(const char *hname, char *msg); void printsys(char *msg); void logmsg(int pri, char *msg, const char *from, int flags); -@@ -816,7 +821,7 @@ - int len, num_fds; +@@ -822,7 +827,7 @@ int main(argc, argv) #else /* __GLIBC__ */ #ifndef TESTING + #ifdef SYSLOG_INET - size_t len; + socklen_t len; #endif + #endif int num_fds; - #endif /* __GLIBC__ */ -@@ -857,7 +862,12 @@ +@@ -868,7 +873,12 @@ int main(argc, argv) int maxfds; #ifndef TESTING @@ -500,8 +495,8 @@ #endif for (i = 1; i < MAXFUNIX; i++) { funixn[i] = ""; -@@ -1029,13 +1039,15 @@ - *p = tolower(*p); +@@ -1074,13 +1084,15 @@ int main(argc, argv) + leave = 0; (void) signal(SIGTERM, die); + (void) siginterrupt(SIGTERM,1); /* Make recvfrom() be able to receive EINTR */ @@ -517,7 +512,7 @@ /* Create a partial message table for all file descriptors. */ num_fds = getdtablesize(); -@@ -1193,7 +1205,7 @@ +@@ -1243,7 +1255,7 @@ int main(argc, argv) * -Joey */ printchopped(from, line, \ @@ -526,7 +521,7 @@ } else if (i < 0 && errno != EINTR) { dprintf("INET socket error: %d = %s.\n", \ errno, strerror(errno)); -@@ -1212,7 +1224,7 @@ +@@ -1262,7 +1274,7 @@ int main(argc, argv) parts[fileno(stdin)] = (char *) 0; i = read(fileno(stdin), line, MAXLINE); if (i > 0) { @@ -535,7 +530,7 @@ } else if (i < 0) { if (errno != EINTR) { logerror("stdin"); -@@ -1257,8 +1269,9 @@ +@@ -1307,8 +1319,9 @@ static int create_unix_socket(const char close(fd); #ifndef SYSV dienow(); @@ -546,7 +541,7 @@ } return fd; } -@@ -1435,7 +1448,7 @@ +@@ -1485,7 +1498,7 @@ void untty() void printchopped(hname, msg, len, fd) const char *hname; char *msg; @@ -555,7 +550,7 @@ int fd; { auto int ptlngth; -@@ -1535,6 +1548,8 @@ +@@ -1585,6 +1598,8 @@ void printline(hname, msg) while ((c = *p++) && q < &line[sizeof(line) - 4]) { if (c == '\n') *q++ = ' '; @@ -564,7 +559,7 @@ else if (c < 040) { *q++ = '^'; *q++ = c ^ 0100; -@@ -1702,7 +1717,7 @@ +@@ -1756,7 +1771,7 @@ void logmsg(pri, msg, from, flags) !strcmp(from, f->f_prevhost)) { (void) strncpy(f->f_lasttime, timestamp, 15); f->f_prevcount++; @@ -573,7 +568,7 @@ f->f_prevcount, now - f->f_time, repeatinterval[f->f_repeatcount]); /* -@@ -2031,13 +2046,7 @@ +@@ -2085,13 +2100,7 @@ void wallmsg(f, iov) register struct filed *f; struct iovec *iov; { @@ -587,7 +582,7 @@ if (reenter++) return; -@@ -2051,9 +2060,18 @@ +@@ -2105,9 +2114,18 @@ void wallmsg(f, iov) * and doing notty(). */ if (fork() == 0) { @@ -606,7 +601,7 @@ #ifndef SYSV (void) signal(SIGTTOU, SIG_IGN); (void) sigsetmask(0); -@@ -2069,7 +2087,7 @@ +@@ -2123,7 +2141,7 @@ void wallmsg(f, iov) /* is this slot used? */ if (ut.ut_name[0] == '\0') continue; @@ -615,7 +610,7 @@ continue; if (!(strcmp (ut.ut_name,"LOGIN"))) /* paranoia */ continue; -@@ -2249,7 +2267,7 @@ +@@ -2301,7 +2319,7 @@ void domark() for (f = Files; f; f = f->f_next) { #endif if (f->f_prevcount && now >= REPEATTIME(f)) { @@ -624,7 +619,7 @@ TypeNames[f->f_type], f->f_prevcount, repeatinterval[f->f_repeatcount]); fprintlog(f, LocalHostName, 0, (char *)NULL); -@@ -2259,6 +2277,7 @@ +@@ -2311,6 +2329,7 @@ void domark() } (void) signal(SIGALRM, domark); (void) alarm(TIMERINTVL); ++++++ sysklogd-1.4.1-nofortify.patch ++++++ --- fortify.h +++ fortify.h 2008-05-30 12:18:14.874490898 +0200 @@ -0,0 +1,17 @@ +#if defined(__USE_FORTIFY_LEVEL) +# undef syslog +# undef vsyslog +# undef openlog +# undef closelog +# undef setlogmask +extern void priv_syslog(int, const char *, ...); +extern void priv_vsyslog(int, const char *, va_list); +extern void priv_openlog(const char *, int, int); +extern void priv_closelog(void); +extern int priv_setlogmask(int); +# define syslog priv_syslog +# define vsyslog priv_vsyslog +# define openlog priv_openlog +# define closelog priv_closelog +# define setlogmask priv_setlogmask +#endif --- klogd.c +++ klogd.c 2008-05-30 12:19:59.501151202 +0200 @@ -286,6 +286,8 @@ static char *PidFile = "/etc/klogd.pid"; #endif #endif +#include "fortify.h" + static int kmsg, change_state = 0, terminate = 0, --- syslog.c +++ syslog.c 2008-05-30 12:20:24.799728870 +0200 @@ -72,6 +72,8 @@ static char sccsid[] = "@(#)syslog.c 5.2 #define _PATH_LOGNAME "/dev/log" +#include "fortify.h" + static int LogFile = -1; /* fd for log */ static int connected; /* have done connect */ static int LogStat = 0; /* status bits, set by openlog() */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit samba
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package samba checked in at Sat May 31 12:13:31 CEST 2008. -------- --- samba/samba.changes 2008-05-23 17:36:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/samba.changes 2008-05-30 19:20:17.000000000 +0200 @@ -1,0 +2,24 @@ +Fri May 30 19:18:17 CEST 2008 - lmuelle(a)suse.de + +- Set only CONFIGDIR and LIBDIR while make everything and install. No longer + set CONFIGFILE, DRIVERFILE, LMHOSTSFILE, and SMB_PASSWD_FILE; [bnc#395877]. + +------------------------------------------------------------------- +Wed May 28 17:49:51 CEST 2008 - lmuelle(a)suse.de + +- Update to 3.0.30. + + Fix for CVE-2008-1105. + + Remove man pages for ldb tools not included in Samba 3.0. + +------------------------------------------------------------------- +Wed May 28 16:15:43 CEST 2008 - lmuelle(a)suse.de + +- Fix vulnerability that allows for the execution of arbitrary code in smbd; + CVE-2008-1105; SA30228; [#391168]. + +------------------------------------------------------------------- +Tue May 27 11:07:45 CEST 2008 - coolo(a)suse.de + +- Follow the rename of libtdb0 in baselibs.conf. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.YOU389/_old 2008-05-31 12:12:31.000000000 +0200 +++ /var/tmp/diff_new_pack.YOU389/_new 2008-05-31 12:12:31.000000000 +0200 @@ -19,7 +19,7 @@ License: GPL v3 or later Url: http://www.samba.org/ Version: 3.2.0 -Release: 17 +Release: 19 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -299,7 +299,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.YOU389/_old 2008-05-31 12:12:31.000000000 +0200 +++ /var/tmp/diff_new_pack.YOU389/_new 2008-05-31 12:12:31.000000000 +0200 @@ -44,7 +44,7 @@ Url: http://www.samba.org/ AutoReqProv: on Version: 3.2.0 -Release: 17 +Release: 19 Requires: samba-client >= %{version} PreReq: /bin/cp /bin/mkdir /bin/mv /bin/rm /bin/touch /usr/bin/dirname /usr/bin/grep /usr/sbin/groupadd /usr/bin/tr Summary: A SMB/CIFS File, Print, and Authentication Server @@ -108,7 +108,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %package client @@ -145,7 +145,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -166,7 +166,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %endif @@ -196,7 +196,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %endif @@ -222,7 +222,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %if %{make_utils} @@ -265,7 +265,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -300,7 +300,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %else @@ -314,7 +314,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %endif @@ -348,7 +348,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %package -n libnetapi0 @@ -367,7 +367,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %package -n libnetapi-devel @@ -387,7 +387,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -414,7 +414,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %else @@ -428,7 +428,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %endif @@ -459,7 +459,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %if %{make_ldapsmb} @@ -480,7 +480,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %package -n libtalloc-devel @@ -500,7 +500,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %package -n libtdb1 @@ -519,7 +519,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %package -n libtdb-devel @@ -539,7 +539,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %package -n libwbclient0 @@ -558,7 +558,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %package -n libwbclient-devel @@ -578,7 +578,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %package -n ldapsmb @@ -587,7 +587,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 190 +Release: 192 Requires: perl-ldap %description -n ldapsmb @@ -600,7 +600,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %endif @@ -622,7 +622,7 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %endif @@ -652,7 +652,7 @@ -------- Rainer Link <rainer(a)openantivirus.org> -Source Timestamp: 1784 +Source Timestamp: 1795 Branch : trunk %endif @@ -799,7 +799,8 @@ %{__make} proto %endif %{__make} %{?jobs:-j%jobs} \ - CODEPAGEDIR=%{_libdir}/samba \ + CONFIGDIR=%{CONFIGDIR} \ + LIBDIR=%{_libdir}/samba \ everything #%{__make} %{?jobs:-j%jobs} -C tdb tdbtest tdbtorture %if %{make_vscan} @@ -855,11 +856,8 @@ ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System %{__make} -C source/ install \ DESTDIR=${RPM_BUILD_ROOT} \ - CONFIGFILE=%{CONFIGDIR}/smb.conf \ - DRIVERFILE=%{CONFIGDIR}/printers.def \ - LIBDIR=%{_libdir}/samba \ - LMHOSTSFILE=%{CONFIGDIR}/lmhosts \ - SMB_PASSWD_FILE=%{CONFIGDIR}/smbpasswd + CONFIGDIR=%{CONFIGDIR} \ + LIBDIR=%{_libdir}/samba # utility scripts scripts="creategroup mksmbpasswd.sh" mkdir -p examples/scripts @@ -1596,6 +1594,18 @@ %endif %changelog +* Fri May 30 2008 lmuelle(a)suse.de +- Set only CONFIGDIR and LIBDIR while make everything and install. No longer + set CONFIGFILE, DRIVERFILE, LMHOSTSFILE, and SMB_PASSWD_FILE; [bnc#395877]. +* Wed May 28 2008 lmuelle(a)suse.de +- Update to 3.0.30. + + Fix for CVE-2008-1105. + + Remove man pages for ldb tools not included in Samba 3.0. +* Wed May 28 2008 lmuelle(a)suse.de +- Fix vulnerability that allows for the execution of arbitrary code in smbd; + CVE-2008-1105; SA30228; [#391168]. +* Tue May 27 2008 coolo(a)suse.de +- Follow the rename of libtdb0 in baselibs.conf. * Fri May 23 2008 lmuelle(a)suse.de - Rename sub package libtdb0 to libtdb1. * Fri May 23 2008 lmuelle(a)suse.de ++++++ baselibs.conf ++++++ --- samba/baselibs.conf 2008-05-17 23:57:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/baselibs.conf 2008-05-27 11:15:00.000000000 +0200 @@ -1,7 +1,7 @@ libsmbclient libsmbclient0 libtalloc1 -libtdb0 +libtdb1 libwbclient0 samba -/usr/lib/samba ++++++ build-source-timestamp ++++++ --- samba/build-source-timestamp 2008-05-23 18:20:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/samba/build-source-timestamp 2008-05-30 19:23:39.000000000 +0200 @@ -1,2 +1,2 @@ -1784 +1795 Branch : trunk ++++++ patches.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/samba.org/CVE-2008-1105_3.2.diff new/patches/samba.org/CVE-2008-1105_3.2.diff --- old/patches/samba.org/CVE-2008-1105_3.2.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/CVE-2008-1105_3.2.diff 2008-05-28 12:47:18.000000000 +0200 @@ -0,0 +1,326 @@ +diff --git source/client/client.c source/client/client.c +index e08fa89..d684ba8 100644 +--- source/client/client.c ++++ source/client/client.c +@@ -4382,7 +4382,7 @@ static void readline_callback(void) + + set_smb_read_error(&cli->smb_rw_error, SMB_READ_OK); + +- status = receive_smb_raw(cli->fd, cli->inbuf, 0, 0, &len); ++ status = receive_smb_raw(cli->fd, cli->inbuf, cli->bufsize, 0, 0, &len); + + if (!NT_STATUS_IS_OK(status)) { + DEBUG(0, ("Read from server failed, maybe it closed " +diff --git source/lib/util_sock.c source/lib/util_sock.c +index f252377..b2a1ece 100644 +--- source/lib/util_sock.c ++++ source/lib/util_sock.c +@@ -1151,16 +1151,15 @@ NTSTATUS read_smb_length(int fd, char *inbuf, unsigned int timeout, + } + + /**************************************************************************** +- Read an smb from a fd. Note that the buffer *MUST* be of size +- BUFFER_SIZE+SAFETY_MARGIN. ++ Read an smb from a fd. + The timeout is in milliseconds. + This function will return on receipt of a session keepalive packet. + maxlen is the max number of bytes to return, not including the 4 byte +- length. If zero it means BUFFER_SIZE+SAFETY_MARGIN limit. ++ length. If zero it means buflen limit. + Doesn't check the MAC on signed packets. + ****************************************************************************/ + +-NTSTATUS receive_smb_raw(int fd, char *buffer, unsigned int timeout, ++NTSTATUS receive_smb_raw(int fd, char *buffer, size_t buflen, unsigned int timeout, + size_t maxlen, size_t *p_len) + { + size_t len; +@@ -1173,17 +1172,10 @@ NTSTATUS receive_smb_raw(int fd, char *buffer, unsigned int timeout, + return status; + } + +- /* +- * A WRITEX with CAP_LARGE_WRITEX can be 64k worth of data plus 65 bytes +- * of header. Don't print the error if this fits.... JRA. +- */ +- +- if (len > (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE)) { ++ if (len > buflen) { + DEBUG(0,("Invalid packet length! (%lu bytes).\n", + (unsigned long)len)); +- if (len > BUFFER_SIZE + (SAFETY_MARGIN/2)) { +- return NT_STATUS_INVALID_PARAMETER; +- } ++ return NT_STATUS_INVALID_PARAMETER; + } + + if(len > 0) { +diff --git source/libsmb/clientgen.c source/libsmb/clientgen.c +index 6419123..2af4383 100644 +--- source/libsmb/clientgen.c ++++ source/libsmb/clientgen.c +@@ -57,8 +57,7 @@ int cli_set_port(struct cli_state *cli, int port) + } + + /**************************************************************************** +- Read an smb from a fd ignoring all keepalive packets. Note that the buffer +- *MUST* be of size BUFFER_SIZE+SAFETY_MARGIN. ++ Read an smb from a fd ignoring all keepalive packets. + The timeout is in milliseconds + + This is exactly the same as receive_smb except that it never returns +@@ -76,8 +75,8 @@ static ssize_t client_receive_smb(struct cli_state *cli, size_t maxlen) + + set_smb_read_error(&cli->smb_rw_error, SMB_READ_OK); + +- status = receive_smb_raw(cli->fd, cli->inbuf, cli->timeout, +- maxlen, &len); ++ status = receive_smb_raw(cli->fd, cli->inbuf, cli->bufsize, ++ cli->timeout, maxlen, &len); + if (!NT_STATUS_IS_OK(status)) { + DEBUG(10,("client_receive_smb failed\n")); + show_msg(cli->inbuf); +@@ -225,93 +224,6 @@ ssize_t cli_receive_smb_data(struct cli_state *cli, char *buffer, size_t len) + return -1; + } + +-/**************************************************************************** +- Read a smb readX header. +- We can only use this if encryption and signing are off. +-****************************************************************************/ +- +-bool cli_receive_smb_readX_header(struct cli_state *cli) +-{ +- ssize_t len, offset; +- +- if (cli->fd == -1) +- return false; +- +- again: +- +- /* Read up to the size of a readX header reply. */ +- len = client_receive_smb(cli, (smb_size - 4) + 24); +- +- if (len > 0) { +- /* it might be an oplock break request */ +- if (!(CVAL(cli->inbuf, smb_flg) & FLAG_REPLY) && +- CVAL(cli->inbuf,smb_com) == SMBlockingX && +- SVAL(cli->inbuf,smb_vwv6) == 0 && +- SVAL(cli->inbuf,smb_vwv7) == 0) { +- ssize_t total_len = smb_len(cli->inbuf); +- +- if (total_len > CLI_SAMBA_MAX_LARGE_READX_SIZE+SAFETY_MARGIN) { +- goto read_err; +- } +- +- /* Read the rest of the data. */ +- if ((total_len - len > 0) && +- !cli_receive_smb_data(cli,cli->inbuf+len,total_len - len)) { +- goto read_err; +- } +- +- if (cli->oplock_handler) { +- int fnum = SVAL(cli->inbuf,smb_vwv2); +- unsigned char level = CVAL(cli->inbuf,smb_vwv3+1); +- if (!cli->oplock_handler(cli, fnum, level)) return false; +- } +- /* try to prevent loops */ +- SCVAL(cli->inbuf,smb_com,0xFF); +- goto again; +- } +- } +- +- /* If it's not the above size it probably was an error packet. */ +- +- if ((len == (smb_size - 4) + 24) && !cli_is_error(cli)) { +- /* Check it's a non-chained readX reply. */ +- if (!(CVAL(cli->inbuf, smb_flg) & FLAG_REPLY) || +- (CVAL(cli->inbuf,smb_vwv0) != 0xFF) || +- (CVAL(cli->inbuf,smb_com) != SMBreadX)) { +- /* +- * We're not coping here with asnyc replies to +- * other calls. Punt here - we need async client +- * libs for this. +- */ +- goto read_err; +- } +- +- /* +- * We know it's a readX reply - ensure we've read the +- * padding bytes also. +- */ +- +- offset = SVAL(cli->inbuf,smb_vwv6); +- if (offset > len) { +- ssize_t ret; +- size_t padbytes = offset - len; +- ret = cli_receive_smb_data(cli,smb_buf(cli->inbuf),padbytes); +- if (ret != padbytes) { +- goto read_err; +- } +- } +- } +- +- return true; +- +- read_err: +- +- cli->smb_rw_error = SMB_READ_ERROR; +- close(cli->fd); +- cli->fd = -1; +- return false; +-} +- + static ssize_t write_socket(int fd, const char *buf, size_t len) + { + ssize_t ret=0; +diff --git source/libsmb/clireadwrite.c source/libsmb/clireadwrite.c +index 12ba4b7..487f446 100644 +--- source/libsmb/clireadwrite.c ++++ source/libsmb/clireadwrite.c +@@ -472,106 +472,6 @@ ssize_t cli_read(struct cli_state *cli, int fnum, char *buf, + return ret; + } + +-#if 0 /* relies on client_receive_smb(), now a static in libsmb/clientgen.c */ +- +-/* This call is INCOMPATIBLE with SMB signing. If you remove the #if 0 +- you must fix ensure you don't attempt to sign the packets - data +- *will* be currupted */ +- +-/**************************************************************************** +-Issue a single SMBreadraw and don't wait for a reply. +-****************************************************************************/ +- +-static bool cli_issue_readraw(struct cli_state *cli, int fnum, off_t offset, +- size_t size, int i) +-{ +- +- if (!cli->sign_info.use_smb_signing) { +- DEBUG(0, ("Cannot use readraw and SMB Signing\n")); +- return False; +- } +- +- memset(cli->outbuf,'\0',smb_size); +- memset(cli->inbuf,'\0',smb_size); +- +- cli_set_message(cli->outbuf,10,0,True); +- +- SCVAL(cli->outbuf,smb_com,SMBreadbraw); +- SSVAL(cli->outbuf,smb_tid,cli->cnum); +- cli_setup_packet(cli); +- +- SSVAL(cli->outbuf,smb_vwv0,fnum); +- SIVAL(cli->outbuf,smb_vwv1,offset); +- SSVAL(cli->outbuf,smb_vwv2,size); +- SSVAL(cli->outbuf,smb_vwv3,size); +- SSVAL(cli->outbuf,smb_mid,cli->mid + i); +- +- return cli_send_smb(cli); +-} +- +-/**************************************************************************** +- Tester for the readraw call. +-****************************************************************************/ +- +-ssize_t cli_readraw(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size) +-{ +- char *p; +- int size2; +- size_t readsize; +- ssize_t total = 0; +- +- if (size == 0) +- return 0; +- +- /* +- * Set readsize to the maximum size we can handle in one readraw. +- */ +- +- readsize = 0xFFFF; +- +- while (total < size) { +- readsize = MIN(readsize, size-total); +- +- /* Issue a read and receive a reply */ +- +- if (!cli_issue_readraw(cli, fnum, offset, readsize, 0)) +- return -1; +- +- if (!client_receive_smb(cli->fd, cli->inbuf, cli->timeout)) +- return -1; +- +- size2 = smb_len(cli->inbuf); +- +- if (size2 > readsize) { +- DEBUG(5,("server returned more than we wanted!\n")); +- return -1; +- } else if (size2 < 0) { +- DEBUG(5,("read return < 0!\n")); +- return -1; +- } +- +- /* Copy data into buffer */ +- +- if (size2) { +- p = cli->inbuf + 4; +- memcpy(buf + total, p, size2); +- } +- +- total += size2; +- offset += size2; +- +- /* +- * If the server returned less than we asked for we're at EOF. +- */ +- +- if (size2 < readsize) +- break; +- } +- +- return total; +-} +-#endif +- + /**************************************************************************** + Issue a single SMBwrite and don't wait for a reply. + ****************************************************************************/ +diff --git source/smbd/process.c source/smbd/process.c +index 5946989..ed34e9b 100644 +--- source/smbd/process.c ++++ source/smbd/process.c +@@ -120,9 +120,7 @@ static bool valid_packet_size(size_t len) + if (len > (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE)) { + DEBUG(0,("Invalid packet length! (%lu bytes).\n", + (unsigned long)len)); +- if (len > BUFFER_SIZE + (SAFETY_MARGIN/2)) { +- return false; +- } ++ return false; + } + return true; + } +diff --git source/utils/smbfilter.c source/utils/smbfilter.c +index e128e1c..d274e09 100644 +--- source/utils/smbfilter.c ++++ source/utils/smbfilter.c +@@ -171,7 +171,8 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss) + if (c != -1 && FD_ISSET(c, &fds)) { + size_t len; + if (!NT_STATUS_IS_OK(receive_smb_raw( +- c, packet, 0, 0, &len))) { ++ c, packet, sizeof(packet), ++ 0, 0, &len))) { + d_printf("client closed connection\n"); + exit(0); + } +@@ -184,7 +185,8 @@ static void filter_child(int c, struct sockaddr_storage *dest_ss) + if (s != -1 && FD_ISSET(s, &fds)) { + size_t len; + if (!NT_STATUS_IS_OK(receive_smb_raw( +- s, packet, 0, 0, &len))) { ++ s, packet, sizeof(packet), ++ 0, 0, &len))) { + d_printf("server closed connection\n"); + exit(0); + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches/series new/patches/series --- old/patches/series 2008-05-23 16:43:35.000000000 +0200 +++ new/patches/series 2008-05-28 12:43:35.000000000 +0200 @@ -5,6 +5,7 @@ # allows quilt to work in the usual way (= outside of our RPM spec file). # Samba patches from upstream, svnanon.Samba.org +samba.org/CVE-2008-1105_3.2.diff -p0 # SuSE specific changes # disabled -> WIP lmuelle ++++++ vendor-files.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2008-05-23 18:20:58.000000000 +0200 +++ new/vendor-files/tools/package-data 2008-05-30 19:23:38.000000000 +0200 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="1784" +SAMBA_PACKAGE_SVN_VERSION="1795" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-theme
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package yast2-theme checked in at Sat May 31 12:12:56 CEST 2008. -------- --- yast2-theme/yast2-theme.changes 2008-05-27 17:46:42.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-theme/yast2-theme.changes 2008-05-30 12:02:27.646907000 +0200 @@ -1,0 +2,18 @@ +Fri May 30 11:55:50 CEST 2008 - sh(a)suse.de + +- Added icons for yast-casa (bnc #384744) +- V 2.16.35 + +------------------------------------------------------------------- +Thu May 29 15:10:24 CEST 2008 - sh(a)suse.de + +- Moved 48x48/yast2-casa-ats to correct directory (bnc #384744) +- V 2.16.34 + +------------------------------------------------------------------- +Wed May 28 11:44:38 CEST 2008 - sh(a)suse.de + +- Added yast-casa-ats icons (bnc #384744) +- V 2.16.33 + +------------------------------------------------------------------- Old: ---- yast2-theme-2.16.32.tar.bz2 New: ---- yast2-theme-2.16.35.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-theme.spec ++++++ --- /var/tmp/diff_new_pack.eO1470/_old 2008-05-31 12:12:41.000000000 +0200 +++ /var/tmp/diff_new_pack.eO1470/_new 2008-05-31 12:12:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-theme (Version 2.16.32) +# spec file for package yast2-theme (Version 2.16.35) # # 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-theme -Version: 2.16.32 +Version: 2.16.35 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-theme-2.16.32.tar.bz2 +Source0: yast2-theme-2.16.35.tar.bz2 Prefix: /usr BuildRequires: fdupes hicolor-icon-theme pkg-config update-desktop-files yast2 yast2-devtools BuildArch: noarch @@ -35,7 +35,7 @@ %package openSUSE License: GPL v2 or later Summary: YaST2 - Theme (openSUSE) -Version: 2.16.32 +Version: 2.16.35 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -50,7 +50,7 @@ %package openSUSE-Crystal License: GPL v2 or later Summary: YaST2 - Theme (openSUSE) -Version: 2.16.32 +Version: 2.16.35 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -59,7 +59,7 @@ %package openSUSE-Oxygen License: GPL v2 or later Summary: YaST2 - Theme (openSUSE) -Version: 2.16.32 +Version: 2.16.35 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -94,7 +94,7 @@ Ken Wimer <wimer(a)suse.de> %prep -%setup -n yast2-theme-2.16.32 +%setup -n yast2-theme-2.16.35 %build %{prefix}/bin/y2tool y2autoconf @@ -187,6 +187,15 @@ %dir /usr/share/YaST2/theme /usr/share/YaST2/theme/openSUSE-Oxygen %changelog +* Fri May 30 2008 sh(a)suse.de +- Added icons for yast-casa (bnc #384744) +- V 2.16.35 +* Thu May 29 2008 sh(a)suse.de +- Moved 48x48/yast2-casa-ats to correct directory (bnc #384744) +- V 2.16.34 +* Wed May 28 2008 sh(a)suse.de +- Added yast-casa-ats icons (bnc #384744) +- V 2.16.33 * Tue May 27 2008 dmacvicar(a)suse.de - fix text color broken in previous changes. - V 2.16.32 ++++++ yast2-theme-2.16.32.tar.bz2 -> yast2-theme-2.16.35.tar.bz2 ++++++ ++++ 10327 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-theme-2.16.32/configure.in new/yast2-theme-2.16.35/configure.in --- old/yast2-theme-2.16.32/configure.in 2008-05-27 17:46:23.000000000 +0200 +++ new/yast2-theme-2.16.35/configure.in 2008-05-30 12:01:15.000000000 +0200 @@ -1,8 +1,8 @@ dnl configure.in for yast2-theme dnl -dnl -- This file is generated by y2autoconf 2.16.7 - 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-theme, 2.16.32, http://bugs.opensuse.org/, yast2-theme) +AC_INIT(yast2-theme, 2.16.35, http://bugs.opensuse.org/, yast2-theme) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.32" +VERSION="2.16.35" RPMNAME="yast2-theme" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" 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-theme-2.16.32/missing new/yast2-theme-2.16.35/missing --- old/yast2-theme-2.16.32/missing 2008-05-27 17:46:27.000000000 +0200 +++ new/yast2-theme-2.16.35/missing 2008-05-30 12:01:21.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2005-06-08.21 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,8 +33,6 @@ 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. @@ -46,7 +44,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= @@ -79,7 +77,6 @@ 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 @@ -109,7 +106,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. ;; @@ -138,7 +135,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 @@ -167,7 +164,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";; @@ -195,8 +192,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` if test -f "$file"; then touch $file else @@ -217,25 +214,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 test $# -ne 1; then + if [ $# -ne 1 ]; then eval LASTARG="\${$#}" - case $LASTARG in + case "$LASTARG" in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if test ! -f y.tab.h; then + if [ ! -f y.tab.h ]; then echo >y.tab.h fi - if test ! -f y.tab.c; then + if [ ! -f y.tab.c ]; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -247,18 +244,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if test $# -ne 1; then + if [ $# -ne 1 ]; then eval LASTARG="\${$#}" - case $LASTARG in + case "$LASTARG" in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if test ! -f lex.yy.c; then + if [ ! -f lex.yy.c ]; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -270,9 +267,11 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then + 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 touch $file else test -z "$file" || exec >$file @@ -290,17 +289,11 @@ 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 "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` 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 @@ -324,13 +317,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 Files old/yast2-theme-2.16.32/openSUSE/icons/22x22/apps/yast-casa-ats.png and new/yast2-theme-2.16.35/openSUSE/icons/22x22/apps/yast-casa-ats.png differ Files old/yast2-theme-2.16.32/openSUSE/icons/22x22/apps/yast-casa.png and new/yast2-theme-2.16.35/openSUSE/icons/22x22/apps/yast-casa.png differ Files old/yast2-theme-2.16.32/openSUSE/icons/32x32/apps/yast-casa-ats.png and new/yast2-theme-2.16.35/openSUSE/icons/32x32/apps/yast-casa-ats.png differ Files old/yast2-theme-2.16.32/openSUSE/icons/32x32/apps/yast-casa.png and new/yast2-theme-2.16.35/openSUSE/icons/32x32/apps/yast-casa.png differ Files old/yast2-theme-2.16.32/openSUSE/icons/48x48/apps/yast-casa-ats.png and new/yast2-theme-2.16.35/openSUSE/icons/48x48/apps/yast-casa-ats.png differ Files old/yast2-theme-2.16.32/openSUSE/icons/48x48/apps/yast-casa.png and new/yast2-theme-2.16.35/openSUSE/icons/48x48/apps/yast-casa.png differ Files old/yast2-theme-2.16.32/openSUSE-Oxygen/icons/22x22/apps/yast-casa-ats.png and new/yast2-theme-2.16.35/openSUSE-Oxygen/icons/22x22/apps/yast-casa-ats.png differ Files old/yast2-theme-2.16.32/openSUSE-Oxygen/icons/22x22/apps/yast-casa.png and new/yast2-theme-2.16.35/openSUSE-Oxygen/icons/22x22/apps/yast-casa.png differ Files old/yast2-theme-2.16.32/openSUSE-Oxygen/icons/32x32/apps/yast-casa-ats.png and new/yast2-theme-2.16.35/openSUSE-Oxygen/icons/32x32/apps/yast-casa-ats.png differ Files old/yast2-theme-2.16.32/openSUSE-Oxygen/icons/32x32/apps/yast-casa.png and new/yast2-theme-2.16.35/openSUSE-Oxygen/icons/32x32/apps/yast-casa.png differ Files old/yast2-theme-2.16.32/openSUSE-Oxygen/icons/48x48/apps/yast-casa-ats.png and new/yast2-theme-2.16.35/openSUSE-Oxygen/icons/48x48/apps/yast-casa-ats.png differ Files old/yast2-theme-2.16.32/openSUSE-Oxygen/icons/48x48/apps/yast-casa.png and new/yast2-theme-2.16.35/openSUSE-Oxygen/icons/48x48/apps/yast-casa.png differ 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-theme-2.16.32/VERSION new/yast2-theme-2.16.35/VERSION --- old/yast2-theme-2.16.32/VERSION 2008-05-27 17:43:27.000000000 +0200 +++ new/yast2-theme-2.16.35/VERSION 2008-05-30 11:55:47.000000000 +0200 @@ -1 +1 @@ -2.16.32 +2.16.35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-repair
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package yast2-repair checked in at Sat May 31 12:12:33 CEST 2008. -------- --- yast2-repair/yast2-repair.changes 2008-05-22 15:10:07.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-repair/yast2-repair.changes 2008-05-29 12:16:21.847648000 +0200 @@ -1,0 +2,6 @@ +Thu May 29 11:00:17 CEST 2008 - jsuchome(a)suse.cz + +- mount /proc, /dev, /sys before writing new bootloader (bnc#395302) +- 2.16.12 + +------------------------------------------------------------------- Old: ---- yast2-repair-2.16.11.tar.bz2 New: ---- yast2-repair-2.16.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-repair.spec ++++++ --- /var/tmp/diff_new_pack.m31174/_old 2008-05-31 12:12:19.000000000 +0200 +++ /var/tmp/diff_new_pack.m31174/_new 2008-05-31 12:12:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-repair (Version 2.16.11) +# spec file for package yast2-repair (Version 2.16.12) # # 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-repair -Version: 2.16.11 +Version: 2.16.12 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-repair-2.16.11.tar.bz2 +Source0: yast2-repair-2.16.12.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-packager yast2-storage yast2-testsuite Requires: yast2 gpart reiserfs e2fsprogs yast2-bootloader yast2-storage @@ -35,7 +35,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-repair-2.16.11 +%setup -n yast2-repair-2.16.12 %build %{prefix}/bin/y2tool y2autoconf @@ -69,6 +69,9 @@ /usr/share/YaST2/include/repair/* %doc %{prefix}/share/doc/packages/yast2-repair %changelog +* Thu May 29 2008 jsuchome(a)suse.cz +- mount /proc, /dev, /sys before writing new bootloader (bnc#395302) +- 2.16.12 * Thu May 22 2008 jsuchome(a)suse.cz - more checks if partitions are mounted (bnc#372238) - 2.16.11 ++++++ yast2-repair-2.16.11.tar.bz2 -> yast2-repair-2.16.12.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.11/src/OSRBoot.ycp new/yast2-repair-2.16.12/src/OSRBoot.ycp --- old/yast2-repair-2.16.11/src/OSRBoot.ycp 2007-10-25 13:37:43.000000000 +0200 +++ new/yast2-repair-2.16.12/src/OSRBoot.ycp 2008-05-29 12:15:46.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Bootloader checks * Authors: Johannes Buchhold <jbuch(a)suse.de> * - * $Id: OSRBoot.ycp 41564 2007-10-25 11:37:43Z jsuchome $ + * $Id: OSRBoot.ycp 47936 2008-05-29 10:15:53Z jsuchome $ * * Provide osr mode information. */ @@ -1270,11 +1270,12 @@ Wizard::CreateDialog (); // prepare environment for saving boot loader settings - string destproc = "/proc"; - SCR::Execute (.target.mkdir, destproc, 0755); - SCR::Execute (.target.mount, ["proc", destproc], "-t proc"); - SCR::Execute (.target.bash, "/sbin/SuSEconfig --module bootsplash"); - + WFM::Execute (.local.bash, + sformat ("mount --bind /proc %1/proc", root_mountpoint)); + WFM::Execute (.local.bash, + sformat ("mount --bind /sys %1/sys", root_mountpoint)); + WFM::Execute (.local.bash, + sformat ("mount --bind /dev %1/dev", root_mountpoint)); boolean g_ret = Bootloader::Write(); Wizard::CloseDialog(); @@ -1282,8 +1283,9 @@ // message popup Report::Message(_("The boot loader was installed successfully.")); - SCR::Execute (.target.umount, "/proc"); - WFM::Execute(.local.umount, root_mountpoint + "/proc" ); + WFM::Execute (.local.umount, root_mountpoint + "/proc"); + WFM::Execute (.local.umount, root_mountpoint + "/sys"); + WFM::Execute (.local.umount, root_mountpoint + "/dev"); } return ret; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-repair-2.16.11/VERSION new/yast2-repair-2.16.12/VERSION --- old/yast2-repair-2.16.11/VERSION 2008-05-22 14:53:51.000000000 +0200 +++ new/yast2-repair-2.16.12/VERSION 2008-05-29 11:00:46.000000000 +0200 @@ -1 +1 @@ -2.16.11 +2.16.12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nss-mdns
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package nss-mdns checked in at Sat May 31 12:12:12 CEST 2008. -------- --- nss-mdns/nss-mdns.changes 2008-04-22 10:14:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/nss-mdns/nss-mdns.changes 2008-05-28 15:52:10.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 28 15:49:14 CEST 2008 - olh(a)suse.de + +- change the recommends for XXbit packages to a supplements + add a Conflicts: != version to the XXbit packages, to give a hint + during manual package upgrades (bnc#336678) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nss-mdns.spec ++++++ --- /var/tmp/diff_new_pack.N29057/_old 2008-05-31 12:12:00.000000000 +0200 +++ /var/tmp/diff_new_pack.N29057/_new 2008-05-31 12:12:00.000000000 +0200 @@ -15,7 +15,7 @@ # lynx is not needed, text version of README is already present #BuildRequires: lynx Version: 0.10 -Release: 5 +Release: 13 Group: Productivity/Networking/DNS/Utilities License: LGPL v2.1 or later Url: http://0pointer.de/lennart/projects/nss-mdns/ @@ -26,12 +26,6 @@ PreReq: sed grep Requires: avahi BuildRoot: %{_tmppath}/%{name}-%{version}-build -%ifarch x86_64 s390x -Recommends: %{name}-32bit = %{version} -%endif -%ifarch ppc -Recommends: %{name}-64bit = %{version} -%endif %description nss-mdns is a plug-in for the GNU Name Service Switch (NSS) @@ -143,6 +137,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 28 2008 olh(a)suse.de +- change the recommends for XXbit packages to a supplements + add a Conflicts: != version to the XXbit packages, to give a hint + during manual package upgrades (bnc#336678) * Tue Apr 22 2008 coolo(a)suse.de - degrading the requires to recommends. It's very well possible to install a system with just 64bit ++++++ baselibs.conf ++++++ --- nss-mdns/baselibs.conf 2008-04-10 12:15:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/nss-mdns/baselibs.conf 2008-05-28 16:03:57.000000000 +0200 @@ -1 +1,4 @@ nss-mdns + conflicts "nss-mdns-<targettype> < <version>" + conflicts "nss-mdns-<targettype> > <version>" + supplements "packageand(nss-mdns:glibc-<targettype>)" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-registration
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package yast2-registration checked in at Sat May 31 12:11:54 CEST 2008. -------- --- yast2-registration/yast2-registration.changes 2008-05-26 17:07:18.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-registration/yast2-registration.changes 2008-05-29 14:31:28.172661000 +0200 @@ -1,0 +2,11 @@ +Thu May 29 14:26:25 CEST 2008 - jdsn(a)suse.de + +- call Pkg::SourceRestore before adding new source (bnc#395333) +- 2.16.5 + +------------------------------------------------------------------- +Tue May 27 18:10:13 CEST 2008 - jdsn(a)suse.de + +- handling cancel event in info window (bnc#217249) + +------------------------------------------------------------------- Old: ---- yast2-registration-2.16.4.tar.bz2 New: ---- yast2-registration-2.16.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-registration.spec ++++++ --- /var/tmp/diff_new_pack.b27904/_old 2008-05-31 12:11:38.000000000 +0200 +++ /var/tmp/diff_new_pack.b27904/_new 2008-05-31 12:11:38.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-registration (Version 2.16.4) +# spec file for package yast2-registration (Version 2.16.5) # # 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-registration -Version: 2.16.4 +Version: 2.16.5 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-registration-2.16.4.tar.bz2 +Source0: yast2-registration-2.16.5.tar.bz2 Prefix: /usr Requires: yast2 >= 2.16.6 Requires: suseRegister @@ -44,7 +44,7 @@ J. Daniel Schmidt <jdsn(a)suse.de> %prep -%setup -n yast2-registration-2.16.4 +%setup -n yast2-registration-2.16.5 %build %{prefix}/bin/y2tool y2autoconf @@ -96,6 +96,11 @@ #fillup /var/adm/fillup-templates/sysconfig.suse_register-yast2-registration %changelog +* Thu May 29 2008 jdsn(a)suse.de +- call Pkg::SourceRestore before adding new source (bnc#395333) +- 2.16.5 +* Tue May 27 2008 jdsn(a)suse.de +- handling cancel event in info window (bnc#217249) * Mon May 26 2008 jdsn(a)suse.de - fix preselected checkboxes (bnc#390367) - create repositories with proper umask (bnc#392072) ++++++ yast2-registration-2.16.4.tar.bz2 -> yast2-registration-2.16.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.4/configure new/yast2-registration-2.16.5/configure --- old/yast2-registration-2.16.4/configure 2008-05-26 17:48:35.000000000 +0200 +++ new/yast2-registration-2.16.5/configure 2008-05-29 15:07:48.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-registration 2.16.4. +# Generated by GNU Autoconf 2.61 for yast2-registration 2.16.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-registration' PACKAGE_TARNAME='yast2-registration' -PACKAGE_VERSION='2.16.4' -PACKAGE_STRING='yast2-registration 2.16.4' +PACKAGE_VERSION='2.16.5' +PACKAGE_STRING='yast2-registration 2.16.5' 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-registration 2.16.4 to adapt to many kinds of systems. +\`configure' configures yast2-registration 2.16.5 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-registration 2.16.4:";; + short | recursive ) echo "Configuration of yast2-registration 2.16.5:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-registration configure 2.16.4 +yast2-registration configure 2.16.5 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-registration $as_me 2.16.4, which was +It was created by yast2-registration $as_me 2.16.5, 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-registration' - VERSION='2.16.4' + VERSION='2.16.5' cat >>confdefs.h <<_ACEOF @@ -2408,7 +2408,7 @@ -VERSION="2.16.4" +VERSION="2.16.5" RPMNAME="yast2-registration" MAINTAINER="J. Daniel Schmidt <jdsn(a)suse.de>" @@ -3303,7 +3303,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-registration $as_me 2.16.4, which was +This file was extended by yast2-registration $as_me 2.16.5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3346,7 +3346,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-registration config.status 2.16.4 +yast2-registration config.status 2.16.5 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-registration-2.16.4/configure.in new/yast2-registration-2.16.5/configure.in --- old/yast2-registration-2.16.4/configure.in 2008-05-26 17:48:30.000000000 +0200 +++ new/yast2-registration-2.16.5/configure.in 2008-05-29 15:07:44.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-registration, 2.16.4, http://bugs.opensuse.org/, yast2-registration) +AC_INIT(yast2-registration, 2.16.5, http://bugs.opensuse.org/, yast2-registration) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.16.4" +VERSION="2.16.5" RPMNAME="yast2-registration" MAINTAINER="J. Daniel Schmidt <jdsn(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.4/src/clients/inst_suse_register.ycp new/yast2-registration-2.16.5/src/clients/inst_suse_register.ycp --- old/yast2-registration-2.16.4/src/clients/inst_suse_register.ycp 2008-05-09 14:20:17.000000000 +0200 +++ new/yast2-registration-2.16.5/src/clients/inst_suse_register.ycp 2008-05-29 14:21:53.000000000 +0200 @@ -609,7 +609,7 @@ info_ret = UI::UserInput(); if ( is(info_ret, string) ) launchBrowser( (string) info_ret); - } until ( info_ret == `info_close ); + } until ( info_ret == `info_close || info_ret == `cancel ); UI::CloseDialog(); } @@ -626,6 +626,11 @@ { if ( configure_status == true ) { + if (Mode::normal()) + { // (bnc#395333) + Pkg::SourceRestore(); + y2milestone ("Current sources: %1", Pkg::SourceGetCurrent (true)); + } // remove the zmd flag file (requested by mvidner) SCR::Execute(.target.bash, " rm -f /var/lib/zypp/zmd_updated_the_sources " ); @@ -848,11 +853,12 @@ SourceManager::Unlock (); if (Mode::normal()) - { - // #172665 - Pkg::SourceFinishAll (); - Pkg::TargetFinish (); - Wizard::CloseDialog(); + { // (bnc#395333) + y2milestone ("Current sources: %1", Pkg::SourceGetCurrent (true)); + // #172665 + Pkg::SourceFinishAll (); + Pkg::TargetFinish (); + Wizard::CloseDialog(); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-registration-2.16.4/VERSION new/yast2-registration-2.16.5/VERSION --- old/yast2-registration-2.16.4/VERSION 2008-05-26 17:00:11.000000000 +0200 +++ new/yast2-registration-2.16.5/VERSION 2008-05-29 14:31:34.000000000 +0200 @@ -1 +1 @@ -2.16.4 +2.16.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit NetworkManager-gnome
by root＠Hilbert.suse.de 31 May '08

31 May '08

Hello community, here is the log from the commit of package NetworkManager-gnome checked in at Sat May 31 12:11:47 CEST 2008. -------- --- GNOME/NetworkManager-gnome/NetworkManager-gnome.changes 2008-05-23 14:36:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/NetworkManager-gnome/NetworkManager-gnome.changes 2008-05-28 17:24:21.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 28 17:23:54 CEST 2008 - sbrabec(a)suse.cz + +- Do not call gtk-update-icon-cache (bnc#395056). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-gnome.spec ++++++ --- /var/tmp/diff_new_pack.r28023/_old 2008-05-31 12:11:43.000000000 +0200 +++ /var/tmp/diff_new_pack.r28023/_new 2008-05-31 12:11:43.000000000 +0200 @@ -13,7 +13,7 @@ Name: NetworkManager-gnome Url: http://www.gnome.org/projects/NetworkManager/ Version: 0.7.0.r729 -Release: 1 +Release: 4 License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: NetworkManager-devel NetworkManager-glib PolicyKit-gnome-devel dbus-1-devel dbus-1-glib gconf2-devel gnome-keyring-devel gtk2-devel hal-devel intltool libglade2-devel libgnomeui-devel libnotify-devel libtool @@ -56,20 +56,6 @@ %clean rm -rf "$RPM_BUILD_ROOT" -%post -# Touch gtk-icon-theme directory to make sure the change is noticed, -# even if gtk-update-icon-cache fails for some reason. -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi - -%postun -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi - %files -f nm-applet.lang %defattr(-,root,root) %doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING @@ -85,6 +71,8 @@ %{_includedir}/NetworkManager/nm-vpn-ui-interface.h %changelog +* Wed May 28 2008 sbrabec(a)suse.cz +- Do not call gtk-update-icon-cache (bnc#395056). * Fri May 23 2008 tambet(a)suse.de - Show error dialog if updating, adding, or removing connection fails in connection editor. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0