Index: Configure =================================================================== --- Configure.orig +++ Configure @@ -117,7 +117,7 @@ paths="$paths /usr/5bin /etc /usr/gnu/bi paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" -paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" +paths="$paths /etc /usr/lib /usr/lib64 /usr/ucblib /lib /usr/ccs/lib" paths="$paths /sbin /usr/sbin /usr/libexec" paths="$paths /system/gnu_library/bin" @@ -1446,7 +1446,7 @@ loclibpth="/usr/local/lib /opt/local/lib loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" : general looking path for locating libraries -glibpth="/lib /usr/lib $xlibpth" +glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth" glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" test -f /shlib/libc.so && glibpth="/shlib $glibpth" @@ -2541,7 +2541,7 @@ uname zip " pth=`echo $PATH | sed -e "s/$p_/ /g"` -pth="$pth $sysroot/lib $sysroot/usr/lib" +pth="$pth $sysroot/lib $sysroot/usr/lib $sysroot/lib64 $sysroot/usr/lib64" for file in $loclist; do eval xxx=\$$file case "$xxx" in @@ -11838,7 +11838,7 @@ void xxx(int n, ...) va_start(args, n); exit((unsigned long)vsprintf(buf,"%s",args) > 10L); } -int main() { xxx(1, "foo"); } +int main() { xxx(1, "foo"); return 0; } #else /* I_VARARGS */ @@ -11850,7 +11850,7 @@ va_dcl va_start(args); exit((unsigned long)vsprintf(buf,"%s",args) > 10L); } -int main() { xxx("foo"); } +int main() { xxx("foo"); return 0; } #endif @@ -20354,14 +20354,20 @@ int main(int argc, char *argv[]) } EOCP set try + # this is really stupid, but we have to link in the -ldb to have + # the above program succeed + _old_libs="$libs" + libs="$libs -ldb" if eval $compile_ok && $run ./try; then echo 'Looks OK.' >&4 + libs="$_old_libs" set `$run ./try 1` db_version_major=$1 db_version_minor=$2 db_version_patch=$3 else echo "I can't use Berkeley DB with your . I'll disable Berkeley DB." >&4 + libs="$_old_libs" i_db=$undef case " $libs " in *"-ldb "*) @@ -20402,7 +20408,7 @@ int main() } #endif EOCP - if $cc $ccflags -c try.c >try.out 2>&1 ; then + if $cc $ccflags -c try.c -ldb >try.out 2>&1 ; then if $contains warning try.out >>/dev/null 2>&1 ; then db_hashtype='int' else @@ -20445,7 +20451,7 @@ int main() } #endif EOCP - if $cc $ccflags -c try.c >try.out 2>&1 ; then + if $cc $ccflags -c try.c -ldb >try.out 2>&1 ; then if $contains warning try.out >>/dev/null 2>&1 ; then db_prefixtype='int' else @@ -25039,7 +25045,7 @@ passcat='$passcat' patchlevel='$patchlevel' path_sep='$path_sep' perl5='$perl5' -perl='$perl' +perl='perl' perl_patchlevel='$perl_patchlevel' perl_static_inline='$perl_static_inline' perladmin='$perladmin' Index: cpan/Compress-Raw-Zlib/config.in =================================================================== --- cpan/Compress-Raw-Zlib/config.in.orig +++ cpan/Compress-Raw-Zlib/config.in @@ -16,9 +16,9 @@ # Setting the Gzip OS Code # -BUILD_ZLIB = True -INCLUDE = ./zlib-src -LIB = ./zlib-src +BUILD_ZLIB = False +INCLUDE = /usr/include +LIB = /usr/lib OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT Index: cpan/Encode/bin/enc2xs =================================================================== --- cpan/Encode/bin/enc2xs.orig +++ cpan/Encode/bin/enc2xs @@ -1066,7 +1066,7 @@ sub make_configlocal_pm { $LocalMod{$enc} ||= $mod; } }; - File::Find::find({wanted => $wanted}, @INC); + File::Find::find({wanted => $wanted}, grep {$_ ne '.'} @INC); $_ModLines = ""; for my $enc ( sort keys %LocalMod ) { $_ModLines .= Index: cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm =================================================================== --- cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm.orig +++ cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm @@ -207,8 +207,11 @@ foreach my $key (sort(keys(%{$self->{dat { if (! -e $key) { - push(@missing, $key); - delete($self->{data}{$key}) if ($remove); + if (($key !~ m!/man/!) || ! -e "$key.gz") + { + push(@missing, $key); + delete($self->{data}{$key}) if ($remove); + } } } return(@missing); Index: cpan/File-Temp/lib/File/Temp.pm =================================================================== --- cpan/File-Temp/lib/File/Temp.pm.orig +++ cpan/File-Temp/lib/File/Temp.pm @@ -16,7 +16,7 @@ use Fcntl 1.03; use IO::Seekable; # For SEEK_* use Errno; use Scalar::Util 'refaddr'; -require VMS::Stdio if $^O eq 'VMS'; +#require VMS::Stdio if $^O eq 'VMS'; # pre-emptively load Carp::Heavy. If we don't when we run out of file # handles and attempt to call croak() we get an error message telling Index: cpan/libnet/lib/Net/Config.pm =================================================================== --- cpan/libnet/lib/Net/Config.pm.orig +++ cpan/libnet/lib/Net/Config.pm @@ -53,7 +53,7 @@ our %NetConfig = ( { ## no critic (BuiltinFunctions::ProhibitStringyEval) $^O eq 'MacOS' and eval < $self->{CCFLAGS} = $Config{ccflags} . ' -I/usr/include/libelf' if -f "/usr/include/libelf/nlist.h"; +# Some silly modules like mod_perl use DynaLoader.a in a shared +# module, so add cccdlflags if we're going for a shared libperl +$self->{CCFLAGS} = ($self->{CCFLAGS} || $Config{ccflags}) . " $Config{cccdlflags}" if $Config{'useshrplib'} eq 'true'; 1; Index: ext/ODBM_File/hints/linux.pl =================================================================== --- ext/ODBM_File/hints/linux.pl.orig +++ ext/ODBM_File/hints/linux.pl @@ -1,5 +1,5 @@ # uses GDBM dbm compatibility feature - at least on SuSE 8.0 -$self->{LIBS} = ['-lgdbm']; +$self->{LIBS} = ['-lgdbm -lgdbm_compat']; # Debian/Ubuntu have libgdbm_compat.so but not this file, # so linking may fail Index: ext/ODBM_File/Makefile.PL =================================================================== --- ext/ODBM_File/Makefile.PL.orig +++ ext/ODBM_File/Makefile.PL @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; WriteMakefile( NAME => 'ODBM_File', - LIBS => ["-ldbm -lucb"], + LIBS => ["-lgdbm -lucb"], XSPROTOARG => '-noprototypes', # XXX remove later? VERSION_FROM => 'ODBM_File.pm', ); Index: hints/linux.sh =================================================================== --- hints/linux.sh.orig +++ hints/linux.sh @@ -53,7 +53,7 @@ ignore_versioned_solibs='y' # BSD compatibility library no longer needed # 'kaffe' has a /usr/lib/libnet.so which is not at all relevant for perl. # bind causes issues with several reentrant functions -set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /' -e 's/ bind / /'` +set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /' -e 's/ bind / /' -e 's/ db / /' -e 's/ gdbm / /' -e 's/ ndbm / /'` shift libswanted="$*" @@ -64,6 +64,20 @@ if echo " $libswanted " | grep -q ' gdbm libswanted="$libswanted gdbm_compat" fi +if test -e /lib64/libc.so.6 ; then + libc=`ls -l /lib64/libc.so.6 | awk '{print $NF}'` + libc=/lib64/$libc + glibpth='/lib64 /usr/lib64 /usr/local/lib64' + libspath='/usr/local/lib64 /lib64 /usr/lib64' + loclibpth='/usr/local/lib64' + lddlflags='-shared -L/usr/local/lib64' + ldflags=' -L/usr/local/lib64' + libs='-lm -ldl -lcrypt' +elif test -L /lib/libc.so.6; then + libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'` + libc=/lib/$libc +fi + # Configure may fail to find lstat() since it's a static/inline # function in . d_lstat=define @@ -147,6 +161,7 @@ case "$optimize" in esac ;; esac + optimize="$optimize --pipe" ;; esac @@ -221,6 +236,10 @@ case "$libc" in ;; esac +man1dir=/usr/share/man/man1 +man3dir=/usr/share/man/man3 +man3ext=3pm + # Are we using ELF? Thanks to Kenneth Albanowski # for this test. cat >try.c <<'EOM' @@ -305,6 +324,29 @@ EOM esac fi +case `uname -m` in +i?86) archname='i586-linux';; +*) archname=`uname -m`-linux;; +esac + +case $archname in +sparc64-linux) glibpth="/lib64 /usr/lib64";; +esac + +cf_email='none' +#libs='-lgdbm -ldb -ldl -lm -lc' +#libs='-ldl -lm -lc' + +usedl='true' +dlsrc='dl_dlopen.xs' +d_dosuid='undef' +d_bincompat3='y' + +# We don't want to add /usr/local/include and /usr/local/lib to the search +# paths, they are already searched by default. +locincpth= +loclibpth= + rm -f try.c a.out if ${sh:-/bin/sh} -c exit; then @@ -354,6 +396,9 @@ else echo "Couldn't find tcsh. Csh-based globbing might be broken." fi fi +csh='' +d_csh='undef' +full_csh='' # Shimpei Yamashita # Message-Id: <33EF1634.B36B6500@pobox.com> @@ -464,6 +509,8 @@ $define|true|[yY]*) d_localtime_r_proto="$define" d_random_r_proto="$define" + test -e /lib64/libc.so.6 && libs='-lm -ldl -lcrypt -lpthread' + ;; esac EOCBU Index: installperl =================================================================== --- installperl.orig +++ installperl @@ -728,7 +728,7 @@ sub installlib { return if $name eq 'ExtUtils/MakeMaker/version/regex.pm'; my $installlib = $installprivlib; - if ($dir =~ /^auto\// || + if (($dir =~ /^auto\// && $dir ne 'auto/Compress/Zlib') || ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) || ($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare)) || $name=~/^Config_(heavy|git)\.pl\z/ Index: lib/perl5db.pl =================================================================== --- lib/perl5db.pl.orig +++ lib/perl5db.pl @@ -2359,6 +2359,8 @@ sub _DB__handle_run_command_in_pager_com open( OUT, ">&STDOUT" ) # XXX: lost message || _db_warn("Can't restore DB::OUT"); } + # tell readline the new OUT handle + $term->Attribs()->{outstream} = *OUT if defined &Term::ReadLine::Gnu::readline; next CMD; } ## end unless ($piped = open(OUT,... @@ -2463,6 +2465,9 @@ sub _DB__at_end_of_every_command { $obj->selected(""); } + # tell readline the new OUT handle + $term->Attribs()->{outstream} = *OUT if defined &Term::ReadLine::Gnu::readline; + # No pipes now. $obj->piped(""); } ## end if ($piped) Index: SuSE/perllocal.SuSE =================================================================== --- /dev/null +++ SuSE/perllocal.SuSE @@ -0,0 +1,84 @@ +#!/usr/bin/perl +# Copyright (c) 1998 S.u.S.E. Gmbh Fuerth, Germany. All rights reserved. +# +# Author: Ruediger Oertel , 1998 +# + +use Config; + +sub ReadFile { + local (*IF,*modules) = @_; + + while() { + chomp ($_); + next if (/^$/); + if (/^=head2.*$/) { + ($front,$rear) = split (': ',$_); + $front =~ s/^=head2\s*//; + $modules{$rear} = "$front"; + } elsif (/^=over [0-9]*$/) { + ($dummy,$num) = split ('\s',$_); + $curnum = 0; + } elsif (/^C<.*:.*>$/) { + $entry = $_; + $curnum++; + $modules{$rear} .= "\0$entry"; + } elsif (/^=back$/) { + ; + } elsif (/^=item \*$/) { + ; + } else { + print "SuSEconfig.perl: parsing perllocal:\n"; + print "ignoring line: $_\n"; + } + } + return %modules; +} + +local (%allmodules); + +if (open (IF, "<$Config{'installarchlib'}/perllocal.pod")) { + %allmodules = ReadFile(*IF,*allmodules); +} +close (IF); + +opendir (DIR, "/var/adm/perl-modules"); +while ($dirent = readdir(DIR)) { + next if ($dirent =~ /^\./); + open (IF , "/var/adm/perl-modules/$dirent"); + %allmodules = ReadFile(*IF,*allmodules); + close (IF); +} +closedir (DIR); + + +if (open (OF, ">$Config{'installarchlib'}/perllocal.pod")) { + foreach $key (keys(%allmodules)) { + $name = $key; + $name =~ s/^.*L\$//; + $name =~ s/::/\//; + @entries = split ('\0',$allmodules{$key}); + $ipath = $entries[1]; + $ipath =~ s/^.*\:\s//; + $ipath =~ s/>$//; + + # test if the module is really there, else skip + if ( -d "$ipath/$Config{'archname'}/auto/$name" || + -d "$Config{'installarchlib'}/auto/$name" ) { + $num = $#entries; + print OF "=head2 ",shift(@entries),": $key\n\n"; + print OF "=over $num\n\n"; + while ($_ = shift(@entries)) { + print OF "=item *\n\n"; + print OF "$_\n\n"; + } + print OF "=back\n\n"; + } + } + close (OF); +} else { + print "SuSEconfig.perl: Can't write to file $Config{'installarchlib'}/perllocal.pod !\n\n"; +} + Index: SuSE/SuSEconfig.perl =================================================================== --- /dev/null +++ SuSE/SuSEconfig.perl @@ -0,0 +1,76 @@ +#! /bin/bash +# +# Copyright (c) 1996 S.u.S.E. Gmbh Fuerth, Germany. All rights reserved. +# +# Author: Burchard Steinbild , 1996 +# Martin Scherbaum , 5/1997 +# Ruediger Oertel , 7/1998 + +# +# Variables in /etc/sysconfig/suseconfig used by this script are: +# CREATE_PERLLOCAL_POD +# +# This script calls the scripts: +# /usr/sbin/perllocal.suse which comes from the package perl +# + +# +# check if we are started as root +# only one of UID and USER must be set correctly +# +if test "$UID" != 0 -a "$USER" != root; then + echo "You must be root to start $0." + exit 1 +fi + +# +# SuSEconfig sometimes sets the variable CHECK_NEWPACKAGE. If it is set +# to false, we don't have to do anything. +# +test "$CHECK_NEWPACKAGE" = false && exit 0 + +test -f /etc/sysconfig/suseconfig || { echo "No /etc/sysconfig/suseconfig found." && exit 1 ; } +. /etc/sysconfig/suseconfig + +# this skript only works in a running system. + +test -n "$ROOT" && exit 0 + +perl -e 'exit 0' 2>/dev/null || { echo "Perl not found." && exit 0 ; } + +# +# see if we may do any work +# +test -n "$CREATE_PERLLOCAL_POD" -a "$CREATE_PERLLOCAL_POD" = "yes" \ + || { echo "disabled in sysconfig/suseconfig" && exit 1 ; } + +# +# check if anything to add +# +PERLLOCAL_PATH=`perl -V:installarchlib | sed -e "s/.*='\(.*\)'.*/\1/"` + +NEEDED="false" + +if test -d /var/adm/perl-modules ; then + if test /var/adm/perl-modules -nt $PERLLOCAL_PATH/perllocal.pod ; then + NEEDED="true" + elif test ! -f $PERLLOCAL_PATH/perllocal.pod ; then + NEEDED="true" + fi +fi + +# +# now call the working script +# +if "$NEEDED" = "true" ; then + if test -x /usr/lib/perl5/perllocal.SuSE ; then + /usr/lib/perl5/perllocal.SuSE + pod2man $PERLLOCAL_PATH/perllocal.pod | gzip > /usr/share/man/man3/perllocal.3pm.gz + else + echo "SuSEconfig.perl: /usr/lib/perl5/perllocal.SuSE not found!" + fi +fi + +# +# end of file SuSEconfig.perl +# Index: SuSE/sysconfig.suseconfig-perl =================================================================== --- /dev/null +++ SuSE/sysconfig.suseconfig-perl @@ -0,0 +1,8 @@ +## Path: System/SuSEconfig +## Type: yesno +## Default: yes +## Config: perl +# +# May SuSEconfig modify your perllocal.pod? (yes/no) +# +CREATE_PERLLOCAL_POD="yes" Index: utils/perlbug.PL =================================================================== --- utils/perlbug.PL.orig +++ utils/perlbug.PL @@ -1039,6 +1039,7 @@ sub _message_headers { $headers{'Cc'} = $cc if ($cc); $headers{'Message-Id'} = $messageid if ($messageid); $headers{'Reply-To'} = $from if ($from); + $headers{'X-Webfrontend'} = 'perlbug'; $headers{'From'} = $from if ($from); if ($have_attachment) { $headers{'MIME-Version'} = '1.0'; Index: t/porting/customized.dat =================================================================== --- t/porting/customized.dat.orig +++ t/porting/customized.dat @@ -10,7 +10,7 @@ CPAN cpan/CPAN/scripts/cpan c43050c8c631 Digest cpan/Digest/Digest.pm 43f7f544cb11842b2f55c73e28930da50774e081 Digest::SHA cpan/Digest-SHA/lib/Digest/SHA.pm 5841fcf70f7290e07befdd16f05093664c618a96 Digest::SHA cpan/Digest-SHA/shasum f92faa37afc098e2a825e4ecda1097890492d957 -Encode cpan/Encode/bin/enc2xs 7bbd4ca8d81e0189b87d703aa058b95a837b97d3 +Encode cpan/Encode/bin/enc2xs 91d5d4a16b97452ba23c1ba845572aada4ca0aa2 Encode cpan/Encode/bin/encguess f1e7a130995c4bad53bb6d3034dae625cfe61e32 Encode cpan/Encode/bin/piconv 80ea7f9afff580e41c4b29f5ab214ed378274b49 Encode cpan/Encode/bin/ucmlint 495862125269a60536b78fd0a7910d024c4d21fe @@ -165,7 +165,7 @@ bignum cpan/bignum/lib/bigrat.pm 7fccc9d bignum cpan/bignum/lib/Math/BigFloat/Trace.pm a6b4b995e18f4083252e6dc72e9bef69671893dd bignum cpan/bignum/lib/Math/BigInt/Trace.pm d9596963673760cae3eeeb752c1eeeec50bb2290 libnet cpan/libnet/lib/Net/Cmd.pm a44a10c939a4c35f923c4638054178c32f1d283a -libnet cpan/libnet/lib/Net/Config.pm 9bd49bf4de0dc438bceee0ef4baf8ba7a6633327 +libnet cpan/libnet/lib/Net/Config.pm 2167a2653b40c9f94e6d52574829532e62394a17 libnet cpan/libnet/lib/Net/Domain.pm 1bbed50f70fd1ff3e1cdf087b19a9349cddfaced libnet cpan/libnet/lib/Net/FTP.pm 40dba553c8d44e1530daec2d07a6e50910401f2e libnet cpan/libnet/lib/Net/FTP/A.pm c570b10730b168990034dcf9cb00e305a100f336