Hello community, here is the log from the commit of package perl-IO-Tty for openSUSE:Factory checked in at 2015-04-15 16:23:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-IO-Tty (Old) and /work/SRC/openSUSE:Factory/.perl-IO-Tty.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-IO-Tty" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-IO-Tty/perl-IO-Tty.changes 2011-09-23 12:37:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-IO-Tty.new/perl-IO-Tty.changes 2015-04-15 16:24:00.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Apr 13 18:51:40 UTC 2015 - co...@suse.com + +- updated to 1.12 + see /usr/share/doc/packages/perl-IO-Tty/ChangeLog + + 2014-09-12 Todd Rinaldo <to...@cpan.org> 1.12 + * Merge pull request from Chris Williams (bingos) to fix "redefinition of typedef" errors with v5.19.4 and above + + 2014-05-05 Todd Rinaldo <to...@cpan.org> + * Release 1.11 to CPAN with explicit dropping of support for Win32 (we never supported it) - RT 77813 + * Bump version to a devel release 1.11_01 for experimental work. + * Fix typo in compilter - RT 75649 + * Add support for PERL_MM_OPT + +------------------------------------------------------------------- Old: ---- IO-Tty-1.10.tar.gz New: ---- IO-Tty-1.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-IO-Tty.spec ++++++ --- /var/tmp/diff_new_pack.kYJDYG/_old 2015-04-15 16:24:00.000000000 +0200 +++ /var/tmp/diff_new_pack.kYJDYG/_new 2015-04-15 16:24:00.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-IO-Tty # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,17 +16,15 @@ # - Name: perl-IO-Tty -Version: 1.10 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 1.12 +Release: 0 %define cpan_name IO-Tty Summary: Low-level allocate a pseudo-Tty, import constants. -Url: http://search.cpan.org/dist/IO-Tty/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl -#Source: http://www.cpan.org/authors/id/T/TO/TODDR/IO-Tty-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz +Url: http://search.cpan.org/dist/IO-Tty/ +Source: http://www.cpan.org/authors/id/T/TO/TODDR/%{cpan_name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros @@ -77,11 +75,8 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files -%defattr(644,root,root,755) +%defattr(-,root,root,755) %doc ChangeLog README try %changelog ++++++ IO-Tty-1.10.tar.gz -> IO-Tty-1.12.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Tty-1.10/ChangeLog new/IO-Tty-1.12/ChangeLog --- old/IO-Tty-1.10/ChangeLog 2010-10-11 20:10:46.000000000 +0200 +++ new/IO-Tty-1.12/ChangeLog 2014-09-12 18:10:15.000000000 +0200 @@ -1,3 +1,12 @@ +2014-09-12 Todd Rinaldo <to...@cpan.org> 1.12 + * Merge pull request from Chris Williams (bingos) to fix "redefinition of typedef" errors with v5.19.4 and above + +2014-05-05 Todd Rinaldo <to...@cpan.org> + * Release 1.11 to CPAN with explicit dropping of support for Win32 (we never supported it) - RT 77813 + * Bump version to a devel release 1.11_01 for experimental work. + * Fix typo in compilter - RT 75649 + * Add support for PERL_MM_OPT + 2010-10-11 Todd Rinaldo <to...@cpan.org> * CPAN testers clean. Bumping to release version 1.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Tty-1.10/MANIFEST new/IO-Tty-1.12/MANIFEST --- old/IO-Tty-1.10/MANIFEST 2010-10-11 20:07:57.000000000 +0200 +++ new/IO-Tty-1.12/MANIFEST 2014-09-12 18:14:41.000000000 +0200 @@ -8,3 +8,4 @@ try t/test.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/IO-Tty-1.10/META.json new/IO-Tty-1.12/META.json --- old/IO-Tty-1.10/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/IO-Tty-1.12/META.json 2014-09-12 18:14:41.000000000 +0200 @@ -0,0 +1,44 @@ +{ + "abstract" : "Pseudo ttys and constants", + "author" : [ + "Roland Giersig <rgier...@cpan.org>" + ], + "dynamic_config" : 1, + "generated_by" : "ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.120921", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";, + "version" : "2" + }, + "name" : "IO-Tty", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "Test::More" : "0" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "runtime" : { + "requires" : {} + } + }, + "release_status" : "stable", + "resources" : { + "repository" : { + "url" : "https://github.com/toddr/IO-Tty"; + } + }, + "version" : "1.12" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Tty-1.10/META.yml new/IO-Tty-1.12/META.yml --- old/IO-Tty-1.10/META.yml 2010-10-11 22:22:41.000000000 +0200 +++ new/IO-Tty-1.12/META.yml 2014-09-12 18:14:41.000000000 +0200 @@ -1,23 +1,23 @@ ---- #YAML:1.0 -name: IO-Tty -version: 1.10 -abstract: Pseudo ttys and constants +--- +abstract: 'Pseudo ttys and constants' author: - - Roland Giersig <rgier...@cpan.org> -license: perl -distribution_type: module -configure_requires: - ExtUtils::MakeMaker: 0 + - 'Roland Giersig <rgier...@cpan.org>' build_requires: - Test::More: 0 -requires: {} -resources: - repository: https://expectperl.svn.sourceforge.net/svnroot/expectperl/IO-Tty/trunk -no_index: - directory: - - t - - inc -generated_by: ExtUtils::MakeMaker version 6.56 + Test::More: '0' +configure_requires: + ExtUtils::MakeMaker: '0' +dynamic_config: 1 +generated_by: 'ExtUtils::MakeMaker version 6.68, CPAN::Meta::Converter version 2.120921' +license: perl meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: '1.4' +name: IO-Tty +no_index: + directory: + - t + - inc +requires: {} +resources: + repository: https://github.com/toddr/IO-Tty +version: '1.12' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Tty-1.10/Makefile.PL new/IO-Tty-1.12/Makefile.PL --- old/IO-Tty-1.10/Makefile.PL 2010-10-11 20:08:36.000000000 +0200 +++ new/IO-Tty-1.12/Makefile.PL 2014-09-12 18:11:33.000000000 +0200 @@ -1,10 +1,32 @@ use ExtUtils::MakeMaker; +# Signal Testers that this is an unsupported platform. +if ( $^O eq 'MSWin32' ) { + print "This module requires a POSIX compliant system to work. Try cygwin if you need this module on windows\n"; + die "OS unsupported"; +} + use strict; use IO::File; use Config qw(%Config); -my $flags = "$Config{ccflags} $Config{ldflags}"; +my %cfg; +@cfg{qw(cc ccflags ldflags)} = @Config{qw(cc ccflags ldflags)}; +for my $arg (@ARGV) { + if ( /^(CC|CCFLAGS|LDFLAGS)=(.*)/i ) { + $cfg{lc($1)} = $2; + } +} +if ($ENV{PERL_MM_OPT}) { + # Split on whitespace just like EU::MM + for ( split ' ', $ENV{PERL_MM_OPT} ) { + if ( /^(CC|CCFLAGS|LDFLAGS)=(.*)/i ) { + $cfg{lc($1)} = $2; + } + } +} + +my $flags = "$cfg{ccflags} $cfg{ldflags}"; $flags =~ s/([^A-Za-z0-9 -_])/\\$1/g; # escape shell-metachars $|=1; # to see output immediately @@ -12,7 +34,7 @@ my %define; my @libs; -my $Package_Version = '1.10'; # keep this consistent with Tty.pm +my $Package_Version = '1.12'; # keep this consistent with Tty.pm my $Is_Beta = ($Package_Version =~ m/_/); open(SUB, ">xssubs.c") or die "open: $!"; @@ -72,12 +94,12 @@ ESQ close(TST); -if (system("$Config{'cc'} $flags compilerok.c > compilerok.log 2>&1")) { +if (system("$cfg{'cc'} $flags compilerok.c > compilerok.log 2>&1")) { die <<"__EOT__"; -ERROR: cannot run the configured compiler '$Config{'cc'}' +ERROR: cannot run the configured compiler '$cfg{'cc'}' (see conf/compilerok.log). Suggestions: -1) The complier '$Config{'cc'}' is not in your PATH. Add it +1) The compiler '$cfg{'cc'}' is not in your PATH. Add it to the PATH and try again. OR 2) The compiler isn't installed on your system. Install it. OR 3) You only have a different compiler installed (e.g. 'gcc'). @@ -148,7 +170,7 @@ close(TST); print "Looking for $f()" . "." x (13-length($f)) . " "; - if (system("$Config{'cc'} $flags $funcs{$f} functest_$f.c > functest_$f.log 2>&1")) { + if (system("$cfg{'cc'} $flags $funcs{$f} functest_$f.c > functest_$f.log 2>&1")) { print "not found.\n"; } else { $define{"-DHAVE_\U$f"} = undef; @@ -175,7 +197,7 @@ ESQ close(TST); print "Looking for $h" . "." x (15-length($h)) . " "; - if(system("$Config{'cc'} $flags headtest_$def.c > headtest_$def.log 2>&1")) { + if(system("$cfg{'cc'} $flags headtest_$def.c > headtest_$def.log 2>&1")) { print "not found.\n" } else { @@ -253,7 +275,7 @@ __EOT__ close(TST); - if (system("$Config{'cc'} $flags @{[keys %define]} ttsymtest_$s.c >ttsymtest_$s.log 2>&1")) { + if (system("$cfg{'cc'} $flags @{[keys %define]} ttsymtest_$s.c >ttsymtest_$s.log 2>&1")) { print SUB qq{newCONSTSUB(stash, "$s", newSV(0));\n}; # now check if the symbol is defined (should have an error message # for line 29999 in the logfile) @@ -415,7 +437,7 @@ }, 'META_MERGE' => { 'resources' => { - 'repository' => 'https://expectperl.svn.sourceforge.net/svnroot/expectperl/IO-Tty/trunk', + 'repository' => 'https://github.com/toddr/IO-Tty', }, }, ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Tty-1.10/Pty.pm new/IO-Tty-1.12/Pty.pm --- old/IO-Tty-1.10/Pty.pm 2010-10-11 20:08:47.000000000 +0200 +++ new/IO-Tty-1.12/Pty.pm 2014-09-12 18:10:53.000000000 +0200 @@ -10,7 +10,7 @@ use vars qw(@ISA $VERSION); -$VERSION = '1.10'; # keep same as in Tty.pm +$VERSION = '1.12'; # keep same as in Tty.pm @ISA = qw(IO::Handle); eval { local $^W = 0; undef local $SIG{__DIE__}; require IO::Stty }; @@ -84,7 +84,7 @@ my $self = shift; local(*DEVTTY); - # loose controlling terminal explicitely + # loose controlling terminal explicitly if (defined TIOCNOTTY) { if (open (\*DEVTTY, "/dev/tty")) { ioctl( \*DEVTTY, TIOCNOTTY, 0 ); @@ -141,6 +141,8 @@ } *clone_winsize_from = \&IO::Tty::clone_winsize_from; +*get_winsize = \&IO::Tty::get_winsize; +*set_winsize = \&IO::Tty::set_winsize; *set_raw = \&IO::Tty::set_raw; 1; @@ -153,7 +155,7 @@ =head1 VERSION -1.10 +1.12 =head1 SYNOPSIS @@ -254,6 +256,17 @@ See the C<try> script for example code how to propagate SIGWINCH. +=item get_winsize() + +Returns the terminal size, in a 4-element list. + + ($row, $col, $xpixel, $ypixel) = $tty->get_winsize() + +=item set_winsize($row, $col, $xpixel, $ypixel) + +Sets the terminal size. If not specified, C<$xpixel> and C<$ypixel> are set to +0. As with C<clone_winsize_from>, this must be called upon the I<slave>. + =back diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Tty-1.10/Tty.pm new/IO-Tty-1.12/Tty.pm --- old/IO-Tty-1.10/Tty.pm 2010-10-11 20:09:05.000000000 +0200 +++ new/IO-Tty-1.12/Tty.pm 2014-09-12 18:11:16.000000000 +0200 @@ -13,8 +13,8 @@ use vars qw(@ISA $VERSION $XS_VERSION $CONFIG $DEBUG); -$VERSION = '1.10'; -$XS_VERSION = "1.10"; +$VERSION = '1.12'; +$XS_VERSION = "1.12"; @ISA = qw(IO::Handle); eval { local $^W = 0; undef local $SIG{__DIE__}; require IO::Stty }; @@ -62,6 +62,25 @@ return undef; } +# ioctl() doesn't tell us how long the structure is, so we'll have to trim it +# after TIOCGWINSZ +my $SIZEOF_WINSIZE = length IO::Tty::pack_winsize(0,0,0,0); + +sub get_winsize { + my $self = shift; + ioctl($self, IO::Tty::Constant::TIOCGWINSZ(), my $winsize) + or croak "Cannot TIOCGWINSZ - $!"; + substr($winsize, $SIZEOF_WINSIZE) = ""; + return IO::Tty::unpack_winsize($winsize); +} + +sub set_winsize { + my $self = shift; + my $winsize = IO::Tty::pack_winsize(@_); + ioctl($self, IO::Tty::Constant::TIOCSWINSZ(), $winsize) + or croak "Cannot TIOCSWINSZ - $!"; +} + sub set_raw($) { require POSIX; my $self = shift; @@ -99,7 +118,7 @@ =head1 VERSION -1.10 +1.12 =head1 SYNOPSIS @@ -244,8 +263,8 @@ Contains copyrighted stuff from openssh v3.0p1, authored by Tatu Ylonen <y...@cs.hut.fi>, Markus Friedl and Todd C. Miller -<todd.mil...@courtesan.com>. I also got a lot of inspiry from the pty -code in Xemacs. +<todd.mil...@courtesan.com>. I also got a lot of inspiration from +the pty code in Xemacs. =head1 COPYRIGHT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/IO-Tty-1.10/Tty.xs new/IO-Tty-1.12/Tty.xs --- old/IO-Tty-1.10/Tty.xs 2010-10-11 20:07:57.000000000 +0200 +++ new/IO-Tty-1.12/Tty.xs 2014-09-12 18:10:15.000000000 +0200 @@ -58,7 +58,9 @@ #endif /* HAVE_UTIL_H */ #ifdef HAVE_UTIL_H -# include <util.h> +# if ((PATCHLEVEL < 19) && (SUBVERSION < 4)) +# include <util.h> +# endif #endif /* HAVE_UTIL_H */ #ifdef HAVE_PTY_H @@ -803,6 +805,39 @@ OUTPUT: RETVAL +SV * +pack_winsize(row, col, xpixel = 0, ypixel = 0) + int row + int col + int xpixel + int ypixel + INIT: + struct winsize ws; + CODE: + ws.ws_row = row; + ws.ws_col = col; + ws.ws_xpixel = xpixel; + ws.ws_ypixel = ypixel; + RETVAL = newSVpvn((char *)&ws, sizeof(ws)); + OUTPUT: + RETVAL + +void +unpack_winsize(winsize) + SV *winsize; + INIT: + struct winsize ws; + PPCODE: + if(SvCUR(winsize) != sizeof(ws)) + croak("IO::Tty::unpack_winsize(): Bad arg length - got %d, expected %d", + SvCUR(winsize), sizeof(ws)); + Copy(SvPV_nolen(winsize), &ws, sizeof(ws), char); + EXTEND(SP, 4); + PUSHs(sv_2mortal(newSViv(ws.ws_row))); + PUSHs(sv_2mortal(newSViv(ws.ws_col))); + PUSHs(sv_2mortal(newSViv(ws.ws_xpixel))); + PUSHs(sv_2mortal(newSViv(ws.ws_ypixel))); + BOOT: {
