July 2011 - openSUSE Commits - openSUSE Mailing Lists

commit libofx for openSUSE:Factory
by root＠hilbert.suse.de 28 Jul '11

28 Jul '11

Hello community, here is the log from the commit of package libofx for openSUSE:Factory checked in at Thu Jul 28 13:10:54 CEST 2011. -------- --- GNOME/libofx/libofx.changes 2011-06-17 08:39:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/libofx/libofx.changes 2011-07-28 09:19:19.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 28 09:18:36 CEST 2011 - vuntz(a)opensuse.org + +- Fix build by not marking some non-directory files as %dir in file + list. This was wrong but only breaks now with newer rpm. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libofx.spec ++++++ --- /var/tmp/diff_new_pack.IydoU1/_old 2011-07-28 13:10:03.000000000 +0200 +++ /var/tmp/diff_new_pack.IydoU1/_new 2011-07-28 13:10:03.000000000 +0200 @@ -23,7 +23,7 @@ License: GPLv2+ Group: Development/Libraries/Other Version: 0.9.4 -Release: 3 +Release: 5 Summary: OFX Command Parser and API Url: http://libofx.sourceforge.net/ Source: libofx-%{version}.tar.gz @@ -96,10 +96,10 @@ %files %defattr(-,root,root) %doc %dir %{_defaultdocdir}/%{name} -%doc %dir %{_defaultdocdir}/%{name}/[ACNR]* -%doc %dir %{_defaultdocdir}/%{name}/*.txt +%doc %{_defaultdocdir}/%{name}/[ACNR]* +%doc %{_defaultdocdir}/%{name}/*.txt %{_bindir}/* -%{_datadir}/libofx +%{_datadir}/libofx/ %{_mandir}/man1/*.1%{?ext_man} %files -n libofx4 @@ -108,11 +108,11 @@ %files devel %defattr(-,root,root) -%doc %{_defaultdocdir}/%{name}/html +%doc %{_defaultdocdir}/%{name}/html/ %doc %{_defaultdocdir}/%{name}/*.sgml %doc %{_defaultdocdir}/%{name}/*.xml %{_libdir}/*.so -%{_includedir}/libofx +%{_includedir}/libofx/ %{_libdir}/pkgconfig/libofx.pc %clean ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-Digest-HMAC for openSUSE:Factory
by root＠hilbert.suse.de 28 Jul '11

28 Jul '11

Hello community, here is the log from the commit of package perl-Digest-HMAC for openSUSE:Factory checked in at Thu Jul 28 13:09:50 CEST 2011. -------- --- perl-Digest-HMAC/perl-Digest-HMAC.changes 2010-11-30 20:25:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Digest-HMAC/perl-Digest-HMAC.changes 2011-07-28 11:00:06.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 28 08:57:12 UTC 2011 - vcizek(a)novell.com + +- update to 1.03 + Depend on Digest::SHA instead of Digest::SHA1 [RT#69776] + Document the blocksize argument [RT#14551] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Digest-HMAC-1.02.tar.bz2 New: ---- Digest-HMAC-1.03.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Digest-HMAC.spec ++++++ --- /var/tmp/diff_new_pack.aE6J4O/_old 2011-07-28 13:09:27.000000000 +0200 +++ /var/tmp/diff_new_pack.aE6J4O/_new 2011-07-28 13:09:27.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package perl-Digest-HMAC (Version 1.02) +# spec file for package perl-Digest-HMAC # -# 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 @@ -21,13 +21,13 @@ Name: perl-Digest-HMAC %define cpan_name Digest-HMAC Summary: Keyed-Hashing for Message Authentication -Version: 1.02 -Release: 7 +Version: 1.03 +Release: 1 License: GPL+ or Artistic Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Digest-HMAC/ #Source: http://www.cpan.org/authors/id/G/GA/GAAS/Digest-HMAC-1.02.tar.gz -Source: %{cpan_name}-%{version}.tar.bz2 +Source: %{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{perl_requires} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit samba for openSUSE:11.4
by root＠hilbert.suse.de 28 Jul '11

28 Jul '11

Hello community, here is the log from the commit of package samba for openSUSE:11.4 checked in at Thu Jul 28 10:26:08 CEST 2011. -------- samba.changes: same change calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.REtBXW/_old 2011-07-28 10:25:56.000000000 +0200 +++ /var/tmp/diff_new_pack.REtBXW/_new 2011-07-28 10:25:56.000000000 +0200 @@ -77,7 +77,7 @@ %endif Url: http://www.samba.org/ Version: 3.5.7 -Release: 1.<RELEASE2> +Release: 1.<RELEASE3> License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.REtBXW/_old 2011-07-28 10:25:56.000000000 +0200 +++ /var/tmp/diff_new_pack.REtBXW/_new 2011-07-28 10:25:56.000000000 +0200 @@ -82,7 +82,7 @@ Url: http://www.samba.org/ AutoReqProv: on Version: 3.5.7 -Release: 1.<RELEASE2> +Release: 1.<RELEASE3> Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -578,7 +578,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libtalloc_ver} -Release: 2.<RELEASE5> +Release: 2.<RELEASE6> PreReq: /sbin/ldconfig %description -n libtalloc2 @@ -599,7 +599,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtalloc_ver} -Release: 2.<RELEASE5> +Release: 2.<RELEASE6> Requires: libtalloc2 = %{libtalloc_ver} %description -n libtalloc-devel @@ -621,7 +621,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libtdb_ver} -Release: 2.<RELEASE5> +Release: 2.<RELEASE6> PreReq: /sbin/ldconfig %description -n libtdb1 @@ -642,7 +642,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtdb_ver} -Release: 2.<RELEASE5> +Release: 2.<RELEASE6> Requires: libtdb1 = %{libtdb_ver} %description -n libtdb-devel @@ -664,7 +664,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libtevent_ver} -Release: 2.<RELEASE5> +Release: 2.<RELEASE6> PreReq: /sbin/ldconfig %description -n libtevent0 @@ -685,7 +685,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtevent_ver} -Release: 2.<RELEASE5> +Release: 2.<RELEASE6> Requires: libtevent0 = %{libtevent_ver} %description -n libtevent-devel @@ -708,7 +708,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libldb_ver} -Release: 2.<RELEASE5> +Release: 3.<RELEASE3> PreReq: /sbin/ldconfig %description -n libldb0 @@ -730,7 +730,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libldb_ver} -Release: 2.<RELEASE5> +Release: 2.<RELEASE6> Requires: libldb0 = %{libldb_ver} %description -n libldb-devel @@ -754,7 +754,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 298.<RELEASE5> +Release: 298.<RELEASE6> Requires: perl-ldap %description -n ldapsmb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

drop kdeedu4 from openSUSE:Factory
by root＠hilbert.suse.de 28 Jul '11

28 Jul '11

Hello community, FYI: Package kdeedu4 was dropped from openSUSE:Factory at Thu Jul 28 08:56:06 CEST 2011. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=kd… 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 perl-kde4 for openSUSE:Factory
by root＠hilbert.suse.de 28 Jul '11

28 Jul '11

Hello community, here is the log from the commit of package perl-kde4 for openSUSE:Factory checked in at Thu Jul 28 08:54:35 CEST 2011. -------- --- perl-kde4/perl-kde4.changes 2011-07-21 15:33:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-kde4/perl-kde4.changes 2011-07-22 20:30:08.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jul 22 20:30:04 CEST 2011 - dmueller(a)suse.de + +- update to 4.7.0 + * Small fixes over KDE 4.7 RC2 + * see http://kde.org/announcements/4.7 for details + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- perlkde-4.6.95.tar.bz2 New: ---- perlkde-4.7.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-kde4.spec ++++++ --- /var/tmp/diff_new_pack.nSkfFV/_old 2011-07-28 08:53:54.000000000 +0200 +++ /var/tmp/diff_new_pack.nSkfFV/_new 2011-07-28 08:53:54.000000000 +0200 @@ -40,7 +40,7 @@ License: LGPLv2.1+ Group: Development/Libraries/KDE Summary: Kdebindings Perl-KDE library -Version: 4.6.95 +Version: 4.7.0 Release: 1 Source0: perlkde-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ perlkde-4.6.95.tar.bz2 -> perlkde-4.7.0.tar.bz2 ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mono-kde4 for openSUSE:Factory
by root＠hilbert.suse.de 28 Jul '11

28 Jul '11

Hello community, here is the log from the commit of package mono-kde4 for openSUSE:Factory checked in at Thu Jul 28 08:53:39 CEST 2011. -------- --- mono-kde4/mono-kde4.changes 2011-07-21 15:47:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/mono-kde4/mono-kde4.changes 2011-07-22 20:24:25.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Jul 22 20:24:24 CEST 2011 - dmueller(a)suse.de + +- update to 4.7.0 + * Small fixes over KDE 4.7 RC2 + * see http://kde.org/announcements/4.7 for details + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kimono-4.6.95.tar.bz2 New: ---- kimono-4.7.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-kde4.spec ++++++ --- /var/tmp/diff_new_pack.W2jBnR/_old 2011-07-28 08:52:41.000000000 +0200 +++ /var/tmp/diff_new_pack.W2jBnR/_new 2011-07-28 08:52:41.000000000 +0200 @@ -40,7 +40,7 @@ License: LGPLv2.1+ Group: Development/Libraries/KDE Summary: Kdebindings Mono-kde library -Version: 4.6.95 +Version: 4.7.0 Release: 1 Source0: kimono-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kimono-4.6.95.tar.bz2 -> kimono-4.7.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimono-4.6.95/COPYING.GPLv2 new/kimono-4.7.0/COPYING.GPLv2 --- old/kimono-4.6.95/COPYING.GPLv2 1970-01-01 01:00:00.000000000 +0100 +++ new/kimono-4.7.0/COPYING.GPLv2 2011-07-19 23:34:09.000000000 +0200 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser 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 Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser General +Public License instead of this License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kimono-4.6.95/COPYING.LGPLv2 new/kimono-4.7.0/COPYING.LGPLv2 --- old/kimono-4.6.95/COPYING.LGPLv2 1970-01-01 01:00:00.000000000 +0100 +++ new/kimono-4.7.0/COPYING.LGPLv2 2011-07-19 23:34:09.000000000 +0200 @@ -0,0 +1,481 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, 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 library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, 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 companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, 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 library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete 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 distribute a copy of this License along with the +Library. + + 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 Library or any portion +of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +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 Library, 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 Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you 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. + + If distribution of 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 satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. 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. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library 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. + + 9. 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 Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +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. + + 11. 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 Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library 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 Library. + +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. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library 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. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library 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 Library +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 Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +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 + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. 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 LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. 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 library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libproxy for openSUSE:Factory
by root＠hilbert.suse.de 28 Jul '11

28 Jul '11

Hello community, here is the log from the commit of package libproxy for openSUSE:Factory checked in at Thu Jul 28 08:52:29 CEST 2011. -------- --- GNOME/libproxy/libproxy-plugins.changes 2011-06-20 20:28:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/libproxy/libproxy-plugins.changes 2011-07-27 14:58:09.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Jul 27 14:53:34 CEST 2011 - vuntz(a)opensuse.org + +- Build against js instead of xulrunner: + + Add libproxy-mozjs185.patch: taken from upstream, detect + mozjs185 instead of xulrunner in the build system. + + Add pkgconfig(mozjs185) BuildRequires and remove + mozilla-xulrunner-devel BuildRequires. + + Change Supplements of libproxy1-pacrunner-mozjs to use + libmozjs185-1_0 instead of mozilla-xulrunner. +- Change Supplements of libproxy1-pacrunner-webkit to appropriately + use libjavascriptcoregtk-1_0-0/libjavascriptcoregtk-3_0-0 + (depending on %favor_gtk2) instead of libwebkitgtk-0. + +------------------------------------------------------------------- libproxy.changes: same change calling whatdependson for head-i586 New: ---- libproxy-mozjs185.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libproxy-plugins.spec ++++++ --- /var/tmp/diff_new_pack.PqfFPC/_old 2011-07-28 08:46:24.000000000 +0200 +++ /var/tmp/diff_new_pack.PqfFPC/_new 2011-07-28 08:46:24.000000000 +0200 @@ -23,19 +23,6 @@ %define have_mono 0 %endif -%if 0%{?suse_version} > 1130 -%define xulrunner_ver 20 -%else -%if 0%{?suse_version} > 1120 -%define xulrunner_ver 192 -%else -%if 0%{?suse_version} > 1110 -%define xulrunner_ver 191 -%else -%define xulrunner_ver 190 -%endif -%endif -%endif Url: http://code.google.com/p/libproxy/ %define _name libproxy @@ -43,7 +30,7 @@ Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications Version: 0.4.7 -Release: 2 +Release: 3 %if 0%{?build_snapshot} %define _sourcename %{_name} %else @@ -55,6 +42,8 @@ Source99: baselibs.conf # PATCH-FIX-UPSTREAM libproxy-javascriptcoregtk.patch dimstar(a)opensuse.org -- Fix build with javascriptcoregtk3, which got split out of webkitgtk3. Patch from upstream svn. Patch0: libproxy-javascriptcoregtk.patch +# PATCH-FIX-UPSTREAM libproxy-mozjs185.patch vuntz(a)opensuse.org -- Build with libmozjs185 instead of xulrunner. Patch from upstream svn. +Patch1: libproxy-mozjs185.patch License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -78,11 +67,7 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(webkitgtk-3.0) %endif -%if 0%{?suse_version} -BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel -%else -BuildRequires: xulrunner-devel -%endif +BuildRequires: pkgconfig(mozjs185) BuildRequires: NetworkManager-devel BuildRequires: libkde4-devel BuildRequires: libqt4-devel @@ -280,7 +265,7 @@ Group: System/Libraries Requires: libproxy1 = %{version} %if 0%{?suse_version} -Supplements: packageand(libproxy1:mozilla-xulrunner%{xulrunner_ver}) +Supplements: packageand(libproxy1:libmozjs185-1_0) %endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -296,7 +281,11 @@ Group: System/Libraries Requires: libproxy1 = %{version} %if 0%{?suse_version} -Supplements: packageand(libproxy1:libwebkitgtk-0) +%if 0%{?favor_gtk2} +Supplements: packageand(libproxy1:libjavascriptcoregtk-1_0-0) +%else +Supplements: packageand(libproxy1:libjavascriptcoregtk-3_0-0) +%endif %endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -323,6 +312,7 @@ %prep %setup -q -n %{_sourcename} %patch0 -p0 +%patch1 -p1 mkdir build %build ++++++ libproxy.spec ++++++ --- /var/tmp/diff_new_pack.PqfFPC/_old 2011-07-28 08:46:24.000000000 +0200 +++ /var/tmp/diff_new_pack.PqfFPC/_new 2011-07-28 08:46:24.000000000 +0200 @@ -23,19 +23,6 @@ %define have_mono 0 %endif -%if 0%{?suse_version} > 1130 -%define xulrunner_ver 20 -%else -%if 0%{?suse_version} > 1120 -%define xulrunner_ver 192 -%else -%if 0%{?suse_version} > 1110 -%define xulrunner_ver 191 -%else -%define xulrunner_ver 190 -%endif -%endif -%endif Url: http://code.google.com/p/libproxy/ %define _name libproxy @@ -43,7 +30,7 @@ Group: System/Libraries Summary: Libproxy provides consistent proxy configuration to applications Version: 0.4.7 -Release: 3 +Release: 5 %if 0%{?build_snapshot} %define _sourcename %{_name} %else @@ -55,6 +42,8 @@ Source99: baselibs.conf # PATCH-FIX-UPSTREAM libproxy-javascriptcoregtk.patch dimstar(a)opensuse.org -- Fix build with javascriptcoregtk3, which got split out of webkitgtk3. Patch from upstream svn. Patch0: libproxy-javascriptcoregtk.patch +# PATCH-FIX-UPSTREAM libproxy-mozjs185.patch vuntz(a)opensuse.org -- Build with libmozjs185 instead of xulrunner. Patch from upstream svn. +Patch1: libproxy-mozjs185.patch License: GPLv2+ ; LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -78,11 +67,7 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(webkitgtk-3.0) %endif -%if 0%{?suse_version} -BuildRequires: mozilla-xulrunner%{xulrunner_ver}-devel -%else -BuildRequires: xulrunner-devel -%endif +BuildRequires: pkgconfig(mozjs185) BuildRequires: NetworkManager-devel BuildRequires: libkde4-devel BuildRequires: libqt4-devel @@ -280,7 +265,7 @@ Group: System/Libraries Requires: libproxy1 = %{version} %if 0%{?suse_version} -Supplements: packageand(libproxy1:mozilla-xulrunner%{xulrunner_ver}) +Supplements: packageand(libproxy1:libmozjs185-1_0) %endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -296,7 +281,11 @@ Group: System/Libraries Requires: libproxy1 = %{version} %if 0%{?suse_version} -Supplements: packageand(libproxy1:libwebkitgtk-0) +%if 0%{?favor_gtk2} +Supplements: packageand(libproxy1:libjavascriptcoregtk-1_0-0) +%else +Supplements: packageand(libproxy1:libjavascriptcoregtk-3_0-0) +%endif %endif # A virtual symbol to identify that this is a pacrunner. Provides: libproxy1-pacrunner = %{version} @@ -323,6 +312,7 @@ %prep %setup -q -n %{_sourcename} %patch0 -p0 +%patch1 -p1 mkdir build %build ++++++ libproxy-mozjs185.patch ++++++ Index: libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk =================================================================== --- libproxy-0.4.7.orig/libproxy/cmake/modules/pacrunner_mozjs.cmk +++ libproxy-0.4.7/libproxy/cmake/modules/pacrunner_mozjs.cmk @@ -7,19 +7,15 @@ if(WIN32) include_directories("${MOZJS_INCLUDE_DIR}") endif() elseif(NOT APPLE) - set(MOZJS_SEARCH_ORDER "mozilla-js;xulrunner-js;firefox-js;seamonkey-js" CACHE STRING "MozJS search order") option(WITH_MOZJS "Search for MOZJS package" ON) if (WITH_MOZJS) - foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER}) - pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12) - if(MOZJS_FOUND) - include_directories(${MOZJS_INCLUDE_DIRS}) - link_directories(${MOZJS_LIBRARY_DIRS}) - break() - else() - set(MOZJS_FOUND 0) - endif() - endforeach() + pkg_search_module(MOZJS mozjs185>=1.8.5) + if(MOZJS_FOUND) + include_directories(${MOZJS_INCLUDE_DIRS}) + link_directories(${MOZJS_LIBRARY_DIRS}) + else() + set(MOZJS_FOUND 0) + endif() else() set(MOZJS_FOUND 0) 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 hxtools for openSUSE:Factory
by root＠hilbert.suse.de 28 Jul '11

28 Jul '11

Hello community, here is the log from the commit of package hxtools for openSUSE:Factory checked in at Thu Jul 28 08:46:05 CEST 2011. -------- --- hxtools/hxtools.changes 2011-02-14 17:12:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/hxtools/hxtools.changes 2011-07-21 16:59:15.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Jul 21 14:52:09 UTC 2011 - jengelh(a)medozas.de + +- Update to hxtools-20110721 +* all: include libHX_CFLAGS to avoid build abort due to missing -I +* ofl: define _GNU_SOURCE to avoid build abort + +------------------------------------------------------------------- +Sat May 21 09:48:32 UTC 2011 - jengelh(a)medozas.de + +- Update to hxtools-20110509 +* phased out and/or removed obsolete scripts +- Update dependencies on Perl modules + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- hxtools-20110214.tar.xz hxtools-20110214.tar.xz.asc New: ---- hxtools-20110721.tar.xz hxtools-20110721.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hxtools.spec ++++++ --- /var/tmp/diff_new_pack.3zrKLu/_old 2011-07-28 08:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.3zrKLu/_new 2011-07-28 08:45:36.000000000 +0200 @@ -18,7 +18,7 @@ Name: hxtools -Version: 20110214 +Version: 20110721 Release: 1 Group: System/Base Url: http://jengelh.medozas.de/projects/hxtools/ @@ -31,6 +31,9 @@ BuildRequires: freetype2 libHX-devel >= 3.4 libcap-devel BuildRequires: pkg-config xorg-x11 xz BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: perl(Data::Dumper), perl(File::Find) +Requires: perl(File::Find::Rule) +Requires: perl(Getopt::Long), perl(IPC::Open2), perl(Text::CSV_XS) Recommends: %name-scripts = %version, %name-man = %version %define build_profile 1 @@ -47,7 +50,7 @@ * vfontas(1) — VGA font file assembler %package scripts -License: GPL,PD + Group: System/Base Summary: Collection of day-to-day tools (scripts) BuildArch: noarch @@ -79,7 +82,7 @@ * wktimer(1) — work timer %package man -License: GPL,PD + Group: Documentation/Man Summary: Manual pages for the hxtools suite BuildArch: noarch @@ -89,7 +92,7 @@ from hxtools. %package data -License: GPL,PD + Group: System/Base Summary: Collection of day-to-day tools (data) BuildArch: noarch @@ -102,7 +105,7 @@ * additional syntax highlighting definitions for mcedit %package profile -License: GPL,PD + Group: System/Base Summary: The hxtools shell environment Requires: %name = %version, %name-scripts = %version @@ -128,8 +131,6 @@ %install o="$PWD"; b="%buildroot"; -rm -Rf "$b"; -mkdir "$b"; make install DESTDIR="$b"; install -dm0755 "$b/%_datadir/mc/syntax"; @@ -144,15 +145,14 @@ perl -pe 's{^\./+}{/}' >"$o/scripts.lst"; %if 0%{?build_profile} +mkdir -p "$b/%_sysconfdir/bashrc.d"; +ln -s "%_datadir/%name/hxtools_bashrc.bash" "$b/%_sysconfdir/bashrc.d/"; mkdir -p "$b/%_sysconfdir/profile.d"; ln -s "%_datadir/%name/hxtools_profile.bash" "$b/%_sysconfdir/profile.d/z_hxtools_profile.sh"; %else rm -Rf "$b/%_sysconfdir/profile.d" "$b/%_sysconfdir"/hx*; %endif -%clean -rm -Rf "%buildroot"; - %files -f binary.lst %defattr(-,root,root) %dir %_libexecdir/%name @@ -180,6 +180,8 @@ %files profile %defattr(-,root,root) %config %_sysconfdir/hxloginpref.conf +%dir %_sysconfdir/bashrc.d +%config %_sysconfdir/bashrc.d/* %config %_sysconfdir/profile.d/* %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 libsatsolver for openSUSE:11.4
by root＠hilbert.suse.de 28 Jul '11

28 Jul '11

Hello community, here is the log from the commit of package libsatsolver for openSUSE:11.4 checked in at Thu Jul 28 00:26:07 CEST 2011. -------- --- old-versions/11.4/UPDATES/all/libsatsolver/libsatsolver.changes 2011-05-10 17:55:31.000000000 +0200 +++ 11.4/libsatsolver/libsatsolver.changes 2011-07-27 11:48:17.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 27 11:30:45 CEST 2011 - mls(a)suse.de + +- fix segfault in "fallback" solution creation code, do two passes to + find better solutions [bnc#707839] +- 0.16.3 + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- satsolver-0.16.2.tar.bz2 New: ---- satsolver-0.16.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsatsolver.spec ++++++ --- /var/tmp/diff_new_pack.r2AMfi/_old 2011-07-28 00:25:40.000000000 +0200 +++ /var/tmp/diff_new_pack.r2AMfi/_new 2011-07-28 00:25:40.000000000 +0200 @@ -22,7 +22,7 @@ %endif Name: libsatsolver -Version: 0.16.2 +Version: 0.16.3 Release: 0.<RELEASE2> License: BSD 3-Clause Url: git://git.opensuse.org/projects/zypp/sat-solver.git ++++++ satsolver-0.16.2.tar.bz2 -> satsolver-0.16.3.tar.bz2 ++++++ old-versions/11.4/UPDATES/all/libsatsolver/satsolver-0.16.2.tar.bz2 11.4/libsatsolver/satsolver-0.16.3.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 samba for openSUSE:11.4
by root＠hilbert.suse.de 28 Jul '11

28 Jul '11

Hello community, here is the log from the commit of package samba for openSUSE:11.4 checked in at Thu Jul 28 00:25:27 CEST 2011. -------- --- old-versions/11.4/all/samba/samba.changes 2011-02-28 17:29:13.000000000 +0100 +++ 11.4/samba/samba.changes 2011-07-27 13:41:00.000000000 +0200 @@ -1,0 +2,58 @@ +Tue Jul 26 23:57:01 UTC 2011 - lmuelle(a)suse.de + +- The Samba Web Administration Tool (SWAT) versions 3.0.x to 3.5.9 are + affected by a cross-site scripting vulnerability; CVE-2011-2694; (bso#8289); + (bnc#708503). + +------------------------------------------------------------------- +Tue Jul 26 20:44:01 UTC 2011 - lmuelle(a)suse.de + +- The Samba Web Administration Tool (SWAT) versions 3.0.x to 3.5.9 are + affected by a cross-site request forgery; CVE-2011-2522; (bso#8290); + (bnc#705241). + +------------------------------------------------------------------- +Mon Jul 11 16:21:23 CEST 2011 - ddiss(a)suse.de + +- Improve ctdb vacuuming performance with use of SCHEDULE_FOR_DELETION; + (bnc#705170). + +------------------------------------------------------------------- +Mon May 16 10:23:54 CEST 2011 - ddiss(a)suse.de + +- Fix a 100% CPU loop when ctdbd dies during a traverse; (bnc#693945). + +------------------------------------------------------------------- +Thu Apr 7 21:38:00 CET 2011 - jmcdonough(a)suse.de + +- Fix idmap_tdb for big-endian systems such as ppc and s390; + (bso#6901); (bnc#675978). + +------------------------------------------------------------------- +Thu Mar 24 16:37:34 CET 2011 - ddiss(a)suse.de + +- Fix smbclient -M NT_STATUS_PIPE_BROKEN failure; (bso#7635); (bnc#681913). + +------------------------------------------------------------------- +Thu Mar 17 10:24:31 CET 2011 - ddiss(a)suse.de + +- Don't crash when publishing a single printer; (bnc#643119). + +------------------------------------------------------------------- +Wed Mar 9 10:46:20 UTC 2011 - lmuelle(a)suse.de + +- Define the libwbclient packages ahead of packages with a different version. + +------------------------------------------------------------------- +Fri Mar 4 20:12:24 UTC 2011 - lmuelle(a)suse.de + +- Require a particular library version even if the major version is part of + the package name. Using the same major version does not guarantee forward + compatibility. + +------------------------------------------------------------------- +Fri Mar 4 16:30:46 CET 2011 - ddiss(a)suse.de + +- Fix a fd-leak in libwbclient at dlclose-time; (bso#7684); (bnc#668773). + +------------------------------------------------------------------- @@ -136,0 +195,5 @@ +Wed Nov 24 13:28:13 CET 2010 - ddiss(a)suse.de + +- One further fix for spoolss GetPrinter (level 2) response; (bnc#649636). + +------------------------------------------------------------------- @@ -162,0 +226,18 @@ + +------------------------------------------------------------------- +Wed Nov 10 11:53:36 CET 2010 - ddiss(a)suse.de + +- Fix incorrect spoolss GetPrinterData behaviour, causing user get + printer settings problems; (bnc#643787). + +------------------------------------------------------------------- +Wed Nov 10 11:50:26 CET 2010 - ddiss(a)suse.de + +- Fix malformed spoolss EnumPrinterKey response, causing add printer + failures on Windows 7; (bso#6883); (bnc#649526). + +------------------------------------------------------------------- +Wed Nov 10 11:47:35 CET 2010 - ddiss(a)suse.de + +- Fix malformed spoolss GetPrinter (level 2) response; + (bso#6727); (bnc#649636). Package does not exist at destination yet. Using Fallback old-versions/11.4/all/samba Destination is old-versions/11.4/UPDATES/all/samba calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.2aE38T/_old 2011-07-28 00:24:54.000000000 +0200 +++ /var/tmp/diff_new_pack.2aE38T/_new 2011-07-28 00:24:54.000000000 +0200 @@ -420,7 +420,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.2aE38T/_old 2011-07-28 00:24:54.000000000 +0200 +++ /var/tmp/diff_new_pack.2aE38T/_new 2011-07-28 00:24:54.000000000 +0200 @@ -184,7 +184,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %package client @@ -230,7 +230,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -257,7 +257,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %endif @@ -287,7 +287,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %endif @@ -314,7 +314,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %if %{make_utils} @@ -365,7 +365,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -375,7 +375,7 @@ %else %package -n libsmbclient0 -License: GPL v3 or later +License: GPLv3+ Provides: libsmbclient = %{version}-%{release} Obsoletes: libsmbclient %endif @@ -390,7 +390,7 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %else @@ -416,12 +416,12 @@ Group: Development/Libraries/C and C++ AutoReqProv: on %if 0%{?suse_version} && 0%{?suse_version} < 921 -Requires: libsmbclient heimdal-devel +Requires: libsmbclient = %{version} heimdal-devel %else %if 0%{?suse_version} && 0%{?suse_version} < 1031 -Requires: libsmbclient krb5-devel +Requires: libsmbclient = %{version} krb5-devel %else -Requires: libsmbclient0 krb5-devel +Requires: libsmbclient0 = %{version} krb5-devel %endif %endif @@ -435,7 +435,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %package -n libnetapi0 @@ -454,7 +454,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %package -n libnetapi-devel @@ -462,7 +462,7 @@ Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ AutoReqProv: on -Requires: libnetapi0 +Requires: libnetapi0 = %{version} %description -n libnetapi-devel This package contains the static libraries and header files needed to @@ -474,7 +474,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -484,7 +484,7 @@ %else %package -n libsmbsharemodes0 -License: GPL v3 or later +License: GPLv3+ %endif Summary: Samba smbsharemodes Library Group: System/Libraries @@ -494,7 +494,7 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %else @@ -514,9 +514,9 @@ Group: Development/Libraries/C and C++ AutoReqProv: on %if 0%{?suse_version} && 0%{?suse_version} < 1031 -Requires: libsmbsharemodes +Requires: libsmbsharemodes = %{version} %else -Requires: libsmbsharemodes0 +Requires: libsmbsharemodes0 = %{version} %endif %description -n libsmbsharemodes-devel @@ -530,20 +530,18 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 -%package -n libtalloc2 -License: LGPLv3+ -Summary: Samba talloc Library +%package -n libwbclient0 +License: GPLv3+ +Summary: Samba libwbclient Library Group: System/Libraries AutoReqProv: on -Version: %{libtalloc_ver} -Release: 2.<RELEASE4> PreReq: /sbin/ldconfig -%description -n libtalloc2 -This package includes the talloc library. +%description -n libwbclient0 +This package includes the wbclient library. @@ -551,21 +549,19 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 -%package -n libtalloc-devel -License: LGPLv3+ -Summary: Libraries and Header Files to Develop Programs with talloc Support +%package -n libwbclient-devel +License: GPLv3+ +Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ AutoReqProv: on -Version: %{libtalloc_ver} -Release: 2.<RELEASE4> -Requires: libtalloc2 +Requires: libwbclient0 = %{version} -%description -n libtalloc-devel +%description -n libwbclient-devel This package contains the static libraries and header files needed to -develop programs which make use of the talloc programming interface. +develop programs which make use of the wbclient programming interface. @@ -573,20 +569,20 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 -%package -n libtdb1 +%package -n libtalloc2 License: LGPLv3+ -Summary: Samba tdb Library +Summary: Samba talloc Library Group: System/Libraries AutoReqProv: on -Version: %{libtdb_ver} -Release: 2.<RELEASE4> +Version: %{libtalloc_ver} +Release: 2.<RELEASE5> PreReq: /sbin/ldconfig -%description -n libtdb1 -This package includes the tdb library. +%description -n libtalloc2 +This package includes the talloc library. @@ -594,21 +590,21 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 -%package -n libtdb-devel +%package -n libtalloc-devel License: LGPLv3+ -Summary: Libraries and Header Files to Develop Programs with tdb Support +Summary: Libraries and Header Files to Develop Programs with talloc Support Group: Development/Libraries/C and C++ AutoReqProv: on -Version: %{libtdb_ver} -Release: 2.<RELEASE4> -Requires: libtdb1 +Version: %{libtalloc_ver} +Release: 2.<RELEASE5> +Requires: libtalloc2 = %{libtalloc_ver} -%description -n libtdb-devel +%description -n libtalloc-devel This package contains the static libraries and header files needed to -develop programs which make use of the tdb programming interface. +develop programs which make use of the talloc programming interface. @@ -616,18 +612,20 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 -%package -n libwbclient0 -License: GPLv3+ -Summary: Samba libwbclient Library +%package -n libtdb1 +License: LGPLv3+ +Summary: Samba tdb Library Group: System/Libraries AutoReqProv: on +Version: %{libtdb_ver} +Release: 2.<RELEASE5> PreReq: /sbin/ldconfig -%description -n libwbclient0 -This package includes the wbclient library. +%description -n libtdb1 +This package includes the tdb library. @@ -635,19 +633,21 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 -%package -n libwbclient-devel -License: GPLv3+ -Summary: Libraries and Header Files to Develop Programs with wbclient Support +%package -n libtdb-devel +License: LGPLv3+ +Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ AutoReqProv: on -Requires: libwbclient0 +Version: %{libtdb_ver} +Release: 2.<RELEASE5> +Requires: libtdb1 = %{libtdb_ver} -%description -n libwbclient-devel +%description -n libtdb-devel This package contains the static libraries and header files needed to -develop programs which make use of the wbclient programming interface. +develop programs which make use of the tdb programming interface. @@ -655,7 +655,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %package -n libtevent0 @@ -664,7 +664,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libtevent_ver} -Release: 2.<RELEASE4> +Release: 2.<RELEASE5> PreReq: /sbin/ldconfig %description -n libtevent0 @@ -676,7 +676,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %package -n libtevent-devel @@ -685,8 +685,8 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtevent_ver} -Release: 2.<RELEASE4> -Requires: libtevent0 +Release: 2.<RELEASE5> +Requires: libtevent0 = %{libtevent_ver} %description -n libtevent-devel This package contains the static libraries and header files needed to @@ -699,7 +699,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %package -n libldb0 @@ -708,7 +708,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libldb_ver} -Release: 2.<RELEASE4> +Release: 2.<RELEASE5> PreReq: /sbin/ldconfig %description -n libldb0 @@ -721,7 +721,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %package -n libldb-devel @@ -730,8 +730,8 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libldb_ver} -Release: 2.<RELEASE4> -Requires: libldb0 +Release: 2.<RELEASE5> +Requires: libldb0 = %{libldb_ver} %description -n libldb-devel This package contains the static libraries and header files needed to @@ -743,7 +743,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %if %{make_ldapsmb} @@ -754,7 +754,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 298.<RELEASE4> +Release: 298.<RELEASE5> Requires: perl-ldap %description -n ldapsmb @@ -767,7 +767,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %endif @@ -790,14 +790,14 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 2505 +Source Timestamp: 2573 Branch : 3.5.7 %endif %if %{make_vscan} %package vscan -License: GPL v2 or later +License: GPLv2+ Summary: On-Access Virus Scanning with Samba Group: Productivity/Networking/Samba AutoReqProv: on ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.2aE38T/_old 2011-07-28 00:24:54.000000000 +0200 +++ /var/tmp/diff_new_pack.2aE38T/_new 2011-07-28 00:24:54.000000000 +0200 @@ -1,2 +1,2 @@ -2505 +2573 Branch : 3.5.7 ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/1c579318ae2d2480ee4cc998443c0d1661b39846 new/patches/samba.org/1c579318ae2d2480ee4cc998443c0d1661b39846 --- old/patches/samba.org/1c579318ae2d2480ee4cc998443c0d1661b39846 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/1c579318ae2d2480ee4cc998443c0d1661b39846 2011-04-26 18:37:00.000000000 +0200 @@ -0,0 +1,17 @@ +Fix GetPrinterData response + +When returning WERR_MORE_DATA, the GetPrinterData data type field must be +retained otherwise Windows XP/2k3 will not reissue the request. +Index: source3/rpc_server/srv_spoolss_nt.c +=================================================================== +--- source3/rpc_server/srv_spoolss_nt.c.orig ++++ source3/rpc_server/srv_spoolss_nt.c +@@ -8725,7 +8725,7 @@ WERROR _spoolss_GetPrinterDataEx(pipes_s + return result; + } + +- *r->out.type = SPOOLSS_BUFFER_OK(*r->out.type, REG_NONE); ++ /* retain type when returning WERR_MORE_DATA */ + r->out.data = SPOOLSS_BUFFER_OK(r->out.data, r->out.data); + + return SPOOLSS_BUFFER_OK(WERR_OK, WERR_MORE_DATA); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/21576e3f8c32878910460bf9575c200ad93d682a new/patches/samba.org/21576e3f8c32878910460bf9575c200ad93d682a --- old/patches/samba.org/21576e3f8c32878910460bf9575c200ad93d682a 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/21576e3f8c32878910460bf9575c200ad93d682a 2011-03-18 16:39:42.000000000 +0100 @@ -0,0 +1,24 @@ +commit 21576e3f8c32878910460bf9575c200ad93d682a +Author: Günther Deschner <gd(a)samba.org> +Date: Fri Oct 1 06:08:12 2010 +0200 + + s3-net: make sure we dont crash when publishing a single printer. + + Guenther + +Index: source3/utils/net_rpc_printer.c +=================================================================== +--- source3/utils/net_rpc_printer.c.orig ++++ source3/utils/net_rpc_printer.c +@@ -1091,6 +1091,11 @@ static bool get_printer_info(struct rpc_ + &hnd)) + return false; + ++ *info_p = talloc_zero(mem_ctx, union spoolss_PrinterInfo); ++ if (*info_p == NULL) { ++ return false; ++ } ++ + if (!net_spoolss_getprinter(pipe_hnd, mem_ctx, &hnd, level, *info_p)) { + rpccli_spoolss_ClosePrinter(pipe_hnd, mem_ctx, &hnd, NULL); + return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/3a3c118a7edf679d6b545df035fd8d51b00e0830 new/patches/samba.org/3a3c118a7edf679d6b545df035fd8d51b00e0830 --- old/patches/samba.org/3a3c118a7edf679d6b545df035fd8d51b00e0830 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/3a3c118a7edf679d6b545df035fd8d51b00e0830 2011-07-21 22:10:31.000000000 +0200 @@ -0,0 +1,93 @@ +commit 3a3c118a7edf679d6b545df035fd8d51b00e0830 +Author: Michael Adam <obnox(a)samba.org> +Date: Wed Dec 22 14:16:07 2010 +0100 + + s3:dbwrap_ctdb: in ctdb_delete, send a SCHEDULE_FOR_DELETION control to local ctdbd + + This way, the record will be scheduled for fast vacuuming. + + This is sent with the NOREPLY flag, so ctd should not sent + a reply packet and samba does not expect one. Hence, it + is not important for the success of the db_ctdb_delete command + whether or not the ctdbd we are running against supports the + SCHEDULE_FOR_DELETION control. + +Index: source3/lib/dbwrap_ctdb.c +=================================================================== +--- source3/lib/dbwrap_ctdb.c.orig ++++ source3/lib/dbwrap_ctdb.c +@@ -879,9 +879,56 @@ static NTSTATUS db_ctdb_store(struct db_ + + + ++#ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION ++static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec) ++{ ++ NTSTATUS status; ++ struct ctdb_control_schedule_for_deletion *dd; ++ TDB_DATA indata; ++ int cstatus; ++ struct db_ctdb_rec *crec = talloc_get_type_abort( ++ rec->private_data, struct db_ctdb_rec); ++ ++ indata.dsize = offsetof(struct ctdb_control_schedule_for_deletion, key) + rec->key.dsize; ++ indata.dptr = talloc_zero_array(crec, uint8_t, indata.dsize); ++ if (indata.dptr == NULL) { ++ DEBUG(0, (__location__ " talloc failed!\n")); ++ return NT_STATUS_NO_MEMORY; ++ } ++ ++ dd = (struct ctdb_control_schedule_for_deletion *)(void *)indata.dptr; ++ dd->db_id = crec->ctdb_ctx->db_id; ++ dd->hdr = crec->header; ++ dd->keylen = rec->key.dsize; ++ memcpy(dd->key, rec->key.dptr, rec->key.dsize); ++ ++ status = ctdbd_control_local(messaging_ctdbd_connection(), ++ CTDB_CONTROL_SCHEDULE_FOR_DELETION, ++ crec->ctdb_ctx->db_id, ++ CTDB_CTRL_FLAG_NOREPLY, /* flags */ ++ indata, ++ NULL, /* outdata */ ++ NULL, /* errmsg */ ++ &cstatus); ++ talloc_free(indata.dptr); ++ ++ if (!NT_STATUS_IS_OK(status) || cstatus != 0) { ++ DEBUG(1, (__location__ " Error sending local control " ++ "SCHEDULE_FOR_DELETION: %s, cstatus = %d\n", ++ nt_errstr(status), cstatus)); ++ if (NT_STATUS_IS_OK(status)) { ++ status = NT_STATUS_UNSUCCESSFUL; ++ } ++ } ++ ++ return status; ++} ++#endif ++ + static NTSTATUS db_ctdb_delete(struct db_record *rec) + { + TDB_DATA data; ++ NTSTATUS status; + + /* + * We have to store the header with empty data. TODO: Fix the +@@ -890,8 +937,16 @@ static NTSTATUS db_ctdb_delete(struct db + + ZERO_STRUCT(data); + +- return db_ctdb_store(rec, data, 0); ++ status = db_ctdb_store(rec, data, 0); ++ if (!NT_STATUS_IS_OK(status)) { ++ return status; ++ } ++ ++#ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION ++ status = db_ctdb_send_schedule_for_deletion(rec); ++#endif + ++ return status; + } + + static int db_ctdb_record_destr(struct db_record* data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/CVE-2011-2522.diff new/patches/samba.org/CVE-2011-2522.diff --- old/patches/samba.org/CVE-2011-2522.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/CVE-2011-2522.diff 2011-07-27 01:32:27.000000000 +0200 @@ -0,0 +1,467 @@ +From 42321e69cb3b245f8cce5f85524d1f3bec780042 Mon Sep 17 00:00:00 2001 +From: Kai Blin <kai(a)samba.org> +Date: Fri, 8 Jul 2011 12:56:21 +0200 +Subject: [PATCH 02/13] s3 swat: Allow getting the user's HTTP auth password + +Signed-off-by: Kai Blin <kai(a)samba.org> + +Index: source3/web/cgi.c +=================================================================== +--- source3/web/cgi.c.orig ++++ source3/web/cgi.c +@@ -19,6 +19,8 @@ + + #include "includes.h" + #include "web/swat_proto.h" ++#include "secrets.h" ++#include "../lib/util/util.h" + + #define MAX_VARIABLES 10000 + +@@ -42,6 +44,7 @@ static char *query_string; + static const char *baseurl; + static char *pathinfo; + static char *C_user; ++static char *C_pass; + static bool inetd_server; + static bool got_request; + +@@ -320,7 +323,23 @@ static void cgi_web_auth(void) + exit(0); + } + +- setuid(0); ++ C_user = SMB_STRDUP(user); ++ ++ if (!setuid(0)) { ++ C_pass = secrets_fetch_generic("root", "SWAT"); ++ if (C_pass == NULL) { ++ char *tmp_pass = NULL; ++ tmp_pass = generate_random_str(talloc_tos(), 16); ++ if (tmp_pass == NULL) { ++ printf("%sFailed to create random nonce for " ++ "SWAT session\n<br>%s\n", head, tail); ++ exit(0); ++ } ++ secrets_store_generic("root", "SWAT", tmp_pass); ++ C_pass = SMB_STRDUP(tmp_pass); ++ TALLOC_FREE(tmp_pass); ++ } ++ } + setuid(pwd->pw_uid); + if (geteuid() != pwd->pw_uid || getuid() != pwd->pw_uid) { + printf("%sFailed to become user %s - uid=%d/%d<br>%s\n", +@@ -388,6 +407,7 @@ static bool cgi_handle_authorization(cha + + /* Save the users name */ + C_user = SMB_STRDUP(user); ++ C_pass = SMB_STRDUP(user_pass); + TALLOC_FREE(pass); + return True; + } +@@ -422,6 +442,13 @@ char *cgi_user_name(void) + return(C_user); + } + ++/*************************************************************************** ++return a ptr to the users password ++ ***************************************************************************/ ++char *cgi_user_pass(void) ++{ ++ return(C_pass); ++} + + /*************************************************************************** + handle a file download +Index: source3/web/statuspage.c +=================================================================== +--- source3/web/statuspage.c.orig ++++ source3/web/statuspage.c +@@ -247,9 +247,14 @@ void status_page(void) + int nr_running=0; + bool waitup = False; + TALLOC_CTX *ctx = talloc_stackframe(); ++ const char form_name[] = "status"; + + smbd_pid = pid_to_procid(pidfile_pid("smbd")); + ++ if (!verify_xsrf_token(form_name)) { ++ goto output_page; ++ } ++ + if (cgi_variable("smbd_restart") || cgi_variable("all_restart")) { + stop_smbd(); + start_smbd(); +@@ -326,9 +331,11 @@ void status_page(void) + + initPid2Machine (); + ++output_page: + printf("<H2>%s</H2>\n", _("Server Status")); + + printf("<FORM method=post>\n"); ++ print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name); + + if (!autorefresh) { + printf("<input type=submit value=\"%s\" name=\"autorefresh\">\n", _("Auto Refresh")); +Index: source3/web/swat.c +=================================================================== +--- source3/web/swat.c.orig ++++ source3/web/swat.c +@@ -29,6 +29,7 @@ + + #include "includes.h" + #include "web/swat_proto.h" ++#include "../lib/crypto/md5.h" + + static int demo_mode = False; + static int passwd_only = False; +@@ -50,6 +51,9 @@ static int iNumNonAutoPrintServices = 0; + #define DISABLE_USER_FLAG "disable_user_flag" + #define ENABLE_USER_FLAG "enable_user_flag" + #define RHOST "remote_host" ++#define XSRF_TOKEN "xsrf" ++#define XSRF_TIME "xsrf_time" ++#define XSRF_TIMEOUT 300 + + #define _(x) lang_msg_rotate(talloc_tos(),x) + +@@ -138,6 +142,76 @@ static char *make_parm_name(const char * + return parmname; + } + ++void get_xsrf_token(const char *username, const char *pass, ++ const char *formname, time_t xsrf_time, char token_str[33]) ++{ ++ struct MD5Context md5_ctx; ++ uint8_t token[16]; ++ int i; ++ ++ token_str[0] = '\0'; ++ ZERO_STRUCT(md5_ctx); ++ MD5Init(&md5_ctx); ++ ++ MD5Update(&md5_ctx, (uint8_t *)formname, strlen(formname)); ++ MD5Update(&md5_ctx, (uint8_t *)&xsrf_time, sizeof(time_t)); ++ if (username != NULL) { ++ MD5Update(&md5_ctx, (uint8_t *)username, strlen(username)); ++ } ++ if (pass != NULL) { ++ MD5Update(&md5_ctx, (uint8_t *)pass, strlen(pass)); ++ } ++ ++ MD5Final(token, &md5_ctx); ++ ++ for(i = 0; i < sizeof(token); i++) { ++ char tmp[3]; ++ ++ snprintf(tmp, sizeof(tmp), "%02x", token[i]); ++ strncat(token_str, tmp, sizeof(tmp)); ++ } ++} ++ ++void print_xsrf_token(const char *username, const char *pass, ++ const char *formname) ++{ ++ char token[33]; ++ time_t xsrf_time = time(NULL); ++ ++ get_xsrf_token(username, pass, formname, xsrf_time, token); ++ printf("<input type=\"hidden\" name=\"%s\" value=\"%s\">\n", ++ XSRF_TOKEN, token); ++ printf("<input type=\"hidden\" name=\"%s\" value=\"%lld\">\n", ++ XSRF_TIME, (long long int)xsrf_time); ++} ++ ++bool verify_xsrf_token(const char *formname) ++{ ++ char expected[33]; ++ const char *username = cgi_user_name(); ++ const char *pass = cgi_user_pass(); ++ const char *token = cgi_variable_nonull(XSRF_TOKEN); ++ const char *time_str = cgi_variable_nonull(XSRF_TIME); ++ time_t xsrf_time = 0; ++ time_t now = time(NULL); ++ ++ if (sizeof(time_t) == sizeof(int)) { ++ xsrf_time = atoi(time_str); ++ } else if (sizeof(time_t) == sizeof(long)) { ++ xsrf_time = atol(time_str); ++ } else if (sizeof(time_t) == sizeof(long long)) { ++ xsrf_time = atoll(time_str); ++ } ++ ++ if (abs(now - xsrf_time) > XSRF_TIMEOUT) { ++ return false; ++ } ++ ++ get_xsrf_token(username, pass, formname, xsrf_time, expected); ++ return (strncmp(expected, token, sizeof(expected)) == 0); ++} ++ ++ + /**************************************************************************** + include a lump of html in a page + ****************************************************************************/ +@@ -611,13 +685,20 @@ static void welcome_page(void) + static void viewconfig_page(void) + { + int full_view=0; ++ const char form_name[] = "viewconfig"; ++ ++ if (!verify_xsrf_token(form_name)) { ++ goto output_page; ++ } + + if (cgi_variable("full_view")) { + full_view = 1; + } + ++output_page: + printf("<H2>%s</H2>\n", _("Current Config")); + printf("<form method=post>\n"); ++ print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name); + + if (full_view) { + printf("<input type=submit name=\"normal_view\" value=\"%s\">\n", _("Normal View")); +@@ -637,18 +718,25 @@ static void viewconfig_page(void) + static void wizard_params_page(void) + { + unsigned int parm_filter = FLAG_WIZARD; ++ const char form_name[] = "wizard_params"; + + /* Here we first set and commit all the parameters that were selected + in the previous screen. */ + + printf("<H2>%s</H2>\n", _("Wizard Parameter Edit Page")); + ++ if (!verify_xsrf_token(form_name)) { ++ goto output_page; ++ } ++ + if (cgi_variable("Commit")) { + commit_parameters(GLOBAL_SECTION_SNUM); + save_reload(-1); + } + ++output_page: + printf("<form name=\"swatform\" method=post action=wizard_params>\n"); ++ print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name); + + if (have_write_access) { + printf("<input type=submit name=\"Commit\" value=\"Commit Changes\">\n"); +@@ -684,6 +772,11 @@ static void wizard_page(void) + int have_home = -1; + int HomeExpo = 0; + int SerType = 0; ++ const char form_name[] = "wizard"; ++ ++ if (!verify_xsrf_token(form_name)) { ++ goto output_page; ++ } + + if (cgi_variable("Rewrite")) { + (void) rewritecfg_file(); +@@ -774,10 +867,12 @@ static void wizard_page(void) + winstype = 3; + + role = lp_server_role(); +- ++ ++output_page: + /* Here we go ... */ + printf("<H2>%s</H2>\n", _("Samba Configuration Wizard")); + printf("<form method=post action=wizard>\n"); ++ print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name); + + if (have_write_access) { + printf("%s\n", _("The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments.")); +@@ -846,9 +941,14 @@ static void globals_page(void) + { + unsigned int parm_filter = FLAG_BASIC; + int mode = 0; ++ const char form_name[] = "globals"; + + printf("<H2>%s</H2>\n", _("Global Parameters")); + ++ if (!verify_xsrf_token(form_name)) { ++ goto output_page; ++ } ++ + if (cgi_variable("Commit")) { + commit_parameters(GLOBAL_SECTION_SNUM); + save_reload(-1); +@@ -861,7 +961,9 @@ static void globals_page(void) + if ( cgi_variable("AdvMode")) + mode = 1; + ++output_page: + printf("<form name=\"swatform\" method=post action=globals>\n"); ++ print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name); + + ViewModeBoxes( mode ); + switch ( mode ) { +@@ -901,11 +1003,17 @@ static void shares_page(void) + int mode = 0; + unsigned int parm_filter = FLAG_BASIC; + size_t converted_size; ++ const char form_name[] = "shares"; ++ ++ printf("<H2>%s</H2>\n", _("Share Parameters")); ++ ++ if (!verify_xsrf_token(form_name)) { ++ goto output_page; ++ } + + if (share) + snum = lp_servicenumber(share); + +- printf("<H2>%s</H2>\n", _("Share Parameters")); + + if (cgi_variable("Commit") && snum >= 0) { + commit_parameters(snum); +@@ -931,10 +1039,6 @@ static void shares_page(void) + } + } + +- printf("<FORM name=\"swatform\" method=post>\n"); +- +- printf("<table>\n"); +- + if ( cgi_variable("ViewMode") ) + mode = atoi(cgi_variable_nonull("ViewMode")); + if ( cgi_variable("BasicMode")) +@@ -942,6 +1046,12 @@ static void shares_page(void) + if ( cgi_variable("AdvMode")) + mode = 1; + ++output_page: ++ printf("<FORM name=\"swatform\" method=post>\n"); ++ print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name); ++ ++ printf("<table>\n"); ++ + ViewModeBoxes( mode ); + switch ( mode ) { + case 0: +@@ -1138,6 +1248,8 @@ static void chg_passwd(void) + static void passwd_page(void) + { + const char *new_name = cgi_user_name(); ++ const char passwd_form[] = "passwd"; ++ const char rpasswd_form[] = "rpasswd"; + + /* + * After the first time through here be nice. If the user +@@ -1152,6 +1264,7 @@ static void passwd_page(void) + printf("<H2>%s</H2>\n", _("Server Password Management")); + + printf("<FORM name=\"swatform\" method=post>\n"); ++ print_xsrf_token(cgi_user_name(), cgi_user_pass(), passwd_form); + + printf("<table>\n"); + +@@ -1191,14 +1304,16 @@ static void passwd_page(void) + * Do some work if change, add, disable or enable was + * requested. It could be this is the first time through this + * code, so there isn't anything to do. */ +- if ((cgi_variable(CHG_S_PASSWD_FLAG)) || (cgi_variable(ADD_USER_FLAG)) || (cgi_variable(DELETE_USER_FLAG)) || +- (cgi_variable(DISABLE_USER_FLAG)) || (cgi_variable(ENABLE_USER_FLAG))) { ++ if (verify_xsrf_token(passwd_form) && ++ ((cgi_variable(CHG_S_PASSWD_FLAG)) || (cgi_variable(ADD_USER_FLAG)) || (cgi_variable(DELETE_USER_FLAG)) || ++ (cgi_variable(DISABLE_USER_FLAG)) || (cgi_variable(ENABLE_USER_FLAG)))) { + chg_passwd(); + } + + printf("<H2>%s</H2>\n", _("Client/Server Password Management")); + + printf("<FORM name=\"swatform\" method=post>\n"); ++ print_xsrf_token(cgi_user_name(), cgi_user_pass(), rpasswd_form); + + printf("<table>\n"); + +@@ -1231,7 +1346,7 @@ static void passwd_page(void) + * password somewhere other than the server. It could be this + * is the first time through this code, so there isn't + * anything to do. */ +- if (cgi_variable(CHG_R_PASSWD_FLAG)) { ++ if (verify_xsrf_token(passwd_form) && cgi_variable(CHG_R_PASSWD_FLAG)) { + chg_passwd(); + } + +@@ -1248,18 +1363,15 @@ static void printers_page(void) + int i; + int mode = 0; + unsigned int parm_filter = FLAG_BASIC; ++ const char form_name[] = "printers"; ++ ++ if (!verify_xsrf_token(form_name)) { ++ goto output_page; ++ } + + if (share) + snum = lp_servicenumber(share); + +- printf("<H2>%s</H2>\n", _("Printer Parameters")); +- +- printf("<H3>%s</H3>\n", _("Important Note:")); +- printf("%s",_("Printer names marked with [*] in the Choose Printer drop-down box ")); +- printf("%s",_("are autoloaded printers from ")); +- printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name")); +- printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect.")); +- + if (cgi_variable("Commit") && snum >= 0) { + commit_parameters(snum); + if (snum >= iNumNonAutoPrintServices) +@@ -1288,8 +1400,6 @@ static void printers_page(void) + } + } + +- printf("<FORM name=\"swatform\" method=post>\n"); +- + if ( cgi_variable("ViewMode") ) + mode = atoi(cgi_variable_nonull("ViewMode")); + if ( cgi_variable("BasicMode")) +@@ -1297,6 +1407,19 @@ static void printers_page(void) + if ( cgi_variable("AdvMode")) + mode = 1; + ++output_page: ++ printf("<H2>%s</H2>\n", _("Printer Parameters")); ++ ++ printf("<H3>%s</H3>\n", _("Important Note:")); ++ printf("%s",_("Printer names marked with [*] in the Choose Printer drop-down box ")); ++ printf("%s",_("are autoloaded printers from ")); ++ printf("<A HREF=\"/swat/help/smb.conf.5.html#printcapname\" target=\"docs\">%s</A>\n", _("Printcap Name")); ++ printf("%s\n", _("Attempting to delete these printers from SWAT will have no effect.")); ++ ++ ++ printf("<FORM name=\"swatform\" method=post>\n"); ++ print_xsrf_token(cgi_user_name(), cgi_user_pass(), form_name); ++ + ViewModeBoxes( mode ); + switch ( mode ) { + case 0: +Index: source3/web/swat_proto.h +=================================================================== +--- source3/web/swat_proto.h.orig ++++ source3/web/swat_proto.h +@@ -31,6 +31,7 @@ const char *cgi_variable(const char *nam + const char *cgi_variable_nonull(const char *name); + bool am_root(void); + char *cgi_user_name(void); ++char *cgi_user_pass(void); + void cgi_setup(const char *rootdir, int auth_required); + const char *cgi_baseurl(void); + const char *cgi_pathinfo(void); +@@ -66,5 +67,10 @@ void status_page(void); + /* The following definitions come from web/swat.c */ + + const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid); ++void get_xsrf_token(const char *username, const char *pass, ++ const char *formname, time_t xsrf_time, char token_str[33]); ++void print_xsrf_token(const char *username, const char *pass, ++ const char *formname); ++bool verify_xsrf_token(const char *formname); + + #endif /* _SWAT_PROTO_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/CVE-2011-2694.diff new/patches/samba.org/CVE-2011-2694.diff --- old/patches/samba.org/CVE-2011-2694.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/CVE-2011-2694.diff 2011-07-27 02:02:14.000000000 +0200 @@ -0,0 +1,47 @@ +From be65f08f70a4fdd2c58394ec4338aa175d7b8f3b Mon Sep 17 00:00:00 2001 +From: Kai Blin <kai(a)samba.org> +Date: Thu, 7 Jul 2011 10:03:33 +0200 +Subject: [PATCH 01/13] s3 swat: Fix possible XSS attack (bug #8289) + +Nobuhiro Tsuji of NTT DATA SECURITY CORPORATION reported a possible XSS attack +against SWAT, the Samba Web Administration Tool. The attack uses reflection to +insert arbitrary content into the "change password" page. + +This patch fixes the reflection issue by not printing user-specified content on +the website anymore. + +Signed-off-by: Kai Blin <kai(a)samba.org> + +Index: source3/web/swat.c +=================================================================== +--- source3/web/swat.c.orig ++++ source3/web/swat.c +@@ -1231,11 +1231,9 @@ static void chg_passwd(void) + if(cgi_variable(CHG_S_PASSWD_FLAG)) { + printf("<p>"); + if (rslt == True) { +- printf(_(" The passwd for '%s' has been changed."), cgi_variable_nonull(SWAT_USER)); +- printf("\n"); ++ printf("%s\n", _(" The passwd has been changed.")); + } else { +- printf(_(" The passwd for '%s' has NOT been changed."), cgi_variable_nonull(SWAT_USER)); +- printf("\n"); ++ printf("%s\n", _(" The passwd for has NOT been changed.")); + } + } + +@@ -1251,14 +1249,6 @@ static void passwd_page(void) + const char passwd_form[] = "passwd"; + const char rpasswd_form[] = "rpasswd"; + +- /* +- * After the first time through here be nice. If the user +- * changed the User box text to another users name, remember it. +- */ +- if (cgi_variable(SWAT_USER)) { +- new_name = cgi_variable_nonull(SWAT_USER); +- } +- + if (!new_name) new_name = ""; + + printf("<H2>%s</H2>\n", _("Server Password Management")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/a04c47b10758b6aa8035107e816dc7efac871646 new/patches/samba.org/a04c47b10758b6aa8035107e816dc7efac871646 --- old/patches/samba.org/a04c47b10758b6aa8035107e816dc7efac871646 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/a04c47b10758b6aa8035107e816dc7efac871646 2011-07-21 22:10:31.000000000 +0200 @@ -0,0 +1,24 @@ +commit a04c47b10758b6aa8035107e816dc7efac871646 +Author: Michael Adam <obnox(a)samba.org> +Date: Thu Dec 23 16:46:24 2010 +0100 + + s3:ctdb: samba can now handle the NOREPLY flag + + Revert "samba3 can't handle NOREPLY yet" + + This reverts commit 9bf211db6d7d6ef6e59508de69d6d8dfe5bae059. + +Index: source3/lib/ctdbd_conn.c +=================================================================== +--- source3/lib/ctdbd_conn.c.orig ++++ source3/lib/ctdbd_conn.c +@@ -732,9 +732,6 @@ static NTSTATUS ctdbd_control(struct ctd + struct ctdbd_connection *new_conn = NULL; + NTSTATUS status; + +- /* the samba3 ctdb code can't handle NOREPLY yet */ +- flags &= ~CTDB_CTRL_FLAG_NOREPLY; +- + if (conn == NULL) { + status = ctdbd_init_connection(NULL, &new_conn); + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/b807c58b655f1ffbf849f5de9eef66136bdb4a52 new/patches/samba.org/b807c58b655f1ffbf849f5de9eef66136bdb4a52 --- old/patches/samba.org/b807c58b655f1ffbf849f5de9eef66136bdb4a52 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/b807c58b655f1ffbf849f5de9eef66136bdb4a52 2011-07-21 22:10:31.000000000 +0200 @@ -0,0 +1,37 @@ +commit b807c58b655f1ffbf849f5de9eef66136bdb4a52 +Author: Björn Baumbach <bb(a)sernet.de> +Date: Tue Jul 12 17:32:55 2011 +0200 + + s3: dbwrap_ctdb.c: fix #ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION issue (bug #8303) + + Check for HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL instead of + CTDB_CONTROL_SCHEDULE_FOR_DELETION, which is an enum member and not a + define. + + Signed-off-by: Stefan Metzmacher <metze(a)samba.org> + + Autobuild-User: Stefan Metzmacher <metze(a)samba.org> + Autobuild-Date: Tue Jul 12 18:56:30 CEST 2011 on sn-devel-104 + +Index: source3/lib/dbwrap_ctdb.c +=================================================================== +--- source3/lib/dbwrap_ctdb.c.orig ++++ source3/lib/dbwrap_ctdb.c +@@ -879,7 +879,7 @@ static NTSTATUS db_ctdb_store(struct db_ + + + +-#ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION ++#ifdef HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL + static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec) + { + NTSTATUS status; +@@ -942,7 +942,7 @@ static NTSTATUS db_ctdb_delete(struct db + return status; + } + +-#ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION ++#ifdef HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL + status = db_ctdb_send_schedule_for_deletion(rec); + #endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/bda7d3134ecc547b9c174a04fd2d02813b06f038 new/patches/samba.org/bda7d3134ecc547b9c174a04fd2d02813b06f038 --- old/patches/samba.org/bda7d3134ecc547b9c174a04fd2d02813b06f038 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/bda7d3134ecc547b9c174a04fd2d02813b06f038 2011-07-21 22:10:31.000000000 +0200 @@ -0,0 +1,22 @@ +commit bda7d3134ecc547b9c174a04fd2d02813b06f038 +Author: Michael Adam <obnox(a)samba.org> +Date: Tue Mar 8 16:26:34 2011 +0100 + + s3:ctdb: pass the ctdb control flags to the ctdb daemon when sending the control + + The only flag that is currently used is the NOREPLY flag to indicate that + the client expects no reply packet. This needs to get passed down to the + ctdb daemon so that it really does not send a reply. + +Index: source3/lib/ctdbd_conn.c +=================================================================== +--- source3/lib/ctdbd_conn.c.orig ++++ source3/lib/ctdbd_conn.c +@@ -754,6 +754,7 @@ static NTSTATUS ctdbd_control(struct ctd + req.opcode = opcode; + req.srvid = srvid; + req.datalen = data.dsize; ++ req.flags = flags; + + DEBUG(10, ("ctdbd_control: Sending ctdb packet\n")); + ctdb_packet_dump(&req.hdr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/samba.org/c7655450f4c9784b700218628568c39e3528e9df new/patches/samba.org/c7655450f4c9784b700218628568c39e3528e9df --- old/patches/samba.org/c7655450f4c9784b700218628568c39e3528e9df 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/samba.org/c7655450f4c9784b700218628568c39e3528e9df 2011-07-21 22:10:31.000000000 +0200 @@ -0,0 +1,20 @@ +commit c7655450f4c9784b700218628568c39e3528e9df +Author: Michael Adam <obnox(a)samba.org> +Date: Thu Dec 23 16:43:55 2010 +0100 + + s3:ctdb: correctly handle cstatus if CTDB_CTRL_FLAG_NOREPLY is set. + +Index: source3/lib/ctdbd_conn.c +=================================================================== +--- source3/lib/ctdbd_conn.c.orig ++++ source3/lib/ctdbd_conn.c +@@ -780,6 +780,9 @@ static NTSTATUS ctdbd_control(struct ctd + + if (flags & CTDB_CTRL_FLAG_NOREPLY) { + TALLOC_FREE(new_conn); ++ if (cstatus) { ++ *cstatus = 0; ++ } + return NT_STATUS_OK; + } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2011-02-28 17:14:18.000000000 +0100 +++ new/patches/series 2011-07-27 02:04:52.000000000 +0200 @@ -13,6 +13,15 @@ samba.org/0afb2995a2177afa2eb7b8f99887a39cdaf23a15 -p0 # bso 7791, bnc 656112 samba.org/0c45b32bc7d93b03838405a97b054cb414267892 -p0 # bso 7835 samba.org/9c12232f1ae36e00d04114ad73edd8ba3c2c6a5c -p0 # bnc 666460 +samba.org/21576e3f8c32878910460bf9575c200ad93d682a -p0 # bnc 643119 +samba.org/1c579318ae2d2480ee4cc998443c0d1661b39846 -p0 # bnc 643787 +samba.org/c7655450f4c9784b700218628568c39e3528e9df -p0 # bnc 705170 +samba.org/a04c47b10758b6aa8035107e816dc7efac871646 -p0 # bnc 705170 +samba.org/bda7d3134ecc547b9c174a04fd2d02813b06f038 -p0 # bnc 705170 +samba.org/3a3c118a7edf679d6b545df035fd8d51b00e0830 -p0 # bnc 705170 +samba.org/b807c58b655f1ffbf849f5de9eef66136bdb4a52 -p0 # bnc 705170 +samba.org/CVE-2011-2522.diff -p0 # bnc 705241, bso 8290 +samba.org/CVE-2011-2694.diff -p0 # bnc 708503, bso 8289 # SuSE specific changes # disabled -> WIP lmuelle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/async_printcap_svc_update.diff new/patches/suse/async_printcap_svc_update.diff --- old/patches/suse/async_printcap_svc_update.diff 2011-02-28 17:13:48.000000000 +0100 +++ new/patches/suse/async_printcap_svc_update.diff 2011-07-27 02:07:07.000000000 +0200 @@ -217,7 +217,7 @@ =================================================================== --- source3/web/swat.c.orig +++ source3/web/swat.c -@@ -490,7 +490,7 @@ static int save_reload(int snum) +@@ -564,7 +564,7 @@ static int save_reload(int snum) return 0; } iNumNonAutoPrintServices = lp_numservices(); @@ -226,7 +226,7 @@ return 1; } -@@ -1434,7 +1434,7 @@ const char *lang_msg_rotate(TALLOC_CTX * +@@ -1547,7 +1547,7 @@ const char *lang_msg_rotate(TALLOC_CTX * load_config(True); load_interfaces(); iNumNonAutoPrintServices = lp_numservices(); ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2011-02-28 18:19:20.000000000 +0100 +++ new/vendor-files/tools/package-data 2011-07-27 13:36:37.000000000 +0200 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2505" +SAMBA_PACKAGE_SVN_VERSION="2573" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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