Change 13120 by pudge@pudge-mobile on 2001/11/20 03:09:21
Various bundled module fixes.
Affected files ...
.... //depot/maint-5.6/macperl/macos/bundled_ext/Compress/Zlib/Makefile.mk#2 edit
.... //depot/maint-5.6/macperl/macos/bundled_ext/Digest/MD5/t/files.t#3 edit
.... //depot/maint-5.6/macperl/macos/bundled_ext/Filter/t/filter-util.pl#2 edit
.... //depot/maint-5.6/macperl/macos/bundled_lib/blib/lib/Net/Config.pm#3 edit
.... //depot/maint-5.6/macperl/macos/bundled_lib/t/libwww-perl/live/jigsaw-chunk.t#2
edit
Differences ...
==== //depot/maint-5.6/macperl/macos/bundled_ext/Compress/Zlib/Makefile.mk#2 (text)
====
Index: perl/macos/bundled_ext/Compress/Zlib/Makefile.mk
--- perl/macos/bundled_ext/Compress/Zlib/Makefile.mk.~1~ Mon Nov 19 20:15:05
2001
+++ perl/macos/bundled_ext/Compress/Zlib/Makefile.mk Mon Nov 19 20:15:05 2001
@@ -21,9 +21,9 @@
NAME = Compress::Zlib
DISTNAME = Compress-Zlib
NAME_SYM = Compress_Zlib
-VERSION = 1.13
-VERSION_SYM = 1_13
-XS_VERSION = 1.13
+VERSION = 1.14
+VERSION_SYM = 1_14
+XS_VERSION = 1.14
INST_LIB = :::::lib
INST_ARCHLIB = :::::lib
PERL_LIB = :::::lib
==== //depot/maint-5.6/macperl/macos/bundled_ext/Digest/MD5/t/files.t#3 (text) ====
Index: perl/macos/bundled_ext/Digest/MD5/t/files.t
--- perl/macos/bundled_ext/Digest/MD5/t/files.t.~1~ Mon Nov 19 20:15:05 2001
+++ perl/macos/bundled_ext/Digest/MD5/t/files.t Mon Nov 19 20:15:05 2001
@@ -14,10 +14,10 @@
abcee0576dd82eca765f54bace61c434 MD5.xs
754b9db19f79dbc4992f7166eb0f37ce rfc1321.txt
EOT1
-3f33c2d0e531cc5902ae9832014a11e3 Changes
+30795c7a0bd3698557ffb44016d83ab8 Changes
5b79ce6f90834381208fb7d67c4a262e README
-b69835aa8b73fc5ed8055f23462aaa47 MD5.pm
-81fbd61766e2c876349c358cced6052f MD5.xs
+cb8513dc7d672530e4c04bb60a641361 MD5.pm
+8f02d1e857549402680d26f2cd826314 MD5.xs
f9a35714ee1d1d0c5a3a80f4dbea956a rfc1321.txt
EOT2
==== //depot/maint-5.6/macperl/macos/bundled_ext/Filter/t/filter-util.pl#2 (text) ====
Index: perl/macos/bundled_ext/Filter/t/filter-util.pl
--- perl/macos/bundled_ext/Filter/t/filter-util.pl.~1~ Mon Nov 19 20:15:05 2001
+++ perl/macos/bundled_ext/Filter/t/filter-util.pl Mon Nov 19 20:15:05 2001
@@ -49,6 +49,7 @@
$Perl = '' ;
$Perl = ($ENV{'FULLPERL'} or $^X or 'perl') ;
+$Perl = "$Perl -MMac::err=unix" if $^O eq 'MacOS';
$Perl = "$Perl -w" ;
1;
==== //depot/maint-5.6/macperl/macos/bundled_lib/blib/lib/Net/Config.pm#3 (text) ====
Index: perl/macos/bundled_lib/blib/lib/Net/Config.pm
--- perl/macos/bundled_lib/blib/lib/Net/Config.pm.~1~ Mon Nov 19 20:15:05 2001
+++ perl/macos/bundled_lib/blib/lib/Net/Config.pm Mon Nov 19 20:15:05 2001
@@ -33,6 +33,30 @@
test_exist => 1,
);
+#
+# Try to get as much configuration info as possible from InternetConfig
+#
+1 && eval <<'TRY_INTERNET_CONFIG';
+use Mac::InternetConfig;
+
+{
+my %nc = (
+ nntp_hosts => [ $InternetConfig{ kICNNTPHost()} ],
+ pop3_hosts => [ $InternetConfig{ kICMailAccount()} =~ /@(.*)/ ],
+ smtp_hosts => [ $InternetConfig{ kICSMTPHost()} ],
+ ftp_testhost => [ $InternetConfig{ kICFTPHost()} ],
+ ph_hosts => [ $InternetConfig{ kICPhHost()} ],
+ ftp_ext_passive => $InternetConfig{"646F676F€UsePassiveMode"} || 0,
+ ftp_int_passive => $InternetConfig{"646F676F€UsePassiveMode"} || 0,
+ socks_hosts =>
+ $InternetConfig{kICUseSocks()} ? [ $InternetConfig{kICSocksHost()} ] :
+[],
+ ftp_firewall =>
+ $InternetConfig{kICUseFTPProxy()} ? [ $InternetConfig{kICFTPProxyHost()} ] :
+[],
+);
+@NetConfig{keys %nc} = values %nc;
+}
+TRY_INTERNET_CONFIG
+
my $file = __FILE__;
my $ref;
$file =~ s/Config.pm/libnet.cfg/;
==== //depot/maint-5.6/macperl/macos/bundled_lib/t/libwww-perl/live/jigsaw-chunk.t#2
(text) ====
Index: perl/macos/bundled_lib/t/libwww-perl/live/jigsaw-chunk.t
--- perl/macos/bundled_lib/t/libwww-perl/live/jigsaw-chunk.t.~1~ Mon Nov 19
20:15:05 2001
+++ perl/macos/bundled_lib/t/libwww-perl/live/jigsaw-chunk.t Mon Nov 19 20:15:05
+2001
@@ -15,6 +15,7 @@
print "ok 2\n";
for (${$res->content_ref}) {
+ s/\015?\012/\n/g;
/Below this line, is 1000 repeated lines of 0-9/ || die;
s/^.*?-----+\n//s;
End of Patch.
