diff options
author | joerg <joerg> | 2014-06-10 15:22:13 +0000 |
---|---|---|
committer | joerg <joerg> | 2014-06-10 15:22:13 +0000 |
commit | d252df15920716b2e1ad9b0f2f8fa07abff4b119 (patch) | |
tree | 2feb1f410c493c9e7cc492d5a0165cd0c95d68b8 /www/ap-perl | |
parent | 517c8f9dc06aef2a8153a319046527e7278e944a (diff) | |
download | pkgsrc-d252df15920716b2e1ad9b0f2f8fa07abff4b119.tar.gz |
Retire Apache 1.3 and 2.0.
Diffstat (limited to 'www/ap-perl')
-rw-r--r-- | www/ap-perl/DESCR | 10 | ||||
-rw-r--r-- | www/ap-perl/MESSAGE | 19 | ||||
-rw-r--r-- | www/ap-perl/Makefile | 40 | ||||
-rw-r--r-- | www/ap-perl/PLIST | 3 | ||||
-rw-r--r-- | www/ap-perl/buildlink3.mk | 21 | ||||
-rw-r--r-- | www/ap-perl/distinfo | 12 | ||||
-rw-r--r-- | www/ap-perl/patches/patch-Symbol_Symbol.xs | 15 | ||||
-rw-r--r-- | www/ap-perl/patches/patch-aa | 14 | ||||
-rw-r--r-- | www/ap-perl/patches/patch-ab | 43 | ||||
-rw-r--r-- | www/ap-perl/patches/patch-src_modules_perl_Log.xs | 15 | ||||
-rw-r--r-- | www/ap-perl/patches/patch-src_modules_perl_mod__perl.c | 15 | ||||
-rw-r--r-- | www/ap-perl/patches/patch-src_modules_perl_perl__config.c | 15 | ||||
-rw-r--r-- | www/ap-perl/patches/patch-src_modules_perl_perl__util.c | 23 |
13 files changed, 0 insertions, 245 deletions
diff --git a/www/ap-perl/DESCR b/www/ap-perl/DESCR deleted file mode 100644 index 00e074d618f..00000000000 --- a/www/ap-perl/DESCR +++ /dev/null @@ -1,10 +0,0 @@ -The Apache/Perl integration project brings together the full power of the -Perl programming language and the Apache HTTP server. This is achieved by -linking the Perl runtime library into the server and providing an object -oriented Perl interface to the server's C language API. - -These pieces are seamlessly glued together by the `mod_perl' server -plugin, making it is possible to write Apache modules entirely in Perl. -In addition, the persistent interpreter embedded in the server avoids the -overhead of starting an external interpreter program and the additional -Perl start-up (compile) time. diff --git a/www/ap-perl/MESSAGE b/www/ap-perl/MESSAGE deleted file mode 100644 index 1899e560c5f..00000000000 --- a/www/ap-perl/MESSAGE +++ /dev/null @@ -1,19 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:44 wiz Exp $ - -In order to use this module in your Apache installation, you need to -add the following to your httpd.conf file: - - LoadModule perl_module lib/httpd/mod_perl.so - <Files ~ "\.pl$"> - PerlHandler Apache::Registry - PerlSendHeader On - SetHandler perl-script - Options +ExecCGI - </Files> - -If switching to/from a server with and without mod_perl enabled, you -should NOT use "apachectl restart" - instead, fully stop and then start -the server. This prevents problems with libperl spinning on the CPU. - -=========================================================================== diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile deleted file mode 100644 index c25a0153edd..00000000000 --- a/www/ap-perl/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# $NetBSD: Makefile,v 1.53 2014/05/29 23:37:55 wiz Exp $ -# - -DISTNAME= mod_perl-1.31 -PKGNAME= ap13-perl-1.31 -PKGREVISION= 3 -CATEGORIES= www perl5 -MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Apache/} \ - http://perl.apache.org/dist/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://perl.apache.org/ -COMMENT= Module that embeds a Perl interpreter into Apache -LICENSE= apache-1.1 - -CONFLICTS= ap-perl-[0-9]* -CONFLICTS+= ap2-perl-[0-9]* - -DEPENDS+= ${BUILDLINK_API_DEPENDS.apache}:../../www/apache -DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource - -APACHE_MODULE= YES -PERL5_PACKLIST= auto/mod_perl/.packlist - -MAKE_PARAMS+= USE_APXS=1 -MAKE_PARAMS+= WITH_APXS=${APXS} -MAKE_PARAMS+= EVERYTHING=1 - -INSTALLATION_DIRS+= lib/httpd share/httpd/htdocs/manual/mod - -.include "../../lang/perl5/module.mk" -.include "../../www/apache/buildlink3.mk" - -post-install: - ${INSTALL_LIB} ${WRKSRC}/apaci/libperl.so \ - ${DESTDIR}${PREFIX}/lib/httpd/mod_perl.so - ${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/mod_perl.html \ - ${DESTDIR}${PREFIX}/share/httpd/htdocs/manual/mod - -.include "../../mk/bsd.pkg.mk" diff --git a/www/ap-perl/PLIST b/www/ap-perl/PLIST deleted file mode 100644 index 5ca9d3a11f5..00000000000 --- a/www/ap-perl/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:15:49 zuntum Exp $ -lib/httpd/mod_perl.so -share/httpd/htdocs/manual/mod/mod_perl.html diff --git a/www/ap-perl/buildlink3.mk b/www/ap-perl/buildlink3.mk deleted file mode 100644 index 50ced084206..00000000000 --- a/www/ap-perl/buildlink3.mk +++ /dev/null @@ -1,21 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.15 2012/05/07 01:54:04 dholland Exp $ - -BUILDLINK_TREE+= ap13-perl - -.if !defined(AP_PERL_BUILDLINK3_MK) -AP_PERL_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.ap13-perl+= ap13-perl>=1.29 -BUILDLINK_ABI_DEPENDS.ap13-perl+= ap13-perl>=1.29 -BUILDLINK_PKGSRCDIR.ap13-perl?= ../../www/ap-perl - -BUILDLINK_FILES.ap13-perl+= lib/httpd/mod_perl.* -BUILDLINK_FILES.ap13-perl+= \ - ${PERL5_SUB_INSTALLVENDORARCH}/auto/Apache/include/* -BUILDLINK_FILES.ap13-perl+= \ - ${PERL5_SUB_INSTALLVENDORARCH}/auto/Apache/include/modules/perl/* - -.include "../../www/apache/buildlink3.mk" -.endif # AP_PERL_BUILDLINK3_MK - -BUILDLINK_TREE+= -ap13-perl diff --git a/www/ap-perl/distinfo b/www/ap-perl/distinfo deleted file mode 100644 index 68c5d03a68e..00000000000 --- a/www/ap-perl/distinfo +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: distinfo,v 1.16 2012/10/15 13:14:26 wiz Exp $ - -SHA1 (mod_perl-1.31.tar.gz) = 5f6eadf2b0fc24ed4376d7708226391baa14c73f -RMD160 (mod_perl-1.31.tar.gz) = 296bd5e95018c313bab84ae7b21ae9f64bd4a394 -Size (mod_perl-1.31.tar.gz) = 389960 bytes -SHA1 (patch-Symbol_Symbol.xs) = 7a8b29c987d439f8309656936cd0377263a719fd -SHA1 (patch-aa) = 85f4a3171f8a91eb9e77d4b2ed424ada970c377c -SHA1 (patch-ab) = 18b02747ae4b9ab17ce252cf003bf9fd7e4b2560 -SHA1 (patch-src_modules_perl_Log.xs) = 60c7473fac429a4aeeb60c8670dcdcb0f9cb80be -SHA1 (patch-src_modules_perl_mod__perl.c) = 3c2e82fb91d4a470e7f018a92b330eac4c7b0630 -SHA1 (patch-src_modules_perl_perl__config.c) = daa30ae219bce44c0763ec84f64cef79989651a4 -SHA1 (patch-src_modules_perl_perl__util.c) = 84d02d62c2dfc0b7765acd36fd3f69da92e92413 diff --git a/www/ap-perl/patches/patch-Symbol_Symbol.xs b/www/ap-perl/patches/patch-Symbol_Symbol.xs deleted file mode 100644 index cc3ad5fa9da..00000000000 --- a/www/ap-perl/patches/patch-Symbol_Symbol.xs +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Symbol_Symbol.xs,v 1.1 2011/09/21 14:59:32 obache Exp $ - -* fixes build with perl-5.14. - ---- Symbol/Symbol.xs.orig 2000-12-22 06:02:32.000000000 +0000 -+++ Symbol/Symbol.xs -@@ -30,7 +30,7 @@ static void undef(SV *ref) - has_proto = TRUE; - - cv_undef(cv); -- CvGV(cv) = gv; /* let user-undef'd sub keep its identity */ -+ CvGV_set(cv, gv); /* let user-undef'd sub keep its identity */ - if(has_proto) - SvPOK_on(cv); /* otherwise we get `Prototype mismatch:' */ - diff --git a/www/ap-perl/patches/patch-aa b/www/ap-perl/patches/patch-aa deleted file mode 100644 index 695b2e672b9..00000000000 --- a/www/ap-perl/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.9 2011/09/21 14:59:32 obache Exp $ - ---- apaci/Makefile.tmpl.orig 2008-02-26 08:43:35.000000000 +0000 -+++ apaci/Makefile.tmpl -@@ -94,7 +94,8 @@ distclean: clean - - # FOR STAND-ALONE BUILDING ONLY - install: -- $(APXS) -i -a -n perl libperl.$(LIBEXT) -+ #@cp libperl.so mod_perl.so -+ #$(APXS) -i -n perl libperl.$(LIBEXT) - - depend: - cp Makefile.tmpl Makefile.tmpl.bak \ diff --git a/www/ap-perl/patches/patch-ab b/www/ap-perl/patches/patch-ab deleted file mode 100644 index 2499de02126..00000000000 --- a/www/ap-perl/patches/patch-ab +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2001/11/23 10:52:24 martti Exp $ - ---- src/modules/perl/Connection.xs.orig Fri Sep 29 16:41:30 2000 -+++ src/modules/perl/Connection.xs Fri Nov 23 11:38:03 2001 -@@ -78,7 +78,11 @@ - RETVAL = newSVpv((char *)&conn->remote_addr, - sizeof conn->remote_addr); - if(sv_addr) { -+#ifdef APACHE6 -+ struct sockaddr_storage addr; -+#else - struct sockaddr_in addr; -+#endif - STRLEN sockaddrlen; - char * new_addr = SvPV(sv_addr,sockaddrlen); - if (sockaddrlen != sizeof(addr)) { -@@ -106,7 +110,26 @@ - #else - conn->remote_ip = pstrdup(conn->pool, (char *)SvPV(ST(1),na)); - #endif -+#ifdef APACHE6 -+ { -+ struct addrinfo hints, *res0; -+ int error; -+ -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_family = PF_UNSPEC; -+ hints.ai_flags = AI_NUMERICHOST; -+ error = getaddrinfo(conn->remote_ip, NULL, &hints, &res0); -+ if (!error) { -+ memcpy(&conn->remote_addr, res0->ai_addr, res0->ai_addrlen); -+ freeaddrinfo(res0); -+ } else { -+ croak("Bad ip address in remote_ip getaddrinfo failed %s", -+ gai_strerror(error)); -+ } -+ } -+#else - conn->remote_addr.sin_addr.s_addr = inet_addr(conn->remote_ip); -+#endif - } - - OUTPUT: diff --git a/www/ap-perl/patches/patch-src_modules_perl_Log.xs b/www/ap-perl/patches/patch-src_modules_perl_Log.xs deleted file mode 100644 index 4fd8d2fa5fe..00000000000 --- a/www/ap-perl/patches/patch-src_modules_perl_Log.xs +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_modules_perl_Log.xs,v 1.1 2011/09/21 14:59:32 obache Exp $ - -* fixes build with perl-5.14. - ---- src/modules/perl/Log.xs.orig 2001-01-25 07:43:05.000000000 +0000 -+++ src/modules/perl/Log.xs -@@ -10,7 +10,7 @@ - static void perl_cv_alias(char *to, char *from) - { - GV *gp = gv_fetchpv(to, TRUE, SVt_PVCV); -- GvCV(gp) = perl_get_cv(from, TRUE); -+ GvCV_set(gp, perl_get_cv(from, TRUE)); - } - - static void ApacheLog(int level, SV *sv, SV *msg) diff --git a/www/ap-perl/patches/patch-src_modules_perl_mod__perl.c b/www/ap-perl/patches/patch-src_modules_perl_mod__perl.c deleted file mode 100644 index 4352b68868d..00000000000 --- a/www/ap-perl/patches/patch-src_modules_perl_mod__perl.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_modules_perl_mod__perl.c,v 1.1 2011/09/21 14:59:32 obache Exp $ - -* fixes build with perl-5.14. - ---- src/modules/perl/mod_perl.c.orig 2008-11-20 18:12:31.000000000 +0000 -+++ src/modules/perl/mod_perl.c -@@ -785,7 +785,7 @@ void perl_startup (server_rec *s, pool * - /* *CORE::GLOBAL::exit = \&Apache::exit */ - if(gv_stashpv("CORE::GLOBAL", FALSE)) { - GV *exitgp = gv_fetchpv("CORE::GLOBAL::exit", TRUE, SVt_PVCV); -- GvCV(exitgp) = perl_get_cv("Apache::exit", TRUE); -+ GvCV_set(exitgp, perl_get_cv("Apache::exit", TRUE)); - GvIMPORTED_CV_on(exitgp); - } - diff --git a/www/ap-perl/patches/patch-src_modules_perl_perl__config.c b/www/ap-perl/patches/patch-src_modules_perl_perl__config.c deleted file mode 100644 index d51070384fa..00000000000 --- a/www/ap-perl/patches/patch-src_modules_perl_perl__config.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_modules_perl_perl__config.c,v 1.1 2011/09/21 14:59:32 obache Exp $ - -* fixes build with perl-5.14. - ---- src/modules/perl/perl_config.c.orig 2003-03-14 04:55:59.000000000 +0000 -+++ src/modules/perl/perl_config.c -@@ -1720,7 +1720,7 @@ void perl_clear_symtab(HV *symtab) - if((cv = GvCV((GV*)val)) && (GvSTASH((GV*)val) == GvSTASH(CvGV(cv)))) { - GV *gv = CvGV(cv); - cv_undef(cv); -- CvGV(cv) = gv; -+ CvGV_set(cv, gv); - GvCVGEN(gv) = 1; /* invalidate method cache */ - } - } diff --git a/www/ap-perl/patches/patch-src_modules_perl_perl__util.c b/www/ap-perl/patches/patch-src_modules_perl_perl__util.c deleted file mode 100644 index 4f267561d4d..00000000000 --- a/www/ap-perl/patches/patch-src_modules_perl_perl__util.c +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-src_modules_perl_perl__util.c,v 1.3 2012/10/15 13:14:26 wiz Exp $ - -Remove uid code; similar to changes done to mod_perl-2.x, see -https://rt.cpan.org/Public/Bug/Display.html?id=77129 - ---- src/modules/perl/perl_util.c.orig 2007-12-03 07:19:59.000000000 +0000 -+++ src/modules/perl/perl_util.c -@@ -669,15 +669,6 @@ void mod_perl_init_ids(void) /* $$, $>, - { - if(set_ids++) return; - sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), (I32)getpid()); --#ifndef WIN32 -- uid = (int)getuid(); -- euid = (int)geteuid(); -- gid = (int)getgid(); -- egid = (int)getegid(); -- MP_TRACE_g(fprintf(stderr, -- "perl_init_ids: uid=%d, euid=%d, gid=%d, egid=%d\n", -- uid, euid, gid, egid)); --#endif - } - - int perl_eval_ok(server_rec *s) |