From 221c4f04ded926b6c566c399ce4524e68303f159 Mon Sep 17 00:00:00 2001 From: agc Date: Tue, 20 Jul 2004 21:56:58 +0000 Subject: Pull up ticket 62 to the pkgsrc-2004Q2 branch, requested by Grant Beattie. Security fix for ap-ssl and apache: Module Name: pkgsrc Committed By: tron Date: Sat Jul 17 12:44:28 UTC 2004 Modified Files: pkgsrc/www/apache: Makefile distinfo Log Message: Use "mod_ssl-2.8.19" sources for SSL hooks, bump package revision. and Module Name: pkgsrc Committed By: tron Date: Sat Jul 17 12:43:37 UTC 2004 Modified Files: pkgsrc/www/ap-ssl: Makefile distinfo Log Message: Update "ap-ssl" package to version 2.8.19: - Fix ssl_log() related format string vulnerability in mod_proxy hook functions. --- doc/CHANGES-pkgsrc-2004Q2 | 4 +++- www/ap-ssl/Makefile | 6 +++--- www/ap-ssl/distinfo | 6 +++--- www/apache/Makefile | 6 +++--- www/apache/distinfo | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2 index f586bd9d98c..ada82a9bab3 100644 --- a/doc/CHANGES-pkgsrc-2004Q2 +++ b/doc/CHANGES-pkgsrc-2004Q2 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.27 2004/07/15 19:38:29 agc Exp $ +$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.28 2004/07/20 21:56:58 agc Exp $ Changes to the packages collection and infrastructure on the pkgsrc-2004Q2 branch: @@ -50,3 +50,5 @@ Pullup ticket 59, requested by Grant Beattie [agc 2004-07-15] libxml2 PLIST fix Pullup ticket 60, requested by Lubomir Sedlacik [agc 2004-07-15] Solaris silc-server fix +Pullup ticket 62, requested by Grant Beattie [agc 2004-07-20] + Security fix for apache and ap-ssl diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index 551c8137cf9..e1210445de5 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.80 2004/05/30 10:29:00 grant Exp $ +# $NetBSD: Makefile,v 1.80.2.1 2004/07/20 21:56:58 agc Exp $ -DISTNAME= mod_ssl-2.8.18-1.3.31 -PKGNAME= ap-ssl-2.8.18 +DISTNAME= mod_ssl-2.8.19-1.3.31 +PKGNAME= ap-ssl-2.8.19 CATEGORIES= www security MASTER_SITES= http://www.modssl.org/source/ \ ftp://ftp.pca.dfn.de/pub/tools/net/mod_ssl/source/ \ diff --git a/www/ap-ssl/distinfo b/www/ap-ssl/distinfo index d56d41930f1..6fdfb25e6c3 100644 --- a/www/ap-ssl/distinfo +++ b/www/ap-ssl/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.21 2004/05/30 10:29:00 grant Exp $ +$NetBSD: distinfo,v 1.21.2.1 2004/07/20 21:56:58 agc Exp $ -SHA1 (mod_ssl-2.8.18-1.3.31.tar.gz) = d40151ce3647d2054cfa7edb0e668fa4d3355cee -Size (mod_ssl-2.8.18-1.3.31.tar.gz) = 754214 bytes +SHA1 (mod_ssl-2.8.19-1.3.31.tar.gz) = aa6ecb4a87fffc99dad6f78845d4c660c741a9d0 +Size (mod_ssl-2.8.19-1.3.31.tar.gz) = 754277 bytes SHA1 (patch-aa) = 6b66b8d9e8bd03613376dca3b4e0dad3a2e7ed15 SHA1 (patch-ab) = 936bc956761559c51263cf7645d135abe40069cd SHA1 (patch-ac) = ebdd43a3ce98fbd20ea515e06eb7f41d440cd294 diff --git a/www/apache/Makefile b/www/apache/Makefile index e60ec1717a9..2f93ee18880 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.146 2004/05/30 12:37:15 tron Exp $ +# $NetBSD: Makefile,v 1.146.2.1 2004/07/20 21:56:58 agc Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). DISTNAME= apache_1.3.31 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} @@ -18,7 +18,7 @@ COMMENT= Apache HTTP (Web) server NETBSD_LOGO= sitedrivenby.gif SITES_${NETBSD_LOGO}= http://www.NetBSD.org/images/logos/ -MODSSL_VERSION= 2.8.18 +MODSSL_VERSION= 2.8.19 MODSSL_DISTNAME= mod_ssl-${MODSSL_VERSION}-1.3.31 MODSSL_DIST= ${MODSSL_DISTNAME}.tar.gz MODSSL_SRC= ${WRKDIR}/${MODSSL_DISTNAME} diff --git a/www/apache/distinfo b/www/apache/distinfo index 0e4f264d66e..8eabf637572 100644 --- a/www/apache/distinfo +++ b/www/apache/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.35 2004/05/30 12:37:15 tron Exp $ +$NetBSD: distinfo,v 1.35.2.1 2004/07/20 21:56:58 agc Exp $ SHA1 (apache_1.3.31.tar.gz) = a5d4298e8f99cae220ba65b5ef128d5742c7298d Size (apache_1.3.31.tar.gz) = 2467371 bytes SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658 Size (sitedrivenby.gif) = 8519 bytes -SHA1 (mod_ssl-2.8.18-1.3.31.tar.gz) = d40151ce3647d2054cfa7edb0e668fa4d3355cee -Size (mod_ssl-2.8.18-1.3.31.tar.gz) = 754214 bytes +SHA1 (mod_ssl-2.8.19-1.3.31.tar.gz) = aa6ecb4a87fffc99dad6f78845d4c660c741a9d0 +Size (mod_ssl-2.8.19-1.3.31.tar.gz) = 754277 bytes SHA1 (patch-aa) = 3a655678f5e99769f27fca06a8279b14a8e8e8be SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6 SHA1 (patch-ac) = 12347c7a306d3e898b032c2b4b3b01670b62d4fd -- cgit v1.2.3