diff options
| author | jlam <jlam@pkgsrc.org> | 2001-10-17 19:17:11 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-10-17 19:17:11 +0000 |
| commit | b6d299c11f232b34eb24ffe254001e6695907a29 (patch) | |
| tree | a703390b0f67483cfec9862c79b6b7b6ba96f3eb | |
| parent | 1008fafeadb3d03aacfc04718c38d6b2d081216e (diff) | |
| download | pkgsrc-b6d299c11f232b34eb24ffe254001e6695907a29.tar.gz | |
Update ap-ssl to 2.8.5 from the mod_ssl-2.8.5-1.3.22 distribution.
Changes from version 2.8.4 include:
*) Upgraded to Apache 1.3.22
*) Fixed check whether server certificate wildcard CommonName (CN)
matches the configured server name.
*) Fixed buffer overflow.
| -rw-r--r-- | www/ap-ssl/Makefile | 16 | ||||
| -rw-r--r-- | www/ap-ssl/distinfo | 8 | ||||
| -rw-r--r-- | www/ap-ssl/patches/patch-aa | 4 |
3 files changed, 15 insertions, 13 deletions
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index 08fe4882a73..394d5572ebc 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2001/09/27 23:18:51 jlam Exp $ +# $NetBSD: Makefile,v 1.40 2001/10/17 19:17:11 jlam Exp $ -DISTNAME= mod_ssl-2.8.4-1.3.20 -PKGNAME= ap-ssl-2.8.4 +DISTNAME= mod_ssl-2.8.5-1.3.22 +PKGNAME= ap-ssl-2.8.5 CATEGORIES= www security MASTER_SITES= http://www.modssl.org/source/ @@ -9,19 +9,20 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.modssl.org/ COMMENT= SSL/TLS protocols module for Apache -DEPENDS+= apache>=1.3.20:../../www/apache +DEPENDS+= apache>=1.3.22:../../www/apache # For "apxs": BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 CONFLICTS= apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]* -HAS_CONFIGURE= # defined -USE_SSL= # defined +HAS_CONFIGURE= YES +USE_BUILDLINK_ONLY= YES .include "../../mk/bsd.prefs.mk" CONFIGURE_ARGS+= --with-apxs=${PREFIX}/sbin/apxs -CONFIGURE_ARGS+= --with-ssl=${SSLBASE} +CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_DIR} +MAKE_ENV+= SSL_RPATH_LDFLAGS="-R${SSLBASE}/lib" APACHE_SYSCONFDIR?= ${LOCALBASE}/etc/httpd BUILD_DEFS+= APACHE_SYSCONFDIR @@ -97,4 +98,5 @@ post-install: PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL +.include "../../security/openssl/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo index 05c35733058..7e8b9b0d0b4 100644 --- a/www/ap-ssl/distinfo +++ b/www/ap-ssl/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2001/06/09 06:50:24 jlam Exp $ +$NetBSD: distinfo,v 1.6 2001/10/17 19:17:11 jlam Exp $ -SHA1 (mod_ssl-2.8.4-1.3.20.tar.gz) = 11114eedd0bc77309ce732b250ccbfbe32060616 -Size (mod_ssl-2.8.4-1.3.20.tar.gz) = 751936 bytes -SHA1 (patch-aa) = 1e768ed5111097954b6dc671dd878568c14ae973 +SHA1 (mod_ssl-2.8.5-1.3.22.tar.gz) = 432be249fbaa3a87391b50af7b138c5496fac209 +Size (mod_ssl-2.8.5-1.3.22.tar.gz) = 751863 bytes +SHA1 (patch-aa) = 6b66b8d9e8bd03613376dca3b4e0dad3a2e7ed15 SHA1 (patch-ab) = b8dab2869b05c520b075ecc16ce407beeab5920e diff --git a/www/ap-ssl/patches/patch-aa b/www/ap-ssl/patches/patch-aa index 9de6eaed52d..3df434485e3 100644 --- a/www/ap-ssl/patches/patch-aa +++ b/www/ap-ssl/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.7 2001/06/09 06:50:25 jlam Exp $ +$NetBSD: patch-aa,v 1.8 2001/10/17 19:17:11 jlam Exp $ --- pkg.sslmod/libssl.module.orig Sun May 20 05:13:47 2001 +++ pkg.sslmod/libssl.module Sat Jun 9 02:43:23 2001 @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.7 2001/06/09 06:50:25 jlam Exp $ fi fi - SSL_LDFLAGS="$SSL_LDFLAGS -L\$(SSL_LIBDIR)" -+ SSL_LDFLAGS="$SSL_LDFLAGS -L\$(SSL_LIBDIR) -R\$(SSL_LIBDIR)" ++ SSL_LDFLAGS="$SSL_LDFLAGS -L\$(SSL_LIBDIR) \$(SSL_RPATH_LDFLAGS)" SSL_LIBS="$SSL_LIBS -lssl -lcrypto" # |