diff options
author | bad <bad> | 1999-12-01 01:00:17 +0000 |
---|---|---|
committer | bad <bad> | 1999-12-01 01:00:17 +0000 |
commit | 3116c8445dde7ea1a187d8983a74b68093679223 (patch) | |
tree | fae50a015581d5e420d550c9d4c59a105d73841a /www | |
parent | 0023fb6476306da5a8b7d1876a7ecf178bfa6b15 (diff) | |
download | pkgsrc-3116c8445dde7ea1a187d8983a74b68093679223.tar.gz |
Update to mod_ssl-2.3.8-1.3.9 so that this works again with the updated
Apache server and OpenSSl-0.9.4.
Makefile: Take advantage of the working configure script.
patches/patch-aa: replace this with a gross hack that finds the libssl
shared library with our current version of the OpenSSL pkg.
Diffstat (limited to 'www')
-rw-r--r-- | www/ap-ssl/Makefile | 37 | ||||
-rw-r--r-- | www/ap-ssl/files/md5 | 4 | ||||
-rw-r--r-- | www/ap-ssl/patches/patch-aa | 24 | ||||
-rw-r--r-- | www/ap-ssl/pkg/PLIST | 31 |
4 files changed, 48 insertions, 48 deletions
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index 194e5828af5..e7379a6cb53 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,20 +1,22 @@ -# $NetBSD: Makefile,v 1.9 1999/07/23 18:20:04 itojun Exp $ +# $NetBSD: Makefile,v 1.10 1999/12/01 01:00:17 bad Exp $ # -DISTNAME= mod_ssl-2.2.8-1.3.6 -PKGNAME= ap-ssl-2.2.8 +DISTNAME= mod_ssl-2.4.8-1.3.9 +PKGNAME= ap-ssl-2.4.8 CATEGORIES= www MASTER_SITES= ftp://ftp.modssl.org/source/ MAINTAINER= tv@netbsd.org HOMEPAGE= http://www.modssl.org/ -DEPENDS= openssl-0.9.2b:../../security/openssl \ - apache-1.3.6p0:../../www/apache +DEPENDS= openssl-0.9.4:../../security/openssl \ + apache-1.3.9p0:../../www/apache # For "apxs": BUILD_DEPENDS= ${LOCALBASE}/bin/perl:../../lang/perl5 -CONFLICTS= apache-1.3.[012] apache-*modssl-* apache6-* +CONFLICTS= apache-1.3.[012345678] apache-*modssl-* apache6-* + +HAS_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" @@ -29,31 +31,22 @@ fetch-depends: @${FALSE} .endif -LDFLAGS+= -L${PREFIX}/lib -lcrypto -lssl -CPPFLAGS+= -I${PREFIX}/include/openssl +CONFIGURE_ARGS+= --with-apxs=${PREFIX}/sbin/apxs --with-ssl=${PREFIX} .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES -LDFLAGS+= -lrsaref +CONFIUGRE_ARGS+= --with-rsa=${PREFIX} .endif -# Since we don't have the Apache source tree to work with, we have to pretend -# to get all the appropriate config information and compile with apxs. -do-build: - @cd ${WRKSRC}/pkg.sslmod && ${PREFIX}/sbin/apxs -c -o mod_ssl.so \ - ${CPPFLAGS} -DSSL_COMPAT -DMOD_SSL_VERSION=\\\"2.2.8\\\" \ - -DSSL_PRODUCT_NAME=\\\"mod_ssl\\\" \ - -DSSL_PRODUCT_VERSION=\\\"2.2.8\\\" *.c - cd ${WRKSRC}/pkg.sslsup && ${LINK.c} -o ca-fix ca-fix.c - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/pkg.sslsup/ca-fix ${PREFIX}/bin/ - @cd ${WRKSRC}/pkg.sslmod && ${PREFIX}/sbin/apxs -i mod_ssl.so +post-install: + @${MV} ${PREFIX}/lib/httpd/libssl.so ${PREFIX}/lib/httpd/mod_ssl.so ${INSTALL_DATA_DIR} ${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl cd ${WRKSRC}/pkg.ssldoc && \ ${INSTALL_DATA} *.html *.gif *.jpg ${PREFIX}/share/httpd/htdocs/manual/mod/mod_ssl/ ${INSTALL_DATA_DIR} ${PREFIX}/share/mod_ssl cd ${WRKSRC}/pkg.contrib && \ ${INSTALL_SCRIPT} *.sh *.cgi ${PREFIX}/share/mod_ssl/ - ${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/Makefile ${WRKSRC}/pkg.sslcfg/README.CRT \ + ${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.CRL \ + ${WRKSRC}/pkg.sslcfg/*.crl ${PREFIX}/etc/httpd/ssl.crl/ + ${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.CRT \ ${WRKSRC}/pkg.sslcfg/*.crt ${PREFIX}/etc/httpd/ssl.crt/ ${INSTALL_DATA} ${WRKSRC}/pkg.sslcfg/README.CSR \ ${WRKSRC}/pkg.sslcfg/*.csr ${PREFIX}/etc/httpd/ssl.csr/ diff --git a/www/ap-ssl/files/md5 b/www/ap-ssl/files/md5 index 96c0ff30892..a2638c546b3 100644 --- a/www/ap-ssl/files/md5 +++ b/www/ap-ssl/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 1999/04/30 17:05:21 tv Exp $ +$NetBSD: md5,v 1.4 1999/12/01 01:00:18 bad Exp $ -MD5 (mod_ssl-2.2.8-1.3.6.tar.gz) = 0aaf0ff78d38cc53ad10fe73cc42a0f5 +MD5 (mod_ssl-2.4.8-1.3.9.tar.gz) = f764b961220b8c067e88ae3abc717785 diff --git a/www/ap-ssl/patches/patch-aa b/www/ap-ssl/patches/patch-aa index 4e4baf2a190..0dc625b1b67 100644 --- a/www/ap-ssl/patches/patch-aa +++ b/www/ap-ssl/patches/patch-aa @@ -1,12 +1,14 @@ -$NetBSD: patch-aa,v 1.1.1.1 1998/12/03 17:22:02 tv Exp $ +$NetBSD: patch-aa,v 1.2 1999/12/01 01:00:18 bad Exp $ ---- pkg.sslsup/ca-fix.c.orig Thu Dec 3 11:40:55 1998 -+++ pkg.sslsup/ca-fix.c Thu Dec 3 11:41:27 1998 -@@ -20,6 +20,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include <ctype.h> - #include <bio.h> - #include <objects.h> +# make sure configure finds the ssl library. +--- pkg.sslmod/libssl.module.orig Thu Sep 30 14:24:27 1999 ++++ pkg.sslmod/libssl.module Tue Nov 30 19:35:43 1999 +@@ -382,7 +382,7 @@ + if [ -f "$SSL_BASE/libssl.a" ]; then + SSL_LIBDIR='$(SSL_BASE)' + my_real_ssl_libdir="$SSL_BASE" +- elif [ -f "$SSL_BASE/lib/libssl.a" ]; then ++ elif [ -f "$SSL_BASE/lib/libssl.so.1.0" ]; then + SSL_LIBDIR='$(SSL_BASE)/lib' + my_real_ssl_libdir="$SSL_BASE/lib" + else diff --git a/www/ap-ssl/pkg/PLIST b/www/ap-ssl/pkg/PLIST index 5ba47328de8..80dcf052f5c 100644 --- a/www/ap-ssl/pkg/PLIST +++ b/www/ap-ssl/pkg/PLIST @@ -1,26 +1,36 @@ -@comment $NetBSD: PLIST,v 1.2 1999/04/30 17:05:22 tv Exp $ -bin/ca-fix -etc/httpd/ssl.crt/Makefile +@comment $NetBSD: PLIST,v 1.3 1999/12/01 01:00:18 bad Exp $ +etc/httpd/ssl.crl/Makefile.crl +etc/httpd/ssl.crl/README.CRL +etc/httpd/ssl.crt/Makefile.crt etc/httpd/ssl.crt/README.CRT etc/httpd/ssl.crt/ca-bundle.crt etc/httpd/ssl.crt/server.crt -etc/httpd/ssl.crt/snakeoil-ca.crt -etc/httpd/ssl.crt/snakeoil.crt +etc/httpd/ssl.crt/snakeoil-ca-dsa.crt +etc/httpd/ssl.crt/snakeoil-ca-rsa.crt +etc/httpd/ssl.crt/snakeoil-dsa.crt +etc/httpd/ssl.crt/snakeoil-rsa.crt etc/httpd/ssl.csr/README.CSR etc/httpd/ssl.csr/server.csr etc/httpd/ssl.key/README.KEY etc/httpd/ssl.key/server.key -etc/httpd/ssl.key/snakeoil-ca.key -etc/httpd/ssl.key/snakeoil.key +etc/httpd/ssl.key/snakeoil-ca-dsa.key +etc/httpd/ssl.key/snakeoil-ca-rsa.key +etc/httpd/ssl.key/snakeoil-dsa.key +etc/httpd/ssl.key/snakeoil-rsa.key lib/httpd/mod_ssl.so +share/mod_ssl/cca.sh +share/mod_ssl/gid-mkcert.sh +share/mod_ssl/loadcacert.cgi +share/mod_ssl/sign.sh share/httpd/htdocs/manual/mod/mod_ssl/apache_pb.gif +share/httpd/htdocs/manual/mod/mod_ssl/feather.jpg share/httpd/htdocs/manual/mod/mod_ssl/index.html share/httpd/htdocs/manual/mod/mod_ssl/mod_ssl_sb.gif share/httpd/htdocs/manual/mod/mod_ssl/openssl_ics.gif share/httpd/htdocs/manual/mod/mod_ssl/ssl_compat.gfont000.gif share/httpd/htdocs/manual/mod/mod_ssl/ssl_compat.html share/httpd/htdocs/manual/mod/mod_ssl/ssl_cover_logo.jpg -share/httpd/htdocs/manual/mod/mod_ssl/ssl_cover_title.gif +share/httpd/htdocs/manual/mod/mod_ssl/ssl_cover_title.jpg share/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.gfont000.gif share/httpd/htdocs/manual/mod/mod_ssl/ssl_faq.html share/httpd/htdocs/manual/mod/mod_ssl/ssl_glossary.html @@ -61,10 +71,5 @@ share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-preface.gif share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-ref.gif share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-toc.gif share/httpd/htdocs/manual/mod/mod_ssl/ssl_template.title-tutor.gif -share/mod_ssl/cca.sh -share/mod_ssl/gid-mkcert.sh -share/mod_ssl/loadcacert.cgi -share/mod_ssl/mca.sh -share/mod_ssl/sign.sh @dirrm share/httpd/htdocs/manual/mod/mod_ssl @dirrm share/mod_ssl |