Change 21035 by [EMAIL PROTECTED] on 2003/09/04 19:02:26
Integrate:
[ 21027]
AUTHORS updates.
[ 21028]
A SuSE patchlet for perlcc -c to avoid
"Modification of a read-only value attempted at ... C.pm"
[ 21029]
Tiny perlcc tweaks.
[ 21030]
Subject: Re: "vendor" patch pickup
From: "Marcus Holland-Moritz" <[EMAIL PROTECTED]>
Date: Thu, 4 Sep 2003 19:47:55 +0200
Message-ID: <[EMAIL PROTECTED]>
(Gentoo: take Marcus' version of the __THROW patch and
even further #ifdef-protect it with __GLIBC__.)
[ 21031]
Subject: [PATCH] perlreftut: change distribution conditions
From: "Brendan O'Dea" <[EMAIL PROTECTED]>
Date: Thu, 4 Sep 2003 02:28:49 +1000
Message-ID: <[EMAIL PROTECTED]>
[ 21033]
I think once is enough.
Affected files ...
... //depot/maint-5.8/perl/AUTHORS#13 integrate
... //depot/maint-5.8/perl/configure.gnu#5 integrate
... //depot/maint-5.8/perl/ext/B/B/C.pm#5 integrate
... //depot/maint-5.8/perl/perl.h#52 integrate
... //depot/maint-5.8/perl/pod/perlreftut.pod#4 integrate
... //depot/maint-5.8/perl/utils/perlcc.PL#4 integrate
Differences ...
==== //depot/maint-5.8/perl/AUTHORS#13 (text) ====
Index: perl/AUTHORS
--- perl/AUTHORS#12~20883~ Mon Aug 25 08:49:41 2003
+++ perl/AUTHORS Thu Sep 4 12:02:26 2003
@@ -13,12 +13,15 @@
--
A. C. Yardley <[EMAIL PROTECTED]>
Aaron B. Dossett <[EMAIL PROTECTED]>
+Aaron J. Mackey <[EMAIL PROTECTED]>
Abe Timmerman <[EMAIL PROTECTED]>
Abhijit Menon-Sen <[EMAIL PROTECTED]>
Abigail <[EMAIL PROTECTED]>
Achim Bohnet <[EMAIL PROTECTED]>
+Adam Kennedy <[EMAIL PROTECTED]>
Adam Krolnik <[EMAIL PROTECTED]>
Adam Milner <[EMAIL PROTECTED]>
+Adam Spiers
Akim Demaille <[EMAIL PROTECTED]>
Alan Burlison <[EMAIL PROTECTED]>
Alan Champion <[EMAIL PROTECTED]>
@@ -28,6 +31,7 @@
Albert Dvornik <[EMAIL PROTECTED]>
Alessandro Forghieri <[EMAIL PROTECTED]>
Alex Gough <[EMAIL PROTECTED]>
+Alex Vandiver <[EMAIL PROTECTED]>
Alexander Gough <[EMAIL PROTECTED]>
Alexander Klimov <[EMAIL PROTECTED]>
Alexander Smishlajev <[EMAIL PROTECTED]>
@@ -35,9 +39,10 @@
Alexey Tourbin <[EMAIL PROTECTED]>
Alexey V. Barantsev <[EMAIL PROTECTED]>
Allen Smith <[EMAIL PROTECTED]>
-alian <[EMAIL PROTECTED]>
+Alain Barbet <[EMAIL PROTECTED]>
Ambrose Kofi Laing
Ananth Kesari <[EMAIL PROTECTED]>
+Anders Jonhson
Andreas Klussmann <[EMAIL PROTECTED]>
Andreas König <[EMAIL PROTECTED]>
Andreas Schwab <[EMAIL PROTECTED]>
@@ -58,6 +63,7 @@
Anton Berezin <[EMAIL PROTECTED]>
Anton Tagunov <[EMAIL PROTECTED]>
Archer Sully <[EMAIL PROTECTED]>
+Arjen Laarhoven <[EMAIL PROTECTED]>
Art Green <[EMAIL PROTECTED]>
Artur Bergman <[EMAIL PROTECTED]>
Autrijus Tang <[EMAIL PROTECTED]>
@@ -112,12 +118,13 @@
Charles Lane <[EMAIL PROTECTED]>
Charles Randall <[EMAIL PROTECTED]>
Charles Wilson <[EMAIL PROTECTED]>
-Chaskiel M Grundma
+Chaskiel M Grundman
Chip Salzenberg <[EMAIL PROTECTED]>
Chris Ball <[EMAIL PROTECTED]>
Chris Bongaarts <[EMAIL PROTECTED]>
Chris Faylor <[EMAIL PROTECTED]>
Chris Nandor <[EMAIL PROTECTED]>
+Chris Pepper
Chris Wick <[EMAIL PROTECTED]>
Christian Kirsch <[EMAIL PROTECTED]>
Christopher Chan-Nui <[EMAIL PROTECTED]>
@@ -142,6 +149,7 @@
Damian Conway <[EMAIL PROTECTED]>
Damon Atkins <[EMAIL PROTECTED]>
Dan Boorstein <[EMAIL PROTECTED]>
+Dan Brook
Dan Hale <[EMAIL PROTECTED]>
Dan Kogai <[EMAIL PROTECTED]>
Dan Schmidt <[EMAIL PROTECTED]>
@@ -163,6 +171,7 @@
Dave Hartnoll <[EMAIL PROTECTED]>
Dave Liney <[EMAIL PROTECTED]>
Dave Nelson <[EMAIL PROTECTED]>
+Dave Paris
Dave Rolsky <[EMAIL PROTECTED]>
Dave Schweisguth <[EMAIL PROTECTED]>
David Billinghurst <[EMAIL PROTECTED]>
@@ -180,6 +189,7 @@
David Kerry <[EMAIL PROTECTED]>
David Mitchell <[EMAIL PROTECTED]>
David Muir Sharnoff <[EMAIL PROTECTED]>
+david nicol <[EMAIL PROTECTED]>
David R. Favor <[EMAIL PROTECTED]>
David Sparks <[EMAIL PROTECTED]>
David Starks-Browning <[EMAIL PROTECTED]>
@@ -201,6 +211,7 @@
Drago Goricanec <[EMAIL PROTECTED]>
Ed Mooring <[EMAIL PROTECTED]>
Ed Peschko <[EMAIL PROTECTED]>
+Edmund Bacon
Edward Avis <[EMAIL PROTECTED]>
Edward Moy <[EMAIL PROTECTED]>
Edward Peschko <[EMAIL PROTECTED]>
@@ -208,9 +219,11 @@
Elizabeth Mattijsen <[EMAIL PROTECTED]>
Enache Adrian <[EMAIL PROTECTED]>
Eric Arnold <[EMAIL PROTECTED]>
+Eric Amick
Eric Bartley <[EMAIL PROTECTED]>
Eric E. Coe <[EMAIL PROTECTED]>
Eric Fifer <[EMAIL PROTECTED]>
+Eric Melville
Erich Rickheit
Eryq <[EMAIL PROTECTED]>
Etienne Grossman <[EMAIL PROTECTED]>
@@ -292,6 +305,7 @@
Ilya Zakharevich <[EMAIL PROTECTED]>
Inaba Hiroto <[EMAIL PROTECTED]>
Indy Singh <[EMAIL PROTECTED]>
+insecure <[EMAIL PROTECTED]>
Irving Reid <[EMAIL PROTECTED]>
Ivan Kurmanov <[EMAIL PROTECTED]>
J. David Blackstone <[EMAIL PROTECTED]>
@@ -302,6 +316,7 @@
James <[EMAIL PROTECTED]>
James A. Duncan <[EMAIL PROTECTED]>
James FitzGibbon <[EMAIL PROTECTED]>
+James Jurach <[EMAIL PROTECTED]>
Jamshid Afshar
Jan D. <[EMAIL PROTECTED]>
Jan Dubois <[EMAIL PROTECTED]>
@@ -316,6 +331,7 @@
Jason Shirk
Jason Stewart <[EMAIL PROTECTED]>
Jason Varsoke <[EMAIL PROTECTED]>
+Jay Hannah <[EMAIL PROTECTED]>
Jay Rogers <[EMAIL PROTECTED]>
JD Laub <[EMAIL PROTECTED]>
Jeff Bouis
@@ -347,6 +363,7 @@
Joe Buehler <[EMAIL PROTECTED]>
Joe McMahon <[EMAIL PROTECTED]>
Joe Orton <[EMAIL PROTECTED]>
+Joe Schaefer <[EMAIL PROTECTED]>
Joe Smith <[EMAIL PROTECTED]>
Joel Rosi-Schwartz <[EMAIL PROTECTED]>
Joerg Porath <[EMAIL PROTECTED]>
@@ -385,12 +402,16 @@
Jonathan I. Kamens <[EMAIL PROTECTED]>
Jonathan Roy <[EMAIL PROTECTED]>
Jonathan Stowe <[EMAIL PROTECTED]>
+Jos I. Boumans <[EMAIL PROTECTED]>
+Jose Auguste-Etienne <[EMAIL PROTECTED]>
Joseph N. Hall <[EMAIL PROTECTED]>
Joseph S. Myers <[EMAIL PROTECTED]>
Joshua E. Rodd <[EMAIL PROTECTED]>
Joshua Pritikin <[EMAIL PROTECTED]>
+Joost van Baal <[EMAIL PROTECTED]>
JT McDuffie <[EMAIL PROTECTED]>
Juan Gallego <[EMAIL PROTECTED]>
+Juerd <[EMAIL PROTECTED]>
Juha Laiho <[EMAIL PROTECTED]>
Julian Yip <[EMAIL PROTECTED]>
Jungshik Shin <[EMAIL PROTECTED]>
@@ -403,12 +424,14 @@
Karsten Sperling <[EMAIL PROTECTED]>
Kaveh Ghazi <[EMAIL PROTECTED]>
Kay Röpke <[EMAIL PROTECTED]>
+KAWAI Takanori <[EMAIL PROTECTED]>
Keith Neufeld <[EMAIL PROTECTED]>
Keith Thompson <[EMAIL PROTECTED]>
Keith Thompson <[EMAIL PROTECTED]>
Ken Estes <[EMAIL PROTECTED]>
Ken Fox <[EMAIL PROTECTED]>
Ken MacLeod <[EMAIL PROTECTED]>
+Ken Neighbors
Ken Shan <[EMAIL PROTECTED]>
Ken Williams <[EMAIL PROTECTED]>
Kenneth Albanowski <[EMAIL PROTECTED]>
@@ -441,6 +464,7 @@
Lionel Cons <[EMAIL PROTECTED]>
Luc St-Louis <[EMAIL PROTECTED]>
Luca Fini
+Lukas Mai
Lupe Christoph <[EMAIL PROTECTED]>
Luther Huffman <[EMAIL PROTECTED]>
M. J. T. Guy <[EMAIL PROTECTED]>
@@ -450,6 +474,7 @@
Marc Lehmann <[EMAIL PROTECTED]>
Marc Paquette <[EMAIL PROTECTED]>
Marcel Grunauer <[EMAIL PROTECTED]>
+Marek Rouchal <[EMAIL PROTECTED]>
Mark A Biggar <[EMAIL PROTECTED]>
Marcus Holland-Moritz <[EMAIL PROTECTED]>
Mark A. Hershberger <[EMAIL PROTECTED]>
@@ -478,7 +503,9 @@
Martin Jost <[EMAIL PROTECTED]>
Martin Lichtin <[EMAIL PROTECTED]>
Martin Plechsmid <[EMAIL PROTECTED]>
+Martti Rahkila <[EMAIL PROTECTED]>
Marty Lucich <[EMAIL PROTECTED]>
+Marty Pauley <[EMAIL PROTECTED]>
Martyn Pearce <[EMAIL PROTECTED]>
Masahiro KAJIURA <[EMAIL PROTECTED]>
Mathias Koerber <[EMAIL PROTECTED]>
@@ -524,6 +551,7 @@
Neale Ferguson <[EMAIL PROTECTED]>
Neil Bowers <[EMAIL PROTECTED]>
Nicholas Clark <[EMAIL PROTECTED]>
+Nicholas Oxhøj
Nick Duffek
Nick Gianniotis
Nick Ing-Simmons <[EMAIL PROTECTED]>
@@ -531,6 +559,7 @@
Nikola Knezevic <[EMAIL PROTECTED]>
Norbert Pueschel <[EMAIL PROTECTED]>
Norton T. Allen <[EMAIL PROTECTED]>
+OKAIE Yutaka
Olaf Flebbe <[EMAIL PROTECTED]>
Olaf Titz <[EMAIL PROTECTED]>
Ollivier Robert <[EMAIL PROTECTED]>
@@ -552,6 +581,7 @@
Paul Saab <[EMAIL PROTECTED]>
Paul Schinder <[EMAIL PROTECTED]>
Per Einar Ellefsen <[EMAIL PROTECTED]>
+Peter BARABAS
Pete Peterson <[EMAIL PROTECTED]>
Peter Chines <[EMAIL PROTECTED]>
Peter Gessner <[EMAIL PROTECTED]>
@@ -559,6 +589,7 @@
Peter Haworth <[EMAIL PROTECTED]>
Peter J. Farley III <[EMAIL PROTECTED]>
Peter Jaspers-Fayer
+Peter O'Gorman <[EMAIL PROTECTED]>
Peter Prymmer <[EMAIL PROTECTED]>
Peter Scott <[EMAIL PROTECTED]>
Peter van Heusden <[EMAIL PROTECTED]>
@@ -570,6 +601,7 @@
Piers Cawley <[EMAIL PROTECTED]>
Piotr Klaban <[EMAIL PROTECTED]>
Pixel <[EMAIL PROTECTED]>
+Pradeep Hodigere <[EMAIL PROTECTED]>
Prymmer/Kahn <[EMAIL PROTECTED]>
Quentin Fennessy <[EMAIL PROTECTED]>
Radu Greab <[EMAIL PROTECTED]>
@@ -582,6 +614,7 @@
Randall Gellens <[EMAIL PROTECTED]>
Randolf Werner <[EMAIL PROTECTED]>
Randy J. Ray <[EMAIL PROTECTED]>
+Randy W. Sims
Raphael Manfredi <[EMAIL PROTECTED]>
Raul Dias <[EMAIL PROTECTED]>
Raymund Will <[EMAIL PROTECTED]>
@@ -591,8 +624,10 @@
Rich Salz <[EMAIL PROTECTED]>
Richard A. Wells <[EMAIL PROTECTED]>
Richard Clamp <[EMAIL PROTECTED]>
-Richard Foley <[EMAIL PROTECTED]>
+Richard Foley <[EMAIL PROTECTED]>
Richard Hatch <[EMAIL PROTECTED]>
+Richard Hitt <[EMAIL PROTECTED]>
+Richard Kandarian <[EMAIL PROTECTED]>
Richard L. England <[EMAIL PROTECTED]>
Richard L. Maus, Jr. <[EMAIL PROTECTED]>
Richard Soderberg <[EMAIL PROTECTED]>
@@ -621,6 +656,7 @@
Ryan Herbert <[EMAIL PROTECTED]>
SADAHIRO Tomoyuki <[EMAIL PROTECTED]>
SAKAI Kiyotaka <[EMAIL PROTECTED]>
+Salvador Fandiño <[EMAIL PROTECTED]>
Sam Tregar <[EMAIL PROTECTED]>
Samuli Kärkkäinen <[EMAIL PROTECTED]>
Schuyler Erle <[EMAIL PROTECTED]>
@@ -638,6 +674,7 @@
Shigeya Suzuki <[EMAIL PROTECTED]>
Shimpei Yamashita <[EMAIL PROTECTED]>
Shishir Gundavaram <[EMAIL PROTECTED]>
+Shlomi Fish <[EMAIL PROTECTED]>
Simon Cozens <[EMAIL PROTECTED]>
Simon Glover <[EMAIL PROTECTED]>
Simon Leinen
@@ -671,6 +708,7 @@
SynaptiCAD, Inc. <[EMAIL PROTECTED]>
Takis Psarogiannakopoulos <[EMAIL PROTECTED]>
Taro KAWAGISHI
+Tassilo von Parseval <[EMAIL PROTECTED]>
Tatsuhiko Miyagawa <[EMAIL PROTECTED]>
Ted Ashton <[EMAIL PROTECTED]>
Ted Law <[EMAIL PROTECTED]>
==== //depot/maint-5.8/perl/configure.gnu#5 (xtext) ====
Index: perl/configure.gnu
--- perl/configure.gnu#4~20212~ Thu Jul 24 07:32:57 2003
+++ perl/configure.gnu Thu Sep 4 12:02:26 2003
@@ -71,12 +71,6 @@
opts="$opts $arg"
shift
;;
- --prefix)
- shift
- arg="-Dprefix=$1"
- opts="$opts $arg"
- shift
- ;;
--cache-file=*)
shift # Just ignore it.
;;
==== //depot/maint-5.8/perl/ext/B/B/C.pm#5 (text) ====
Index: perl/ext/B/B/C.pm
--- perl/ext/B/B/C.pm#4~20693~ Wed Aug 13 22:35:13 2003
+++ perl/ext/B/B/C.pm Thu Sep 4 12:02:26 2003
@@ -1863,10 +1863,10 @@
my $sym;
my $ref;
no strict 'vars';
- local(*glob);
$prefix = '' unless defined $prefix;
while (($sym, $ref) = each %$symref)
{
+ local(*glob);
*glob = $ref;
if ($sym =~ /::$/)
{
==== //depot/maint-5.8/perl/perl.h#52 (text) ====
Index: perl/perl.h
--- perl/perl.h#51~20918~ Wed Aug 27 06:15:45 2003
+++ perl/perl.h Thu Sep 4 12:02:26 2003
@@ -743,9 +743,14 @@
#endif
/* sockatmark() is so new (2001) that many places might have it hidden
- * behind some -D_BLAH_BLAH_SOURCE guard. */
+ * behind some -D_BLAH_BLAH_SOURCE guard. The __THROW magic is required
+ * e.g. in Gentoo, see http://bugs.gentoo.org/show_bug.cgi?id=12605 */
#if defined(HAS_SOCKATMARK) && !defined(HAS_SOCKATMARK_PROTO)
+# if defined(__THROW) && defined(__GLIBC__)
+int sockatmark(int) __THROW;
+# else
int sockatmark(int);
+# endif
#endif
#ifdef SETERRNO
==== //depot/maint-5.8/perl/pod/perlreftut.pod#4 (text) ====
Index: perl/pod/perlreftut.pod
--- perl/pod/perlreftut.pod#3~20460~ Sun Aug 3 12:09:33 2003
+++ perl/pod/perlreftut.pod Thu Sep 4 12:02:26 2003
@@ -512,12 +512,8 @@
Copyright 1998 The Perl Journal.
-When included as part of the Standard Version of Perl, or as part of
-its complete documentation whether printed or otherwise, this work may
-be distributed only under the terms of Perl's Artistic License. Any
-distribution of this file or derivatives thereof outside of that
-package require that special arrangements be made with copyright
-holder.
+This documentation is free; you can redistribute it and/or modify it
+under the same terms as Perl itself.
Irrespective of its distribution, all code examples in these files are
hereby placed into the public domain. You are permitted and
==== //depot/maint-5.8/perl/utils/perlcc.PL#4 (text) ====
Index: perl/utils/perlcc.PL
--- perl/utils/perlcc.PL#3~20682~ Wed Aug 13 10:19:03 2003
+++ perl/utils/perlcc.PL Thu Sep 4 12:02:26 2003
@@ -328,7 +328,7 @@
$link .= " -libpath:".$_ for split /\s+/, opt(L);
my @mods = split /-?u /, $stash;
$link .= " ".ExtUtils::Embed::ldopts("-std", [EMAIL PROTECTED]);
- $link .= " perl57.lib kernel32.lib msvcrt.lib";
+ $link .= " perl5$Config{PERL_VERSION}.lib kernel32.lib msvcrt.lib";
vprint 3, "running $Config{cc} $compile";
system("$Config{cc} $compile");
vprint 3, "running $Config{ld} $link";
@@ -529,7 +529,7 @@
sub _usage_and_die {
_die(<<EOU);
$0: Usage:
-$0 [-o executable] [-r] [-O|-B|-c|-S] [-log log] [source[.pl] | -e oneliner]
+$0 [-o executable] [-r] [-O|-B|-c|-S] [-I /foo] [-L /foo] [-log log] [source[.pl] |
-e oneliner]
EOU
}
End of Patch.
