Change 34246 by [EMAIL PROTECTED] on 2008/09/03 15:48:26
Integrate:
[ 34005]
Subject: Re: CPAN Upload: S/SA/SAPER/Sys-Syslog-0.25.tar.gz
From: Sébastien Aperghis-Tramoni <[EMAIL PROTECTED]>
Date: Fri, 6 Jun 2008 01:23:30 +0200
Message-Id: <[EMAIL PROTECTED]>
[ 34058]
Subject: Fwd: CPAN Upload: S/SA/SAPER/Sys-Syslog-0.26.tar.gz
From: Sébastien Aperghis-Tramoni <[EMAIL PROTECTED]>
Date: Mon, 16 Jun 2008 01:57:33 +0200
Message-Id: <[EMAIL PROTECTED]>
[ 34103]
Upgrade to Encode-2.26
Affected files ...
... //depot/maint-5.10/perl/MANIFEST#40 integrate
... //depot/maint-5.10/perl/ext/Encode/Byte/Makefile.PL#2 integrate
... //depot/maint-5.10/perl/ext/Encode/Changes#4 integrate
... //depot/maint-5.10/perl/ext/Encode/Encode.pm#4 integrate
... //depot/maint-5.10/perl/ext/Encode/Makefile.PL#4 integrate
... //depot/maint-5.10/perl/ext/Encode/lib/Encode/Alias.pm#4 integrate
... //depot/maint-5.10/perl/ext/Encode/lib/Encode/GSM0338.pm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/lib/Encode/JP/JIS7.pm#2 integrate
... //depot/maint-5.10/perl/ext/Encode/t/Aliases.t#2 integrate
... //depot/maint-5.10/perl/ext/Encode/t/jis7-fallback.t#1 branch
... //depot/maint-5.10/perl/ext/Encode/ucm/cp850.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp852.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp855.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp856.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp857.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp858.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp860.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp861.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp862.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp863.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp864.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp865.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp866.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp869.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp874.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/cp875.ucm#3 integrate
... //depot/maint-5.10/perl/ext/Encode/ucm/gsm0338.ucm#2 delete
... //depot/maint-5.10/perl/ext/Sys/Syslog/Changes#2 integrate
... //depot/maint-5.10/perl/ext/Sys/Syslog/Makefile.PL#3 integrate
... //depot/maint-5.10/perl/ext/Sys/Syslog/README#2 integrate
... //depot/maint-5.10/perl/ext/Sys/Syslog/Syslog.pm#3 integrate
... //depot/maint-5.10/perl/ext/Sys/Syslog/Syslog.xs#2 integrate
... //depot/maint-5.10/perl/ext/Sys/Syslog/t/00-load.t#2 integrate
... //depot/maint-5.10/perl/ext/Sys/Syslog/t/syslog.t#3 integrate
Differences ...
==== //depot/maint-5.10/perl/MANIFEST#40 (text) ====
Index: perl/MANIFEST
--- perl/MANIFEST#39~33976~ 2008-06-01 06:05:57.000000000 -0700
+++ perl/MANIFEST 2008-09-03 08:48:26.000000000 -0700
@@ -517,6 +517,7 @@
ext/Encode/t/grow.t test script
ext/Encode/t/gsm0338.t test script
ext/Encode/t/guess.t test script
+ext/Encode/t/jis7-fallback.t test script
ext/Encode/t/jisx0201.enc test data
ext/Encode/t/jisx0201.utf test data
ext/Encode/t/jisx0208.enc test data
@@ -603,7 +604,6 @@
ext/Encode/ucm/euc-kr.ucm Unicode Character Map
ext/Encode/ucm/gb12345.ucm Unicode Character Map
ext/Encode/ucm/gb2312.ucm Unicode Character Map
-ext/Encode/ucm/gsm0338.ucm Unicode Character Map
ext/Encode/ucm/hp-roman8.ucm Unicode Character Map
ext/Encode/ucm/ir-165.ucm Unicode Character Map
ext/Encode/ucm/jis0201.ucm Unicode Character Map
==== //depot/maint-5.10/perl/ext/Encode/Byte/Makefile.PL#2 (text) ====
Index: perl/ext/Encode/Byte/Makefile.PL
--- perl/ext/Encode/Byte/Makefile.PL#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/Encode/Byte/Makefile.PL 2008-09-03 08:48:26.000000000 -0700
@@ -8,7 +8,7 @@
byte_t =>
[
# misc. vendors
- 'gsm0338.ucm',
+ # 'gsm0338.ucm', now in Encode::GSM0338
'nextstep.ucm',
'hp-roman8.ucm',
'viscii.ucm',
==== //depot/maint-5.10/perl/ext/Encode/Changes#4 (text) ====
Index: perl/ext/Encode/Changes
--- perl/ext/Encode/Changes#3~33820~ 2008-05-11 03:57:47.000000000 -0700
+++ perl/ext/Encode/Changes 2008-09-03 08:48:26.000000000 -0700
@@ -1,8 +1,27 @@
# Revision history for Perl extension Encode.
#
-# $Id: Changes,v 2.25 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: Changes,v 2.26 2008/07/01 20:56:17 dankogai Exp dankogai $
#
-$Revision: 2.25 $ $Date: 2008/05/07 20:56:05 $
+$Revision: 2.26 $ $Date: 2008/07/01 20:56:17 $
+! Encode.pm
+ Absense of Encode::ConfigLocal no longer carps no matter what.
+ https://bugzilla.redhat.com/show_bug.cgi?id=435505#c2
+ https://rt.cpan.org/Ticket/Display.html?id=28638
+ https://rt.cpan.org/Ticket/Display.html?id=11511
+! lib/Encode/JIS7.pm
+ use encoding 'utf8' and 'iso-2022-jp' glitches on perl 5.10
+ Thanks, MIYAGAWA
+ Message-Id: <[EMAIL PROTECTED]>
+! lib/Encode/Alias.pm t/Aliases.t
+ macintosh' not recognize as MacRoman
+ http://rt.cpan.org/Ticket/Display.html?id=36326
+! Makefile.PL
+ s{INC => "-I./Encode"}
+ {INC => '-I' . File::Spec->catfile( '.', 'Encode' )}
+ To prevent some platforms from forgetting to include Encode/encode.h.
+ http://rt.cpan.org/Ticket/Display.html?id=36348
+
+2.25 2008/05/07 20:56:05
! Encode.pm
added ':default' to Exporter option.
! lib/Encode/GSM0338.pm
@@ -15,7 +34,7 @@
"This fix for Encode::Alias should make Solaris happy:"
Message-ID: <[EMAIL PROTECTED]>
-$Revision: 2.25 $ $Date: 2008/05/07 20:56:05 $
+2.24 2008/03/12 09:51:11
! lib/Encode/Config.pm
adds and fixes also adds cp858 support.
! Encode.pm encoding.pm lib/Encode/Alias.pm ucm/cp858.ucm
==== //depot/maint-5.10/perl/ext/Encode/Encode.pm#4 (text) ====
Index: perl/ext/Encode/Encode.pm
--- perl/ext/Encode/Encode.pm#3~33820~ 2008-05-11 03:57:47.000000000 -0700
+++ perl/ext/Encode/Encode.pm 2008-09-03 08:48:26.000000000 -0700
@@ -1,10 +1,10 @@
#
-# $Id: Encode.pm,v 2.25 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: Encode.pm,v 2.26 2008/07/01 20:56:17 dankogai Exp dankogai $
#
package Encode;
use strict;
use warnings;
-our $VERSION = sprintf "%d.%02d", q$Revision: 2.25 $ =~ /(\d+)/g;
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.26 $ =~ /(\d+)/g;
sub DEBUG () { 0 }
use XSLoader ();
XSLoader::load( __PACKAGE__, $VERSION );
@@ -51,7 +51,14 @@
our %Encoding;
our %ExtModule;
require Encode::Config;
-eval { require Encode::ConfigLocal };
+# See
+# https://bugzilla.redhat.com/show_bug.cgi?id=435505#c2
+# to find why sig handers inside eval{} are disabled.
+eval {
+ local $SIG{__DIE__};
+ local $SIG{__WARN__};
+ require Encode::ConfigLocal;
+};
sub encodings {
my $class = shift;
==== //depot/maint-5.10/perl/ext/Encode/Makefile.PL#4 (text) ====
Index: perl/ext/Encode/Makefile.PL
--- perl/ext/Encode/Makefile.PL#3~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/Makefile.PL 2008-09-03 08:48:26.000000000 -0700
@@ -1,10 +1,11 @@
#
-# $Id: Makefile.PL,v 2.6 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: Makefile.PL,v 2.7 2008/07/01 20:56:17 dankogai Exp dankogai $
#
use 5.007003;
use strict;
use warnings;
use ExtUtils::MakeMaker;
+use File::Spec;
# Just for sure :)
my %ARGV = map { my @r = split /=/,$_; defined $r[1] or $r[1]=1; @r } @ARGV;
@@ -34,20 +35,20 @@
@man = ( MAN1PODS => {}, MAN3PODS => {} ) if $ENV{PERL_CORE};
WriteMakefile(
- NAME => "Encode",
- EXE_FILES => [EMAIL PROTECTED],
- VERSION_FROM => 'Encode.pm',
- OBJECT => '$(O_FILES)',
- 'dist' => {
- COMPRESS => 'gzip -9f',
- SUFFIX => 'gz',
- DIST_DEFAULT => 'all tardist',
- },
- @man,
- INC => "-I./Encode",
- PMLIBDIRS => [EMAIL PROTECTED],
- INSTALLDIRS => 'perl',
- );
+ NAME => "Encode",
+ EXE_FILES => [EMAIL PROTECTED],
+ VERSION_FROM => 'Encode.pm',
+ OBJECT => '$(O_FILES)',
+ 'dist' => {
+ COMPRESS => 'gzip -9f',
+ SUFFIX => 'gz',
+ DIST_DEFAULT => 'all tardist',
+ },
+ @man,
+ INC => '-I' . File::Spec->catfile( '.', 'Encode' ),
+ PMLIBDIRS => [EMAIL PROTECTED],
+ INSTALLDIRS => 'perl',
+);
package MY;
==== //depot/maint-5.10/perl/ext/Encode/lib/Encode/Alias.pm#4 (text) ====
Index: perl/ext/Encode/lib/Encode/Alias.pm
--- perl/ext/Encode/lib/Encode/Alias.pm#3~33820~ 2008-05-11
03:57:47.000000000 -0700
+++ perl/ext/Encode/lib/Encode/Alias.pm 2008-09-03 08:48:26.000000000 -0700
@@ -2,7 +2,7 @@
use strict;
use warnings;
no warnings 'redefine';
-our $VERSION = do { my @r = ( q$Revision: 2.9 $ =~ /\d+/g ); sprintf "%d." .
"%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.10 $ =~ /\d+/g ); sprintf "%d." .
"%02d" x $#r, @r };
sub DEBUG () { 0 }
use base qw(Exporter);
@@ -207,6 +207,8 @@
# predefined in *.ucm; unneeded
# define_alias( qr/\bmacIcelandic$/i => '"macIceland"');
define_alias( qr/^mac_(.*)$/i => '"mac$1"' );
+ # http://rt.cpan.org/Ticket/Display.html?id=36326
+ define_alias( qr/^macintosh$/i => '"MacRoman"' );
# Ououououou. gone. They are differente!
# define_alias( qr/\bmacRomanian$/i => '"macRumanian"');
==== //depot/maint-5.10/perl/ext/Encode/lib/Encode/GSM0338.pm#3 (text) ====
Index: perl/ext/Encode/lib/Encode/GSM0338.pm
--- perl/ext/Encode/lib/Encode/GSM0338.pm#2~33820~ 2008-05-11
03:57:47.000000000 -0700
+++ perl/ext/Encode/lib/Encode/GSM0338.pm 2008-09-03 08:48:26.000000000
-0700
@@ -1,5 +1,5 @@
#
-# $Id: GSM0338.pm,v 2.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: GSM0338.pm,v 2.1 2008/05/07 20:56:05 dankogai Exp $
#
package Encode::GSM0338;
==== //depot/maint-5.10/perl/ext/Encode/lib/Encode/JP/JIS7.pm#2 (text) ====
Index: perl/ext/Encode/lib/Encode/JP/JIS7.pm
--- perl/ext/Encode/lib/Encode/JP/JIS7.pm#1~32694~ 2007-12-22
01:23:09.000000000 -0800
+++ perl/ext/Encode/lib/Encode/JP/JIS7.pm 2008-09-03 08:48:26.000000000
-0700
@@ -1,7 +1,7 @@
package Encode::JP::JIS7;
use strict;
use warnings;
-our $VERSION = do { my @r = ( q$Revision: 2.3 $ =~ /\d+/g ); sprintf "%d." .
"%02d" x $#r, @r };
+our $VERSION = do { my @r = ( q$Revision: 2.4 $ =~ /\d+/g ); sprintf "%d." .
"%02d" x $#r, @r };
use Encode qw(:fallbacks);
@@ -130,6 +130,7 @@
sub euc_jis {
no warnings qw(uninitialized);
+ local ${^ENCODING};
my $r_str = shift;
my $jis0212 = shift;
$$r_str =~ s{
==== //depot/maint-5.10/perl/ext/Encode/t/Aliases.t#2 (text) ====
Index: perl/ext/Encode/t/Aliases.t
--- perl/ext/Encode/t/Aliases.t#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/Encode/t/Aliases.t 2008-09-03 08:48:26.000000000 -0700
@@ -52,6 +52,7 @@
'WinArabic' => 'cp1256',
'WinBaltic' => 'cp1257',
'WinVietnamese' => 'cp1258',
+ 'Macintosh' => 'MacRoman',
'koi8r' => 'koi8-r',
'koi8u' => 'koi8-u',
'ja_JP.euc' => $ON_EBCDIC ? '' : 'euc-jp',
==== //depot/maint-5.10/perl/ext/Encode/t/jis7-fallback.t#1 (text) ====
Index: perl/ext/Encode/t/jis7-fallback.t
--- /dev/null 2008-08-26 01:15:08.532840418 -0700
+++ perl/ext/Encode/t/jis7-fallback.t 2008-09-03 08:48:26.000000000 -0700
@@ -0,0 +1,21 @@
+use strict;
+use Test::More 'no_plan';
+use Encode ':fallbacks';
+
+my $str = "\x{0647}";
+my @data = grep length, map { chomp; $_ } <DATA>;
+
+while (my($in, $out) = splice(@data, 0, 2)) {
+ my $copy = $str;
+ is Encode::encode("iso-2022-jp", $copy, eval $in), $out;
+}
+
+__DATA__
+FB_PERLQQ
+\x{0647}
+
+FB_HTMLCREF
+ه
+
+FB_XMLCREF
+ه
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp850.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp850.ucm
--- perl/ext/Encode/ucm/cp850.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp850.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp850.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp850.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP850.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp852.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp852.ucm
--- perl/ext/Encode/ucm/cp852.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp852.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp852.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp852.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP852.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp855.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp855.ucm
--- perl/ext/Encode/ucm/cp855.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp855.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp855.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp855.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP855.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp856.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp856.ucm
--- perl/ext/Encode/ucm/cp856.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp856.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp856.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp856.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MISC/CP856.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp857.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp857.ucm
--- perl/ext/Encode/ucm/cp857.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp857.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp857.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp857.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP857.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp858.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp858.ucm
--- perl/ext/Encode/ucm/cp858.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp858.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp858.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp858.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# cf. http://en.wikipedia.org/wiki/Code_page_858
#
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp860.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp860.ucm
--- perl/ext/Encode/ucm/cp860.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp860.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp860.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp860.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP860.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp861.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp861.ucm
--- perl/ext/Encode/ucm/cp861.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp861.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp861.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp861.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP861.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp862.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp862.ucm
--- perl/ext/Encode/ucm/cp862.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp862.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp862.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp862.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP862.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp863.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp863.ucm
--- perl/ext/Encode/ucm/cp863.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp863.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp863.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp863.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP863.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp864.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp864.ucm
--- perl/ext/Encode/ucm/cp864.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp864.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp864.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp864.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP864.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp865.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp865.ucm
--- perl/ext/Encode/ucm/cp865.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp865.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp865.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp865.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP865.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp866.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp866.ucm
--- perl/ext/Encode/ucm/cp866.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp866.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp866.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp866.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP866.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp869.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp869.ucm
--- perl/ext/Encode/ucm/cp869.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp869.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp869.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp869.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/PC/CP869.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp874.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp874.ucm
--- perl/ext/Encode/ucm/cp874.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp874.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp874.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp874.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP874.TXT
==== //depot/maint-5.10/perl/ext/Encode/ucm/cp875.ucm#3 (text) ====
Index: perl/ext/Encode/ucm/cp875.ucm
--- perl/ext/Encode/ucm/cp875.ucm#2~33820~ 2008-05-11 03:57:47.000000000
-0700
+++ perl/ext/Encode/ucm/cp875.ucm 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,5 @@
#
-# $Id: cp875.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp dankogai $
+# $Id: cp875.ucm,v 1.1 2008/05/07 20:56:05 dankogai Exp $
#
# Original table can be obtained at
# http://www.unicode.org/Public/MAPPINGS/VENDORS/MICSFT/EBCDIC/CP875.TXT
==== //depot/maint-5.10/perl/ext/Sys/Syslog/Changes#2 (text) ====
Index: perl/ext/Sys/Syslog/Changes
--- perl/ext/Sys/Syslog/Changes#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/Sys/Syslog/Changes 2008-09-03 08:48:26.000000000 -0700
@@ -1,5 +1,36 @@
Revision history for Sys-Syslog
+0.26 -- 2008.06.16 -- Sebastien Aperghis-Tramoni (SAPER)
+ [BUGFIX] Make Sys::Syslog works with Perl 5.10.0 (because of
+ ExtUtils::Constant::ProxySubs).
+ [CODE] setlogsock() is now a little more strict about its arguments.
+
+0.25 -- 2008.05.17 -- Sebastien Aperghis-Tramoni (SAPER)
+ [BUGFIX] CPAN-RT#34691: Fixed an incorrect call to sysopen() which
+ prevented Sys::Syslog from working on some Solaris systems.
+ Thanks to Paul Townsend.
+ [BUGFIX] CPAN-RT#34753: Fixed a slowness introduced in v0.19 (which
+ was to work around OSX syslog own slowness). Thanks to Alex Efros.
+ [BUGFIX] CPAN-RT#35952: Fixed a bug with the "nofatal" option.
+ [BUGFIX] CPAN-RT#35189: Fixed a bug in xlate().
+ [BUGFIX] Fixed build on Win32, thanks to Adam Kennedy.
+ [FEATURE] setlogsock() now interprets the second argument as the
+ hostname for network mechanisms.
+ [DIST] Add AUTHOR to WriteMakefile() in order to fix the META.yml
+ generated by ExtUtils::MakeMaker.
+ [TESTS] Improved t/pod.t with Pod::Checker.
+
+0.24 -- 2007.12.31 -- Sebastien Aperghis-Tramoni (SAPER)
+ [BUGFIX] CPANT-RT#32001: Skip the setlogsock('stream') tests when
+ /dev/log is unavailable (Brendan O'Dea).
+
+0.23 -- 2007.11.12 -- Sebastien Aperghis-Tramoni (SAPER)
+ [BUGFIX] Fixed a too liberal test in the "pipe" mechanism, thanks
+ to Jan Dubois.
+ [DIST] fallback/syslog.h was missing from MANIFEST (thanks to CPAN
+ Tester Matthew Musgrove).
+ [TESTS] Better handling of Perl 5.005, thanks to CPAN Tester Slaven
Rezic.
+
0.22 -- 2007.11.08 -- Sebastien Aperghis-Tramoni (SAPER)
[BUGFIX] CPAN-RT#29875: Added workaround SpamAssassin overzealous
logging features.
@@ -33,6 +64,8 @@
via syslog().
[BUGFIX] Rewrote the constants generation code in order to provide
fallback value for non-standard macros.
+ [BUGFIX] Mark Blackman and Edmund von der Burg identified and fixed the
+ random failures appearing on OSX, caused by a UDP timeout.
[FEATURE] Added Win32 event log support thanks to Yves Orton.
[FEATURE] Added new macros from modern BSD and IRIX.
[FEATURE] Each non-standard macro now fall backs to a standard macro.
==== //depot/maint-5.10/perl/ext/Sys/Syslog/Makefile.PL#3 (text) ====
Index: perl/ext/Sys/Syslog/Makefile.PL
--- perl/ext/Sys/Syslog/Makefile.PL#2~33111~ 2008-01-29 11:03:04.000000000
-0800
+++ perl/ext/Sys/Syslog/Makefile.PL 2008-09-03 08:48:26.000000000 -0700
@@ -29,11 +29,14 @@
print " * Win32::EventLog detected.\n";
my $name = "PerlLog";
- push @extra_prereqs, "Win32::TieRegistry" => 0, "Win32::EventLog" => 0;
+ push @extra_prereqs,
+ Win32 => 0, "Win32::TieRegistry" => 0, "Win32::EventLog" => 0;
$virtual_path{'win32/Win32.pm' } = '$(INST_LIBDIR)/Syslog/Win32.pm';
$virtual_path{'win32/PerlLog.dll'} = '$(INST_ARCHAUTODIR)/PerlLog.dll';
+ push @extra_params, CCFLAGS => "-Ifallback";
+
# recreate the DLL from its uuencoded form if it's not here
if (! -f File::Spec->catfile("win32", "$name.dll")) {
# read the uuencoded data
@@ -76,19 +79,32 @@
WriteMakefile(
NAME => 'Sys::Syslog',
LICENSE => 'perl',
+ AUTHOR => 'Sebastien Aperghis-Tramoni <[EMAIL PROTECTED]>',
VERSION_FROM => 'Syslog.pm',
ABSTRACT_FROM => 'Syslog.pm',
INSTALLDIRS => 'perl',
XSPROTOARG => '-noprototypes',
PM => \%virtual_path,
PREREQ_PM => {
- 'Test::More' => 0,
- 'XSLoader' => 0,
+ # run prereqs
+ 'Carp' => 0,
+ 'Fcntl' => 0,
+ 'File::Basename' => 0,
+ 'File::Spec' => 0,
+ 'POSIX' => 0,
+ 'Socket' => 0,
+ 'XSLoader' => 0,
@extra_prereqs,
+
+ # build/test prereqs
+ 'Test::More' => 0,
},
+ PL_FILES => {},
dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
clean => { FILES => 'Sys-Syslog-*' },
- realclean => { FILES => 'lib const-c.inc const-xs.inc macros.all
PerlLog.h *.bak *.bin *.rc' },
+ realclean => { FILES => 'lib const-c.inc const-xs.inc macros.all '
+ .'PerlLog.h typemap *.bak *.bin *.rc win32/PerlLog_dll' },
+ NO_META => 1,
@extra_params
);
@@ -163,9 +179,9 @@
);
ExtUtils::Constant::WriteConstants(
- ($] > 5.009002 ? (PROXYSUBS => 1) : ()),
NAME => 'Sys::Syslog',
NAMES => [ @levels, @facilities, @options, @others_macros ],
+ ($] > 5.009002 ? (PROXYSUBS => 1) : ()),
);
my @names = map { ref $_ ? $_->{name} : $_ } @levels, @facilities,
@options;
==== //depot/maint-5.10/perl/ext/Sys/Syslog/README#2 (text) ====
Index: perl/ext/Sys/Syslog/README
--- perl/ext/Sys/Syslog/README#1~32694~ 2007-12-22 01:23:09.000000000 -0800
+++ perl/ext/Sys/Syslog/README 2008-09-03 08:48:26.000000000 -0700
@@ -63,5 +63,7 @@
COPYRIGHT AND LICENCE
+ Copyright (C) 1990-2008 by Larry Wall and others.
+
This program is free software; you can redistribute it and/or modify it
under the same terms as Perl itself.
==== //depot/maint-5.10/perl/ext/Sys/Syslog/Syslog.pm#3 (text) ====
Index: perl/ext/Sys/Syslog/Syslog.pm
--- perl/ext/Sys/Syslog/Syslog.pm#2~33111~ 2008-01-29 11:03:04.000000000
-0800
+++ perl/ext/Sys/Syslog/Syslog.pm 2008-09-03 08:48:26.000000000 -0700
@@ -1,16 +1,17 @@
package Sys::Syslog;
use strict;
+use warnings;
use warnings::register;
use Carp;
+use Exporter ();
use Fcntl qw(O_WRONLY);
use File::Basename;
use POSIX qw(strftime setlocale LC_TIME);
use Socket ':all';
require 5.005;
-require Exporter;
{ no strict 'vars';
- $VERSION = '0.24';
+ $VERSION = '0.26';
@ISA = qw(Exporter);
%EXPORT_TAGS = (
@@ -76,6 +77,11 @@
#
use vars qw($host); # host to send syslog messages to (see notes
at end)
+#
+# Prototypes
+#
+sub silent_eval (&);
+
#
# Global variables
#
@@ -85,6 +91,7 @@
my $syslog_path = undef; # syslog path for "stream" and "unix"
mechanisms
my $syslog_xobj = undef; # if defined, holds the external object used
to send messages
my $transmit_ok = 0; # flag to indicate if the last message was
transmited
+my $sock_timeout = 0; # socket timeout, see below
my $current_proto = undef; # current mechanism used to transmit messages
my $ident = ''; # identifiant prepended to each message
$facility = ''; # current facility
@@ -105,15 +112,12 @@
@connectMethods = grep { $_ ne 'udp' } @connectMethods;
}
+# And on Win32 systems, we try to use the native mechanism for this
+# platform, the events logger, available through Win32::EventLog.
EVENTLOG: {
- # use EventLog on Win32
my $is_Win32 = $^O =~ /Win32/i;
- # some applications are trying to be too smart
- # yes I'm speaking of YOU, SpamAssassin, grr..
- local($SIG{__DIE__}, $SIG{__WARN__}, $@);
-
- if (eval "use Sys::Syslog::Win32; 1") {
+ if (can_load("Sys::Syslog::Win32")) {
unshift @connectMethods, 'eventlog';
}
elsif ($is_Win32) {
@@ -124,6 +128,18 @@
my @defaultMethods = @connectMethods;
my @fallbackMethods = ();
+# The timeout in connection_ok() was pushed up to 0.25 sec in
+# Sys::Syslog v0.19 in order to address a heisenbug on MacOSX:
+# http://london.pm.org/pipermail/london.pm/Week-of-Mon-20061211/005961.html
+#
+# However, this also had the effect of slowing this test for
+# all other operating systems, which apparently impacted some
+# users (cf. CPAN-RT #34753). So, in order to make everybody
+# happy, the timeout is now zero by default on all systems
+# except on OSX where it is set to 250 msec, and can be set
+# with the infamous setlogsock() function.
+$sock_timeout = 0.25 if $^O =~ /darwin/;
+
# coderef for a nicer handling of errors
my $err_sub = $options{nofatal} ? \&warnings::warnif : \&croak;
@@ -155,7 +171,7 @@
$options{$opt} = 1 if exists $options{$opt}
}
- $err_sub = $options{nofatal} ? \&warnings::warnif : \&croak;
+ $err_sub = delete $options{nofatal} ? \&warnings::warnif : \&croak;
return 1 unless $options{ndelay};
connect_log();
}
@@ -172,8 +188,18 @@
}
sub setlogsock {
- my $setsock = shift;
- $syslog_path = shift;
+ my ($setsock, $setpath, $settime) = @_;
+
+ # check arguments
+ my $diag_invalid_arg
+ = "Invalid argument passed to setlogsock; must be 'stream', 'pipe', "
+ . "'unix', 'native', 'eventlog', 'tcp', 'udp' or 'inet'";
+ croak $diag_invalid_arg unless defined $setsock;
+ croak "Invalid number of arguments" unless @_ >= 1 and @_ <= 3;
+
+ $syslog_path = $setpath if defined $setpath;
+ $sock_timeout = $settime if defined $settime;
+
disconnect_log() if $connected;
$transmit_ok = 0;
@fallbackMethods = ();
@@ -237,7 +263,7 @@
@connectMethods = qw(native);
} elsif (lc $setsock eq 'eventlog') {
- if (eval "use Win32::EventLog; 1") {
+ if (can_load("Win32::EventLog")) {
@connectMethods = qw(eventlog);
} else {
warnings::warnif "eventlog passed to setlogsock, but no Win32 API
available";
@@ -248,6 +274,7 @@
} elsif (lc $setsock eq 'tcp') {
if (getservbyname('syslog', 'tcp') || getservbyname('syslogng', 'tcp'))
{
@connectMethods = qw(tcp);
+ $host = $syslog_path;
} else {
warnings::warnif "tcp passed to setlogsock, but tcp service
unavailable";
return undef;
@@ -256,6 +283,7 @@
} elsif (lc $setsock eq 'udp') {
if (getservbyname('syslog', 'udp')) {
@connectMethods = qw(udp);
+ $host = $syslog_path;
} else {
warnings::warnif "udp passed to setlogsock, but udp service
unavailable";
return undef;
@@ -268,8 +296,7 @@
@connectMethods = qw(console);
} else {
- croak "Invalid argument passed to setlogsock; must be 'stream',
'pipe', ",
- "'unix', 'native', 'eventlog', 'tcp', 'udp' or 'inet'"
+ croak $diag_invalid_arg
}
return 1;
@@ -293,25 +320,29 @@
croak "syslog: expecting argument \$priority" unless defined $priority;
croak "syslog: expecting argument \$format" unless defined $mask;
+ croak "syslog: invalid level/facility: $priority" if $priority =~ /^-\d+$/;
@words = split(/\W+/, $priority, 2); # Allow "level" or
"level|facility".
undef $numpri;
undef $numfac;
- foreach (@words) {
- $num = xlate($_); # Translate word to number.
- if ($num < 0) {
- croak "syslog: invalid level/facility: $_"
- }
- elsif ($num <= &LOG_PRIMASK) {
- croak "syslog: too many levels given: $_" if defined $numpri;
- $numpri = $num;
- return 0 unless LOG_MASK($numpri) & $maskpri;
- }
- else {
- croak "syslog: too many facilities given: $_" if defined $numfac;
- $facility = $_;
- $numfac = $num;
- }
+ for my $word (@words) {
+ next if length $word == 0;
+
+ $num = xlate($word); # Translate word to number.
+
+ if ($num < 0) {
+ croak "syslog: invalid level/facility: $word"
+ }
+ elsif ($num <= &LOG_PRIMASK) {
+ croak "syslog: too many levels given: $word" if defined $numpri;
+ $numpri = $num;
+ return 0 unless LOG_MASK($numpri) & $maskpri;
+ }
+ else {
+ croak "syslog: too many facilities given: $word" if defined
$numfac;
+ $facility = $word;
+ $numfac = $num;
+ }
}
croak "syslog: level must be given" unless defined $numpri;
@@ -464,14 +495,28 @@
# private function to translate names to numeric values
#
sub xlate {
- my($name) = @_;
+ my ($name) = @_;
+
return $name+0 if $name =~ /^\s*\d+\s*$/;
$name = uc $name;
$name = "LOG_$name" unless $name =~ /^LOG_/;
- $name = "Sys::Syslog::$name";
- # Can't have just eval { &$name } || -1 because some LOG_XXX may be zero.
- my $value = eval { no strict 'refs'; &$name };
- $@ = "";
+
+ # ExtUtils::Constant 0.20 introduced a new way to implement
+ # constants, called ProxySubs. When it was used to generate
+ # the C code, the constant() function no longer returns the
+ # correct value. Therefore, we first try a direct call to
+ # constant(), and if the value is an error we try to call the
+ # constant by its full name.
+ my $value = constant($name);
+
+ if (index($value, "not a valid") >= 0) {
+ $name = "Sys::Syslog::$name";
+ $value = eval { no strict "refs"; &$name };
+ $value = $@ unless defined $value;
+ }
+
+ $value = -1 if index($value, "not a valid") >= 0;
+
return defined $value ? $value : -1;
}
@@ -546,11 +591,10 @@
}
setsockopt(SYSLOG, SOL_SOCKET, SO_KEEPALIVE, 1);
- if (eval { IPPROTO_TCP() }) {
+ if (silent_eval { IPPROTO_TCP() }) {
# These constants don't exist in 5.005. They were added in 1999
setsockopt(SYSLOG, IPPROTO_TCP(), TCP_NODELAY(), 1);
}
- $@ = "";
if (!connect(SYSLOG, $addr)) {
push @$errs, "tcp connect: $!";
return 0;
@@ -619,7 +663,7 @@
push @$errs, "stream $syslog_path is not writable";
return 0;
}
- if (!sysopen(SYSLOG, $syslog_path, 0400, O_WRONLY)) {
+ if (!sysopen(SYSLOG, $syslog_path, O_WRONLY, 0400)) {
push @$errs, "stream can't open $syslog_path: $!";
return 0;
}
@@ -697,12 +741,7 @@
$logopt += xlate($opt) if $options{$opt}
}
- eval { openlog_xs($ident, $logopt, xlate($facility)) };
- if ($@) {
- push @$errs, $@;
- return 0;
- }
-
+ openlog_xs($ident, $logopt, xlate($facility));
$syslog_send = \&_syslog_send_native;
return 1;
@@ -741,7 +780,7 @@
my $rin = '';
vec($rin, fileno(SYSLOG), 1) = 1;
- my $ret = select $rin, undef, $rin, 0.25;
+ my $ret = select $rin, undef, $rin, $sock_timeout;
return ($ret ? 0 : 1);
}
@@ -761,7 +800,26 @@
return close SYSLOG;
}
-1;
+
+#
+# Wrappers around eval() that makes sure that nobody, and I say NOBODY,
+# ever knows that I wanted to test if something was here or not.
+# It is needed because some applications are trying to be too smart,
+# do it wrong, and it ends up in EPIC FAIL.
+# Yes I'm speaking of YOU, SpamAssassin.
+#
+sub silent_eval (&) {
+ local($SIG{__DIE__}, $SIG{__WARN__}, $@);
+ return eval { $_[0]->() }
+}
+
+sub can_load {
+ local($SIG{__DIE__}, $SIG{__WARN__}, $@);
+ return eval "use $_[0]; 1"
+}
+
+
+"Eighth Rule: read the documentation."
__END__
@@ -771,7 +829,7 @@
=head1 VERSION
-Version 0.24
+Version 0.26
=head1 SYNOPSIS
@@ -965,6 +1023,8 @@
=item B<setlogsock($sock_type, $stream_location)> (added in Perl 5.004_02)
+=item B<setlogsock($sock_type, $stream_location, $sock_timeout)> (added in
0.25)
+
Sets the socket type to be used for the next call to
C<openlog()> or C<syslog()> and returns true on success,
C<undef> on failure. The available mechanisms are:
@@ -984,15 +1044,18 @@
=item *
C<"tcp"> - connect to a TCP socket, on the C<syslog/tcp> or C<syslogng/tcp>
-service.
+service. If defined, the second parameter is used as a hostname to connect to.
=item *
C<"udp"> - connect to a UDP socket, on the C<syslog/udp> service.
+If defined, the second parameter is used as a hostname to connect to,
+and the third parameter as the timeout used to check for UDP response.
=item *
-C<"inet"> - connect to an INET socket, either TCP or UDP, tried in that order.
+C<"inet"> - connect to an INET socket, either TCP or UDP, tried in that
+order. If defined, the second parameter is used as a hostname to connect to.
=item *
@@ -1026,7 +1089,8 @@
When this calling method is used, the array should contain a list of
mechanisms which are attempted in order.
-The default is to try C<native>, C<tcp>, C<udp>, C<unix>, C<stream>,
C<console>.
+The default is to try C<native>, C<tcp>, C<udp>, C<unix>, C<pipe>, C<stream>,
+C<console>.
Under systems with the Win32 API, C<eventlog> will be added as the first
mechanism to try if C<Win32::EventLog> is available.
@@ -1113,8 +1177,7 @@
Log to UDP port on C<$remotehost> instead of logging locally:
- setlogsock('udp');
- $Sys::Syslog::host = $remotehost;
+ setlogsock("udp", $remotehost);
openlog($program, 'ndelay', 'user');
syslog('info', 'something happened over here');
@@ -1342,16 +1405,19 @@
L<http://www.gnu.org/software/libc/manual/html_node/Syslog.html>
Solaris 10 documentation on syslog,
-L<http://docs.sun.com/app/docs/doc/816-5168/6mbb3hruo?a=view>
+L<http://docs.sun.com/app/docs/doc/816-5168/syslog-3c?a=view>
-IRIX 6.4 documentation on syslog,
-L<http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=0640&db=man&fname=3c+syslog>
+Mac OS X documentation on syslog,
+L<http://developer.apple.com/documentation/Darwin/Reference/ManPages/man3/syslog.3.html>
+
+IRIX 6.5 documentation on syslog,
+L<http://techpubs.sgi.com/library/tpl/cgi-bin/getdoc.cgi?coll=0650&db=man&fname=3c+syslog>
AIX 5L 5.3 documentation on syslog,
L<http://publib.boulder.ibm.com/infocenter/pseries/v5r3/index.jsp?topic=/com.ibm.aix.basetechref/doc/basetrf2/syslog.htm>
HP-UX 11i documentation on syslog,
-L<http://docs.hp.com/en/B9106-90010/syslog.3C.html>
+L<http://docs.hp.com/en/B2355-60130/syslog.3C.html>
Tru64 5.1 documentation on syslog,
L<http://h30097.www3.hp.com/docs/base_doc/DOCUMENTATION/V51_HTML/MAN/MAN3/0193____.HTM>
@@ -1455,7 +1521,7 @@
=head1 COPYRIGHT
-Copyright (C) 1990-2007 by Larry Wall and others.
+Copyright (C) 1990-2008 by Larry Wall and others.
=head1 LICENSE
@@ -1518,6 +1584,9 @@
Links
-----
+Linux Fast-STREAMS
+- L<http://www.openss7.org/streams.html>
+
II12021: SYSLOGD HOWTO TCPIPINFO (z/OS, OS/390, MVS)
- L<http://www-1.ibm.com/support/docview.wss?uid=isg1II12021>
==== //depot/maint-5.10/perl/ext/Sys/Syslog/Syslog.xs#2 (text) ====
Index: perl/ext/Sys/Syslog/Syslog.xs
--- perl/ext/Sys/Syslog/Syslog.xs#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/Sys/Syslog/Syslog.xs 2008-09-03 08:48:26.000000000 -0700
@@ -9,13 +9,13 @@
#define HAVE_SYSLOG 1
#endif
-#if defined(I_SYSLOG) || PATCHLEVEL < 6
-#include <syslog.h>
-#endif
-
#if defined(_WIN32) && !defined(__CYGWIN__)
-#undef HAVE_SYSLOG
-#include "fallback/syslog.h"
+# undef HAVE_SYSLOG
+# include "fallback/syslog.h"
+#else
+# if defined(I_SYSLOG) || PATCHLEVEL < 6
+# include <syslog.h>
+# endif
#endif
static SV *ident_svptr;
@@ -126,7 +126,9 @@
INPUT:
int mask
CODE:
- setlogmask(mask);
+ RETVAL = setlogmask(mask);
+ OUTPUT:
+ RETVAL
void
closelog_xs()
==== //depot/maint-5.10/perl/ext/Sys/Syslog/t/00-load.t#2 (text) ====
Index: perl/ext/Sys/Syslog/t/00-load.t
--- perl/ext/Sys/Syslog/t/00-load.t#1~32694~ 2007-12-22 01:23:09.000000000
-0800
+++ perl/ext/Sys/Syslog/t/00-load.t 2008-09-03 08:48:26.000000000 -0700
@@ -2,9 +2,7 @@
use strict;
use Test::More tests => 1;
-BEGIN {
- use_ok( 'Sys::Syslog' );
-}
+use_ok( 'Sys::Syslog' );
diag( "Testing Sys::Syslog $Sys::Syslog::VERSION, Perl $], $^X" )
unless $ENV{PERL_CORE};
==== //depot/maint-5.10/perl/ext/Sys/Syslog/t/syslog.t#3 (xtext) ====
Index: perl/ext/Sys/Syslog/t/syslog.t
--- perl/ext/Sys/Syslog/t/syslog.t#2~33111~ 2008-01-29 11:03:04.000000000
-0800
+++ perl/ext/Sys/Syslog/t/syslog.t 2008-09-03 08:48:26.000000000 -0700
@@ -115,35 +115,35 @@
}
-BEGIN { $tests += 20 * 8 }
+BEGIN { $tests += 22 * 8 }
# try to open a syslog using all the available connection methods
my @passed = ();
for my $sock_type (qw(native eventlog unix pipe stream inet tcp udp)) {
SKIP: {
- skip "the 'stream' mechanism because a previous mechanism with similar
interface succeeded", 20
+ skip "the 'stream' mechanism because a previous mechanism with similar
interface succeeded", 22
if $sock_type eq 'stream' and grep {/pipe|unix/} @passed;
# setlogsock() called with an arrayref
$r = eval { setlogsock([$sock_type]) } || 0;
- skip "can't use '$sock_type' socket", 20 unless $r;
+ skip "can't use '$sock_type' socket", 22 unless $r;
is( $@, '', "[$sock_type] setlogsock() called with ['$sock_type']" );
ok( $r, "[$sock_type] setlogsock() should return true: '$r'" );
# setlogsock() called with a single argument
$r = eval { setlogsock($sock_type) } || 0;
- skip "can't use '$sock_type' socket", 18 unless $r;
+ skip "can't use '$sock_type' socket", 20 unless $r;
is( $@, '', "[$sock_type] setlogsock() called with '$sock_type'" );
ok( $r, "[$sock_type] setlogsock() should return true: '$r'" );
# openlog() without option NDELAY
$r = eval { openlog('perl', '', 'local0') } || 0;
- skip "can't connect to syslog", 16 if $@ =~ /^no connection to syslog
available/;
+ skip "can't connect to syslog", 18 if $@ =~ /^no connection to syslog
available/;
is( $@, '', "[$sock_type] openlog() called with facility 'local0' and
without option 'ndelay'" );
ok( $r, "[$sock_type] openlog() should return true: '$r'" );
# openlog() with the option NDELAY
$r = eval { openlog('perl', 'ndelay', 'local0') } || 0;
- skip "can't connect to syslog", 14 if $@ =~ /^no connection to syslog
available/;
+ skip "can't connect to syslog", 16 if $@ =~ /^no connection to syslog
available/;
is( $@, '', "[$sock_type] openlog() called with facility 'local0' with
option 'ndelay'" );
ok( $r, "[$sock_type] openlog() should return true: '$r'" );
@@ -152,6 +152,11 @@
like( $@, '/^syslog: invalid level\/facility: /', "[$sock_type]
syslog() called with level -1" );
ok( !$r, "[$sock_type] syslog() should return false: '$r'" );
+ # syslog() with invalid level, should fail
+ $r = eval { syslog("plonk", "$test_string by connecting to a
$sock_type socket") } || 0;
+ like( $@, '/^syslog: invalid level\/facility: /', "[$sock_type]
syslog() called with level plonk" );
+ ok( !$r, "[$sock_type] syslog() should return false: '$r'" );
+
# syslog() with levels "info" and "notice" (as a strings), should fail
$r = eval { syslog('info,notice', "$test_string by connecting to a
$sock_type socket") } || 0;
like( $@, '/^syslog: too many levels given: notice/', "[$sock_type]
syslog() called with level 'info,notice'" );
End of Patch.
