November 2007 - openSUSE Commits - openSUSE Mailing Lists

commit yast2
by root＠Hilbert.suse.de 29 Nov '07

29 Nov '07

Hello community, here is the log from the commit of package yast2 checked in at Thu Nov 29 18:29:01 CET 2007. -------- --- yast2/yast2.changes 2007-11-27 19:29:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2007-11-29 13:21:04.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 29 13:19:11 CET 2007 - mzugec(a)suse.cz + +- for AY Confirm::Detection popup has timeout 10 seconds (#192181) +- 2.16.15 + +------------------------------------------------------------------- Old: ---- yast2-2.16.14.tar.bz2 New: ---- yast2-2.16.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.G28847/_old 2007-11-29 18:28:37.000000000 +0100 +++ /var/tmp/diff_new_pack.G28847/_new 2007-11-29 18:28:37.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.16.14) +# spec file for package yast2 (Version 2.16.15) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2 -Version: 2.16.14 +Version: 2.16.15 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.16.14.tar.bz2 +Source0: yast2-2.16.15.tar.bz2 Prefix: /usr Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-pkg-bindings yast2-testsuite @@ -123,7 +123,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.16.14 +%setup -n yast2-2.16.15 %build %{prefix}/bin/y2tool y2autoconf @@ -225,7 +225,11 @@ %doc %{prefix}/share/doc/packages/yast2/system %doc %{prefix}/share/doc/packages/yast2/types %doc %{prefix}/share/doc/packages/yast2/wizard + %changelog +* Thu Nov 29 2007 - mzugec(a)suse.cz +- for AY Confirm::Detection popup has timeout 10 seconds (#192181) +- 2.16.15 * Tue Nov 27 2007 - sh(a)suse.de - Require yast2-core >= 2.16.10 in .spec - 2.16.14 ++++++ yast2-2.16.14.tar.bz2 -> yast2-2.16.15.tar.bz2 ++++++ ++++ 22483 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-2.16.14/configure.in new/yast2-2.16.15/configure.in --- old/yast2-2.16.14/configure.in 2007-11-22 16:38:14.000000000 +0100 +++ new/yast2-2.16.15/configure.in 2007-11-29 13:15:05.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.16.2 - 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, 2.16.11, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.16.14, http://bugs.opensuse.org/, yast2) 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.11" +VERSION="2.16.14" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" 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-2.16.14/COPYRIGHT.english new/yast2-2.16.15/COPYRIGHT.english --- old/yast2-2.16.14/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.16.15/COPYRIGHT.english 2007-11-29 13:20:22.000000000 +0100 @@ -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-2.16.14/library/modules/Version.ycp new/yast2-2.16.15/library/modules/Version.ycp --- old/yast2-2.16.14/library/modules/Version.ycp 2007-11-27 19:29:14.000000000 +0100 +++ new/yast2-2.16.15/library/modules/Version.ycp 2007-11-29 13:19:49.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.16.14"; +global string yast2 = "2.16.15"; /* EOF */ } 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-2.16.14/library/network/src/yast2-services-translations.ycp new/yast2-2.16.15/library/network/src/yast2-services-translations.ycp --- old/yast2-2.16.14/library/network/src/yast2-services-translations.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.16.15/library/network/src/yast2-services-translations.ycp 2007-11-07 10:53:43.000000000 +0100 @@ -0,0 +1,226 @@ +{ + /** + * This file contains only translations for + * FATE #300687: Ports for SuSEfirewall added via packages + * + * Translations are grabbed when 'make pot' is called. + */ + + textdomain "firewall-services"; + + string tmpstring = nil; + + // TRANSLATORS: Name of Service (rpm: apache2), can be used as check box, item in multiple selection box... + tmpstring = _("Apache 2"); + + // TRANSLATORS: Description of a Service (rpm: apache2), used as a common label or an item in table + tmpstring = _("Opens ports for Apache Web Server."); + + // TRANSLATORS: Name of Service (rpm: apache2-ssl), can be used as check box, item in multiple selection box... + tmpstring = _("Apache 2"); + + // TRANSLATORS: Description of a Service (rpm: apache2-ssl), used as a common label or an item in table + tmpstring = _("Opens ports for Apache Web Server."); + + // TRANSLATORS: Name of Service (rpm: avahi), can be used as check box, item in multiple selection box... + tmpstring = _("Zeroconf/Bonjour Multicast DNS"); + + // TRANSLATORS: Description of a Service (rpm: avahi), used as a common label or an item in table + tmpstring = _("Zeroconf/Bonjour Multicast DNS (mDNS) ports for Service Discovery (DNS-SD)"); + + // TRANSLATORS: Description of a Service (rpm: bacula-dir), used as a common label or an item in table + tmpstring = _("Bacula Director "); + + // TRANSLATORS: Description of a Service (rpm: bacula-fd), used as a common label or an item in table + tmpstring = _("Bacula File Daemon "); + + // TRANSLATORS: Description of a Service (rpm: bacula-sd), used as a common label or an item in table + tmpstring = _("Bacula Storage Daemon "); + + // TRANSLATORS: Name of Service (rpm: bind), can be used as check box, item in multiple selection box... + tmpstring = _("bind DNS server"); + + // TRANSLATORS: Description of a Service (rpm: bind), used as a common label or an item in table + tmpstring = _("Open ports for the bind DNS server"); + + // TRANSLATORS: Name of Service (rpm: courier-imap), can be used as check box, item in multiple selection box... + tmpstring = _("courier-imapd"); + + // TRANSLATORS: Description of a Service (rpm: courier-imap), used as a common label or an item in table + tmpstring = _("Opens ports for courier-imapd."); + + // TRANSLATORS: Name of Service (rpm: courier-imap-ssl), can be used as check box, item in multiple selection box... + tmpstring = _("courier-imapd"); + + // TRANSLATORS: Description of a Service (rpm: courier-imap-ssl), used as a common label or an item in table + tmpstring = _("Opens ports for courier-imapd."); + + // TRANSLATORS: Name of Service (rpm: cups), can be used as check box, item in multiple selection box... + tmpstring = _("cups"); + + // TRANSLATORS: Description of a Service (rpm: cups), used as a common label or an item in table + tmpstring = _("Firewall Configuration file for printing service CUPS"); + + // TRANSLATORS: Name of Service (rpm: cyrus-imapd), can be used as check box, item in multiple selection box... + tmpstring = _("cyrus-imapd Server"); + + // TRANSLATORS: Description of a Service (rpm: cyrus-imapd), used as a common label or an item in table + tmpstring = _("Opens ports for the cyrus-imapd Server."); + + // TRANSLATORS: Name of Service (rpm: dhcp-server), can be used as check box, item in multiple selection box... + tmpstring = _("DHCP Server"); + + // TRANSLATORS: Description of a Service (rpm: dhcp-server), used as a common label or an item in table + tmpstring = _("Opens ports for ISC DHCP Server."); + + // TRANSLATORS: Name of Service (rpm: dnsmasq-dhcp), can be used as check box, item in multiple selection box... + tmpstring = _("dnsmasq"); + + // TRANSLATORS: Description of a Service (rpm: dnsmasq-dhcp), used as a common label or an item in table + tmpstring = _("Open ports for the dnsmasq DNS/DHCP server"); + + // TRANSLATORS: Name of Service (rpm: dnsmasq-dns), can be used as check box, item in multiple selection box... + tmpstring = _("dnsmasq"); + + // TRANSLATORS: Description of a Service (rpm: dnsmasq-dns), used as a common label or an item in table + tmpstring = _("Open ports for the dnsmasq DNS/DHCP server"); + + // TRANSLATORS: Name of Service (rpm: iscsitarget), can be used as check box, item in multiple selection box... + tmpstring = _("iSCSI Target Daemon"); + + // TRANSLATORS: Description of a Service (rpm: iscsitarget), used as a common label or an item in table + tmpstring = _("Opens ports for iSCSI Target Daemon with broadcast allowed."); + + // TRANSLATORS: Name of Service (rpm: isns), can be used as check box, item in multiple selection box... + tmpstring = _("iSNS Daemon"); + + // TRANSLATORS: Description of a Service (rpm: isns), used as a common label or an item in table + tmpstring = _("Opens ports for iSNS daemon with broadcast allowed."); + + // TRANSLATORS: Name of Service (rpm: kadmind), can be used as check box, item in multiple selection box... + tmpstring = _("Kerberos Admin Server"); + + // TRANSLATORS: Description of a Service (rpm: kadmind), used as a common label or an item in table + tmpstring = _("Open ports for kadmind Server"); + + // TRANSLATORS: Name of Service (rpm: kdc), can be used as check box, item in multiple selection box... + tmpstring = _("Key Distribution Center"); + + // TRANSLATORS: Description of a Service (rpm: kdc), used as a common label or an item in table + tmpstring = _("Open ports for the Key Distribution Center"); + + // TRANSLATORS: Name of Service (rpm: lighttpd), can be used as check box, item in multiple selection box... + tmpstring = _("lighttpd"); + + // TRANSLATORS: Description of a Service (rpm: lighttpd), used as a common label or an item in table + tmpstring = _("Open the http port for lighttpd."); + + // TRANSLATORS: Name of Service (rpm: lighttpd-ssl), can be used as check box, item in multiple selection box... + tmpstring = _("lighttpd"); + + // TRANSLATORS: Description of a Service (rpm: lighttpd-ssl), used as a common label or an item in table + tmpstring = _("Open the https port for lighttpd."); + + // TRANSLATORS: Name of Service (rpm: mysql), can be used as check box, item in multiple selection box... + tmpstring = _("MySQL server"); + + // TRANSLATORS: Description of a Service (rpm: mysql), used as a common label or an item in table + tmpstring = _("opens ports for MySQL in order to allow other hosts connect to it"); + + // TRANSLATORS: Name of Service (rpm: nut), can be used as check box, item in multiple selection box... + tmpstring = _("Network UPS Tools"); + + // TRANSLATORS: Description of a Service (rpm: nut), used as a common label or an item in table + tmpstring = _("Opens ports for remote UPS signalling for Network UPS Tools."); + + // TRANSLATORS: Name of Service (rpm: openldap), can be used as check box, item in multiple selection box... + tmpstring = _("OpenLDAP Server"); + + // TRANSLATORS: Description of a Service (rpm: openldap), used as a common label or an item in table + tmpstring = _("Opens ports for the OpenLDAP Server (slapd)."); + + // TRANSLATORS: Description of a Service (rpm: postfix), used as a common label or an item in table + tmpstring = _("Firewall Configuration file for postfix"); + + // TRANSLATORS: Name of Service (rpm: postgresql), can be used as check box, item in multiple selection box... + tmpstring = _("PostgreSQL Server"); + + // TRANSLATORS: Description of a Service (rpm: postgresql), used as a common label or an item in table + tmpstring = _("Opens TCP port 5432 to allow remote connections to the PostgreSQL server."); + + // TRANSLATORS: Name of Service (rpm: pure-ftpd), can be used as check box, item in multiple selection box... + tmpstring = _("pureftpd"); + + // TRANSLATORS: Description of a Service (rpm: pure-ftpd), used as a common label or an item in table + tmpstring = _("Opens ports for pureftpd with broadcast allowed."); + + // TRANSLATORS: Description of a Service (rpm: sendmail), used as a common label or an item in table + tmpstring = _("Firewall Configuration file for postfix"); + + // TRANSLATORS: Name of Service (rpm: squid), can be used as check box, item in multiple selection box... + tmpstring = _("Squid Service"); + + // TRANSLATORS: Description of a Service (rpm: squid), used as a common label or an item in table + tmpstring = _("Opens ports for Squid"); + + // TRANSLATORS: Name of Service (rpm: sshd), can be used as check box, item in multiple selection box... + tmpstring = _("Secure Shell Server"); + + // TRANSLATORS: Description of a Service (rpm: sshd), used as a common label or an item in table + tmpstring = _("Open ports for Secure Shell Server"); + + // TRANSLATORS: Name of Service (rpm: svnserve), can be used as check box, item in multiple selection box... + tmpstring = _("svnserve"); + + // TRANSLATORS: Description of a Service (rpm: svnserve), used as a common label or an item in table + tmpstring = _("Open ports for svnserve"); + + // TRANSLATORS: Name of Service (rpm: talkd), can be used as check box, item in multiple selection box... + tmpstring = _("Talk Server"); + + // TRANSLATORS: Description of a Service (rpm: talkd), used as a common label or an item in table + tmpstring = _("Open ports for Talk Server"); + + // TRANSLATORS: Name of Service (rpm: tetrinet-server), can be used as check box, item in multiple selection box... + tmpstring = _("Tetrinet Server"); + + // TRANSLATORS: Description of a Service (rpm: tetrinet-server), used as a common label or an item in table + tmpstring = _("Opens ports in firewall to make possible to connect clients to your server. "); + + // TRANSLATORS: Name of Service (rpm: vnc-httpd), can be used as check box, item in multiple selection box... + tmpstring = _("VNC mini-HTTP server"); + + // TRANSLATORS: Description of a Service (rpm: vnc-httpd), used as a common label or an item in table + tmpstring = _("Opens the VNC HTTP ports so that browsers can connect."); + + // TRANSLATORS: Name of Service (rpm: vnc-server), can be used as check box, item in multiple selection box... + tmpstring = _("VNC"); + + // TRANSLATORS: Description of a Service (rpm: vnc-server), used as a common label or an item in table + tmpstring = _("Opens VNC server ports so that viewers can connect."); + + // TRANSLATORS: Name of Service (rpm: vsftpd), can be used as check box, item in multiple selection box... + tmpstring = _("vsftpd Server"); + + // TRANSLATORS: Description of a Service (rpm: vsftpd), used as a common label or an item in table + tmpstring = _("Opens ports for vsftpd Server."); + + // TRANSLATORS: Name of Service (rpm: xntp), can be used as check box, item in multiple selection box... + tmpstring = _("xntp Server"); + + // TRANSLATORS: Description of a Service (rpm: xntp), used as a common label or an item in table + tmpstring = _("Opens ports for xntp."); + + // TRANSLATORS: Name of Service (rpm: ypbind), can be used as check box, item in multiple selection box... + tmpstring = _("NIS Client"); + + // TRANSLATORS: Description of a Service (rpm: ypbind), used as a common label or an item in table + tmpstring = _("The ypbind daemon binds NIS clients to an NIS domain"); + + // TRANSLATORS: Name of Service (rpm: ypserv), can be used as check box, item in multiple selection box... + tmpstring = _("NIS Server"); + + // TRANSLATORS: Description of a Service (rpm: ypserv), used as a common label or an item in table + tmpstring = _("Configuration for a NIS master/slave server"); + +} 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-2.16.14/library/wizard/src/Confirm.ycp new/yast2-2.16.15/library/wizard/src/Confirm.ycp --- old/yast2-2.16.14/library/wizard/src/Confirm.ycp 2007-11-16 12:41:41.000000000 +0100 +++ new/yast2-2.16.15/library/wizard/src/Confirm.ycp 2007-11-29 13:19:28.000000000 +0100 @@ -9,7 +9,7 @@ * * Flags: Stable * - * $Id: Confirm.ycp 40759 2007-09-05 10:51:08Z jsrain $ + * $Id: Confirm.ycp 42504 2007-11-29 12:19:27Z mzugec $ */ { @@ -78,7 +78,8 @@ UI::SetFocus (`id(`continue)); - any ret = UI::UserInput(); + // for autoinstallation popup has timeout 10 seconds (#192181) + any ret = Mode::autoinst() ? UI::TimeoutUserInput(10*1000) : UI::UserInput(); UI::CloseDialog(); result = true; 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-2.16.14/Makefile.am new/yast2-2.16.15/Makefile.am --- old/yast2-2.16.14/Makefile.am 2007-11-22 16:38:14.000000000 +0100 +++ new/yast2-2.16.15/Makefile.am 2007-11-29 13:15:05.000000000 +0100 @@ -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-2.16.14/missing new/yast2-2.16.15/missing --- old/yast2-2.16.14/missing 2007-11-22 16:38:20.000000000 +0100 +++ new/yast2-2.16.15/missing 2007-11-29 13:15:21.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-2.16.14/README new/yast2-2.16.15/README --- old/yast2-2.16.14/README 2007-11-27 19:29:26.000000000 +0100 +++ new/yast2-2.16.15/README 2007-11-29 13:20:22.000000000 +0100 @@ -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-2.16.14/VERSION new/yast2-2.16.15/VERSION --- old/yast2-2.16.14/VERSION 2007-11-27 19:13:00.000000000 +0100 +++ new/yast2-2.16.15/VERSION 2007-11-29 13:19:09.000000000 +0100 @@ -1 +1 @@ -2.16.14 +2.16.15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-network
by root＠Hilbert.suse.de 29 Nov '07

29 Nov '07

Hello community, here is the log from the commit of package yast2-network checked in at Thu Nov 29 18:28:32 CET 2007. -------- --- yast2-network/yast2-network.changes 2007-11-21 18:30:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-11-29 15:42:12.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 29 15:39:35 CET 2007 - mzugec(a)suse.cz + +- when user change BOOTPROTO to NONE, set STARTMODE to off +- for hotplug devices set STARTMODE=hotplug (#132583) +- 2.16.11 + +------------------------------------------------------------------- Old: ---- yast2-network-2.16.10.tar.bz2 New: ---- yast2-network-2.16.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.e26888/_old 2007-11-29 18:27:46.000000000 +0100 +++ /var/tmp/diff_new_pack.e26888/_new 2007-11-29 18:27:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.16.10) +# spec file for package yast2-network (Version 2.16.11) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-network -Version: 2.16.10 +Version: 2.16.11 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.16.10.tar.bz2 +Source0: yast2-network-2.16.11.tar.bz2 Prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -45,12 +45,12 @@ Summary: YaST2 - Network Configuration %package devel-doc -Version: 2.16.10 +Version: 2.16.11 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.16.10.tar.bz2 +Source0: yast2-network-2.16.11.tar.bz2 Prefix: /usr Requires: yast2-network >= 2.15.53 Summary: YaST2 - Developer documentation for yast2-network @@ -74,7 +74,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.16.10 +%setup -n yast2-network-2.16.11 %build %{prefix}/bin/y2tool y2autoconf @@ -138,6 +138,10 @@ %exclude %{prefix}/share/doc/packages/yast2-network/COPYING %exclude %{prefix}/share/doc/packages/yast2-network/README %changelog +* Thu Nov 29 2007 - mzugec(a)suse.cz +- when user change BOOTPROTO to NONE, set STARTMODE to off +- for hotplug devices set STARTMODE=hotplug (#132583) +- 2.16.11 * Wed Nov 21 2007 - mzugec(a)suse.cz - choosing pptp server by domain name, not only ip (#241461) thanks to nderkach(a)gmail.com ++++++ yast2-network-2.16.10.tar.bz2 -> yast2-network-2.16.11.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.10/configure new/yast2-network-2.16.11/configure --- old/yast2-network-2.16.10/configure 2007-11-21 18:26:07.000000000 +0100 +++ new/yast2-network-2.16.11/configure 2007-11-29 15:36:54.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-network 2.16.9. +# Generated by GNU Autoconf 2.61 for yast2-network 2.16.10. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.16.9' -PACKAGE_STRING='yast2-network 2.16.9' +PACKAGE_VERSION='2.16.10' +PACKAGE_STRING='yast2-network 2.16.10' 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-network 2.16.9 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.16.10 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-network 2.16.9:";; + short | recursive ) echo "Configuration of yast2-network 2.16.10:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.16.9 +yast2-network configure 2.16.10 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-network $as_me 2.16.9, which was +It was created by yast2-network $as_me 2.16.10, 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-network' - VERSION='2.16.9' + VERSION='2.16.10' cat >>confdefs.h <<_ACEOF @@ -2408,7 +2408,7 @@ -VERSION="2.16.9" +VERSION="2.16.10" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -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-network $as_me 2.16.9, which was +This file was extended by yast2-network $as_me 2.16.10, 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-network config.status 2.16.9 +yast2-network config.status 2.16.10 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-network-2.16.10/configure.in new/yast2-network-2.16.11/configure.in --- old/yast2-network-2.16.10/configure.in 2007-11-21 18:26:01.000000000 +0100 +++ new/yast2-network-2.16.11/configure.in 2007-11-29 15:36:47.000000000 +0100 @@ -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-network, 2.16.9, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.16.10, http://bugs.opensuse.org/, yast2-network) 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.9" +VERSION="2.16.10" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.10/src/lan/address.ycp new/yast2-network-2.16.11/src/lan/address.ycp --- old/yast2-network-2.16.10/src/lan/address.ycp 2007-11-19 14:18:51.000000000 +0100 +++ new/yast2-network-2.16.11/src/lan/address.ycp 2007-11-29 15:41:18.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Network card adresss configuration dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: address.ycp 42105 2007-11-15 18:29:34Z mzugec $ + * $Id: address.ycp 42510 2007-11-29 14:41:18Z mzugec $ */ { @@ -120,6 +120,13 @@ settings["SLAVES"] = (list<string>)UI::QueryWidget (`id(key), `SelectedItems); } +void enableDisableBootProto(symbol current){ + UI::ChangeWidget(`dyn, `Enabled, current==`dynamic); + UI::ChangeWidget(`ipaddr, `Enabled, current==`static); + UI::ChangeWidget(`netmask, `Enabled, current==`static); + UI::ChangeWidget(`hostname, `Enabled, current==`static); +} + /** * Initialize a RadioButtonGroup * Group called FOO has buttons FOO_bar FOO_qux and values bar qux @@ -143,25 +150,16 @@ case "none" : UI::ChangeWidget(`id(`bootproto), `CurrentButton, `none); break; } + enableDisableBootProto((symbol)UI::QueryWidget(`id(`bootproto), `CurrentButton)); } symbol handleBootProto (string key, map event) { - boolean none = false; - boolean dynamic = false; - boolean stat = false; - switch((symbol)UI::QueryWidget(`id(`bootproto), `CurrentButton)){ - case `none : none=true; - break; - case `static: stat=true; - break; - default : dynamic=true; - break; - } - UI::ChangeWidget(`dyn, `Enabled, dynamic); - UI::ChangeWidget(`ipaddr, `Enabled, stat); - UI::ChangeWidget(`netmask, `Enabled, stat); - UI::ChangeWidget(`hostname, `Enabled, stat); + if (event["EventReason"]:""=="ValueChanged"){ + symbol current = (symbol)UI::QueryWidget(`id(`bootproto), `CurrentButton); + enableDisableBootProto(current); + if (current == `none) settings["STARTMODE"] = "off"; + } return nil; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.10/src/modules/LanItems.ycp new/yast2-network-2.16.11/src/modules/LanItems.ycp --- old/yast2-network-2.16.10/src/modules/LanItems.ycp 2007-10-29 10:03:47.000000000 +0100 +++ new/yast2-network-2.16.11/src/modules/LanItems.ycp 2007-11-29 14:43:20.000000000 +0100 @@ -777,7 +777,8 @@ // if(dev == "") { // defaults for a new device devmap = $[ - "STARTMODE": "auto", // #115448, #156388 + // for hotplug devices set STARTMODE=hotplug (#132583) + "STARTMODE": hasAnyValue(Items[current, "hwinfo", "hotplug"]:"") ? "hotplug" : "auto", // #115448, #156388 "NETMASK": (NetHwDetection::result["NETMASK"]:"255.255.255.0"), // #31369 ]; string product_startmode = ProductFeatures::GetStringFeature ("network", "startmode"); @@ -788,7 +789,7 @@ { // #164816 y2milestone ("Not a laptop, will not prefer ifplugd"); - product_startmode = "auto"; + product_startmode = hasAnyValue(Items[current, "hwinfo", "hotplug"]:"") ? "hotplug" : "auto"; } devmap["STARTMODE"] = product_startmode; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.16.10/VERSION new/yast2-network-2.16.11/VERSION --- old/yast2-network-2.16.10/VERSION 2007-11-21 18:27:11.000000000 +0100 +++ new/yast2-network-2.16.11/VERSION 2007-11-29 15:38:11.000000000 +0100 @@ -1 +1 @@ -2.16.10 +2.16.11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 skelcd-openSUSE
by root＠Hilbert.suse.de 29 Nov '07

29 Nov '07

Hello community, here is the log from the commit of package skelcd-openSUSE checked in at Thu Nov 29 18:27:17 CET 2007. -------- --- skelcd-openSUSE/skelcd-openSUSE.changes 2007-11-27 14:04:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/skelcd-openSUSE/skelcd-openSUSE.changes 2007-11-29 13:18:52.258416000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 29 13:18:43 CET 2007 - coolo(a)suse.de + +- remove "for now" part + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.B25917/_old 2007-11-29 18:27:09.000000000 +0100 +++ /var/tmp/diff_new_pack.B25917/_new 2007-11-29 18:27:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-openSUSE (Version 2007.11.27) +# spec file for package skelcd-openSUSE (Version 2007.11.29) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ Group: SuSE internal Conflicts: skelcd-SUSE_Linux skelcd-SUSE_Linux-AddOn skelcd-sles skelcd-sled skelcd-openSUSE-non-OSS skelcd-openSUSE-non-OSS-DVD skelcd-openSUSE-non-OSS-CD skelcd-openSUSE-FTP skelcd-openSUSE-CD-KDE skelcd-openSUSE-CD-GNOME skelcd-openSUSE-CD AutoReqProv: off -Version: 2007.11.27 +Version: 2007.11.29 Release: 1 Summary: Skeleton for openSUSE OSS Media Sets BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -94,7 +94,7 @@ pwd ls -la # for now ... begin -BUILD_DISTRIBUTION_VERSION=10.3 +#BUILD_DISTRIBUTION_VERSION=10.3 # for now ... end for i in README ; do sed -e "s@#DATE#@$DATE_ENG@" \ @@ -200,6 +200,8 @@ /CD1/docu/en/opensuse-gnomequick_en.pdf %changelog +* Thu Nov 29 2007 - coolo(a)suse.de +- remove "for now" part * Tue Nov 27 2007 - coolo(a)suse.de - enable beta EULA * Mon Nov 19 2007 - cthiel(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sensors
by root＠Hilbert.suse.de 29 Nov '07

29 Nov '07

Hello community, here is the log from the commit of package sensors checked in at Thu Nov 29 18:25:44 CET 2007. -------- --- sensors/sensors.changes 2007-11-27 14:48:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/sensors/sensors.changes 2007-11-29 13:43:31.895289000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 29 13:43:18 CET 2007 - jdelvare(a)suse.de + +- Add missing Conflicts tag. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sensors.spec ++++++ --- /var/tmp/diff_new_pack.U22487/_old 2007-11-29 18:25:31.000000000 +0100 +++ /var/tmp/diff_new_pack.U22487/_new 2007-11-29 18:25:31.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: bison flex rrdtool-devel sysfsutils Url: http://www.lm-sensors.org/ Version: 3.0.0 -Release: 1 +Release: 2 Summary: Hardware health monitoring for Linux License: GPL v2 or later Group: System/Monitoring @@ -98,6 +98,7 @@ Requires: sysfsutils Provides: sensors:/usr/include/sensors/sensors.h AutoReqProv: on +Conflicts: libsensors3-devel %description -n libsensors4-devel libsensors offers a way for applications to access the hardware @@ -197,6 +198,8 @@ %doc /usr/share/man/man3/*.3.gz %changelog +* Thu Nov 29 2007 - jdelvare(a)suse.de +- Add missing Conflicts tag. * Tue Nov 27 2007 - jdelvare(a)suse.de - Add a link to the init script. * Mon Nov 26 2007 - jdelvare(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 MozillaFirefox
by root＠Hilbert.suse.de 29 Nov '07

29 Nov '07

Hello community, here is the log from the commit of package MozillaFirefox checked in at Thu Nov 29 18:25:12 CET 2007. -------- --- MozillaFirefox/MozillaFirefox.changes 2007-11-26 18:27:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes 2007-11-27 18:25:44.908309000 +0100 @@ -1,0 +2,12 @@ +Tue Nov 27 18:25:25 CET 2007 - maw(a)suse.de + +- Security update to version 2.0.0.10 (#341905, #341591): + + MFSA 2007-39 Referer-spoofing via window.location race condition + + MFSA 2007-38 Memory corruption vulnerabilities (rv:1.8.1.10) + + MFSA 2007-37 jar: URI scheme XSS hazard + + Fixes for regressions introduced in 2.0.0.8 + + Updated dbus.patch, startup.patch, misc.dif, and configure.patch +- Add mozilla-gcc4.3-fixes.patch +- Add mozilla-canvas-1.8.1.10.patch (#341591#c10). + +------------------------------------------------------------------- Old: ---- firefox-2.0.0.8-source.tar.bz2 firefox-gcc4.3-fixes.patch l10n-2.0.0.8.tar.bz2 New: ---- firefox-2.0.0.10-source.tar.bz2 l10n-2.0.0.10.tar.bz2 mozilla-canvas-1.8.1.10.patch mozilla-gcc4.3-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.C19755/_old 2007-11-29 18:24:48.000000000 +0100 +++ /var/tmp/diff_new_pack.C19755/_new 2007-11-29 18:24:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 2.0.0.8) +# spec file for package MozillaFirefox (Version 2.0.0.10) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ %if %sles_version == 10 Obsoletes: mozilla %endif -Version: 2.0.0.8 -Release: 22 +Version: 2.0.0.10 +Release: 1 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -59,6 +59,7 @@ Patch1: visibility.patch Patch2: rpath.patch Patch3: gcc-undefined-ops.patch +Patch4: mozilla-gcc4.3-fixes.patch Patch5: abuild.patch # NSPR bmo #270502 Patch6: nspr-prdtoa.patch @@ -91,9 +92,9 @@ # integration Patch34: skin-selection.patch Patch36: greasemonkey.patch +Patch37: mozilla-canvas-1.8.1.10.patch Patch38: tango-maxversion.patch Patch39: x11-session.patch -Patch40: firefox-gcc4.3-fixes.patch # gconf.patch dbus.patch startup.patch Patch100: configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -188,6 +189,7 @@ %patch1 %patch2 %patch3 +%patch4 %patch5 %patch6 %patch7 @@ -216,11 +218,11 @@ %patch33 %patch34 %patch36 +%patch37 pushd $RPM_BUILD_DIR %patch38 popd %patch39 -p1 -%patch40 -p1 %patch100 %if %has_system_nss #%patch101 @@ -557,6 +559,15 @@ %endif %changelog +* Tue Nov 27 2007 - maw(a)suse.de +- Security update to version 2.0.0.10 (#341905, #341591): + + MFSA 2007-39 Referer-spoofing via window.location race condition + + MFSA 2007-38 Memory corruption vulnerabilities (rv:1.8.1.10) + + MFSA 2007-37 jar: URI scheme XSS hazard + + Fixes for regressions introduced in 2.0.0.8 + + Updated dbus.patch, startup.patch, misc.dif, and configure.patch +- Add mozilla-gcc4.3-fixes.patch +- Add mozilla-canvas-1.8.1.10.patch (#341591#c10). * Mon Nov 26 2007 - maw(a)suse.de - Build with -ftree-vrp -fwrapv, per advice in #342603#c17. * Tue Nov 13 2007 - maw(a)suse.de ++++++ configure.patch ++++++ ++++ 6177 lines (skipped) ++++ between MozillaFirefox/configure.patch ++++ and /mounts/work_src_done/STABLE/MozillaFirefox/configure.patch ++++++ dbus.patch ++++++ --- /var/tmp/diff_new_pack.C19755/_old 2007-11-29 18:24:48.000000000 +0100 +++ /var/tmp/diff_new_pack.C19755/_new 2007-11-29 18:24:48.000000000 +0100 @@ -77,7 +77,7 @@ MOZ_EXTENSIONS=`echo $MOZ_EXTENSIONS | sed -e 's|venkman||'` --- extensions/dbus/Makefile.in +++ extensions/dbus/Makefile.in -@@ -0,0 +1,68 @@ +@@ -0,0 +1,70 @@ +# ###### BEGIN LICENSE BLOCK ###### +# Version: NPL 1.1/GPL 2.0/LGPL 2.1 +# @@ -134,9 +134,11 @@ + embedcomponents \ + $(NULL) + -+EXTRA_DSO_LDOPTS = $(MOZ_DBUS_GLIB_LIBS) \ -+ $(MOZ_GTHREAD_LIBS) \ -+ $(MOZ_COMPONENT_LIBS) ++EXTRA_DSO_LDOPTS = $(XPCOM_GLUE_LDOPTS) \ ++ $(NSPR_LIBS) \ ++ $(MOZ_DBUS_GLIB_LIBS) \ ++ $(MOZ_GTHREAD_LIBS) \ ++ $(NULL) + +CPPSRCS = \ + nsDBusModule.cpp \ @@ -563,3 +565,20 @@ +}; + +NS_IMPL_NSGETMODULE(nsDBusModule, components) +Index: config/system-headers +=================================================================== +RCS file: /cvsroot/mozilla/config/system-headers,v +retrieving revision 3.4.4.3 +diff -u -r3.4.4.3 system-headers +--- config/system-headers 18 Dec 2006 23:48:58 -0000 3.4.4.3 ++++ config/system-headers 13 Nov 2007 23:04:10 -0000 +@@ -141,6 +141,9 @@ + curses.h + cxxabi.h + DateTimeUtils.h ++dbus/dbus.h ++dbus/dbus-glib.h ++dbus/dbus-glib-lowlevel.h + ddeml.h + Debug.h + dem.h ++++++ firefox-2.0.0.8-source.tar.bz2 -> firefox-2.0.0.10-source.tar.bz2 ++++++ MozillaFirefox/firefox-2.0.0.8-source.tar.bz2 /mounts/work_src_done/STABLE/MozillaFirefox/firefox-2.0.0.10-source.tar.bz2 differ: byte 11, line 1 ++++++ l10n-2.0.0.8.tar.bz2 -> l10n-2.0.0.10.tar.bz2 ++++++ MozillaFirefox/l10n-2.0.0.8.tar.bz2 /mounts/work_src_done/STABLE/MozillaFirefox/l10n-2.0.0.10.tar.bz2 differ: byte 11, line 1 ++++++ mozilla-canvas-1.8.1.10.patch ++++++ Index: content/canvas/src/nsCanvasRenderingContext2D.cpp =================================================================== RCS file: /cvsroot/mozilla/content/canvas/src/nsCanvasRenderingContext2D.cpp,v retrieving revision 1.102 diff -u -8 -p -r1.102 nsCanvasRenderingContext2D.cpp --- content/canvas/src/nsCanvasRenderingContext2D.cpp 10 Oct 2007 20:31:45 -0000 1.102 +++ content/canvas/src/nsCanvasRenderingContext2D.cpp 11 Oct 2007 23:31:32 -0000 @@ -2140,17 +2140,17 @@ nsCanvasRenderingContext2D::CairoSurface getter_AddRefs(imgRequest)); NS_ENSURE_SUCCESS(rv, rv); if (!imgRequest) // XXX ERRMSG we need to report an error to developers here! (bug 329026) return NS_ERROR_NOT_AVAILABLE; PRUint32 status; imgRequest->GetImageStatus(&status); - if (status != imgIRequest::STATUS_LOAD_COMPLETE) + if ((status & imgIRequest::STATUS_LOAD_COMPLETE) == 0) return NS_ERROR_NOT_AVAILABLE; nsCOMPtr<nsIURI> uri; rv = imageLoader->GetCurrentURI(uriOut); NS_ENSURE_SUCCESS(rv, rv); *forceWriteOnlyOut = PR_FALSE; ++++++ mozilla-gcc4.3-fixes.patch ++++++ References: https://bugzilla.mozilla.org/show_bug.cgi?id=403675 https://bugzilla.mozilla.org/show_bug.cgi?id=386362 Index: modules/libpr0n/encoders/png/nsPNGEncoder.h =================================================================== RCS file: /cvsroot/mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.h,v retrieving revision 1.1.18.1 diff -u -p -6 -r1.1.18.1 nsPNGEncoder.h --- modules/libpr0n/encoders/png/nsPNGEncoder.h 20 May 2006 17:20:49 -0000 1.1.18.1 +++ modules/libpr0n/encoders/png/nsPNGEncoder.h 13 Nov 2007 22:07:36 -0000 @@ -35,14 +35,16 @@ * * ***** END LICENSE BLOCK ***** */ #include "imgIEncoder.h" #ifdef MOZILLA_1_8_BRANCH #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH +#ifndef NS_DECL_IMGIENCODER #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH #endif +#endif #include <png.h> #define NS_PNGENCODER_CID \ { /* 38d1592e-b81e-432b-86f8-471878bbfe07 */ \ 0x38d1592e, \ @@ -60,12 +62,20 @@ public: NS_DECL_ISUPPORTS NS_DECL_IMGIENCODER NS_DECL_NSIINPUTSTREAM nsPNGEncoder(); + NS_IMETHOD InitFromData(const PRUint8* aData, + PRUint32 aLength, // (unused, req'd by JS) + PRUint32 aWidth, + PRUint32 aHeight, + PRUint32 aStride, + PRUint32 aInputFormat, + const nsAString& aOutputOptions); + private: ~nsPNGEncoder(); protected: void ConvertHostARGBRow(const PRUint8* aSrc, PRUint8* aDest, PRUint32 aPixelWidth, PRBool aUseTransparency); Index: modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h =================================================================== RCS file: /cvsroot/mozilla/modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h,v retrieving revision 1.1.14.1 diff -u -p -6 -r1.1.14.1 nsJPEGEncoder.h --- modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h 20 May 2006 17:20:48 -0000 1.1.14.1 +++ modules/libpr0n/encoders/jpeg/nsJPEGEncoder.h 13 Nov 2007 22:07:57 -0000 @@ -36,14 +36,16 @@ * * ***** END LICENSE BLOCK ***** */ #include "imgIEncoder.h" #ifdef MOZILLA_1_8_BRANCH #define imgIEncoder imgIEncoder_MOZILLA_1_8_BRANCH +#ifndef NS_DECL_IMGIENCODER #define NS_DECL_IMGIENCODER NS_DECL_IMGIENCODER_MOZILLA_1_8_BRANCH #endif +#endif // needed for JPEG library #include <stdio.h> extern "C" { #include "jpeglib.h" @@ -66,12 +68,20 @@ public: NS_DECL_ISUPPORTS NS_DECL_IMGIENCODER NS_DECL_NSIINPUTSTREAM nsJPEGEncoder(); + NS_IMETHOD InitFromData(const PRUint8* aData, + PRUint32 aLength, // (unused, req'd by JS) + PRUint32 aWidth, + PRUint32 aHeight, + PRUint32 aStride, + PRUint32 aInputFormat, + const nsAString& aOutputOptions); + private: ~nsJPEGEncoder(); protected: void ConvertHostARGBRow(const PRUint8* aSrc, PRUint8* aDest, Index: modules/libpr0n/public/imgIEncoder.idl =================================================================== RCS file: /cvsroot/mozilla/modules/libpr0n/public/imgIEncoder.idl,v retrieving revision 1.1.10.3 diff -u -p -r1.1.10.3 imgIEncoder.idl --- modules/libpr0n/public/imgIEncoder.idl 20 May 2006 17:20:49 -0000 1.1.10.3 +++ modules/libpr0n/public/imgIEncoder.idl 14 Nov 2007 10:41:40 -0000 @@ -96,6 +96,6 @@ interface nsIFile; [scriptable, uuid(CCC5B3AD-3E67-4e3d-97E1-B06B2E96FEF8)] interface imgIEncoder : nsISupports { - void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); + /* void encodeClipboardImage(in nsIClipboardImage aClipboardImage, out nsIFile aImageFile); */ }; Index: xpcom/obsolete/component/nsFileSpecImpl.h =================================================================== RCS file: /cvsroot/mozilla/xpcom/obsolete/component/nsFileSpecImpl.h,v retrieving revision 1.3 diff -u -p -6 -r1.3 nsFileSpecImpl.h --- xpcom/obsolete/component/nsFileSpecImpl.h 18 Apr 2004 14:18:15 -0000 1.3 +++ xpcom/obsolete/component/nsFileSpecImpl.h 14 Nov 2007 12:11:12 -0000 @@ -40,13 +40,13 @@ #include "nscore.h" #include "nsIFileSpec.h" #include "nsFileSpec.h" //======================================================================================== -class nsFileSpecImpl +class NS_COM nsFileSpecImpl //======================================================================================== : public nsIFileSpec { public: @@ -78,13 +78,13 @@ class nsFileSpecImpl private: ~nsFileSpecImpl(); }; // class nsFileSpecImpl //======================================================================================== -class nsDirectoryIteratorImpl +class NS_COM nsDirectoryIteratorImpl //======================================================================================== : public nsIDirectoryIterator { public: ++++++ startup.patch ++++++ --- /var/tmp/diff_new_pack.C19755/_old 2007-11-29 18:24:49.000000000 +0100 +++ /var/tmp/diff_new_pack.C19755/_new 2007-11-29 18:24:49.000000000 +0100 @@ -1193,3 +1193,22 @@ + return NS_FAILED(rv) ? 1 : 0; } +Index: config/system-headers +=================================================================== +RCS file: /cvsroot/mozilla/config/system-headers,v +retrieving revision 3.4.4.3 +diff -u -r3.4.4.3 system-headers +--- config/system-headers 18 Dec 2006 23:48:58 -0000 3.4.4.3 ++++ config/system-headers 14 Nov 2007 09:20:50 -0000 +@@ -931,3 +934,11 @@ + #if MOZ_NATIVE_ZLIB==1 + zlib.h + #endif ++#ifdef MOZ_ENABLE_STARTUP_NOTIFICATION ++libsn/sn.h ++libsn/sn-common.h ++libsn/sn-launchee.h ++libsn/sn-launcher.h ++libsn/sn-monitor.h ++libsn/sn-util.h ++#endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 makedumpfile
by root＠Hilbert.suse.de 29 Nov '07

29 Nov '07

Hello community, here is the log from the commit of package makedumpfile checked in at Thu Nov 29 18:24:33 CET 2007. -------- --- makedumpfile/makedumpfile.changes 2007-11-02 11:39:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/makedumpfile/makedumpfile.changes 2007-11-29 13:34:12.326896000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 29 13:41:09 CET 2007 - bwalle(a)suse.de + +- updated to 1.2.3 + o Add the filtering feature for free_pages of linux-2.6.24. + +------------------------------------------------------------------- Old: ---- makedumpfile-1.2.2.tar.bz2 New: ---- makedumpfile-1.2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ makedumpfile.spec ++++++ --- /var/tmp/diff_new_pack.u15478/_old 2007-11-29 18:23:03.000000000 +0100 +++ /var/tmp/diff_new_pack.u15478/_new 2007-11-29 18:23:03.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package makedumpfile (Version 1.2.2) +# spec file for package makedumpfile (Version 1.2.3) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,7 +14,7 @@ BuildRequires: gcc-c++ libdw-devel libdw1 libelf-devel libelf0 libelf1 zlib-devel %define elfutils_version 0.124 License: GPL v2 or later -Version: 1.2.2 +Version: 1.2.3 Release: 1 Summary: Partial kernel dump Group: System/Kernel @@ -57,7 +57,11 @@ %doc README COPYING %doc %{_mandir}/man?/* /bin/* + %changelog +* Thu Nov 29 2007 - bwalle(a)suse.de +- updated to 1.2.3 + o Add the filtering feature for free_pages of linux-2.6.24. * Fri Nov 02 2007 - bwalle(a)suse.de - updated to 1.2.2 o Fix the problem that vmcoreinfo cannot be extracted from ELF32 ++++++ makedumpfile-1.2.2.tar.bz2 -> makedumpfile-1.2.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/makedumpfile/makedumpfile.8 new/makedumpfile/makedumpfile.8 --- old/makedumpfile/makedumpfile.8 2007-11-02 04:11:54.000000000 +0100 +++ new/makedumpfile/makedumpfile.8 2007-11-14 12:34:36.000000000 +0100 @@ -1,4 +1,4 @@ -.TH MAKEDUMPFILE 8 "November 2007" "makedumpfile v1.2.2" "Linux System Administrator's Manual" +.TH MAKEDUMPFILE 8 "November 2007" "makedumpfile v1.2.3" "Linux System Administrator's Manual" .SH NAME makedumpfile \- make a small dumpfile of kdump .SH SYNOPSIS diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/makedumpfile/makedumpfile.c new/makedumpfile/makedumpfile.c --- old/makedumpfile/makedumpfile.c 2007-11-02 04:11:50.000000000 +0100 +++ new/makedumpfile/makedumpfile.c 2007-11-14 12:34:36.000000000 +0100 @@ -1863,6 +1863,7 @@ */ SIZE_INIT(free_area, "free_area"); OFFSET_INIT(free_area.free_list, "free_area", "free_list"); + MEMBER_ARRAY_LENGTH_INIT(free_area.free_list, "free_area", "free_list"); /* * Get offsets of the list_head's members. @@ -2102,6 +2103,7 @@ WRITE_ARRAY_LENGTH("node_memblk", node_memblk); WRITE_ARRAY_LENGTH("zone.free_area", zone.free_area); + WRITE_ARRAY_LENGTH("free_area.free_list", free_area.free_list); WRITE_NUMBER("NR_FREE_PAGES", NR_FREE_PAGES); WRITE_NUMBER("N_ONLINE", N_ONLINE); @@ -2317,6 +2319,7 @@ READ_ARRAY_LENGTH("mem_section", mem_section); READ_ARRAY_LENGTH("node_memblk", node_memblk); READ_ARRAY_LENGTH("zone.free_area", zone.free_area); + READ_ARRAY_LENGTH("free_area.free_list", free_area.free_list); READ_NUMBER("NR_FREE_PAGES", NR_FREE_PAGES); READ_NUMBER("N_ONLINE", N_ONLINE); @@ -3691,48 +3694,60 @@ reset_bitmap_of_free_pages(unsigned long node_zones) { - int order, i; + int order, i, migrate_type, migrate_types; unsigned long curr, previous, head, curr_page, curr_prev; unsigned long addr_free_pages, free_pages = 0, found_free_pages = 0; unsigned long long pfn, start_pfn; - for (order = (ARRAY_LENGTH(zone.free_area) - 1); order >= 0; --order) { - head = node_zones + OFFSET(zone.free_area) - + SIZE(free_area) * order + OFFSET(free_area.free_list); - previous = head; - if (!readmem(VADDR, head + OFFSET(list_head.next), &curr, - sizeof curr)) { - ERRMSG("Can't get next list_head.\n"); - return FALSE; - } - for (;curr != head;) { - curr_page = curr - OFFSET(page.lru); - start_pfn = page_to_pfn(curr_page); - if (start_pfn == ULONGLONG_MAX) - return FALSE; + /* + * On linux-2.6.24 or later, free_list is divided into the array. + */ + migrate_types = ARRAY_LENGTH(free_area.free_list); + if (migrate_types == NOT_FOUND_STRUCTURE) + migrate_types = 1; - if (!readmem(VADDR, curr + OFFSET(list_head.prev), - &curr_prev, sizeof curr_prev)) { - ERRMSG("Can't get prev list_head.\n"); - return FALSE; - } - if (previous != curr_prev) { - ERRMSG("The free list is broken.\n"); - retcd = ANALYSIS_FAILED; - return FALSE; - } - for (i = 0; i < (1<<order); i++) { - pfn = start_pfn + i; - reset_2nd_bitmap(pfn); - } - found_free_pages += i; - - previous=curr; - if (!readmem(VADDR, curr + OFFSET(list_head.next), - &curr, sizeof curr)) { + for (order = (ARRAY_LENGTH(zone.free_area) - 1); order >= 0; --order) { + for (migrate_type = 0; migrate_type < migrate_types; + migrate_type++) { + head = node_zones + OFFSET(zone.free_area) + + SIZE(free_area) * order + + OFFSET(free_area.free_list) + + SIZE(list_head) * migrate_type; + previous = head; + if (!readmem(VADDR, head + OFFSET(list_head.next), + &curr, sizeof curr)) { ERRMSG("Can't get next list_head.\n"); return FALSE; } + for (;curr != head;) { + curr_page = curr - OFFSET(page.lru); + start_pfn = page_to_pfn(curr_page); + if (start_pfn == ULONGLONG_MAX) + return FALSE; + + if (!readmem(VADDR, curr+OFFSET(list_head.prev), + &curr_prev, sizeof curr_prev)) { + ERRMSG("Can't get prev list_head.\n"); + return FALSE; + } + if (previous != curr_prev) { + ERRMSG("The free list is broken.\n"); + retcd = ANALYSIS_FAILED; + return FALSE; + } + for (i = 0; i < (1<<order); i++) { + pfn = start_pfn + i; + reset_2nd_bitmap(pfn); + } + found_free_pages += i; + + previous = curr; + if (!readmem(VADDR, curr+OFFSET(list_head.next), + &curr, sizeof curr)) { + ERRMSG("Can't get next list_head.\n"); + return FALSE; + } + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/makedumpfile/makedumpfile.h new/makedumpfile/makedumpfile.h --- old/makedumpfile/makedumpfile.h 2007-11-02 04:11:37.000000000 +0100 +++ new/makedumpfile/makedumpfile.h 2007-11-14 12:34:36.000000000 +0100 @@ -911,6 +911,9 @@ struct zone_at { long free_area; } zone; + struct free_area_at { + long free_list; + } free_area; }; struct number_table { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/makedumpfile/Makefile new/makedumpfile/Makefile --- old/makedumpfile/Makefile 2007-11-02 04:11:54.000000000 +0100 +++ new/makedumpfile/Makefile 2007-11-14 12:34:36.000000000 +0100 @@ -1,7 +1,7 @@ # makedumpfile -VERSION=1.2.2 -DATE=2 November 2007 +VERSION=1.2.3 +DATE=14 November 2007 CC = gcc CFLAGS = -g -O2 -Wall -D_FILE_OFFSET_BITS=64 \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/makedumpfile/README new/makedumpfile/README --- old/makedumpfile/README 2007-11-02 04:11:54.000000000 +0100 +++ new/makedumpfile/README 2007-11-14 12:34:36.000000000 +0100 @@ -39,7 +39,7 @@ # make; make install * SUPPORTED KERNELS - makedumpfile (version 1.2.2) supports the following kernels. + makedumpfile (version 1.2.3) supports the following kernels. | FLATMEM | DISCONTIGMEM | SPARSEMEM |-------------------+-------------------+------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libsensors3
by root＠Hilbert.suse.de 29 Nov '07

29 Nov '07

Hello community, here is the log from the commit of package libsensors3 checked in at Thu Nov 29 18:22:55 CET 2007. -------- --- libsensors3/libsensors3.changes 2007-11-26 12:21:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/libsensors3/libsensors3.changes 2007-11-29 13:42:05.273998000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 29 13:39:58 CET 2007 - jdelvare(a)suse.de + +- Add missing Conflicts tag. +- Delete redundant description section. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsensors3.spec ++++++ --- /var/tmp/diff_new_pack.k12202/_old 2007-11-29 18:21:18.000000000 +0100 +++ /var/tmp/diff_new_pack.k12202/_new 2007-11-29 18:21:18.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: bison flex sysfsutils Url: http://www.lm-sensors.org/ Version: 2.10.5 -Release: 17 +Release: 18 Summary: Hardware health monitoring library License: GPL v2 or later Group: System/Libraries @@ -44,30 +44,13 @@ Jean Delvare <khali(a)linux-fr.org> Mark M. Hoffman <mhoffman(a)lightlink.com> -%description -n libsensors3 -libsensors offers a way for applications to access the hardware -monitoring chips of the system. A system-dependent configuration file -controls how the different inputs are labeled and what scaling factors -have to be applied for the specific hardware, so that the output makes -sense to the user. - - - -Authors: --------- - Mark D. Studebaker <mds(a)eng.paradyne.com> - Philip Edelbrock <phil(a)netroedge.com> - Ky�sti M�lkki <kmalkki(a)cc.hut.fi> - Frodo Looijaard <frodol(a)dds.nl> - Jean Delvare <khali(a)linux-fr.org> - Mark M. Hoffman <mhoffman(a)lightlink.com> - %package -n libsensors3-devel Summary: Hardware health monitoring library Group: Development/Libraries/C and C++ Requires: libsensors3 = %{version} Requires: sysfsutils AutoReqProv: on +Conflicts: libsensors4-devel %description -n libsensors3-devel libsensors offers a way for applications to access the hardware @@ -125,6 +108,9 @@ %doc /usr/share/man/man3/*.3.gz %changelog +* Thu Nov 29 2007 - jdelvare(a)suse.de +- Add missing Conflicts tag. +- Delete redundant description section. * Mon Nov 26 2007 - jdelvare(a)suse.de - Copy sensors to libsensors3 and strip it down to only provide the needed compatibility libraries. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kiwi
by root＠Hilbert.suse.de 29 Nov '07

29 Nov '07

Hello community, here is the log from the commit of package kiwi checked in at Thu Nov 29 18:21:11 CET 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-11-28 23:58:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-11-29 16:38:37.915407000 +0100 @@ -1,0 +2,16 @@ +Wed Nov 28 22:33:15 CET 2007 - ms(a)suse.de + +- v1.99 +- don't use /mnt as mount directory (#344589) +- reread partition table using blockdev (#340317) +- fixed cleanup code in KIWIBoot and objects of this class +- added pigz to kiwi-tools package and fixed pigz to allow + splash files which are compressed cpio archives +- start blogd for setting up /var/log/boot.msg file +- added two examples to /usr/share/doc/packages/kiwi/examples + the documentation will refer to this examples in the future +- fixed --bootstick and --bootvm options when uncompressed + boot images are used +- added kiwi manual page + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.vs9449/_old 2007-11-29 18:20:52.000000000 +0100 +++ /var/tmp/diff_new_pack.vs9449/_new 2007-11-29 18:20:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 1.98) +# spec file for package kiwi (Version 1.99) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,13 +12,13 @@ Name: kiwi Url: http://kiwi.berlios.de -BuildRequires: module-init-tools perl perl-XML-LibXML perl-libwww-perl screen smart +BuildRequires: module-init-tools perl perl-XML-LibXML perl-libwww-perl screen smart zlib-devel %ifarch %ix86 x86_64 BuildRequires: syslinux %endif Requires: perl perl-XML-LibXML perl-libwww-perl screen coreutils Summary: OpenSuSE - KIWI Image System -Version: 1.98 +Version: 1.99 Release: 1 Group: System/Management License: GPL v2 or later @@ -266,7 +266,9 @@ echo /srv/tftpboot/pxelinux.0 > kiwi.loader test -f $RPM_BUILD_ROOT/srv/tftpboot/mboot.c32 && \ echo /srv/tftpboot/mboot.c32 >> kiwi.loader -install -m 644 tools/README $RPM_BUILD_ROOT/usr/share/kiwi/tools +install -m 644 tools/README \ + $RPM_BUILD_ROOT/usr/share/doc/packages/kiwi/README.tools +rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/kiwi/kiwi-man cat kiwi.loader #================================================= # KIWI files... @@ -277,6 +279,9 @@ %dir %{_defaultdocdir}/kiwi %dir %{_datadir}/kiwi %dir %{_datadir}/kiwi/image +%doc %{_mandir}/man1/kiwi.1.gz +%doc %{_defaultdocdir}/kiwi/COPYING +%doc %{_defaultdocdir}/kiwi/examples %doc %{_defaultdocdir}/kiwi/kiwi.pdf %{_datadir}/kiwi/.revision %{_datadir}/kiwi/modules @@ -310,9 +315,9 @@ %files -n kiwi-tools %defattr(-, root, root) -%dir %{_datadir}/kiwi/tools -%doc %{_datadir}/kiwi/tools/README -%{_datadir}/kiwi/tools +%doc %{_defaultdocdir}/kiwi/README.tools +/etc/init.d/* +/usr/bin/* #================================================= # KIWI-desc-*... # ------------------------------------------------ @@ -355,6 +360,19 @@ %changelog * Wed Nov 28 2007 - ms(a)suse.de +- v1.99 +- don't use /mnt as mount directory (#344589) +- reread partition table using blockdev (#340317) +- fixed cleanup code in KIWIBoot and objects of this class +- added pigz to kiwi-tools package and fixed pigz to allow + splash files which are compressed cpio archives +- start blogd for setting up /var/log/boot.msg file +- added two examples to /usr/share/doc/packages/kiwi/examples + the documentation will refer to this examples in the future +- fixed --bootstick and --bootvm options when uncompressed + boot images are used +- added kiwi manual page +* Wed Nov 28 2007 - ms(a)suse.de - v1.98 - fixed console redirect while booting into the system - fixed oemboot descriptions, atftp is not required (#344546) ++++++ kiwi.tar.bz2 ++++++ ++++ 5234 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnome-power-manager
by root＠Hilbert.suse.de 29 Nov '07

29 Nov '07

Hello community, here is the log from the commit of package gnome-power-manager checked in at Thu Nov 29 18:20:42 CET 2007. -------- --- GNOME/gnome-power-manager/gnome-power-manager.changes 2007-11-08 14:10:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnome-power-manager/gnome-power-manager.changes 2007-11-29 14:04:33.511987000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 29 14:03:50 CET 2007 - rodrigo(a)suse.de + +- Added upstreamed patch to leave the sleep error notification up + until dismissed by the user (#241440) + +------------------------------------------------------------------- New: ---- gnome-power-manager-sleep-notification.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-power-manager.spec ++++++ --- /var/tmp/diff_new_pack.Be8041/_old 2007-11-29 18:20:33.000000000 +0100 +++ /var/tmp/diff_new_pack.Be8041/_new 2007-11-29 18:20:33.000000000 +0100 @@ -14,7 +14,7 @@ # BuildRequires: PolicyKit-devel docbook-utils docbook_4 gnome-common gnome-doc-utils-devel gnome-icon-theme gnome-panel-devel gnome-patch-translation intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libnotify-devel libwnck-devel notification-daemon scrollkeeper update-desktop-files xmlto BuildRequires: docbook-utils docbook_4 fdupes gnome-common gnome-doc-utils-devel gnome-panel-devel gnome-patch-translation gstreamer010-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libnotify-devel libwnck-devel notification-daemon scrollkeeper update-desktop-files xmlto Version: 2.20.0 -Release: 29 +Release: 37 Url: http://gnome-power.sourceforge.net/ Group: System/GUI/GNOME License: GPL v2 or later @@ -30,6 +30,8 @@ Patch11: gnome-power-manager-brightness-BNC310273.patch # PATCH-FIX-OPENSUSE gnome-power-manager-enable-cpufreq.patch bnc222021 Patch12: gnome-power-manager-enable-cpufreq.patch +# PATCH-FIX-UPSTREAM gnome-power-manager-sleep-notification.patch bnc241440 +Patch13: gnome-power-manager-sleep-notification.patch Requires: hal dbus-1 gnome-screensaver notification-daemon Requires: %{name}-lang = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,6 +70,7 @@ %patch10 -p1 %patch11 -p0 %patch12 +%patch13 #gnome-patch-translation-update %build @@ -119,7 +122,11 @@ %dir %{_datadir}/gnome/autostart %files lang -f %{name}.lang + %changelog +* Thu Nov 29 2007 - rodrigo(a)suse.de +- Added upstreamed patch to leave the sleep error notification up + until dismissed by the user (#241440) * Thu Nov 08 2007 - rodrigo(a)suse.de - Enable cpufreq settings by default (#222021) * Tue Oct 02 2007 - sreeves(a)suse.de ++++++ gnome-power-manager-sleep-notification.patch ++++++ Index: src/gpm-notify.c =================================================================== --- src/gpm-notify.c (revision 2585) +++ src/gpm-notify.c (working copy) @@ -570,7 +570,7 @@ icon = GPM_STOCK_SUSPEND; } - gpm_notify_create (notify, title, msg, GPM_NOTIFY_TIMEOUT_LONG, icon, + gpm_notify_create (notify, title, msg, GPM_NOTIFY_TIMEOUT_NEVER, icon, GPM_NOTIFY_URGENCY_CRITICAL); /* add extra stuff */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 cryptsetup
by root＠Hilbert.suse.de 29 Nov '07

29 Nov '07

Hello community, here is the log from the commit of package cryptsetup checked in at Thu Nov 29 18:20:00 CET 2007. -------- --- cryptsetup/cryptsetup.changes 2007-11-07 12:41:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/cryptsetup/cryptsetup.changes 2007-11-29 13:50:44.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 29 13:47:24 CET 2007 - lnussel(a)suse.de + +- upgrade to svn revision 38 + +------------------------------------------------------------------- Old: ---- cryptsetup-1.0.5-run_udevsettle.patch cryptsetup-1.0.5_SVNr31.tar.bz2 cryptsetup-luks-implicit-declarations.diff cryptsetup-luks-libnostderr.diff cryptsetup-luks-warnings.diff New: ---- 0001-cryptsetup-the-device-parameter-of-LUKS_device_ready.diff 0002-cryptsetup-logger-function-should-return-void.diff 0003-cryptsetup-fix-implicit-function-declarations.diff cryptsetup-1.0.5_SVNr38.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cryptsetup.spec ++++++ --- /var/tmp/diff_new_pack.xf2531/_old 2007-11-29 18:18:20.000000000 +0100 +++ /var/tmp/diff_new_pack.xf2531/_new 2007-11-29 18:18:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cryptsetup (Version 1.0.5_SVNr31) +# spec file for package cryptsetup (Version 1.0.5_SVNr38) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,10 +18,10 @@ License: BSD 3-Clause; GPL v2 or later Group: System/Base AutoReqProv: on -Version: 1.0.5_SVNr31 -Release: 4 +Version: 1.0.5_SVNr38 +Release: 1 Summary: Set Up dm-crypt Based Encrypted Block Devices -Source: cryptsetup-1.0.5_SVNr31.tar.bz2 +Source: cryptsetup-%{version}.tar.bz2 Source1: hashalot-%haver.tar.bz2 Source50: boot.crypto Source90: Makefile.doc @@ -30,10 +30,9 @@ Source92: crypttab.5 # use this to create the tarball from svn Source99: cryptsetup-mktar -Patch2: cryptsetup-luks-implicit-declarations.diff -Patch3: cryptsetup-luks-warnings.diff -Patch4: cryptsetup-luks-libnostderr.diff -Patch5: cryptsetup-1.0.5-run_udevsettle.patch +Patch1: 0001-cryptsetup-the-device-parameter-of-LUKS_device_ready.diff +Patch2: 0002-cryptsetup-logger-function-should-return-void.diff +Patch3: 0003-cryptsetup-fix-implicit-function-declarations.diff Patch10: hashalot-fixes.diff Patch11: hashalot-libgcrypt.diff Patch12: hashalot-ctrl-d.diff @@ -84,11 +83,9 @@ %prep %setup -q -b 1 -#%patch1 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 pushd ../hashalot-%haver %patch10 -p1 %patch11 -p1 @@ -183,7 +180,10 @@ %defattr(-,root,root) %_includedir/libcryptsetup.h %{_libdir}/libcryptsetup.so + %changelog +* Thu Nov 29 2007 - lnussel(a)suse.de +- upgrade to svn revision 38 * Wed Nov 07 2007 - mkoenig(a)suse.de - add %%fillup_prereq and %%insserv_prereq to PreReq * Tue Oct 16 2007 - lnussel(a)suse.de ++++++ 0001-cryptsetup-the-device-parameter-of-LUKS_device_ready.diff ++++++ >From 637619ff183804b4f654a3c5810aea2bb8ce9ba3 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Thu, 29 Nov 2007 13:18:23 +0100 Subject: [PATCH] cryptsetup: the device parameter of LUKS_device_ready should be const Signed-off-by: Ludwig Nussel <ludwig.nussel(a)suse.de> --- luks/keymanage.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/luks/keymanage.c b/luks/keymanage.c index 915a0f2..91ff688 100644 --- a/luks/keymanage.c +++ b/luks/keymanage.c @@ -466,7 +466,7 @@ int LUKS_benchmarkt_iterations() return PBKDF2_performance_check()/2; } -int LUKS_device_ready(char *device, int mode) +int LUKS_device_ready(const char *device, int mode) { int devfd = open(device, mode | O_DIRECT | O_SYNC); if(devfd < 0) { -- 1.5.3.4 ++++++ 0002-cryptsetup-logger-function-should-return-void.diff ++++++ >From 32f038fe704a069444e5b71d6b195795b917016a Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Thu, 29 Nov 2007 13:21:23 +0100 Subject: [PATCH] cryptsetup: logger function should return void Signed-off-by: Ludwig Nussel <ludwig.nussel(a)suse.de> --- lib/setup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/setup.c b/lib/setup.c index 9e8c810..032d90e 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -26,7 +26,7 @@ static char *default_backend = NULL; #define at_least_one(a) ({ __typeof__(a) __at_least_one=(a); (__at_least_one)?__at_least_one:1; }) -static int logger(struct crypt_options *options, int class, char *format, ...) { +static void logger(struct crypt_options *options, int class, char *format, ...) { va_list argp; char *target; -- 1.5.3.4 ++++++ 0003-cryptsetup-fix-implicit-function-declarations.diff ++++++ >From 557a4f778b227b63b7095e2910bb6911ed2b040c Mon Sep 17 00:00:00 2001 From: Ludwig Nussel <ludwig.nussel(a)suse.de> Date: Thu, 29 Nov 2007 10:35:19 +0100 Subject: [PATCH] cryptsetup: fix implicit function declarations Signed-off-by: Ludwig Nussel <ludwig.nussel(a)suse.de> --- lib/libcryptsetup.h | 3 ++- luks/luks.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/lib/libcryptsetup.h b/lib/libcryptsetup.h index fad14d1..e2db46a 100644 --- a/lib/libcryptsetup.h +++ b/lib/libcryptsetup.h @@ -53,7 +53,8 @@ int crypt_query_device(struct crypt_options *options); int crypt_remove_device(struct crypt_options *options); int crypt_luksFormat(struct crypt_options *options); int crypt_luksOpen(struct crypt_options *options); -int crypt_luksDelKey(struct crypt_options *options); +int crypt_luksKillSlot(struct crypt_options *options); +int crypt_luksRemoveKey(struct crypt_options *options); int crypt_luksAddKey(struct crypt_options *options); int crypt_luksUUID(struct crypt_options *options); int crypt_isLuks(struct crypt_options *options); diff --git a/luks/luks.h b/luks/luks.h index ac9fe74..17f7b08 100644 --- a/luks/luks.h +++ b/luks/luks.h @@ -132,4 +132,5 @@ int LUKS_decrypt_from_storage(char *dst, size_t dstLength, char *key, size_t keyLength, const char *device, unsigned int sector, struct setup_backend *backend); +int LUKS_device_ready(const char *device, int mode); #endif -- 1.5.3.4 ++++++ cryptsetup-1.0.5_SVNr31.tar.bz2 -> cryptsetup-1.0.5_SVNr38.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/configure new/cryptsetup-1.0.5_SVNr38/configure --- old/cryptsetup-1.0.5_SVNr31/configure 2007-09-11 16:48:42.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/configure 2007-11-22 14:50:26.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for cryptsetup 1.0.5-pre1. +# Generated by GNU Autoconf 2.61 for cryptsetup 1.0.6-pre1. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -726,8 +726,8 @@ # Identity of this package. PACKAGE_NAME='cryptsetup' PACKAGE_TARNAME='cryptsetup' -PACKAGE_VERSION='1.0.5-pre1' -PACKAGE_STRING='cryptsetup 1.0.5-pre1' +PACKAGE_VERSION='1.0.6-pre1' +PACKAGE_STRING='cryptsetup 1.0.6-pre1' PACKAGE_BUGREPORT='' ac_unique_file="src/cryptsetup.c" @@ -1425,7 +1425,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 cryptsetup 1.0.5-pre1 to adapt to many kinds of systems. +\`configure' configures cryptsetup 1.0.6-pre1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1495,7 +1495,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cryptsetup 1.0.5-pre1:";; + short | recursive ) echo "Configuration of cryptsetup 1.0.6-pre1:";; esac cat <<\_ACEOF @@ -1617,7 +1617,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cryptsetup configure 1.0.5-pre1 +cryptsetup configure 1.0.6-pre1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1631,7 +1631,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cryptsetup $as_me 1.0.5-pre1, which was +It was created by cryptsetup $as_me 1.0.6-pre1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2305,7 +2305,7 @@ # Define the identity of the package. PACKAGE='cryptsetup' - VERSION='1.0.5-pre1' + VERSION='1.0.6-pre1' cat >>confdefs.h <<_ACEOF @@ -24479,7 +24479,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cryptsetup $as_me 1.0.5-pre1, which was +This file was extended by cryptsetup $as_me 1.0.6-pre1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -24532,7 +24532,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -cryptsetup config.status 1.0.5-pre1 +cryptsetup config.status 1.0.6-pre1 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/cryptsetup-1.0.5_SVNr31/lib/internal.h new/cryptsetup-1.0.5_SVNr38/lib/internal.h --- old/cryptsetup-1.0.5_SVNr31/lib/internal.h 2007-09-11 16:48:42.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/lib/internal.h 2007-10-24 22:14:25.000000000 +0200 @@ -62,6 +62,9 @@ struct setup_backend *get_setup_backend(const char *name); void put_setup_backend(struct setup_backend *backend); +void hexprint(char *d, int n); + +int sector_size_for_device(const char *device); ssize_t write_blockwise(int fd, const void *buf, size_t count); ssize_t read_blockwise(int fd, void *_buf, size_t count); ssize_t write_lseek_blockwise(int fd, const char *buf, size_t count, off_t offset); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/lib/libcryptsetup.h new/cryptsetup-1.0.5_SVNr38/lib/libcryptsetup.h --- old/cryptsetup-1.0.5_SVNr31/lib/libcryptsetup.h 2007-09-11 16:48:42.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/lib/libcryptsetup.h 2007-10-24 22:42:20.000000000 +0200 @@ -51,12 +51,14 @@ int crypt_resize_device(struct crypt_options *options); int crypt_query_device(struct crypt_options *options); int crypt_remove_device(struct crypt_options *options); -int crypt_luksInit(struct crypt_options *options); +int crypt_luksFormat(struct crypt_options *options); int crypt_luksOpen(struct crypt_options *options); int crypt_luksDelKey(struct crypt_options *options); int crypt_luksAddKey(struct crypt_options *options); int crypt_luksUUID(struct crypt_options *options); int crypt_isLuks(struct crypt_options *options); +int crypt_luksFormat(struct crypt_options *options); +int crypt_luksDump(struct crypt_options *options); void crypt_get_error(char *buf, size_t size); void crypt_put_options(struct crypt_options *options); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/lib/libdevmapper.c new/cryptsetup-1.0.5_SVNr38/lib/libdevmapper.c --- old/cryptsetup-1.0.5_SVNr31/lib/libdevmapper.c 2006-09-24 19:31:56.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/lib/libdevmapper.c 2007-10-24 22:47:53.000000000 +0200 @@ -18,6 +18,13 @@ #define CRYPT_TARGET "crypt" +#define UDEVSETTLE "/sbin/udevsettle" + +static void run_udevsettle(void) +{ + system(UDEVSETTLE); +} + static void set_dm_error(int level, const char *file, int line, const char *f, ...) { @@ -184,6 +191,9 @@ if (dmi.read_only) options->flags |= CRYPT_FLAG_READONLY; + /* run udevsettle to avoid a race in libdevmapper causing busy dm devices */ + run_udevsettle(); + r = 0; out: @@ -258,7 +268,7 @@ options->skip = 0; options->size = length; if (details) { - char *cipher, *key_, *device, *tmp; + char *cipher, *key_, *device; uint64_t val64; set_error("Invalid dm table"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/lib/setup.c new/cryptsetup-1.0.5_SVNr38/lib/setup.c --- old/cryptsetup-1.0.5_SVNr31/lib/setup.c 2007-09-11 16:48:42.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/lib/setup.c 2007-11-22 14:50:26.000000000 +0100 @@ -26,7 +26,26 @@ #define at_least_one(a) ({ __typeof__(a) __at_least_one=(a); (__at_least_one)?__at_least_one:1; }) -static int setup_enter(struct setup_backend *backend) +static int logger(struct crypt_options *options, int class, char *format, ...) { + va_list argp; + char *target; + + va_start(argp, format); + vasprintf(&target, format, argp); + options->icb->log(class, target); + + va_end(argp); + free(target); +} + +static void hexprintICB(struct crypt_options *options, int class, char *d, int n) +{ + int i; + for(i = 0; i < n; i++) + logger(options, class, "%02hhx ", (char)d[i]); +} + +static int setup_enter(struct setup_backend *backend, void (*log)(int, char *)) { int r; @@ -37,7 +56,7 @@ r = mlockall(MCL_CURRENT | MCL_FUTURE); if (r < 0) { perror("mlockall failed"); - fprintf(stderr, "WARNING!!! Possibly insecure memory. Are you root?\n"); + log(CRYPT_LOG_ERROR, "WARNING!!! Possibly insecure memory. Are you root?\n"); memory_unsafe = 1; } @@ -56,8 +75,6 @@ static int setup_leave(struct setup_backend *backend) { - const char *error; - if (backend) backend->exit(); @@ -101,9 +118,9 @@ return NULL; } } else if (passLen > options->key_size) { - memcpy(key, pass, options->key_size); + memcpy(key, pass, options->key_size); } else { - memcpy(key, pass, passLen); + memcpy(key, pass, passLen); } return key; @@ -114,11 +131,21 @@ char buf[128]; uint64_t size; unsigned long size_small; - int readonly; + int readonly = 0; int ret = -1; int fd; - fd = open(device, O_RDONLY); + /* Try to open read-write to check whether it is a read-only device */ + fd = open(device, O_RDWR); + if (fd < 0) { + if (errno == EROFS) { + readonly = 1; + fd = open(device, O_RDONLY); + } + } else { + close(fd); + fd = open(device, O_RDONLY); + } if (fd < 0) { set_error("Error opening device: %s", strerror_r(errno, buf, 128)); @@ -126,13 +153,19 @@ } #ifdef BLKROGET - if (ioctl(fd, BLKROGET, &readonly) < 0) { - set_error("BLKROGET failed on device: %s", - strerror_r(errno, buf, 128)); - return -1; + /* If the device can be opened read-write, i.e. readonly is still 0, then + * check whether BKROGET says that it is read-only. E.g. read-only loop + * devices may be openend read-write but are read-only according to BLKROGET + */ + if (readonly == 0) { + if (ioctl(fd, BLKROGET, &readonly) < 0) { + set_error("BLKROGET failed on device: %s", + strerror_r(errno, buf, 128)); + return -1; + } } #else -# error BLKROGET not available +#error BLKROGET not available #endif #ifdef BLKGETSIZE64 @@ -168,7 +201,7 @@ static int parse_into_name_and_mode(const char *nameAndMode, char *name, char *mode) { - // Token content stringification, see info cpp/stringification +/* Token content stringification, see info cpp/stringification */ #define str(s) #s #define xstr(s) str(s) #define scanpattern1 "%" xstr(LUKS_CIPHERNAME_L) "[^-]-%" xstr(LUKS_CIPHERMODE_L) "s" @@ -181,7 +214,7 @@ strncpy(mode,"cbc-plain",10); } else { - fprintf(stderr, "no known cipher-spec pattern detected\n"); + set_error("no known cipher-spec pattern detected"); return -EINVAL; } } @@ -352,17 +385,17 @@ int PBKDF2perSecond; if (!LUKS_device_ready(options->device, O_RDWR | O_EXCL)) { - set_error("Can not access device"); - r = -ENOTBLK; goto out; + set_error("Can not access device"); + r = -ENOTBLK; goto out; } mk = LUKS_generate_masterkey(options->key_size); if(NULL == mk) return -ENOMEM; #ifdef LUKS_DEBUG -#define printoffset(entry) printf("offset of " #entry " = %d\n", (char *)(&header.entry)-(char *)(&header)) +#define printoffset(entry) logger(options, CRYPT_LOG_ERROR, ("offset of " #entry " = %d\n", (char *)(&header.entry)-(char *)(&header)) - printf("sizeof phdr %d, key slot %d\n",sizeof(struct luks_phdr),sizeof(header.keyblock[0])); + logger(options, CRYPT_LOG_ERROR, "sizeof phdr %d, key slot %d\n",sizeof(struct luks_phdr),sizeof(header.keyblock[0])); printoffset(magic); printoffset(version); @@ -389,7 +422,7 @@ PBKDF2perSecond = LUKS_benchmarkt_iterations(); header.keyblock[0].passwordIterations = at_least_one(PBKDF2perSecond * ((float)options->iteration_time / 1000.0)); #ifdef LUKS_DEBUG - fprintf(stderr, "pitr %d\n", header.keyblock[0].passwordIterations); + logger(options->icb->log,CRYPT_LOG_ERROR, "pitr %d\n", header.keyblock[0].passwordIterations); #endif get_key("Enter LUKS passphrase: ",&password,&passwordLen, 0, options->new_key_file, options->passphrase_fd, options->timeout, options->flags); if(!password) { @@ -426,13 +459,13 @@ } if (!LUKS_device_ready(options->device, O_RDONLY | O_EXCL)) { - set_error("Can not access device"); - return -ENOTBLK; + set_error("Can not access device"); + return -ENOTBLK; } if (get_device_infos(options->device, &infos) < 0) { - set_error("Can't get device information.\n"); - return -ENOTBLK; + set_error("Can't get device information.\n"); + return -ENOTBLK; } if (infos.readonly) @@ -506,8 +539,8 @@ int r; if (!LUKS_device_ready(options->device, O_RDWR | O_EXCL)) { - set_error("Can not access device"); - r = -ENOTBLK; goto out; + set_error("Can not access device"); + r = -ENOTBLK; goto out; } r = LUKS_read_phdr(device, &hdr); @@ -528,10 +561,13 @@ if(!password) { r = -EINVAL; goto out; } - if(LUKS_open_any_key(device, password, passwordLen, &hdr, &mk, backend) < 0) { - printf("No key available with this passphrase.\n"); + r = LUKS_open_any_key(device, password, passwordLen, &hdr, &mk, backend); + if(r < 0) { + options->icb->log(CRYPT_LOG_ERROR,"No key available with this passphrase.\n"); r = -EPERM; goto out; - } + } else + logger(options, CRYPT_LOG_NORMAL,"key slot %d unlocked.\n",i); + safe_free(password); optionsSet.key_size = 0; // FIXME, define a clean interface some day. @@ -570,12 +606,12 @@ if(supply_it) { get_key("Enter LUKS passphrase to be deleted: ",&password,&passwordLen, 0, options->new_key_file, options->passphrase_fd, options->timeout, options->flags); if(!password) { - r = -EINVAL; goto out; + r = -EINVAL; goto out; } keyIndex = LUKS_open_any_key(device, password, passwordLen, &hdr, &mk, backend); if(keyIndex < 0) { - printf("No remaining key available with this passphrase.\n"); - r = -EPERM; goto out; + options->icb->log(CRYPT_LOG_ERROR,"No remaining key available with this passphrase.\n"); + r = -EPERM; goto out; } safe_free(password); } else { @@ -596,8 +632,8 @@ } openedIndex = LUKS_open_any_key(device, password, passwordLen, &hdr, &mk, backend); if(openedIndex < 0 || keyIndex == openedIndex) { - printf("No remaining key available with this passphrase.\n"); - r = -EPERM; goto out; + options->icb->log(CRYPT_LOG_ERROR,"No remaining key available with this passphrase.\n"); + r = -EPERM; goto out; } } r = LUKS_del_key(device, keyIndex); @@ -610,11 +646,11 @@ } static int __crypt_luks_kill_slot(int arg, struct setup_backend *backend, struct crypt_options *options) { - return luks_remove_helper(arg, backend, options, 0); + return luks_remove_helper(arg, backend, options, 0); } static int __crypt_luks_remove_key(int arg, struct setup_backend *backend, struct crypt_options *options) { - return luks_remove_helper(arg, backend, options, 1); + return luks_remove_helper(arg, backend, options, 1); } @@ -627,7 +663,7 @@ backend = get_setup_backend(default_backend); - setup_enter(backend); + setup_enter(backend,options->icb->log); if (!backend) { set_error("No setup backend available"); @@ -706,7 +742,8 @@ r = LUKS_read_phdr(options->device,&hdr); if(r < 0) return r; - printf("%s\n",hdr.uuid); + options->icb->log(CRYPT_LOG_NORMAL,hdr.uuid); + options->icb->log(CRYPT_LOG_NORMAL,"\n"); return 0; } @@ -724,38 +761,38 @@ r = LUKS_read_phdr(options->device,&hdr); if(r < 0) return r; - printf("LUKS header information for %s\n\n",options->device); - printf("Version: \t%d\n",hdr.version); - printf("Cipher name: \t%s\n",hdr.cipherName); - printf("Cipher mode: \t%s\n",hdr.cipherMode); - printf("Hash spec: \t%s\n",hdr.hashSpec); - printf("Payload offset:\t%d\n",hdr.payloadOffset); - printf("MK bits: \t%d\n",hdr.keyBytes*8); - printf("MK digest: \t"); - hexprint(hdr.mkDigest,LUKS_DIGESTSIZE); - printf("\n"); - printf("MK salt: \t"); - hexprint(hdr.mkDigestSalt,LUKS_SALTSIZE/2); - printf("\n \t"); - hexprint(hdr.mkDigestSalt+LUKS_SALTSIZE/2,LUKS_SALTSIZE/2); - printf("\n"); - printf("MK iterations: \t%d\n",hdr.mkDigestIterations); - printf("UUID: \t%s\n\n",hdr.uuid); + logger(options, CRYPT_LOG_NORMAL, "LUKS header information for %s\n\n",options->device); + logger(options, CRYPT_LOG_NORMAL, "Version: \t%d\n",hdr.version); + logger(options, CRYPT_LOG_NORMAL, "Cipher name: \t%s\n",hdr.cipherName); + logger(options, CRYPT_LOG_NORMAL, "Cipher mode: \t%s\n",hdr.cipherMode); + logger(options, CRYPT_LOG_NORMAL, "Hash spec: \t%s\n",hdr.hashSpec); + logger(options, CRYPT_LOG_NORMAL, "Payload offset:\t%d\n",hdr.payloadOffset); + logger(options, CRYPT_LOG_NORMAL, "MK bits: \t%d\n",hdr.keyBytes*8); + logger(options, CRYPT_LOG_NORMAL, "MK digest: \t"); + hexprintICB(options, CRYPT_LOG_NORMAL, hdr.mkDigest,LUKS_DIGESTSIZE); + logger(options, CRYPT_LOG_NORMAL, "\n"); + logger(options, CRYPT_LOG_NORMAL, "MK salt: \t"); + hexprintICB(options, CRYPT_LOG_NORMAL, hdr.mkDigestSalt,LUKS_SALTSIZE/2); + logger(options, CRYPT_LOG_NORMAL, "\n \t"); + hexprintICB(options, CRYPT_LOG_NORMAL, hdr.mkDigestSalt+LUKS_SALTSIZE/2,LUKS_SALTSIZE/2); + logger(options, CRYPT_LOG_NORMAL, "\n"); + logger(options, CRYPT_LOG_NORMAL, "MK iterations: \t%d\n",hdr.mkDigestIterations); + logger(options, CRYPT_LOG_NORMAL, "UUID: \t%s\n\n",hdr.uuid); for(i=0;i<LUKS_NUMKEYS;i++) { if(hdr.keyblock[i].active == LUKS_KEY_ENABLED) { - printf("Key Slot %d: ENABLED\n",i); - printf("\tIterations: \t%d\n",hdr.keyblock[i].passwordIterations); - printf("\tSalt: \t"); - hexprint(hdr.keyblock[i].passwordSalt,LUKS_SALTSIZE/2); - printf("\n\t \t"); - hexprint(hdr.keyblock[i].passwordSalt+LUKS_SALTSIZE/2,LUKS_SALTSIZE/2); - printf("\n"); + logger(options, CRYPT_LOG_NORMAL, "Key Slot %d: ENABLED\n",i); + logger(options, CRYPT_LOG_NORMAL, "\tIterations: \t%d\n",hdr.keyblock[i].passwordIterations); + logger(options, CRYPT_LOG_NORMAL, "\tSalt: \t"); + hexprintICB(options, CRYPT_LOG_NORMAL, hdr.keyblock[i].passwordSalt,LUKS_SALTSIZE/2); + logger(options, CRYPT_LOG_NORMAL, "\n\t \t"); + hexprintICB(options, CRYPT_LOG_NORMAL, hdr.keyblock[i].passwordSalt+LUKS_SALTSIZE/2,LUKS_SALTSIZE/2); + logger(options, CRYPT_LOG_NORMAL, "\n"); - printf("\tKey material offset:\t%d\n",hdr.keyblock[i].keyMaterialOffset); - printf("\tAF stripes: \t%d\n",hdr.keyblock[i].stripes); + logger(options, CRYPT_LOG_NORMAL, "\tKey material offset:\t%d\n",hdr.keyblock[i].keyMaterialOffset); + logger(options, CRYPT_LOG_NORMAL, "\tAF stripes: \t%d\n",hdr.keyblock[i].stripes); } else - printf("Key Slot %d: DISABLED\n",i); + logger(options, CRYPT_LOG_NORMAL, "Key Slot %d: DISABLED\n",i); } return 0; } @@ -814,3 +851,8 @@ return dir; } + +// Local Variables: +// c-basic-offset: 8 +// indent-tabs-mode: nil +// End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/lib/utils.c new/cryptsetup-1.0.5_SVNr38/lib/utils.c --- old/cryptsetup-1.0.5_SVNr31/lib/utils.c 2007-09-11 16:48:42.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/lib/utils.c 2007-10-24 22:37:19.000000000 +0200 @@ -9,6 +9,7 @@ #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/ioctl.h> #include <fcntl.h> #include <termios.h> @@ -173,7 +174,7 @@ { char *padbuf; char *padbuf_base; char *buf = (char *)orig_buf; - int r; + int r = 0; int hangover; int solid; int bsize; if ((bsize = sector_size(fd)) < 0) @@ -213,7 +214,7 @@ ssize_t read_blockwise(int fd, void *orig_buf, size_t count) { char *padbuf; char *padbuf_base; char *buf = (char *)orig_buf; - int r; + int r = 0; int step; int bsize; @@ -226,7 +227,7 @@ while(count) { r = read(fd,padbuf,bsize); if(r < 0 || r != bsize) { - fprintf(stderr, "read failed in read_blockwise.\n"); + set_error("read failed in read_blockwise.\n"); goto out; } step = count<bsize?count:bsize; @@ -307,7 +308,7 @@ if (select(fd+1, &fds, NULL, NULL, &t) > 0) failed = untimed_read(fd, pass, maxlen); else - fprintf(stderr, "Operation timed out.\n"); + set_error("Operation timed out"); return failed; } @@ -316,7 +317,7 @@ { struct termios orig, tmp; int failed = -1; - int infd, outfd; + int infd = STDIN_FILENO, outfd; if (maxlen < 1) goto out_err; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/luks/af.c new/cryptsetup-1.0.5_SVNr38/luks/af.c --- old/cryptsetup-1.0.5_SVNr31/luks/af.c 2006-09-24 19:31:56.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/luks/af.c 2007-10-24 22:14:25.000000000 +0200 @@ -30,6 +30,7 @@ #include <errno.h> #include "sha1.h" #include "XORblock.h" +#include "random.h" /* diffuse: Information spreading over the whole dataset with * the help of sha512. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/luks/keyencryption.c new/cryptsetup-1.0.5_SVNr38/luks/keyencryption.c --- old/cryptsetup-1.0.5_SVNr31/luks/keyencryption.c 2007-09-11 16:48:42.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/luks/keyencryption.c 2007-11-22 14:50:26.000000000 +0100 @@ -35,12 +35,16 @@ #include "../lib/internal.h" #include "../lib/blockdev.h" -#define div_round_up(a,b) ({ \ +#define div_round_up(a,b) ({ \ typeof(a) __a = (a); \ typeof(b) __b = (b); \ - (__a - 1) / __b + 1; \ + (__a - 1) / __b + 1; \ }) +static inline int round_up_modulo(int x, int m) { + return div_round_up(x, m) * m; +} + static int setup_mapping(const char *cipher, const char *name, const char *device, unsigned int payloadOffset, const char *key, size_t keyLength, @@ -58,7 +62,7 @@ * device's sector size, otherwise the mapping will be refused. */ if(device_sector_size < 0) { - fprintf(stderr,_("Unable to obtain sector size for %s"),device); + set_error(_("Unable to obtain sector size for %s"),device); return -EINVAL; } options->size = round_up_modulo(srcLength,device_sector_size)/SECTOR_SIZE; @@ -97,12 +101,12 @@ static void sigint_handler(int sig) { - if(devfd) - close(devfd); - if(cleaner_backend && cleaner_name) - clear_mapping(cleaner_name, cleaner_backend); - signal(SIGINT, SIG_DFL); - kill(getpid(), SIGINT); + if(devfd) + close(devfd); + if(cleaner_backend && cleaner_name) + clear_mapping(cleaner_name, cleaner_backend); + signal(SIGINT, SIG_DFL); + kill(getpid(), SIGINT); } /* This function is not reentrant safe, as it installs a signal @@ -138,7 +142,8 @@ r = setup_mapping(dmCipherSpec,name,device,hdr->payloadOffset,key,keyLength,sector,srcLength,backend,mode); if(r < 0) { - fprintf(stderr,"Failed to setup dm-crypt key mapping.\nCheck kernel for support for the %s cipher spec and verify that %s contains at least %d sectors.\n", + if(!get_error()) + set_error("Failed to setup dm-crypt key mapping.\nCheck kernel for support for the %s cipher spec and verify that %s contains at least %d sectors", dmCipherSpec, device, sector + div_round_up(srcLength,SECTOR_SIZE)); @@ -187,3 +192,8 @@ { return LUKS_endec_template(dst,dstLength,hdr,key,keyLength, device, sector, backend, read_blockwise, O_RDONLY); } + +// Local Variables: +// c-basic-offset: 8 +// indent-tabs-mode: nil +// End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/luks/keymanage.c new/cryptsetup-1.0.5_SVNr38/luks/keymanage.c --- old/cryptsetup-1.0.5_SVNr31/luks/keymanage.c 2007-09-11 16:48:42.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/luks/keymanage.c 2007-11-22 14:50:26.000000000 +0100 @@ -43,7 +43,7 @@ (__a - 1) / __b + 1; \ }) -inline int round_up_modulo(int x, int m) { +static inline int round_up_modulo(int x, int m) { return div_round_up(x, m) * m; } @@ -79,20 +79,20 @@ devfd = open(device,O_RDONLY | O_DIRECT | O_SYNC); if(-1 == devfd) { - fprintf(stderr, _("Can't open device: %s\n"), device); + set_error(_("Can't open device: %s\n"), device); return -EINVAL; } if(read_blockwise(devfd, hdr, sizeof(struct luks_phdr)) < sizeof(struct luks_phdr)) { r = -EIO; } else if(memcmp(hdr->magic, luksMagic, LUKS_MAGIC_L)) { /* Check magic */ - fprintf(stderr, _("%s is not a LUKS partition\n"), device); + set_error(_("%s is not a LUKS partition\n"), device); r = -EINVAL; } else if(memcmp(hdr->hashSpec, "sha1", 4)) { /* Check for SHA1 - other hashspecs are not implemented ATM */ - fputs(_("unknown hash spec in phdr"), stderr); + set_error(_("unknown hash spec in phdr\n"), stderr); r = -EINVAL; } else if((hdr->version = ntohs(hdr->version)) != 1) { /* Convert every uint16/32_t item from network byte order */ - fprintf(stderr, _("unknown LUKS version %d\n"), hdr->version); + set_error(_("unknown LUKS version %d\n"), hdr->version); r = -EINVAL; } else { hdr->payloadOffset = ntohl(hdr->payloadOffset); @@ -120,7 +120,7 @@ devfd = open(device,O_RDWR | O_DIRECT | O_SYNC | O_EXCL); if(-1 == devfd) { - fprintf(stderr, _("Can't open device: %s\n"), device); + set_error(_("Can't open device %s"), device); return -EINVAL; } @@ -192,8 +192,9 @@ currentSector = round_up_modulo(currentSector, alignPayload); header->payloadOffset=currentSector; + uuid_generate(partitionUuid); - uuid_unparse(partitionUuid, header->uuid); + uuid_unparse(partitionUuid, header->uuid); return 0; } @@ -209,12 +210,12 @@ int r; if(hdr->keyblock[keyIndex].active != LUKS_KEY_DISABLED) { - fprintf(stderr, _("key %d active, purge first.\n"), keyIndex); + set_error( _("key %d active, purge first"), keyIndex); return -EINVAL; } if(hdr->keyblock[keyIndex].stripes < LUKS_STRIPES) { - fprintf(stderr,_("key material section %d includes too few stripes. Header manipulation?\n"),keyIndex); + set_error(_("key material section %d includes too few stripes. Header manipulation?"),keyIndex); return -EINVAL; } r = getRandom(hdr->keyblock[keyIndex].passwordSalt, LUKS_SALTSIZE); @@ -246,7 +247,8 @@ hdr->keyblock[keyIndex].keyMaterialOffset, backend); if(r < 0) { - fprintf(stderr,"Failed to write to key storage.\n"); + if(!get_error()) + set_error("Failed to write to key storage"); goto out; } @@ -280,9 +282,6 @@ int r; if(hdr->keyblock[keyIndex].active != LUKS_KEY_ENABLED) { -#ifdef LUKS_DEBUG - fprintf(stderr, _("key %d is disabled.\n"), keyIndex); -#endif return -EINVAL; } @@ -306,7 +305,8 @@ hdr->keyblock[keyIndex].keyMaterialOffset, backend); if(r < 0) { - fprintf(stderr,"Failed to read from key storage\n"); + if(!get_error()) + set_error("Failed to read from key storage"); goto out; } @@ -341,9 +341,7 @@ *mk=LUKS_alloc_masterkey(hdr->keyBytes); for(i=0; i<LUKS_NUMKEYS; i++) { r = LUKS_open_key(device, i, password, passwordLen, hdr, *mk, backend); - if(r == 0) { - fprintf(stderr,"key slot %d unlocked.\n",i); return i; } /* Do not retry for errors that are no -EPERM or -EINVAL, former meaning password wrong, latter key slot inactive */ @@ -390,7 +388,7 @@ devfd = open(device, O_RDWR | O_DIRECT); if(devfd == -1) { - fprintf(stderr, _("Can't open device: %s\n"), device); + set_error(_("Can't open device %s"), device); return -EINVAL; } @@ -420,7 +418,7 @@ int LUKS_del_key(const char *device, unsigned int keyIndex) { struct luks_phdr hdr; - unsigned int i, startOffset, endOffset, stripesLen; + unsigned int startOffset, endOffset, stripesLen; int r; r = LUKS_read_phdr(device, &hdr); @@ -470,11 +468,16 @@ int LUKS_device_ready(char *device, int mode) { - int devfd = open(device, mode | O_DIRECT | O_SYNC); - if(devfd < 0) { - fprintf(stderr,_("Can't open device for %s%saccess: %s\n"), (mode & O_EXCL)?_("exclusive "):"", (mode & O_RDWR)?_("writable "):"read-only ", device); - return 0; - } - close(devfd); - return 1; + int devfd = open(device, mode | O_DIRECT | O_SYNC); + if(devfd < 0) { + set_error(_("Can't open device for %s%saccess: %s\n"), (mode & O_EXCL)?_("exclusive "):"", (mode & O_RDWR)?_("writable "):"read-only ", device); + return 0; + } + close(devfd); + return 1; } + +// Local Variables: +// c-basic-offset: 8 +// indent-tabs-mode: nil +// End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/luks/luks.h new/cryptsetup-1.0.5_SVNr38/luks/luks.h --- old/cryptsetup-1.0.5_SVNr31/luks/luks.h 2006-11-21 10:54:36.000000000 +0100 +++ new/cryptsetup-1.0.5_SVNr38/luks/luks.h 2007-11-22 14:50:26.000000000 +0100 @@ -132,5 +132,4 @@ char *key, size_t keyLength, const char *device, unsigned int sector, struct setup_backend *backend); - #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/luks/random.c new/cryptsetup-1.0.5_SVNr38/luks/random.c --- old/cryptsetup-1.0.5_SVNr31/luks/random.c 2007-09-11 16:48:42.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/luks/random.c 2007-10-24 21:57:21.000000000 +0200 @@ -23,7 +23,7 @@ closeRandom */ int getRandom(char *buf, size_t len) { - int r = 0, index = 0; + int r = 0; if(openRandom() == -1) { perror("getRandom:"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/man/cryptsetup.8 new/cryptsetup-1.0.5_SVNr38/man/cryptsetup.8 --- old/cryptsetup-1.0.5_SVNr31/man/cryptsetup.8 2007-09-11 16:48:42.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/man/cryptsetup.8 2007-10-24 21:29:57.000000000 +0200 @@ -88,7 +88,9 @@ query for passwords twice. Useful, when creating a (regular) mapping for the first time, or when running \fIluksFormat\fR. .TP .B "\-\-key-file, \-d" -use file as key material. With LUKS, key material supplied in key files via \-d are always used for existing passphrases. If you want to set a new key via a key file, you have to use a positional arg to \fIluksFormat\fR or \fIluksAddKey\fR. If the key file is "-", stdin will be used. +use file as key material. With LUKS, key material supplied in key files via \-d are always used for existing passphrases. If you want to set a new key via a key file, you have to use a positional arg to \fIluksFormat\fR or \fIluksAddKey\fR. + +If the key file is "-", stdin will be used. This is different from how cryptsetup usually reads from stdin. See section \fBNOTES ON PASSWORD PROCESSING\fR for more information. .TP .B "\-\-key-size, \-s" set key size in bits. Has to be a multiple of 8 bits. The key size is limited by the used cipher. See output of /proc/crypto for more information. Can be used for \fIcreate\fR or \fIluksFormat\fR, all other LUKS actions will ignore this flag, as the key-size is specified by the partition header. Default is 128. @@ -112,7 +114,7 @@ Do not ask for confirmation. This option is only relevant for \fIluksFormat\fR. .TP .B "\-\-timeout, \-t" -The number of seconds to wait before timeout. This option is relevant evertime a password is asked, like \fIcreate\fR, \fIluksOpen\fR, \fIluksFormat\fR or \fIluksAddKey\fR. +The number of seconds to wait before timeout. This option is relevant evertime a password is asked, like \fIcreate\fR, \fIluksOpen\fR, \fIluksFormat\fR or \fIluksAddKey\fR. It has no effect if used in conjunction with \-\-key-file. .TP .B "\-\-tries, \-T" How often the input of the passphrase shall be retried. This option is relevant evertime a password is asked, like \fIcreate\fR, \fIluksOpen\fR, \fIluksFormat\fR or \fIluksAddKey\fR. The default is 3 tries. @@ -125,14 +127,16 @@ .B "\-\-version" Show the version. -.SH NOTES ON PASSWORD PROCESSING FOR REGULAR MAPPINGS -\fIFrom a file descriptor or a terminal\fR: Password processing is new-line sensitive, meaning the reading will stop after encountering \\n. It will processed the read material with the default hash or the hash given by \-\-hash. After hashing it will be cropped to the key size given by \-s (default 256 bits). +.SH NOTES ON PASSWORD PROCESSING +\fIFrom a file descriptor or a terminal\fR: Password processing is new-line sensitive, meaning the reading will stop after encountering \\n. It will processed the read material (without newline) with the default hash or the hash given by \-\-hash. After hashing it will be cropped to the key size given by \-s (default 256 bits). -\fIFrom stdin\fR: Reading will continue until EOF (so using e.g. /dev/random as stdin will not work). After that the read data will be hashed with the default hash or the hash given by \-\-hash and the result will be cropped to the keysize given by \-s (default 256 bits). If "plain" is used as an argument to the hash option, the input data will not be hashed. Instead it will be zero padded (if shorter than the keysize) or truncated (if longer than the keysize) and used directly as the key. No warning will be given if the amount of data read from stdin is less than the keysize. +\fIFrom stdin\fR: Reading will continue until EOF (so using e.g. /dev/random as stdin will not work), with the trailing newline stripped. After that the read data will be hashed with the default hash or the hash given by \-\-hash and the result will be cropped to the keysize given by \-s (default 256 bits). If "plain" is used as an argument to the hash option, the input data will not be hashed. Instead it will be zero padded (if shorter than the keysize) or truncated (if longer than the keysize) and used directly as the key. No warning will be given if the amount of data read from stdin is less than the keysize. \fIFrom a key file\fR: It will be cropped to the size given by \-s. If there is insufficient key material in the key file, cryptsetup will quit with an error. + +If \-\-key-file=- is used for reading the key from stdin, no trailing newline ist stripped from the input. Without that option, cryptsetup strips trailing newlines from stdin input. .SH NOTES ON PASSWORD PROCESSING FOR LUKS -Password processing is totally different for LUKS. LUKS uses PBKDF2 to protect against dictionary attacks (see RFC 2898). +LUKS uses PBKDF2 to protect against dictionary attacks (see RFC 2898). LUKS will always use SHA1 in HMAC mode, and no other mode is supported at the moment. Hence, \-h is ignored. @@ -149,9 +153,9 @@ .br LUKS extensions, and man page by Clemens Fruhwirth <clemens(a)endorphin.org> .SH "COMPATABILITY WITH OLD SUSE TWOFISH PARTITIONS" -To read images created with SuSE Linux 9.2's loop_fish2 use --cipher -twofish-cbc-null -s 256 -h sha512, for images created with even -older SuSE Linux use --cipher twofish-cbc-null -s 192 -h +To read images created with SuSE Linux 9.2's loop_fish2 use \-\-cipher +twofish-cbc-null \-s 256 \-h sha512, for images created with even +older SuSE Linux use \-\-cipher twofish-cbc-null \-s 192 \-h ripemd160:20 .SH "REPORTING BUGS" Report bugs to <dm-crypt(a)saout.de>. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/po/Makefile.in new/cryptsetup-1.0.5_SVNr38/po/Makefile.in --- old/cryptsetup-1.0.5_SVNr31/po/Makefile.in 2007-09-11 16:48:42.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/po/Makefile.in 2007-11-22 14:50:26.000000000 +0100 @@ -11,7 +11,7 @@ # Origin: gettext-0.15 PACKAGE = cryptsetup -VERSION = 1.0.5-pre1 +VERSION = 1.0.6-pre1 PACKAGE_BUGREPORT = SHELL = /bin/sh diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cryptsetup-1.0.5_SVNr31/src/cryptsetup.c new/cryptsetup-1.0.5_SVNr38/src/cryptsetup.c --- old/cryptsetup-1.0.5_SVNr31/src/cryptsetup.c 2007-09-11 16:48:42.000000000 +0200 +++ new/cryptsetup-1.0.5_SVNr38/src/cryptsetup.c 2007-11-22 14:50:26.000000000 +0100 @@ -4,6 +4,7 @@ #include <stdint.h> #include <inttypes.h> #include <errno.h> +#include <unistd.h> #include <assert.h> #include <libcryptsetup.h> @@ -82,7 +83,8 @@ size_t size=0; fprintf(stderr,"\nWARNING!\n========\n"); fprintf(stderr,"%s\n\nAre you sure? (Type uppercase yes): ",msg); - getline(&answer,&size,stdin); + if(getline(&answer,&size,stdin) == -1) + return 0; if(strcmp(answer,"YES\n") == 0) r = 1; free(answer); @@ -95,20 +97,20 @@ switch(class) { case CRYPT_LOG_NORMAL: - puts(msg); - break; + puts(msg); + break; case CRYPT_LOG_ERROR: - fputs(msg, stderr); - break; + fputs(msg, stderr); + break; default: - fprintf(stderr, "Internal error on logging class for msg: %s", msg); - break; + fprintf(stderr, "Internal error on logging class for msg: %s", msg); + break; } } static struct interface_callbacks cmd_icb = { - .yesDialog = yesDialog, - .log = cmdLineLog + .yesDialog = yesDialog, + .log = cmdLineLog, }; /* End ICBs */ @@ -118,8 +120,8 @@ char error[256]; if(!errcode) { - fprintf(stderr, _("Command successful.\n")); - return; + fprintf(stderr, _("Command successful.\n")); + return; } crypt_get_error(error, sizeof(error)); @@ -305,12 +307,7 @@ int r; opt_verbose = 1; - if(LUKS_is_last_keyslot(options.device, options.key_slot) && - !yesDialog(_("This is the last keyslot. Device will become unusable after purging this key."))) { - r = -EINVAL; - } else { - r = crypt_luksKillSlot(&options); - } + r = crypt_luksKillSlot(&options); show_status(-r); return r; } @@ -367,7 +364,7 @@ .device = action_argv[0], .icb = &cmd_icb, }; - int r; + int r; r = crypt_luksUUID(&options); if (r < 0) @@ -535,3 +532,8 @@ } return action->handler(action->arg); } + +// Local Variables: +// c-basic-offset: 8 +// indent-tabs-mode: nil +// End: ++++++ cryptsetup-mktar ++++++ --- cryptsetup/cryptsetup-mktar 2007-04-25 13:38:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/cryptsetup/cryptsetup-mktar 2007-11-29 13:46:28.000000000 +0100 @@ -1,8 +1,8 @@ #!/bin/sh # repo is at http://luks.endorphin.org/svn/cryptsetup -set -e -SVN_VERSION="1.0.4_SVN`svnversion .`" -rm -rf cryptsetup-luks-${SVN_VERSION} -svn export . cryptsetup-luks-${SVN_VERSION} -tar --owner=root --group=root --force-local -cjf cryptsetup-luks-${SVN_VERSION}.tar.bz2 cryptsetup-luks-${SVN_VERSION} -rm -rf cryptsetup-luks-${SVN_VERSION} +set -e -x +SVN_VERSION="1.0.5_SVNr`svnversion .`" +rm -rf cryptsetup-${SVN_VERSION} +svn export . cryptsetup-${SVN_VERSION} +tar --owner=root --group=root --force-local -cjf cryptsetup-${SVN_VERSION}.tar.bz2 cryptsetup-${SVN_VERSION} +rm -rf cryptsetup-${SVN_VERSION} ++++++ crypttab.5 ++++++ --- cryptsetup/crypttab.5 2007-05-09 15:06:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/cryptsetup/crypttab.5 2007-11-29 14:07:15.000000000 +0100 @@ -1,17 +1,17 @@ .\" Title: crypttab .\" Author: -.\" Generator: DocBook XSL Stylesheets v1.71.1 <http://docbook.sf.net/> -.\" Date: 05/09/2007 +.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/> +.\" Date: 11/29/2007 .\" Manual: .\" Source: .\" -.TH "CRYPTTAB" "5" "05/09/2007" "" "" +.TH "CRYPTTAB" "5" "11/29/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" -crypttab \- static information about crypted filesystems +crypttab - static information about crypted filesystems .SH "SYNOPSIS" .PP \fBcrypttab\fR @@ -23,111 +23,115 @@ \fI<options>\fR .RE .SH "DESCRIPTION" -The file \fB/etc/crypttab\fR contains descriptive informations about encrypted volumes. Each volume is described on a separate line; columns on each line are separated by tabs or spaces. Lines starting with "\fI#\fR" are comments, empty lines are ignored. The order of records in \fBcrypttab\fR is important because the \fB/etc/init.d/boot.crypto\fR script sequentially iterates through \fBcrypttab\fR entries. All four columns are mandatory, missing or excessive columns will lead to unspecified behaviour. +The file \fB/etc/crypttab\fR contains descriptive informations about encrypted volumes\. Each volume is described on a separate line; columns on each line are separated by tabs or spaces\. Lines starting with "\fI#\fR" are comments, empty lines are ignored\. The order of records in \fBcrypttab\fR is important because the \fB/etc/init\.d/boot\.crypto\fR script sequentially iterates through \fBcrypttab\fR entries\. All four columns are mandatory, missing or excessive columns will lead to unspecified behaviour\. .sp -.TP 4 -\(bu -The first column, +.sp +.RS 4 +\h'-04'\(bu\h'+03'The first column, \fItarget device\fR specifies the mapped -\fIdevice name\fR. It must be a plain filename without any directories. A mapped device +\fIdevice name\fR\. It must be a plain filename without any directories\. A mapped device \fB/dev/mapper/\fR\fIdevice name\fR will be created by \fBcryptsetup(8)\fR crypting data from and onto the -\fIsource device\fR. -To actually mount that device it needs to be listed in \fB/etc/fstab\fR. +\fIsource device\fR\. +.RE +To actually mount that device it needs to be listed in \fB/etc/fstab\fR\. +.sp .sp -.TP 4 -\(bu -The second column +.RS 4 +\h'-04'\(bu\h'+03'The second column \fIsource device\fR -specifies the block special device that should hold the encrypted data. -.TP 4 -\(bu -The third column +specifies the block special device that should hold the encrypted data\. +.RE +.sp +.RS 4 +\h'-04'\(bu\h'+03'The third column \fIkey file\fR -specifies the file to use for decrypting the encrypted data of the -\fIsource device\fR. -It can also be a device name (e.g. \fB/dev/urandom\fR, which is useful for encrypted swap devices). Warning: luks does not support infinite streams (like \fB/dev/urandom\fR), it requires a fixed size key. -.sp -If the \fIkey file\fR is the string \fBnone\fR, the key data (i.e. a password or passphrase) will be read interactively from the console. In this case the options precheck, check, checkargs and tries may be useful. -.sp -.TP 4 -\(bu -The fourth field +specifies a file containing the raw binary key to use for decrypting the encrypted data of the +\fIsource device\fR\. +.RE +The key file can also be a device name (e\.g\. \fB/dev/urandom\fR, which is useful for encrypted swap devices)\. Warning: luks does not support infinite streams (like \fB/dev/urandom\fR), it requires a fixed size key\. +.sp +If the \fIkey file\fR is the string \fBnone\fR, the key data (i\.e\. a password or passphrase) will be read interactively from the console\. In this case the options precheck, check, checkargs and tries may be useful\. +.sp +.sp +.RS 4 +\h'-04'\(bu\h'+03'The fourth field \fIoptions\fR -specifies the cryptsetup options associated with the encryption process. At minimum, the field should contain the string +specifies the cryptsetup options associated with the encryption process\. At minimum, the field should contain the string \fBluks\fR or the \fIcipher\fR, \fIhash\fR and \fIsize\fR -options. +options\. +.RE Options have to be specified in the format: \fIkey\fR=\fIvalue\fR[,\fIkey\fR=\fIvalue\fR \&...] .sp .SH "OPTIONS" .PP \fBcipher\fR=<cipher> .RS 4 -Encryption algorithm. See -\fBcryptsetup \-c\fR. +Encryption algorithm\. See +\fBcryptsetup \-c\fR\. .RE .PP \fBsize\fR=<size> .RS 4 -Encryption key size. See -\fBcryptsetup \-s\fR. +Encryption key size\. See +\fBcryptsetup \-s\fR\. .RE .PP \fBhash\fR=<hash> .RS 4 -Hash algorithm. See -\fBcryptsetup \-h\fR. +Hash algorithm\. See +\fBcryptsetup \-h\fR\. .RE .PP \fBverify\fR .RS 4 -Verify password. See -\fBcryptsetup \-y\fR. +Verify password\. See +\fBcryptsetup \-y\fR\. .RE .PP \fBreadonly\fR .RS 4 -The backing device is read\-only (eg: a dvd). +The backing device is read\-only (eg: a dvd)\. .RE .PP \fBluks\fR .RS 4 -Use device with luks extensions. +Use device with luks extensions\. .RE .PP \fBswap\fR .RS 4 Run \fBmkswap\fR -on the created device. +on the created device\. .RE .PP \fBtmp\fR .RS 4 Run \fBmkfs\fR -on the created device. The file system to use is specified in -\fB/etc/fstab\fR. If +on the created device\. The file system to use is specified in +\fB/etc/fstab\fR\. If \fB/etc/fstab\fR -does not list the mapped device, ext2 is used as fallback. +does not list the mapped device, ext2 is used as fallback\. .RE .PP \fBprecheck\fR=<precheck> .RS 4 -Check the source device by suitable program; if the check fails the device is not created; <precheck> is a script to check the source device. The source device is given as argument to the script. +Check the source device by suitable program; if the check fails the device is not created; <precheck> is a script to check the source device\. The source device is given as argument to the script\. .RE .PP \fBcheck\fR[=<program>] .RS 4 -Check the content of the mapped device by a suitable program; if the check fails the device is removed. The specified program is run giving the decrypted volume (target device) as first and the value of the checkargs option as second argument. Cryptdisks searches for the given program in /lib/cryptsetup/checks/. If no program is specified, vol_id is used. +Check the content of the mapped device by a suitable program; if the check fails the device is removed\. The specified program is run giving the decrypted volume (target device) as first and the value of the checkargs option as second argument\. Cryptdisks searches for the given program in /lib/cryptsetup/checks/\. If no program is specified, vol_id is used\. .RE .PP \fBcheckargs\fR=<argument> @@ -137,37 +141,37 @@ .PP \fBtries\fR=<num> .RS 4 -Prompt for the passphrase at most <num> times if the entered passphrase was wrong. Defaults is 3. Only works for LUKS volumes. +Prompt for the passphrase at most <num> times if the entered passphrase was wrong\. Defaults is 3\. Only works for LUKS volumes\. .RE .PP \fBtimeout\fR=<sec> .RS 4 -Time out interactive password prompts after <sec> seconds. +Time out interactive password prompts after <sec> seconds\. .RE .PP \fBloop\fR .RS 4 -Always attach a loop device before mapping the device. Normally a loop device is used automatically only for image files. Useful if the block size of the physical device does not match the block size of the contained file system. E.g. ext2 on a CD. +Always attach a loop device before mapping the device\. Normally a loop device is used automatically only for image files\. Useful if the block size of the physical device does not match the block size of the contained file system\. E\.g\. ext2 on a CD\. .RE .PP \fBnoauto\fR .RS 4 -Causes boot.crypto to skip this record during boot +Causes boot\.crypto to skip this record during boot .RE .PP \fBpseed=<string>\fR .RS 4 -Set a string that is appended to the passphrase after hashing. Using different seeds for volumes with the same passphrase makes dictionary attacks harder. Use for compatability with loop\-AES. +Set a string that is appended to the passphrase after hashing\. Using different seeds for volumes with the same passphrase makes dictionary attacks harder\. Use for compatability with loop\-AES\. .RE .PP \fBitercountk=<num>\fR .RS 4 -Encrypts the hashed password <num> thousand times using AES\-256. Use for compatability with loop\-AES. +Encrypts the hashed password <num> thousand times using AES\-256\. Use for compatability with loop\-AES\. .RE .PP \fBloud\fR, \fBssl\fR, \fBgpg\fR, \fBkeyscript\fR .RS 4 -not supported. Listed here as they are supported by Debian. +not supported\. Listed here as they are supported by Debian\. .RE .SH "CHECKSCRIPTS" TODO @@ -197,5 +201,5 @@ cryptsetup(8), /etc/crypttab, fstab(8) .sp .SH "AUTHOR" -Manual page converted to asciidoc by Michael Gebetsroither <michael.geb(a)gmx.at>. Originally written by Bastian Kleineidam <calvin(a)debian.org> for the Debian distribution of cryptsetup. Improved by Jonas Meurer <jonas(a)freesources.org>. Modified for SUSE Linux by Ludwig Nussel <ludwig.nussel(a)suse.de>. Parts of this manual were taken and adapted from the fstab(5) manual page. +Manual page converted to asciidoc by Michael Gebetsroither <michael\.geb(a)gmx\.at>\. Originally written by Bastian Kleineidam <calvin(a)debian\.org> for the Debian distribution of cryptsetup\. Improved by Jonas Meurer <jonas(a)freesources\.org>\. Modified for SUSE Linux by Ludwig Nussel <ludwig\.nussel(a)suse\.de>\. Parts of this manual were taken and adapted from the fstab(5) manual page\. .sp ++++++ crypttab.5.txt ++++++ --- cryptsetup/crypttab.5.txt 2007-05-09 10:46:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/cryptsetup/crypttab.5.txt 2007-11-29 14:06:56.000000000 +0100 @@ -33,12 +33,14 @@ - The second column 'source device' specifies the block special device that should hold the encrypted data. -- The third column 'key file' specifies the file to use for -decrypting the encrypted data of the 'source device'. - -It can also be a device name (e.g. */dev/urandom*, which is useful -for encrypted swap devices). Warning: luks does not support infinite -streams (like */dev/urandom*), it requires a fixed size key. +- The third column 'key file' specifies a file containing the raw +binary key to use for decrypting the encrypted data of the 'source +device'. + +The key file can also be a device name (e.g. */dev/urandom*, which +is useful for encrypted swap devices). Warning: luks does not +support infinite streams (like */dev/urandom*), it requires a fixed +size key. If the 'key file' is the string *none*, the key data (i.e. a password or passphrase) will be read interactively from the console. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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