rpms/perl/devel perl-5.10.0-SysSyslog-0.24.patch, NONE, 1.1 perl.spec, 1.145, 1.146

Tom Callaway (spot) fedora-extras-commits at redhat.com
Thu Jan 10 14:21:24 UTC 2008


Author: spot

Update of /cvs/pkgs/rpms/perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1170

Modified Files:
	perl.spec 
Added Files:
	perl-5.10.0-SysSyslog-0.24.patch 
Log Message:

Update Sys::Syslog to 0.24 to fix test failures


perl-5.10.0-SysSyslog-0.24.patch:

--- NEW FILE perl-5.10.0-SysSyslog-0.24.patch ---
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/Changes perl-5.10.0/ext/Sys/Syslog/Changes
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/Changes	2007-12-18 05:47:07.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/Changes	2007-12-31 11:15:57.000000000 -0500
@@ -1,5 +1,16 @@
 Revision history for Sys-Syslog
 
+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.
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/eg/syslog.pl perl-5.10.0/ext/Sys/Syslog/eg/syslog.pl
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/eg/syslog.pl	1969-12-31 19:00:00.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/eg/syslog.pl	2006-10-26 18:10:46.000000000 -0400
@@ -0,0 +1,12 @@
+#!/usr/bin/perl
+use strict;
+use Sys::Syslog;
+
+die "usage: $0 facility/priority message\n" unless @ARGV;
+
+my ($facility, $priority) = split '/', shift;
+my $message = join ' ', @ARGV;
+
+openlog($0, "ndelay,pid", $facility) or die "fatal: can't open syslog: $!\n";
+syslog($priority, "%s", $message);
+closelog();
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/fallback/syslog.h perl-5.10.0/ext/Sys/Syslog/fallback/syslog.h
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/fallback/syslog.h	1969-12-31 19:00:00.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/fallback/syslog.h	2007-11-12 17:24:23.000000000 -0500
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 1982, 1986, 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
+ */
+
+#ifndef _SYS_SYSLOG_H
+#define _SYS_SYSLOG_H 1
+
+#define	_PATH_LOG	""
+
+/*
+ * priorities/facilities are encoded into a single 32-bit quantity, where the
+ * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
+ * (0-big number).  Both the priorities and the facilities map roughly
+ * one-to-one to strings in the syslogd(8) source code.  This mapping is
+ * included in this file.
+ *
+ * priorities (these are ordered)
+ */
+#define	LOG_EMERG	0	/* system is unusable */
+#define	LOG_ALERT	1	/* action must be taken immediately */
+#define	LOG_CRIT	2	/* critical conditions */
+#define	LOG_ERR		3	/* error conditions */
+#define	LOG_WARNING	4	/* warning conditions */
+#define	LOG_NOTICE	5	/* normal but significant condition */
+#define	LOG_INFO	6	/* informational */
+#define	LOG_DEBUG	7	/* debug-level messages */
+
+#define	LOG_PRIMASK	0x07	/* mask to extract priority part (internal) */
+				/* extract priority */
+#define	LOG_PRI(p)	((p) & LOG_PRIMASK)
+#define	LOG_MAKEPRI(fac, pri)	(((fac) << 3) | (pri))
+
+/* facility codes */
+#define	LOG_KERN	(0<<3)	/* kernel messages */
+#define	LOG_USER	(1<<3)	/* random user-level messages */
+#define	LOG_MAIL	(2<<3)	/* mail system */
+#define	LOG_DAEMON	(3<<3)	/* system daemons */
+#define	LOG_AUTH	(4<<3)	/* security/authorization messages */
+#define	LOG_SYSLOG	(5<<3)	/* messages generated internally by syslogd */
+#define	LOG_LPR		(6<<3)	/* line printer subsystem */
+#define	LOG_NEWS	(7<<3)	/* network news subsystem */
+#define	LOG_UUCP	(8<<3)	/* UUCP subsystem */
+#define	LOG_CRON	(9<<3)	/* clock daemon */
+#define	LOG_AUTHPRIV	(10<<3)	/* security/authorization messages (private) */
+#define	LOG_FTP		(11<<3)	/* ftp daemon */
+#define	LOG_NETINFO     (12<<3) /* NetInfo */
+#define	LOG_REMOTEAUTH  (13<<3) /* remote authentication/authorization */
+#define	LOG_INSTALL     (14<<3) /* installer subsystem */
+#define	LOG_RAS         (15<<3) /* Remote Access Service (VPN / PPP) */
+#define	LOG_LOCAL0	(16<<3)	/* reserved for local use */
+#define	LOG_LOCAL1	(17<<3)	/* reserved for local use */
+#define	LOG_LOCAL2	(18<<3)	/* reserved for local use */
+#define	LOG_LOCAL3	(19<<3)	/* reserved for local use */
+#define	LOG_LOCAL4	(20<<3)	/* reserved for local use */
+#define	LOG_LOCAL5	(21<<3)	/* reserved for local use */
+#define	LOG_LOCAL6	(22<<3)	/* reserved for local use */
+#define	LOG_LOCAL7	(23<<3)	/* reserved for local use */
+#define	LOG_LAUNCHD     (24<<3) /* launchd - general bootstrap daemon */
+
+#define	LOG_NFACILITIES	25	/* current number of facilities */
+#define	LOG_FACMASK	0x03f8	/* mask to extract facility part */
+				/* facility of pri */
+#define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
+
+/*
+ * arguments to setlogmask.
+ */
+#define	LOG_MASK(pri)	(1 << (pri))		/* mask for one priority */
+#define	LOG_UPTO(pri)	((1 << ((pri)+1)) - 1)	/* all priorities through pri */
+
+/*
+ * Option flags for openlog.
+ *
+ * LOG_ODELAY no longer does anything.
+ * LOG_NDELAY is the inverse of what it used to be.
+ */
+#define	LOG_PID		0x01	/* log the pid with each message */
+#define	LOG_CONS	0x02	/* log on the console if errors in sending */
+#define	LOG_ODELAY	0x04	/* delay open until first syslog() (default) */
+#define	LOG_NDELAY	0x08	/* don't delay open */
+#define	LOG_NOWAIT	0x10	/* don't wait for console forks: DEPRECATED */
+#define	LOG_PERROR	0x20	/* log to stderr as well */
+
+#endif /* sys/syslog.h */
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/Makefile.PL perl-5.10.0/ext/Sys/Syslog/Makefile.PL
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/Makefile.PL	2007-12-18 05:47:07.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/Makefile.PL	2007-11-09 08:51:59.000000000 -0500
@@ -70,6 +70,9 @@
         DEFINE      => '-DUSE_PPPORT_H';
 }
 
+# on pre-5.6 Perls, add warnings::compat to the prereq modules
+push @extra_prereqs, "warnings::compat"  if $] < 5.006;
+
 WriteMakefile(
     NAME            => 'Sys::Syslog',
     LICENSE         => 'perl',
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/MANIFEST perl-5.10.0/ext/Sys/Syslog/MANIFEST
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/MANIFEST	1969-12-31 19:00:00.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/MANIFEST	2007-12-31 12:00:44.000000000 -0500
@@ -0,0 +1,27 @@
+Makefile.PL
+META.yml
+Changes
+MANIFEST
+README
+README.win32
+Syslog.pm
+Syslog.xs
+fallback/const-c.inc
+fallback/const-xs.inc
+fallback/syslog.h
+ppport.h
+eg/syslog.pl
+t/00-load.t
+t/constants.t
+t/distchk.t
+t/syslog.t
+t/pod.t
+t/podcover.t
+t/podspell.t
+t/portfs.t
+win32/compile.pl
+win32/PerlLog.mc
+win32/PerlLog.RES
+win32/PerlLog_RES.uu
+win32/PerlLog_dll.uu
+win32/Win32.pm
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/META.yml perl-5.10.0/ext/Sys/Syslog/META.yml
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/META.yml	1969-12-31 19:00:00.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/META.yml	2007-12-31 12:01:18.000000000 -0500
@@ -0,0 +1,14 @@
[...5151 lines suppressed...]
+#endif
+#endif
+
+#ifdef NO_XSLOCKS
+#  ifdef dJMPENV
+#    define dXCPT             dJMPENV; int rEtV = 0
+#    define XCPT_TRY_START    JMPENV_PUSH(rEtV); if (rEtV == 0)
+#    define XCPT_TRY_END      JMPENV_POP;
+#    define XCPT_CATCH        if (rEtV != 0)
+#    define XCPT_RETHROW      JMPENV_JUMP(rEtV)
+#  else
+#    define dXCPT             Sigjmp_buf oldTOP; int rEtV = 0
+#    define XCPT_TRY_START    Copy(top_env, oldTOP, 1, Sigjmp_buf); rEtV = Sigsetjmp(top_env, 1); if (rEtV == 0)
+#    define XCPT_TRY_END      Copy(oldTOP, top_env, 1, Sigjmp_buf);
+#    define XCPT_CATCH        if (rEtV != 0)
+#    define XCPT_RETHROW      Siglongjmp(top_env, rEtV)
+#  endif
+#endif
+
+#endif /* _P_P_PORTABILITY_H_ */
+
+/* End of File ppport.h */
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/Syslog.pm perl-5.10.0/ext/Sys/Syslog/Syslog.pm
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/Syslog.pm	2007-12-18 05:47:07.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/Syslog.pm	2007-12-31 11:15:28.000000000 -0500
@@ -10,7 +10,7 @@
 require Exporter;
 
 {   no strict 'vars';
-    $VERSION = '0.22';
+    $VERSION = '0.24';
     @ISA = qw(Exporter);
 
     %EXPORT_TAGS = (
@@ -221,7 +221,7 @@
 
     } elsif (lc $setsock eq 'pipe') {
         for my $path ($syslog_path, &_PATH_LOG, "/dev/log") {
-            next unless defined $path and length $path and -w $path;
+            next unless defined $path and length $path and -p $path and -w _;
             $syslog_path = $path;
             last
         }
@@ -771,7 +771,7 @@
 
 =head1 VERSION
 
-Version 0.22
+Version 0.24
 
 =head1 SYNOPSIS
 
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/distchk.t perl-5.10.0/ext/Sys/Syslog/t/distchk.t
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/distchk.t	1969-12-31 19:00:00.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/t/distchk.t	2007-08-21 14:59:13.000000000 -0400
@@ -0,0 +1,5 @@
+#!perl -w
+use strict;
+use Test::More;
+eval "use Test::Distribution not => [qw(versions podcover use)]";
+plan skip_all => "Test::Distribution required for checking distribution" if $@;
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/podcover.t perl-5.10.0/ext/Sys/Syslog/t/podcover.t
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/podcover.t	1969-12-31 19:00:00.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/t/podcover.t	2007-08-19 19:53:41.000000000 -0400
@@ -0,0 +1,6 @@
+#!perl -wT
+use strict;
+use Test::More;
+eval "use Test::Pod::Coverage 1.06";
+plan skip_all => "Test::Pod::Coverage 1.06 required for testing POD coverage" if $@;
+all_pod_coverage_ok({also_private => [qw(^constant$ ^connect ^disconnect ^xlate$ ^LOG_ _xs$)]});
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/podspell.t perl-5.10.0/ext/Sys/Syslog/t/podspell.t
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/podspell.t	1969-12-31 19:00:00.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/t/podspell.t	2007-09-07 09:13:19.000000000 -0400
@@ -0,0 +1,78 @@
+#!perl -w
+use strict;
+use Test::More;
+plan skip_all => "Pod spelling: for developer interest only :)" unless -d 'releases';
+eval "use Test::Spelling";
+plan skip_all => "Test::Spelling required for testing POD spell" if $@;
+set_spell_cmd('aspell -l --lang=en');
+add_stopwords(<DATA>);
+all_pod_files_spelling_ok();
+
+__END__
+
+SAPER
+Sébastien
+Aperghis
+Tramoni
+Aperghis-Tramoni
+Christiansen
+Kobes
+Hedden
+Reini
+Harnisch
+AnnoCPAN
+CPAN
+README
+TODO
+AUTOLOADER
+API
+arrayref
+arrayrefs
+hashref
+hashrefs
+lookup
+hostname
+loopback
+netmask
+timestamp
+INET
+BPF
+IP
+TCP
+tcp
+UDP
+udp
+UUCP
+NTP
+FDDI
+Firewire
+HDLC
+IEEE
+IrDA
+LocalTalk
+PPP
+unix
+FreeBSD
+NetBSD
+Solaris
+IRIX
+endianness
+failover
+Failover
+logopts
+pathname
+syslogd
+Syslogging
+logmask
+AIX
+SUSv
+SUSv3
+Tru
+Tru64
+UX
+HP-UX
+VOS
+NetInfo
+VPN
+launchd
+logalert
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/pod.t perl-5.10.0/ext/Sys/Syslog/t/pod.t
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/pod.t	1969-12-31 19:00:00.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/t/pod.t	2007-08-19 19:53:41.000000000 -0400
@@ -0,0 +1,6 @@
+#!perl -wT
+use strict;
+use Test::More;
+eval "use Test::Pod 1.14";
+plan skip_all => "Test::Pod 1.14 required for testing POD" if $@;
+all_pod_files_ok();
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/portfs.t perl-5.10.0/ext/Sys/Syslog/t/portfs.t
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/portfs.t	1969-12-31 19:00:00.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/t/portfs.t	2007-08-19 19:53:40.000000000 -0400
@@ -0,0 +1,8 @@
+#!perl -wT
+use strict;
+use Test::More;
+eval "use Test::Portability::Files";
+plan skip_all => "Test::Portability::Files required for testing filenames portability" if $@;
+
+# run the selected tests
+run_tests();
diff -urP /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/syslog.t perl-5.10.0/ext/Sys/Syslog/t/syslog.t
--- /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/t/syslog.t	2007-12-18 05:47:07.000000000 -0500
+++ perl-5.10.0/ext/Sys/Syslog/t/syslog.t	2007-12-30 12:23:58.000000000 -0500
@@ -19,6 +19,10 @@
                 pack portable recursion redefine regexp severe signal substr
                 syntax taint uninitialized unpack untie utf8 void);
 
+# if someone is using warnings::compat, the previous trick won't work, so we
+# must manually disable warnings
+$^W = 0 if $] < 5.006;
+
 my $is_Win32  = $^O =~ /win32/i;
 my $is_Cygwin = $^O =~ /cygwin/i;
 
@@ -189,6 +193,9 @@
     skip "the 'unix' mechanism works, so the tests will likely fail with the 'stream' mechanism", 10 
         if grep {/unix/} @passed;
 
+    skip "not testing setlogsock('stream'): _PATH_LOG unavailable", 10
+        unless -e Sys::Syslog::_PATH_LOG();
+
     # setlogsock() with "stream" and an undef path
     $r = eval { setlogsock("stream", undef ) } || '';
     is( $@, '', "setlogsock() called, with 'stream' and an undef path" );
Binary files /home/spot/rpmbuild/BUILD/perl-5.10.0/ext/Sys/Syslog/win32/PerlLog.RES and perl-5.10.0/ext/Sys/Syslog/win32/PerlLog.RES differ


Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/devel/perl.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- perl.spec	10 Jan 2008 03:30:42 -0000	1.145
+++ perl.spec	10 Jan 2008 14:20:34 -0000	1.146
@@ -16,7 +16,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
@@ -54,6 +54,9 @@
 # buildroots by design.
 Patch8:        perl-5.10.0-disable_test_hosts.patch
 
+# Bump Sys::Syslog to 0.24 to fix test failure case
+Patch9:        perl-5.10.0-SysSyslog-0.24.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel, zlib-devel
@@ -763,6 +766,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 #
 # Candidates for doc recoding (need case by case review):
@@ -1548,6 +1552,9 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Thu Jan 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4:5.10.0-3
+- Update Sys::Syslog to 0.24, to fix test failures
+
 * Wed Jan 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4:5.10.0-2
 - add some BR for tests
 




More information about the fedora-extras-commits mailing list