unhook mod_perl, everything using it has been moved to ap2-mod_perl (mod_perl2)

2016-04-28 17:43:23 +00:00 · 2016-04-28 17:43:23 +00:00 · 47fd1b4cba
commit 47fd1b4cba
parent 1767ce0f10
12 changed files with 5 additions and 277 deletions
--- a/devel/quirks/Makefile
+++ b/devel/quirks/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.383 2016/04/28 16:29:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.384 2016/04/28 17:43:23 sthen Exp $

 COMMENT =	exceptions to pkg_add rules
 CATEGORIES =	devel databases
 DISTFILES =

 # API.rev
-PKGNAME =	quirks-2.228
+PKGNAME =	quirks-2.229
 PKG_ARCH =	*
 MAINTAINER =	Marc Espie <espie@openbsd.org>

--- a/devel/quirks/files/Quirks.pm
+++ b/devel/quirks/files/Quirks.pm
@ -1,7 +1,7 @@
 #! /usr/bin/perl

 # ex:ts=8 sw=4:
-# $OpenBSD: Quirks.pm,v 1.394 2016/04/28 16:29:29 sthen Exp $
+# $OpenBSD: Quirks.pm,v 1.395 2016/04/28 17:43:23 sthen Exp $
 #
 # Copyright (c) 2009 Marc Espie <espie@openbsd.org>
 #
@ -796,6 +796,7 @@ my $obsolete_reason = {
 	'p5-CGI-SpeedyCGI' => 6,
 	'p5-HTML-Embperl' => 6,
 	'p5-libapreq' => 6,
+	'mod_perl' => 6,
 };

 my @msg = (
--- a/www/Makefile
+++ b/www/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.778 2016/04/28 16:39:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.779 2016/04/28 17:43:23 sthen Exp $

     SUBDIR =
     SUBDIR += ajaxterm
@ -101,7 +101,6 @@
     SUBDIR += midori,gtk3
     SUBDIR += mimetex
     SUBDIR += minitube
-     SUBDIR += mod_perl
     SUBDIR += moinmoin
     SUBDIR += mollify
     SUBDIR += mongrel2
--- a/www/mod_perl/Makefile
+++ b/www/mod_perl/Makefile
@ -1,49 +0,0 @@
-# $OpenBSD: Makefile,v 1.45 2015/12/03 21:24:32 sthen Exp $
-
-COMMENT=	module that embeds a Perl interpreter into Apache
-
-DISTNAME=	mod_perl-1.32pre20130312
-REVISION=	3
-CATEGORIES=	www perl5
-
-# svn checkout; upstream is at http://perl.apache.org/dist/
-# or ${MASTER_SITE_PERL_CPAN:=Apache/} but is now mostly dead
-# for apache 1.x
-MASTER_SITES=	https://spacehopper.org/mirrors/
-
-HOMEPAGE=	http://perl.apache.org/
-
-MODULES=	apache-module
-
-MODAPACHE_NAME= perl
-MODAPACHE_LOCATION= ${WRKBUILD}/apaci
-MODAPACHE_FILE=	${MODAPACHE_LOCATION}/libperl.so
-
-# Apache
-PERMIT_PACKAGE_CDROM=	Yes
-
-WANTLIB=		c m perl util
-
-RUN_DEPENDS=		devel/p5-Devel-Symdump \
-			www/p5-libwww \
-			www/p5-HTML-Parser
-
-SUBST_VARS=	PKGNAME
-
-NO_TEST=	Yes
-
-CONFIGURE_STYLE= perl
-CONFIGURE_ARGS=	USE_APXS="1" EVERYTHING="1" WITH_APXS="${MODAPACHE_APXS}"
-
-INSTALL_TARGET=	pure_install doc_install
-
-post-build:
-	@${MODAPACHE_CREATE_ENABLE_SCRIPT}
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_perl
-	${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/* \
-		${PREFIX}/share/doc/mod_perl
-	${MODAPACHE_INSTALL}
-
-.include <bsd.port.mk>
--- a/www/mod_perl/distinfo
+++ b/www/mod_perl/distinfo
@ -1,2 +0,0 @@
-SHA256 (mod_perl-1.32pre20130312.tar.gz) = Tc2Zg4gmgXHjmd66dDT9uBMNFHXB9X3W0sD8QpeLO/A=
-SIZE (mod_perl-1.32pre20130312.tar.gz) = 390926
--- a/www/mod_perl/patches/patch-apaci_configure
+++ b/www/mod_perl/patches/patch-apaci_configure
@ -1,12 +0,0 @@
-$OpenBSD: patch-apaci_configure,v 1.1 2013/03/22 15:55:53 sthen Exp $
--- apaci/configure.orig	Wed Mar 20 21:28:50 2013
-+++ apaci/configure	Wed Mar 20 21:31:08 2013
-@@ -42,7 +42,7 @@ for my_dir in $PATH; do
-     if test -f "$my_dir/apxs"; then
-         if test -x "$my_dir/apxs"; then
-             my_apxs="$my_dir/apxs"
-            break 2
-+            break
-         fi
-     fi
- done
--- a/www/mod_perl/patches/patch-src_modules_perl_Connection_xs
+++ b/www/mod_perl/patches/patch-src_modules_perl_Connection_xs
@ -1,54 +0,0 @@
-$OpenBSD: patch-src_modules_perl_Connection_xs,v 1.2 2012/06/13 12:41:14 okan Exp $
--- src/modules/perl/Connection.xs.orig	Fri Mar 30 07:12:42 2007
-+++ src/modules/perl/Connection.xs	Wed Dec  5 17:41:08 2007
-@@ -23,8 +23,8 @@ BOOT: 
-   
- #  /* Who is the client? */
-   
-#  struct sockaddr_in local_addr; /* local address */
-#  struct sockaddr_in remote_addr;/* remote address */
-+#  struct sockaddr_storage local_addr; /* local address */
-+#  struct sockaddr_storage remote_addr;/* remote address */
- #  char *remote_ip;		/* Client's IP address */
- #  char *remote_host;		/* Client's DNS name, if known.
- #                                 * NULL if DNS hasn't been checked,
-@@ -78,7 +78,7 @@ remote_addr(conn, sv_addr=Nullsv)
-     RETVAL = newSVpv((char *)&conn->remote_addr,
-                       sizeof conn->remote_addr);
-     if(sv_addr) {
-        struct sockaddr_in addr; 
-+        struct sockaddr_storage addr; 
-         STRLEN sockaddrlen; 
-         char * new_addr = SvPV(sv_addr,sockaddrlen); 
-         if (sockaddrlen != sizeof(addr)) { 
-@@ -97,7 +97,9 @@ remote_ip(conn, ...)
- 
-     CODE:
-     RETVAL = conn->remote_ip;
- 
-+
-+    struct addrinfo rhints, *res, *res0;
-+    int error;
-     if(items > 1) {
- #ifdef SGI_BOOST
-         ap_cpystrn(conn->remote_ip, (char *)SvPV(ST(1),na),
-@@ -106,7 +108,18 @@ remote_ip(conn, ...)
- #else
-         conn->remote_ip = pstrdup(conn->pool, (char *)SvPV(ST(1),na));
- #endif
-        conn->remote_addr.sin_addr.s_addr = inet_addr(conn->remote_ip);
-+        memset(&rhints, 0, sizeof(rhints));
-+        rhints.ai_family = PF_UNSPEC;
-+        rhints.ai_socktype = SOCK_STREAM;
-+        error = getaddrinfo(conn->remote_ip, NULL, &rhints, &res0);
-+        if (!error) {
-+            memcpy(&conn->remote_addr, (const void *)res0->ai_addr,
-+                (size_t) res0->ai_addrlen);
-+            freeaddrinfo(res0);
-+        } else {
-+            croak("Bad IP address in remote_ip getaddrinfo failed %s",
-+                gai_strerror(error));
-+        }
-     }
- 
-     OUTPUT:
--- a/www/mod_perl/patches/patch-src_modules_perl_mod_perl_h
+++ b/www/mod_perl/patches/patch-src_modules_perl_mod_perl_h
@ -1,17 +0,0 @@
-$OpenBSD: patch-src_modules_perl_mod_perl_h,v 1.3 2014/11/19 01:39:33 sthen Exp $
--- src/modules/perl/mod_perl.h.orig	Mon Nov 17 09:17:49 2014
-+++ src/modules/perl/mod_perl.h	Mon Nov 17 09:18:00 2014
-@@ -186,11 +186,11 @@
- #endif
- 
- #ifndef ERRSV
-#define ERRSV GvSV(errgv) 
-+#define ERRSV GvSV(PL_errgv) 
- #endif
- 
- #ifndef ERRHV
-#define ERRHV GvHV(errgv)
-+#define ERRHV GvHV(PL_errgv)
- #endif
- 
- #ifndef AvFILLp
--- a/www/mod_perl/pkg/DESCR
+++ b/www/mod_perl/pkg/DESCR
@ -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.
--- a/www/mod_perl/pkg/MESSAGE
+++ b/www/mod_perl/pkg/MESSAGE
@ -1,8 +0,0 @@
-To finish the install of ${PKGNAME}, enable the module using the
-following command:
-
-  ${PREFIX}/sbin/${MODAPACHE_ENABLE}
-
-Then restart Apache:
-
-  /etc/rc.d/httpd restart
--- a/www/mod_perl/pkg/PLIST
+++ b/www/mod_perl/pkg/PLIST
@ -1,112 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.26 2014/11/19 01:39:33 sthen Exp $
-lib/${MODAPACHE_MODULE}
-@exec-update test ! -f ${MODAPACHE_FINAL} || cp -fp %D/%F ${MODAPACHE_FINAL}
-${P5ARCH}/Apache/
-${P5ARCH}/Apache.pm
-${P5ARCH}/Apache/Connection.pm
-${P5ARCH}/Apache/Constants/
-${P5ARCH}/Apache/Constants.pm
-${P5ARCH}/Apache/Constants/Exports.pm
-${P5ARCH}/Apache/Debug.pm
-${P5ARCH}/Apache/ExtUtils.pm
-${P5ARCH}/Apache/FakeRequest.pm
-${P5ARCH}/Apache/File.pm
-${P5ARCH}/Apache/Include.pm
-${P5ARCH}/Apache/Leak.pm
-${P5ARCH}/Apache/Log.pm
-${P5ARCH}/Apache/ModuleConfig.pm
-${P5ARCH}/Apache/MyConfig.pm
-${P5ARCH}/Apache/Opcode.pm
-${P5ARCH}/Apache/Options.pm
-${P5ARCH}/Apache/PerlRun.pm
-${P5ARCH}/Apache/PerlRunXS.pm
-${P5ARCH}/Apache/PerlSections.pm
-${P5ARCH}/Apache/RedirectLogFix.pm
-${P5ARCH}/Apache/Registry.pm
-${P5ARCH}/Apache/RegistryBB.pm
-${P5ARCH}/Apache/RegistryLoader.pm
-${P5ARCH}/Apache/RegistryNG.pm
-${P5ARCH}/Apache/Resource.pm
-${P5ARCH}/Apache/SIG.pm
-${P5ARCH}/Apache/Server.pm
-@comment ${P5ARCH}/Apache/SizeLimit.pm
-${P5ARCH}/Apache/StatINC.pm
-${P5ARCH}/Apache/Status.pm
-${P5ARCH}/Apache/Symbol.pm
-${P5ARCH}/Apache/Symdump.pm
-${P5ARCH}/Apache/Table.pm
-${P5ARCH}/Apache/URI.pm
-${P5ARCH}/Apache/Util.pm
-${P5ARCH}/Apache/fork.pm
-${P5ARCH}/Apache/httpd_conf.pm
-${P5ARCH}/Apache/src.pm
-${P5ARCH}/Apache/testold.pm
-${P5ARCH}/Bundle/
-${P5ARCH}/Bundle/Apache.pm
-${P5ARCH}/auto/Apache/
-${P5ARCH}/auto/Apache/Leak/
-${P5ARCH}/auto/Apache/Leak/Leak.so
-${P5ARCH}/auto/Apache/Symbol/
-${P5ARCH}/auto/Apache/Symbol/Symbol.so
-${P5ARCH}/auto/Apache/include/
-${P5ARCH}/auto/Apache/include/ap_config_auto.h
-${P5ARCH}/auto/Apache/include/modules/
-${P5ARCH}/auto/Apache/include/modules/perl/
-${P5ARCH}/auto/Apache/include/modules/perl/apache_inc.h
-${P5ARCH}/auto/Apache/include/modules/perl/mod_perl.h
-${P5ARCH}/auto/Apache/include/modules/perl/mod_perl_version.h
-${P5ARCH}/auto/Apache/include/modules/perl/mod_perl_xs.h
-${P5ARCH}/auto/Apache/include/modules/perl/perl_PL.h
-${P5ARCH}/auto/Apache/mod_perl.exp
-${P5ARCH}/auto/Apache/typemap
-${P5ARCH}/cgi_to_mod_perl.pod
-${P5ARCH}/mod_perl.pm
-${P5ARCH}/mod_perl.pod
-${P5ARCH}/mod_perl_cvs.pod
-${P5ARCH}/mod_perl_hooks.pm
-${P5ARCH}/mod_perl_hooks.pm.PL
-${P5ARCH}/mod_perl_method_handlers.pod
-${P5ARCH}/mod_perl_traps.pod
-${P5ARCH}/mod_perl_tuning.pod
-@man man/man3p/Apache.3p
-@man man/man3p/Apache::Constants.3p
-@man man/man3p/Apache::Debug.3p
-@man man/man3p/Apache::ExtUtils.3p
-@man man/man3p/Apache::FakeRequest.3p
-@man man/man3p/Apache::File.3p
-@man man/man3p/Apache::Include.3p
-@man man/man3p/Apache::Leak.3p
-@man man/man3p/Apache::Log.3p
-@man man/man3p/Apache::MyConfig.3p
-@man man/man3p/Apache::Options.3p
-@man man/man3p/Apache::PerlRun.3p
-@man man/man3p/Apache::PerlRunXS.3p
-@man man/man3p/Apache::PerlSections.3p
-@man man/man3p/Apache::RedirectLogFix.3p
-@man man/man3p/Apache::Registry.3p
-@man man/man3p/Apache::RegistryLoader.3p
-@man man/man3p/Apache::Resource.3p
-@man man/man3p/Apache::SIG.3p
-@comment @man man/man3p/Apache::SizeLimit.3p
-@man man/man3p/Apache::StatINC.3p
-@man man/man3p/Apache::Status.3p
-@man man/man3p/Apache::Symbol.3p
-@man man/man3p/Apache::Symdump.3p
-@man man/man3p/Apache::Table.3p
-@man man/man3p/Apache::URI.3p
-@man man/man3p/Apache::Util.3p
-@man man/man3p/Apache::fork.3p
-@man man/man3p/Apache::httpd_conf.3p
-@man man/man3p/Apache::src.3p
-@man man/man3p/Apache::testold.3p
-@man man/man3p/Bundle::Apache.3p
-@man man/man3p/cgi_to_mod_perl.3p
-@man man/man3p/mod_perl.3p
-@man man/man3p/mod_perl_cvs.3p
-@man man/man3p/mod_perl_method_handlers.3p
-@man man/man3p/mod_perl_traps.3p
-@man man/man3p/mod_perl_tuning.3p
-sbin/${MODAPACHE_ENABLE}
-share/doc/mod_perl/
-share/doc/mod_perl/mod_perl.html
-@unexec-delete rm -f ${MODAPACHE_FINAL}
--- a/www/mod_perl/pkg/UNMESSAGE
+++ b/www/mod_perl/pkg/UNMESSAGE
@ -1,8 +0,0 @@
-To completely deinstall this package you need to perform these steps as
-root:
-
-        edit /var/www/conf/httpd.conf
-        remove the line LoadModule perl_module
-
-Do not do this if you plan on re-installing this package at some future
-time.