Author: torsten Date: Tue Mar 1 12:33:58 2011 New Revision: 1075794 URL: http://svn.apache.org/viewvc?rev=1075794&view=rev Log: Merged revisions 1066644,1068176,1068195,1068242,1068246,1068252,1073931,1074122 via svnmerge from https://svn.eu.apache.org/repos/asf/perl/modperl/trunk
........ r1066644 | phred | 2011-02-02 22:52:32 +0100 (Wed, 02 Feb 2011) | 2 lines Fix KEYS url ........ r1068176 | phred | 2011-02-07 23:14:25 +0100 (Mon, 07 Feb 2011) | 2 lines Merge changes from 2.0.5 release ........ r1068195 | phred | 2011-02-07 23:42:18 +0100 (Mon, 07 Feb 2011) | 1 line add notes from 2.0.5 release ........ r1068242 | phred | 2011-02-08 02:05:17 +0100 (Tue, 08 Feb 2011) | 2 lines Add another note from pgollucci ........ r1068246 | phred | 2011-02-08 03:03:37 +0100 (Tue, 08 Feb 2011) | 1 line start 2.0.6-dev cycle ........ r1068252 | phred | 2011-02-08 03:25:04 +0100 (Tue, 08 Feb 2011) | 1 line 2.0.6 ........ r1073931 | phred | 2011-02-23 21:33:48 +0100 (Wed, 23 Feb 2011) | 3 lines Pass LD_LIBRARY_PATH if mod_env is loaded. Should prevent build failures on some platforms. Idea stolen from rt.cpan.org #66085 ........ r1074122 | torsten | 2011-02-24 13:08:05 +0100 (Thu, 24 Feb 2011) | 3 lines Check the ExtUtils::Embed version in Apache2::Build, see http://www.gossamer-threads.com/lists/modperl/modperl/102740#102740 ........ Added: perl/modperl/branches/threading/todo/2.0.6 - copied unchanged from r1074122, perl/modperl/trunk/todo/2.0.6 Removed: perl/modperl/branches/threading/todo/2.0.5 Modified: perl/modperl/branches/threading/ (props changed) perl/modperl/branches/threading/Changes perl/modperl/branches/threading/Makefile.PL perl/modperl/branches/threading/RELEASE perl/modperl/branches/threading/STATUS perl/modperl/branches/threading/lib/Apache2/Build.pm perl/modperl/branches/threading/lib/mod_perl2.pm perl/modperl/branches/threading/t/conf/extra.conf.in Propchange: perl/modperl/branches/threading/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 1 12:33:58 2011 @@ -1 +1 @@ -/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232,1062311-1062448 +/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232,1062311-1062448,1066644-1074122 Propchange: perl/modperl/branches/threading/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Tue Mar 1 12:33:58 2011 @@ -1 +1 @@ -/perl/modperl/trunk:1-712967,712969-1062457 +/perl/modperl/trunk:1-712967,712969-1075785 Modified: perl/modperl/branches/threading/Changes URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/Changes?rev=1075794&r1=1075793&r2=1075794&view=diff ============================================================================== --- perl/modperl/branches/threading/Changes (original) +++ perl/modperl/branches/threading/Changes Tue Mar 1 12:33:58 2011 @@ -29,9 +29,25 @@ via ModPerl::TiPool and modperl_tipool_c Expose modperl_interp_t via ModPerl::Interpreter [Torsten Foertsch] -=item 2.0.5-rc1 +=item 2.0.6-dev -Perpare modperl for the upcoming perl 5.14 [Torsten Foertsch] +Check for the right ExtUtils::Embed version during build [Torsten Foertsch] + +Take a lesson from rt.cpan.org #66085 and pass LD_LIBRARY_PATH if mod_env +is present. Should prevent test failures on some platforms. +[Fred Moyer] + + +=item 2.0.5 February 7, 2011 + +The mod_perl PMC dedicates this release of mod_perl to Randy Kobes, who +passed away in September 2010. Randy was a member of the mod_perl project +management committee and a co-author of the mod_perl Developer's Cookbook. +His work helped many Windows mod_perl users. His work with ppm files, and +Win32 perl users will be sorely missed. He was kind, bright, and always +willing to lend a hand on the mod_perl user's list. + +Prepare modperl for the upcoming perl 5.14 [Torsten Foertsch] Add lib/ModPerl/MethodLookup.pm to MANIFEST via lib/ModPerl/Manifest.pm RT #48103 reported by mar...@cpan.org Modified: perl/modperl/branches/threading/Makefile.PL URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/Makefile.PL?rev=1075794&r1=1075793&r2=1075794&view=diff ============================================================================== --- perl/modperl/branches/threading/Makefile.PL (original) +++ perl/modperl/branches/threading/Makefile.PL Tue Mar 1 12:33:58 2011 @@ -828,7 +828,7 @@ Apache-Test/META.yml: cd Apache-Test && make metafile tag : - svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM) + svn copy https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM) svn copy https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM) EOF Modified: perl/modperl/branches/threading/RELEASE URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/RELEASE?rev=1075794&r1=1075793&r2=1075794&view=diff ============================================================================== --- perl/modperl/branches/threading/RELEASE (original) +++ perl/modperl/branches/threading/RELEASE Tue Mar 1 12:33:58 2011 @@ -14,7 +14,7 @@ Instructions for mod_perl 2.0 Release Ma http://people.apache.org/~geoff/gpghowto.html Copy the KEYS file into place: - % scp KEYS www.apache.org:/www/www.apache.org/dist/perl/KEYS + % scp KEYS people.apache.org:/www/www.apache.org/dist/perl/KEYS If this is your first release, ask someone with APML karma on PAUSE to verify you have the appropriate permissions. Likely someone on @@ -29,8 +29,8 @@ Instructions for mod_perl 2.0 Release Ma f. if you happen to know that packages were added this release, make sure you give the correct permissions to them. -1. 'make dist' - to make sure nothing is missing from the manifest, - etc. Now test this generated package mod_perl-2.0.5.tar.gz (not +1. 'make mydist' - to make sure nothing is missing from the manifest, + etc. Now test this generated package mod_perl-2.0.6.tar.gz (not the current build) with as many configurations as possible on as many platforms as possible, unpacking the package each time afresh. @@ -55,7 +55,7 @@ Instructions for mod_perl 2.0 Release Ma to the modperl/dev list (may be longer to give most people a chance to catch up). no need to tag this package - Subject: [RELEASE CANDIDATE]: mod_perl-2.0.5 RC\d+ + Subject: [RELEASE CANDIDATE]: mod_perl-2.0.6 RC\d+ 2a. if problems are detected during stage 2, repeat stages 1 and 2. @@ -75,61 +75,63 @@ Instructions for mod_perl 2.0 Release Ma % make -n tag d. commit Changes README Makefile.PL - % svn ci -m "Releasing 2.0.5" Changes README Makefile.PL + % svn ci -m "Releasing 2.0.6" Changes README Makefile.PL e. tag % make tag + XXXX: See BRANCHING for the steps to include the proper tagged externals XXXX: This needs to be fixed, and updated, developer beware its outdated and possibly wrong f. Update the svn:externals in the new tag (you can't propedit remotely yet in svn) - % svn co https://svn.apache.org/repos/asf/perl/modperl/tags/2_0_5 - % svn propedit svn:externals 2_0_5 + % svn co https://svn.apache.org/repos/asf/perl/modperl/tags/2_0_6 + % svn propedit svn:externals 2_0_6 Update the Apache-Test line to current revision % svn info https://svn.apache.org/repos/asf/perl/Apache-Test/trunk | grep "Last Changed Rev" Update the docs line to the current tag. It should look like: - % svn propget svn:externals 2_0_5 + % svn propget svn:externals 2_0_6 Apache-Test -r 608229 https://svn.apache.org/repos/asf/perl/Apache-Test/trunk - docs https://svn.apache.org/repos/asf/perl/modperl/docs/tags/2_0_5/src/docs/2.0 + docs https://svn.apache.org/repos/asf/perl/modperl/docs/tags/2_0_6/src/docs/2.0 - % svn ci -m "Releasing 2.0.5" + % svn ci -m "Releasing 2.0.6" g. create the final package % make dist h. test the final package again at least once -4. Release the package and update links (e.g. mod_perl-2.0.5.tar.gz) +4. Release the package and update links (e.g. mod_perl-2.0.6.tar.gz) - a. upload to people.apache.org:/www/perl.apache.org/dist/ + a. upload to people.apache.org:/www/perl.apache.org/dist/ - ask the PMC + chair to give you the needed permissions if you do not have them. - % scp mod_perl-2.0.5.tar.gz people.apache.org:/www/perl.apache.org/dist/ + % scp mod_perl-2.0.6.tar.gz people.apache.org:/www/perl.apache.org/dist/ b. ssh to people.apache.org, unpack the package, update symlinks to the tar ball and unpacked distro: % ssh people.apache.org % cd /www/perl.apache.org/dist/ - % ln -sf mod_perl-2.0.5.tar.gz mod_perl-2.0-current.tar.gz - % tar -xzvf mod_perl-2.0.5.tar.gz + % ln -sf mod_perl-2.0.6.tar.gz mod_perl-2.0-current.tar.gz + % tar -xzvf mod_perl-2.0.6.tar.gz % rm /www/perl.apache.org/dist/mod_perl-2.0-current - % ln -sf mod_perl-2.0.5 mod_perl-2.0-current + % ln -sf mod_perl-2.0.6 mod_perl-2.0-current c. archive older releases (keep current + one prior release) - % mv /www/perl.apache.org/dist/mod_perl-2.0.3.tar.gz \ + % mv /www/perl.apache.org/dist/mod_perl-2.0.4.tar.gz \ /www/perl.apache.org/dist/old - % mv /www/perl.apache.org/dist/mod_perl-2.0.3.tar.gz.asc \ + % mv /www/perl.apache.org/dist/mod_perl-2.0.4.tar.gz.asc \ /www/perl.apache.org/dist/old - % rm -rf /www/perl.apache.org/dist/mod_perl-2.0.3 + % rm -rf /www/perl.apache.org/dist/mod_perl-2.0.4 d. update the version and release date in the docs: % vi modperl-docs/src/download/index_top.html % vi modperl-docs/doap_Perl.rdf and commit. - % svn ci -m "Releasing 2.0.5" \ + % svn ci -m "Releasing 2.0.6" \ modperl-docs/src/download/index_top.html \ modperl-docs/doap_Perl.rdf @@ -139,6 +141,8 @@ Instructions for mod_perl 2.0 Release Ma % /home/perlwww/apache.org/modperl-docs/bin/site_build + You may need to sudo -H -u perlwww to cleanup any svn locks. + 5. Upload the package to CPAN 6. Tarball signing @@ -148,27 +152,27 @@ Instructions for mod_perl 2.0 Release Ma a. sign your local copy of the tarball: - % gpg --detach-sign --armor mod_perl-2.0.5.tar.gz + % gpg --detach-sign --armor mod_perl-2.0.6.tar.gz - % pgps -b --armor mod_perl-2.0.5.tar.gz + % pgps -b --armor mod_perl-2.0.6.tar.gz b. upload the generated sig file to people.apache.org: - % scp mod_perl-2.0.5.tar.gz.asc people.apache.org:/www/perl.apache.org/dist/ + % scp mod_perl-2.0.6.tar.gz.asc people.apache.org:/www/perl.apache.org/dist/ % ssh people.apache.org % cd /www/perl.apache.org/dist/ - % chmod 0664 mod_perl-2.0.5.tar.gz.asc - % ln -sf mod_perl-2.0.5.tar.gz.asc mod_perl-2.0-current.tar.gz.asc + % chmod 0664 mod_perl-2.0.6.tar.gz.asc + % ln -sf mod_perl-2.0.6.tar.gz.asc mod_perl-2.0-current.tar.gz.asc c. ask one of the other developers to double check the signature file and tarball: download both files and verify the signature: - http://perl.apache.org/dist/mod_perl-2.0.5.tar.gz.asc - http://perl.apache.org/dist/mod_perl-2.0.5.tar.gz + http://perl.apache.org/dist/mod_perl-2.0.6.tar.gz.asc + http://perl.apache.org/dist/mod_perl-2.0.6.tar.gz - % gpg --verify mod_perl-2.0.5.tar.gz.asc + % gpg --verify mod_perl-2.0.6.tar.gz.asc - % pgpv mod_perl-2.0.5.tar.gz.asc + % pgpv mod_perl-2.0.6.tar.gz.asc d. make sure that the files you just created are group rw so all the dist admins can make changes: @@ -182,10 +186,10 @@ Instructions for mod_perl 2.0 Release Ma a. unpack the package, update symlinks to the tarball and unpacked distro: % cd /www/www.apache.org/dist/perl/ - % cp /www/perl.apache.org/dist/mod_perl-2.0.5.tar.gz* . - % tar -xzvf mod_perl-2.0.5.tar.gz - % mv mod_perl-2.0.3.tar.gz* /www/archive.apache.org/dist/perl/ - % rm -rf mod_perl-2.0.3 + % cp /www/perl.apache.org/dist/mod_perl-2.0.6.tar.gz* . + % tar -xzvf mod_perl-2.0.6.tar.gz + % mv mod_perl-2.0.4.tar.gz* /www/archive.apache.org/dist/perl/ + % rm -rf mod_perl-2.0.4 b. make sure that the files you just created are group rw so @@ -198,11 +202,11 @@ Instructions for mod_perl 2.0 Release Ma a. post ... to the modperl, announce lists Note, to post to announce@, you must be sending from an apache.org address. - Subject: [ANNOUNCE] mod_perl 2.0.5 + Subject: [ANNOUNCE] mod_perl 2.0.6 include - link at perl.apache.org: - http://apache.org/dist/perl/mod_perl-2.0.5.tar.gz - http://apache.org/dist/perl/mod_perl-2.0.5.tar.gz.asc (pgp sig) + http://apache.org/dist/perl/mod_perl-2.0.6.tar.gz + http://apache.org/dist/perl/mod_perl-2.0.6.tar.gz.asc (pgp sig) - MD5 sig (as it comes from CPAN upload announce). - the latest Changes @@ -213,7 +217,7 @@ Instructions for mod_perl 2.0 Release Ma b. edit ./Changes: - start a new item with incremented version + '-dev' - =item 2.0.6-dev + =item 2.0.7-dev c. add a release entry in STATUS @@ -224,7 +228,7 @@ Instructions for mod_perl 2.0 Release Ma e. commit the changed files - % svn ci -m "start 2.0.5-dev cycle" Changes lib/mod_perl2.pm \ + % svn ci -m "start 2.0.6-dev cycle" Changes lib/mod_perl2.pm \ STATUS RELEASE 10. Old Versions Modified: perl/modperl/branches/threading/STATUS URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/STATUS?rev=1075794&r1=1075793&r2=1075794&view=diff ============================================================================== --- perl/modperl/branches/threading/STATUS (original) +++ perl/modperl/branches/threading/STATUS Tue Mar 1 12:33:58 2011 @@ -3,6 +3,7 @@ mod_perl 2.0 STATUS: Release: -------- + 2.000.05 : Released Feb 07, 2011 2.000.04 : Released Apr 16, 2008 2.000.03 : Released Nov 29, 2006 2.000.02 : Released Oct 20, 2005 Modified: perl/modperl/branches/threading/lib/Apache2/Build.pm URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/lib/Apache2/Build.pm?rev=1075794&r1=1075793&r2=1075794&view=diff ============================================================================== --- perl/modperl/branches/threading/lib/Apache2/Build.pm (original) +++ perl/modperl/branches/threading/lib/Apache2/Build.pm Tue Mar 1 12:33:58 2011 @@ -28,6 +28,42 @@ use File::Basename; use ExtUtils::Embed (); use File::Copy (); +BEGIN { # check for a sane ExtUtils::Embed + unless ($ENV{MP_USE_MY_EXTUTILS_EMBED}) { + my ($version, $path)=(ExtUtils::Embed->VERSION, + $INC{q{ExtUtils/Embed.pm}}); + my $msg=<<"EOF"; +I have found ExtUtils::Embed $version at + + $path + +This is probably not the right one for this perl version. Please make sure +there is only one version of this module installed and that it is the one +that comes with this perl version. + +If you insist on using the ExtUtils::Embed as is set the environment +variable MP_USE_MY_EXTUTILS_EMBED=1 and try again. + +EOF + if (eval {require Module::CoreList}) { + my $req=$Module::CoreList::version{$]}->{q/ExtUtils::Embed/}; + die "Please repair your Module::CoreList" unless $req; + unless ($version eq $req) { + $msg.=("Details: expecting ExtUtils::Embed $req ". + "(according to Module::CoreList)\n\n"); + die $msg; + } + } + else { + my $req=$Config{privlib}.'/ExtUtils/Embed.pm'; + unless ($path eq $req) { + $msg.="Details: expecting ExtUtils::Embed at $req\n\n"; + die $msg; + } + } + } +} + use constant IS_MOD_PERL_BUILD => grep { -e "$_/Makefile.PL" && -e "$_/lib/mod_perl2.pm" } qw(. ..); Modified: perl/modperl/branches/threading/lib/mod_perl2.pm URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/lib/mod_perl2.pm?rev=1075794&r1=1075793&r2=1075794&view=diff ============================================================================== --- perl/modperl/branches/threading/lib/mod_perl2.pm (original) +++ perl/modperl/branches/threading/lib/mod_perl2.pm Tue Mar 1 12:33:58 2011 @@ -20,7 +20,7 @@ use 5.006; use strict; BEGIN { - our $VERSION = "2.000005"; + our $VERSION = "2.000006"; our $VERSION_TRIPLET; if ($VERSION =~ /(\d+)\.(\d\d\d)(\d+)/) { Modified: perl/modperl/branches/threading/t/conf/extra.conf.in URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/conf/extra.conf.in?rev=1075794&r1=1075793&r2=1075794&view=diff ============================================================================== --- perl/modperl/branches/threading/t/conf/extra.conf.in (original) +++ perl/modperl/branches/threading/t/conf/extra.conf.in Tue Mar 1 12:33:58 2011 @@ -73,6 +73,10 @@ PerlModule TestExit::FromPerlModule </IfModule> <IfModule mod_env.c> SetEnv TMPDIR @t_logs@ + + # pass ld_library_path for non standard lib locations + # [rt.cpan.org #66085] + PassEnv LD_LIBRARY_PATH </IfModule> # </sandbox-friendly>
