May 2011 - openSUSE Commits - openSUSE Mailing Lists

commit mozilla-xulrunner192 for openSUSE:Factory
by root＠hilbert.suse.de 10 May '11

10 May '11

Hello community, here is the log from the commit of package mozilla-xulrunner192 for openSUSE:Factory checked in at Tue May 10 09:13:39 CEST 2011. -------- --- mozilla-xulrunner192/mozilla-xulrunner192.changes 2011-03-23 00:54:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner192/mozilla-xulrunner192.changes 2011-04-29 07:06:44.000000000 +0200 @@ -1,0 +2,20 @@ +Thu Apr 21 10:16:51 UTC 2011 - wr(a)rosenauer.org + +- security update to 1.9.2.17 (bnc#689281) + * MFSA 2011-12/ CVE-2011-0069 CVE-2011-0070 CVE-2011-0072 + CVE-2011-0074 CVE-2011-0075 CVE-2011-0077 CVE-2011-0078 + CVE-2011-0080 CVE-2011-0081 + Miscellaneous memory safety hazards + * MFSA 2011-13/CVE-2011-0065/CVE-2011-0066/CVE-2011-0073 + Multiple dangling pointer vulnerabilities + * MFSA 2011-14/CVE-2011-0067 (bmo#527935) + Information stealing via form history + * MFSA 2011-18/CVE-2011-1202 (bmo#640339) + XSLT generate-id() function heap address leak + +------------------------------------------------------------------- +Mon Mar 28 16:25:25 UTC 2011 - llunak(a)novell.com + +- fix 'save as' with KDE integration (bnc#557598) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- l10n-1.9.2.16.tar.bz2 xulrunner-source-1.9.2.16.tar.bz2 New: ---- l10n-1.9.2.17.tar.bz2 xulrunner-source-1.9.2.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner192.spec ++++++ --- /var/tmp/diff_new_pack.hxTTo9/_old 2011-05-10 09:12:32.000000000 +0200 +++ /var/tmp/diff_new_pack.hxTTo9/_new 2011-05-10 09:12:32.000000000 +0200 @@ -38,13 +38,13 @@ %else BuildRequires: wireless-tools %endif -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 1.9.2.16 +License: MPLv1.1 or GPLv2+ or LGPLv2+ +Version: 1.9.2.17 Release: 1 -%define releasedate 2011031900 -%define version_internal 1.9.2.16 +%define releasedate 2011042000 +%define version_internal 1.9.2.17 %define apiversion 1.9.2 -%define uaweight 192160 +%define uaweight 192170 Summary: Mozilla Runtime Environment 1.9.2 Url: http://www.mozilla.org Group: Productivity/Other @@ -128,7 +128,7 @@ %package -n mozilla-js192 -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Mozilla JS 1.8 engine Group: Productivity/Other @@ -140,7 +140,7 @@ %package devel -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: XULRunner/Gecko SDK 1.9.2 Group: Development/Libraries/Other %if %has_system_nspr @@ -157,7 +157,7 @@ %if %localize %package translations-common -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Common translations for XULRunner 1.9.2 Group: System/Localization Requires: %{name} = %{version} @@ -174,7 +174,7 @@ %package translations-other -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Extra translations for XULRunner 1.9.2 Group: System/Localization Requires: %{name} = %{version} @@ -190,7 +190,7 @@ %endif %package gnome -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: XULRunner components depending on gnome-vfs Group: Productivity/Other Requires: %{name} = %{version}-%{release} @@ -206,7 +206,7 @@ %if %crashreporter %package buildsymbols -License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +License: MPLv1.1 or GPLv2+ or LGPLv2+ Summary: Breakpad buildsymbols for %{name} Group: Development/Debug ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.hxTTo9/_old 2011-05-10 09:12:32.000000000 +0200 +++ /var/tmp/diff_new_pack.hxTTo9/_new 2011-05-10 09:12:32.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_6_16_RELEASE" -VERSION="1.9.2.16" +RELEASE_TAG="FIREFOX_3_6_17_RELEASE" +VERSION="1.9.2.17" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla ++++++ l10n-1.9.2.16.tar.bz2 -> l10n-1.9.2.17.tar.bz2 ++++++ mozilla-xulrunner192/l10n-1.9.2.16.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner192/l10n-1.9.2.17.tar.bz2 differ: char 11, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.hxTTo9/_old 2011-05-10 09:12:32.000000000 +0200 +++ /var/tmp/diff_new_pack.hxTTo9/_new 2011-05-10 09:12:32.000000000 +0200 @@ -2616,7 +2616,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/xre/nsKDEUtils.cpp -@@ -0,0 +1,334 @@ +@@ -0,0 +1,328 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -2817,12 +2817,6 @@ + { + if( !startHelper()) + return false; -+ // if Gtk has meanwhile gotten a grab (bnc#555202, somehow the file dialog -+ // is called with a delay), then do not do anything, as this app would keep -+ // the grabs but block waiting for the helper, which would be unable to do -+ // anything because of the grab -+ if( blockUi && gdk_pointer_is_grabbed()) -+ return false; + feedCommand( command ); + // do not store the data in 'this' but in extra structure, just in case there + // is reentrancy (can there be? the event loop is re-entered) ++++++ xulrunner-source-1.9.2.16.tar.bz2 -> xulrunner-source-1.9.2.17.tar.bz2 ++++++ mozilla-xulrunner192/xulrunner-source-1.9.2.16.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner192/xulrunner-source-1.9.2.17.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 aaa_base for openSUSE:Factory
by root＠hilbert.suse.de 10 May '11

10 May '11

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Tue May 10 09:12:16 CEST 2011. -------- --- aaa_base/aaa_base.changes 2011-05-06 12:06:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2011-05-09 16:23:59.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 9 14:23:10 UTC 2011 - ro(a)novell.com + +- add COPYING file as requested + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.yIrVHt/_old 2011-05-10 09:12:01.000000000 +0200 +++ /var/tmp/diff_new_pack.yIrVHt/_new 2011-05-10 09:12:01.000000000 +0200 @@ -21,7 +21,7 @@ Name: aaa_base Version: 11.5 -Release: 75 +Release: 77 License: GPLv2+ Group: System/Fhs Url: http://gitorious.org/opensuse/aaa_base @@ -103,6 +103,7 @@ %files %defattr(-,root,root) +%doc COPYING %config(noreplace) /etc/inittab %config /etc/bash.bashrc %config /etc/csh.cshrc ++++++ aaa_base.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aaa_base/COPYING new/aaa_base/COPYING --- old/aaa_base/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base/COPYING 2011-05-09 16:21:26.000000000 +0200 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Steet, Fifth Floor, 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., 51 Franklin Steet, Fifth Floor, 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. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 vino for openSUSE:11.4
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package vino for openSUSE:11.4 checked in at Mon May 9 17:00:14 CEST 2011. -------- --- old-versions/11.4/all/vino/vino.changes 2011-02-13 17:24:38.000000000 +0100 +++ 11.4/vino/vino.changes 2011-05-02 15:49:03.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 2 15:44:57 CEST 2011 - vuntz(a)opensuse.org + +- Add vino-CVE-2011-0904_0905.patch to fix security vulnerabilities + that lead to an out-of-bounds memory write and read with a + crafted client framebuffer update request packet. +- Fixes CVE-2011-0904, CVE-2011-0905 and bnc#691207. + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/vino Destination is old-versions/11.4/UPDATES/all/vino calling whatdependson for 11.4-i586 New: ---- vino-CVE-2011-0904_0905.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vino.spec ++++++ --- /var/tmp/diff_new_pack.EaZTkb/_old 2011-05-09 16:59:57.000000000 +0200 +++ /var/tmp/diff_new_pack.EaZTkb/_new 2011-05-09 16:59:57.000000000 +0200 @@ -22,10 +22,12 @@ License: GPLv2+ Group: Productivity/Networking/Other Version: 2.32.1 -Release: 2 +Release: 6.<RELEASE7> Summary: GNOME VNC Server Url: http://www.gnome.org Source: vino-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM vino-CVE-2011-0904_0905.patch bnc#691207 vuntz(a)opensuse.org -- Fix security issues +Patch0: vino-CVE-2011-0904_0905.patch BuildRequires: fdupes BuildRequires: gconf2-devel BuildRequires: gnutls-devel @@ -51,6 +53,7 @@ %prep %setup translation-update-upstream +%patch0 -p1 %build %configure\ ++++++ vino-CVE-2011-0904_0905.patch ++++++ >From af7847f11681770018ed6e7f86e7a31feabf9963 Mon Sep 17 00:00:00 2001 From: David King <amigadave(a)amigadave.com> Date: Tue, 26 Apr 2011 22:31:36 +0200 Subject: [PATCH] Avoid out-of-bounds memory accesses This fixes two critical security vulnerabilities that lead to an out-of-bounds memory write and read with a crafted client framebuffer update request packet. The dimensions of the update from the packet are checked to ensure that they are within the screen dimensions. Thanks to Kevin Chen from the Bitblaze group for the reports in bugs 641802 and 641803. The CVE identifiers for these vulnerabilities are CVE-2011-0904 and CVE-2011-0905. --- server/libvncserver/rfbserver.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c index 8c35853..f02a7f9 100644 --- a/server/libvncserver/rfbserver.c +++ b/server/libvncserver/rfbserver.c @@ -1163,6 +1163,10 @@ rfbSendFramebufferUpdate(rfbClientPtr cl, cl->rfbRawBytesEquivalent += (sz_rfbFramebufferUpdateRectHeader + w * (cl->format.bitsPerPixel / 8) * h); + /* Validate the rectangle given by the update packet. */ + if (w + x > cl->screen->width || h + y > cl->screen->height) + goto tx_error; + switch (cl->preferredEncoding) { case rfbEncodingRaw: if (!rfbSendRectEncodingRaw(cl, x, y, w, h)) -- 1.7.3.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 vino for openSUSE:11.3
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package vino for openSUSE:11.3 checked in at Mon May 9 16:59:48 CEST 2011. -------- --- old-versions/11.3/all/vino/vino.changes 2010-03-30 19:59:40.000000000 +0200 +++ 11.3/vino/vino.changes 2011-05-02 15:48:46.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 2 15:44:57 CEST 2011 - vuntz(a)opensuse.org + +- Add vino-CVE-2011-0904_0905.patch to fix security vulnerabilities + that lead to an out-of-bounds memory write and read with a + crafted client framebuffer update request packet. +- Fixes CVE-2011-0904, CVE-2011-0905 and bnc#691207. + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.3/all/vino Destination is old-versions/11.3/UPDATES/all/vino calling whatdependson for 11.3-i586 New: ---- vino-CVE-2011-0904_0905.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vino.spec ++++++ --- /var/tmp/diff_new_pack.oy047p/_old 2011-05-09 16:58:54.000000000 +0200 +++ /var/tmp/diff_new_pack.oy047p/_new 2011-05-09 16:58:54.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package vino (Version 2.28.2) +# spec file for package vino # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,10 +36,12 @@ License: GPLv2+ Group: Productivity/Networking/Remote Desktop Version: 2.28.2 -Release: 1 +Release: 2.<RELEASE2> Requires: %{name}-lang = %{version} Summary: GNOME VNC Server Source: vino-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM vino-CVE-2011-0904_0905.patch bnc#691207 vuntz(a)opensuse.org -- Fix security issues +Patch0: vino-CVE-2011-0904_0905.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -51,6 +53,7 @@ %prep %setup translation-update-upstream +%patch0 -p1 %build %configure\ ++++++ vino-CVE-2011-0904_0905.patch ++++++ >From af7847f11681770018ed6e7f86e7a31feabf9963 Mon Sep 17 00:00:00 2001 From: David King <amigadave(a)amigadave.com> Date: Tue, 26 Apr 2011 22:31:36 +0200 Subject: [PATCH] Avoid out-of-bounds memory accesses This fixes two critical security vulnerabilities that lead to an out-of-bounds memory write and read with a crafted client framebuffer update request packet. The dimensions of the update from the packet are checked to ensure that they are within the screen dimensions. Thanks to Kevin Chen from the Bitblaze group for the reports in bugs 641802 and 641803. The CVE identifiers for these vulnerabilities are CVE-2011-0904 and CVE-2011-0905. --- server/libvncserver/rfbserver.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c index 8c35853..f02a7f9 100644 --- a/server/libvncserver/rfbserver.c +++ b/server/libvncserver/rfbserver.c @@ -1163,6 +1163,10 @@ rfbSendFramebufferUpdate(rfbClientPtr cl, cl->rfbRawBytesEquivalent += (sz_rfbFramebufferUpdateRectHeader + w * (cl->format.bitsPerPixel / 8) * h); + /* Validate the rectangle given by the update packet. */ + if (w + x > cl->screen->width || h + y > cl->screen->height) + goto tx_error; + switch (cl->preferredEncoding) { case rfbEncodingRaw: if (!rfbSendRectEncodingRaw(cl, x, y, w, h)) -- 1.7.3.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 vino for openSUSE:11.2
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package vino for openSUSE:11.2 checked in at Mon May 9 16:58:43 CEST 2011. -------- --- old-versions/11.2/UPDATES/all/vino/vino.changes 2009-11-14 16:53:33.000000000 +0100 +++ 11.2/vino/vino.changes 2011-05-02 15:47:12.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 2 15:44:57 CEST 2011 - vuntz(a)opensuse.org + +- Add vino-CVE-2011-0904_0905.patch to fix security vulnerabilities + that lead to an out-of-bounds memory write and read with a + crafted client framebuffer update request packet. +- Fixes CVE-2011-0904, CVE-2011-0905 and bnc#691207. + +------------------------------------------------------------------- calling whatdependson for 11.2-i586 New: ---- vino-CVE-2011-0904_0905.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vino.spec ++++++ --- /var/tmp/diff_new_pack.EPfLpB/_old 2011-05-09 16:58:29.000000000 +0200 +++ /var/tmp/diff_new_pack.EPfLpB/_new 2011-05-09 16:58:29.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package vino (Version 2.28.1) +# spec file for package vino # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,10 +36,12 @@ License: GPLv2+ Group: Productivity/Networking/Remote Desktop Version: 2.28.1 -Release: 2.<RELEASE1> +Release: 2.<RELEASE3> Requires: %{name}-lang = %{version} Summary: GNOME VNC Server Source: vino-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM vino-CVE-2011-0904_0905.patch bnc#691207 vuntz(a)opensuse.org -- Fix security issues +Patch0: vino-CVE-2011-0904_0905.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build %gconf_schemas_prereq @@ -70,6 +72,7 @@ %prep %setup translation-update-upstream +%patch0 -p1 %build %configure\ ++++++ vino-CVE-2011-0904_0905.patch ++++++ >From af7847f11681770018ed6e7f86e7a31feabf9963 Mon Sep 17 00:00:00 2001 From: David King <amigadave(a)amigadave.com> Date: Tue, 26 Apr 2011 22:31:36 +0200 Subject: [PATCH] Avoid out-of-bounds memory accesses This fixes two critical security vulnerabilities that lead to an out-of-bounds memory write and read with a crafted client framebuffer update request packet. The dimensions of the update from the packet are checked to ensure that they are within the screen dimensions. Thanks to Kevin Chen from the Bitblaze group for the reports in bugs 641802 and 641803. The CVE identifiers for these vulnerabilities are CVE-2011-0904 and CVE-2011-0905. --- server/libvncserver/rfbserver.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/server/libvncserver/rfbserver.c b/server/libvncserver/rfbserver.c index 8c35853..f02a7f9 100644 --- a/server/libvncserver/rfbserver.c +++ b/server/libvncserver/rfbserver.c @@ -1163,6 +1163,10 @@ rfbSendFramebufferUpdate(rfbClientPtr cl, cl->rfbRawBytesEquivalent += (sz_rfbFramebufferUpdateRectHeader + w * (cl->format.bitsPerPixel / 8) * h); + /* Validate the rectangle given by the update packet. */ + if (w + x > cl->screen->width || h + y > cl->screen->height) + goto tx_error; + switch (cl->preferredEncoding) { case rfbEncodingRaw: if (!rfbSendRectEncodingRaw(cl, x, y, w, h)) -- 1.7.3.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 hylafax for openSUSE:11.4
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package hylafax for openSUSE:11.4 checked in at Mon May 9 12:05:52 CEST 2011. -------- --- old-versions/11.4/all/hylafax/hylafax.changes 2010-03-15 02:39:24.000000000 +0100 +++ 11.4/hylafax/hylafax.changes 2011-03-28 14:38:15.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Mar 28 14:37:12 CEST 2011 - pth(a)suse.de + +- Remove unsupported option -o from init script (bnc#632586). + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/hylafax Destination is old-versions/11.4/UPDATES/all/hylafax calling whatdependson for 11.4-i586 New: ---- hylafax-changed_options.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hylafax.spec ++++++ --- /var/tmp/diff_new_pack.uMKhEu/_old 2011-05-09 12:05:38.000000000 +0200 +++ /var/tmp/diff_new_pack.uMKhEu/_new 2011-05-09 12:05:38.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package hylafax (Version 6.0.4) +# spec file for package hylafax # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ Conflicts: sendfax AutoReqProv: on Version: 6.0.4 -Release: 1 +Release: 7.<RELEASE8> Source: %{name}-%{version}.tar.lzma Source1: latex-cover-1.04.tar.lzma Source2: %{name}-SuSE.tar.lzma @@ -46,6 +46,7 @@ Patch9: %{name}-%{version}-no-timestamp.patch Patch10: %{name}-%{version}-DESTDIR.patch Patch11: %{name}-%{version}-configure.patch +Patch12: hylafax-changed_options.patch Url: http://www.hylafax.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Very Powerful Fax Server @@ -94,6 +95,7 @@ %patch9 %patch10 %patch11 +%patch12 # needs to be executable chmod 755 SuSE/usr/lib/fax/a2pswrap find ../ -name .cvsignore -exec rm {} \; ++++++ hylafax-changed_options.patch ++++++ The -o option has been dropped in 6.* . Index: etc/hylafax.in =================================================================== --- etc/hylafax.in.orig 2011-03-28 11:34:54.000000000 +0200 +++ etc/hylafax.in 2011-03-28 12:23:16.459305442 +0200 @@ -112,7 +112,7 @@ do_start() killall -15 $FAXQ >/dev/null 2>&1 killall -15 $HFAXD >/dev/null 2>&1 /sbin/startproc $FAXQ || return=$rc_failed - /sbin/startproc $HFAXD -i $FAXPORT -o 4557 -s $SNPPPORT \ + /sbin/startproc $HFAXD -i $FAXPORT -s $SNPPPORT \ || return=$rc_failed echo -e "$return" fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 hylafax for openSUSE:11.3
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package hylafax for openSUSE:11.3 checked in at Mon May 9 12:05:22 CEST 2011. -------- --- old-versions/11.3/all/hylafax/hylafax.changes 2010-03-15 02:39:24.000000000 +0100 +++ 11.3/hylafax/hylafax.changes 2011-03-28 14:39:32.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Mar 28 14:38:34 CEST 2011 - pth(a)suse.de + +- Remove unsupported option -o from init script (bnc#632586). + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.3/all/hylafax Destination is old-versions/11.3/UPDATES/all/hylafax calling whatdependson for 11.3-i586 New: ---- hylafax-changed_options.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hylafax.spec ++++++ --- /var/tmp/diff_new_pack.U7sZ8x/_old 2011-05-09 12:05:06.000000000 +0200 +++ /var/tmp/diff_new_pack.U7sZ8x/_new 2011-05-09 12:05:06.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package hylafax (Version 6.0.4) +# spec file for package hylafax # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ Conflicts: sendfax AutoReqProv: on Version: 6.0.4 -Release: 1 +Release: 4.<RELEASE2> Source: %{name}-%{version}.tar.lzma Source1: latex-cover-1.04.tar.lzma Source2: %{name}-SuSE.tar.lzma @@ -46,6 +46,7 @@ Patch9: %{name}-%{version}-no-timestamp.patch Patch10: %{name}-%{version}-DESTDIR.patch Patch11: %{name}-%{version}-configure.patch +Patch12: hylafax-changed_options.patch Url: http://www.hylafax.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Very Powerful Fax Server @@ -94,6 +95,7 @@ %patch9 %patch10 %patch11 +%patch12 # needs to be executable chmod 755 SuSE/usr/lib/fax/a2pswrap find ../ -name .cvsignore -exec rm {} \; ++++++ hylafax-changed_options.patch ++++++ The -o option has been dropped in 6.* . Index: etc/hylafax.in =================================================================== --- etc/hylafax.in.orig 2011-03-28 11:34:54.000000000 +0200 +++ etc/hylafax.in 2011-03-28 12:23:16.459305442 +0200 @@ -112,7 +112,7 @@ do_start() killall -15 $FAXQ >/dev/null 2>&1 killall -15 $HFAXD >/dev/null 2>&1 /sbin/startproc $FAXQ || return=$rc_failed - /sbin/startproc $HFAXD -i $FAXPORT -o 4557 -s $SNPPPORT \ + /sbin/startproc $HFAXD -i $FAXPORT -s $SNPPPORT \ || return=$rc_failed echo -e "$return" fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bsdtar for openSUSE:11.4
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package bsdtar for openSUSE:11.4 checked in at Mon May 9 11:24:09 CEST 2011. -------- --- old-versions/11.4/all/bsdtar/bsdtar.changes 2010-11-11 14:42:22.000000000 +0100 +++ 11.4/bsdtar/bsdtar.changes 2011-05-06 15:25:12.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 19 13:23:09 UTC 2011 - idoenmez(a)novell.com + +- Add suport for xz and xar archives +- Add libarchive-2.8.4-iso9660-data-types.patch: + fix ISO9660 reader data type mismatches (bnc#688463) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/bsdtar Destination is old-versions/11.4/UPDATES/all/bsdtar calling whatdependson for 11.4-i586 New: ---- libarchive-2.8.4-iso9660-data-types.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsdtar.spec ++++++ --- /var/tmp/diff_new_pack.b8hn4S/_old 2011-05-09 11:23:46.000000000 +0200 +++ /var/tmp/diff_new_pack.b8hn4S/_new 2011-05-09 11:23:46.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package bsdtar (Version 2.8.4) +# spec file for package bsdtar # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: bsdtar Version: 2.8.4 -Release: 1 +Release: 9.<RELEASE10> %define pkg_name libarchive # License: BSD3c(or similar) @@ -39,12 +39,17 @@ %else BuildRequires: e2fsprogs-devel %endif +BuildRequires: libopenssl-devel +BuildRequires: libxml2-devel +BuildRequires: xz-devel # Summary: Creates and reads several different streaming archive formats # Url: http://code.google.com/p/libarchive/ Source: libarchive-%{version}.tar.bz2 Patch1: libarchive-2.5.5_handle_ENOSYS_from_lutimes.patch +# PATCH-FIX-UPSTREAM libarchive-2.8.4-iso9660-data-types.patch idoenmez(a)suse.de -- bnc#688463 +Patch2: libarchive-2.8.4-iso9660-data-types.patch %description Libarchive is a programming library that can create and read several @@ -144,6 +149,7 @@ %prep %setup -q -n %{pkg_name}-%{version} %patch1 +%patch2 %build #autoreconf -fi @@ -159,6 +165,7 @@ %make_install rm -fv minitar/*.o rm -fv %{buildroot}%{_libdir}/*.la +rm "%{buildroot}%{_mandir}/man5/"{tar,cpio,mtree}.5* %clean rm -rf %{buildroot} ++++++ libarchive-2.8.4-iso9660-data-types.patch ++++++ Index: libarchive/archive_read_support_format_iso9660.c =================================================================== --- libarchive/archive_read_support_format_iso9660.c (revision 1983) +++ libarchive/archive_read_support_format_iso9660.c (revision 1984) @@ -924,7 +924,7 @@ if (parent->offset + parent->size > iso9660->volume_size) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, "Directory is beyond end-of-media: %s", - parent->name); + parent->name.s); return (ARCHIVE_WARN); } if (iso9660->current_position < parent->offset) { @@ -1220,7 +1220,7 @@ if (file->offset + file->size > iso9660->volume_size) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "File is beyond end-of-media: %s", file->name); + "File is beyond end-of-media: %s", file->name.s); iso9660->entry_bytes_remaining = 0; iso9660->entry_sparse_offset = 0; return (ARCHIVE_WARN); @@ -1279,8 +1279,8 @@ if ((file->mode & AE_IFMT) != AE_IFDIR && file->offset < iso9660->current_position) { archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, - "Ignoring out-of-order file @%x (%s) %jd < %jd", - file, + "Ignoring out-of-order file @%jx (%s) %jd < %jd", + (intmax_t)file->number, iso9660->pathname.s, file->offset, iso9660->current_position); iso9660->entry_bytes_remaining = 0; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grub2 for openSUSE:Factory
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at Mon May 9 10:48:43 CEST 2011. -------- --- grub2/grub2.changes 2010-10-27 16:59:34.000000000 +0200 +++ /mounts/work_src_done/STABLE/grub2/grub2.changes 2011-05-07 14:25:44.000000000 +0200 @@ -1,0 +2,9 @@ +Sat May 7 12:33:43 CEST 2011 - jslaby(a)suse.de + +- fix build with gcc 4.6 +- build in parallel (fixed finally in 1.99) +- add translations from translations project +- update to 1.99-rc2 + * See NEWS file for changes + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- grub-1.95-grubdir.patch grub-1.98-follow-dev-mapper-symlinks.patch grub-1.98.tar.bz2 New: ---- gcc46-fixes.patch grub-1.99~rc2.tar.xz translations-20110507.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.d68VQi/_old 2011-05-09 10:43:31.000000000 +0200 +++ /var/tmp/diff_new_pack.d68VQi/_new 2011-05-09 10:43:31.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package grub2 (Version 1.98) +# spec file for package grub2 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,13 @@ Name: grub2 %ifarch x86_64 -BuildRequires: freetype2-devel-32bit gcc-32bit glibc-devel-32bit libncurses5-32bit libusb-1_0-devel-32bit ncurses-devel-32bit +BuildRequires: freetype2-devel-32bit gcc-32bit glibc-32bit glibc-devel-32bit +BuildRequires: libncurses5-32bit libusb-1_0-devel-32bit ncurses-devel-32bit %else -BuildRequires: freetype2-devel gcc glibc-devel libncurses5 libusb-1_0-devel ncurses-devel +BuildRequires: freetype2-devel gcc glibc-devel libncurses5 libusb-1_0-devel +BuildRequires: ncurses-devel %endif -BuildRequires: bison flex ruby +BuildRequires: bison device-mapper-devel flex lzma ruby xz # Modules always contain just 32-bit code %define _libdir %{_exec_prefix}/lib @@ -33,23 +35,27 @@ %ifarch x86_64 %define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu} %endif -Version: 1.98 -Release: 9 +Version: 1.98.99.rc2 +Release: 1 +%define tar_version 1.99~rc2 Summary: Bootloader with support for Linux, Multiboot and more Group: System/Boot License: GPLv3+ Url: http://www.gnu.org/software/grub/ -Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{version}.tar.bz2 +Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tar_version}.tar.xz Source1: 90_persistent Source2: grub.default Source3: README.openSUSE Source4: grub2.rpmlintrc -Patch0: grub-1.95-grubdir.patch +# rsync -Lrtvz translationproject.org::tp/latest/grub/ po +Source5: translations-20110507.tar.bz2 +Patch0: gcc46-fixes.patch Patch2: grub2-linux.patch Patch3: gccwarn.patch -Patch4: grub-1.98-follow-dev-mapper-symlinks.patch PreReq: perl-Bootloader Requires: gettext-runtime +Requires(post): /sbin/install-info +Requires(preun):/sbin/install-info BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,17 +76,26 @@ %prep -%setup -q -n grub-%{version} -%patch0 -p0 -b .grubdir -%patch2 -p0 -b .linux -%patch3 -p0 -b .gccwarn -%patch4 -p1 -b .dev-mapper +%setup -q -n grub-%{tar_version} -a 5 +(cd po && ls *.po | cut -d. -f1 | xargs) >po/LINGUAS +sed 's,@setfilename grub.info,@setfilename grub2.info,' docs/grub.texi >docs/grub2.texi +sed -i 's,grub.texi,grub2.texi,' docs/Makefile.am +%patch0 -p1 +%patch2 -p0 +%patch3 -p1 # README.openSUSE cp %{SOURCE3} . %build -#sh autogen.sh +#./autogen.sh + +# we don't want to let rpm to override *FLAGS by bogus ones +CFLAGS=" " +CXXFLAGS=" " +FFLAGS=" " +export CFLAGS CXXFLAGS FFLAGS + # -static is needed so that autoconf script is able to link # test that looks for _start symbol on 64 bit platforms %configure TARGET_LDFLAGS=-static \ @@ -88,7 +103,7 @@ --enable-grub-emu-usb \ --program-transform-name=s,grub,%{name}, -make +make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install @@ -101,8 +116,6 @@ touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg ln -s ../boot/%{name}/grub.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.cfg -# XXX: Remove for now, should be renamed to grub2.info -rm $RPM_BUILD_ROOT/%{_infodir}/grub.info* # Remove devel files rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/*/*.h @@ -111,6 +124,9 @@ %find_lang grub %post +/sbin/install-info %{_infodir}/grub-dev.info %{_infodir}/dir || : +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : + mkdir -p /boot/%{name}/ 2>/dev/null || true # Create device.map or reuse one from GRUB Legacy if [ ! -e /boot/%{name}/device.map ] ; then @@ -131,10 +147,15 @@ fi %preun +if [ $1 = 0 ]; then + /sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : +fi + exec >/dev/null if [ -e /boot/%{name}/core.img ] ; then - /sbin/update-bootloader --remove --image /boot/%{name}/core.img --name="GNU GRUB 2" - /sbin/update-bootloader --refresh + /sbin/update-bootloader --remove --image /boot/%{name}/core.img --name="GNU GRUB 2" || : + /sbin/update-bootloader --refresh || : ## XXX Ugly rm -f /boot/%{name}/*.mod rm -f /boot/%{name}/*.img @@ -142,50 +163,35 @@ rm -f /boot/%{name}/device.map fi -#%triggerin -- kernel, kernel-PAE +#%%triggerin -- kernel, kernel-PAE #exec >/dev/null 2>&1 ## Generate grub.cfg -#%{name}-mkconfig +#%%{name}-mkconfig # # -#%triggerun -- kernel, kernel-PAE +#%%triggerun -- kernel, kernel-PAE #exec >/dev/null 2>&1 ## Generate grub.cfg -#%{name}-mkconfig +#%%{name}-mkconfig %files -f grub.lang %defattr(-,root,root,-) %{_libdir}/%{name} %{_libdir}/grub/ -%{_sbindir}/%{name}-mkdevicemap -%{_sbindir}/%{name}-install -%{_sbindir}/%{name}-probe -%{_sbindir}/%{name}-setup -%{_sbindir}/%{name}-mkconfig -%{_sbindir}/%{name}-reboot -%{_sbindir}/%{name}-set-default -%{_bindir}/%{name}-bin2h -%{_bindir}/%{name}-mkisofs -%{_bindir}/%{name}-mkrelpath -%{_bindir}/%{name}-script-check -%{_bindir}/%{name}-mkimage -%{_bindir}/%{name}-mkelfimage -%{_bindir}/%{name}-editenv -%{_bindir}/%{name}-fstest -%{_bindir}/%{name}-mkfont -%{_bindir}/%{name}-mkrescue -%{_bindir}/%{name}-mkpasswd-pbkdf2 +%{_sbindir}/%{name}-* +%{_bindir}/%{name}-* +%{_sysconfdir}/bash_completion.d/grub +%config %{_sysconfdir}/default/grub %dir %{_sysconfdir}/grub.d -%config %{_sysconfdir}/grub.d/??_* %{_sysconfdir}/grub.d/README +%config %{_sysconfdir}/grub.d/??_* %{_sysconfdir}/%{name}.cfg -%config %{_sysconfdir}/default/grub %dir /boot/%{name} # Actually, this is replaced by update-grub from scriptlets, # but it takes care of modified persistent part %config(noreplace) /boot/%{name}/grub.cfg %doc COPYING INSTALL NEWS README THANKS TODO ChangeLog README.openSUSE -#%exclude %{_mandir} -#%{_infodir}/%{name}.info* +%{_infodir}/grub-dev.info* +%{_infodir}/%{name}.info* %changelog ++++++ gcc46-fixes.patch ++++++ --- include/grub/test.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/include/grub/test.h +++ b/include/grub/test.h @@ -49,8 +49,7 @@ int grub_test_run (grub_test_t test); /* Test `cond' for nonzero; log failure otherwise. */ void grub_test_nonzero (int cond, const char *file, const char *func, grub_uint32_t line, - const char *fmt, ...) - __attribute__ ((format (printf, 5, 6))); + const char *fmt, ...); /* Macro to fill in location details and an optional error message. */ #define grub_test_assert(cond, ...) \ ++++++ gccwarn.patch ++++++ --- /var/tmp/diff_new_pack.d68VQi/_old 2011-05-09 10:43:31.000000000 +0200 +++ /var/tmp/diff_new_pack.d68VQi/_new 2011-05-09 10:43:31.000000000 +0200 @@ -1,12 +1,27 @@ -Index: lib/libgcrypt-grub/cipher/camellia.c -=================================================================== ---- lib/libgcrypt-grub/cipher/camellia.c.orig -+++ lib/libgcrypt-grub/cipher/camellia.c -@@ -25,11 +25,9 @@ - * http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html - */ +--- + grub-core/lib/libgcrypt-grub/cipher/camellia.c | 3 +-- + grub-core/lib/libgcrypt/cipher/camellia.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +--- a/grub-core/lib/libgcrypt-grub/cipher/camellia.c ++++ b/grub-core/lib/libgcrypt-grub/cipher/camellia.c +@@ -29,9 +29,8 @@ GRUB_MOD_LICENSE ("GPLv3+"); + + + #include "camellia.h" ++#include "memory.h" + +-/* u32 must be 32bit word */ +-typedef unsigned int u32; + typedef unsigned char u8; + + /* key constants */ +--- a/grub-core/lib/libgcrypt/cipher/camellia.c ++++ b/grub-core/lib/libgcrypt/cipher/camellia.c +@@ -26,10 +26,9 @@ + #include <string.h> + #include <stdlib.h> -- +#include "memory.h" #include "camellia.h" ++++++ grub2-linux.patch ++++++ --- /var/tmp/diff_new_pack.d68VQi/_old 2011-05-09 10:43:31.000000000 +0200 +++ /var/tmp/diff_new_pack.d68VQi/_new 2011-05-09 10:43:31.000000000 +0200 @@ -8,39 +8,15 @@ else - OS="${GRUB_DISTRIBUTOR} GNU/Linux" + OS="${GRUB_DISTRIBUTOR}" - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]') ${CLASS}" + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" fi @@ -84,7 +84,7 @@ EOF - printf '%s\n' "${prepare_boot_cache}" + message="$(gettext_printf "Loading Linux %s ..." ${version})" cat << EOF - echo $(printf "$(gettext "Loading Linux %s ...")" ${version}) + echo '$message' - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ${args} EOF if test -n "${initrd}" ; then - cat << EOF -@@ -97,9 +97,21 @@ EOF - EOF - } - -+# do not output vmlinux if vmlinuz of same version exists - list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do -- if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi -- done` -+ if grub_file_is_not_garbage "$i" ; then -+ case $i in -+ */vmlinux*) -+ j=${i/vmlinux/vmlinuz} -+ k=${j/.gz/} -+ if test ! -e $k ; then echo -n "$i "; fi -+ ;; -+ *) -+ echo -n "$i " -+ ;; -+ esac -+ fi -+ done` - prepare_boot_cache= - - while [ "x$list" != "x" ] ; do + message="$(gettext_printf "Loading initial ramdisk ...")" ++++++ grub2.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.d68VQi/_old 2011-05-09 10:43:31.000000000 +0200 +++ /var/tmp/diff_new_pack.d68VQi/_new 2011-05-09 10:43:31.000000000 +0200 @@ -1,2 +1,7 @@ +addFilter("zero-length /boot/grub2/grub.cfg") +addFilter("non-etc-or-var-file-marked-as-conffile /boot/grub2/grub.cfg") +addFilter("non-conffile-in-etc /etc/bash_completion.d/grub") +addFilter("non-conffile-in-etc /etc/grub.d/README") +addFilter("statically-linked-binary .*/grub2/i386-pc/kernel.img") # We need to supply unstripped files for grub -addFilter("unstripped-binary-or-object .*") +addFilter("unstripped-binary-or-object .*/grub2/i386-pc/.*.mod") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 inst-source-utils for openSUSE:Factory
by root＠hilbert.suse.de 09 May '11

09 May '11

Hello community, here is the log from the commit of package inst-source-utils for openSUSE:Factory checked in at Mon May 9 10:43:02 CEST 2011. -------- --- inst-source-utils/inst-source-utils.changes 2011-04-28 18:25:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/inst-source-utils/inst-source-utils.changes 2011-05-05 12:26:20.000000000 +0200 @@ -1,0 +2,6 @@ +Thu May 5 12:20:17 CEST 2011 - ro(a)suse.de + +- create_sha1sum and create_sha1sums now understand option "-2" + to use/create sha256sum(s) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inst-source-utils.spec ++++++ --- /var/tmp/diff_new_pack.8hRem6/_old 2011-05-09 10:41:48.000000000 +0200 +++ /var/tmp/diff_new_pack.8hRem6/_new 2011-05-09 10:41:48.000000000 +0200 @@ -19,7 +19,7 @@ Name: inst-source-utils Summary: Utilities for creating customized installation sources -Version: 2011.4.28 +Version: 2011.5.5 Release: 1 Url: http://en.opensuse.org/Inst-source-utils License: GPLv2+ ++++++ inst-source-utils.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sum new/inst-source-utils/usr/bin/create_sha1sum --- old/inst-source-utils/usr/bin/create_sha1sum 2010-03-17 14:28:14.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_sha1sum 2011-05-05 12:25:51.000000000 +0200 @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, # USA. # -# $Id: create_sha1sum 110 2009-03-06 15:30:14Z lrupp $ +# $Id: create_sha1sum 421 2011-05-05 10:25:22Z ro $ # function usage (){ @@ -41,13 +41,6 @@ fi } -if [ -z "$1" ]; then - usage 1; -fi -if [[ "$1" == "-h" ]] || [[ "$1" == "--help" ]] ; then - usage 0; -fi - unset LANGUAGE unset LANG export LC_ALL=POSIX @@ -55,14 +48,21 @@ CREATE_META= QUIET="no" +CHECKSUM="sha1sum" +CHECKSUM_F="SHA1SUMS" -if test "x$1" = "x--meta"; then - CREATE_META=1 - shift -fi -if test "x$1" = "x--quiet"; then - QUIET="yes" - shift +while test -n "$1" ; do + case $1 in + --) shift ; break ;; + -h|--help) usage 0 ;; + -m|--meta) CREATE_META=1 ; shift ;; + -q|--quiet) QUIET="yes" ; shift ;; + -2) CHECKSUM="sha256sum" ; CHECKSUM_F="SHA256SUMS" ; shift ;; + *) break ;; + esac +done +if [ -z "$1" ]; then + usage 1; fi TMPFILE=$(mktemp /tmp/.create_sha1sums.XXXXXX) @@ -100,7 +100,7 @@ test $IS_SKIP = true && continue } case "$FILE" in - (*.swp|SHA1SUMS*|MD5SUMS*) + (*.swp|SHA1SUMS*|SHA256SUMS*|MD5SUMS*) continue ;; (*) @@ -109,25 +109,25 @@ esac done if [ $NFILES -eq 0 ]; then - rm -f SHA1SUMS* + rm -f SHA1SUMS* SHA256SUMS* else echo -n > $TMPFILE for FILE in "${FILES[@]}"; do - sha1sum "$FILE" >> $TMPFILE + $CHECKSUM "$FILE" >> $TMPFILE done - test -e SHA1SUMS || touch SHA1SUMS - cmp -s $TMPFILE SHA1SUMS || { - mv $TMPFILE SHA1SUMS - chmod 644 SHA1SUMS - output "INFO: created SHA1SUMS in $DIR" + test -e $CHECKSUM_F || touch $CHECKSUM_F + cmp -s $TMPFILE $CHECKSUM_F || { + mv $TMPFILE $CHECKSUM_F + chmod 644 $CHECKSUM_F + output "INFO: created $CHECKSUM_F in $DIR" } if test -n "$CREATE_META"; then - test -e SHA1SUMS.meta || touch SHA1SUMS.meta - sha1sum SHA1SUMS > $TMPFILE - cmp -s $TMPFILE SHA1SUMS.meta || { - mv $TMPFILE SHA1SUMS.meta - chmod 644 SHA1SUMS.meta - output "INFO: created SHA1SUMS.meta in $DIR" + test -e $CHECKSUM_F.meta || touch $CHECKSUM_F.meta + $CHECKSUM $CHECKSUM_F > $TMPFILE + cmp -s $TMPFILE $CHECKSUM_F.meta || { + mv $TMPFILE $CHECKSUM_F.meta + chmod 644 $CHECKSUM_F.meta + output "INFO: created $CHECKSUM_F.meta in $DIR" } fi rm -f $TMPFILE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/inst-source-utils/usr/bin/create_sha1sums new/inst-source-utils/usr/bin/create_sha1sums --- old/inst-source-utils/usr/bin/create_sha1sums 2010-03-17 14:28:14.000000000 +0100 +++ new/inst-source-utils/usr/bin/create_sha1sums 2011-05-05 12:25:51.000000000 +0200 @@ -19,13 +19,19 @@ # Boston, MA 02110-1301, # USA. # -# $Id: create_sha1sums,v 1.8 2009/10/12 21:13:11 lrupp Exp $ +# $Id: create_sha1sums 419 2011-05-05 10:13:45Z ro $ # SIGN="yes" SIGN_OPTS="" INCLUDE_SHA1SUMS="no" EXTRA="no" + +CHECKSUM="sha1sum" +CHECKSUM_T="SHA1" +CHECKSUM_F="SHA1SUMS" +CHECKSUM_O="" + unset LANGUAGE unset LANG export LC_ALL=POSIX @@ -33,11 +39,12 @@ function usage() { echo "Usage: `basename $0` [OPTIONS] <CD-Rootdir>" - echo " -n : don't re-sign the generated files" - echo " -m : include SHA1SUMS files" - echo " -x : add sha1sums for extra files" - echo - echo " (re-)creates the SHA1SUM lines in the content file" + echo " -n : don't re-sign the generated files" + echo " -m : include SHA1SUMS files (or SHA256SUMS files for sha256)" + echo " -2 : use sha256 instead of sha1" + echo " -x : add sha1sums for extra files" + echo + echo " (re-)creates the SHA*SUM lines in the content file" echo " and signs the content and products file" exit $1 } @@ -50,18 +57,23 @@ fi } -while getopts 'hnmxs:' OPTION ; do +while getopts 'hnmx2s:' OPTION ; do case $OPTION in h) usage 0 ;; - m) INCLUDE_SHA1SUMS="yes" - ;; + m) INCLUDE_SHA1SUMS="yes" + ;; n) SIGN="no" ;; s) SIGN_OPTS=$OPTARG ;; x) EXTRA="yes" ;; + 2) CHECKSUM="sha256sum" + CHECKSUM_T="SHA256" + CHECKSUM_F="SHA256SUMS" + CHECKSUM_O="-2" + ;; esac done shift $(( OPTIND - 1 )) @@ -78,7 +90,7 @@ # prepare content file CONTTMP=$(mktemp $CDS_PRIM/content-XXXXXX) -grep -v "^META " $CDS_PRIM/content | grep -v "^KEY " | grep -v "^HASH SHA1" > $CONTTMP +grep -v "^META " $CDS_PRIM/content | grep -v "^KEY " | grep -v "^HASH SHA" > $CONTTMP mv $CONTTMP $CDS_PRIM/content # add pattern and packages files to content file @@ -89,18 +101,18 @@ if test -d $CDS_PRIM/$DESCRDIR ; then pushd $CDS_PRIM/$DESCRDIR >/dev/null rm -f *.asc - sha1sum * 2>/dev/null | grep -v "MD5SUMS" | grep -v "directory.yast" | sed -e "s@^@META SHA1 @" >> $CDS_PRIM/content + $CHECKSUM * 2>/dev/null | grep -v "MD5SUMS" | grep -v "directory.yast" | sed -e "s@^@META $CHECKSUM_T @" >> $CDS_PRIM/content popd >/dev/null fi pushd $CDS_PRIM >/dev/null if [ "$EXTRA" = "yes" ] ; then for i in license.tar.gz control.xml installation.xml media.1/info.txt media.1/license.zip y2update.tgz driverupdate; do test -f $i || continue - sha1sum $i 2>/dev/null | sed -e "s@^@HASH SHA1 @" >> $CDS_PRIM/content + $CHECKSUM $i 2>/dev/null | sed -e "s@^@HASH $CHECKSUM_T @" >> $CDS_PRIM/content done for i in boot/*/* boot/*/loader/linux boot/*/loader/initrd boot/*/loader/*.spl docu/* images/* ; do test -f $i || continue - sha1sum $i 2>/dev/null | sed -e "s@^@HASH SHA1 @" >> $CDS_PRIM/content + $CHECKSUM $i 2>/dev/null | sed -e "s@^@HASH $CHECKSUM_T @" >> $CDS_PRIM/content done # check if we need to include additional files for > 11.0 if grep -q CONTENTSTYLE $CDS_PRIM/content; then @@ -109,23 +121,23 @@ SLIDESHOWDIR="$CDS_PRIM/$DATADIR/setup/slide" fi if test -n "$SLIDESHOWDIR" -a -d "$SLIDESHOWDIR" ; then - /usr/bin/create_sha1sum --quiet "$SLIDESHOWDIR" + /usr/bin/create_sha1sum $CHECKSUM_O --quiet "$SLIDESHOWDIR" fi - for sha1sumfile in $(find $SLIDESHOWDIR -name SHA1SUMS); do + for sha1sumfile in $(find $SLIDESHOWDIR -name $CHECKSUM_F); do signit "$sha1sumfile" done fi fi if [ "$INCLUDE_SHA1SUMS" = "yes" ]; then - for i in $(find $CDS_PRIM/ -name SHA1SUMS | sed -e "s|./||"); do + for i in $(find $CDS_PRIM/ -name $CHECKSUM_F | sed -e "s|./||"); do test -f $i || continue - sha1sum $i 2>/dev/null | sed -e "s@^@HASH SHA1 @" >> $CDS_PRIM/content + $CHECKSUM $i 2>/dev/null | sed -e "s@^@HASH $CHECKSUM_T @" >> $CDS_PRIM/content done fi # add gpg-key files to content file -sha1sum gpg-pubkey-* 2>/dev/null | sed -e "s@^@KEY SHA1 @" >> $CDS_PRIM/content +$CHECKSUM gpg-pubkey-* 2>/dev/null | sed -e "s@^@KEY $CHECKSUM_T @" >> $CDS_PRIM/content popd >/dev/null # signing part @@ -152,7 +164,7 @@ cp -a $KEY_FILE $CDS_PRIM/$REPOFILE.key fi if [ -n "$SLIDESHOWDIR" ]; then - for sha1sumfile in $(find $SLIDESHOWDIR -name SHA1SUMS); do + for sha1sumfile in $(find $SLIDESHOWDIR -name $CHECKSUM_F); do cp -a $KEY_FILE ${sha1sumfile}.key # XXXX: check if this is needed create_directory.yast $(dirname "$sha1sumfile") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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