May 2011 - openSUSE Commits - openSUSE Mailing Lists

commit perl-Path-Class for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package perl-Path-Class for openSUSE:Factory checked in at Tue May 31 16:51:12 CEST 2011. -------- --- perl-Path-Class/perl-Path-Class.changes 2011-04-02 21:31:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/perl-Path-Class/perl-Path-Class.changes 2011-05-30 17:23:06.000000000 +0200 @@ -1,0 +2,11 @@ +Mon May 30 15:21:07 UTC 2011 - coolo(a)novell.com + +- updated to 0.24 + - Added a tempfile() method for Dir objects, which provides an + interface to File::Temp. [RT#60485] + + - Fixed a non-helpful fatal error message when calling resolve() on a + path that doesn't exist. Now dies with the proper "No such file or + directory" message & exit status. [GRAF] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Path-Class-0.23.tar.gz New: ---- Path-Class-0.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Path-Class.spec ++++++ --- /var/tmp/diff_new_pack.RSIUBX/_old 2011-05-31 16:49:56.000000000 +0200 +++ /var/tmp/diff_new_pack.RSIUBX/_new 2011-05-31 16:49:56.000000000 +0200 @@ -18,37 +18,19 @@ Name: perl-Path-Class -Version: 0.23 +Version: 0.24 Release: 1 License: GPL+ or Artistic %define cpan_name Path-Class Summary: Cross-platform path specification manipulation Url: http://search.cpan.org/dist/Path-Class/ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Path-Class-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl -BuildRequires: perl(Module::Build) BuildRequires: perl-macros -BuildRequires: perl(Cwd) -BuildRequires: perl(File::Path) -BuildRequires: perl(File::Spec) >= 0.87 -BuildRequires: perl(File::Spec::Mac) >= 1.3 -BuildRequires: perl(File::stat) -BuildRequires: perl(File::Temp) -BuildRequires: perl(IO::Dir) -BuildRequires: perl(IO::File) -BuildRequires: perl(overload) -Requires: perl(Cwd) -Requires: perl(File::Path) -Requires: perl(File::Spec) >= 0.87 -Requires: perl(File::Spec::Mac) >= 1.3 -Requires: perl(File::stat) -Requires: perl(IO::Dir) -Requires: perl(IO::File) -Requires: perl(overload) +BuildRequires: perl(Module::Build) >= 0.3601 %{perl_requires} %description @@ -63,6 +45,42 @@ way that won't actually work properly on platforms significantly different than the ones they've tested their code on. +In fact, 'Path::Class' uses 'File::Spec' internally, wrapping all the +unsightly details so you can concentrate on your application code. Whereas +'File::Spec' provides functions for some common path manipulations, +'Path::Class' provides an object-oriented model of the world of path +specifications and their underlying semantics. 'File::Spec' doesn't create +any objects, and its classes represent the different ways in which paths +must be manipulated on various platforms (not a very intuitive concept). +'Path::Class' creates objects representing files and directories, and +provides methods that relate them to each other. For instance, the +following 'File::Spec' code: + + my $absolute = File::Spec->file_name_is_absolute( + File::Spec->catfile( @dirs, $file ) + ); + +can be written using 'Path::Class' as + + my $absolute = Path::Class::File->new( @dirs, $file )->is_absolute; + +or even as + + my $absolute = file( @dirs, $file )->is_absolute; + +Similar readability improvements should happen all over the place when +using 'Path::Class'. + +Using 'Path::Class' can help solve real problems in your code too - for +instance, how many people actually take the "volume" (like 'C:' on Windows) +into account when writing 'File::Spec'-using code? I thought not. But if +you use 'Path::Class', your file and directory objects will know what +volumes they refer to and do the right thing. + +The guts of the 'Path::Class' code live in the 'Path::Class::File' and +'Path::Class::Dir' modules, so please see those modules' documentation for +more details about how to use them. + %prep %setup -q -n %{cpan_name}-%{version} @@ -81,7 +99,7 @@ %{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(644,root,root,755) -%doc Changes README +%defattr(-,root,root,755) +%doc Changes LICENSE README %changelog ++++++ Path-Class-0.23.tar.gz -> Path-Class-0.24.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/Build.PL new/Path-Class-0.24/Build.PL --- old/Path-Class-0.23/Build.PL 2010-12-26 20:42:56.000000000 +0100 +++ new/Path-Class-0.24/Build.PL 2011-05-29 03:53:45.000000000 +0200 @@ -1,34 +1,46 @@ -use Module::Build; +use strict; +use warnings; -my $b = Module::Build->new - ( - module_name => 'Path::Class', - license => 'perl', - requires => { - 'File::Spec' => 0.87, - 'File::Spec::Mac' => 1.3, - 'IO::Dir' => 0, - 'IO::File' => 0, - 'File::stat' => 0, - 'File::Path' => 0, - 'overload' => 0, - 'Cwd' => 0, - }, - build_requires => { - 'Test::More' => 0, - 'File::Temp' => 0, - }, - create_makefile_pl => 'traditional', - create_readme => 1, - meta_merge => { - resources => { - repository => 'http://perl-path-class.googlecode.com/svn/trunk', - homepage => 'http://code.google.com/p/perl-path-class', - bugtracker => 'http://rt.cpan.org/Public/Dist/Display.html?Name=Path-Class', - }, - }, - sign => 1, - ); +use Module::Build 0.3601; -$b->create_build_script; + +my %module_build_args = ( + 'build_requires' => { + 'Module::Build' => '0.3601', + 'Test' => '0', + 'Test::More' => '0' + }, + 'configure_requires' => { + 'ExtUtils::MakeMaker' => '6.30', + 'Module::Build' => '0.3601' + }, + 'dist_abstract' => 'Cross-platform path specification manipulation', + 'dist_author' => [ + 'Ken Williams <kwilliams(a)cpan.org>' + ], + 'dist_name' => 'Path-Class', + 'dist_version' => '0.24', + 'license' => 'perl', + 'module_name' => 'Path::Class', + 'recommends' => {}, + 'recursive_test_files' => 1, + 'requires' => { + 'Carp' => '0', + 'Cwd' => '0', + 'Exporter' => '0', + 'File::Path' => '0', + 'File::Spec' => '0.87', + 'File::Temp' => '0', + 'File::stat' => '0', + 'IO::Dir' => '0', + 'IO::File' => '0', + 'overload' => '0' + }, + 'script_files' => [] +); + + +my $build = Module::Build->new(%module_build_args); + +$build->create_build_script; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/Changes new/Path-Class-0.24/Changes --- old/Path-Class-0.23/Changes 2010-12-26 20:42:56.000000000 +0100 +++ new/Path-Class-0.24/Changes 2011-05-29 03:53:45.000000000 +0200 @@ -1,5 +1,14 @@ Revision history for Perl extension Path::Class. +0.24 Sat May 28 20:52:39 CDT 2011 + + - Added a tempfile() method for Dir objects, which provides an + interface to File::Temp. [RT#60485] + + - Fixed a non-helpful fatal error message when calling resolve() on a + path that doesn't exist. Now dies with the proper "No such file or + directory" message & exit status. [GRAF] + 0.23 - Sun Dec 26 13:35:53 CST 2010 - Fixed a bunch of problems with the distribution (e.g. in META.yml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/LICENSE new/Path-Class-0.24/LICENSE --- old/Path-Class-0.23/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/Path-Class-0.24/LICENSE 2011-05-29 03:53:45.000000000 +0200 @@ -0,0 +1,377 @@ +This software is copyright (c) 2011 by Ken Williams. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +Terms of the Perl programming language system itself + +a) the GNU General Public License as published by the Free + Software Foundation; either version 1, or (at your option) any + later version, or +b) the "Artistic License" + +--- The GNU General Public License, Version 1, February 1989 --- + +This software is Copyright (c) 2011 by Ken Williams. + +This is free software, licensed under: + + The GNU General Public License, Version 1, February 1989 + + GNU GENERAL PUBLIC LICENSE + Version 1, February 1989 + + Copyright (C) 1989 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The license agreements of most software companies try to keep users +at the mercy of those companies. By contrast, our 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. The +General Public License applies to the Free Software Foundation's +software and to any other program whose authors commit to using it. +You can use it for your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Specifically, the General Public License is designed to make +sure that you have the freedom to give away or sell copies of free +software, 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 a 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 tell them 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. + + 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 Agreement 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 work containing the +Program or a portion of it, either verbatim or with modifications. Each +licensee is addressed as "you". + + 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 +General Public License and to the absence of any warranty; and give any +other recipients of the Program a copy of this General Public License +along with the Program. You may charge a fee for the physical act of +transferring a copy. + + 2. You may modify your copy or copies of the Program or any portion of +it, and copy and distribute such modifications under the terms of Paragraph +1 above, provided that you also do the following: + + a) cause the modified files to carry prominent notices stating that + you changed the files and the date of any change; and + + b) cause the whole of any work that you distribute or publish, that + in whole or in part contains the Program or any part thereof, either + with or without modifications, to be licensed at no charge to all + third parties under the terms of this General Public License (except + that you may choose to grant warranty protection to some or all + third parties, at your option). + + c) If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use + in the simplest and most usual 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 General + Public License. + + d) 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. + +Mere aggregation of another independent work with the Program (or its +derivative) on a volume of a storage or distribution medium does not bring +the other work under the scope of these terms. + + 3. You may copy and distribute the Program (or a portion or derivative of +it, under Paragraph 2) in object code or executable form under the terms of +Paragraphs 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 + Paragraphs 1 and 2 above; or, + + b) accompany it with a written offer, valid for at least three + years, to give any third party free (except for a nominal charge + for the cost of distribution) a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of + Paragraphs 1 and 2 above; or, + + c) accompany it with the information you received as to where the + corresponding source code may be obtained. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form alone.) + +Source code for a work means the preferred form of the work for making +modifications to it. For an executable file, complete source code means +all the source code for all modules it contains; but, as a special +exception, it need not include source code for modules which are standard +libraries that accompany the operating system on which the executable +file runs, or for standard header files or definitions files that +accompany that operating system. + + 4. You may not copy, modify, sublicense, distribute or transfer the +Program except as expressly provided under this General Public License. +Any attempt otherwise to copy, modify, sublicense, distribute or transfer +the Program is void, and will automatically terminate your rights to use +the Program under this License. However, parties who have received +copies, or rights to use copies, from you under this General Public +License will not have their licenses terminated so long as such parties +remain in full compliance. + + 5. By copying, distributing or modifying 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. + + 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. + + 7. 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 the 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 +the license, you may choose any version ever published by the Free Software +Foundation. + + 8. 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 + + 9. 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. + + 10. 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 + + Appendix: 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 humanity, 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) 19yy <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 1, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19xx 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 a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + program `Gnomovision' (a program to direct compilers to make passes + at assemblers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +That's all there is to it! + + +--- The Artistic License 1.0 --- + +This software is Copyright (c) 2011 by Ken Williams. + +This is free software, licensed under: + + The Artistic License 1.0 + +The Artistic License + +Preamble + +The intent of this document is to state the conditions under which a Package +may be copied, such that the Copyright Holder maintains some semblance of +artistic control over the development of the package, while giving the users of +the package the right to use and distribute the Package in a more-or-less +customary fashion, plus the right to make reasonable modifications. + +Definitions: + + - "Package" refers to the collection of files distributed by the Copyright + Holder, and derivatives of that collection of files created through + textual modification. + - "Standard Version" refers to such a Package if it has not been modified, + or has been modified in accordance with the wishes of the Copyright + Holder. + - "Copyright Holder" is whoever is named in the copyright or copyrights for + the package. + - "You" is you, if you're thinking about copying or distributing this Package. + - "Reasonable copying fee" is whatever you can justify on the basis of media + cost, duplication charges, time of people involved, and so on. (You will + not be required to justify it to the Copyright Holder, but only to the + computing community at large as a market that must bear the fee.) + - "Freely Available" means that no fee is charged for the item itself, though + there may be fees involved in handling the item. It also means that + recipients of the item may redistribute it under the same conditions they + received it. + +1. You may make and give away verbatim copies of the source form of the +Standard Version of this Package without restriction, provided that you +duplicate all of the original copyright notices and associated disclaimers. + +2. You may apply bug fixes, portability fixes and other modifications derived +from the Public Domain or from the Copyright Holder. A Package modified in such +a way shall still be considered the Standard Version. + +3. You may otherwise modify your copy of this Package in any way, provided that +you insert a prominent notice in each changed file stating how and when you +changed that file, and provided that you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or an + equivalent medium, or placing the modifications on a major archive site + such as ftp.uu.net, or by allowing the Copyright Holder to include your + modifications in the Standard Version of the Package. + + b) use the modified Package only within your corporation or organization. + + c) rename any non-standard executables so the names do not conflict with + standard executables, which must also be provided, and provide a separate + manual page for each non-standard executable that clearly documents how it + differs from the Standard Version. + + d) make other distribution arrangements with the Copyright Holder. + +4. You may distribute the programs of this Package in object code or executable +form, provided that you do at least ONE of the following: + + a) distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on where to + get the Standard Version. + + b) accompany the distribution with the machine-readable source of the Package + with your modifications. + + c) accompany any non-standard executables with their corresponding Standard + Version executables, giving the non-standard executables non-standard + names, and clearly documenting the differences in manual pages (or + equivalent), together with instructions on where to get the Standard + Version. + + d) make other distribution arrangements with the Copyright Holder. + +5. You may charge a reasonable copying fee for any distribution of this +Package. You may charge any fee you choose for support of this Package. You +may not charge a fee for this Package itself. However, you may distribute this +Package in aggregate with other (possibly commercial) programs as part of a +larger (possibly commercial) software distribution provided that you do not +advertise this Package as a product of your own. + +6. The scripts and library files supplied as input to or produced as output +from the programs of this Package do not automatically fall under the copyright +of this Package, but belong to whomever generated them, and may be sold +commercially, and may be aggregated with this Package. + +7. C or perl subroutines supplied by you and linked into this Package shall not +be considered part of this Package. + +8. The name of the Copyright Holder may not be used to endorse or promote +products derived from this software without specific prior written permission. + +9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +The End + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/MANIFEST new/Path-Class-0.24/MANIFEST --- old/Path-Class-0.23/MANIFEST 2010-12-26 20:42:56.000000000 +0100 +++ new/Path-Class-0.24/MANIFEST 2011-05-29 03:53:45.000000000 +0200 @@ -1,6 +1,7 @@ Build.PL Changes INSTALL +LICENSE MANIFEST META.yml Makefile.PL @@ -15,4 +16,4 @@ t/02-foreign.t t/03-filesystem.t t/04-subclass.t -t/file-spec-tests +t/author-critic.t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/META.yml new/Path-Class-0.24/META.yml --- old/Path-Class-0.23/META.yml 2010-12-26 20:42:56.000000000 +0100 +++ new/Path-Class-0.24/META.yml 2011-05-29 03:53:45.000000000 +0200 @@ -3,22 +3,26 @@ author: - 'Ken Williams <kwilliams(a)cpan.org>' build_requires: - File::Temp: 0 + Module::Build: 0.3601 + Test: 0 Test::More: 0 configure_requires: - ExtUtils::MakeMaker: 6.31 + ExtUtils::MakeMaker: 6.30 + Module::Build: 0.3601 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.200000, CPAN::Meta::Converter version 2.102400' +generated_by: 'Dist::Zilla version 4.200006, CPAN::Meta::Converter version 2.102400' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 name: Path-Class requires: + Carp: 0 Cwd: 0 + Exporter: 0 File::Path: 0 File::Spec: 0.87 - File::Spec::Mac: 1.3 + File::Temp: 0 File::stat: 0 IO::Dir: 0 IO::File: 0 @@ -26,4 +30,4 @@ resources: bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Path-Class repository: http://perl-path-class.googlecode.com/svn/trunk -version: 0.23 +version: 0.24 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/Makefile.PL new/Path-Class-0.24/Makefile.PL --- old/Path-Class-0.23/Makefile.PL 2010-12-26 20:42:56.000000000 +0100 +++ new/Path-Class-0.24/Makefile.PL 2011-05-29 03:53:45.000000000 +0200 @@ -4,7 +4,7 @@ -use ExtUtils::MakeMaker 6.31; +use ExtUtils::MakeMaker 6.30; @@ -12,27 +12,31 @@ 'ABSTRACT' => 'Cross-platform path specification manipulation', 'AUTHOR' => 'Ken Williams <kwilliams(a)cpan.org>', 'BUILD_REQUIRES' => { - 'File::Temp' => '0', + 'Module::Build' => '0.3601', + 'Test' => '0', 'Test::More' => '0' }, 'CONFIGURE_REQUIRES' => { - 'ExtUtils::MakeMaker' => '6.31' + 'ExtUtils::MakeMaker' => '6.30', + 'Module::Build' => '0.3601' }, 'DISTNAME' => 'Path-Class', 'EXE_FILES' => [], 'LICENSE' => 'perl', 'NAME' => 'Path::Class', 'PREREQ_PM' => { + 'Carp' => '0', 'Cwd' => '0', + 'Exporter' => '0', 'File::Path' => '0', 'File::Spec' => '0.87', - 'File::Spec::Mac' => '1.3', + 'File::Temp' => '0', 'File::stat' => '0', 'IO::Dir' => '0', 'IO::File' => '0', 'overload' => '0' }, - 'VERSION' => '0.23', + 'VERSION' => '0.24', 'test' => { 'TESTS' => 't/*.t' } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/README new/Path-Class-0.24/README --- old/Path-Class-0.23/README 2010-12-26 20:42:56.000000000 +0100 +++ new/Path-Class-0.24/README 2011-05-29 03:53:45.000000000 +0200 @@ -1,127 +1,13 @@ -NAME - Path::Class - Cross-platform path specification manipulation -SYNOPSIS - use Path::Class; - - my $dir = dir('foo', 'bar'); # Path::Class::Dir object - my $file = file('bob', 'file.txt'); # Path::Class::File object - - # Stringifies to 'foo/bar' on Unix, 'foo\bar' on Windows, etc. - print "dir: $dir\n"; - - # Stringifies to 'bob/file.txt' on Unix, 'bob\file.txt' on Windows - print "file: $file\n"; - - my $subdir = $dir->subdir('baz'); # foo/bar/baz - my $parent = $subdir->parent; # foo/bar - my $parent2 = $parent->parent; # foo - - my $dir2 = $file->dir; # bob - - # Work with foreign paths - use Path::Class qw(foreign_file foreign_dir); - my $file = foreign_file('Mac', ':foo:file.txt'); - print $file->dir; # :foo: - print $file->as_foreign('Win32'); # foo\file.txt - - # Interact with the underlying filesystem: - - # $dir_handle is an IO::Dir object - my $dir_handle = $dir->open or die "Can't read $dir: $!"; - - # $file_handle is an IO::File object - my $file_handle = $file->open($mode) or die "Can't read $file: $!"; - -DESCRIPTION - `Path::Class' is a module for manipulation of file and directory - specifications (strings describing their locations, like - `'/home/ken/foo.txt'' or `'C:\Windows\Foo.txt'') in a cross-platform - manner. It supports pretty much every platform Perl runs on, including - Unix, Windows, Mac, VMS, Epoc, Cygwin, OS/2, and NetWare. - - The well-known module `File::Spec' also provides this service, but it's - sort of awkward to use well, so people sometimes avoid it, or use it in - a way that won't actually work properly on platforms significantly - different than the ones they've tested their code on. - - In fact, `Path::Class' uses `File::Spec' internally, wrapping all the - unsightly details so you can concentrate on your application code. - Whereas `File::Spec' provides functions for some common path - manipulations, `Path::Class' provides an object-oriented model of the - world of path specifications and their underlying semantics. - `File::Spec' doesn't create any objects, and its classes represent the - different ways in which paths must be manipulated on various platforms - (not a very intuitive concept). `Path::Class' creates objects - representing files and directories, and provides methods that relate - them to each other. For instance, the following `File::Spec' code: - - my $absolute = File::Spec->file_name_is_absolute( - File::Spec->catfile( @dirs, $file ) - ); - - can be written using `Path::Class' as - - my $absolute = Path::Class::File->new( @dirs, $file )->is_absolute; - - or even as - - my $absolute = file( @dirs, $file )->is_absolute; - - Similar readability improvements should happen all over the place when - using `Path::Class'. - - Using `Path::Class' can help solve real problems in your code too - for - instance, how many people actually take the "volume" (like `C:' on - Windows) into account when writing `File::Spec'-using code? I thought - not. But if you use `Path::Class', your file and directory objects will - know what volumes they refer to and do the right thing. - - The guts of the `Path::Class' code live in the `Path::Class::File' and - `Path::Class::Dir' modules, so please see those modules' documentation - for more details about how to use them. - - EXPORT - - The following functions are exported by default. - - file - A synonym for `Path::Class::File->new'. - - dir A synonym for `Path::Class::Dir->new'. - - If you would like to prevent their export, you may explicitly pass an - empty list to perl's `use', i.e. `use Path::Class ()'. - - The following are exported only on demand. - - foreign_file - A synonym for `Path::Class::File->new_foreign'. - - foreign_dir - A synonym for `Path::Class::Dir->new_foreign'. - -Notes on Cross-Platform Compatibility - Although it is much easier to write cross-platform-friendly code with - this module than with `File::Spec', there are still some issues to be - aware of. - - * Some platforms, notably VMS and some older versions of DOS (I - think), all filenames must have an extension. Thus if you create a - file called foo/bar and then ask for a list of files in the - directory foo, you may find a file called bar. instead of the bar - you were expecting. Thus it might be a good idea to use an extension - in the first place. - -AUTHOR - Ken Williams, KWILLIAMS(a)cpan.org -COPYRIGHT - Copyright (c) Ken Williams. All rights reserved. +This archive contains the distribution Path-Class, +version 0.24: - This library is free software; you can redistribute it and/or modify it - under the same terms as Perl itself. + Cross-platform path specification manipulation + +This software is copyright (c) 2011 by Ken Williams. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. -SEE ALSO - Path::Class::Dir, Path::Class::File, File::Spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/SIGNATURE new/Path-Class-0.24/SIGNATURE --- old/Path-Class-0.23/SIGNATURE 2010-12-26 20:42:59.000000000 +0100 +++ new/Path-Class-0.24/SIGNATURE 2011-05-29 03:53:52.000000000 +0200 @@ -14,27 +14,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -SHA1 3e94b50826015fe7ac1e769cadd656b53317d4ab Build.PL -SHA1 1923d4e05cce842d978a78536a958388a3675873 Changes +SHA1 ea792bf52b566bff462a76a5d4d50433e0b527ea Build.PL +SHA1 247c8647d187a81327719ee36cf6d4f9703db733 Changes SHA1 066a2dba8084a0c2a7e4b6996ad21872bc16beb5 INSTALL -SHA1 f4f533d5ba595558e925934701b6a624c1ae263a MANIFEST -SHA1 8d450b38f6346a82944f17f0b25be8c8d2a49df7 META.yml -SHA1 c56ae13703aa3a30404e13a4b321818fc865b8f2 Makefile.PL -SHA1 a7b1cdcddb8679dff993b475939abcfb73076afb README -SHA1 b40373e05544adc4447c5fad2509368fc6213b03 dist.ini -SHA1 e3b4393203382a6a4194a6ec852942f8898c8a61 lib/Path/Class.pm -SHA1 1aa682b45c70d04aecc6ba2b9cf7402650abbf5a lib/Path/Class/Dir.pm -SHA1 16c0113abd50b90bb9aa739fa5ee4b549e0ffbe1 lib/Path/Class/Entity.pm -SHA1 0ea60757f1483cb4287adcdf33c4c8233ba3fd90 lib/Path/Class/File.pm +SHA1 da0b89eff79e9d5128ab28d63e099b840cca39bf LICENSE +SHA1 52cb7d3f48ff3c95c8459535d1bd6e123ec44501 MANIFEST +SHA1 fb09dac402763a91c50f3e1949a51813f509afdb META.yml +SHA1 ce72ebc3d68832477effb18bc248d92211874f14 Makefile.PL +SHA1 243b575c9d7769d2cfd29c189ec2be8c883c4ece README +SHA1 a6ebbb825cd8d9c406a02ac08f3b7680d5d285f2 dist.ini +SHA1 07aaa412631cc8e6ea4276b3f3ea1fffbe5065f5 lib/Path/Class.pm +SHA1 8d6415121b20b7a701290105646ac48f0f691b5b lib/Path/Class/Dir.pm +SHA1 0549c1d2150621445a31f7688b2f5a878bb662f2 lib/Path/Class/Entity.pm +SHA1 8193c8bd639e4e5c01bbaf4f173970fa3a992507 lib/Path/Class/File.pm SHA1 212c128d87fa012c36016210e6e9213112fc3c23 t/01-basic.t SHA1 a42f4b07e4c42e7a59b960b13c5466d7cd82e17a t/02-foreign.t SHA1 ff702cdbf0bb4c25959cbc5a5c7db17772b7aa5b t/03-filesystem.t SHA1 a163d4cf70142b45974ed39c78571e7ce2ba5a7f t/04-subclass.t -SHA1 2c32aa5691540466533ae7c06753160f020818e9 t/file-spec-tests +SHA1 fa45d6e6ab1cd421349dea4ef527bfd5cdc8a09e t/author-critic.t -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (Darwin) -iD8DBQFNF5rDgrvMBLfvlHYRAvbMAJ98sj5UZ5yLj0FkiXyu7P/NHq0vGACgnry1 -iuQgkpeJgSCL7Ljh0hfJRcQ= -=Fky1 +iD8DBQFN4acwgrvMBLfvlHYRAmIXAKC4w/k04B/Pm3pj3AUHDLUBxEKmFgCgpr+J +vFWvOuqcL5jRV9XPXUxGOCI= +=+Fzk -----END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/dist.ini new/Path-Class-0.24/dist.ini --- old/Path-Class-0.23/dist.ini 2010-12-26 20:42:56.000000000 +0100 +++ new/Path-Class-0.24/dist.ini 2011-05-29 03:53:45.000000000 +0200 @@ -1,37 +1,25 @@ name = Path-Class -version = 0.23 +version = 0.24 author = Ken Williams <kwilliams(a)cpan.org> license = Perl_5 copyright_holder = Ken Williams -[GatherDir] +[@Basic] [PkgVersion] [PodVersion] -[TestRelease] -[ConfirmRelease] -[UploadToCPAN] - -[MetaYAML] -[MakeMaker] -[PruneCruft] -[Manifest] -[Signature] +[PruneFiles] +match = ~$ +match = ^Path-Class +[Signature] [Bugtracker] [Repository] +[ModuleBuild] + +[CriticTests] +;[PodCoverageTests] -[Prereqs] -File::Spec = 0.87 -File::Spec::Mac = 1.3 -IO::Dir = 0 -IO::File = 0 -File::stat = 0 -File::Path = 0 -overload = 0 -Cwd = 0 - -[Prereqs / TestRequires] -Test::More = 0 -File::Temp = 0 +[AutoPrereqs] +skip = ^English$ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/lib/Path/Class/Dir.pm new/Path-Class-0.24/lib/Path/Class/Dir.pm --- old/Path-Class-0.23/lib/Path/Class/Dir.pm 2010-12-26 20:42:56.000000000 +0100 +++ new/Path-Class-0.24/lib/Path/Class/Dir.pm 2011-05-29 03:53:45.000000000 +0200 @@ -1,15 +1,17 @@ +use strict; + package Path::Class::Dir; BEGIN { - $Path::Class::Dir::VERSION = '0.23'; + $Path::Class::Dir::VERSION = '0.24'; } -use strict; use Path::Class::File; use Carp(); use base qw(Path::Class::Entity); use IO::Dir (); use File::Path (); +use File::Temp (); # updir & curdir on the local machine, for screening them out in # children(). Note that they don't respect 'foreign' semantics. @@ -207,6 +209,7 @@ my $next = $self->{dh}->read; unless (defined $next) { delete $self->{dh}; + ## no critic return undef; } @@ -254,6 +257,11 @@ return !!(-d $self and (-e $other or -l $other) and $self->subsumes($other)); } +sub tempfile { + my $self = shift; + return File::Temp::tempfile(@_, DIR => $self->stringify); +} + 1; __END__ @@ -263,7 +271,7 @@ =head1 VERSION -version 0.23 +version 0.24 =head1 SYNOPSIS @@ -590,6 +598,37 @@ This method is mainly provided for consistency with C<Path::Class::File>'s C<remove()> method. +=item $dir->tempfile(...) + +An interface to C<File::Temp>'s C<tempfile()> function. Just like +that function, if you call this in a scalar context, the return value +is the filehandle and the file is C<unlink>ed as soon as possible +(which is immediately on Unix-like platforms). If called in a list +context, the return values are the filehandle and the filename. + +The given directory is passed as the C<DIR> parameter. + +Here's an example of pretty good usage which doesn't allow race +conditions, won't leave yucky tempfiles around on your filesystem, +etc.: + + my $fh = $dir->tempfile; + print $fh "Here's some data...\n"; + seek($fh, 0, 0); + while (<$fh>) { do something... } + +Or in combination with a C<fork>: + + my $fh = $dir->tempfile; + print $fh "Here's some more data...\n"; + seek($fh, 0, 0); + if ($pid=fork()) { + wait; + } else { + something($_) while <$fh>; + } + + =item $dir_or_file = $dir->next() A convenient way to iterate through directory contents. The first diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/lib/Path/Class/Entity.pm new/Path-Class-0.24/lib/Path/Class/Entity.pm --- old/Path-Class-0.23/lib/Path/Class/Entity.pm 2010-12-26 20:42:56.000000000 +0100 +++ new/Path-Class-0.24/lib/Path/Class/Entity.pm 2011-05-29 03:53:45.000000000 +0200 @@ -1,10 +1,11 @@ +use strict; + package Path::Class::Entity; BEGIN { - $Path::Class::Entity::VERSION = '0.23'; + $Path::Class::Entity::VERSION = '0.24'; } -use strict; -use File::Spec; +use File::Spec 0.87; use File::stat (); use Cwd; @@ -30,6 +31,7 @@ die "Invalid system type '$type'" unless ($type) = $type =~ /^(\w+)$/; # Untaint my $spec = "File::Spec::$type"; + ## no critic eval "require $spec; 1" or die $@; return $spec; } @@ -61,7 +63,8 @@ sub resolve { my $self = shift; - my $cleaned = $self->new( Cwd::realpath($self->stringify) ); + die $! unless -e $self; # No such file or directory + my $cleaned = $self->new( scalar Cwd::realpath($self->stringify) ); # realpath() always returns absolute path, kind of annoying $cleaned = $cleaned->relative if $self->is_relative; @@ -93,7 +96,7 @@ =head1 VERSION -version 0.23 +version 0.24 =head1 DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/lib/Path/Class/File.pm new/Path-Class-0.24/lib/Path/Class/File.pm --- old/Path-Class-0.23/lib/Path/Class/File.pm 2010-12-26 20:42:56.000000000 +0100 +++ new/Path-Class-0.24/lib/Path/Class/File.pm 2011-05-29 03:53:45.000000000 +0200 @@ -1,9 +1,10 @@ +use strict; + package Path::Class::File; BEGIN { - $Path::Class::File::VERSION = '0.23'; + $Path::Class::File::VERSION = '0.24'; } -use strict; use Path::Class::Dir; use base qw(Path::Class::Entity); use Carp; @@ -103,7 +104,7 @@ =head1 VERSION -version 0.23 +version 0.24 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/lib/Path/Class.pm new/Path-Class-0.24/lib/Path/Class.pm --- old/Path-Class-0.23/lib/Path/Class.pm 2010-12-26 20:42:56.000000000 +0100 +++ new/Path-Class-0.24/lib/Path/Class.pm 2011-05-29 03:53:45.000000000 +0200 @@ -1,13 +1,18 @@ +use strict; + package Path::Class; BEGIN { - $Path::Class::VERSION = '0.23'; + $Path::Class::VERSION = '0.24'; } -@ISA = qw(Exporter); -@EXPORT = qw(file dir); -@EXPORT_OK = qw(file dir foreign_file foreign_dir); +{ + ## no critic + no strict 'vars'; + @ISA = qw(Exporter); + @EXPORT = qw(file dir); + @EXPORT_OK = qw(file dir foreign_file foreign_dir); +} -use strict; use Exporter; use Path::Class::File; use Path::Class::Dir; @@ -27,7 +32,7 @@ =head1 VERSION -version 0.23 +version 0.24 =head1 SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/t/author-critic.t new/Path-Class-0.24/t/author-critic.t --- old/Path-Class-0.23/t/author-critic.t 1970-01-01 01:00:00.000000000 +0100 +++ new/Path-Class-0.24/t/author-critic.t 2011-05-29 03:53:45.000000000 +0200 @@ -0,0 +1,20 @@ +#!perl + +BEGIN { + unless ($ENV{AUTHOR_TESTING}) { + require Test::More; + Test::More::plan(skip_all => 'these tests are for testing by the author'); + } +} + + +use strict; +use warnings; + +use Test::More; +use English qw(-no_match_vars); + +eval "use Test::Perl::Critic"; +plan skip_all => 'Test::Perl::Critic required to criticise code' if $@; +Test::Perl::Critic->import( -profile => "perlcritic.rc" ) if -e "perlcritic.rc"; +all_critic_ok(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Path-Class-0.23/t/file-spec-tests new/Path-Class-0.24/t/file-spec-tests --- old/Path-Class-0.23/t/file-spec-tests 2010-12-26 20:42:56.000000000 +0100 +++ new/Path-Class-0.24/t/file-spec-tests 1970-01-01 01:00:00.000000000 +0100 @@ -1,379 +0,0 @@ -#!./perl - -BEGIN { - $^O = ''; -#chdir 't' if -d 't'; -#unshift @INC, '../lib'; -} - -# Each element in this array is a single test. Storing them this way makes -# maintenance easy, and should be OK since perl should be pretty functional -# before these tests are run. - -@tests = ( -# Function Expected -[ "Unix->catfile('a','b','c')", 'a/b/c' ], - -[ "Unix->splitpath('file')", ',,file' ], -[ "Unix->splitpath('/d1/d2/d3/')", ',/d1/d2/d3/,' ], -[ "Unix->splitpath('d1/d2/d3/')", ',d1/d2/d3/,' ], -[ "Unix->splitpath('/d1/d2/d3/.')", ',/d1/d2/d3/.,' ], -[ "Unix->splitpath('/d1/d2/d3/..')", ',/d1/d2/d3/..,' ], -[ "Unix->splitpath('/d1/d2/d3/.file')", ',/d1/d2/d3/,.file' ], -[ "Unix->splitpath('d1/d2/d3/file')", ',d1/d2/d3/,file' ], -[ "Unix->splitpath('/../../d1/')", ',/../../d1/,' ], -[ "Unix->splitpath('/././d1/')", ',/././d1/,' ], - -[ "Unix->catpath('','','file')", 'file' ], -[ "Unix->catpath('','/d1/d2/d3/','')", '/d1/d2/d3/' ], -[ "Unix->catpath('','d1/d2/d3/','')", 'd1/d2/d3/' ], -[ "Unix->catpath('','/d1/d2/d3/.','')", '/d1/d2/d3/.' ], -[ "Unix->catpath('','/d1/d2/d3/..','')", '/d1/d2/d3/..' ], -[ "Unix->catpath('','/d1/d2/d3/','.file')", '/d1/d2/d3/.file' ], -[ "Unix->catpath('','d1/d2/d3/','file')", 'd1/d2/d3/file' ], -[ "Unix->catpath('','/../../d1/','')", '/../../d1/' ], -[ "Unix->catpath('','/././d1/','')", '/././d1/' ], -[ "Unix->catpath('d1','d2/d3/','')", 'd2/d3/' ], -[ "Unix->catpath('d1','d2','d3/')", 'd2/d3/' ], - -[ "Unix->splitdir('')", '' ], -[ "Unix->splitdir('/d1/d2/d3/')", ',d1,d2,d3,' ], -[ "Unix->splitdir('d1/d2/d3/')", 'd1,d2,d3,' ], -[ "Unix->splitdir('/d1/d2/d3')", ',d1,d2,d3' ], -[ "Unix->splitdir('d1/d2/d3')", 'd1,d2,d3' ], - -[ "Unix->catdir()", '' ], -[ "Unix->catdir('/')", '/' ], -[ "Unix->catdir('','d1','d2','d3','')", '/d1/d2/d3' ], -[ "Unix->catdir('d1','d2','d3','')", 'd1/d2/d3' ], -[ "Unix->catdir('','d1','d2','d3')", '/d1/d2/d3' ], -[ "Unix->catdir('d1','d2','d3')", 'd1/d2/d3' ], - -[ "Unix->catfile('a','b','c')", 'a/b/c' ], - -[ "Unix->canonpath('')", '' ], -[ "Unix->canonpath('///../../..//./././a//b/.././c/././')", '/a/b/../c' ], -[ "Unix->canonpath('/.')", '/.' ], - -[ "Unix->abs2rel('/t1/t2/t3','/t1/t2/t3')", '' ], -[ "Unix->abs2rel('/t1/t2/t4','/t1/t2/t3')", '../t4' ], -[ "Unix->abs2rel('/t1/t2','/t1/t2/t3')", '..' ], -[ "Unix->abs2rel('/t1/t2/t3/t4','/t1/t2/t3')", 't4' ], -[ "Unix->abs2rel('/t4/t5/t6','/t1/t2/t3')", '../../../t4/t5/t6' ], -#[ "Unix->abs2rel('../t4','/t1/t2/t3')", '../t4' ], -[ "Unix->abs2rel('/','/t1/t2/t3')", '../../..' ], -[ "Unix->abs2rel('///','/t1/t2/t3')", '../../..' ], -[ "Unix->abs2rel('/.','/t1/t2/t3')", '../../../.' ], -[ "Unix->abs2rel('/./','/t1/t2/t3')", '../../..' ], -#[ "Unix->abs2rel('../t4','/t1/t2/t3')", '../t4' ], - -[ "Unix->rel2abs('t4','/t1/t2/t3')", '/t1/t2/t3/t4' ], -[ "Unix->rel2abs('t4/t5','/t1/t2/t3')", '/t1/t2/t3/t4/t5' ], -[ "Unix->rel2abs('.','/t1/t2/t3')", '/t1/t2/t3' ], -[ "Unix->rel2abs('..','/t1/t2/t3')", '/t1/t2/t3/..' ], -[ "Unix->rel2abs('../t4','/t1/t2/t3')", '/t1/t2/t3/../t4' ], -[ "Unix->rel2abs('/t1','/t1/t2/t3')", '/t1' ], - -[ "Win32->splitpath('file')", ',,file' ], -[ "Win32->splitpath('\\d1/d2\\d3/')", ',\\d1/d2\\d3/,' ], -[ "Win32->splitpath('d1/d2\\d3/')", ',d1/d2\\d3/,' ], -[ "Win32->splitpath('\\d1/d2\\d3/.')", ',\\d1/d2\\d3/.,' ], -[ "Win32->splitpath('\\d1/d2\\d3/..')", ',\\d1/d2\\d3/..,' ], -[ "Win32->splitpath('\\d1/d2\\d3/.file')", ',\\d1/d2\\d3/,.file' ], -[ "Win32->splitpath('\\d1/d2\\d3/file')", ',\\d1/d2\\d3/,file' ], -[ "Win32->splitpath('d1/d2\\d3/file')", ',d1/d2\\d3/,file' ], -[ "Win32->splitpath('C:\\d1/d2\\d3/')", 'C:,\\d1/d2\\d3/,' ], -[ "Win32->splitpath('C:d1/d2\\d3/')", 'C:,d1/d2\\d3/,' ], -[ "Win32->splitpath('C:\\d1/d2\\d3/file')", 'C:,\\d1/d2\\d3/,file' ], -[ "Win32->splitpath('C:d1/d2\\d3/file')", 'C:,d1/d2\\d3/,file' ], -[ "Win32->splitpath('C:\\../d2\\d3/file')", 'C:,\\../d2\\d3/,file' ], -[ "Win32->splitpath('C:../d2\\d3/file')", 'C:,../d2\\d3/,file' ], -[ "Win32->splitpath('\\../..\\d1/')", ',\\../..\\d1/,' ], -[ "Win32->splitpath('\\./.\\d1/')", ',\\./.\\d1/,' ], -[ "Win32->splitpath('\\\\node\\share\\d1/d2\\d3/')", '\\\\node\\share,\\d1/d2\\d3/,' ], -[ "Win32->splitpath('\\\\node\\share\\d1/d2\\d3/file')", '\\\\node\\share,\\d1/d2\\d3/,file' ], -[ "Win32->splitpath('\\\\node\\share\\d1/d2\\file')", '\\\\node\\share,\\d1/d2\\,file' ], -[ "Win32->splitpath('file',1)", ',file,' ], -[ "Win32->splitpath('\\d1/d2\\d3/',1)", ',\\d1/d2\\d3/,' ], -[ "Win32->splitpath('d1/d2\\d3/',1)", ',d1/d2\\d3/,' ], -[ "Win32->splitpath('\\\\node\\share\\d1/d2\\d3/',1)", '\\\\node\\share,\\d1/d2\\d3/,' ], - -[ "Win32->catpath('','','file')", 'file' ], -[ "Win32->catpath('','\\d1/d2\\d3/','')", '\\d1/d2\\d3/' ], -[ "Win32->catpath('','d1/d2\\d3/','')", 'd1/d2\\d3/' ], -[ "Win32->catpath('','\\d1/d2\\d3/.','')", '\\d1/d2\\d3/.' ], -[ "Win32->catpath('','\\d1/d2\\d3/..','')", '\\d1/d2\\d3/..' ], -[ "Win32->catpath('','\\d1/d2\\d3/','.file')", '\\d1/d2\\d3/.file' ], -[ "Win32->catpath('','\\d1/d2\\d3/','file')", '\\d1/d2\\d3/file' ], -[ "Win32->catpath('','d1/d2\\d3/','file')", 'd1/d2\\d3/file' ], -[ "Win32->catpath('C:','\\d1/d2\\d3/','')", 'C:\\d1/d2\\d3/' ], -[ "Win32->catpath('C:','d1/d2\\d3/','')", 'C:d1/d2\\d3/' ], -[ "Win32->catpath('C:','\\d1/d2\\d3/','file')", 'C:\\d1/d2\\d3/file' ], -[ "Win32->catpath('C:','d1/d2\\d3/','file')", 'C:d1/d2\\d3/file' ], -[ "Win32->catpath('C:','\\../d2\\d3/','file')", 'C:\\../d2\\d3/file' ], -[ "Win32->catpath('C:','../d2\\d3/','file')", 'C:../d2\\d3/file' ], -[ "Win32->catpath('','\\../..\\d1/','')", '\\../..\\d1/' ], -[ "Win32->catpath('','\\./.\\d1/','')", '\\./.\\d1/' ], -[ "Win32->catpath('\\\\node\\share','\\d1/d2\\d3/','')", '\\\\node\\share\\d1/d2\\d3/' ], -[ "Win32->catpath('\\\\node\\share','\\d1/d2\\d3/','file')", '\\\\node\\share\\d1/d2\\d3/file' ], -[ "Win32->catpath('\\\\node\\share','\\d1/d2\\','file')", '\\\\node\\share\\d1/d2\\file' ], - -[ "Win32->splitdir('')", '' ], -[ "Win32->splitdir('\\d1/d2\\d3/')", ',d1,d2,d3,' ], -[ "Win32->splitdir('d1/d2\\d3/')", 'd1,d2,d3,' ], -[ "Win32->splitdir('\\d1/d2\\d3')", ',d1,d2,d3' ], -[ "Win32->splitdir('d1/d2\\d3')", 'd1,d2,d3' ], - -[ "Win32->catdir()", '' ], -[ "Win32->catdir('')", '\\' ], -[ "Win32->catdir('/')", '\\' ], -[ "Win32->catdir('//d1','d2')", '\\\\d1\\d2' ], -[ "Win32->catdir('','/d1','d2')", '\\\\d1\\d2' ], -[ "Win32->catdir('','','/d1','d2')", '\\\\\\d1\\d2' ], -[ "Win32->catdir('','//d1','d2')", '\\\\\\d1\\d2' ], -[ "Win32->catdir('','','//d1','d2')", '\\\\\\\\d1\\d2' ], -[ "Win32->catdir('','d1','','d2','')", '\\d1\\d2' ], -[ "Win32->catdir('','d1','d2','d3','')", '\\d1\\d2\\d3' ], -[ "Win32->catdir('d1','d2','d3','')", 'd1\\d2\\d3' ], -[ "Win32->catdir('','d1','d2','d3')", '\\d1\\d2\\d3' ], -[ "Win32->catdir('d1','d2','d3')", 'd1\\d2\\d3' ], -[ "Win32->catdir('A:/d1','d2','d3')", 'A:\\d1\\d2\\d3' ], -[ "Win32->catdir('A:/d1','d2','d3','')", 'A:\\d1\\d2\\d3' ], -#[ "Win32->catdir('A:/d1','B:/d2','d3','')", 'A:\\d1\\d2\\d3' ], -[ "Win32->catdir('A:/d1','B:/d2','d3','')", 'A:\\d1\\B:\\d2\\d3' ], -[ "Win32->catdir('A:/')", 'A:\\' ], - -[ "Win32->catfile('a','b','c')", 'a\\b\\c' ], - -[ "Win32->canonpath('')", '' ], -[ "Win32->canonpath('a:')", 'A:' ], -[ "Win32->canonpath('A:f')", 'A:f' ], -[ "Win32->canonpath('//a\\b//c')", '\\\\a\\b\\c' ], -[ "Win32->canonpath('/a/..../c')", '\\a\\....\\c' ], -[ "Win32->canonpath('//a/b\\c')", '\\\\a\\b\\c' ], -[ "Win32->canonpath('////')", '\\\\\\' ], -[ "Win32->canonpath('//')", '\\' ], -[ "Win32->canonpath('/.')", '\\.' ], -[ "Win32->canonpath('//a/b/../../c')", '\\\\a\\b\\..\\..\\c' ], -[ "Win32->canonpath('//a/../../c')", '\\\\a\\..\\..\\c' ], - -[ "Win32->abs2rel('/t1/t2/t3','/t1/t2/t3')", '' ], -[ "Win32->abs2rel('/t1/t2/t4','/t1/t2/t3')", '..\\t4' ], -[ "Win32->abs2rel('/t1/t2','/t1/t2/t3')", '..' ], -[ "Win32->abs2rel('/t1/t2/t3/t4','/t1/t2/t3')", 't4' ], -[ "Win32->abs2rel('/t4/t5/t6','/t1/t2/t3')", '..\\..\\..\\t4\\t5\\t6' ], -#[ "Win32->abs2rel('../t4','/t1/t2/t3')", '\\t1\\t2\\t3\\..\\t4' ], -[ "Win32->abs2rel('/','/t1/t2/t3')", '..\\..\\..' ], -[ "Win32->abs2rel('///','/t1/t2/t3')", '..\\..\\..' ], -[ "Win32->abs2rel('/.','/t1/t2/t3')", '..\\..\\..\\.' ], -[ "Win32->abs2rel('/./','/t1/t2/t3')", '..\\..\\..' ], -[ "Win32->abs2rel('\\\\a/t1/t2/t4','/t2/t3')", '..\\t4' ], -[ "Win32->abs2rel('//a/t1/t2/t4','/t2/t3')", '..\\t4' ], - -[ "Win32->rel2abs('temp','C:/')", 'C:\\temp' ], -[ "Win32->rel2abs('temp','C:/a')", 'C:\\a\\temp' ], -[ "Win32->rel2abs('temp','C:/a/')", 'C:\\a\\temp' ], -[ "Win32->rel2abs('../','C:/')", 'C:\\..' ], -[ "Win32->rel2abs('../','C:/a')", 'C:\\a\\..' ], -[ "Win32->rel2abs('temp','//prague_main/work/')", '\\\\prague_main\\work\\temp' ], -[ "Win32->rel2abs('../temp','//prague_main/work/')", '\\\\prague_main\\work\\..\\temp' ], -[ "Win32->rel2abs('temp','//prague_main/work')", '\\\\prague_main\\work\\temp' ], -[ "Win32->rel2abs('../','//prague_main/work')", '\\\\prague_main\\work\\..' ], - -[ "VMS->splitpath('file')", ',,file' ], -[ "VMS->splitpath('[d1.d2.d3]')", ',[d1.d2.d3],' ], -[ "VMS->splitpath('[.d1.d2.d3]')", ',[.d1.d2.d3],' ], -[ "VMS->splitpath('[d1.d2.d3]file')", ',[d1.d2.d3],file' ], -[ "VMS->splitpath('d1/d2/d3/file')", ',[.d1.d2.d3],file' ], -[ "VMS->splitpath('/d1/d2/d3/file')", 'd1:,[d2.d3],file' ], -[ "VMS->splitpath('[.d1.d2.d3]file')", ',[.d1.d2.d3],file' ], -[ "VMS->splitpath('node::volume:[d1.d2.d3]')", 'node::volume:,[d1.d2.d3],' ], -[ "VMS->splitpath('node::volume:[d1.d2.d3]file')", 'node::volume:,[d1.d2.d3],file' ], -[ "VMS->splitpath('node\"access_spec\"::volume:[d1.d2.d3]')", 'node"access_spec"::volume:,[d1.d2.d3],' ], -[ "VMS->splitpath('node\"access_spec\"::volume:[d1.d2.d3]file')", 'node"access_spec"::volume:,[d1.d2.d3],file' ], - -[ "VMS->catpath('','','file')", 'file' ], -[ "VMS->catpath('','[d1.d2.d3]','')", '[d1.d2.d3]' ], -[ "VMS->catpath('','[.d1.d2.d3]','')", '[.d1.d2.d3]' ], -[ "VMS->catpath('','[d1.d2.d3]','file')", '[d1.d2.d3]file' ], -[ "VMS->catpath('','[.d1.d2.d3]','file')", '[.d1.d2.d3]file' ], -[ "VMS->catpath('','d1/d2/d3','file')", '[.d1.d2.d3]file' ], -[ "VMS->catpath('v','d1/d2/d3','file')", 'v:[.d1.d2.d3]file' ], -[ "VMS->catpath('node::volume:','[d1.d2.d3]','')", 'node::volume:[d1.d2.d3]' ], -[ "VMS->catpath('node::volume:','[d1.d2.d3]','file')", 'node::volume:[d1.d2.d3]file' ], -[ "VMS->catpath('node\"access_spec\"::volume:','[d1.d2.d3]','')", 'node"access_spec"::volume:[d1.d2.d3]' ], -[ "VMS->catpath('node\"access_spec\"::volume:','[d1.d2.d3]','file')", 'node"access_spec"::volume:[d1.d2.d3]file' ], - -[ "VMS->canonpath('')", '' ], -[ "VMS->canonpath('volume:[d1]file')", 'volume:[d1]file' ], -[ "VMS->canonpath('volume:[d1.-.d2.][d3.d4.-]')", 'volume:[d2.d3]' ], -[ "VMS->canonpath('volume:[000000.d1]d2.dir;1')", 'volume:[d1]d2.dir;1' ], - -[ "VMS->splitdir('')", '' ], -[ "VMS->splitdir('[]')", '' ], -[ "VMS->splitdir('d1.d2.d3')", 'd1,d2,d3' ], -[ "VMS->splitdir('[d1.d2.d3]')", 'd1,d2,d3' ], -[ "VMS->splitdir('.d1.d2.d3')", ',d1,d2,d3' ], -[ "VMS->splitdir('[.d1.d2.d3]')", ',d1,d2,d3' ], -[ "VMS->splitdir('.-.d2.d3')", ',-,d2,d3' ], -[ "VMS->splitdir('[.-.d2.d3]')", ',-,d2,d3' ], - -[ "VMS->catdir('')", '' ], -[ "VMS->catdir('d1','d2','d3')", '[.d1.d2.d3]' ], -[ "VMS->catdir('d1','d2/','d3')", '[.d1.d2.d3]' ], -[ "VMS->catdir('','d1','d2','d3')", '[.d1.d2.d3]' ], -[ "VMS->catdir('','-','d2','d3')", '[-.d2.d3]' ], -[ "VMS->catdir('','-','','d3')", '[-.d3]' ], -[ "VMS->catdir('dir.dir','d2.dir','d3.dir')", '[.dir.d2.d3]' ], -[ "VMS->catdir('[.name]')", '[.name]' ], -[ "VMS->catdir('[.name]','[.name]')", '[.name.name]'], - -[ "VMS->abs2rel('node::volume:[t1.t2.t3]','[t1.t2.t3]')", '' ], -[ "VMS->abs2rel('node::volume:[t1.t2.t4]','[t1.t2.t3]')", '[-.t4]' ], -[ "VMS->abs2rel('[t1.t2.t3]','[t1.t2.t3]')", '' ], -[ "VMS->abs2rel('[t1.t2.t3]file','[t1.t2.t3]')", 'file' ], -[ "VMS->abs2rel('[t1.t2.t4]','[t1.t2.t3]')", '[-.t4]' ], -[ "VMS->abs2rel('[t1.t2]file','[t1.t2.t3]')", '[-]file' ], -[ "VMS->abs2rel('[t1.t2.t3.t4]','[t1.t2.t3]')", '[t4]' ], -[ "VMS->abs2rel('[t4.t5.t6]','[t1.t2.t3]')", '[---.t4.t5.t6]' ], -[ "VMS->abs2rel('[000000]','[t1.t2.t3]')", '[---.000000]' ], -[ "VMS->abs2rel('a:[t1.t2.t4]','[t1.t2.t3]')", '[-.t4]' ], -[ "VMS->abs2rel('[a.-.b.c.-]','[t1.t2.t3]')", '[---.b]' ], - -[ "VMS->rel2abs('[.t4]','[t1.t2.t3]')", '[t1.t2.t3.t4]' ], -[ "VMS->rel2abs('[.t4.t5]','[t1.t2.t3]')", '[t1.t2.t3.t4.t5]' ], -[ "VMS->rel2abs('[]','[t1.t2.t3]')", '[t1.t2.t3]' ], -[ "VMS->rel2abs('[-]','[t1.t2.t3]')", '[t1.t2]' ], -[ "VMS->rel2abs('[-.t4]','[t1.t2.t3]')", '[t1.t2.t4]' ], -[ "VMS->rel2abs('[t1]','[t1.t2.t3]')", '[t1]' ], - -[ "OS2->catdir('A:/d1','B:/d2','d3','')", 'A:/d1/B:/d2/d3' ], -[ "OS2->catfile('a','b','c')", 'a/b/c' ], - -[ "Mac->splitpath('file')", ',,file' ], -[ "Mac->splitpath(':file')", ',:,file' ], -[ "Mac->splitpath(':d1',1)", ',:d1:,' ], -[ "Mac->splitpath('d1',1)", 'd1:,,' ], -[ "Mac->splitpath('d1:d2:d3:')", 'd1:,d2:d3:,' ], -[ "Mac->splitpath('d1:d2:d3',1)", 'd1:,d2:d3:,' ], -[ "Mac->splitpath(':d1:d2:d3:')", ',:d1:d2:d3:,' ], -[ "Mac->splitpath(':d1:d2:d3:',1)", ',:d1:d2:d3:,' ], -[ "Mac->splitpath('d1:d2:d3:file')", 'd1:,d2:d3:,file' ], -[ "Mac->splitpath('d1:d2:d3',1)", 'd1:,d2:d3:,' ], - -[ "Mac->catdir('')", ':' ], -[ "Mac->catdir('d1','d2','d3')", 'd1:d2:d3:' ], -[ "Mac->catdir('d1','d2/','d3')", 'd1:d2/:d3:' ], -[ "Mac->catdir('','d1','d2','d3')", ':d1:d2:d3:' ], -[ "Mac->catdir('','','d2','d3')", '::d2:d3:' ], -[ "Mac->catdir('','','','d3')", ':::d3:' ], -[ "Mac->catdir(':name')", ':name:' ], -[ "Mac->catdir(':name',':name')", ':name:name:' ], - -[ "Mac->catfile('a','b','c')", 'a:b:c' ], - -[ "Mac->canonpath('')", '' ], -[ "Mac->canonpath(':')", ':' ], -[ "Mac->canonpath('::')", '::' ], -[ "Mac->canonpath('a::')", 'a::' ], -[ "Mac->canonpath(':a::')", ':a::' ], - -[ "Mac->abs2rel('t1:t2:t3','t1:t2:t3')", ':' ], -[ "Mac->abs2rel('t1:t2','t1:t2:t3')", '::' ], -[ "Mac->abs2rel('t1:t4','t1:t2:t3')", ':::t4' ], -[ "Mac->abs2rel('t1:t2:t4','t1:t2:t3')", '::t4' ], -[ "Mac->abs2rel('t1:t2:t3:t4','t1:t2:t3')", ':t4' ], -[ "Mac->abs2rel('t4:t5:t6','t1:t2:t3')", '::::t4:t5:t6' ], -[ "Mac->abs2rel('t1','t1:t2:t3')", ':::' ], - -[ "Mac->rel2abs(':t4','t1:t2:t3')", 't1:t2:t3:t4' ], -[ "Mac->rel2abs(':t4:t5','t1:t2:t3')", 't1:t2:t3:t4:t5' ], -[ "Mac->rel2abs('','t1:t2:t3')", '' ], -[ "Mac->rel2abs('::','t1:t2:t3')", 't1:t2:t3::' ], -[ "Mac->rel2abs('::t4','t1:t2:t3')", 't1:t2:t3::t4' ], -[ "Mac->rel2abs('t1','t1:t2:t3')", 't1' ], -) ; - -# Grab all of the plain routines from File::Spec -use File::Spec @File::Spec::EXPORT_OK ; - -require File::Spec::Unix ; -require File::Spec::Win32 ; - -eval { - require VMS::Filespec ; -} ; - -my $skip_exception = "Install VMS::Filespec (from vms/ext)" ; - -if ( $@ ) { - # Not pretty, but it allows testing of things not implemented soley - # on VMS. It might be better to change File::Spec::VMS to do this, - # making it more usable when running on (say) Unix but working with - # VMS paths. - eval qq- - sub File::Spec::VMS::vmsify { die "$skip_exception" } - sub File::Spec::VMS::unixify { die "$skip_exception" } - sub File::Spec::VMS::vmspath { die "$skip_exception" } - - ; - $INC{"VMS/Filespec.pm"} = 1 ; -} -require File::Spec::VMS ; - -require File::Spec::OS2 ; -require File::Spec::Mac ; - -print "1..", scalar( @tests ), "\n" ; - -my $current_test= 1 ; - -# Test out the class methods -for ( @tests ) { - tryfunc( @$_ ) ; -} - - - -# -# Tries a named function with the given args and compares the result against -# an expected result. Works with functions that return scalars or arrays. -# -sub tryfunc { - my $function = shift ; - my $expected = shift ; - my $platform = shift ; - - if ($platform && $^O ne $platform) { - print "ok $current_test # skipped: $function\n" ; - ++$current_test ; - return; - } - - $function =~ s#\\#\\\\#g ; - - my $got ; - if ( $function =~ /^[^\$].*->/ ) { - $got = eval( "join( ',', File::Spec::$function )" ) ; - } - else { - $got = eval( "join( ',', $function )" ) ; - } - - if ( $@ ) { - if ( substr( $@, 0, length $skip_exception ) eq $skip_exception ) { - chomp $@ ; - print "ok $current_test # skip $function: $@\n" ; - } - else { - chomp $@ ; - print "not ok $current_test # $function: $@\n" ; - } - } - elsif ( !defined( $got ) || $got ne $expected ) { - print "not ok $current_test # $function: got '$got', expected '$expected'\n" ; - } - else { - print "ok $current_test # $function\n" ; - } - ++$current_test ; -} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-Test-CPAN-Meta for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package perl-Test-CPAN-Meta for openSUSE:Factory checked in at Tue May 31 16:49:48 CEST 2011. -------- --- perl-Test-CPAN-Meta/perl-Test-CPAN-Meta.changes 2011-01-21 21:32:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Test-CPAN-Meta/perl-Test-CPAN-Meta.changes 2011-04-30 17:32:52.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Apr 30 15:25:11 UTC 2011 - coolo(a)opensuse.org + +- updated to 0.18 + - documentation clean up + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Test-CPAN-Meta-0.17.tar.bz2 New: ---- Test-CPAN-Meta-0.18.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Test-CPAN-Meta.spec ++++++ --- /var/tmp/diff_new_pack.QXcB5P/_old 2011-05-31 16:47:42.000000000 +0200 +++ /var/tmp/diff_new_pack.QXcB5P/_new 2011-05-31 16:47:42.000000000 +0200 @@ -18,23 +18,25 @@ Name: perl-Test-CPAN-Meta -Version: 0.17 +Version: 0.18 Release: 1 License: GPL+ or Artistic %define cpan_name Test-CPAN-Meta Summary: Validation of the META.yml file in a CPAN distribution. Url: http://search.cpan.org/dist/Test-CPAN-Meta/ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/B/BA/BARBIE/Test-CPAN-Meta-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.bz2 -BuildRequires: perl(Test::Pod) >= 1.00 -BuildRequires: perl(Test::Pod::Coverage) >= 0.08 +Source: http://www.cpan.org/authors/id/B/BA/BARBIE/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -Requires: perl(Test::Pod) >= 1.00 -Requires: perl(Test::Pod::Coverage) >= 0.08 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildRequires: perl(Parse::CPAN::Meta) >= 0.02 +BuildRequires: perl(Test::More) >= 0.70 +Requires: perl(Parse::CPAN::Meta) >= 0.02 +Requires: perl(Test::More) >= 0.7 +Recommends: perl(Test::More) >= 0.70 +Recommends: perl(Test::Pod) >= 1.00 +Recommends: perl(Test::Pod::Coverage) >= 0.08 %{perl_requires} %description @@ -44,6 +46,9 @@ and installers such as the ExtUtils::MakeMaker manpage, the Module::Build manpage and the Module::Install manpage. +See the CPAN::Meta manpage for further details of the CPAN Meta +Specification. + %prep %setup -q -n %{cpan_name}-%{version} @@ -63,7 +68,7 @@ %{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(644,root,root,755) -%doc Artistic Changes LICENSE README +%defattr(-,root,root,755) +%doc Changes examples LICENSE README %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-Test-Command for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package perl-Test-Command for openSUSE:Factory checked in at Tue May 31 16:47:33 CEST 2011. -------- --- perl-Test-Command/perl-Test-Command.changes 2011-01-22 20:53:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Test-Command/perl-Test-Command.changes 2011-05-30 17:25:34.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 30 15:25:02 UTC 2011 - coolo(a)novell.com + +- regenerate with newest cpanspec + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- Test-Command-0.08.tar.bz2 New: ---- Test-Command-0.08.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Test-Command.spec ++++++ --- /var/tmp/diff_new_pack.smOutP/_old 2011-05-31 16:46:18.000000000 +0200 +++ /var/tmp/diff_new_pack.smOutP/_new 2011-05-31 16:46:18.000000000 +0200 @@ -19,19 +19,18 @@ Name: perl-Test-Command Version: 0.08 -Release: 1 +Release: 3 License: GPL+ or Artistic %define cpan_name Test-Command Summary: Test routines for external commands Url: http://search.cpan.org/dist/Test-Command/ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/D/DA/DANBOO/Test-Command-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.bz2 +Source: http://www.cpan.org/authors/id/D/DA/DANBOO/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Module::Build) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch %{perl_requires} %description @@ -99,7 +98,7 @@ %{__rm} -rf %{buildroot} %files -f %{name}.files -%defattr(644,root,root,755) +%defattr(-,root,root,755) %doc Changes README %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pitivi for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package pitivi for openSUSE:Factory checked in at Tue May 31 16:41:22 CEST 2011. -------- --- GNOME/pitivi/pitivi.changes 2011-02-14 20:34:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/pitivi/pitivi.changes 2011-05-27 17:58:09.000000000 +0200 @@ -1,0 +2,24 @@ +Fri May 27 17:27:25 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 0.13.9.90: + + Audio and video effects + + Completely redesigned project settings dialog, with the ability + to create presets + + Completely redesigned rendering dialog + + Welcome dialog that helps you start a project or load recent + projects in two clicks + + Ability to preview video, audio and image files before + importing + + Add a "best fit" zoom button + + Ability to jump to an exact position in the timeline + + Ability to specify custom aspect ratios and framerates + + Show a progress bar when loading projects + + 300% faster project timeline loading + + Search bar in the Media Library + + Ability to detach all the tabs and the previewer + + New manpage + + Commandline render mode + + Use the standard infobar widget all around + + Lots of bug fixing. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pitivi-0.13.5.tar.bz2 New: ---- pitivi-0.13.9.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pitivi.spec ++++++ --- /var/tmp/diff_new_pack.mUMmrB/_old 2011-05-31 16:41:06.000000000 +0200 +++ /var/tmp/diff_new_pack.mUMmrB/_new 2011-05-31 16:41:06.000000000 +0200 @@ -18,8 +18,8 @@ Name: pitivi -Version: 0.13.5 -Release: 9 +Version: 0.13.9.90 +Release: 1 License: LGPLv2.1+ Summary: Intuitive and featureful movie editor Url: http://www.pitivi.org/ @@ -99,6 +99,7 @@ %{_datadir}/icons/hicolor/*/apps/pitivi.svg %{_datadir}/mime/packages/pitivi.xml %{_datadir}/pitivi/ +%{_mandir}/man1/pitivi.1%{?ext_man} %files lang -f %{name}.lang ++++++ pitivi-0.13.5.tar.bz2 -> pitivi-0.13.9.90.tar.bz2 ++++++ ++++ 82764 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pure-ftpd for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package pure-ftpd for openSUSE:Factory checked in at Tue May 31 16:40:59 CEST 2011. -------- --- pure-ftpd/pure-ftpd.changes 2011-04-11 14:04:58.000000000 +0200 +++ /mounts/work_src_done/STABLE/pure-ftpd/pure-ftpd.changes 2011-05-28 00:47:08.000000000 +0200 @@ -1,0 +2,22 @@ +Fri May 27 22:23:06 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 1.0.32: + - Support SHA1 password hashing in MySQL and PostgreSQL backends + - Support for braces expansion in directory listings has been + disabled - Cf. CVE-2011-0418 +- Aditional changes FROM 1.0.31: + - Introduce --tlsciphersuite (-J) to set the list of allowed ciphers, + thanks to Todd Rinaldo. + - The -F switch has been documented in the built-in help. + - Shell-like escaping is now partially handled when emulating the "ls" + command. + - Use my_make_scrambled_password() instead of make_scrambled_password(). + Suggested by Arkadiusz Miskiewicz. +- Refresh and fix patch for [bnc#407363]: + - old: patch pure-ftpd-1.0.22-default_tcp_sedrcv_buffer_size.patch + - new: patch pure-ftpd-1.0.32-default_tcp_sedrcv_buffer_size.patch +- Refresh PassivePortRange patch: + - old: pure-ftpd-1.0.21-portrange.patch + - new: pure-ftpd-1.0.32-portrange.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- pure-ftpd-1.0.21-portrange.patch pure-ftpd-1.0.22-default_tcp_sedrcv_buffer_size.patch pure-ftpd-1.0.30.tar.gz New: ---- pure-ftpd-1.0.32-default_tcp_sedrcv_buffer_size.patch pure-ftpd-1.0.32-portrange.patch pure-ftpd-1.0.32.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pure-ftpd.spec ++++++ --- /var/tmp/diff_new_pack.niK61e/_old 2011-05-31 16:40:24.000000000 +0200 +++ /var/tmp/diff_new_pack.niK61e/_new 2011-05-31 16:40:24.000000000 +0200 @@ -20,13 +20,13 @@ %define with_oes 0 Name: pure-ftpd -Version: 1.0.30 +Version: 1.0.32 Release: 1 License: BSD3c Summary: A Lightweight, Fast, and Secure FTP Server Url: http://www.pureftpd.org Group: Productivity/Networking/Ftp/Servers -Source: ftp://ftp.pureftpd.org/pub/%{name}/releases/%{name}-%version.tar.gz +Source: ftp://ftp.pureftpd.org/pub/%{name}/releases/%{name}-%version.tar.bz2 Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.xinetd @@ -39,9 +39,10 @@ # PATCH-FEATURE-OPENSUSE %{name}-1.0.20_virtualhosts.patch -- Custom VHOST_PATH on openSUSE. Patch2: %{name}-1.0.20_virtualhosts.patch Patch5: %{name}-1.0.20_ftpwho_path.patch -Patch7: %{name}-1.0.22-default_tcp_sedrcv_buffer_size.patch -# PATCH-FEATURE-OPENSUSE %{name}-1.0.21-portrange.patch -- Add PassivePortRange to "%numpairc_switch_for". -Patch8: %{name}-1.0.21-portrange.patch +# PATCH-FIX-UPSTREAM %{name}-1.0.32-default_tcp_sedrcv_buffer_size.patch +Patch7: %{name}-1.0.32-default_tcp_sedrcv_buffer_size.patch +# PATCH-FEATURE-OPENSUSE %{name}-1.0.32-portrange.patch -- Add PassivePortRange to "%numpairc_switch_for". +Patch8: %{name}-1.0.32-portrange.patch # OES patches - see %with_oes Patch100: %{name}-1.0.20-oes_remote_server.patch Patch101: pure-ftpd-1.0.22-oes-bugfix-534424.patch ++++++ pure-ftpd-1.0.22-default_tcp_sedrcv_buffer_size.patch -> pure-ftpd-1.0.32-default_tcp_sedrcv_buffer_size.patch ++++++ --- pure-ftpd/pure-ftpd-1.0.22-default_tcp_sedrcv_buffer_size.patch 2011-04-11 14:04:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/pure-ftpd/pure-ftpd-1.0.32-default_tcp_sedrcv_buffer_size.patch 2011-05-28 00:47:03.000000000 +0200 @@ -1,21 +1,17 @@ Index: configure =================================================================== ---- configure.orig 2010-12-30 11:42:52.000000000 +0100 -+++ configure 2011-04-11 13:55:41.566322096 +0200 -@@ -23271,163 +23271,12 @@ - echo "${ECHO_T}no" >&6; } +--- configure.orig ++++ configure +@@ -11160,107 +11160,12 @@ else + $as_echo "no" >&6; } fi --{ echo "$as_me:$LINENO: checking default TCP send buffer size" >&5 --echo $ECHO_N "checking default TCP send buffer size... $ECHO_C" >&6; } --if test "$cross_compiling" = yes; then +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default TCP send buffer size" >&5 +-$as_echo_n "checking default TCP send buffer size... " >&6; } +-if test "$cross_compiling" = yes; then : - CONF_TCP_SO_SNDBUF=65536 -else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <stdio.h> @@ -44,41 +40,17 @@ -} - -_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then +-if ac_fn_c_try_run "$LINENO"; then : - CONF_TCP_SO_SNDBUF=`cat conftestval` -else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --CONF_TCP_SO_SNDBUF=65536 +- CONF_TCP_SO_SNDBUF=65536 -fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -- --{ echo "$as_me:$LINENO: result: $CONF_TCP_SO_SNDBUF" >&5 --echo "${ECHO_T}$CONF_TCP_SO_SNDBUF" >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_TCP_SO_SNDBUF" >&5 +-$as_echo "$CONF_TCP_SO_SNDBUF" >&6; } - - cat >>confdefs.h <<_ACEOF @@ -87,16 +59,12 @@ _ACEOF - --{ echo "$as_me:$LINENO: checking default TCP receive buffer size" >&5 --echo $ECHO_N "checking default TCP receive buffer size... $ECHO_C" >&6; } --if test "$cross_compiling" = yes; then +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default TCP receive buffer size" >&5 +-$as_echo_n "checking default TCP receive buffer size... " >&6; } +-if test "$cross_compiling" = yes; then : - CONF_TCP_SO_RCVBUF=65536 -else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <stdio.h> @@ -125,46 +93,22 @@ -} - -_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then +-if ac_fn_c_try_run "$LINENO"; then : - CONF_TCP_SO_RCVBUF=`cat conftestval` -else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --CONF_TCP_SO_RCVBUF=65536 +- CONF_TCP_SO_RCVBUF=65536 -fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -- --{ echo "$as_me:$LINENO: result: $CONF_TCP_SO_RCVBUF" >&5 --echo "${ECHO_T}$CONF_TCP_SO_RCVBUF" >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_TCP_SO_RCVBUF" >&5 +-$as_echo "$CONF_TCP_SO_RCVBUF" >&6; } - - cat >>confdefs.h <<_ACEOF -#define CONF_TCP_SO_RCVBUF $CONF_TCP_SO_RCVBUF -+#define CONF_TCP_SO_RCVBUF 65563 ++#define CONF_TCP_SO_RCVBUF 65536 _ACEOF ++++++ pure-ftpd-1.0.21-portrange.patch -> pure-ftpd-1.0.32-portrange.patch ++++++ --- pure-ftpd/pure-ftpd-1.0.21-portrange.patch 2010-01-12 10:38:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/pure-ftpd/pure-ftpd-1.0.32-portrange.patch 2011-05-28 00:47:04.000000000 +0200 @@ -2,17 +2,17 @@ =================================================================== --- configuration-file/pure-config.pl.in.orig +++ configuration-file/pure-config.pl.in -@@ -80,9 +80,10 @@ my %numpairb_switch_for = ( +@@ -81,9 +81,10 @@ my %numpairb_switch_for = ( ); my %numpairc_switch_for = ( -- Umask => "-U", -- Quota => "-n", -- PerUserLimits => "-y", -+ Umask => "-U", -+ Quota => "-n", -+ PerUserLimits => "-y", -+ PassivePortRange => "-p", +- Umask => "-U", +- Quota => "-n", +- PerUserLimits => "-y", ++ Umask => "-U", ++ Quota => "-n", ++ PerUserLimits => "-y", ++ PassivePortRange => "-p", ); my %auth_method_for = ( ++++++ pure-ftpd-1.0.30.tar.gz -> pure-ftpd-1.0.32.tar.bz2 ++++++ ++++ 38108 lines of diff (skipped) ++++ retrying with extended exclude list Files old/pure-ftpd-1.0.30/._AUTHORS and new/pure-ftpd-1.0.32/._AUTHORS differ Files old/pure-ftpd-1.0.30/._FAQ and new/pure-ftpd-1.0.32/._FAQ differ Files old/pure-ftpd-1.0.30/._INSTALL and new/pure-ftpd-1.0.32/._INSTALL differ Files old/pure-ftpd-1.0.30/._Makefile.in and new/pure-ftpd-1.0.32/._Makefile.in differ Files old/pure-ftpd-1.0.30/._README and new/pure-ftpd-1.0.32/._README differ Files old/pure-ftpd-1.0.30/._README.Authentication-Modules and new/pure-ftpd-1.0.32/._README.Authentication-Modules differ Files old/pure-ftpd-1.0.30/._README.Donations and new/pure-ftpd-1.0.32/._README.Donations differ Files old/pure-ftpd-1.0.30/._README.LDAP and new/pure-ftpd-1.0.32/._README.LDAP differ Files old/pure-ftpd-1.0.30/._README.MySQL and new/pure-ftpd-1.0.32/._README.MySQL differ Files old/pure-ftpd-1.0.30/._README.PGSQL and new/pure-ftpd-1.0.32/._README.PGSQL differ Files old/pure-ftpd-1.0.30/._README.TLS and new/pure-ftpd-1.0.32/._README.TLS differ Files old/pure-ftpd-1.0.30/._README.Virtual-Users and new/pure-ftpd-1.0.32/._README.Virtual-Users differ Files old/pure-ftpd-1.0.30/._THANKS and new/pure-ftpd-1.0.32/._THANKS differ Files old/pure-ftpd-1.0.30/._aclocal.m4 and new/pure-ftpd-1.0.32/._aclocal.m4 differ Files old/pure-ftpd-1.0.30/._config.h.in and new/pure-ftpd-1.0.32/._config.h.in differ Files old/pure-ftpd-1.0.30/._configure and new/pure-ftpd-1.0.32/._configure differ Files old/pure-ftpd-1.0.30/._configure.ac and new/pure-ftpd-1.0.32/._configure.ac differ Files old/pure-ftpd-1.0.30/._depcomp and new/pure-ftpd-1.0.32/._depcomp differ Files old/pure-ftpd-1.0.30/._install-sh and new/pure-ftpd-1.0.32/._install-sh differ Files old/pure-ftpd-1.0.30/._missing and new/pure-ftpd-1.0.32/._missing differ Files old/pure-ftpd-1.0.30/._pure-ftpd.spec and new/pure-ftpd-1.0.32/._pure-ftpd.spec differ Files old/pure-ftpd-1.0.30/._pure-ftpd.spec.in and new/pure-ftpd-1.0.32/._pure-ftpd.spec.in differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/AUTHORS new/pure-ftpd-1.0.32/AUTHORS --- old/pure-ftpd-1.0.30/AUTHORS 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/AUTHORS 2011-04-17 17:05:54.000000000 +0200 @@ -319,6 +319,10 @@ LDAP authentication through binding. +* Todd E Rinaldino / Cpanel + + -J option (set allowed ciphers for SSL/TLS). + * Frank DENIS aka Jedi/Sector One <j <at> pureftpd.org> : Pure-FTPd project initiator and maintainer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/ChangeLog new/pure-ftpd-1.0.32/ChangeLog --- old/pure-ftpd-1.0.30/ChangeLog 2011-03-08 00:00:56.000000000 +0100 +++ new/pure-ftpd-1.0.32/ChangeLog 2011-05-02 04:31:45.000000000 +0200 @@ -1,4 +1,18 @@ +* Version 1.0.32: + - Support SHA1 password hashing in MySQL and PostgreSQL backends + - Support for braces expansion in directory listings has been +disabled - Cf. CVE-2011-0418 + +* Version 1.0.31: + - Introduce --tlsciphersuite (-J) to set the list of allowed ciphers, +thanks to Todd Rinaldo. + - The -F switch has been documented in the built-in help. + - Shell-like escaping is now partially handled when emulating the "ls" +command. + - Use my_make_scrambled_password() instead of make_scrambled_password(). +Suggested by Arkadiusz Miskiewicz. + * Version 1.0.30: - Use malloc() instead of an ever-growing stack in pure-quotacheck. Fixes quota computation on a large number of files. Problem initially diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/NEWS new/pure-ftpd-1.0.32/NEWS --- old/pure-ftpd-1.0.30/NEWS 2011-03-08 00:15:32.000000000 +0100 +++ new/pure-ftpd-1.0.32/NEWS 2011-05-02 04:32:00.000000000 +0200 @@ -1,4 +1,16 @@ +* Version 1.0.32: + - Support SHA1 password hashing in MySQL and PostgreSQL backends + - Support for braces expansion in directory listings has been +disabled - Cf. CVE-2011-0418 + +* Version 1.0.31: + - The list of allowed ciphers for SSL/TLS connections can now be +specified (--tlsciphersuite / -J). + - Shell-like escaping is now partially handled when emulating the +"ls" command in order to improve compatibility with legacy clients. + - Linking issues with MySQL support on Fedora have been solved. + * Version 1.0.30: - pure-quotacheck can now work with a large number of files. - OPTS UTF-8 is now an alias to OPTS UTF8. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/README new/pure-ftpd-1.0.32/README --- old/pure-ftpd-1.0.30/README 2011-01-23 00:54:35.000000000 +0100 +++ new/pure-ftpd-1.0.32/README 2011-05-02 03:22:54.000000000 +0200 @@ -1,6 +1,6 @@ .:. PURE-FTPD .:. - Documentation for version 1.0.30 + Documentation for version 1.0.32 ------------------------ BLURB ------------------------ @@ -750,6 +750,10 @@ because with that feature, he'll be able to create/chown directories anywhere on the server's filesystem. +- '-J <ciphers>': Sets the list of ciphers that will be accepted for +SSL/TLS connections. +For example: -J HIGH:MEDIUM:+TLSv1:!SSLv2:+SSLv3 + - '-k <percentage>': Don't allow uploads if the partition is more than <percentage>% full. For instance, "-k 95" will ensure your disks will never get filled more than 95% by FTP. No need for the "percent" sign after the @@ -1007,6 +1011,7 @@ -i --anonymouscantupload -I --maxidletime <time (min)> -j --createhomedir +-J --tlsciphersuite <ciphers> -k --maxdiskusagepct <percentage> -K --keepallfiles -l --login <auth> or <auth>:<config file> @@ -1109,6 +1114,7 @@ -f --syslogfacility <facility> +-J --tlsciphersuite <ciphers> -a --trustedgid <gid> -V --trustedip <ip address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/README.MySQL new/pure-ftpd-1.0.32/README.MySQL --- old/pure-ftpd-1.0.30/README.MySQL 2010-01-10 22:19:14.000000000 +0100 +++ new/pure-ftpd-1.0.32/README.MySQL 2011-05-02 03:22:54.000000000 +0200 @@ -91,7 +91,7 @@ - The user's login. -- The user's password, in plaintext, MD5, crypt()ed or MySQL's password() +- The user's password, in plaintext, SHA1, MD5, crypt()ed or MySQL's password() format. Pure-FTPd also accepts the "any" value for the MySQLCrypt field. With "any", all hashing functions (not plaintext) are tried. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/README.PGSQL new/pure-ftpd-1.0.32/README.PGSQL --- old/pure-ftpd-1.0.30/README.PGSQL 2010-01-10 22:19:08.000000000 +0100 +++ new/pure-ftpd-1.0.32/README.PGSQL 2011-05-02 03:22:54.000000000 +0200 @@ -83,9 +83,9 @@ - The user's login. -- The user's password, in plaintext, crypt()ed format or MD5. Pure-FTPd also -accepts the "any" value for the PGSQLCrypt field. With "any", all hashing -functions (not plaintext) are tried. +- The user's password, in plaintext, crypt()ed format, MD5 or SHA1. +Pure-FTPd also accepts the "any" value for the PGSQLCrypt field. +With "any", all hashing functions (not plaintext) are tried. - The system uid to map the user to. This can be a numeric id or a user name, looked up at run-time. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/THANKS new/pure-ftpd-1.0.32/THANKS --- old/pure-ftpd-1.0.30/THANKS 2011-01-27 09:40:10.000000000 +0100 +++ new/pure-ftpd-1.0.32/THANKS 2011-05-02 03:22:54.000000000 +0200 @@ -151,7 +151,8 @@ * Thomas Ericsson - Reported documentation glitches. * Thomas Maschutznig. * Thomas Min - Reported an endless loop. -* Todd Rinaldo - sent two compatibility fixes for GCC 2.95 +* Tomasz Krynicki - Suggested SHA1 password hashing in MySQL. +* Todd Rinaldo - sent two compatibility fixes for GCC 2.95 and provided support for the -J option. * Tomonori Kamitaki - Helped pure-ftpd to work on Playstation 2. * Trilucid - Initial web design of pureftpd.org * Ulrich Zehl - Found a documentation error in the sample LDAP schema. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/config.h.in new/pure-ftpd-1.0.32/config.h.in --- old/pure-ftpd-1.0.30/config.h.in 2010-12-30 11:42:50.000000000 +0100 +++ new/pure-ftpd-1.0.32/config.h.in 2011-05-02 03:24:09.000000000 +0200 @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD + /* display only boring messages */ #undef BORING_MODE @@ -54,7 +57,8 @@ this is either `int' or `gid_t'. */ #undef GETGROUPS_T -/* Define if the `getloadavg' function needs to be run setuid or setgid. */ +/* Define to 1 if the `getloadavg' function needs to be run setuid or setgid. + */ #undef GETLOADAVG_PRIVILEGED /* Define to 1 if you have the `alarm' function. */ @@ -248,6 +252,9 @@ /* Define to 1 if you have the `mysql_real_escape_string' function. */ #undef HAVE_MYSQL_REAL_ESCAPE_STRING +/* Define to 1 if you have the `my_make_scrambled_password' function. */ +#undef HAVE_MY_MAKE_SCRAMBLED_PASSWORD + /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */ #undef HAVE_NDIR_H @@ -426,10 +433,10 @@ /* define if you have struct addrinfo */ #undef HAVE_STRUCT_ADDRINFO -/* Define to 1 if `n_un.n_name' is member of `struct nlist'. */ +/* Define to 1 if `n_un.n_name' is a member of `struct nlist'. */ #undef HAVE_STRUCT_NLIST_N_UN_N_NAME -/* Define to 1 if `tm_zone' is member of `struct tm'. */ +/* Define to 1 if `tm_zone' is a member of `struct tm'. */ #undef HAVE_STRUCT_TM_TM_ZONE /* define if syslog names are available */ @@ -691,6 +698,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -817,6 +827,28 @@ /* Define if you already have standard SHA1 functions */ #undef USE_SYSTEM_CRYPT_SHA1 +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# undef _ALL_SOURCE +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# undef _POSIX_PTHREAD_SEMANTICS +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# undef _TANDEM_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + + /* Version number of package */ #undef VERSION @@ -874,25 +906,21 @@ /* with welcomemsg */ #undef WITH_WELCOME_MSG -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN - -/* Define to 1 if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif #endif /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif - /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES @@ -906,17 +934,6 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE -/* Enable extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif - /* Define to empty if `const' does not conform to ANSI C. */ #undef const Files old/pure-ftpd-1.0.30/configuration-file/._Makefile.in and new/pure-ftpd-1.0.32/configuration-file/._Makefile.in differ Files old/pure-ftpd-1.0.30/configuration-file/._pure-config.py.in and new/pure-ftpd-1.0.32/configuration-file/._pure-config.py.in differ Files old/pure-ftpd-1.0.30/configuration-file/._pure-ftpd.conf.in and new/pure-ftpd-1.0.32/configuration-file/._pure-ftpd.conf.in differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/configuration-file/pure-config.pl.in new/pure-ftpd-1.0.32/configuration-file/pure-config.pl.in --- old/pure-ftpd-1.0.30/configuration-file/pure-config.pl.in 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/configuration-file/pure-config.pl.in 2011-04-17 17:05:54.000000000 +0200 @@ -1,6 +1,6 @@ #! @PERL@ -# (C) 2001-2009 Aristotle Pagaltzis +# (C) 2001-2011 Aristotle Pagaltzis # derived from code (C) 2001-2002 Frank Denis and Matthias Andree use strict; @@ -9,88 +9,89 @@ my $PUREFTPD; -x && ($PUREFTPD=$_, last) for qw( - ${exec_prefix}/sbin/pure-ftpd - /usr/local/pure-ftpd/sbin/pure-ftpd - /usr/local/pureftpd/sbin/pure-ftpd - /usr/local/sbin/pure-ftpd - /usr/sbin/pure-ftpd + ${exec_prefix}/sbin/pure-ftpd + /usr/local/pure-ftpd/sbin/pure-ftpd + /usr/local/pureftpd/sbin/pure-ftpd + /usr/local/sbin/pure-ftpd + /usr/sbin/pure-ftpd ); my %simple_switch_for = ( - IPV4Only => "-4", - IPV6Only => "-6", - ChrootEveryone => "-A", - BrokenClientsCompatibility => "-b", - Daemonize => "-B", - VerboseLog => "-d", - DisplayDotFiles => "-D", - AnonymousOnly => "-e", - NoAnonymous => "-E", - DontResolve => "-H", - AnonymousCanCreateDirs => "-M", - NATmode => "-N", - CallUploadScript => "-o", - AntiWarez => "-s", - AllowUserFXP => "-w", - AllowAnonymousFXP => "-W", - ProhibitDotFilesWrite => "-x", - ProhibitDotFilesRead => "-X", - AllowDotFiles => "-z", - AutoRename => "-r", - AnonymousCantUpload => "-i", - LogPID => "-1", - NoChmod => "-R", - KeepAllFiles => "-K", - CreateHomeDir => "-j", - NoRename => "-G", - CustomerProof => "-Z", - NoTruncate => "-0", + IPV4Only => "-4", + IPV6Only => "-6", + ChrootEveryone => "-A", + BrokenClientsCompatibility => "-b", + Daemonize => "-B", + VerboseLog => "-d", + DisplayDotFiles => "-D", + AnonymousOnly => "-e", + NoAnonymous => "-E", + DontResolve => "-H", + AnonymousCanCreateDirs => "-M", + NATmode => "-N", + CallUploadScript => "-o", + AntiWarez => "-s", + AllowUserFXP => "-w", + AllowAnonymousFXP => "-W", + ProhibitDotFilesWrite => "-x", + ProhibitDotFilesRead => "-X", + AllowDotFiles => "-z", + AutoRename => "-r", + AnonymousCantUpload => "-i", + LogPID => "-1", + NoChmod => "-R", + KeepAllFiles => "-K", + CreateHomeDir => "-j", + NoRename => "-G", + CustomerProof => "-Z", + NoTruncate => "-0", ); my %string_switch_for = ( - FileSystemCharset => "-8", - ClientCharset => "-9", - SyslogFacility => "-f", - FortunesFile => "-F", - ForcePassiveIP => "-P", - Bind => "-S", - AnonymousBandwidth => "-t", - UserBandwidth => "-T", - TrustedIP => "-V", - AltLog => "-O", - PIDFile => "-g", -); + FileSystemCharset => "-8", + ClientCharset => "-9", + SyslogFacility => "-f", + FortunesFile => "-F", + ForcePassiveIP => "-P", + Bind => "-S", + AnonymousBandwidth => "-t", + UserBandwidth => "-T", + TrustedIP => "-V", + AltLog => "-O", + PIDFile => "-g", + TLSCipherSuite => "-J", +); my %numeric_switch_for = ( - MaxIdleTime => "-I", - MaxDiskUsage => "-k", - TrustedGID => "-a", - MaxClientsNumber => "-c", - MaxClientsPerIP => "-C", - MaxLoad => "-m", - MinUID => "-u", - TLS => "-Y", + MaxIdleTime => "-I", + MaxDiskUsage => "-k", + TrustedGID => "-a", + MaxClientsNumber => "-c", + MaxClientsPerIP => "-C", + MaxLoad => "-m", + MinUID => "-u", + TLS => "-Y", ); my %numpairb_switch_for = ( - LimitRecursion => "-L", - PassivePortRange => "-p", - AnonymousRatio => "-q", - UserRatio => "-Q", + LimitRecursion => "-L", + PassivePortRange => "-p", + AnonymousRatio => "-q", + UserRatio => "-Q", ); my %numpairc_switch_for = ( - Umask => "-U", - Quota => "-n", - PerUserLimits => "-y", + Umask => "-U", + Quota => "-n", + PerUserLimits => "-y", ); my %auth_method_for = ( - LDAPConfigFile => "ldap", - MySQLConfigFile => "mysql", - PGSQLConfigFile => "pgsql", - PureDB => "puredb", - ExtAuth => "extauth", + LDAPConfigFile => "ldap", + MySQLConfigFile => "mysql", + PGSQLConfigFile => "pgsql", + PureDB => "puredb", + ExtAuth => "extauth", ); my $simple_switch = qr/(@{[join "|", keys %simple_switch_for ]})\s+yes/i; @@ -101,20 +102,20 @@ my $auth_method = qr/(@{[join "|", keys %auth_method_for ]})\s+(\S+)/i; die "Usage: pure-config.pl <configuration file> [extra options]\n" - unless defined $conffile; + unless defined $conffile; open CONF, "< $conffile" or die "Can't open $conffile: $!\n"; !/^\s*(?:$|#)/ and (chomp, push @flg, - /$simple_switch/i ? ($simple_switch_for{$1}) : - /$string_switch/i ? ($string_switch_for{$1} . $2) : - /$numeric_switch/i ? ($numeric_switch_for{$1} . $2) : - /$numpairb_switch/i ? ($numpairb_switch_for{$1} . "$2:$3") : - /$numpairc_switch/i ? ($numpairc_switch_for{$1} . "$2:$3") : - /$auth_method/i ? ("-l" . "$auth_method_for{$1}:$2") : - /UnixAuthentication\s+yes/i ? ("-l" . "unix") : - /PAMAuthentication\s+yes/i ? ("-l" . "pam") : - () + /$simple_switch/i ? ($simple_switch_for{$1}) : + /$string_switch/i ? ($string_switch_for{$1} . $2) : + /$numeric_switch/i ? ($numeric_switch_for{$1} . $2) : + /$numpairb_switch/i ? ($numpairb_switch_for{$1} . "$2:$3") : + /$numpairc_switch/i ? ($numpairc_switch_for{$1} . "$2:$3") : + /$auth_method/i ? ("-l" . "$auth_method_for{$1}:$2") : + /UnixAuthentication\s+yes/i ? ("-l" . "unix") : + /PAMAuthentication\s+yes/i ? ("-l" . "pam") : + () ) while <CONF>; close CONF; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/configuration-file/pure-config.py.in new/pure-ftpd-1.0.32/configuration-file/pure-config.py.in --- old/pure-ftpd-1.0.30/configuration-file/pure-config.py.in 2010-06-19 23:53:12.000000000 +0200 +++ new/pure-ftpd-1.0.32/configuration-file/pure-config.py.in 2011-04-17 17:05:54.000000000 +0200 @@ -112,6 +112,7 @@ ["CustomerProof\s+yes", "-Z" ], ["NoTruncate\s+yes", "-0" ], ["PIDFile\s+(\S+)", "-g", None ], + ["TLSCipherSuite\s+(\S+)", "-J", None ], ["PerUserLimits\s+([:0-9]+)", "-y", None ], ["TLS\s+(\d)", "-Y", None ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/configuration-file/pure-ftpd.conf.in new/pure-ftpd-1.0.32/configuration-file/pure-ftpd.conf.in --- old/pure-ftpd-1.0.30/configuration-file/pure-ftpd.conf.in 2010-12-15 17:58:31.000000000 +0100 +++ new/pure-ftpd-1.0.32/configuration-file/pure-ftpd.conf.in 2011-04-17 17:05:54.000000000 +0200 @@ -423,6 +423,11 @@ # TLS 1 +# List of ciphers that will be accepted for SSL/TLS connections + +# TLSCipherSuite HIGH:MEDIUM:+TLSv1:!SSLv2:+SSLv3 + + # Listen only to IPv4 addresses in standalone mode (ie. disable IPv6) # By default, both IPv4 and IPv6 are enabled. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/configure.ac new/pure-ftpd-1.0.32/configure.ac --- old/pure-ftpd-1.0.30/configure.ac 2010-12-30 11:41:09.000000000 +0100 +++ new/pure-ftpd-1.0.32/configure.ac 2011-05-02 03:22:54.000000000 +0200 @@ -1,7 +1,7 @@ dnl AM_ACLOCAL_INCLUDE(m4) AC_PREREQ(2.61) -AC_INIT([pure-ftpd],[1.0.30],[bugs at pureftpd dot org]) +AC_INIT([pure-ftpd],[1.0.32],[bugs at pureftpd dot org]) AC_CONFIG_SRCDIR(src/ftpd.c) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([1.9 dist-bzip2]) @@ -1216,10 +1216,10 @@ } ]])],[],[ AC_MSG_RESULT(no) - AC_MSG_ERROR(Your MySQL client libraries aren't properly installed) + AC_MSG_ERROR(Your MySQL client libraries aren't properly installed) ],[]) AC_MSG_RESULT(yes) - AC_CHECK_FUNCS(mysql_real_escape_string) + AC_CHECK_FUNCS(mysql_real_escape_string my_make_scrambled_password) fi ]) AC_ARG_WITH(pgsql, Files old/pure-ftpd-1.0.30/contrib/._Makefile.in and new/pure-ftpd-1.0.32/contrib/._Makefile.in differ Files old/pure-ftpd-1.0.30/contrib/._pure-stat.pl and new/pure-ftpd-1.0.32/contrib/._pure-stat.pl differ Files old/pure-ftpd-1.0.30/contrib/._xml_python_processors.txt and new/pure-ftpd-1.0.32/contrib/._xml_python_processors.txt differ Files old/pure-ftpd-1.0.30/gui/._Makefile.in and new/pure-ftpd-1.0.32/gui/._Makefile.in differ Files old/pure-ftpd-1.0.30/gui/._build.sh and new/pure-ftpd-1.0.32/gui/._build.sh differ Files old/pure-ftpd-1.0.30/m4/._Makefile.in and new/pure-ftpd-1.0.32/m4/._Makefile.in differ Files old/pure-ftpd-1.0.30/man/._Makefile.in and new/pure-ftpd-1.0.32/man/._Makefile.in differ Files old/pure-ftpd-1.0.30/man/._pure-authd.8.in and new/pure-ftpd-1.0.32/man/._pure-authd.8.in differ Files old/pure-ftpd-1.0.30/man/._pure-ftpd.8.in and new/pure-ftpd-1.0.32/man/._pure-ftpd.8.in differ Files old/pure-ftpd-1.0.30/man/._pure-uploadscript.8.in and new/pure-ftpd-1.0.32/man/._pure-uploadscript.8.in differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/man/pure-ftpd.8.in new/pure-ftpd-1.0.32/man/pure-ftpd.8.in --- old/pure-ftpd-1.0.30/man/pure-ftpd.8.in 2011-01-23 00:57:05.000000000 +0100 +++ new/pure-ftpd-1.0.32/man/pure-ftpd.8.in 2011-04-17 17:05:54.000000000 +0200 @@ -9,7 +9,7 @@ pure\-ftpd \- simple File Transfer Protocol server .SH "SYNOPSIS" -.B pure\-ftpd [\-0] [\-1] [\-4] [\-6] [\-a gid] [\-A] [\-b] [\-B] [\-c clients] [\-C cnx/ip] [\-d [\-d]] [\-D] [\-e] [\-E] [\-f facility] [\-F fortunes file] [\-g pidfile] [\-G] [\-H] [\-i] [\-I] [\-j] [\-k percentage] [\-K] [\-l authentication[:config file]] [\-L max files:max depth] [\-m maxload] [\-M] [\-n maxfiles:maxsize] [\-N] [\-o] [\-O format:log file] [\-p first:last] [\-P ip address or host name] [\-q upload:download ratio] [\-Q upload:download ratio] [\-r] [\-R] [\-s] [\-S [address,][port]] [\-t upload bandwidth:download bandwidth] [\-T upload bandwidth:download bandwidth] [\-u uid] [\-U umask files:umask dirs] [\-v bonjour name] [\-V ip address] [\-w] [\-W] [\-x] [\-X] [\-y max user sessions:max anon sessions] [\-Y tls behavior] [\-z] [\-Z] +.B pure\-ftpd [\-0] [\-1] [\-4] [\-6] [\-a gid] [\-A] [\-b] [\-B] [\-c clients] [\-C cnx/ip] [\-d [\-d]] [\-D] [\-e] [\-E] [\-f facility] [\-F fortunes file] [\-g pidfile] [\-G] [\-H] [\-i] [\-I] [\-j] [\-J ciphers] [\-k percentage] [\-K] [\-l authentication[:config file]] [\-L max files:max depth] [\-m maxload] [\-M] [\-n maxfiles:maxsize] [\-N] [\-o] [\-O format:log file] [\-p first:last] [\-P ip address or host name] [\-q upload:download ratio] [\-Q upload:download ratio] [\-r] [\-R] [\-s] [\-S [address,][port]] [\-t upload bandwidth:download bandwidth] [\-T upload bandwidth:download bandwidth] [\-u uid] [\-U umask files:umask dirs] [\-v bonjour name] [\-V ip address] [\-w] [\-W] [\-x] [\-X] [\-y max user sessions:max anon sessions] [\-Y tls behavior] [\-z] [\-Z] .br Alternative style : @@ -60,6 +60,8 @@ .br \-j \-\-createhomedir .br +\-J \-\-tlsciphersuite +.br \-k \-\-maxdiskusagepct .br \-K \-\-keepallfiles @@ -276,6 +278,9 @@ permissions are set according to the current directory mask. To avoid local attacks, the parent directory should never belong to an untrusted user. .TP +.B \-J ciphers +Set the list of ciphers that will be accepted for SSL/TLS connections. +.TP .B \-k percentage Disallow upload if the partition is more than .B percentage Files old/pure-ftpd-1.0.30/pam/._Makefile.in and new/pure-ftpd-1.0.32/pam/._Makefile.in differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/pure-ftpd.spec new/pure-ftpd-1.0.32/pure-ftpd.spec --- old/pure-ftpd-1.0.30/pure-ftpd.spec 2010-12-30 11:43:23.000000000 +0100 +++ new/pure-ftpd-1.0.32/pure-ftpd.spec 2011-05-02 03:25:55.000000000 +0200 @@ -1,5 +1,5 @@ %define name pure-ftpd -%define version 1.0.30 +%define version 1.0.32 %define builddir $RPM_BUILD_DIR/%{name}-%{version} %define no_install_post_compress_docs 1 %define con_pam 0 Files old/pure-ftpd-1.0.30/puredb/._Makefile.in and new/pure-ftpd-1.0.32/puredb/._Makefile.in differ Files old/pure-ftpd-1.0.30/puredb/._README and new/pure-ftpd-1.0.32/puredb/._README differ Files old/pure-ftpd-1.0.30/puredb/src/._Makefile.in and new/pure-ftpd-1.0.32/puredb/src/._Makefile.in differ Files old/pure-ftpd-1.0.30/puredb/src/._puredb_read.c and new/pure-ftpd-1.0.32/puredb/src/._puredb_read.c differ Files old/pure-ftpd-1.0.30/puredb/src/._puredb_write.c and new/pure-ftpd-1.0.32/puredb/src/._puredb_write.c differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/pureftpd-mysql.conf new/pure-ftpd-1.0.32/pureftpd-mysql.conf --- old/pure-ftpd-1.0.30/pureftpd-mysql.conf 2011-01-27 09:39:14.000000000 +0100 +++ new/pure-ftpd-1.0.32/pureftpd-mysql.conf 2011-05-02 03:22:54.000000000 +0200 @@ -38,9 +38,9 @@ # Mandatory : how passwords are stored -# Valid values are : "cleartext", "crypt", "md5" and "password" +# Valid values are : "cleartext", "crypt", "sha1", "md5" and "password" # ("password" = MySQL password() function) -# You can also use "any" to try "crypt", "md5" *and* "password" +# You can also use "any" to try "crypt", "sha1", "md5" *and* "password" MYSQLCrypt cleartext diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/pureftpd-pgsql.conf new/pure-ftpd-1.0.32/pureftpd-pgsql.conf --- old/pure-ftpd-1.0.30/pureftpd-pgsql.conf 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/pureftpd-pgsql.conf 2011-05-02 03:22:54.000000000 +0200 @@ -25,7 +25,7 @@ PGSQLDatabase pureftpd # Mandatory : how passwords are stored -# Valid values are : "cleartext", "crypt", "md5" and "any" +# Valid values are : "cleartext", "crypt", "md5", "sha1" and "any" PGSQLCrypt cleartext # In the following directives, parts of the strings are replaced at Files old/pure-ftpd-1.0.30/src/._Makefile.in and new/pure-ftpd-1.0.32/src/._Makefile.in differ Files old/pure-ftpd-1.0.30/src/._altlog.c and new/pure-ftpd-1.0.32/src/._altlog.c differ Files old/pure-ftpd-1.0.30/src/._bsd-getopt_long.h and new/pure-ftpd-1.0.32/src/._bsd-getopt_long.h differ Files old/pure-ftpd-1.0.30/src/._bsd-glob.c and new/pure-ftpd-1.0.32/src/._bsd-glob.c differ Files old/pure-ftpd-1.0.30/src/._bsd-realpath.c and new/pure-ftpd-1.0.32/src/._bsd-realpath.c differ Files old/pure-ftpd-1.0.30/src/._crypto-md5.c and new/pure-ftpd-1.0.32/src/._crypto-md5.c differ Files old/pure-ftpd-1.0.30/src/._crypto-sha1.c and new/pure-ftpd-1.0.32/src/._crypto-sha1.c differ Files old/pure-ftpd-1.0.30/src/._crypto.c and new/pure-ftpd-1.0.32/src/._crypto.c differ Files old/pure-ftpd-1.0.30/src/._fakechroot.c and new/pure-ftpd-1.0.32/src/._fakechroot.c differ Files old/pure-ftpd-1.0.30/src/._fakesnprintf.c and new/pure-ftpd-1.0.32/src/._fakesnprintf.c differ Files old/pure-ftpd-1.0.30/src/._ftpd.c and new/pure-ftpd-1.0.32/src/._ftpd.c differ Files old/pure-ftpd-1.0.30/src/._ftpd.h and new/pure-ftpd-1.0.32/src/._ftpd.h differ Files old/pure-ftpd-1.0.30/src/._ftpd_p.h and new/pure-ftpd-1.0.32/src/._ftpd_p.h differ Files old/pure-ftpd-1.0.30/src/._ftpwho-update.c and new/pure-ftpd-1.0.32/src/._ftpwho-update.c differ Files old/pure-ftpd-1.0.30/src/._globals.h and new/pure-ftpd-1.0.32/src/._globals.h differ Files old/pure-ftpd-1.0.30/src/._ipstack.c and new/pure-ftpd-1.0.32/src/._ipstack.c differ Files old/pure-ftpd-1.0.30/src/._log_extauth.c and new/pure-ftpd-1.0.32/src/._log_extauth.c differ Files old/pure-ftpd-1.0.30/src/._log_ldap.c and new/pure-ftpd-1.0.32/src/._log_ldap.c differ Files old/pure-ftpd-1.0.30/src/._log_mysql.c and new/pure-ftpd-1.0.32/src/._log_mysql.c differ Files old/pure-ftpd-1.0.30/src/._log_pam.c and new/pure-ftpd-1.0.32/src/._log_pam.c differ Files old/pure-ftpd-1.0.30/src/._log_pgsql.c and new/pure-ftpd-1.0.32/src/._log_pgsql.c differ Files old/pure-ftpd-1.0.30/src/._log_puredb.c and new/pure-ftpd-1.0.32/src/._log_puredb.c differ Files old/pure-ftpd-1.0.30/src/._ls.c and new/pure-ftpd-1.0.32/src/._ls.c differ Files old/pure-ftpd-1.0.30/src/._messages_cs_cz.h and new/pure-ftpd-1.0.32/src/._messages_cs_cz.h differ Files old/pure-ftpd-1.0.30/src/._messages_da.h and new/pure-ftpd-1.0.32/src/._messages_da.h differ Files old/pure-ftpd-1.0.30/src/._messages_de.h and new/pure-ftpd-1.0.32/src/._messages_de.h differ Files old/pure-ftpd-1.0.30/src/._messages_en.h and new/pure-ftpd-1.0.32/src/._messages_en.h differ Files old/pure-ftpd-1.0.30/src/._messages_es.h and new/pure-ftpd-1.0.32/src/._messages_es.h differ Files old/pure-ftpd-1.0.30/src/._messages_fr.h and new/pure-ftpd-1.0.32/src/._messages_fr.h differ Files old/pure-ftpd-1.0.30/src/._messages_fr_funny.h and new/pure-ftpd-1.0.32/src/._messages_fr_funny.h differ Files old/pure-ftpd-1.0.30/src/._messages_hu.h and new/pure-ftpd-1.0.32/src/._messages_hu.h differ Files old/pure-ftpd-1.0.30/src/._messages_it.h and new/pure-ftpd-1.0.32/src/._messages_it.h differ Files old/pure-ftpd-1.0.30/src/._messages_kr.h and new/pure-ftpd-1.0.32/src/._messages_kr.h differ Files old/pure-ftpd-1.0.30/src/._messages_nl.h and new/pure-ftpd-1.0.32/src/._messages_nl.h differ Files old/pure-ftpd-1.0.30/src/._messages_no.h and new/pure-ftpd-1.0.32/src/._messages_no.h differ Files old/pure-ftpd-1.0.30/src/._messages_pl.h and new/pure-ftpd-1.0.32/src/._messages_pl.h differ Files old/pure-ftpd-1.0.30/src/._messages_pt_br.h and new/pure-ftpd-1.0.32/src/._messages_pt_br.h differ Files old/pure-ftpd-1.0.30/src/._messages_ro.h and new/pure-ftpd-1.0.32/src/._messages_ro.h differ Files old/pure-ftpd-1.0.30/src/._messages_ru.h and new/pure-ftpd-1.0.32/src/._messages_ru.h differ Files old/pure-ftpd-1.0.30/src/._messages_sk.h and new/pure-ftpd-1.0.32/src/._messages_sk.h differ Files old/pure-ftpd-1.0.30/src/._messages_sv.h and new/pure-ftpd-1.0.32/src/._messages_sv.h differ Files old/pure-ftpd-1.0.30/src/._messages_tr.h and new/pure-ftpd-1.0.32/src/._messages_tr.h differ Files old/pure-ftpd-1.0.30/src/._messages_zh_cn.h and new/pure-ftpd-1.0.32/src/._messages_zh_cn.h differ Files old/pure-ftpd-1.0.30/src/._messages_zh_tw.h and new/pure-ftpd-1.0.32/src/._messages_zh_tw.h differ Files old/pure-ftpd-1.0.30/src/._privsep.c and new/pure-ftpd-1.0.32/src/._privsep.c differ Files old/pure-ftpd-1.0.30/src/._pure-authd.c and new/pure-ftpd-1.0.32/src/._pure-authd.c differ Files old/pure-ftpd-1.0.30/src/._pure-ftpwho.c and new/pure-ftpd-1.0.32/src/._pure-ftpwho.c differ Files old/pure-ftpd-1.0.30/src/._pure-pw.c and new/pure-ftpd-1.0.32/src/._pure-pw.c differ Files old/pure-ftpd-1.0.30/src/._pure-quotacheck.c and new/pure-ftpd-1.0.32/src/._pure-quotacheck.c differ Files old/pure-ftpd-1.0.30/src/._pure-uploadscript.c and new/pure-ftpd-1.0.32/src/._pure-uploadscript.c differ Files old/pure-ftpd-1.0.30/src/._quotas.c and new/pure-ftpd-1.0.32/src/._quotas.c differ Files old/pure-ftpd-1.0.30/src/._tls.c and new/pure-ftpd-1.0.32/src/._tls.c differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/ftp_parser.c new/pure-ftpd-1.0.32/src/ftp_parser.c --- old/pure-ftpd-1.0.30/src/ftp_parser.c 2011-03-07 23:48:54.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/ftp_parser.c 2011-04-17 17:05:54.000000000 +0200 @@ -60,10 +60,12 @@ static size_t scanned; static size_t readnbd; +#ifdef WITH_TLS static void flush_cmd(void) { scanned = readnbd = (size_t) 0U; } +#endif int sfgets(void) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/ftpd.c new/pure-ftpd-1.0.32/src/ftpd.c --- old/pure-ftpd-1.0.30/src/ftpd.c 2011-01-20 12:23:14.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/ftpd.c 2011-04-17 17:17:39.000000000 +0200 @@ -1725,13 +1725,15 @@ void dopass(char *password) { static unsigned int tapping; - gid_t *groups = NULL; char *hd; +#if !defined(MINIMAL) && defined(HAVE_GETGROUPS) && defined(DISPLAY_GROUPS) + gid_t *groups = NULL; int ngroups; -#if defined(NGROUPS_MAX) && NGROUPS_MAX > 0 +# if defined(NGROUPS_MAX) && NGROUPS_MAX > 0 int ngroups_max = NGROUPS_MAX; /* Use the compile time value */ -#else +# else int ngroups_max = 1; /* use a sane default */ +# endif #endif #ifdef WITH_RFC2640 char *nwd = NULL; @@ -5841,6 +5843,12 @@ } break; } + case 'J': { + if ((tlsciphersuite = strdup(optarg)) == NULL) { + die_mem(); + } + break; + } #endif case 'e': { anon_only = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/ftpd_p.h new/pure-ftpd-1.0.32/src/ftpd_p.h --- old/pure-ftpd-1.0.30/src/ftpd_p.h 2010-03-17 23:46:29.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/ftpd_p.h 2011-04-17 17:05:54.000000000 +0200 @@ -104,7 +104,7 @@ "y:" #endif #ifdef WITH_TLS - "Y:" + "Y:J:" #endif "zZ"; @@ -188,6 +188,7 @@ # endif # ifdef WITH_TLS { "tls", 1, NULL, 'Y' }, + { "tlsciphersuite", 1, NULL, 'J' }, # endif { "allowdotfiles", 0, NULL, 'z' }, { "customerproof", 0, NULL, 'Z' }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/ftpwho-update.c new/pure-ftpd-1.0.32/src/ftpwho-update.c --- old/pure-ftpd-1.0.30/src/ftpwho-update.c 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/ftpwho-update.c 2011-04-17 17:11:04.000000000 +0200 @@ -55,7 +55,7 @@ void ftpwho_unlock(void) { #if defined(__OpenBSD__) - (void) msync(shm_data_cur, NULL, MS_ASYNC); + (void) msync(shm_data_cur, (size_t) 0U, MS_ASYNC); #endif lock.l_type = F_UNLCK; while (fcntl(mmap_fd, F_SETLK, &lock) < 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/globals.h new/pure-ftpd-1.0.32/src/globals.h --- old/pure-ftpd-1.0.30/src/globals.h 2010-03-28 10:57:46.000000000 +0200 +++ new/pure-ftpd-1.0.32/src/globals.h 2011-04-17 17:05:54.000000000 +0200 @@ -164,6 +164,7 @@ #ifdef WITH_TLS GLOBAL0(signed char enforce_tls_auth); GLOBAL0(int data_protection_level); +GLOBAL(const char *tlsciphersuite, NULL); #endif GLOBAL0(char *atomic_prefix); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/log_mysql.c new/pure-ftpd-1.0.32/src/log_mysql.c --- old/pure-ftpd-1.0.30/src/log_mysql.c 2010-05-04 21:54:51.000000000 +0200 +++ new/pure-ftpd-1.0.32/src/log_mysql.c 2011-05-02 03:22:54.000000000 +0200 @@ -322,7 +322,8 @@ char *escaped_peer_ip = NULL; char *escaped_decimal_ip = NULL; int committed = 1; - int crypto_crypt = 0, crypto_mysql = 0, crypto_md5 = 0, crypto_plain = 0; + int crypto_crypt = 0, crypto_mysql = 0, crypto_md5 = 0, crypto_sha1 = 0, + crypto_plain = 0; unsigned long decimal_ip_num = 0UL; char decimal_ip[42]; char hbuf[NI_MAXHOST]; @@ -416,12 +417,15 @@ crypto_crypt++; crypto_mysql++; crypto_md5++; + crypto_sha1++; } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) { crypto_crypt++; } else if (strcasecmp(crypto, PASSWD_SQL_MYSQL) == 0) { crypto_mysql++; } else if (strcasecmp(crypto, PASSWD_SQL_MD5) == 0) { crypto_md5++; + } else if (strcasecmp(crypto, PASSWD_SQL_SHA1) == 0) { + crypto_sha1++; } else { /* default to plaintext */ crypto_plain++; } @@ -451,7 +455,12 @@ # if MYSQL_VERSION_ID >= 40100 && MYSQL_VERSION_ID < 40101 make_scrambled_password(scrambled_password, password, 1, NULL); # else +# ifdef HAVE_MY_MAKE_SCRAMBLED_PASSWORD + my_make_scrambled_password(scrambled_password, password, + strlen(password)); +# else make_scrambled_password(scrambled_password, password); +# endif # endif #endif if (strcmp(scrambled_password, spwd) == 0) { @@ -465,7 +474,15 @@ strcmp(crypted, spwd) == 0) { goto auth_ok; } - } + } + if (crypto_sha1 != 0) { + const char *crypted; + + if ((crypted = (const char *) crypto_hash_sha1(password, 1)) != NULL && + strcmp(crypted, spwd) == 0) { + goto auth_ok; + } + } if (crypto_plain != 0) { if (*password != 0 && /* refuse null cleartext passwords */ strcmp(password, spwd) == 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/log_mysql.h new/pure-ftpd-1.0.32/src/log_mysql.h --- old/pure-ftpd-1.0.30/src/log_mysql.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/log_mysql.h 2011-05-02 03:22:54.000000000 +0200 @@ -5,6 +5,7 @@ #define PASSWD_SQL_CLEARTEXT "cleartext" #define PASSWD_SQL_MYSQL "password" #define PASSWD_SQL_MD5 "md5" +#define PASSWD_SQL_SHA1 "sha1" #define PASSWD_SQL_ANY "any" #define MYSQL_DEFAULT_SERVER "localhost" #define MYSQL_DEFAULT_PORT 3306 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/log_mysql_p.h new/pure-ftpd-1.0.32/src/log_mysql_p.h --- old/pure-ftpd-1.0.30/src/log_mysql_p.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/log_mysql_p.h 2011-04-17 17:24:58.000000000 +0200 @@ -71,4 +71,9 @@ { NULL, NULL } }; +#ifdef HAVE_MY_MAKE_SCRAMBLED_PASSWORD +extern void my_make_scrambled_password(char *to, const char *password, + size_t pass_len); +#endif + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/log_pgsql.c new/pure-ftpd-1.0.32/src/log_pgsql.c --- old/pure-ftpd-1.0.30/src/log_pgsql.c 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/log_pgsql.c 2011-05-02 03:22:54.000000000 +0200 @@ -1,6 +1,6 @@ #include <config.h> -/* PostgreSQL backend, by Cindy Marasco <cindy(a)getaclue.org> */ +/* PostgreSQL backend, by Cindy Marasco <cindy at getaclue.org> */ #ifdef WITH_PGSQL @@ -403,7 +403,7 @@ char *escaped_decimal_ip = NULL; char *scrambled_password = NULL; int committed = 1; - int crypto_crypt = 0, crypto_plain = 0, crypto_md5 = 0; + int crypto_crypt = 0, crypto_md5 = 0, crypto_sha1 = 0, crypto_plain = 0; unsigned long decimal_ip_num = 0UL; char decimal_ip[42]; char hbuf[NI_MAXHOST]; @@ -494,10 +494,13 @@ if (strcasecmp(crypto, PASSWD_SQL_ANY) == 0) { crypto_crypt++; crypto_md5++; + crypto_sha1++; } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) { crypto_crypt++; } else if (strcasecmp(crypto, PASSWD_SQL_MD5) == 0) { crypto_md5++; + } else if (strcasecmp(crypto, PASSWD_SQL_SHA1) == 0) { + crypto_sha1++; } else { /* default to plaintext */ crypto_plain++; } @@ -516,6 +519,14 @@ strcmp(crypted, spwd) == 0) { goto auth_ok; } + } + if (crypto_sha1 != 0) { + const char *crypted; + + if ((crypted = (const char *) crypto_hash_sha1(password, 1)) != NULL && + strcmp(crypted, spwd) == 0) { + goto auth_ok; + } } if (crypto_plain != 0) { if (*password != 0 && /* refuse null cleartext passwords */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/log_pgsql.h new/pure-ftpd-1.0.32/src/log_pgsql.h --- old/pure-ftpd-1.0.30/src/log_pgsql.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/log_pgsql.h 2011-05-02 03:22:54.000000000 +0200 @@ -5,6 +5,7 @@ #define PASSWD_SQL_CLEARTEXT "cleartext" #define PASSWD_SQL_PGSQL "password" #define PASSWD_SQL_MD5 "md5" +#define PASSWD_SQL_SHA1 "sha1" #define PASSWD_SQL_ANY "any" #define PGSQL_DEFAULT_SERVER "localhost" #define PGSQL_DEFAULT_PORT 5432 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/ls.c new/pure-ftpd-1.0.32/src/ls.c --- old/pure-ftpd-1.0.30/src/ls.c 2010-03-07 20:29:00.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/ls.c 2011-05-02 04:36:09.000000000 +0200 @@ -226,7 +226,7 @@ } /* listfile returns non-zero if the file is a directory */ -static int listfile(const PureFileInfo * const fi, const char *name) +static int listfile(const PureFileInfo * const fi, const char *name) { int rval = 0; struct stat st; @@ -768,6 +768,32 @@ names = NULL; } +static char *unescape_and_return_next_file(char * const str) { + char *pnt = str; + signed char seen_backslash = 0; + + while (*pnt != 0) { + if (seen_backslash == 0) { + if (*pnt == '\\') { + seen_backslash = 1; + } else if (*pnt == ' ') { + *pnt++ = 0; + if (*pnt != 0) { + return pnt; + } + break; + } + pnt++; + } else { + seen_backslash = 0; + if (*pnt == ' ' || *pnt == '\\' || *pnt == '{' || *pnt == '}') { + memmove(pnt - 1, pnt, strlen(pnt) + (size_t) 1U); + } + } + } + return NULL; +} + void donlist(char *arg, const int on_ctrl_conn, const int opt_l_, const int opt_a_, const int split_args) { @@ -870,8 +896,7 @@ if (split_args == 0) { endarg = NULL; - } else if ((endarg = strchr(arg, ' ')) != NULL) { - *endarg++ = 0; + } else if ((endarg = unescape_and_return_next_file(arg)) != NULL) { justone = 0; } #ifdef DEBUG @@ -884,7 +909,7 @@ alarm(GLOB_TIMEOUT); a = sglob(arg, - GLOB_BRACE | (opt_a ? GLOB_PERIOD : 0), + opt_a ? GLOB_PERIOD : 0, NULL, &g, max_ls_files + 2, max_ls_depth * 2); alarm(0); if (a == 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_cs_cz.h new/pure-ftpd-1.0.32/src/messages_cs_cz.h --- old/pure-ftpd-1.0.30/src/messages_cs_cz.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_cs_cz.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "�as vypr�el" #define MSG_CAPABILITIES "Nemohu zm�nit privilegia" #define MSG_CLIENT_CLOSED_CNX "Klient uzav�el spojen�" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_da.h new/pure-ftpd-1.0.32/src/messages_da.h --- old/pure-ftpd-1.0.30/src/messages_da.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_da.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Timeout" #define MSG_CAPABILITIES "Kan ikke �ndre muligheder" #define MSG_CLIENT_CLOSED_CNX "Klient afbr�d forbindelsen" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_de.h new/pure-ftpd-1.0.32/src/messages_de.h --- old/pure-ftpd-1.0.30/src/messages_de.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_de.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Zeit�berschreitung" #define MSG_CAPABILITIES "Konnte Berechtigungen (CAPABILITES) nicht wechseln." #define MSG_CLIENT_CLOSED_CNX "Die Gegenstelle hat die Verbindung geschlossen." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_en.h new/pure-ftpd-1.0.32/src/messages_en.h --- old/pure-ftpd-1.0.30/src/messages_en.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_en.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Timeout" #define MSG_CAPABILITIES "Unable to switch capabilities" #define MSG_CLIENT_CLOSED_CNX "Client closed the connection" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_es.h new/pure-ftpd-1.0.32/src/messages_es.h --- old/pure-ftpd-1.0.30/src/messages_es.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_es.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Timeout" #define MSG_CAPABILITIES "No se han podido alternar capacidades" #define MSG_CLIENT_CLOSED_CNX "El cliente cerr� la conexi�n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_fr.h new/pure-ftpd-1.0.32/src/messages_fr.h --- old/pure-ftpd-1.0.30/src/messages_fr.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_fr.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Temps de reponse depasse" #define MSG_CAPABILITIES "Impossible d'acceder a cette fonctionnalite" #define MSG_CLIENT_CLOSED_CNX "Le client a ferme la connexion" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_fr_funny.h new/pure-ftpd-1.0.32/src/messages_fr_funny.h --- old/pure-ftpd-1.0.30/src/messages_fr_funny.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_fr_funny.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Putain mais achete-toi des doigts" #define MSG_CAPABILITIES "Ton kernel m'a envoye chier" #define MSG_CLIENT_CLOSED_CNX "Le mec s'est casse" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_hu.h new/pure-ftpd-1.0.32/src/messages_hu.h --- old/pure-ftpd-1.0.30/src/messages_hu.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_hu.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Id?t�ll�p�s" #define MSG_CAPABILITIES "K�pess�g v�lt�s sikertelen" #define MSG_CLIENT_CLOSED_CNX "A Kliens bontotta a kapcsolatot" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_it.h new/pure-ftpd-1.0.32/src/messages_it.h --- old/pure-ftpd-1.0.30/src/messages_it.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_it.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Timeout" #define MSG_CAPABILITIES "Impossibile modificare i permessi" #define MSG_CLIENT_CLOSED_CNX "Il client ha chiuso la connessione" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_kr.h new/pure-ftpd-1.0.32/src/messages_kr.h --- old/pure-ftpd-1.0.30/src/messages_kr.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_kr.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "�ð� �ʰ�" #define MSG_CAPABILITIES "�� ȯ �Ұ�" #define MSG_CLIENT_CLOSED_CNX "Ŭ��̾�Ʈ�� " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_nl.h new/pure-ftpd-1.0.32/src/messages_nl.h --- old/pure-ftpd-1.0.30/src/messages_nl.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_nl.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Onderbreking" #define MSG_CAPABILITIES "Onmogelijk om de instelling te wisselen" #define MSG_CLIENT_CLOSED_CNX "Client sloot de verbinding" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_no.h new/pure-ftpd-1.0.32/src/messages_no.h --- old/pure-ftpd-1.0.30/src/messages_no.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_no.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Timeout" #define MSG_CAPABILITIES "Kan ikke endre egenskaper" #define MSG_CLIENT_CLOSED_CNX "Klienten lukket tilkoblingen" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_pl.h new/pure-ftpd-1.0.32/src/messages_pl.h --- old/pure-ftpd-1.0.30/src/messages_pl.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_pl.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Przekroczony czas oczekiwania" #define MSG_CAPABILITIES "Nie mo�na prze��cza� capabilities" #define MSG_CLIENT_CLOSED_CNX "Klient zamkn�� po��czenie" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_pt_br.h new/pure-ftpd-1.0.32/src/messages_pt_br.h --- old/pure-ftpd-1.0.30/src/messages_pt_br.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_pt_br.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Tempo expirado" #define MSG_CAPABILITIES "N�o foi poss�vel trocar capacidades" #define MSG_CLIENT_CLOSED_CNX "Cliente encerrou a conex�o" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_ro.h new/pure-ftpd-1.0.32/src/messages_ro.h --- old/pure-ftpd-1.0.30/src/messages_ro.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_ro.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Temporizare expirata" #define MSG_CAPABILITIES "Nu pot comuta capabilitatile" #define MSG_CLIENT_CLOSED_CNX "Clientul a inchis conexiunea" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_ru.h new/pure-ftpd-1.0.32/src/messages_ru.h --- old/pure-ftpd-1.0.30/src/messages_ru.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_ru.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "�� " #define MSG_CAPABILITIES "�� (capabilities)" #define MSG_CLIENT_CLOSED_CNX "�� " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_sk.h new/pure-ftpd-1.0.32/src/messages_sk.h --- old/pure-ftpd-1.0.30/src/messages_sk.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_sk.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Cas vyprsal" #define MSG_CAPABILITIES "Nemozem zmenit privilegia" #define MSG_CLIENT_CLOSED_CNX "Klient zavrel spojenie" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_sv.h new/pure-ftpd-1.0.32/src/messages_sv.h --- old/pure-ftpd-1.0.30/src/messages_sv.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_sv.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Timeout" #define MSG_CAPABILITIES "Of�rm�gen att �ndra m�jligheter" #define MSG_CLIENT_CLOSED_CNX "Klienten avbr�t anslutningen" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_tr.h new/pure-ftpd-1.0.32/src/messages_tr.h --- old/pure-ftpd-1.0.30/src/messages_tr.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_tr.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "Zaman A��m�" #define MSG_CAPABILITIES "Anahtar destekleri yap�lam�yor" #define MSG_CLIENT_CLOSED_CNX "Kullan�c� ba�lant�y� kapatt�" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_zh_cn.h new/pure-ftpd-1.0.32/src/messages_zh_cn.h --- old/pure-ftpd-1.0.30/src/messages_zh_cn.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_zh_cn.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "��ʱ" #define MSG_CAPABILITIES "�޷��л��" #define MSG_CLIENT_CLOSED_CNX "�û��˹ر��" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/messages_zh_tw.h new/pure-ftpd-1.0.32/src/messages_zh_tw.h --- old/pure-ftpd-1.0.30/src/messages_zh_tw.h 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/messages_zh_tw.h 2011-04-17 17:05:54.000000000 +0200 @@ -1,3 +1,4 @@ +#define MSG_TLS_CIPHER_FAILED "SSL/TLS: Invalid TLSCipherSuite specified '%s'" #define MSG_TIMEOUT "�O��" #define MSG_CAPABILITIES "�L�k��ʯ�" #define MSG_CLIENT_CLOSED_CNX "�Τ��s�u" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/pure-pw.c new/pure-ftpd-1.0.32/src/pure-pw.c --- old/pure-ftpd-1.0.30/src/pure-pw.c 2010-04-07 22:58:29.000000000 +0200 +++ new/pure-ftpd-1.0.32/src/pure-pw.c 2011-04-17 17:05:54.000000000 +0200 @@ -179,7 +179,7 @@ " [-q <upload ratio>] [-Q <download ratio>]\n" " [-r <allow client ip>/<mask>] [-R <deny client ip>/<mask>]\n" " [-i <allow local ip>/<mask>] [-I <deny local ip>/<mask>]\n" - " [-y <max number of concurrent sessions>]\n" + " [-y <max number of concurrent sessions>]\n" " [-z <hhmm>-<hhmm>] [-m]\n" "\n" "pure-pw userdel <login> [-f <passwd file>] [-m]\n" @@ -189,6 +189,7 @@ "pure-pw show <login> [-f <passwd file>]\n" "\n" "pure-pw mkdb [<puredb database file> [-f <passwd file>]]\n" + " [-F <puredb file>]\n" "\n" "pure-pw list [-f <passwd file>]\n" "\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pure-ftpd-1.0.30/src/tls.c new/pure-ftpd-1.0.32/src/tls.c --- old/pure-ftpd-1.0.30/src/tls.c 2009-12-30 23:44:26.000000000 +0100 +++ new/pure-ftpd-1.0.32/src/tls.c 2011-04-17 17:05:54.000000000 +0200 @@ -10,6 +10,7 @@ # include "ftpwho-update.h" # include "globals.h" # include "messages.h" +# include "globals.h" # ifndef DISABLE_SSL_RENEGOTIATION # ifndef SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION @@ -243,6 +244,12 @@ SSL_CTX_set_info_callback(tls_ctx, ssl_info_cb); # endif + if (tlsciphersuite != NULL) { + if (SSL_CTX_set_cipher_list(tls_ctx, tlsciphersuite) != 1) { + logfile(LOG_ERR, MSG_TLS_CIPHER_FAILED, tlsciphersuite); + _EXIT(EXIT_FAILURE); + } + } # ifdef REQUIRE_VALID_CLIENT_CERTIFICATE SSL_CTX_set_verify(tls_ctx, SSL_VERIFY_FAIL_IF_NO_PEER_CERT | SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, NULL); @@ -250,7 +257,8 @@ TLS_CERTIFICATE_FILE, NULL) != 1) { tls_error(__LINE__, 0); } -# endif +# endif + return 0; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-distribute for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package python-distribute for openSUSE:Factory checked in at Tue May 31 16:40:15 CEST 2011. -------- --- python-distribute/python-distribute.changes 2010-08-31 01:48:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/python-distribute/python-distribute.changes 2011-05-30 23:08:41.000000000 +0200 @@ -1,0 +2,36 @@ +Mon May 30 21:07:25 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 0.6.17: + * Support 'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT' environment + variable to allow to disable installation of easy_install-${version} script. + * Support Python >=3.1.4 and >=3.2.1. + * Issue 204: Don't try to import the parent of a namespace package in + declare_namespace + * Issue 196: Tolerate responses with multiple Content-Length headers + * Issue 205: Sandboxing doesn't preserve working_set. Leads to setup_requires + problems. + +------------------------------------------------------------------- +Sat Apr 30 17:18:30 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 0.6.16: + * Builds sdist gztar even on Windows (avoiding Issue 193). + * Issue 192: Fixed metadata omitted on Windows when package_dir + specified with forward-slash. + * Issue 195: Cython build support. + * Issue 200: Issues with recognizing 64-bit packages on Windows. + Aditional changes from 0.6.15: + * Fixed typo in bdist_egg + * Several issues under Python 3 has been solved. + * Issue 146: Fixed missing DLL files after easy_install of windows + exe package. + +------------------------------------------------------------------- +Tue Apr 26 20:33:38 UTC 2011 - saschpe(a)gmx.de + +- Spec file cleanup: + - Removed authors from description + - Obsoletes/Provides setuptools version fixed + - %py_requires available only on SUSE distros + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- distribute-0.6.14.tar.bz2 New: ---- distribute-0.6.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-distribute.spec ++++++ --- /var/tmp/diff_new_pack.ieOq2e/_old 2011-05-31 16:39:31.000000000 +0200 +++ /var/tmp/diff_new_pack.ieOq2e/_new 2011-05-31 16:39:31.000000000 +0200 @@ -16,27 +16,29 @@ # +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)")} + %define modname distribute Name: python-%{modname} -Version: 0.6.14 +Version: 0.6.17 Release: 1 -License: PSF or ZPL -Summary: Easily Download, Build, Install, Upgrade, and Uninstall Python Packages Url: http://packages.python.org/distribute/ +Summary: Easily Download, Build, Install, Upgrade, and Uninstall Python Packages +License: PSF or ZPL Group: Development/Libraries/Python Source: %{modname}-%{version}.tar.bz2 -BuildRequires: python-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: python-setuptools -Provides: python-setuptools -%{py_requires} -%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} +BuildRequires: python-devel +%if 0%{?suse_version} +%py_requires +%if 0%{?suse_version} > 1110 BuildArch: noarch -%else -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)")} %endif +%endif +Obsoletes: python-setuptools < %{version} +Provides: python-setuptools = %{version} %description Distribute is a fork of the Setuptools project. @@ -44,10 +46,6 @@ Distribute is intended to replace Setuptools as the standard method for working with Python module distributions. -Author: --------- - The fellowship of the packaging <distutils-sig(a)python.org> - %prep %setup -q -n %{modname}-%{version} rm -f distribute.egg-info/*.orig ++++++ distribute-0.6.14.tar.bz2 -> distribute-0.6.17.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/CHANGES.txt new/distribute-0.6.17/CHANGES.txt --- old/distribute-0.6.14/CHANGES.txt 2010-07-15 02:03:02.000000000 +0200 +++ new/distribute-0.6.17/CHANGES.txt 2011-05-30 17:55:22.000000000 +0200 @@ -3,6 +3,37 @@ ======= ------ +0.6.17 +------ + +* Support 'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT' environment + variable to allow to disable installation of easy_install-${version} script. +* Support Python >=3.1.4 and >=3.2.1. +* Issue 204: Don't try to import the parent of a namespace package in + declare_namespace +* Issue 196: Tolerate responses with multiple Content-Length headers +* Issue 205: Sandboxing doesn't preserve working_set. Leads to setup_requires + problems. + +------ +0.6.16 +------ + +* Builds sdist gztar even on Windows (avoiding Issue 193). +* Issue 192: Fixed metadata omitted on Windows when package_dir + specified with forward-slash. +* Issue 195: Cython build support. +* Issue 200: Issues with recognizing 64-bit packages on Windows. + +------ +0.6.15 +------ + +* Fixed typo in bdist_egg +* Several issues under Python 3 has been solved. +* Issue 146: Fixed missing DLL files after easy_install of windows exe package. + +------ 0.6.14 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/CONTRIBUTORS.txt new/distribute-0.6.17/CONTRIBUTORS.txt --- old/distribute-0.6.14/CONTRIBUTORS.txt 2010-07-15 01:53:37.000000000 +0200 +++ new/distribute-0.6.17/CONTRIBUTORS.txt 2011-05-16 14:05:34.000000000 +0200 @@ -14,6 +14,7 @@ * Noufal Ibrahim * Philip Jenvey * Reinout van Rees +* Robert Myers * Tarek Ziadé * Toshio Kuratomi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/PKG-INFO new/distribute-0.6.17/PKG-INFO --- old/distribute-0.6.14/PKG-INFO 2010-07-15 02:14:11.000000000 +0200 +++ new/distribute-0.6.17/PKG-INFO 2011-05-30 17:58:23.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: distribute -Version: 0.6.14 +Version: 0.6.17 Summary: Easily download, build, install, upgrade, and uninstall Python packages Home-page: http://packages.python.org/distribute Author: The fellowship of the packaging @@ -107,9 +107,9 @@ Download the source tarball, uncompress it, then run the install command:: - $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz - $ tar -xzvf distribute-0.6.14.tar.gz - $ cd distribute-0.6.14 + $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.17.tar.gz + $ tar -xzvf distribute-0.6.17.tar.gz + $ cd distribute-0.6.17 $ python setup.py install --------------------------- @@ -239,6 +239,37 @@ ======= ------ + 0.6.17 + ------ + + * Support 'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT' environment + variable to allow to disable installation of easy_install-${version} script. + * Support Python >=3.1.4 and >=3.2.1. + * Issue 204: Don't try to import the parent of a namespace package in + declare_namespace + * Issue 196: Tolerate responses with multiple Content-Length headers + * Issue 205: Sandboxing doesn't preserve working_set. Leads to setup_requires + problems. + + ------ + 0.6.16 + ------ + + * Builds sdist gztar even on Windows (avoiding Issue 193). + * Issue 192: Fixed metadata omitted on Windows when package_dir + specified with forward-slash. + * Issue 195: Cython build support. + * Issue 200: Issues with recognizing 64-bit packages on Windows. + + ------ + 0.6.15 + ------ + + * Fixed typo in bdist_egg + * Several issues under Python 3 has been solved. + * Issue 146: Fixed missing DLL files after easy_install of windows exe package. + + ------ 0.6.14 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/README.txt new/distribute-0.6.17/README.txt --- old/distribute-0.6.14/README.txt 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/README.txt 2011-05-30 17:57:03.000000000 +0200 @@ -99,9 +99,9 @@ Download the source tarball, uncompress it, then run the install command:: - $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz - $ tar -xzvf distribute-0.6.14.tar.gz - $ cd distribute-0.6.14 + $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.17.tar.gz + $ tar -xzvf distribute-0.6.17.tar.gz + $ cd distribute-0.6.17 $ python setup.py install --------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/distribute.egg-info/PKG-INFO new/distribute-0.6.17/distribute.egg-info/PKG-INFO --- old/distribute-0.6.14/distribute.egg-info/PKG-INFO 2010-07-15 02:14:10.000000000 +0200 +++ new/distribute-0.6.17/distribute.egg-info/PKG-INFO 2011-05-30 17:58:22.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: distribute -Version: 0.6.14 +Version: 0.6.17 Summary: Easily download, build, install, upgrade, and uninstall Python packages Home-page: http://packages.python.org/distribute Author: The fellowship of the packaging @@ -107,9 +107,9 @@ Download the source tarball, uncompress it, then run the install command:: - $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz - $ tar -xzvf distribute-0.6.14.tar.gz - $ cd distribute-0.6.14 + $ curl -O http://pypi.python.org/packages/source/d/distribute/distribute-0.6.17.tar.gz + $ tar -xzvf distribute-0.6.17.tar.gz + $ cd distribute-0.6.17 $ python setup.py install --------------------------- @@ -239,6 +239,37 @@ ======= ------ + 0.6.17 + ------ + + * Support 'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT' environment + variable to allow to disable installation of easy_install-${version} script. + * Support Python >=3.1.4 and >=3.2.1. + * Issue 204: Don't try to import the parent of a namespace package in + declare_namespace + * Issue 196: Tolerate responses with multiple Content-Length headers + * Issue 205: Sandboxing doesn't preserve working_set. Leads to setup_requires + problems. + + ------ + 0.6.16 + ------ + + * Builds sdist gztar even on Windows (avoiding Issue 193). + * Issue 192: Fixed metadata omitted on Windows when package_dir + specified with forward-slash. + * Issue 195: Cython build support. + * Issue 200: Issues with recognizing 64-bit packages on Windows. + + ------ + 0.6.15 + ------ + + * Fixed typo in bdist_egg + * Several issues under Python 3 has been solved. + * Issue 146: Fixed missing DLL files after easy_install of windows exe package. + + ------ 0.6.14 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/distribute.egg-info/SOURCES.txt new/distribute-0.6.17/distribute.egg-info/SOURCES.txt --- old/distribute-0.6.14/distribute.egg-info/SOURCES.txt 2010-07-15 02:14:11.000000000 +0200 +++ new/distribute-0.6.17/distribute.egg-info/SOURCES.txt 2011-05-30 17:58:23.000000000 +0200 @@ -14,6 +14,7 @@ distribute.egg-info/SOURCES.txt distribute.egg-info/dependency_links.txt distribute.egg-info/entry_points.txt +distribute.egg-info/entry_points.txt.orig distribute.egg-info/top_level.txt distribute.egg-info/zip-safe docs/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/distribute.egg-info/entry_points.txt.orig new/distribute-0.6.17/distribute.egg-info/entry_points.txt.orig --- old/distribute-0.6.14/distribute.egg-info/entry_points.txt.orig 1970-01-01 01:00:00.000000000 +0100 +++ new/distribute-0.6.17/distribute.egg-info/entry_points.txt.orig 2011-05-26 12:12:27.000000000 +0200 @@ -0,0 +1,61 @@ +[distutils.commands] +bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm +rotate = setuptools.command.rotate:rotate +develop = setuptools.command.develop:develop +setopt = setuptools.command.setopt:setopt +build_py = setuptools.command.build_py:build_py +saveopts = setuptools.command.saveopts:saveopts +egg_info = setuptools.command.egg_info:egg_info +register = setuptools.command.register:register +upload_docs = setuptools.command.upload_docs:upload_docs +install_egg_info = setuptools.command.install_egg_info:install_egg_info +alias = setuptools.command.alias:alias +easy_install = setuptools.command.easy_install:easy_install +install_scripts = setuptools.command.install_scripts:install_scripts +bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst +bdist_egg = setuptools.command.bdist_egg:bdist_egg +install = setuptools.command.install:install +test = setuptools.command.test:test +install_lib = setuptools.command.install_lib:install_lib +build_ext = setuptools.command.build_ext:build_ext +sdist = setuptools.command.sdist:sdist + +[egg_info.writers] +dependency_links.txt = setuptools.command.egg_info:overwrite_arg +requires.txt = setuptools.command.egg_info:write_requirements +PKG-INFO = setuptools.command.egg_info:write_pkg_info +eager_resources.txt = setuptools.command.egg_info:overwrite_arg +top_level.txt = setuptools.command.egg_info:write_toplevel_names +namespace_packages.txt = setuptools.command.egg_info:overwrite_arg +entry_points.txt = setuptools.command.egg_info:write_entries +depends.txt = setuptools.command.egg_info:warn_depends_obsolete + +[console_scripts] +easy_install = setuptools.command.easy_install:main +easy_install-2.6 = setuptools.command.easy_install:main + +[setuptools.file_finders] +svn_cvs = setuptools.command.sdist:_default_revctrl + +[distutils.setup_keywords] +dependency_links = setuptools.dist:assert_string_list +entry_points = setuptools.dist:check_entry_points +extras_require = setuptools.dist:check_extras +package_data = setuptools.dist:check_package_data +install_requires = setuptools.dist:check_requirements +use_2to3 = setuptools.dist:assert_bool +use_2to3_fixers = setuptools.dist:assert_string_list +include_package_data = setuptools.dist:assert_bool +exclude_package_data = setuptools.dist:check_package_data +namespace_packages = setuptools.dist:check_nsp +test_suite = setuptools.dist:check_test_suite +eager_resources = setuptools.dist:assert_string_list +zip_safe = setuptools.dist:assert_bool +test_loader = setuptools.dist:check_importable +packages = setuptools.dist:check_packages +convert_2to3_doctests = setuptools.dist:assert_string_list +tests_require = setuptools.dist:check_requirements + +[setuptools.installation] +eggsecutable = setuptools.command.easy_install:bootstrap + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/distribute_setup.py new/distribute-0.6.17/distribute_setup.py --- old/distribute-0.6.14/distribute_setup.py 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/distribute_setup.py 2011-05-16 14:05:34.000000000 +0200 @@ -46,7 +46,7 @@ args = [quote(arg) for arg in args] return os.spawnl(os.P_WAIT, sys.executable, *args) == 0 -DEFAULT_VERSION = "0.6.13" +DEFAULT_VERSION = "0.6.17" DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/" SETUPTOOLS_FAKED_VERSION = "0.6c11" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/docs/conf.py new/distribute-0.6.17/docs/conf.py --- old/distribute-0.6.14/docs/conf.py 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/docs/conf.py 2011-05-16 14:05:34.000000000 +0200 @@ -41,16 +41,16 @@ # General information about the project. project = u'Distribute' -copyright = u'2009, The fellowship of the packaging' +copyright = u'2009-2011, The fellowship of the packaging' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '0.6.14' +version = '0.6.17' # The full version, including alpha/beta/rc tags. -release = '0.6.14' +release = '0.6.17' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/docs/index.txt new/distribute-0.6.17/docs/index.txt --- old/distribute-0.6.14/docs/index.txt 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/docs/index.txt 2011-05-30 17:55:12.000000000 +0200 @@ -28,3 +28,9 @@ .. image:: http://python-distribute.org/pip_distribute.png Design done by Idan Gazit (http://pixane.com) - License: cc-by-3.0 + +Copy & paste:: + + curl -O http://python-distribute.org/distribute_setup.py + python distribute_setup.py + easy_install pip \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/docs/setuptools.txt new/distribute-0.6.17/docs/setuptools.txt --- old/distribute-0.6.14/docs/setuptools.txt 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/docs/setuptools.txt 2011-05-20 09:48:10.000000000 +0200 @@ -2519,7 +2519,7 @@ Your function should accept three arguments: the ``Distribution`` object, the attribute name, and the attribute value. It should raise a -``DistutilsSetupError`` (from the ``distutils.error`` module) if the argument +``DistutilsSetupError`` (from the ``distutils.errors`` module) if the argument is invalid. Remember, your function will only be called with non-None values, and the default value of arguments defined this way is always None. So, your commands should always be prepared for the possibility that the attribute will diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/pkg_resources.py new/distribute-0.6.17/pkg_resources.py --- old/distribute-0.6.14/pkg_resources.py 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/pkg_resources.py 2011-05-26 12:13:22.000000000 +0200 @@ -52,9 +52,41 @@ mkdir(dirname, mode) +_state_vars = {} +def _declare_state(vartype, **kw): + g = globals() + for name, val in kw.iteritems(): + g[name] = val + _state_vars[name] = vartype + +def __getstate__(): + state = {} + g = globals() + for k, v in _state_vars.iteritems(): + state[k] = g['_sget_'+v](g[k]) + return state + +def __setstate__(state): + g = globals() + for k, v in state.iteritems(): + g['_sset_'+_state_vars[k]](k, g[k], v) + return state +def _sget_dict(val): + return val.copy() +def _sset_dict(key, ob, state): + ob.clear() + ob.update(state) + +def _sget_object(val): + return val.__getstate__() + +def _sset_object(key, ob, state): + ob.__setstate__(state) + +_sget_none = _sset_none = lambda *args: None @@ -672,12 +704,15 @@ for callback in self.callbacks: callback(dist) - - - - - - + def __getstate__(self): + return (self.entries[:], self.entry_keys.copy(), self.by_key.copy(), + self.callbacks[:]) + + def __setstate__(self, (entries, keys, by_key, callbacks)): + self.entries = entries[:] + self.entry_keys = keys.copy() + self.by_key = by_key.copy() + self.callbacks = callbacks[:] @@ -1638,7 +1673,7 @@ -_distribution_finders = {} +_declare_state('dict', _distribution_finders = {}) def register_finder(importer_type, distribution_finder): """Register `distribution_finder` to find distributions in sys.path items @@ -1720,8 +1755,9 @@ break register_finder(ImpWrapper,find_on_path) -_namespace_handlers = {} -_namespace_packages = {} +_declare_state('dict', _namespace_handlers={}) +_declare_state('dict', _namespace_packages={}) + def register_namespace_handler(importer_type, namespace_handler): """Register `namespace_handler` to declare namespace packages @@ -1773,11 +1809,12 @@ if '.' in packageName: parent = '.'.join(packageName.split('.')[:-1]) declare_namespace(parent) - __import__(parent) - try: - path = sys.modules[parent].__path__ - except AttributeError: - raise TypeError("Not a package:", parent) + if parent not in _namespace_packages: + __import__(parent) + try: + path = sys.modules[parent].__path__ + except AttributeError: + raise TypeError("Not a package:", parent) # Track what packages are namespaces, so when new path items are added, # they can be updated @@ -2650,7 +2687,7 @@ os.open = old_open # and then put it back -# Set up global resource manager +# Set up global resource manager (deliberately not state-saved) _manager = ResourceManager() def _initialize(g): for name in dir(_manager): @@ -2659,7 +2696,8 @@ _initialize(globals()) # Prepare the master working set and make the ``require()`` API available -working_set = WorkingSet() +_declare_state('object', working_set = WorkingSet()) + try: # Does the main program list any requirements? from __main__ import __requires__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/setup.cfg new/distribute-0.6.17/setup.cfg --- old/distribute-0.6.14/setup.cfg 2010-07-15 02:14:11.000000000 +0200 +++ new/distribute-0.6.17/setup.cfg 2011-05-30 17:58:23.000000000 +0200 @@ -11,6 +11,9 @@ [upload_docs] upload-dir = docs/build/html +[sdist] +formats = gztar + [aliases] release = egg_info -RDb '' binary = bdist_egg upload --show-response diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/setup.py new/distribute-0.6.17/setup.py --- old/distribute-0.6.14/setup.py 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/setup.py 2011-05-30 17:57:09.000000000 +0200 @@ -37,7 +37,7 @@ exec(open(init_path).read(), d) SETUP_COMMANDS = d['__all__'] -VERSION = "0.6.14" +VERSION = "0.6.17" from setuptools import setup, find_packages from setuptools.command.build_py import build_py as _build_py @@ -45,6 +45,10 @@ scripts = [] +console_scripts = ["easy_install = setuptools.command.easy_install:main"] +if os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") is None: + console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]) + # specific command that is used to generate windows .exe files class build_py(_build_py): def build_package_data(self): @@ -182,11 +186,7 @@ "dependency_links.txt = setuptools.command.egg_info:overwrite_arg", ], - "console_scripts": [ - "easy_install = setuptools.command.easy_install:main", - "easy_install-%s = setuptools.command.easy_install:main" - % sys.version[:3] - ], + "console_scripts": console_scripts, "setuptools.file_finders": ["svn_cvs = setuptools.command.sdist:_default_revctrl"], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/setuptools/command/bdist_egg.py new/distribute-0.6.17/setuptools/command/bdist_egg.py --- old/distribute-0.6.14/setuptools/command/bdist_egg.py 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/setuptools/command/bdist_egg.py 2011-05-16 14:05:34.000000000 +0200 @@ -332,7 +332,11 @@ def copy_metadata_to(self, target_dir): - prefix = os.path.join(self.egg_info,'') + "Copy metadata (egg info) to the target_dir" + # normalize the path (so that a forward-slash in egg_info will + # match using startswith below) + norm_egg_info = os.path.normpath(self.egg_info) + prefix = os.path.join(norm_egg_info,'') for path in self.ei_cmd.filelist.files: if path.startswith(prefix): target = os.path.join(target_dir, path[len(prefix):]) @@ -535,6 +539,6 @@ z.close() else: for dirname, dirs, files in os.walk(base_dir): - visit(None, dirname, file) + visit(None, dirname, files) return zip_filename # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/setuptools/command/easy_install.py new/distribute-0.6.17/setuptools/command/easy_install.py --- old/distribute-0.6.14/setuptools/command/easy_install.py 2010-07-15 01:59:21.000000000 +0200 +++ new/distribute-0.6.17/setuptools/command/easy_install.py 2011-05-16 14:05:34.000000000 +0200 @@ -15,6 +15,7 @@ from setuptools import Command, _dont_write_bytecode from setuptools.sandbox import run_setup from distutils import log, dir_util +from distutils.util import get_platform from distutils.util import convert_path, subst_vars from distutils.sysconfig import get_python_lib, get_config_vars from distutils.errors import DistutilsArgError, DistutilsOptionError, \ @@ -202,6 +203,8 @@ 'prefix': prefix, 'sys_exec_prefix': exec_prefix, 'exec_prefix': exec_prefix, + # Only python 3.2+ has abiflags + 'abiflags': getattr(sys, 'abiflags', ''), } if HAS_USER_SITE: @@ -377,7 +380,7 @@ def check_site_dir(self): """Verify that self.install_dir is .pth-capable dir, if needed""" - print 'install_dir', self.install_dir + instdir = normalize_path(self.install_dir) pth_file = os.path.join(instdir,'easy-install.pth') @@ -852,7 +855,7 @@ # Create a dummy distribution object until we build the real distro dist = Distribution(None, project_name=cfg.get('metadata','name'), - version=cfg.get('metadata','version'), platform="win32" + version=cfg.get('metadata','version'), platform=get_platform() ) # Convert the .exe to an unpacked egg @@ -1445,7 +1448,8 @@ prefixes = [ ('PURELIB/', ''), ('PLATLIB/pywin32_system32', ''), ('PLATLIB/', ''), - ('SCRIPTS/', 'EGG-INFO/scripts/') + ('SCRIPTS/', 'EGG-INFO/scripts/'), + ('DATA/LIB/site-packages', ''), ] z = zipfile.ZipFile(exe_filename) try: @@ -1586,6 +1590,11 @@ def get_script_header(script_text, executable=sys_executable, wininst=False): """Create a #! line, getting options (if any) from script_text""" from distutils.command.build_scripts import first_line_re + + # first_line_re in Python >=3.1.4 and >=3.2.1 is a bytes pattern. + if not isinstance(first_line_re.pattern, str): + first_line_re = re.compile(first_line_re.pattern.decode()) + first = (script_text+'\n').splitlines()[0] match = first_line_re.match(first) options = '' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/setuptools/dist.py new/distribute-0.6.17/setuptools/dist.py --- old/distribute-0.6.14/setuptools/dist.py 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/setuptools/dist.py 2011-05-26 12:13:22.000000000 +0200 @@ -266,6 +266,7 @@ """Fetch an egg needed for building""" try: cmd = self._egg_fetcher + cmd.package_index.to_scan = [] except AttributeError: from setuptools.command.easy_install import easy_install dist = self.__class__({'script_args':['easy_install']}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/setuptools/extension.py new/distribute-0.6.17/setuptools/extension.py --- old/distribute-0.6.14/setuptools/extension.py 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/setuptools/extension.py 2011-05-16 14:05:34.000000000 +0200 @@ -2,12 +2,16 @@ from setuptools.dist import _get_unpatched _Extension = _get_unpatched(_Extension) -try: - from Pyrex.Distutils.build_ext import build_ext -except ImportError: - have_pyrex = False -else: - have_pyrex = True +# Prefer Cython to Pyrex +pyrex_impls = 'Cython.Distutils.build_ext', 'Pyrex.Distutils.build_ext' +for pyrex_impl in pyrex_impls: + try: + # from (pyrex_impl) import build_ext + build_ext = __import__(pyrex_impl, fromlist=['build_ext']).build_ext + break + except: + pass +have_pyrex = 'build_ext' in globals() class Extension(_Extension): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/setuptools/package_index.py new/distribute-0.6.17/setuptools/package_index.py --- old/distribute-0.6.14/setuptools/package_index.py 2010-07-15 01:56:32.000000000 +0200 +++ new/distribute-0.6.17/setuptools/package_index.py 2011-05-16 14:21:31.000000000 +0200 @@ -1,5 +1,5 @@ """PyPI and direct package downloading""" -import sys, os.path, re, urlparse, urllib2, shutil, random, socket, cStringIO +import sys, os.path, re, urlparse, urllib, urllib2, shutil, random, socket, cStringIO import httplib from pkg_resources import * from distutils import log @@ -31,16 +31,25 @@ """Return (base,pyversion) or (None,None) for possible .exe name""" lower = name.lower() - base, py_ver = None, None + base, py_ver, plat = None, None, None if lower.endswith('.exe'): if lower.endswith('.win32.exe'): base = name[:-10] + plat = 'win32' elif lower.startswith('.win32-py',-16): py_ver = name[-7:-4] base = name[:-16] + plat = 'win32' + elif lower.endswith('.win-amd64.exe'): + base = name[:-14] + plat = 'win-amd64' + elif lower.startswith('.win-amd64-py',-20): + py_ver = name[-7:-4] + base = name[:-20] + plat = 'win-amd64' + return base,py_ver,plat - return base,py_ver def egg_info_for_url(url): scheme, server, path, parameters, query, fragment = urlparse.urlparse(url) @@ -69,10 +78,10 @@ return [Distribution.from_location(location, basename, metadata)] if basename.endswith('.exe'): - win_base, py_ver = parse_bdist_wininst(basename) + win_base, py_ver, platform = parse_bdist_wininst(basename) if win_base is not None: return interpret_distro_name( - location, win_base, metadata, py_ver, BINARY_DIST, "win32" + location, win_base, metadata, py_ver, BINARY_DIST, platform ) # Try source distro extensions (.zip, .tgz, etc.) @@ -199,8 +208,12 @@ base = f.url # handle redirects page = f.read() - if sys.version_info >= (3,): - charset = f.headers.get_param('charset') or 'latin-1' + if not isinstance(page, str): # We are in Python 3 and got bytes. We want str. + if isinstance(f, urllib2.HTTPError): + # Errors have no charset, assume latin1: + charset = 'latin-1' + else: + charset = f.headers.get_param('charset') or 'latin-1' page = page.decode(charset, "ignore") f.close() for match in HREF.finditer(page): @@ -566,7 +579,9 @@ bs = self.dl_blocksize size = -1 if "content-length" in headers: - size = int(headers["Content-Length"]) + # Some servers return multiple Content-Length headers :( + content_length = headers.getheaders("Content-Length")[0] + size = int(content_length) self.reporthook(url, filename, blocknum, bs, size) tfp = open(filename,'wb') while True: @@ -642,7 +657,7 @@ if scheme=='svn' or scheme.startswith('svn+'): return self._download_svn(url, filename) elif scheme=='file': - return urllib2.url2pathname(urlparse.urlparse(url)[2]) + return urllib.url2pathname(urlparse.urlparse(url)[2]) else: self.url_ok(url, True) # raises error if not allowed return self._attempt_download(url, filename) @@ -791,7 +806,7 @@ def local_open(url): """Read a local path, with special support for directories""" scheme, server, path, param, query, frag = urlparse.urlparse(url) - filename = urllib2.url2pathname(path) + filename = urllib.url2pathname(path) if os.path.isfile(filename): return urllib2.urlopen(url) elif path.endswith('/') and os.path.isdir(filename): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/setuptools/sandbox.py new/distribute-0.6.17/setuptools/sandbox.py --- old/distribute-0.6.14/setuptools/sandbox.py 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/setuptools/sandbox.py 2011-05-26 12:13:22.000000000 +0200 @@ -1,4 +1,4 @@ -import os, sys, __builtin__, tempfile, operator +import os, sys, __builtin__, tempfile, operator, pkg_resources _os = sys.modules[os.name] try: _file = file @@ -19,6 +19,7 @@ if not os.path.isdir(temp_dir): os.makedirs(temp_dir) save_tmp = tempfile.tempdir save_modules = sys.modules.copy() + pr_state = pkg_resources.__getstate__() try: tempfile.tempdir = temp_dir os.chdir(setup_dir) @@ -36,6 +37,7 @@ raise # Normal exit, just return finally: + pkg_resources.__setstate__(pr_state) sys.modules.update(save_modules) for key in list(sys.modules): if key not in save_modules: del sys.modules[key] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/setuptools/tests/test_develop.py new/distribute-0.6.17/setuptools/tests/test_develop.py --- old/distribute-0.6.14/setuptools/tests/test_develop.py 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/setuptools/tests/test_develop.py 2011-05-30 17:55:12.000000000 +0200 @@ -43,7 +43,7 @@ site.USER_SITE = self.old_site def test_develop(self): - if sys.version < "2.6": + if sys.version < "2.6" or hasattr(sys, 'real_prefix'): return dist = Distribution() dist.script_name = 'setup.py' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/setuptools/tests/test_packageindex.py new/distribute-0.6.17/setuptools/tests/test_packageindex.py --- old/distribute-0.6.14/setuptools/tests/test_packageindex.py 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/setuptools/tests/test_packageindex.py 2011-05-16 14:05:34.000000000 +0200 @@ -108,5 +108,14 @@ # the link should be from the index self.assert_('correct_md5' in pi['foobar'][0].location) + def test_parse_bdist_wininst(self): + self.assertEqual(setuptools.package_index.parse_bdist_wininst( + 'reportlab-2.5.win32-py2.4.exe'), ('reportlab-2.5', '2.4', 'win32')) + self.assertEqual(setuptools.package_index.parse_bdist_wininst( + 'reportlab-2.5.win32.exe'), ('reportlab-2.5', None, 'win32')) + self.assertEqual(setuptools.package_index.parse_bdist_wininst( + 'reportlab-2.5.win-amd64-py2.7.exe'), ('reportlab-2.5', '2.7', 'win-amd64')) + self.assertEqual(setuptools.package_index.parse_bdist_wininst( + 'reportlab-2.5.win-amd64.exe'), ('reportlab-2.5', None, 'win-amd64')) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/distribute-0.6.14/setuptools/tests/test_resources.py new/distribute-0.6.17/setuptools/tests/test_resources.py --- old/distribute-0.6.14/setuptools/tests/test_resources.py 2010-07-15 01:53:38.000000000 +0200 +++ new/distribute-0.6.17/setuptools/tests/test_resources.py 2011-05-20 09:48:10.000000000 +0200 @@ -3,7 +3,7 @@ # NOTE: the shebang and encoding lines are for ScriptHeaderTests; do not remove from unittest import TestCase, makeSuite; from pkg_resources import * from setuptools.command.easy_install import get_script_header, is_sh -import os, pkg_resources, sys, StringIO +import os, pkg_resources, sys, StringIO, tempfile, shutil try: frozenset except NameError: from sets import ImmutableSet as frozenset @@ -563,3 +563,29 @@ sys.platform = platform sys.stdout = stdout + + + +class NamespaceTests(TestCase): + + def setUp(self): + self._ns_pkgs = pkg_resources._namespace_packages.copy() + self._tmpdir = tempfile.mkdtemp(prefix="tests-distribute-") + sys.path.append(self._tmpdir) + + def tearDown(self): + shutil.rmtree(self._tmpdir) + pkg_resources._namespace_packages = self._ns_pkgs.copy() + sys.path.remove(self._tmpdir) + + def test_two_levels_deep(self): + os.makedirs(os.path.join(self._tmpdir, "pkg1", "pkg2")) + declare_namespace("pkg1") + self.assertTrue("pkg1" in pkg_resources._namespace_packages.keys()) + try: + declare_namespace("pkg1.pkg2") + except ImportError, e: + self.fail("Distribute tried to import the parent namespace package") + self.assertTrue("pkg1.pkg2" in pkg_resources._namespace_packages.keys()) + self.assertEqual(pkg_resources._namespace_packages["pkg1"], ["pkg1.pkg2"]) + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 suspend for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package suspend for openSUSE:Factory checked in at Tue May 31 16:37:35 CEST 2011. -------- --- suspend/suspend.changes 2010-08-02 13:12:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/suspend/suspend.changes 2011-05-24 10:41:59.000000000 +0200 @@ -1,0 +2,8 @@ +Wed May 18 13:11:24 CEST 2011 - hmacht(a)suse.de + +- update to 1.0 +- remove suspend-0.80-opensuse.org.diff +- remove suspend-0.80-fix-s2both-resume-hacks.diff +- refresh patches + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- suspend-0.8.20100129.tar.bz2 suspend-0.80-fix-s2both-resume-hacks.diff suspend-0.80-opensuse.org.diff New: ---- suspend-utils-1.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ suspend.spec ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package suspend (Version 0.80.20100129) +# spec file for package suspend # -# 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 @@ -31,15 +31,13 @@ %ifarch %ix86 x86_64 BuildRequires: libx86-devel %endif -%define GITDATE 20100129 -Version: 0.80.%{GITDATE} -Release: 6 -%define tarversion 0.8.%{GITDATE} +Version: 1.0 +Release: 1 Summary: A Set Of Tools To Support Sleep Modes License: GPLv2+ Url: http://sourceforge.net/projects/suspend Group: System/Console -Source: %name-%{tarversion}.tar.bz2 +Source: %name-utils-%{version}.tar.bz2 Source2: configure-suspend-encryption.sh Source3: README.scripts Source4: mkinitrd-boot.kernel.sh @@ -50,13 +48,11 @@ Patch4: suspend-disable-bootsplash.diff Patch5: suspend-default-splash.diff Patch6: suspend-0.80-dont-return-eintr-on-abort.diff -Patch7: suspend-0.80-fix-s2both-resume-hacks.diff Patch10: suspend-0.80-keygen-new-defaults.diff Patch11: suspend-0.80-make-whitelist-test.diff Patch12: suspend-buildfixes.diff Patch13: suspend-0.80-vbetool-retry-on-errors.diff Patch16: suspend-splash-verbose-debug.diff -Patch99: suspend-0.80-opensuse.org.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 %if 0%{?suse_version} @@ -76,20 +72,18 @@ and others. %prep -%setup -q -n suspend-%{tarversion} +%setup -q -n suspend-utils-%{version} %patch1 -p1 %patch2 -p0 %patch3 -p0 %patch4 -p0 %patch5 -p0 %patch6 -p1 -%patch7 -p1 %patch10 -p1 %patch11 -p0 %patch12 -p0 %patch13 -p0 %patch16 -p1 -%patch99 -p1 cp %{S:3} scripts/ #cp -vb --suffix=-0.5 %{S:99} whitelist.c ++++++ suspend-0.80-dont-return-eintr-on-abort.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -1,8 +1,8 @@ -Index: b/suspend.c +Index: suspend-utils-1.0/suspend.c =================================================================== ---- a/suspend.c -+++ b/suspend.c -@@ -1261,6 +1261,11 @@ Shutdown: +--- suspend-utils-1.0.orig/suspend.c ++++ suspend-utils-1.0/suspend.c +@@ -1794,6 +1794,11 @@ Shutdown: Unfreeze: unfreeze(snapshot_fd); ++++++ suspend-0.80-make-whitelist-test.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -1,11 +1,8 @@ Index: Makefile.am =================================================================== -RCS file: /cvsroot/suspend/suspend/Makefile.am,v -retrieving revision 1.6 -diff -u -p -r1.6 Makefile.am ---- Makefile.am 16 Apr 2008 15:27:36 -0000 1.6 -+++ Makefile.am 16 Apr 2008 16:43:25 -0000 -@@ -176,3 +176,9 @@ install-resume-new-initrd: resume +--- Makefile.am.orig ++++ Makefile.am +@@ -192,3 +192,9 @@ install-resume-new-initrd: resume install-resume-on-initrd: resume BOOT_DIR=$(DESTDIR)$(bootdir) ./scripts/install-resume.sh ++++++ suspend-0.80-vbetool-retry-on-errors.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- s2ram-x86.c.orig +++ s2ram-x86.c -@@ -321,6 +321,7 @@ int s2ram_do(void) +@@ -319,6 +319,7 @@ int s2ram_do(void) void s2ram_resume(void) { @@ -10,7 +10,7 @@ if (flags & PCI_SAVE) { printf("restoring PCI config of device %02x:%02x.%d\n", vga_dev.bus, vga_dev.dev, vga_dev.func); -@@ -330,19 +331,36 @@ void s2ram_resume(void) +@@ -328,19 +329,36 @@ void s2ram_resume(void) } // FIXME: can we call vbetool_init() multiple times without cleaning up? if (flags & VBE_POST) { ++++++ suspend-buildfixes.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- Makefile.am.orig +++ Makefile.am -@@ -77,7 +77,7 @@ common_s2ram_libs= +@@ -78,7 +78,7 @@ common_s2ram_libs= if ENABLE_SPLASHY AM_CFLAGS+=\ @@ -15,7 +15,7 @@ =================================================================== --- configure.ac.orig +++ configure.ac -@@ -260,7 +260,7 @@ fi +@@ -281,7 +281,7 @@ fi # workaround for old autoconf if test -z "${docdir}"; then ++++++ suspend-default-compress.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- suspend.c.orig +++ suspend.c -@@ -1768,13 +1768,15 @@ int main(int argc, char *argv[]) +@@ -2295,13 +2295,15 @@ int main(int argc, char *argv[]) if (compute_checksum != 'y' && compute_checksum != 'Y') compute_checksum = 0; #ifdef CONFIG_COMPRESS ++++++ suspend-default-splash.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- resume.c.orig +++ resume.c -@@ -421,10 +421,10 @@ int main(int argc, char *argv[]) +@@ -432,10 +432,10 @@ int main(int argc, char *argv[]) if (error) return -error; @@ -20,7 +20,7 @@ =================================================================== --- suspend.c.orig +++ suspend.c -@@ -1782,10 +1782,10 @@ int main(int argc, char *argv[]) +@@ -2309,10 +2309,10 @@ int main(int argc, char *argv[]) if (do_encrypt != 'y' && do_encrypt != 'Y') do_encrypt = 0; #endif ++++++ suspend-disable-bootsplash.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -1,6 +1,8 @@ ---- splash.c +Index: splash.c +=================================================================== +--- splash.c.orig +++ splash.c -@@ -85,7 +85,7 @@ +@@ -207,7 +207,7 @@ void splash_prepare(struct splash *splas printf("Looking for splash system... "); ++++++ suspend-splash-verbose-debug.diff ++++++ --- /var/tmp/diff_new_pack.pMUDuo/_old 2011-05-31 16:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.pMUDuo/_new 2011-05-31 16:36:54.000000000 +0200 @@ -1,8 +1,8 @@ -Index: b/resume.c +Index: suspend-utils-1.0/resume.c =================================================================== ---- a/resume.c -+++ b/resume.c -@@ -201,6 +201,13 @@ static void pause_resume(int pause) +--- suspend-utils-1.0.orig/resume.c ++++ suspend-utils-1.0/resume.c +@@ -213,6 +213,13 @@ static void pause_resume(int pause) splash.set_caption(message); printf("%s: %s", my_name, message); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 telepathy-idle for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package telepathy-idle for openSUSE:Factory checked in at Tue May 31 16:36:32 CEST 2011. -------- --- telepathy-idle/telepathy-idle.changes 2011-04-11 15:53:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/telepathy-idle/telepathy-idle.changes 2011-05-18 17:41:53.000000000 +0200 @@ -1,0 +2,17 @@ +Wed May 18 17:35:23 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 0.1.10: + + Enhancements: + - The ContactInfo interface is now implemented, allowing you to + discover contacts' real names and other attributes exposed + via /whois in the IRC protocol [fdo#34796] + + Fixes: + - Should send keep-alive packets to detect dropped connections + [fdo#35058] + - Use AM_PATH_PYTHON to check for more Python versions instead + of check for each binary [fdo#36624] + - NewChannels fired twice when connecting to a bip account + [fdo#28918] + - Pass the message type to tp_cm_message_new_text [fdo#37038] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- telepathy-idle-0.1.9.tar.bz2 New: ---- telepathy-idle-0.1.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-idle.spec ++++++ --- /var/tmp/diff_new_pack.3UATYl/_old 2011-05-31 16:36:14.000000000 +0200 +++ /var/tmp/diff_new_pack.3UATYl/_new 2011-05-31 16:36:14.000000000 +0200 @@ -19,7 +19,7 @@ Name: telepathy-idle -Version: 0.1.9 +Version: 0.1.10 Release: 1 License: LGPLv2.1+ BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ telepathy-idle-0.1.9.tar.bz2 -> telepathy-idle-0.1.10.tar.bz2 ++++++ ++++ 10449 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit telepathy-logger for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package telepathy-logger for openSUSE:Factory checked in at Tue May 31 16:36:05 CEST 2011. -------- --- GNOME/telepathy-logger/telepathy-logger.changes 2011-04-21 12:12:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/telepathy-logger/telepathy-logger.changes 2011-05-27 10:01:34.000000000 +0200 @@ -1,0 +2,22 @@ +Fri May 27 10:00:03 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 0.2.10: + + Add support for text message edits + + Fix events ordering and merging speed + + Fix destroy function for get_entities_async + + Fix crash in pidgin log store. + +------------------------------------------------------------------- +Wed May 18 17:35:40 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 0.2.9: + + Work around GLib TimeZone cache bug [bgo#646435] + + Fix client file to effectively observe Call.DRAFT channels + + Downgraded autotools requirement to 2.65 + + Fix SQL syntax error and pending message order + + Store Calls log in separate file (e.g 20110505.call.log), to + fix performance issues. + + Make Pidgin store robust to empty file + + And more unit tests. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- telepathy-logger-0.2.8.tar.bz2 New: ---- telepathy-logger-0.2.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-logger.spec ++++++ --- /var/tmp/diff_new_pack.D3yuR9/_old 2011-05-31 16:35:46.000000000 +0200 +++ /var/tmp/diff_new_pack.D3yuR9/_new 2011-05-31 16:35:46.000000000 +0200 @@ -18,7 +18,7 @@ Name: telepathy-logger -Version: 0.2.8 +Version: 0.2.10 Release: 1 License: LGPLv2.1+ Summary: Centralized Logging for the Telepathy Framework ++++++ telepathy-logger-0.2.8.tar.bz2 -> telepathy-logger-0.2.10.tar.bz2 ++++++ ++++ 7906 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit telepathy-mission-control for openSUSE:Factory
by root＠hilbert.suse.de 31 May '11

31 May '11

Hello community, here is the log from the commit of package telepathy-mission-control for openSUSE:Factory checked in at Tue May 31 16:35:38 CEST 2011. -------- --- GNOME/telepathy-mission-control/telepathy-mission-control.changes 2011-04-22 14:05:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/telepathy-mission-control/telepathy-mission-control.changes 2011-05-27 00:03:29.000000000 +0200 @@ -1,0 +2,43 @@ +Thu May 19 18:53:11 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 5.9.0: + + Enhancements: + - DelegateChannels and PresentChannel from spec version 0.23.2 + have been implemented. + + Fixes: + - fdo#36483: All tests now pass, even with newer tp-glib. + - Implementation of the draft ChannelDispatcher.Messages + interface did not correctly handle all internal requests + which should have been dispatched to an existing channel. + +------------------------------------------------------------------- +Wed May 18 17:35:56 CEST 2011 - dimstar(a)opensuse.org + +- Update to version 5.7.11: + + Enhancements: + - fdo#36845: dispatch operation policy plugins can implement + handler_is_suitable_async(), to say whether a Handler is + acceptable for a particular dispatch operation + - All members of McpDBusAclIface may be NULL + - The McpDispatchOperationPolicyIface struct is directly + visible to plugins + - The implementation vtable of MCP plugin classes is no longer + concealed, and maybe assigned to directly by implementations + instead of using the _implement methods + - More/better documentation for the MCP plugin classes + + Fixes: + - If enabled, the Aegis plugin is now statically linked into + the MC executable rather than being a loadable module + - Account plugins are no longer added to the cached list + repeatedly +- Changes from version 5.7.10: + + Enhancements: + - Use the new arg0namespace matching to watch only interesting + DBus name-owner-changed signals if DBus is new enough to + allow this + + Fixes: + - Setting changes originating in storage backends (e.g. + libaccounts) were not necessarily propagated to CMs if they + were not parameters. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- telepathy-mission-control-5.7.9.tar.bz2 New: ---- telepathy-mission-control-5.9.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-mission-control.spec ++++++ --- /var/tmp/diff_new_pack.OkyCSk/_old 2011-05-31 16:33:49.000000000 +0200 +++ /var/tmp/diff_new_pack.OkyCSk/_new 2011-05-31 16:33:49.000000000 +0200 @@ -19,7 +19,7 @@ Url: http://mission-control.sourceforge.net/ Name: telepathy-mission-control -Version: 5.7.9 +Version: 5.9.0 Release: 1 License: LGPLv2.1 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ telepathy-mission-control-5.7.9.tar.bz2 -> telepathy-mission-control-5.9.0.tar.bz2 ++++++ ++++ 45659 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0