Date: Fri, 29 Jul 2005 00:13:38 +0800 (CST) From: Yen-Ming Lee <leeym@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: nistor@snickers.org Subject: ports/84233: [PATCH] www/p5-Apache-ParseFormData: update for mod_perl2 Message-ID: <20050728161338.D5292B29CE2@utopia.leeym.com> Resent-Message-ID: <200507281620.j6SGKLlR010805@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 84233
>Category: ports
>Synopsis: [PATCH] www/p5-Apache-ParseFormData: update for mod_perl2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 28 16:20:21 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Yen-Ming Lee
>Release: FreeBSD 5.4-STABLE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.4-STABLE FreeBSD 5.4-STABLE #0: Sun Jul 17 07:50:25 CST 2005
>Description:
- update for mod_perl2 and unbreak this port
Added file(s):
- files/patch-ParseFormData.pm
Port maintainer (nistor@snickers.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- p5-Apache-ParseFormData-0.09.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/p5-Apache-ParseFormData/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- Makefile 23 Jul 2005 02:53:40 -0000 1.3
+++ Makefile 28 Jul 2005 16:12:29 -0000
@@ -15,22 +15,21 @@
MAINTAINER= nistor@snickers.org
COMMENT= Module allows you to easily decode/parse form and query data
-BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache2/mod_perl.pm:${PORTSDIR}/www/mod_perl2
+BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/mod_perl2.pm:${PORTSDIR}/www/mod_perl2
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-BROKEN= Broken due the new mod_perl2 API
-DEPRECATED= ${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
MAN3= Apache::ParseFormData.3
+post-patch:
+ @${FIND} ${WRKSRC} -name "*.orig" -delete
+
.include <bsd.port.pre.mk>
# mod_perl 2 requires it
.if ${PERL_LEVEL} < 500800
-IGNORE= requires perl 5.8.x or later. Install lang/perl5.8 then try again
+IGNORE= requires perl 5.8.x or later. Install lang/perl5.8 then try again
.endif
.include <bsd.port.post.mk>
Index: files/patch-ParseFormData.pm
===================================================================
RCS file: files/patch-ParseFormData.pm
diff -N files/patch-ParseFormData.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-ParseFormData.pm 28 Jul 2005 16:12:29 -0000
@@ -0,0 +1,58 @@
+--- ParseFormData.pm.orig Fri Jul 29 00:00:48 2005
++++ ParseFormData.pm Fri Jul 29 00:01:41 2005
+@@ -11,9 +11,9 @@
+ package Apache::ParseFormData;
+
+ use strict;
+-use Apache::Log;
+-use Apache::Const -compile => qw(OK M_POST M_GET FORBIDDEN HTTP_REQUEST_ENTITY_TOO_LARGE);
+-use Apache::RequestIO ();
++use Apache2::Log;
++use Apache2::Const -compile => qw(OK M_POST M_GET FORBIDDEN HTTP_REQUEST_ENTITY_TOO_LARGE);
++use Apache2::RequestIO ();
+ use APR::Table;
+ use IO::File;
+ use POSIX qw(tmpnam);
+@@ -44,12 +44,12 @@
+ if(my $data = $self->headers_in->get('cookie')) {
+ &_parse_query($self, $data, " *; *");
+ }
+- if($self->method_number == Apache::M_POST) {
++ if($self->method_number == Apache2::Const::M_POST) {
+ $self->pnotes('apr_req_result' => &parse_content($self, \%args));
+- } elsif($self->method_number == Apache::M_GET) {
++ } elsif($self->method_number == Apache2::Const::M_GET) {
+ my $data = $self->args();
+ &_parse_query($self, $data) if($data);
+- $self->pnotes('apr_req_result' => Apache::OK);
++ $self->pnotes('apr_req_result' => Apache2::Const::OK);
+ }
+ return($self);
+ }
+@@ -139,7 +139,7 @@
+ my $error_str = "[Apache::ParseFormData] file upload forbidden";
+ $r->notes->set("error-notes" => $error_str);
+ $r->log_error($error_str);
+- return(Apache::FORBIDDEN);
++ return(Apache2::Const::FORBIDDEN);
+ }
+ my $rm = $r->remaining;
+ if($args->{'post_max'} && ($rm > $args->{'post_max'})) {
+@@ -147,7 +147,7 @@
+ my $error_str = "[Apache::ParseFormData] entity too large ($rm, max=$pm)";
+ $r->notes->set("error-notes" => $error_str);
+ $r->log_error($error_str);
+- return(Apache::HTTP_REQUEST_ENTITY_TOO_LARGE);
++ return(Apache2::Const::HTTP_REQUEST_ENTITY_TOO_LARGE);
+ }
+ if($ct =~ /^multipart\/form-data; boundary=(.+)$/) {
+ my $boundary = $1;
+@@ -196,7 +196,7 @@
+ $r->get_client_block($buf, $len);
+ &_parse_query($r, $buf) if($buf);
+ }
+- return(Apache::OK);
++ return(Apache2::Const::OK);
+ }
+
+ sub extract_headers {
--- p5-Apache-ParseFormData-0.09.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050728161338.D5292B29CE2>