Integrate:

[ 34992]
Integrate:
[ 34943]
Subject: [perl #32979] [PATCH] perlrun #!/bin/sh incantation n.g. 4 linux
From: "Steve Peters via RT" <perlbug-followup@perl.org>
Date: 21 Dec 2004 17:36:12 -0000
Message-ID: <rt-3.0.11-32979-103402.11.4873424142094@perl.org>

Applying a four year old patch from myself.  w00t!

[ 34945]
Subject: [PATCH] Small eval documentation tweak
From: Bo Lindbergh <blgl@hagernas.com>
Date: Wed, 26 Nov 2008 10:54:53 +0100
Message-Id: <F5D05263-9E5C-4B6D-8233-E11DE1D207E8@hagernas.com>

[ 34961]
Subject: Re: 5.8.9 RC1 / 5.10.x / bleed patches for README.aix
From: Rainer Tammer <tammer@tammer.net>
Date: Sat, 29 Nov 2008 14:23:26 +0100
Message-ID: <4931424E.8000008@tammer.net>

[ 34975]
Add diagnostics for "No such hook: %s".

[ 34976]
setsid() returns -1 on failure.

[ 35041]
Integrate:
[ 35039]
Note perl5-security-report@perl.org in INSTALL. Must remember to
mention it in the release announcement.
p4raw-link: @35041 on //depot/maint-5.10/perl: 61a5d557692739efe5327bc409828918badf61b8
p4raw-link: @35039 on //depot/perl: 5acb7768560c2784f756ed5cfc88162c6759ce4e
p4raw-link: @34992 on //depot/maint-5.10/perl: 3ad21a22a0cfea85be5178120a64645681aa14a1
p4raw-link: @34976 on //depot/perl: c4cd47ac59d76a2228d65807ac3ac3a0ef9ed7c7
p4raw-link: @34975 on //depot/perl: 3c20a832e0afaa3d5dac4e9889c4ce2f06a128c5
p4raw-link: @34961 on //depot/perl: e1051f11a3c9aa4f634380cb66a839c59f585fe4
p4raw-link: @34945 on //depot/perl: bbead3ca7e50b701f65ec6cf737d745fbe719760
p4raw-link: @34943 on //depot/perl: 428bacd701ef45155f9dfd0d9c3d063dc305de00

p4raw-id: //depot/maint-5.8/perl@35042
p4raw-integrated: from //depot/maint-5.10/perl@35037 'copy in'
	pod/perlipc.pod (@34017..) 'merge in' pod/perlrun.pod
	(@34720..) pod/perldiag.pod pod/perlfunc.pod (@34850..) INSTALL
	(@34911..)
p4raw-integrated: from //depot/maint-5.10/perl@34992 'merge in'
	README.aix (@34893..)

6 files changed, 29 insertions, 8 deletions

diff --git a/INSTALL b/INSTALL
index ad3d1b9b19..5c1cf2a6ea 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2205,6 +2205,15 @@ attachments or encodings may actually reduce the number of people who
 read your message.  Your message will get relayed to over 400
 subscribers around the world so please try to keep it brief but clear.
 
+If the bug you are reporting has security implications, which make it
+inappropriate to send to a publicly archived mailing list, then please send
+it to perl5-security-report@perl.org. This points to a closed subscription
+unarchived mailing list, which includes all the core committers, who be able
+to help assess the impact of issues, figure out a resolution, and help
+co-ordinate the release of patches to mitigate or fix the problem across all
+platforms on which Perl is supported. Please only use this address for security
+issues in the Perl core, not for modules independently distributed on CPAN.
+
 If you are unsure what makes a good bug report please read "How to
 report Bugs Effectively" by Simon Tatham:
 http://www.chiark.greenend.org.uk/~sgtatham/bugs.html
diff --git a/README.aix b/README.aix
index c7c67c6d0a..aeb23f189c 100644
--- a/README.aix
+++ b/README.aix
@@ -27,6 +27,11 @@ Currently all versions of IBM's "xlc", "xlc_r", "cc", "cc_r" or
 "vac" ANSI/C compiler will work for building perl if that compiler
 works on your system.
 
+If you plan to link perl to any module that requires thread-support,
+like DBD::Oracle, it is better to use the _r version of the compiler.
+This will not build a threaded perl, but a thread-enabled perl. See
+also L<Threaded perl> later on.
+
 As of writing (2008-11) only the IBM XL C for AIX or XL C/C++ for AIX
 compiler is supported by IBM on AIX 5L/6.1.
 
@@ -122,7 +127,7 @@ can set:
 With the default setting the size is limited to 128MB.
 The -1 removes this limit.
 
-=head2 Recommended Options AIX 5.2/5.3 and 6.1 (threaded/32-bit)
+=head2 Recommended Options AIX 5.1/5.2/5.3 and 6.1 (threaded/32-bit)
 
 With the following options you get a threaded Perl version which
 passes all make tests in threaded 32-bit mode, which is the default
@@ -154,7 +159,7 @@ all make tests in 32-bit mode.
 The -Dprefix option will install Perl in a directory parallel to the
 IBM AIX system Perl installation.
 
-=head2 Recommended Options AIX 5.2/5.3 and 6.1 (threaded/64-bit)
+=head2 Recommended Options AIX 5.1/5.2/5.3 and 6.1 (threaded/64-bit)
 
 With the following options you get a threaded Perl version which
 passes all make tests in 64-bit mode.
@@ -453,6 +458,6 @@ Rainer Tammer <tammer@tammer.net>
 
 =head1 DATE
 
-Version 0.0.7: 18 Nov 2008
+Version 0.0.8: 01 Dec 2008
 
 =cut
diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index c5651afb6f..5b1d244af3 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -2520,6 +2520,11 @@ you haven't specified one.
 (F) You provided a class qualifier in a "my" or "our" declaration, but
 this class doesn't exist at this point in your program.
 
+=item No such hook: %s
+
+(F) You specified a signal hook that was not recognized by Perl.  Currently, Perl
+accepts C<__DIE__> and C<__WARN__> as valid signal hooks
+
 =item No such pipe open
 
 (P) An error peculiar to VMS.  The internal routine my_pclose() tried to
diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod
index 2f410f4026..717c9179d4 100644
--- a/pod/perlfunc.pod
+++ b/pod/perlfunc.pod
@@ -1501,7 +1501,8 @@ itself.  See L</wantarray> for more on how the evaluation context can be
 determined.
 
 If there is a syntax error or runtime error, or a C<die> statement is
-executed, an undefined value is returned by C<eval>, and C<$@> is set to the
+executed, C<eval> returns an undefined value in scalar context
+or an empty list in list context, and C<$@> is set to the
 error message.  If there was no error, C<$@> is guaranteed to be a null
 string.  Beware that using C<eval> neither silences perl from printing
 warnings to STDERR, nor does it stuff the text of warning messages into C<$@>.
diff --git a/pod/perlipc.pod b/pod/perlipc.pod
index 3e916a07af..de6ba581e6 100644
--- a/pod/perlipc.pod
+++ b/pod/perlipc.pod
@@ -536,7 +536,7 @@ output doesn't wind up on the user's terminal).
 				or die "Can't write to /dev/null: $!";
 	defined(my $pid = fork)	or die "Can't fork: $!";
 	exit if $pid;
-	setsid			or die "Can't start a new session: $!";
+	die "Can't start a new session: $!" if setsid == -1;
 	open STDERR, '>&STDOUT'	or die "Can't dup stdout: $!";
     }
 
diff --git a/pod/perlrun.pod b/pod/perlrun.pod
index 4eba382532..ac82d7f763 100644
--- a/pod/perlrun.pod
+++ b/pod/perlrun.pod
@@ -78,9 +78,10 @@ Parsing of the #! switches starts wherever "perl" is mentioned in the line.
 The sequences "-*" and "- " are specifically ignored so that you could,
 if you were so inclined, say
 
-    #!/bin/sh -- # -*- perl -*- -p
-    eval 'exec perl -wS $0 ${1+"$@"}'
-        if $running_under_some_shell;
+    #!/bin/sh
+    #! -*-perl-*-
+    eval 'exec perl -x -wS $0 ${1+"$@"}'
+        if 0;
 
 to let Perl see the B<-p> switch.