Date: Tue, 15 Mar 2011 22:05:46 GMT From: Dereckson <dereckson@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/155586: Port update: www/mod_perl2 to 2.0.5 Message-ID: <201103152205.p2FM5ksX065353@red.freebsd.org> Resent-Message-ID: <201103152210.p2FMA6IG065595@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155586 >Category: ports >Synopsis: Port update: www/mod_perl2 to 2.0.5 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Mar 15 22:10:06 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Dereckson >Release: FreeBSD 8.1 >Organization: >Environment: FreeBSD grip.espace-win.net 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:55:53 UTC 2010 root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: As Bugzilla 4.0 requires Apache-SizeLimit 0.93+ and mod_perl v2.000005 includes the version 0.95, I prepared a port update. Please assign this pr to apache@. Ports changes: * patch-r760926, patch-lib__ModPerl__BuildMM.pm and patch-src__modules__perl__modperl_apache_compat.h aren't needed anymore, as they have been applied upstream * Apache-Reload have been included in 2.0.5 As noted in port changes, the following files are to be deleted during commit: - files/patch-src__modules__perl__modperl_apache_compat.h - files/patch-lib__ModPerl__BuildMM.pm - files/patch-r760926 The following entry should be added in UPDATING: YYYYMMDD: AFFECTS: users of www/mod_perl2 AUTHOR: dereckson@gmail.com Apache(2)::Reload is again a part of mod_perl 2.0.5. If you're upgrading from 2.0.4, you were invited at port install to install the www/p5-Apache-Reload as a workaround. You should deinstall it before update the port. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN mod_perl2.orig/Makefile mod_perl2/Makefile --- mod_perl2.orig/Makefile 2010-05-25 22:17:34.000000000 +0200 +++ mod_perl2/Makefile 2011-03-15 22:56:28.000000000 +0100 @@ -2,12 +2,11 @@ # Date created: February 13th 2003 # Whom: Lars Eggert <larse@isi.edu> # -# $FreeBSD: ports/www/mod_perl2/Makefile,v 1.72 2010/05/25 20:17:34 pgollucci Exp $ +# $FreeBSD$ # PORTNAME= mod_perl -PORTVERSION= 2.0.4 -PORTREVISION= 2 +PORTVERSION= 2.0.5 PORTEPOCH= 3 CATEGORIES= www perl5 MASTER_SITES= http://perl.apache.org/dist/ \ @@ -21,7 +20,7 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource RUN_DEPENDS= ${BUILD_DEPENDS} -MAKE_JOBS_SAFE= yes +MAKE_JOBS_SAFE= yes SUB_FILES= pkg-message SUB_LIST= APACHEMODDIR=${APACHEMODDIR} @@ -63,7 +62,12 @@ ModPerl::RegistryBB.3 ModPerl::RegistryCooker.3 \ ModPerl::RegistryLoader.3 ModPerl::RegistryPrefork.3 \ ModPerl::Util.3 mod_perl2.3 Apache2::ConnectionUtil.3 \ - APR::ThreadRWLock.3 + APR::ThreadRWLock.3 Apache2::Reload.3 Apache::Reload.3 \ + Apache::SizeLimit.3 Apache::SizeLimit::Core.3 + +LICENSE= ASL + +CONFLICTS= p5-Apache-Reload-* .include <bsd.port.pre.mk> @@ -89,18 +93,6 @@ PLIST_SUB+= THREADRWLOCK="@comment " .endif -pre-fetch: - @${ECHO} "" - @${ECHO} "Note, Aapche(2)::Reload was mistakenly ommited from ${PORTVERSION}" - @${ECHO} "cd ${PORTSDIR}/www/p5-Apache-Reload ; ${MAKE} install" - @${ECHO} "After installing mod_perl" - @${ECHO} "This will be fixed in the next version...." - @${ECHO} "" - -pre-configure: - ${RM} ${WRKSRC}/lib/ModPerl/BuildMM.pm.orig - ${RM} ${WRKSRC}/lib/Apache2/Status.pm.orig - post-install: ${MKDIR} ${PREFIX}/${APACHEINCLUDEDIR}/modules/perl ${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \ diff -ruN mod_perl2.orig/distinfo mod_perl2/distinfo --- mod_perl2.orig/distinfo 2008-06-07 17:31:21.000000000 +0200 +++ mod_perl2/distinfo 2011-03-15 16:45:45.000000000 +0100 @@ -1,3 +1,2 @@ -MD5 (mod_perl-2.0.4.tar.gz) = 1a05625ae6843085f985f5da8214502a -SHA256 (mod_perl-2.0.4.tar.gz) = 7da2046aa65dbef64ff5b71400bed4b6b82441e6313c8ca4becb85fb4a89a0f0 -SIZE (mod_perl-2.0.4.tar.gz) = 3727717 +SHA256 (mod_perl-2.0.5.tar.gz) = fa95be3d6d00f083afaea4b17fd594b505998e396feb71260857604566aa8afa +SIZE (mod_perl-2.0.5.tar.gz) = 3778910 diff -ruN mod_perl2.orig/files/patch-Makefile.PL mod_perl2/files/patch-Makefile.PL --- mod_perl2.orig/files/patch-Makefile.PL 2010-05-05 05:35:10.000000000 +0200 +++ mod_perl2/files/patch-Makefile.PL 2011-03-15 16:45:09.000000000 +0100 @@ -1,6 +1,6 @@ ---- m Wed May 18 11:55:48 2005 -+++ Makefile.PL Wed May 18 11:56:07 2005 -@@ -668,11 +668,11 @@ +--- Makefile.PL.orig 2011-02-07 20:16:43.000000000 +0100 ++++ Makefile.PL 2011-03-15 16:32:09.000000000 +0100 +@@ -687,11 +687,11 @@ cd "$(MODPERL_SRC)" && $(MAKE) modperl_lib_install: diff -ruN mod_perl2.orig/files/patch-lib__ModPerl__BuildMM.pm mod_perl2/files/patch-lib__ModPerl__BuildMM.pm --- mod_perl2.orig/files/patch-lib__ModPerl__BuildMM.pm 2008-06-07 17:31:21.000000000 +0200 +++ mod_perl2/files/patch-lib__ModPerl__BuildMM.pm 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- ./lib/ModPerl/BuildMM.pm.orig 2008-05-08 13:00:34.000000000 -0400 -+++ ./lib/ModPerl/BuildMM.pm 2008-05-08 13:01:03.000000000 -0400 -@@ -359,7 +359,7 @@ - - $apr_config ||= $build->get_apr_config(); - -- if ($path =~ m/(Thread|Global)Mutex/) { -+ if ($path =~ m/(Thread|Global)(Mutex|RWLock)/) { - return unless $apr_config->{HAS_THREADS}; - } - diff -ruN mod_perl2.orig/files/patch-r760926 mod_perl2/files/patch-r760926 --- mod_perl2.orig/files/patch-r760926 2009-05-16 04:07:21.000000000 +0200 +++ mod_perl2/files/patch-r760926 1970-01-01 01:00:00.000000000 +0100 @@ -1,47 +0,0 @@ ---- lib/Apache2/Status.pm 2009/04/01 15:32:12 760925 -+++ lib/Apache2/Status.pm 2009/04/01 15:39:56 760926 -@@ -29,7 +29,7 @@ - - use Apache2::Const -compile => qw(OK); - --$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0 -+$Apache2::Status::VERSION = '4.01'; # mod_perl 2.0 - - use constant IS_WIN32 => ($^O eq "MSWin32"); - -@@ -126,7 +126,7 @@ - $r->print(symdump($r, $qs)); - } - else { -- my $uri = $r->uri; -+ my $uri = $r->location; - $r->print('<p>'); - $r->print( - map { qq[<a href="$uri?$_">$status{$_}</a><br />\n] } sort { lc $a cmp lc $b } keys %status -@@ -198,7 +198,7 @@ - sub status_inc { - my ($r) = @_; - -- my $uri = $r->uri; -+ my $uri = $r->location; - my @retval = ( - '<table border="1">', - "<tr>", -@@ -289,7 +289,7 @@ - my ($r) = @_; - - local $_; -- my $uri = $r->uri; -+ my $uri = $r->location; - my $cache = __PACKAGE__->registry_cache; - - my @retval = "<h2>Compiled registry scripts grouped by their handler</h2>"; -@@ -765,7 +765,7 @@ - my ($self, $package, $r) = @_; - - my @m = qw(<table>); -- my $uri = $r->uri; -+ my $uri = $r->location; - my $is_main = $package eq "main"; - - my $do_dump = has($r, "dumper"); diff -ruN mod_perl2.orig/files/patch-src__modules__perl__modperl_apache_compat.h mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h --- mod_perl2.orig/files/patch-src__modules__perl__modperl_apache_compat.h 2008-06-07 17:31:21.000000000 +0200 +++ mod_perl2/files/patch-src__modules__perl__modperl_apache_compat.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ ---- ./src/modules/perl/modperl_apache_compat.h.orig 2008-05-08 12:59:16.000000000 -0400 -+++ ./src/modules/perl/modperl_apache_compat.h 2008-05-08 12:59:30.000000000 -0400 -@@ -22,6 +22,7 @@ - #if !APR_HAS_THREADS - typedef unsigned long apr_os_thread_t; - typedef void * apr_thread_mutex_t; -+typedef void * apr_thread_rwlock_t; - #endif - - /* back compat adjustements for older Apache versions diff -ruN mod_perl2.orig/pkg-plist mod_perl2/pkg-plist --- mod_perl2.orig/pkg-plist 2008-07-03 03:48:34.000000000 +0200 +++ mod_perl2/pkg-plist 2011-03-15 18:03:12.000000000 +0100 @@ -76,6 +76,9 @@ %%SITE_PERL%%/%%PERL_ARCH%%/APR/UUID.pm %%SITE_PERL%%/%%PERL_ARCH%%/APR/Util.pm %%SITE_PERL%%/%%PERL_ARCH%%/APR/XSLoader.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache/Reload.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit/Core.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Test.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Test5005compat.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/TestBuild.pm @@ -127,6 +130,7 @@ %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections/Dump.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Process.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Reload.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestIO.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestRec.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/RequestUtil.pm @@ -338,6 +342,7 @@ @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Bundle @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/PerlSections @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2 +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/SizeLimit @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/APR @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103152205.p2FM5ksX065353>