packages: perl/perl-modules, perl/perl-t-syslog.patch, perl/perl-test-nopro...
radek
radek at pld-linux.org
Tue Apr 13 22:09:18 CEST 2010
Author: radek Date: Tue Apr 13 20:09:18 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- version 5.12.0
- release 0.1: not much testing, Provides likely incomplete
---- Files affected:
packages/perl:
perl-modules (1.10 -> 1.11) , perl-t-syslog.patch (1.4 -> 1.5) , perl-test-noproc.patch (1.2 -> 1.3) , perl-timer-test.patch (1.5 -> 1.6) , perl-write-permissions.patch (1.5 -> 1.6) , perl.spec (1.423 -> 1.424) , perl_581-INC.patch (1.5 -> 1.6) , perl_585-microperl_uconfig.patch (1.8 -> 1.9) , perl_581-noroot_install.patch (1.4 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/perl/perl-modules
diff -u packages/perl/perl-modules:1.10 packages/perl/perl-modules:1.11
--- packages/perl/perl-modules:1.10 Sat Sep 12 12:07:22 2009
+++ packages/perl/perl-modules Tue Apr 13 22:09:10 2010
@@ -1,55 +1,55 @@
-# Module versions from Perl 5.10.1 distribution.
-Attribute::Handlers = 0.85
-CGI = 3.43
-CPAN = 1.9402
-Class::ISA = 0.33
+# Module versions from Perl 5.12.0 distribution.
+Attribute::Handlers = 0.87
+CGI = 3.48
+CPAN = 1.9456
+Class::ISA = 0.36
Devel::DProf = 20080331.00
Devel::PPPort = 3.19
Devel::Peek = 1.04
Digest = 1.16
Digest::MD5 = 2.39
-Encode = 2.35
+Encode = 2.39
ExtUtils::Embed = 1.28
-ExtUtils::MakeMaker = 6.55_02
+ExtUtils::MakeMaker = 6.56
File::Compare = 1.1006
-File::Spec = 3.3
+File::Spec = 3.31
File::Temp = 0.22
Filter::Simple = 0.84
FindBin = 1.50
-GDBM_File = 1.09
+GDBM_File = 1.10
Hash::Util = 0.07
I18N::LangTags = 0.35
-IO = 1.25
+IO = 1.25_02
IPC::SysV = 2.01
-Locale::Maketext = 1.13
+Locale::Maketext = 1.14
MIME::Base64 = 3.08
-Math::BigInt = 1.89
-Math::BigRat = 0.22
+Math::BigInt = 1.89_01
+Math::BigRat = 0.24
Math::Trig = 1.2
Memoize = 1.01_03
-Module::Build = 0.340201
+Module::Build = 0.3603
NEXT = 0.64
-Parse::CPAN::Meta = 1.39
+Parse::CPAN::Meta = 1.40
PerlIO::via::QuotedPrint = 0.06
Pod::LaTeX = 0.58
Pod::Parser = 1.37
-Safe = 2.18
-Socket = 1.82
-Storable = 2.20
-Term::ANSIColor = 2.00
+Safe = 2.25
+Socket = 1.87
+Storable = 2.22
+Term::ANSIColor = 2.02
Term::Cap = 1.12
Test = 1.25_02
Test::Harness = 3.17
-Test::Simple = 0.92
-Text::Balanced = 2.0.0
+Test::Simple = 0.94
+Text::Balanced = 2.02
Text::ParseWords = 3.27
-Text::Soundex = 3.03
+Text::Soundex = 3.03_01
Text::Tabs = 2009.0305
Tie::File = 0.97_02
Time::HiRes = 1.9719
-UNIVERSAL = 1.05
-Unicode::Collate = 0.52
+UNIVERSAL = 1.06
+Unicode::Collate = 0.52_01
Unicode::Normalize = 1.03
autodie = 2.06_01
libnet = 1.22
-version = 0.77
+version = 0.82
================================================================
Index: packages/perl/perl-t-syslog.patch
diff -u packages/perl/perl-t-syslog.patch:1.4 packages/perl/perl-t-syslog.patch:1.5
--- packages/perl/perl-t-syslog.patch:1.4 Sat Sep 12 12:07:23 2009
+++ packages/perl/perl-t-syslog.patch Tue Apr 13 22:09:10 2010
@@ -1,5 +1,5 @@
---- perl-5.10.0/ext/Sys-Syslog/t/syslog.t~ 2008-02-26 07:24:29.000000000 +0000
-+++ perl-5.10.0/ext/Sys-Syslog/t/syslog.t 2008-02-26 07:24:34.000000000 +0000
+--- perl-5.12.0/cpan/Sys-Syslog/t/syslog.t~ 2008-02-26 07:24:29.000000000 +0000
++++ perl-5.12.0/cpan/Sys-Syslog/t/syslog.t 2008-02-26 07:24:34.000000000 +0000
@@ -201,7 +201,11 @@
}
}
================================================================
Index: packages/perl/perl-test-noproc.patch
diff -u packages/perl/perl-test-noproc.patch:1.2 packages/perl/perl-test-noproc.patch:1.3
--- packages/perl/perl-test-noproc.patch:1.2 Wed Jan 9 14:28:11 2008
+++ packages/perl/perl-test-noproc.patch Tue Apr 13 22:09:10 2010
@@ -1,5 +1,5 @@
---- perl-5.8.2/ext/threads/t/join.t.orig Tue Sep 30 19:10:32 2003
-+++ perl-5.8.2/ext/threads/t/join.t Mon Dec 8 14:49:12 2003
+--- perl-5.12.0/dist/threads/t/join.t.orig Tue Sep 30 19:10:32 2003
++++ perl-5.12.0/dist/threads/t/join.t Mon Dec 8 14:49:12 2003
@@ -118,6 +118,10 @@
# We parse ps output so this is OS-dependent.
================================================================
Index: packages/perl/perl-timer-test.patch
diff -u packages/perl/perl-timer-test.patch:1.5 packages/perl/perl-timer-test.patch:1.6
--- packages/perl/perl-timer-test.patch:1.5 Sat Sep 12 12:07:23 2009
+++ packages/perl/perl-timer-test.patch Tue Apr 13 22:09:10 2010
@@ -1,5 +1,5 @@
---- perl-5.8.8/ext/Time-HiRes/t/HiRes.t~ 2005-12-17 20:20:26.000000000 +0100
-+++ perl-5.8.8/ext/Time-HiRes/t/HiRes.t 2007-02-11 00:06:42.000000000 +0100
+--- perl-5.12.0/cpan/Time-HiRes/t/HiRes.t~ 2005-12-17 20:20:26.000000000 +0100
++++ perl-5.12.0/cpan/Time-HiRes/t/HiRes.t 2007-02-11 00:06:42.000000000 +0100
@@ -113,7 +113,7 @@
# completes fine with (say) 30% slosh, and fail otherwise. If you do that,
# consider changing over to test.pl at the same time.
================================================================
Index: packages/perl/perl-write-permissions.patch
diff -u packages/perl/perl-write-permissions.patch:1.5 packages/perl/perl-write-permissions.patch:1.6
--- packages/perl/perl-write-permissions.patch:1.5 Sat Sep 12 12:07:23 2009
+++ packages/perl/perl-write-permissions.patch Tue Apr 13 22:09:10 2010
@@ -1,5 +1,5 @@
---- perl-5.10.1/lib/ExtUtils/Install.pm.orig 2009-08-03 21:36:03.000000000 +0200
-+++ perl-5.10.1/lib/ExtUtils/Install.pm 2009-09-12 10:07:06.181527344 +0200
+--- perl-5.12.0/dist/ExtUtils-Install/lib/ExtUtils/Install.pm.orig 2009-08-03 21:36:03.000000000 +0200
++++ perl-5.12.0/dist/ExtUtils-Install/lib/ExtUtils/Install.pm 2009-09-12 10:07:06.181527344 +0200
@@ -813,7 +813,7 @@
utime($atime,$mtime + $Is_VMS,$targetfile) unless $dry_run>1;
================================================================
Index: packages/perl/perl.spec
diff -u packages/perl/perl.spec:1.423 packages/perl/perl.spec:1.424
--- packages/perl/perl.spec:1.423 Fri Jan 1 23:54:15 2010
+++ packages/perl/perl.spec Tue Apr 13 22:09:10 2010
@@ -7,7 +7,7 @@
%bcond_without tests # do not perform "make test"
%bcond_without threads # build without support for threads
%bcond_without gdbm # build without the GDBM_File module
-%bcond_without microperl # build microperl (needs fixing)
+%bcond_with microperl # build microperl (needs fixing)
#
# TODO:
# - fix "FIXME"s, review "XXX"s
@@ -29,7 +29,7 @@
# NOTE
# - modules in 5.10.0: http://search.cpan.org/~rgarcia/perl-5.10.0/
-%define abi 5.10.0
+%define abi 5.12.0
%define perlthread %{?with_threads:-thread-multi}
%define perl_privlib %{_datadir}/perl5/%{ver}
@@ -43,8 +43,8 @@
%define perl_modver() %([ -f %{SOURCE3} ] && awk -vp=%1 '$1 == p{print $3}' %{SOURCE3} || echo ERROR)
%define perl_modversion() %([ -f %{SOURCE3} ] && awk -vp=%1 '$1 == p{m=$1; gsub(/::/, "-", m); printf("perl-%s = %s\\n", m, $3)}END{if (!m) printf("# Error looking up [%s]\\n", p)}' %{SOURCE3} || echo ERROR)
-%define ver 5.10.1
-%define rel 2
+%define ver 5.12.0
+%define rel 0.1
Summary: Practical Extraction and Report Language (Perl)
Summary(cs.UTF-8): Programovací jazyk Perl
Summary(da.UTF-8): Programmeringssproget Perl
@@ -72,14 +72,12 @@
Epoch: 1
License: GPL v1+ or Artistic
Group: Development/Languages/Perl
-Source0: http://www.cpan.org/src/%{name}-%{ver}.tar.gz
-# Source0-md5: b9b2fdb957f50ada62d73f43ee75d044
+Source0: http://www.cpan.org/modules/by-authors/id/J/JE/JESSE/%{name}-%{ver}.tar.bz2
+# Source0-md5: 3e15696f4160775a90f6b2fb3ccc98c2
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: de47d7893f49ad7f41ba69c78511c0db
Source2: %{name}.prov
Source3: %{name}-modules
-Patch0: %{name}_581-noroot_install.patch
-Patch1: %{name}_581-INC.patch
Patch2: %{name}_580-errno_h-parsing.patch
Patch3: %{name}_581-soname.patch
Patch4: %{name}-test-noproc.patch
@@ -102,7 +100,7 @@
Requires: %{name}-modules = %{epoch}:%{ver}-%{release}
Suggests: %{name}-doc-reference = %{epoch}:%{ver}-%{release}
Suggests: perldoc
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRoot: %{tmpdir}/%{name}-%{ver}-root-%(id -u -n)
%define __perl %{_builddir}/perl-%{ver}/runperl
%define __perl_provides %{__perl} %{SOURCE2}
@@ -442,72 +440,6 @@
"pod2man | nroff -man | $PAGER". Program ten używany jest głównie do
dokumentacji modułów z bibliotek Perla.
-%package -n sperl
-Summary: Perl setuid root binaries for use with setuid Perl scripts
-Summary(de.UTF-8): sperl zur Verwendung mit setuid Perl-Skripts
-Summary(es.UTF-8): sperl, para uso con los scrips de Perl setuid
-Summary(fr.UTF-8): sperl, à utiliser avec les scripts Perl setuid
-Summary(it.UTF-8): sperl, da usare con gli script di Perl setuid
-Summary(ja.UTF-8): Setuid Perl scripts と一緒に使用するための suidperl
-Summary(ko.UTF-8): Setuid 펄 스크립트와 함께 사용되는 suidperl
-Summary(pl.UTF-8): Binaria setuid root Perla dla setuid-owych skryptów Perla
-Summary(pt.UTF-8): O suidperl, para usar com os programas de Perl 'setuid'
-Summary(ru.UTF-8): SUID версия языка Perl
-Summary(sv.UTF-8): sperl, att användas med setuid perlskript
-Summary(uk.UTF-8): SUID-версія мови Perl
-Summary(zh_CN.UTF-8): sperl,用来与 setuid Perl 脚本一起使用
-Group: Development/Languages/Perl
-Requires: %{name}-base = %{epoch}:%{ver}-%{release}
-Obsoletes: perl-suidperl
-
-%description -n sperl
-sperl is a setuid root binary copy of Perl that allows for (hopefully)
-more secure running of setuid Perl scripts.
-
-%description -n sperl -l de.UTF-8
-sperl ist eine binäre setuid Kopie von Perl, mit der (hoffentlich)
-setuid-Skripts sicherer ausgeführt werden können.
-
-%description -n sperl -l es.UTF-8
-sperl es una copia binaria de setuid para Perl que le permite una
-ejecución más segura de los scripts de Perl setuid.
-
-%description -n sperl -l fr.UTF-8
-sperl est une copie binaire setuid de Perl qui permet une exécution
-plus sûre de scripts Perl setuid.
-
-%description -n sperl -l it.UTF-8
-sperl è una copia binaria setuid di Perl che consente un'esecuzione
-più sicura di script di Perl setuid.
-
-%description -n sperl -l ja.UTF-8
-sperl は setuid Perl scripts.をもっと安全に動作できる(期待のある)為の
-Perl のsetuid バイナリ コピーです。
-
-%description -n sperl -l pl.UTF-8
-sperl jest to kopia setuid root programu binarnego Perl umożliwiająca
-bezpieczniejsze (miejmy nadzieję) uruchamianie setuidowych skryptów
-Perla.
-
-%description -n sperl -l pt.UTF-8
-O suidperl é uma cópia do Perl com 'setuid' que permite uma execução
-mais segura dos 'scripts' de Perl 'setuid'.
-
-%description -n sperl -l ru.UTF-8
-Suid perl испльзуется для того, чтобы дать возможность создавать
-скрипты с утановленным битом SUID. Хотя в него встроено достаточно
-много проверок, призваных обеспечить безопасность его использования
-suid perl все равно представляет собой значительную потенциальную
-опасность.
-
-%description -n sperl -l sv.UTF-8
-suidperl är en setuid binärkopia av pers som tillåter
-(förhoppningsvis) säkrare körning av setuid perlskript.
-
-%description -n sperl -l zh_CN.UTF-8
-suidperl 是 Perl 的 setuid 二进制副本。它允许(希望如此) 更安全地运行
-setuid perl 脚本。
-
%package tools
Summary: Various tools from the core Perl distribution
Summary(pl.UTF-8): Różne narzędzia z podstawowej dystrybucji Perla
@@ -646,10 +578,11 @@
GDBM_File jest modułem, który umożliwia programom w Perlu korzystanie
z biblioteki GNU gdbm.
+# Setting Version in GDBM_File resets the %version macro. This hack works around it.
+%define version %{ver}
+
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
@@ -658,8 +591,15 @@
%patch7 -p1
%patch9 -p1
-%build
+cat > runperl <<'EOF'
+#!/bin/sh
+LD_PRELOAD="%{_builddir}/%{name}-%{ver}/libperl.so.%{abi}" \
+PERL5LIB="%{buildroot}%{perl_privlib}:%{buildroot}%{perl_archlib}" \
+exec %{buildroot}%{_bindir}/perl ${1:+"$@"}
+EOF
+chmod a+x runperl
+%build
unset LD_SYMBOLIC_FUNCTIONS || :
sh Configure \
-des \
@@ -673,7 +613,6 @@
-Doptimize="%{rpmcflags}" \
-%{?debug:D}%{!?debug:U}DEBUGGING \
-Duseshrplib \
- -Dd_dosuid \
-Dman1dir=%{_mandir}/man1 -Dman1ext=1 \
-Dman3dir=%{_mandir}/man3 -Dman3ext=3perl \
-Dvendorman1dir=%{_mandir}/man1 -Dvendorman1ext=1p \
@@ -696,14 +635,6 @@
LIBPERL_SONAME=libperl.so.%{abi} \
LDDLFLAGS="%{rpmcflags} -shared"
-cat > runperl <<'EOF'
-#!/bin/sh
-LD_PRELOAD="%{_builddir}/%{name}-%{ver}/libperl.so.%{abi}" \
-PERL5LIB="%{buildroot}%{perl_privlib}:%{buildroot}%{perl_archlib}" \
-exec %{buildroot}%{_bindir}/perl ${1:+"$@"}
-EOF
-chmod a+x runperl
-
## microperl
%if %{with microperl}
%{__rm} uconfig.h
@@ -740,7 +671,6 @@
## use symlinks instead of hardlinks
%{__ln_s} -f perl%{ver} $RPM_BUILD_ROOT%{_bindir}/perl
- %{__ln_s} -f perl%{ver} $RPM_BUILD_ROOT%{_bindir}/suidperl
%{__ln_s} -f c2ph $RPM_BUILD_ROOT%{_bindir}/pstruct
%{__ln_s} -f psed $RPM_BUILD_ROOT%{_bindir}/s2p
@@ -781,7 +711,7 @@
## remove man pages for other operating systems
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/perl{aix,amiga,apollo,beos,bs2000,ce,cygwin,dgux,dos}* \
- $RPM_BUILD_ROOT%{_mandir}/man1/perl{freebsd,hpux,machten,macos,mpeix,os2,os390}* \
+ $RPM_BUILD_ROOT%{_mandir}/man1/perl{freebsd,hpux,macos,mpeix,os2,os390}* \
$RPM_BUILD_ROOT%{_mandir}/man1/perl{qnx,solaris,vmesa,vms,vos,win32}*
## symlink perldelta.1.gz -> perlFOOdelta.1.gz
@@ -790,7 +720,7 @@
echo ".so perl%(echo %{ver} | tr -d .)delta.1" >$RPM_BUILD_ROOT%{_mandir}/man1/perldelta.1
## These File::Spec submodules are for non-Unix systems
- %{__rm} $RPM_BUILD_ROOT%{perl_privlib}/File/Spec/[EMOVW]*.pm
+ %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/File/Spec/[EMOVW]*.pm
rm $RPM_BUILD_ROOT%{_mandir}/man3/File::Spec::{Epoc,Mac,OS2,VMS,Win32}.3perl*
## We already have these *.pod files as man pages
@@ -799,9 +729,6 @@
%{__rm} $RPM_BUILD_ROOT%{perl_privlib}/*.pod
%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/*.pod
- ## this object file looks unused; why is it there?
- %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/CORE/sperl.o
-
install -d doc-base/{Getopt/Long,Switch} \
doc-devel/ExtUtils \
doc-modules/{Attribute/Handlers,Filter/Simple,I18N/LangTags,Locale/{Codes,Maketext},Memoize,NEXT} \
@@ -853,7 +780,7 @@
v=$(%{__perl} -e 'do "Devel/DProf.pm"; print $Devel::DProf::VERSION')
;;
libnet)
- v=$(awk '/^libnet /{print $2; exit}' lib/Net/Changes)
+ v=$(awk '/^libnet /{print $2; exit}' cpan/libnet/Changes)
;;
*)
v=$(%{__perl} -M$m -e "print $m->VERSION" )
@@ -960,6 +887,8 @@
%{_mandir}/man3/Symbol.*
%{perl_privlib}/Tie
%{_mandir}/man3/Tie::*
+%{perl_privlib}/XSLoader*
+%{_mandir}/man3/XSLoader*
## arch-dependent modules
%{perl_archlib}/Config*
@@ -969,8 +898,6 @@
%{_mandir}/man3/DynaLoader*
%{perl_archlib}/Errno*
%{_mandir}/man3/Errno*
-%{perl_archlib}/XSLoader*
-%{_mandir}/man3/XSLoader*
%{perl_archlib}/Cwd.*
%dir %{perl_archlib}/auto/Cwd
@@ -1056,6 +983,8 @@
%{perl_archlib}/CORE/*.h
%{_mandir}/man3/CORE*
+%{perl_privlib}/App/Cpan.pm
+%{_mandir}/man3/App::Cpan*
# FIXME: Changes file to _docdir (and rm MANIFEST.SKIP?)
%{perl_privlib}/ExtUtils
%{_mandir}/man3/ExtUtils*
@@ -1065,6 +994,9 @@
%{_mandir}/man3/CPAN*
%{perl_privlib}/DB.*
%{_mandir}/man3/DB.*
+
+%{perl_privlib}/inc
+%{_mandir}/man3/inc::latest*
%{perl_privlib}/Module/Build*
%{_mandir}/man3/Module::Build*
@@ -1130,8 +1062,6 @@
%{perl_privlib}/unicore
## pragmas
-%{perl_privlib}/attributes.pm
-%{_mandir}/man3/attributes.*
%{perl_privlib}/autouse.pm
%{_mandir}/man3/autouse.*
%{perl_privlib}/big*.pm
@@ -1142,6 +1072,8 @@
%{_mandir}/man3/bytes.*
%{perl_privlib}/charnames.pm
%{_mandir}/man3/charnames.*
+%{perl_privlib}/deprecate*.pm
+%{_mandir}/man3/deprecate*
%{perl_privlib}/encoding
%{_mandir}/man3/encoding::*
%{perl_privlib}/filetest.pm
@@ -1161,10 +1093,11 @@
%{perl_privlib}/version.pm
%{_mandir}/man3/version*
-%{perl_archlib}/attrs.pm
-%dir %{perl_archlib}/auto/attrs
-%attr(755,root,root) %{perl_archlib}/auto/attrs/*.so
-%{_mandir}/man3/attrs.*
+
+%{perl_archlib}/attributes.pm
+%dir %{perl_archlib}/auto/attributes
+%attr(755,root,root) %{perl_archlib}/auto/attributes/*.so
+%{_mandir}/man3/attributes.*
%{perl_archlib}/mro.pm
%dir %attr(755,root,root) %{perl_archlib}/auto/mro
%attr(755,root,root) %{perl_archlib}/auto/mro/*.so
@@ -1200,6 +1133,7 @@
%{perl_archlib}/linux
%{perl_archlib}/sys
+%{perl_privlib}/Compress
%{perl_archlib}/Compress
%dir %{perl_archlib}/auto/Compress
%dir %{perl_archlib}/auto/Compress/Raw
@@ -1321,7 +1255,8 @@
%{perl_privlib}/AnyDBM*
%{_mandir}/man3/AnyDBM*
-%{perl_privlib}/App
+%dir %{perl_privlib}/App
+%{perl_privlib}/App/Prove*
%{_mandir}/man3/App::Prove*
%{perl_privlib}/Archive*
%{_mandir}/man3/Archive*
@@ -1360,7 +1295,6 @@
%{_mandir}/man3/NEXT*
# FIXME: README and Changes files
%dir %{perl_privlib}/Net
-%{perl_privlib}/Net/*.eg
%{perl_privlib}/Net/*.pm
%{perl_privlib}/Net/FTP
%{_mandir}/man3/Net::*
@@ -1417,11 +1351,6 @@
%{_mandir}/man1/perldoc.*
-%files -n sperl
-%defattr(644,root,root,755)
-%attr(4755,root,root) %{_bindir}/sperl%{ver}
-%attr(755,root,root) %{_bindir}/suidperl
-
%files tools
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/a2p
@@ -1490,6 +1419,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.424 2010/04/13 20:09:10 radek
+- version 5.12.0
+- release 0.1: not much testing, Provides likely incomplete
+
Revision 1.423 2010/01/01 22:54:15 sparky
- use standatd BuildRoot directory
================================================================
Index: packages/perl/perl_581-INC.patch
diff -u packages/perl/perl_581-INC.patch:1.5 packages/perl/perl_581-INC.patch:1.6
--- packages/perl/perl_581-INC.patch:1.5 Wed Jan 9 15:14:10 2008
+++ packages/perl/perl_581-INC.patch Tue Apr 13 22:09:10 2010
@@ -1,94 +1,71 @@
-diff -urN perl-5.10.0.org/perl.c perl-5.10.0/perl.c
---- perl-5.10.0.org/perl.c 2007-12-18 11:47:08.000000000 +0100
-+++ perl-5.10.0/perl.c 2008-01-09 14:12:15.921155066 +0100
-@@ -4753,39 +4753,6 @@
- incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
+diff --git a/perl.c b/perl.c
+index dfb549d..9b5dd4c 100644
+--- a/perl.c
++++ b/perl.c
+@@ -4151,26 +4151,6 @@ S_init_perllib(pTHX)
+ # endif
#endif
-#ifdef ARCHLIB_EXP
-- incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
+- S_incpush_use_sep(aTHX_ STR_WITH_LEN(ARCHLIB_EXP), INCPUSH_CAN_RELOCATE);
-#endif
--#ifdef MACOS_TRADITIONAL
-- {
-- Stat_t tmpstatbuf;
-- SV * privdir = newSV(0);
-- char * macperl = PerlEnv_getenv("MACPERL");
--
-- if (!macperl)
-- macperl = "";
--
-- Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
-- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-- incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
-- Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
-- if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-- incpush(SvPVX(privdir), TRUE, FALSE, TRUE, FALSE);
--
-- SvREFCNT_dec(privdir);
-- }
-- if (!PL_tainting)
-- incpush(":", FALSE, FALSE, TRUE, FALSE);
--#else
+-
-#ifndef PRIVLIB_EXP
-# define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
-#endif
+-
-#if defined(WIN32)
-- incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
+- s = win32_get_privlib(PERL_FS_VERSION, &len);
+- if (s)
+- incpush_use_sep(s, len, INCPUSH_ADD_SUB_DIRS|INCPUSH_CAN_RELOCATE);
-#else
-- incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
+-# ifdef NETWARE
+- S_incpush_use_sep(aTHX_ PRIVLIB_EXP, 0, INCPUSH_CAN_RELOCATE);
+-# else
+- S_incpush_use_sep(aTHX_ STR_WITH_LEN(PRIVLIB_EXP), INCPUSH_CAN_RELOCATE);
+-# endif
-#endif
-
- #ifdef SITEARCH_EXP
- /* sitearch is always relative to sitelib on Windows for
- * DLL-based path intuition to work correctly */
-@@ -4805,7 +4772,7 @@
+ #ifdef PERL_OTHERLIBDIRS
+ S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS),
+ INCPUSH_ADD_VERSIONED_SUB_DIRS|INCPUSH_NOT_BASEDIR
+@@ -4216,15 +4196,35 @@ S_init_perllib(pTHX)
#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
/* Search for version-specific dirs below here */
-- incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
-+ /* incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE); */
+- S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM),
+- INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
++/* S_incpush_use_sep(aTHX_ STR_WITH_LEN(SITELIB_STEM),
++ INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); */
#endif
- #ifdef PERL_VENDORARCH_EXP
-@@ -4825,7 +4792,40 @@
- #endif
- #ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
-- incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
-+/* incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE); */
+ #if defined(PERL_VENDORLIB_STEM) && defined(PERL_INC_VERSION_LIST)
+ /* Search for version-specific dirs below here */
+- S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM),
+- INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE);
++/* S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_VENDORLIB_STEM),
++ INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); */
+#endif
+
+#ifdef ARCHLIB_EXP
-+ incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
++ S_incpush_use_sep(aTHX_ STR_WITH_LEN(ARCHLIB_EXP), INCPUSH_CAN_RELOCATE);
+#endif
-+#ifdef MACOS_TRADITIONAL
-+ {
-+ Stat_t tmpstatbuf;
-+ SV * privdir = NEWSV(55, 0);
-+ char * macperl = PerlEnv_getenv("MACPERL");
+
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl-modules?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl-t-syslog.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl-test-noproc.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl-timer-test.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl-write-permissions.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl.spec?r1=1.423&r2=1.424&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl_581-INC.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl_585-microperl_uconfig.patch?r1=1.8&r2=1.9&f=u
More information about the pld-cvs-commit
mailing list