From 7a66c1486f511f5a7fbdc0fb2afa39543e8e4e7c Mon Sep 17 00:00:00 2001 From: jorton Date: Apr 18 2008 08:38:51 +0000 Subject: - update to 2.0.4 --- diff --git a/.cvsignore b/.cvsignore index 7c55ccb..c091c86 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,5 +1 @@ -mod_perl-2.0.3.tar.gz -x86_64 -clog -mod_perl-2.0.3 -*.src.rpm +mod_perl-2.0.4.tar.gz diff --git a/mod_perl-2.0.2.tar.gz.asc b/mod_perl-2.0.2.tar.gz.asc deleted file mode 100644 index f457eee..0000000 --- a/mod_perl-2.0.2.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (FreeBSD) - -iD8DBQBDWEBd1VpxcqeZl/oRAgw5AKCzb5Nh4DipHJ1Iy/2Xs6y5tc/QXACgvU5K -q/SXTHOZZyNIU1oU498kN0E= -=xExs ------END PGP SIGNATURE----- diff --git a/mod_perl-2.0.3-perl510.patch b/mod_perl-2.0.3-perl510.patch deleted file mode 100644 index 1198792..0000000 --- a/mod_perl-2.0.3-perl510.patch +++ /dev/null @@ -1,56 +0,0 @@ - -http://svn.apache.org/viewvc?view=rev&rev=480890 -http://svn.apache.org/viewvc?view=rev&rev=480903 - ---- mod_perl-2.0.3/src/modules/perl/modperl_interp.h.perl510 -+++ mod_perl-2.0.3/src/modules/perl/modperl_interp.h -@@ -36,16 +36,30 @@ apr_status_t modperl_interp_cleanup(void - * cleaner solution. of course it must be really fast. - */ - #ifndef HvPMROOT -+# if PERL_REVISION == 5 && \ -+ ((PERL_VERSION == 9 && PERL_SUBVERSION > 4) || \ -+ PERL_VERSION > 9) - #define MP_THX_INTERP_GET(thx) \ -- (modperl_interp_t *) ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_magic -+ (modperl_interp_t *) ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_u.xmg_magic -+# else -+#define MP_THX_INTERP_GET(thx) \ -+ (modperl_interp_t *) ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_magic -+# endif - #else - #define MP_THX_INTERP_GET(thx) \ - (modperl_interp_t *)HvPMROOT(*Perl_Imodglobal_ptr(thx)) - #endif - - #ifndef HvPMROOT -+# if PERL_REVISION == 5 && \ -+ ((PERL_VERSION == 9 && PERL_SUBVERSION > 4) || \ -+ PERL_VERSION > 9) -+#define MP_THX_INTERP_SET(thx, interp) \ -+ ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_u.xmg_magic = (MAGIC*)interp -+# else - #define MP_THX_INTERP_SET(thx, interp) \ - ((XPVMG*)SvANY(*Perl_Imodglobal_ptr(thx)))->xmg_magic = (MAGIC*)interp -+# endif - #else - #define MP_THX_INTERP_SET(thx, interp) \ - HvPMROOT(*Perl_Imodglobal_ptr(thx)) = (PMOP*)interp ---- mod_perl-2.0.3/src/modules/perl/mod_perl.c.perl510 -+++ mod_perl-2.0.3/src/modules/perl/mod_perl.c -@@ -584,6 +584,15 @@ static apr_status_t modperl_sys_init(voi - - static apr_status_t modperl_sys_term(void *data) - { -+ /* PERL_SYS_TERM() needs 'my_perl' as of 5.9.5 */ -+#ifdef USE_ITHREADS -+# if PERL_REVISION == 5 && \ -+ ((PERL_VERSION == 9 && PERL_SUBVERSION > 4) || \ -+ PERL_VERSION > 9) -+ modperl_cleanup_data_t *cdata = (modperl_cleanup_data_t *)data; -+ PerlInterpreter *my_perl = (PerlInterpreter *)cdata->data; -+# endif -+#endif - MP_init_status = 0; - MP_threads_started = 0; - MP_post_post_config_phase = 0; diff --git a/mod_perl-2.0.3-perl510attrs.patch b/mod_perl-2.0.3-perl510attrs.patch deleted file mode 100644 index 4ddc9f3..0000000 --- a/mod_perl-2.0.3-perl510attrs.patch +++ /dev/null @@ -1,119 +0,0 @@ - -http://svn.apache.org/viewvc?rev=615751&view=rev - ---- mod_perl-2.0.3/src/modules/perl/mod_perl.h.perl510attrs -+++ mod_perl-2.0.3/src/modules/perl/mod_perl.h -@@ -138,11 +138,6 @@ apr_status_t modperl_response_finish(req - int modperl_response_handler(request_rec *r); - int modperl_response_handler_cgi(request_rec *r); - --/* betting on Perl*Handlers not using CvXSUBANY -- * mod_perl reuses this field for handler attributes -- */ --#define MP_CODE_ATTRS(cv) (CvXSUBANY((CV*)cv).any_i32) -- - #define MgTypeExt(mg) (mg->mg_type == '~') - - typedef void MP_FUNC_NONSTD_T(modperl_var_modify_t) (apr_table_t *, ---- mod_perl-2.0.3/src/modules/perl/modperl_util.h.perl510attrs -+++ mod_perl-2.0.3/src/modules/perl/modperl_util.h -@@ -149,4 +149,6 @@ int modperl_restart_count(void); - SV *modperl_pnotes(pTHX_ HV **pnotes, SV *key, SV *val, - request_rec *r, conn_rec *c); - -+U16 *modperl_code_attrs(pTHX_ CV *cv); -+ - #endif /* MODPERL_UTIL_H */ ---- mod_perl-2.0.3/src/modules/perl/modperl_mgv.c.perl510attrs -+++ mod_perl-2.0.3/src/modules/perl/modperl_mgv.c -@@ -271,7 +271,7 @@ int modperl_mgv_resolve(pTHX_ modperl_ha - } - else { - if ((cv = get_cv(name, FALSE))) { -- handler->attrs = (U32)MP_CODE_ATTRS(cv); -+ handler->attrs = *modperl_code_attrs(aTHX_ cv); - handler->mgv_cv = - modperl_mgv_compile(aTHX_ p, HvNAME(GvSTASH(CvGV(cv)))); - modperl_mgv_append(aTHX_ p, handler->mgv_cv, GvNAME(CvGV(cv))); -@@ -334,7 +334,7 @@ int modperl_mgv_resolve(pTHX_ modperl_ha - modperl_mgv_new_name(handler->mgv_obj, p, name); - } - -- handler->attrs = (U32)MP_CODE_ATTRS(cv); -+ handler->attrs = *modperl_code_attrs(aTHX_ cv); - /* note: this is the real function after @ISA lookup */ - handler->mgv_cv = modperl_mgv_compile(aTHX_ p, HvNAME(GvSTASH(gv))); - modperl_mgv_append(aTHX_ p, handler->mgv_cv, handler_name); ---- mod_perl-2.0.3/src/modules/perl/modperl_types.h.perl510attrs -+++ mod_perl-2.0.3/src/modules/perl/modperl_types.h -@@ -196,7 +196,7 @@ struct modperl_handler_t { - const char *name; - CV *cv; - U8 flags; -- U32 attrs; -+ U16 attrs; - modperl_handler_t *next; - }; - ---- mod_perl-2.0.3/src/modules/perl/modperl_util.c.perl510attrs -+++ mod_perl-2.0.3/src/modules/perl/modperl_util.c -@@ -903,3 +903,13 @@ SV *modperl_pnotes(pTHX_ HV **pnotes, SV - return retval ? SvREFCNT_inc(retval) : &PL_sv_undef; - } - -+U16 *modperl_code_attrs(pTHX_ CV *cv) { -+ MAGIC *mg; -+ -+ if (!SvMAGICAL(cv)) { -+ sv_magic((SV*)cv, Nullsv, PERL_MAGIC_ext, NULL, -1); -+ } -+ -+ mg = mg_find((SV*)cv, PERL_MAGIC_ext); -+ return &(mg->mg_private); -+} ---- mod_perl-2.0.3/xs/Apache2/Filter/Apache2__Filter.h.perl510attrs -+++ mod_perl-2.0.3/xs/Apache2/Filter/Apache2__Filter.h -@@ -86,9 +86,9 @@ static MP_INLINE apr_size_t mpxs_Apache2 - return len; - } - --static MP_INLINE U32 *modperl_filter_attributes(SV *package, SV *cvrv) -+static MP_INLINE U16 *modperl_filter_attributes(pTHX_ SV *package, SV *cvrv) - { -- return (U32 *)&MP_CODE_ATTRS(SvRV(cvrv)); -+ return modperl_code_attrs(aTHX_ (CV*)SvRV(cvrv)); - } - - #ifdef MP_TRACE -@@ -118,7 +118,7 @@ static MP_INLINE U32 *modperl_filter_att - MP_STATIC XS(MPXS_modperl_filter_attributes) - { - dXSARGS; -- U32 *attrs = modperl_filter_attributes(ST(0), ST(1)); -+ U16 *attrs = modperl_filter_attributes(aTHX_ ST(0), ST(1)); - I32 i; - #ifdef MP_TRACE - HV *stash = gv_stashsv(ST(0), TRUE); ---- mod_perl-2.0.3/xs/tables/current/ModPerl/FunctionTable.pm.perl510attrs -+++ mod_perl-2.0.3/xs/tables/current/ModPerl/FunctionTable.pm -@@ -1239,6 +1239,20 @@ $ModPerl::FunctionTable = [ - ] - }, - { -+ 'return_type' => 'U16 *', -+ 'name' => 'modperl_code_attrs', -+ 'args' => [ -+ { -+ 'type' => 'PerlInterpreter *', -+ 'name' => 'my_perl' -+ }, -+ { -+ 'type' => 'CV *', -+ 'name' => 'cv' -+ } -+ ] -+ }, -+ { - 'return_type' => 'int', - 'name' => 'modperl_config_apply_PerlModule', - 'args' => [ diff --git a/mod_perl-2.0.3.tar.gz.asc b/mod_perl-2.0.3.tar.gz.asc deleted file mode 100644 index 9fbfbdf..0000000 --- a/mod_perl-2.0.3.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (FreeBSD) - -iD8DBQBFbUT/EySbT+yIoL8RAgnFAJ9pMHym4BXIPNb5ebC/twQhsYb1PwCglj8g -LI7C5qsEv1uIkeuBHUS7xXI= -=GOlZ ------END PGP SIGNATURE----- diff --git a/mod_perl-2.0.4.tar.gz.asc b/mod_perl-2.0.4.tar.gz.asc new file mode 100644 index 0000000..a4651cc --- /dev/null +++ b/mod_perl-2.0.4.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.7 (Darwin) + +iD8DBQBIBu6gyzKhB4jDpaURAiksAJ0WQqfPU+yVCfMin0D9QMb2YwpzlgCdF2oC +51V0W6BUT15CRrHgPn79LDc= +=9ONw +-----END PGP SIGNATURE----- diff --git a/mod_perl.spec b/mod_perl.spec index e679d78..75ffb94 100644 --- a/mod_perl.spec +++ b/mod_perl.spec @@ -1,8 +1,8 @@ %define contentdir /var/www Name: mod_perl -Version: 2.0.3 -Release: 21 +Version: 2.0.4 +Release: 2 Summary: An embedded Perl interpreter for the Apache HTTP Server Group: System Environment/Daemons @@ -13,8 +13,6 @@ Source1: perl.conf Source2: filter-requires.sh Source3: filter-provides.sh Patch0: mod_perl-2.0.2-multilib.patch -Patch1: mod_perl-2.0.3-perl510.patch -Patch2: mod_perl-2.0.3-perl510attrs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl-devel, perl(ExtUtils::Embed) @@ -51,8 +49,6 @@ modules that use mod_perl. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p1 -b .perl510 -%patch2 -p1 -b .perl510attrs %build CFLAGS="$RPM_OPT_FLAGS -fpic" %{__perl} Makefile.PL 2.0.4-2 +- update to 2.0.4 + * Wed Feb 27 2008 Tom "spot" Callaway - 2.0.3-21 - Rebuild for perl 5.10 (again) diff --git a/sources b/sources index 0b5fbd3..a1b0597 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b40e2adf67c6be15a0041af1c67b6997 mod_perl-2.0.3.tar.gz +1a05625ae6843085f985f5da8214502a mod_perl-2.0.4.tar.gz diff --git a/upstream b/upstream index 53d0aaa..c091c86 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -mod_perl-2.0.3.tar.gz +mod_perl-2.0.4.tar.gz