Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PATCH] Sync Cap.pm with CPAN #13711

Closed
p5pRT opened this issue Apr 5, 2014 · 7 comments
Closed

[PATCH] Sync Cap.pm with CPAN #13711

p5pRT opened this issue Apr 5, 2014 · 7 comments

Comments

@p5pRT
Copy link

p5pRT commented Apr 5, 2014

Migrated from rt.perl.org#121582 (status was 'resolved')

Searchable as RT121582$

@p5pRT
Copy link
Author

p5pRT commented Apr 5, 2014

From jns@gellyfish.co.uk

This is a bug report for perl from jns@​gellyfish.co.uk,
generated with the help of perlbug 1.39 running under perl 5.16.3.


Hi,
I've just uploaded Term-Cap with 1.16 to CPAN.

Small change from drm00 to make the fallback to terminfo actually
work.

jonathanstowe/Term-Cap@08afd37

I also took the opportunity to remove the change log from the Cap.pm

Inline Patch
diff --git a/cpan/Term-Cap/Cap.pm b/cpan/Term-Cap/Cap.pm
index 9a70251..97a6e20 100644
--- a/cpan/Term-Cap/Cap.pm
+++ b/cpan/Term-Cap/Cap.pm
@@ -19,51 +19,8 @@ use strict;
 use vars qw($VERSION $VMS_TERMCAP);
 use vars qw($termpat $state $first $entry);
 
-$VERSION = '1.15';
-
-# Version undef: Thu Dec 14 20:02:42 CST 1995 by sanders@bsdi.com
-# Version 1.00:  Thu Nov 30 23:34:29 EST 2000 by schwern@pobox.com
-#	[PATCH] $VERSION crusade, strict, tests, etc... all over lib/
-# Version 1.01:  Wed May 23 00:00:00 CST 2001 by d-lewart@uiuc.edu
-#	Avoid warnings in Tgetent and Tputs
-# Version 1.02:  Sat Nov 17 13:50:39 GMT 2001 by jns@gellyfish.com
-#       Altered layout of the POD
-#       Added Test::More to PREREQ_PM in Makefile.PL
-#       Fixed no argument Tgetent()
-# Version 1.03:  Wed Nov 28 10:09:38 GMT 2001
-#       VMS Support from Charles Lane <lane@DUPHY4.Physics.Drexel.Edu>
-# Version 1.04:  Thu Nov 29 16:22:03 GMT 2001
-#       Fixed warnings in test
-# Version 1.05:  Mon Dec  3 15:33:49 GMT 2001
-#       Don't try to fall back on infocmp if it's not there. From chromatic.
-# Version 1.06:  Thu Dec  6 18:43:22 GMT 2001
-#       Preload the default VMS termcap from Charles Lane
-#       Don't carp at setting OSPEED unless warnings are on.
-# Version 1.07:  Wed Jan  2 21:35:09 GMT 2002
-#       Sanity check on infocmp output from Norton Allen
-#       Repaired INSTALLDIRS thanks to Michael Schwern
-# Version 1.08:  Sat Sep 28 11:33:15 BST 2002
-#       Late loading of 'Carp' as per Michael Schwern
-# Version 1.09:  Tue Apr 20 12:06:51 BST 2004
-#       Merged in changes from and to Core
-#       Core (Fri Aug 30 14:15:55 CEST 2002):
-#       Cope with comments lines from 'infocmp' from Brendan O'Dea
-#       Allow for EBCDIC in Tgoto magic test.
-# Version 1.10: Thu Oct 18 16:52:20 BST 2007
-#       Don't use try to use $ENV{HOME} if it doesn't exist
-#       Give Win32 'dumb' if TERM isn't set
-#       Provide fallback 'dumb' termcap entry as last resort
-# Version 1.11: Thu Oct 25 09:33:07 BST 2007
-#       EBDIC fixes from Chun Bing Ge <gecb@cn.ibm.com>
-# Version 1.12: Sat Dec  8 00:10:21 GMT 2007
-#       QNX test fix from Matt Kraai <kraai@ftbfs.org>
-# Version 1.13: Thu Dec 22 22:21:09 GMT 2011
-#       POD error fix from Domin Hargreaves <dom@earth.li>
-# Version 1.14 Sat Oct 26 19:16:38 BST 2013
-#       Applied all patches from RT and updated contact details
-# Version 1.15 Sat Oct 26 21:32:24 BST 2013
-#        Metadata change from David Steinbrunner
-#        Forgot to update the email somewhere
+$VERSION = '1.16';
+
 # TODO:
 # support Berkeley DB termcaps
 # force $FH into callers package?
@@ -279,7 +236,7 @@ sub Tgetent
 
     my @termcap_path = termcap_path();
 
-    unless ( @termcap_path || $entry )
+    if ( !@termcap_path || !$entry )
     {
 
         # last resort--fake up a termcap from terminfo


-----------------------------------------------------------------
---
Flags:   category=library   severity=low

Site configuration information for perl 5.16.3​:

Configured by Red Hat, Inc. at Mon Nov 11 12​:35​:45 UTC 2013.

Summary of my perl5 (revision 5 version 16 subversion 3) configuration​:
 
  Platform​:
  osname=linux, osvers=3.10.9-200.fc19.x86_64, archname=x86_64-linux-thread-multi
  uname='linux buildvm-01.phx2.fedoraproject.org 3.10.9-200.fc19.x86_64 #1 smp wed aug 21 19​:27​:58 utc 2013 x86_64 x86_64 x86_64 gnulinux '
  config_args='-des -Doptimize=-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -Dccdlflags=-Wl,--enable-new-dtags -Dlddlflags=-shared -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -Wl,-z,relro -DDEBUGGING=-g -Dversion=5.16.3 -Dmyhostname=localhost -Dperladmin=root@​localhost -Dcc=gcc -Dcf_by=Red Hat, Inc. -Dprefix=/usr -Dvendorprefix=/usr -Dsiteprefix=/usr/local -Dsitelib=/usr/local/share/perl5 -Dsitearch=/usr/local/lib64/perl5 -Dprivlib=/usr/share/perl5 -Dvendorlib=/usr/share/perl5/vendor_perl -Darchlib=/usr/lib64/perl5 -Dvendorarch=/usr/lib64/perl5/vendor_perl -Darchname=x86_64-linux-thread-multi -Dlibpth=/usr/local/lib64 /lib64 /usr/lib64 -Duseshrplib -Dusethreads -Duseithreads -Dusedtrace=/usr/bin/dtrace -Duselargefiles -Dd_semctl_semun -Di_db -Ui_ndbm -Di_gdbm -Di_shadow -Di_sysl!
og -Dman3ext=3pm -Duseperlio -Dinstallusrbinperl=n -Ubincompat5005 -Uversiononly -Dpager=/usr/bin/less -isr -Dd_gethostent_r_proto -Ud_endhostent_r_proto -Ud_sethostent_r_proto -Ud_endprotoent_r_proto -Ud_setprotoent_r_proto -Ud_endservent_r_proto -Ud_setservent_r_proto -Dscriptdir=/usr/bin -Dusesitecustomize'
  hint=recommended, useposix=true, d_sigaction=define
  useithreads=define, usemultiplicity=define
  useperlio=define, d_sfio=undef, uselargefiles=define, usesocks=undef
  use64bitint=define, use64bitall=define, uselongdouble=undef
  usemymalloc=n, bincompat5005=undef
  Compiler​:
  cc='gcc', ccflags ='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64',
  optimize='-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic',
  cppflags='-D_REENTRANT -D_GNU_SOURCE -fno-strict-aliasing -pipe -fstack-protector -I/usr/local/include'
  ccversion='', gccversion='4.8.2 20131017 (Red Hat 4.8.2-1)', gccosandvers=''
  intsize=4, longsize=8, ptrsize=8, doublesize=8, byteorder=12345678
  d_longlong=define, longlongsize=8, d_longdbl=define, longdblsize=16
  ivtype='long', ivsize=8, nvtype='double', nvsize=8, Off_t='off_t', lseeksize=8
  alignbytes=8, prototype=define
  Linker and Libraries​:
  ld='gcc', ldflags =' -fstack-protector'
  libpth=/usr/local/lib64 /lib64 /usr/lib64
  libs=-lresolv -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lpthread -lc -lgdbm_compat
  perllibs=-lresolv -lnsl -ldl -lm -lcrypt -lutil -lpthread -lc
  libc=, so=so, useshrplib=true, libperl=libperl.so
  gnulibc_version='2.17'
  Dynamic Linking​:
  dlsrc=dl_dlopen.xs, dlext=so, d_dlsymun=undef, ccdlflags='-Wl,--enable-new-dtags -Wl,-rpath,/usr/lib64/perl5/CORE'
  cccdlflags='-fPIC', lddlflags='-shared -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -grecord-gcc-switches -m64 -mtune=generic -Wl,-z,relro '

Locally applied patches​:
 


@​INC for perl 5.16.3​:
  /usr/local/lib64/perl5
  /usr/local/share/perl5
  /usr/lib64/perl5/vendor_perl
  /usr/share/perl5/vendor_perl
  /usr/lib64/perl5
  /usr/share/perl5
  .


Environment for perl 5.16.3​:
  HOME=/home/jonathan
  LANG=en_GB.utf8
  LANGUAGE (unset)
  LD_LIBRARY_PATH (unset)
  LOGDIR (unset)
  PATH=/opt/arduino​:/usr/lib64/qt-3.3/bin​:/usr/local/bin​:/usr/bin​:/bin​:/usr/local/sbin​:/usr/sbin​:/home/jonathan/bin
  PERL_BADLANG (unset)
  SHELL=/bin/bash

@p5pRT
Copy link
Author

p5pRT commented Apr 7, 2014

From @rjbs

I've added this to the list of things to review/do before 5.21.1

--
rjbs

@p5pRT
Copy link
Author

p5pRT commented Apr 7, 2014

The RT System itself - Status changed from 'new' to 'open'

@p5pRT
Copy link
Author

p5pRT commented May 12, 2014

From @tonycoz

On Sat Apr 05 03​:01​:50 2014, jns@​gellyfish.co.uk wrote​:

I've just uploaded Term-Cap with 1.16 to CPAN.

Small change from drm00 to make the fallback to terminfo actually
work.

https://github.com/jonathanstowe/Term-
Cap/commit/08afd37b982ce34382b682f3a2dde844dd8873e8

I also took the opportunity to remove the change log from the Cap.pm

Is there any chance you could supply this as a "git format-patch" patch against blead?

If that's a problem, I can sythesize one, but I'm not sure where I should be using jns@​gellyfish.co.uk as the email or jns@​integration-house.com (your email in AUTHORS).

Tony

@p5pRT
Copy link
Author

p5pRT commented May 17, 2014

From @jkeenan

On Sat Apr 05 03​:01​:50 2014, jns@​gellyfish.co.uk wrote​:

This is a bug report for perl from jns@​gellyfish.co.uk,
generated with the help of perlbug 1.39 running under perl 5.16.3.

-----------------------------------------------------------------
Hi,
I've just uploaded Term-Cap with 1.16 to CPAN.

Small change from drm00 to make the fallback to terminfo actually
work.

https://github.com/jonathanstowe/Term-
Cap/commit/08afd37b982ce34382b682f3a2dde844dd8873e8

[snip]

diff --git a/cpan/Term-Cap/Cap.pm b/cpan/Term-Cap/Cap.pm
index 9a70251..97a6e20 100644
--- a/cpan/Term-Cap/Cap.pm
+++ b/cpan/Term-Cap/Cap.pm
@​@​ -19,51 +19,8 @​@​ use strict;
use vars qw($VERSION $VMS_TERMCAP);
use vars qw($termpat $state $first $entry);

-$VERSION = '1.15';
-
[snp]
@​@​ -279,7 +236,7 @​@​ sub Tgetent

my @​termcap_path = termcap_path();

- unless ( @​termcap_path || $entry )
+ if ( !@​termcap_path || !$entry )
{

Would this correction be reflected anywhere within Term-Cap/test.pl?

Thank you very much.
Jim Keenan

@p5pRT
Copy link
Author

p5pRT commented Jun 4, 2014

From @tonycoz

On Sat Apr 05 03​:01​:50 2014, jns@​gellyfish.co.uk wrote​:

I've just uploaded Term-Cap with 1.16 to CPAN.

Small change from drm00 to make the fallback to terminfo actually
work.

https://github.com/jonathanstowe/Term-
Cap/commit/08afd37b982ce34382b682f3a2dde844dd8873e8

I also took the opportunity to remove the change log from the Cap.pm

This change was applied as part of 60d2b2a, which was then reverted in 663bce8 since it broke blead.

I think this ticket is obsolete, so I'm closing it.

Tony

@p5pRT
Copy link
Author

p5pRT commented Jun 4, 2014

@tonycoz - Status changed from 'open' to 'resolved'

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant