Hello community, here is the log from the commit of package perl-File-Tail for openSUSE:Factory checked in at 2015-04-21 10:52:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-File-Tail (Old) and /work/SRC/openSUSE:Factory/.perl-File-Tail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-File-Tail" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-File-Tail/perl-File-Tail.changes 2015-02-10 20:21:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-File-Tail.new/perl-File-Tail.changes 2015-04-21 10:52:41.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 19 07:14:01 UTC 2015 - co...@suse.com + +- updated to 1.1 + see /usr/share/doc/packages/perl-File-Tail/Changes + +------------------------------------------------------------------- Old: ---- File-Tail-1.0.tar.gz New: ---- File-Tail-1.1.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-File-Tail.spec ++++++ --- /var/tmp/diff_new_pack.MANdqZ/_old 2015-04-21 10:52:42.000000000 +0200 +++ /var/tmp/diff_new_pack.MANdqZ/_new 2015-04-21 10:52:42.000000000 +0200 @@ -17,14 +17,15 @@ Name: perl-File-Tail -Version: 1.0 +Version: 1.1 Release: 0 %define cpan_name File-Tail -Summary: Perl extension for reading from continuously updated files -License: GPL-1.0+ or Artistic-1.0 +Summary: Perl extension for reading from continously updated files +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/File-Tail/ -Source: http://www.cpan.org/authors/id/M/MG/MGRABNAR/%{cpan_name}-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/M/MG/MGRABNAR/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -33,8 +34,8 @@ %description The primary purpose of File::Tail is reading and analysing log files while -they are being written, which is especialy useful if you are monitoring the -logging process with a tool like Tobias Oetiker's MRTG. +they are being written, which is especialy usefull if you are monitoring +the logging process with a tool like Tobias Oetiker's MRTG. The module tries very hard NOT to "busy-wait" on a file that has little traffic. Any time it reads new data from the file, it counts the number of ++++++ File-Tail-1.0.tar.gz -> File-Tail-1.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Tail-1.0/Changes new/File-Tail-1.1/Changes --- old/File-Tail-1.0/Changes 2014-12-03 12:33:47.000000000 +0100 +++ new/File-Tail-1.1/Changes 2015-04-16 16:51:03.000000000 +0200 @@ -105,4 +105,13 @@ 1.0 Actually just two minor bug fixes (one of them in a test), but I no longer see a point in not having a 1.0 version. - \ No newline at end of file + +1.1 Lee Duncan drew my attention to Stephan Muller's fixes for Windows compatibility + Changed the use of the system's mv command to using File::Copy in the + tests. (Steffen Mueller) + Added machine-readable license statement to Makefile.PL and thus + META.yml (Steffen Mueller) + The sixth test in 10/open.t is skipped on win32 because you can't just + move files around that are opened. (Steffen Mueller) + Due to using sysread and friends, there were newline problems on win32. + That should be fixed now. (Steffen Mueller) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Tail-1.0/MANIFEST new/File-Tail-1.1/MANIFEST --- old/File-Tail-1.0/MANIFEST 2014-12-03 12:25:51.000000000 +0100 +++ new/File-Tail-1.1/MANIFEST 2015-04-18 20:58:17.000000000 +0200 @@ -10,3 +10,4 @@ t/20tail.t t/30name_change.t META.yml Module meta-data (added by MakeMaker) +META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Tail-1.0/META.json new/File-Tail-1.1/META.json --- old/File-Tail-1.0/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/File-Tail-1.1/META.json 2015-04-18 20:58:17.000000000 +0200 @@ -0,0 +1,44 @@ +{ + "abstract" : "unknown", + "author" : [ + "unknown" + ], + "dynamic_config" : 1, + "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.142690", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";, + "version" : "2" + }, + "name" : "File-Tail", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "runtime" : { + "requires" : { + "File::stat" : "0", + "FileHandle" : "0", + "IO::Seekable" : "0", + "Time::HiRes" : "1.12" + } + } + }, + "release_status" : "stable", + "version" : "1.1" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Tail-1.0/META.yml new/File-Tail-1.1/META.yml --- old/File-Tail-1.0/META.yml 2014-12-03 12:40:06.000000000 +0100 +++ new/File-Tail-1.1/META.yml 2015-04-18 20:58:16.000000000 +0200 @@ -1,14 +1,25 @@ -# http://module-build.sourceforge.net/META-spec.html -#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# -name: File-Tail -version: 1.0 -version_from: Tail.pm.debug -installdirs: site +--- +abstract: unknown +author: + - unknown +build_requires: + ExtUtils::MakeMaker: '0' +configure_requires: + ExtUtils::MakeMaker: '0' +dynamic_config: 1 +generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.142690' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: '1.4' +name: File-Tail +no_index: + directory: + - t + - inc requires: - File::stat: 0 - FileHandle: 0 - IO::Seekable: 0 - Time::HiRes: 1.12 - -distribution_type: module -generated_by: ExtUtils::MakeMaker version 6.17 + File::stat: '0' + FileHandle: '0' + IO::Seekable: '0' + Time::HiRes: '1.12' +version: '1.1' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Tail-1.0/Makefile.PL new/File-Tail-1.1/Makefile.PL --- old/File-Tail-1.0/Makefile.PL 2014-12-03 12:25:51.000000000 +0100 +++ new/File-Tail-1.1/Makefile.PL 2015-04-16 16:52:47.000000000 +0200 @@ -77,6 +77,7 @@ WriteMakefile( 'NAME' => 'File::Tail', 'VERSION_FROM' => 'Tail.pm.debug', # finds $VERSION + 'LICENSE' => 'perl', 'PREREQ_PM' => { "FileHandle"=>0, "File::stat"=>0, "IO::Seekable"=>0, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Tail-1.0/Tail.pm new/File-Tail-1.1/Tail.pm --- old/File-Tail-1.0/Tail.pm 2014-12-03 12:38:39.000000000 +0100 +++ new/File-Tail-1.1/Tail.pm 2015-04-18 20:57:01.000000000 +0200 @@ -1,7 +1,9 @@ package File::Tail; use strict; -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); +use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $Is_Win32); + +$Is_Win32 = ($^O =~ /win32/i) ? 1 : 0; require Exporter; @@ -9,7 +11,7 @@ # Items to export into callers namespace by default. Note: do not export # names by default without a very good reason. Use EXPORT_OK instead. # Do not simply export all your public functions/methods/constants. -$VERSION = '1.0'; +$VERSION = '1.1'; # Preloaded methods go here. @@ -305,6 +307,7 @@ $object->{curpos}=sysseek($object->{handle},-$calclen,SEEK_END); sysread($object->{handle},$object->{"buffer"}, $calclen); + $object->{"buffer"} =~ s/\015\012/\n/g if $Is_Win32; $object->{curpos}=sysseek($object->{handle},0,SEEK_CUR); $crs=$object->{"buffer"}=~tr/\n//; last if ($calclen>=$maxlen); @@ -516,6 +519,8 @@ while ($nlen>0) { $len=sysread($object->{handle},$object->{"buffer"}, $nlen,length($object->{"buffer"})); + $object->{"buffer"} =~ s/\015\012/\n/g if $Is_Win32; + last if $len==0; # Some busy filesystems return 0 sometimes, # and never give anything more from then on if # you don't give them time to rest. This return @@ -585,7 +590,7 @@ =head1 NAME -File::Tail - Perl extension for reading from continuously updated files +File::Tail - Perl extension for reading from continously updated files =head1 SYNOPSIS @@ -604,11 +609,12 @@ OR, you could use tie (additional parameters can be passed with the name, or can be set using $ref): - use File::Tail; - my $ref=tie *FH,"File::Tail",(name=>$name); - while (<FH>) { - print "$_"; - } + use File::Tail; + my $ref=tie *FH,"File::Tail",(name=>$name); + while (<FH>) { + print "$_"; + } + Note that the above script will never exit. If there is nothing being written to the file, it will simply block. @@ -626,7 +632,7 @@ =head1 DESCRIPTION The primary purpose of File::Tail is reading and analysing log files while -they are being written, which is especialy useful if you are monitoring +they are being written, which is especialy usefull if you are monitoring the logging process with a tool like Tobias Oetiker's MRTG. The module tries very hard NOT to "busy-wait" on a file that has little @@ -656,7 +662,7 @@ =head2 new ([ ARGS ]) -Creates a C<File::Tail>. If it has only one parameter, it is assumed to +Creates a C<File::Tail>. If it has only one paramter, it is assumed to be the filename. If the open fails, the module performs a croak. I am currently looking for a way to set $! and return undef. @@ -719,35 +725,36 @@ =item ignore_nonexistant -Do not complain if the file doesn't exist when it is first + Do not complain if the file doesn't exist when it is first opened or when it is to be reopened. (File may be reopened after resetafter seconds have passed since last data was found.) =item tail -When first started, read and return C<n> lines from the file. + When first started, read and return C<n> lines from the file. If C<n> is zero, start at the end of file. If C<n> is negative, return the whole file. -Default is C<0>. + Default is C<0>. =item reset_tail -Same as tail, but applies after reset. (i.e. after the -file has been automatically closed and reopened). Defaults to + Same as tail, but applies after reset. (i.e. after the +file has been automaticaly closed and reopened). Defaults to C<-1>, i.e. does not skip any information present in the file when it first checks it. -Why would you want it otherwise? I've seen files which + Why would you want it otherwise? I've seen files which have been cycled like this: - grep -v lastmonth log >newlog - mv log archive/lastmonth - mv newlog log - kill -HUP logger + grep -v lastmonth log >newlog + mv log archive/lastmonth + mv newlog log + kill -HUP logger + Obviously, if this happens and you have reset_tail set to -C<-1>, you will suddenly get a whole bunch of lines - lines +c<-1>, you will suddenly get a whole bunch of lines - lines you already saw. So in this case, reset_tail should probably be set to a small positive number or even C<0>. @@ -775,9 +782,9 @@ reference as the first parameter and other parameters to be passed to handler subroutine, or one of the words: - return - ignore any error (just put error message in errmsg). - warn - output the error message but continue - die - display error message and exit +return - ignore any error (just put error message in errmsg). +warn - output the error message but continue +die - display error message and exit Default is die. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Tail-1.0/Tail.pm.debug new/File-Tail-1.1/Tail.pm.debug --- old/File-Tail-1.0/Tail.pm.debug 2014-12-03 12:38:30.000000000 +0100 +++ new/File-Tail-1.1/Tail.pm.debug 2015-04-16 17:12:50.000000000 +0200 @@ -1,7 +1,9 @@ package File::Tail; use strict; -use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); +use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $Is_Win32); + +$Is_Win32 = ($^O =~ /win32/i) ? 1 : 0; require Exporter; @@ -9,7 +11,7 @@ # Items to export into callers namespace by default. Note: do not export # names by default without a very good reason. Use EXPORT_OK instead. # Do not simply export all your public functions/methods/constants. -$VERSION = '1.0'; +$VERSION = '1.1'; # Preloaded methods go here. @@ -308,6 +310,7 @@ $object->{curpos}=sysseek($object->{handle},-$calclen,SEEK_END); sysread($object->{handle},$object->{"buffer"}, $calclen); + $object->{"buffer"} =~ s/\015\012/\n/g if $Is_Win32; $object->{curpos}=sysseek($object->{handle},0,SEEK_CUR); $crs=$object->{"buffer"}=~tr/\n//; last if ($calclen>=$maxlen); @@ -545,6 +548,8 @@ while ($nlen>0) { $len=sysread($object->{handle},$object->{"buffer"}, $nlen,length($object->{"buffer"})); + $object->{"buffer"} =~ s/\015\012/\n/g if $Is_Win32; + last if $len==0; # Some busy filesystems return 0 sometimes, # and never give anything more from then on if # you don't give them time to rest. This return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/File-Tail-1.0/t/10open.t new/File-Tail-1.1/t/10open.t --- old/File-Tail-1.0/t/10open.t 2014-12-03 12:26:36.000000000 +0100 +++ new/File-Tail-1.1/t/10open.t 2015-04-16 17:17:22.000000000 +0200 @@ -1,5 +1,6 @@ BEGIN { $| = 1; print "1..6\n"; } END {print "not ok 1\n" unless $loaded;} +use File::Copy qw/move/; use File::Tail; $loaded = 1; print "ok 1\n"; @@ -71,16 +72,20 @@ # # Test 6 - Read on moved and reopened file # -rename($testname, "$testname-tmp"); -open(TEST,">$testname"); -$teststring="This is yet another test string\n"; -print TEST $teststring; -$t=$file->read; -if ($t eq $teststring) { +if (not $^O =~ /win32/i) { + move($testname, "$testname-tmp"); + open(TEST,">$testname"); + $teststring="This is yet another test string\n"; + print TEST $teststring; + $t=$file->read; + if ($t eq $teststring) { print "ok 6\n"; -} else { -# print "<$t><$teststring>\n"; + } else { + # print "<$t><$teststring>\n"; print "not ok 6\n"; + } +} else { + print "ok 6\n"; # Apparently, in windows, you can not rename opened files? } unlink "$testname"; unlink "$testname-tmp"; ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: - #./Build build flags=%{?_smp_mflags} --myflag
