r57369 - in /trunk/libterm-readline-gnu-perl: Gnu.pm Gnu.xs META.yml Makefile.PL README debian/README.source debian/changelog debian/control debian/copyright debian/rules debian/source/ debian/source/format t/readline.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Mon May 3 13:18:50 UTC 2010
Author: jawnsy-guest
Date: Mon May 3 13:18:32 2010
New Revision: 57369
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=57369
Log:
* New upstream release
* Use new 3.0 (quilt) source format
* Add myself to Copyright and Uploaders
* Standards-Version 3.8.4 (no changes)
* Rewrite control description
* Extract debian/ copyright holders from changelog
Added:
trunk/libterm-readline-gnu-perl/debian/source/
trunk/libterm-readline-gnu-perl/debian/source/format
Removed:
trunk/libterm-readline-gnu-perl/debian/README.source
Modified:
trunk/libterm-readline-gnu-perl/Gnu.pm
trunk/libterm-readline-gnu-perl/Gnu.xs
trunk/libterm-readline-gnu-perl/META.yml
trunk/libterm-readline-gnu-perl/Makefile.PL
trunk/libterm-readline-gnu-perl/README
trunk/libterm-readline-gnu-perl/debian/changelog
trunk/libterm-readline-gnu-perl/debian/control
trunk/libterm-readline-gnu-perl/debian/copyright
trunk/libterm-readline-gnu-perl/debian/rules
trunk/libterm-readline-gnu-perl/t/readline.t
Modified: trunk/libterm-readline-gnu-perl/Gnu.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-gnu-perl/Gnu.pm?rev=57369&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/Gnu.pm (original)
+++ trunk/libterm-readline-gnu-perl/Gnu.pm Mon May 3 13:18:32 2010
@@ -1,7 +1,7 @@
#
# Gnu.pm --- The GNU Readline/History Library wrapper module
#
-# $Id: Gnu.pm,v 1.100 2009/03/20 16:33:25 hiroo Exp $
+# $Id: Gnu.pm,v 1.101 2010/05/02 10:39:19 hiroo Exp $
#
# Copyright (c) 2009 Hiroo Hayashi. All rights reserved.
#
@@ -73,7 +73,7 @@
use DynaLoader;
use vars qw($VERSION @ISA @EXPORT_OK);
- $VERSION = '1.19';
+ $VERSION = '1.20';
# Term::ReadLine::Gnu::AU makes a function in
# `Term::ReadLine::Gnu::XS' as a method.
@@ -776,6 +776,10 @@
Keymap rl_discard_keymap(Keymap|str map)
+=item C<free_keymap(MAP)>
+
+ void rl_free_keymap(Keymap|str map)
+
=item C<get_keymap>
Keymap rl_get_keymap()
Modified: trunk/libterm-readline-gnu-perl/Gnu.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-gnu-perl/Gnu.xs?rev=57369&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/Gnu.xs (original)
+++ trunk/libterm-readline-gnu-perl/Gnu.xs Mon May 3 13:18:32 2010
@@ -1,9 +1,9 @@
/*
* Gnu.xs --- GNU Readline wrapper module
*
- * $Id: Gnu.xs,v 1.112 2009/02/27 12:44:41 hiroo Exp $
+ * $Id: Gnu.xs,v 1.114 2010/05/02 10:34:41 hiroo Exp $
*
- * Copyright (c) 2009 Hiroo Hayashi. All rights reserved.
+ * Copyright (c) 2010 Hiroo Hayashi. All rights reserved.
*
* This program is free software; you can redistribute it and/or
* modify it under the same terms as Perl itself.
@@ -232,6 +232,20 @@
*/
static void rl_echo_signal_char(int sig){}
#endif /* (RL_VERSION_MAJOR < 6) */
+
+#if 0 /* comment out until GNU Readline 6.2 will be released. */
+#if (RL_READLINE_VERSION < 0x0601)
+/* features introduced by GNU Readline 6.1 */
+/* Convenience function that discards, then frees, MAP. */
+void
+rl_free_keymap (map)
+ Keymap map;
+{
+ rl_discard_keymap (map);
+ free ((char *)map);
+}
+#endif /* (RL_READLINE_VERSION < 0x0601) */
+#endif
/*
* utility/dummy functions
@@ -1411,6 +1425,12 @@
OUTPUT:
RETVAL
+ # comment out until GNU Readline 6.2 will be released.
+ #void
+ #rl_free_keymap(map)
+ # Keymap map
+ # PROTOTYPE: $
+
Keymap
rl_get_keymap()
PROTOTYPE:
@@ -1943,6 +1963,56 @@
int
rl_initialize()
PROTOTYPE:
+ CODE:
+ {
+ RETVAL = rl_initialize();
+ /*
+ * Perl optionally maintains its own envirnment variable array
+ * using its own memory management functions. On the other hand
+ * the GNU Readline Library sets variables, $LINES and $COLUMNS,
+ * by using the C library function putenv() in
+ * rl_initialize(). When Perl frees the memory for the variables
+ * during the destruction (perl.c:perl_destruct()), it may cause
+ * segmentation faults.
+ *
+ * CPAN ticket #37194
+ * https://rt.cpan.org/Public/Bug/Display.html?id=37194
+ *
+ * To solve the problem, make a copy of the whole environment
+ * variable array which might be reallocated by rl_initialize().
+ */
+ /* from perl.c:perl_destruct() */
+#if defined(USE_ENVIRON_ARRAY) && !defined(PERL_USE_SAFE_PUTENV) \
+ && !defined(PERL_DARWIN)
+ if (environ != PL_origenviron && !PL_use_safe_putenv
+# ifdef USE_ITHREADS
+ /* only main thread can free environ[0] contents */
+ && PL_curinterp == aTHX
+# endif
+ ) {
+ int i, len;
+ char *s;
+ char **tmpenv;
+ for (i = 0; environ[i]; i++)
+ ;
+ /*
+ * We cannot use New*() which uses safemalloc() instead of
+ * safesysmalloc().
+ */
+ tmpenv = (char **)safesysmalloc((i+1)*sizeof(char *));
+ for (i = 0; environ[i]; i++) {
+ len = strlen(environ[i]);
+ s = (char*)safesysmalloc((len+1)*sizeof(char));
+ Copy(environ[i], s, len+1, char);
+ tmpenv[i] = s;
+ }
+ tmpenv[i] = NULL;
+ environ = tmpenv;
+ }
+#endif
+ }
+ OUTPUT:
+ RETVAL
int
rl_ding()
Modified: trunk/libterm-readline-gnu-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-gnu-perl/META.yml?rev=57369&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/META.yml (original)
+++ trunk/libterm-readline-gnu-perl/META.yml Mon May 3 13:18:32 2010
@@ -1,7 +1,7 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: Term-ReadLine-Gnu
-version: 1.19
+version: 1.20
version_from: Gnu.pm
installdirs: site
requires:
Modified: trunk/libterm-readline-gnu-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-gnu-perl/Makefile.PL?rev=57369&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/Makefile.PL (original)
+++ trunk/libterm-readline-gnu-perl/Makefile.PL Mon May 3 13:18:32 2010
@@ -1,7 +1,7 @@
#
# Makefile.PL for Term::ReadLine::Gnu
#
-# $Id: Makefile.PL,v 1.32 2009/03/01 02:57:15 hiroo Exp $
+# $Id: Makefile.PL,v 1.32 2009-03-01 11:57:15+09 hiroo Exp $
#
# Copyright (c) 2009 Hiroo Hayashi. All rights reserved.
# <hiroo.hayashi at computer.org>
Modified: trunk/libterm-readline-gnu-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-gnu-perl/README?rev=57369&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/README (original)
+++ trunk/libterm-readline-gnu-perl/README Mon May 3 13:18:32 2010
@@ -1,9 +1,9 @@
-*- Indented-text -*-
-$Id: README,v 1.29 2009/03/20 16:37:36 hiroo Exp $
+$Id: README,v 1.30 2010/05/02 10:38:53 hiroo Exp $
Term::ReadLine::Gnu --- GNU Readline Library Wrapper Module
- Copyright (c) 2009 Hiroo Hayashi. All rights reserved.
+ Copyright (c) 2010 Hiroo Hayashi. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
@@ -65,6 +65,17 @@
Revision History:
+
+1.20 2010-05-02
+ - Make a copy of the environment variable array to stop
+ segmentation faults on some systems (ex. FreeBSD)
+ - t/readline.t skip the test of rl_readline_version for GNU
+ Readline Library 6.1 which may return a wrong value
+ - readline-6.1 support
+ new function
+ rl_free_keymap (disabled due to readline-6.1 bug)
+ new variable
+ rl_filename_rewrite_hook (not supported yet)
1.19 2009-03-21
- make sure the outstream fd inside the readline library is in
Modified: trunk/libterm-readline-gnu-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-gnu-perl/debian/changelog?rev=57369&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/changelog (original)
+++ trunk/libterm-readline-gnu-perl/debian/changelog Mon May 3 13:18:32 2010
@@ -1,8 +1,17 @@
-libterm-readline-gnu-perl (1.19-3) UNRELEASED; urgency=low
-
+libterm-readline-gnu-perl (1.20-1) UNRELEASED; urgency=low
+
+ [ Jonathan Yu ]
+ * New upstream release
+ * Use new 3.0 (quilt) source format
+ * Add myself to Copyright and Uploaders
+ * Standards-Version 3.8.4 (no changes)
+ * Rewrite control description
+ * Extract debian/ copyright holders from changelog
+
+ [ Ryan Niebur ]
* Update ryan52's email address
- -- Ryan Niebur <ryan at debian.org> Fri, 25 Sep 2009 00:26:31 -0700
+ -- Jonathan Yu <jawnsy at cpan.org> Mon, 03 May 2010 09:48:30 -0400
libterm-readline-gnu-perl (1.19-2) unstable; urgency=low
Modified: trunk/libterm-readline-gnu-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-gnu-perl/debian/control?rev=57369&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/control (original)
+++ trunk/libterm-readline-gnu-perl/debian/control Mon May 3 13:18:32 2010
@@ -1,14 +1,13 @@
Source: libterm-readline-gnu-perl
Section: perl
Priority: optional
+Build-Depends: perl, debhelper (>= 7.0.50), libreadline-dev
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at debian.org>,
- Krzysztof Krzyzaniak (eloy) <eloy at debian.org>,
+ Krzysztof Krzyzaniak (eloy) <eloy at debian.org>, Jonathan Yu <jawnsy at cpan.org>,
MartÃn Ferrari <tincho at debian.org>, Ryan Niebur <ryan at debian.org>,
gregor herrmann <gregoa at debian.org>
-Standards-Version: 3.8.3
-Build-Depends: perl, debhelper (>= 7.0.50), quilt (>= 0.46-7),
- libreadline-dev
+Standards-Version: 3.8.4
Homepage: http://search.cpan.org/dist/Term-ReadLine-Gnu/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libterm-readline-gnu-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libterm-readline-gnu-perl/
@@ -16,11 +15,12 @@
Package: libterm-readline-gnu-perl
Architecture: any
Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
-Description: Perl extension for the GNU Readline/History Library
- Term::ReadLine::Gnu is an implementation of a Perl interface to the GNU
- Readline Library. This module gives you input line editing, input history
- management, word completion, and other similar facilities. This module gives
- you access to almost all variables and functions documented in the GNU
- ReadLine/History Library. This means you can write your custom editing
- function, your custom completion function, and so on with Perl. You may find
- it useful for prototyping before programming with C.
+Description: Perl extension for the GNU ReadLine/History Library
+ Term::ReadLine::Gnu is a Perl interface to the GNU ReadLine Library, allowing
+ developers to provide features including input line editing, input history
+ management, word completion and more.
+ .
+ Through this module, you have access to almost all variables and functions as
+ documented in the GNU ReadLine/History Library. This means you can write your
+ custom editing function, custom completion function, and so on, with Perl.
+ You may find it useful for prototyping before programming with C.
Modified: trunk/libterm-readline-gnu-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-gnu-perl/debian/copyright?rev=57369&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/copyright (original)
+++ trunk/libterm-readline-gnu-perl/debian/copyright Mon May 3 13:18:32 2010
@@ -1,34 +1,48 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Hiroo Hayashi <hiroo.hayashi at computer.org>
-Upstream-Source: http://search.cpan.org/dist/Term-ReadLine-Gnu/
-Upstream-Name: Term-ReadLine-Gnu
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Hiroo Hayashi <hiroo.hayashi at computer.org>
+Source: http://search.cpan.org/dist/Term-ReadLine-Gnu/
+Name: Term-ReadLine-Gnu
Files: *
-Copyright: 1996-2009 Hiroo Hayashi
-License: Artistic | GPL-1+
-License-Alias: Perl
+Copyright: 1996-2009, Hiroo Hayashi <hiroo.hayashi at computer.org>
+License: Artistic or GPL-1+
+
+Files: ppport.h
+Copyright: 2004-2009, Marcus Holland-Moritz <mhx-cpan at gmx.net>
+ 2001, Paul Marquess <pmqs at cpan.org> (Version 2.x)
+ 1999, Kenneth Albanowski <kjahds at kjahds.com> (Version 1.x)
+License: Artistic or GPL-1+
Files: debian/*
-Copyright: various contibutors, see debian/changelog
-License: Artistic | GPL-1+
-License-Alias: Perl
-
-Files: ppport.h
-Copyright: 1999, Kenneth Albanowski
-License: GPL-1+ | Artistic
-License-Alias: Perl
+Copyright: 2010, Jonathan Yu <jawnsy at cpan.org>
+ 2007-2009, gregor herrmann <gregoa at debian.org>
+ 2009, Ryan Niebur <ryanryan52 at gmail.com>
+ 2008, MartÃn Ferrari <martin.ferrari at gmail.com>
+ 2006-2008, Niko Tyni <ntyni at debian.org>
+ 2006, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
+ 2005, Gunnar Wolf <gwolf at debian.org>
+ 2002-2003, Joerg Jaspert <joerg at debian.org>
+ 2002, Joey Hess <joeyh at debian.org>
+ 2001, Darren Stalder <torin at daft.com>
+ 2001, Raphael Hertzog <hertzog at debian.org>
+ 2000, Matthias Klose <doko at cs.tu-berlin.de>
+ 1999, Darren Stalder <torin at daft.com>
+ 1998, Ben Gertzfield <che at debian.org>
+License: Artistic or GPL-1+
License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
- On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
License: GPL-1+
- 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.
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
+ 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.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
+
Modified: trunk/libterm-readline-gnu-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-gnu-perl/debian/rules?rev=57369&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/rules (original)
+++ trunk/libterm-readline-gnu-perl/debian/rules Mon May 3 13:18:32 2010
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh --with quilt $@
+ dh $@
override_dh_auto_test:
# the test suite needs an interactive terminal to run
Added: trunk/libterm-readline-gnu-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-gnu-perl/debian/source/format?rev=57369&op=file
==============================================================================
--- trunk/libterm-readline-gnu-perl/debian/source/format (added)
+++ trunk/libterm-readline-gnu-perl/debian/source/format Mon May 3 13:18:32 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: trunk/libterm-readline-gnu-perl/t/readline.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-gnu-perl/t/readline.t?rev=57369&op=diff
==============================================================================
--- trunk/libterm-readline-gnu-perl/t/readline.t (original)
+++ trunk/libterm-readline-gnu-perl/t/readline.t Mon May 3 13:18:32 2010
@@ -1,9 +1,9 @@
# -*- perl -*-
# readline.t - Test script for Term::ReadLine:GNU
#
-# $Id: readline.t,v 1.46 2009-03-20 23:17:27+09 hiroo Exp $
+# $Id: readline.t,v 1.47 2010/05/02 10:24:59 hiroo Exp $
#
-# Copyright (c) 2008 Hiroo Hayashi. All rights reserved.
+# Copyright (c) 2010 Hiroo Hayashi. All rights reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
@@ -91,7 +91,13 @@
my ($maj, $min) = $a->{library_version} =~ /(\d+)\.(\d+)/;
my $version = $a->{readline_version};
-$res = ($version == 0x100 * $maj + $min); ok('readline_version');
+if ($a->{library_version} eq '6.1') {
+ # rl_readline_version returns 0x0600. The bug is fixed GNU Readline 6.1-p2
+ print "ok $n # skipped because GNU Readline Library 6.1 may return wrong value.\n";
+ $n++;
+} else {
+ $res = ($version == 0x100 * $maj + $min); ok('readline_version');
+}
# Version 2.0 is NOT supported.
$res = $version > 0x0200; ok('rl_version');
More information about the Pkg-perl-cvs-commits
mailing list