diff options
author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-07-27 10:31:55 +0100 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-07-30 08:28:31 +0700 |
commit | 5afe071b987c6706a2a9bf532e9d6f396cea3b95 (patch) | |
tree | 34c9558b0e17309859831f73cafd4678988ebd61 /perl/mod_perl | |
parent | 39178a6774cb91198018925efa533a7a9107cd3d (diff) |
perl/mod_perl: Added (Perl Interpreter for Apache).
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'perl/mod_perl')
-rw-r--r-- | perl/mod_perl/README | 7 | ||||
-rw-r--r-- | perl/mod_perl/doinst.sh | 5 | ||||
-rw-r--r-- | perl/mod_perl/mod_perl.SlackBuild | 107 | ||||
-rw-r--r-- | perl/mod_perl/mod_perl.conf | 31 | ||||
-rw-r--r-- | perl/mod_perl/mod_perl.info | 10 | ||||
-rw-r--r-- | perl/mod_perl/perl_522.patch | 295 | ||||
-rw-r--r-- | perl/mod_perl/slack-desc | 19 | ||||
-rw-r--r-- | perl/mod_perl/undefined_symbol.patch | 11 |
8 files changed, 485 insertions, 0 deletions
diff --git a/perl/mod_perl/README b/perl/mod_perl/README new file mode 100644 index 0000000000000..d3449bdbdcf1d --- /dev/null +++ b/perl/mod_perl/README @@ -0,0 +1,7 @@ +Mod_perl incorporates a Perl interpreter into the Apache web server +so that the Apache web server can directly execute Perl code. + +Mod_perl links the Perl runtime library into the Apache web server +and provides an object-oriented Perl interface for Apache's C +language API. The end result is a quicker CGI script turnaround +process, since no external Perl interpreter has to be started. diff --git a/perl/mod_perl/doinst.sh b/perl/mod_perl/doinst.sh new file mode 100644 index 0000000000000..1133274bea838 --- /dev/null +++ b/perl/mod_perl/doinst.sh @@ -0,0 +1,5 @@ +if [ ! -r etc/httpd/extra/mod_perl.conf ]; then + cat etc/httpd/extra/mod_perl.conf.example > etc/httpd/extra/mod_perl.conf +elif [ "$(cat etc/httpd/extra/mod_perl.conf 2> /dev/null)" = "" ]; then + cat etc/httpd/extra/mod_perl.conf.example > etc/httpd/extra/mod_perl.conf +fi diff --git a/perl/mod_perl/mod_perl.SlackBuild b/perl/mod_perl/mod_perl.SlackBuild new file mode 100644 index 0000000000000..cb5622d4269e0 --- /dev/null +++ b/perl/mod_perl/mod_perl.SlackBuild @@ -0,0 +1,107 @@ +#!/bin/sh + +# Slackware build script for mod_perl + +# Copyright 2007-2012 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2016 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=mod_perl +VERSION=${VERSION:-2.0.9} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Thanks to ARCH Linux +patch -p1 < $CWD/undefined_symbol.patch +patch -p1 < $CWD/perl_522.patch + +perl \ + Makefile.PL \ + MP_APXS=/usr/bin/apxs \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN1DIR=/usr/man/man1 \ + INSTALLVENDORMAN3DIR=/usr/man/man3 + +make +make install DESTDIR=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/srv/httpd/htdocs/perl/ + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/etc/httpd/extra +sed "s%@baselibdir@%lib${LIBDIRSUFFIX}%g" $CWD/mod_perl.conf > $PKG/etc/httpd/extra/mod_perl.conf.example + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Changes INSTALL LICENSE README* RELEASE STATUS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/perl/mod_perl/mod_perl.conf b/perl/mod_perl/mod_perl.conf new file mode 100644 index 0000000000000..0ececcc1b0f59 --- /dev/null +++ b/perl/mod_perl/mod_perl.conf @@ -0,0 +1,31 @@ +# +# mod_perl - Perl Interpreter for Apache2 +# + +# Load the Perl module: +LoadModule perl_module @baselibdir@/httpd/modules/mod_perl.so + +# Define the files mod-perl's responsible for +AddHandler perl-script pl + +# Set this if you want perl-scripts to be +# executed from only one directory +#Alias /perl/ /srv/httpd/htdocs/perl/ +#<Location /perl/> +# SetHandler perl-script +# PerlResponseHandler ModPerl::Registry +# PerlOptions +ParseHeaders +# Options +ExecCGI +# Require all granted +#</Location> + +# Set this if you want perl-scripts to be +# executed from everywhere in the htdocs directory +# (default) +<Files *.pl> + # mod_perl mode + SetHandler perl-script + PerlResponseHandler ModPerl::Registry + PerlOptions +ParseHeaders + Options +ExecCGI +</Files> diff --git a/perl/mod_perl/mod_perl.info b/perl/mod_perl/mod_perl.info new file mode 100644 index 0000000000000..9fc29c7c58a48 --- /dev/null +++ b/perl/mod_perl/mod_perl.info @@ -0,0 +1,10 @@ +PRGNAM="mod_perl" +VERSION="2.0.9" +HOMEPAGE="https://perl.apache.org/" +DOWNLOAD="http://apache.org/dist/perl/mod_perl-2.0.9.tar.gz" +MD5SUM="fdab9a145bf35f54fce997c96c76f8e2" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackbuilds.org" diff --git a/perl/mod_perl/perl_522.patch b/perl/mod_perl/perl_522.patch new file mode 100644 index 0000000000000..4e6261efabaa1 --- /dev/null +++ b/perl/mod_perl/perl_522.patch @@ -0,0 +1,295 @@ +From 82827132efd3c2e25cc413c85af61bb63375da6e Mon Sep 17 00:00:00 2001 +From: Steve Hay <stevehay@apache.org> +Date: Tue, 1 Dec 2015 17:39:43 +0000 +Subject: [PATCH] Add support for Perl 5.22.x. + +As outlined by Leon Timmermans in [perl #123687]: + + lookup %ENV's magic, and then replace the pointer to PL_vtbl_env with + a pointer to MP_vtbl_env. You may have to add some svt_copy magic to + make it cast MP_vtbl_envelem instead of PL_vtbl_envelem on the elements. + +with an added svt_local for the 'local %ENV' tests. + +While at it, augment t/modperl/env.t to check that deleting %ENV elements really removes them from subprocess_env. This highlights the need for modifying their vtable, currently in the modperl_envelem_tie() macro. + +(MP_vtbl_envelem probably shouldn't be a global variable, but the modperl_envelem_tie() macro needs it, and the perl vtables are global too anyway. I've made MP_vtbl_env global too for symmetry.) + +Based on ++Niko Tyni's 0001-Steps-at-Perl-5.22-compatibility-take-3.patch in [rt.cpan.org #101962]. + +Bug: https://rt.cpan.org/Public/Bug/Display.html?id=101962 +Bug: https://rt.perl.org/Ticket/Display.html?id=123687 + + +git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/trunk@1717474 13f79535-47bb-0310-9956-ffa450edef68 +--- + Changes | 2 + + src/modules/perl/mod_perl.c | 7 +-- + src/modules/perl/modperl_env.c | 102 ++++++++++++++++++++++++++++++++-------- + src/modules/perl/modperl_env.h | 9 ++-- + src/modules/perl/modperl_perl.c | 2 + + t/response/TestModperl/env.pm | 4 +- + 6 files changed, 97 insertions(+), 29 deletions(-) + +diff --git a/Changes b/Changes +index 8f15756..fdade41 100644 +--- a/Changes ++++ b/Changes +@@ -12,6 +12,8 @@ Also refer to the Apache::Test changes log file, at Apache-Test/Changes + + =item 2.0.10-dev + ++Add support for Perl 5.22.x. [Niko Tyni <ntyni@iki.fi>, Steve Hay] ++ + =item 2.0.9 June 18, 2015 + + Add note to README about MP_INLINE problem when building with GCC 5. +diff --git a/src/modules/perl/mod_perl.c b/src/modules/perl/mod_perl.c +index 1148bc0..1e17747 100644 +--- a/src/modules/perl/mod_perl.c ++++ b/src/modules/perl/mod_perl.c +@@ -262,6 +262,8 @@ PerlInterpreter *modperl_startup(server_rec *s, apr_pool_t *p) + exit(1); + } + ++ modperl_env_init(aTHX); ++ + /* suspend END blocks to be run at server shutdown */ + endav = PL_endav; + PL_endav = (AV *)NULL; +@@ -576,9 +578,6 @@ static apr_status_t modperl_sys_init(void) + /* modifies PL_ppaddr */ + modperl_perl_pp_set_all(); + +- /* modifies PL_vtbl_env{elem} */ +- modperl_env_init(); +- + return APR_SUCCESS; + } + +@@ -597,8 +596,6 @@ static apr_status_t modperl_sys_term(void *data) + + MP_TRACE_i(MP_FUNC, "mod_perl sys term"); + +- modperl_env_unload(); +- + modperl_perl_pp_unset_all(); + + PERL_SYS_TERM(); +diff --git a/src/modules/perl/modperl_env.c b/src/modules/perl/modperl_env.c +index c1a276b..874652f 100644 +--- a/src/modules/perl/modperl_env.c ++++ b/src/modules/perl/modperl_env.c +@@ -121,6 +121,7 @@ static void modperl_env_table_populate(pTHX_ apr_table_t *table) + const apr_array_header_t *array; + apr_table_entry_t *elts; + ++ modperl_env_init(aTHX); + modperl_env_untie(mg_flags); + + array = apr_table_elts(table); +@@ -431,14 +432,10 @@ void modperl_env_request_untie(pTHX_ request_rec *r) + #endif + } + +-/* to store the original virtual tables +- * these are global, not per-interpreter ++/* handy access to perl's original virtual tables + */ +-static MGVTBL MP_PERL_vtbl_env; +-static MGVTBL MP_PERL_vtbl_envelem; +- + #define MP_PL_vtbl_call(name, meth) \ +- MP_PERL_vtbl_##name.svt_##meth(aTHX_ sv, mg) ++ PL_vtbl_##name.svt_##meth(aTHX_ sv, mg) + + #define MP_dENV_KEY \ + STRLEN klen; \ +@@ -529,6 +526,26 @@ static int modperl_env_magic_clear_all(pTHX_ SV *sv, MAGIC *mg) + return 0; + } + ++static int modperl_env_magic_copy(pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen) ++{ ++ MP_TRACE_e(MP_FUNC, "setting up %%ENV element magic"); ++ sv_magicext(nsv, mg->mg_obj, toLOWER(mg->mg_type), &MP_vtbl_envelem, name, namlen); ++ ++ return 1; ++} ++ ++static int modperl_env_magic_local_all(pTHX_ SV *nsv, MAGIC *mg) ++{ ++ MAGIC *nmg; ++ MP_TRACE_e(MP_FUNC, "localizing %%ENV"); ++ nmg = sv_magicext(nsv, mg->mg_obj, mg->mg_type, &MP_vtbl_env, (char*)NULL, 0); ++ nmg->mg_ptr = mg->mg_ptr; ++ nmg->mg_flags |= MGf_COPY; ++ nmg->mg_flags |= MGf_LOCAL; ++ ++ return 1; ++} ++ + static int modperl_env_magic_set(pTHX_ SV *sv, MAGIC *mg) + { + request_rec *r = (request_rec *)EnvMgObj; +@@ -613,15 +630,18 @@ static int modperl_env_magic_get(pTHX_ SV *sv, MAGIC *mg) + #endif + + /* override %ENV virtual tables with our own */ +-static MGVTBL MP_vtbl_env = { ++MGVTBL MP_vtbl_env = { + 0, + modperl_env_magic_set_all, + 0, + modperl_env_magic_clear_all, +- 0 ++ 0, ++ modperl_env_magic_copy, ++ 0, ++ modperl_env_magic_local_all + }; + +-static MGVTBL MP_vtbl_envelem = { ++MGVTBL MP_vtbl_envelem = { + 0, + modperl_env_magic_set, + 0, +@@ -629,22 +649,64 @@ static MGVTBL MP_vtbl_envelem = { + 0 + }; + +-void modperl_env_init(void) ++void modperl_env_init(pTHX) + { +- /* save originals */ +- StructCopy(&PL_vtbl_env, &MP_PERL_vtbl_env, MGVTBL); +- StructCopy(&PL_vtbl_envelem, &MP_PERL_vtbl_envelem, MGVTBL); ++ MAGIC *mg; + +- /* replace with our versions */ +- StructCopy(&MP_vtbl_env, &PL_vtbl_env, MGVTBL); +- StructCopy(&MP_vtbl_envelem, &PL_vtbl_envelem, MGVTBL); ++ /* Find the 'E' magic on %ENV */ ++ if (!my_perl) ++ return; ++ if (!PL_envgv) ++ return; ++ if (!SvRMAGICAL(ENVHV)) ++ return; ++ mg = mg_find((const SV *)ENVHV, PERL_MAGIC_env); ++ if (!mg) ++ return; ++ ++ /* Ignore it if it isn't perl's original version */ ++ if (mg->mg_virtual != &PL_vtbl_env) ++ return; ++ ++ MP_TRACE_e(MP_FUNC, "env_init - ptr: %x obj: %x flags: %x", ++ mg->mg_ptr, mg->mg_obj, mg->mg_flags); ++ ++ /* Remove it */ ++ mg_free_type((SV*)ENVHV, PERL_MAGIC_env); ++ ++ /* Add our version instead */ ++ mg = sv_magicext((SV*)ENVHV, (SV*)NULL, PERL_MAGIC_env, &MP_vtbl_env, (char*)NULL, 0); ++ mg->mg_flags |= MGf_COPY; ++ mg->mg_flags |= MGf_LOCAL; + } + +-void modperl_env_unload(void) ++void modperl_env_unload(pTHX) + { +- /* restore originals */ +- StructCopy(&MP_PERL_vtbl_env, &PL_vtbl_env, MGVTBL); +- StructCopy(&MP_PERL_vtbl_envelem, &PL_vtbl_envelem, MGVTBL); ++ MAGIC *mg; ++ ++ /* Find the 'E' magic on %ENV */ ++ if (!my_perl) ++ return; ++ if (!PL_envgv) ++ return; ++ if (!SvRMAGICAL(ENVHV)) ++ return; ++ mg = mg_find((const SV *)ENVHV, PERL_MAGIC_env); ++ if (!mg) ++ return; ++ ++ /* Ignore it if it isn't our version */ ++ if (mg->mg_virtual != &MP_vtbl_env) ++ return; ++ ++ MP_TRACE_e(MP_FUNC, "env_unload - ptr: %x obj: %x flags: %x", ++ mg->mg_ptr, mg->mg_obj, mg->mg_flags); ++ ++ /* Remove it */ ++ mg_free_type((SV*)ENVHV, PERL_MAGIC_env); ++ ++ /* Restore perl's original version */ ++ sv_magicext((SV*)ENVHV, (SV*)NULL, PERL_MAGIC_env, &PL_vtbl_env, (char*)NULL, 0); + } + + /* +diff --git a/src/modules/perl/modperl_env.h b/src/modules/perl/modperl_env.h +index 406e345..cb2f060 100644 +--- a/src/modules/perl/modperl_env.h ++++ b/src/modules/perl/modperl_env.h +@@ -28,7 +28,7 @@ + MP_magical_tie(ENVHV, mg_flags) + + #define modperl_envelem_tie(sv, key, klen) \ +- sv_magic(sv, (SV *)NULL, 'e', key, klen) ++ sv_magicext(sv, (SV *)NULL, PERL_MAGIC_envelem, &MP_vtbl_envelem, key, klen) + + void modperl_env_hash_keys(pTHX); + +@@ -58,9 +58,12 @@ void modperl_env_request_tie(pTHX_ request_rec *r); + + void modperl_env_request_untie(pTHX_ request_rec *r); + +-void modperl_env_init(void); ++void modperl_env_init(pTHX); + +-void modperl_env_unload(void); ++void modperl_env_unload(pTHX); ++ ++MGVTBL MP_vtbl_env; ++MGVTBL MP_vtbl_envelem; + + #endif /* MODPERL_ENV_H */ + +diff --git a/src/modules/perl/modperl_perl.c b/src/modules/perl/modperl_perl.c +index dfe4d36..bda988c 100644 +--- a/src/modules/perl/modperl_perl.c ++++ b/src/modules/perl/modperl_perl.c +@@ -181,6 +181,8 @@ void modperl_perl_destruct(PerlInterpreter *perl) + } + } + ++ modperl_env_unload(perl); ++ + perl_destruct(perl); + + /* XXX: big bug in 5.6.1 fixed in 5.7.2+ +diff --git a/t/response/TestModperl/env.pm b/t/response/TestModperl/env.pm +index 62eac81..ac057a9 100644 +--- a/t/response/TestModperl/env.pm ++++ b/t/response/TestModperl/env.pm +@@ -15,7 +15,7 @@ use Apache2::Const -compile => 'OK'; + sub handler { + my $r = shift; + +- plan $r, tests => 23 + keys(%ENV); ++ plan $r, tests => 23 + 3 * keys(%ENV); + + my $env = $r->subprocess_env; + +@@ -75,6 +75,8 @@ sub handler { + for my $key (sort keys %ENV) { + eval { delete $ENV{$key}; }; + ok t_cmp($@, '', $key); ++ ok t_cmp($ENV{$key}, undef, "ENV{$key} is empty"); ++ ok t_cmp($env->get($key), undef, "subprocess_env($key) is empty"); + } + + Apache2::Const::OK; diff --git a/perl/mod_perl/slack-desc b/perl/mod_perl/slack-desc new file mode 100644 index 0000000000000..a2950b8008a9c --- /dev/null +++ b/perl/mod_perl/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +mod_perl: mod_perl (Perl Interpreter for Apache) +mod_perl: +mod_perl: Mod_perl incorporates a Perl interpreter into the Apache web server +mod_perl: so that the Apache web server can directly execute Perl code. +mod_perl: Mod_perl links the Perl runtime library into the Apache web server +mod_perl: and provides an object-oriented Perl interface for Apache's C +mod_perl: language API. The end result is a quicker CGI script turnaround +mod_perl: process, since no external Perl interpreter has to be started. +mod_perl: +mod_perl: Homepage: https://perl.apache.org/ +mod_perl: diff --git a/perl/mod_perl/undefined_symbol.patch b/perl/mod_perl/undefined_symbol.patch new file mode 100644 index 0000000000000..b49af7730ea71 --- /dev/null +++ b/perl/mod_perl/undefined_symbol.patch @@ -0,0 +1,11 @@ +--- mod_perl-2.0.4/src/modules/perl/modperl_common_util.h.inline ++++ mod_perl-2.0.4/src/modules/perl/modperl_common_util.h +@@ -22,7 +22,7 @@ + #ifdef MP_DEBUG + #define MP_INLINE + #else +-#define MP_INLINE APR_INLINE ++#define MP_INLINE + #endif + + #ifdef CYGWIN |