[pkgsrc/pkgsrc-2009Q4]: pkgsrc/www Pullup ticket 2996 - requested by dholland

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e8cccec59f1e
branches:  pkgsrc-2009Q4
changeset: 569251:e8cccec59f1e
user:      spz <spz%pkgsrc.org@localhost>
date:      Wed Feb 10 20:37:32 2010 +0000

description:
Pullup ticket 2996 - requested by dholland
security update

Revisions pulled up:
- pkgsrc/www/apache/Makefile            1.199
- pkgsrc/www/apache/distinfo            1.60
- pkgsrc/www/ap-ssl/Makefile            1.109
- pkgsrc/www/ap-ssl/distinfo            1.35

Files added:
pkgsrc/www/ap-ssl/patches/patch-ac

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   dholland
   Date:           Tue Feb  9 07:22:06 UTC 2010

   Modified Files:
           pkgsrc/www/apache: Makefile distinfo

   Log Message:
   Update to 1.3.42, fixing CVE-2010-0010. Note: this package is now EOL
   upstream. The next security bug probably won't get patched, so if you're
   still using this, it's time to migrate to 2.x.


   To generate a diff of this commit:
   cvs rdiff -u -r1.198 -r1.199 pkgsrc/www/apache/Makefile
   cvs rdiff -u -r1.59 -r1.60 pkgsrc/www/apache/distinfo

   -------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   dholland
   Date:           Wed Feb 10 03:55:18 UTC 2010

   Modified Files:
           pkgsrc/www/ap-ssl: Makefile distinfo
   Added Files:
           pkgsrc/www/ap-ssl/patches: patch-ac

   Log Message:
   Hack this to build against Apache 1.3.42. As 1.3.42 doesn't change
   anything significant in the internals, all this requires is patching
   the accepted version and bumping BUILDLINK_API_DEPENDS. PKGREVISION++.


   To generate a diff of this commit:
   cvs rdiff -u -r1.108 -r1.109 pkgsrc/www/ap-ssl/Makefile
   cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/ap-ssl/distinfo
   cvs rdiff -u -r0 -r1.3 pkgsrc/www/ap-ssl/patches/patch-ac

diffstat:

 www/ap-ssl/Makefile         |   4 ++--
 www/ap-ssl/distinfo         |   3 ++-
 www/ap-ssl/patches/patch-ac |  10 ++++++++++
 www/apache/Makefile         |   4 ++--
 www/apache/distinfo         |   8 ++++----
 5 files changed, 20 insertions(+), 9 deletions(-)

diffs (76 lines):

diff -r 03e7ab63f6b3 -r e8cccec59f1e www/ap-ssl/Makefile
--- a/www/ap-ssl/Makefile       Sun Feb 07 18:12:39 2010 +0000
+++ b/www/ap-ssl/Makefile       Wed Feb 10 20:37:32 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2008/02/24 05:29:21 obache Exp $
+# $NetBSD: Makefile,v 1.107.20.1 2010/02/10 20:37:32 spz Exp $
 
 DISTNAME=              mod_ssl-2.8.31-1.3.41
 PKGNAME=               ap13-ssl-2.8.31
@@ -22,7 +22,7 @@
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../www/apache/buildlink3.mk"
-BUILDLINK_API_DEPENDS.apache+= apache>=1.3.41
+BUILDLINK_API_DEPENDS.apache+= apache>=1.3.42
 
 SSL_RPATH_LDFLAGS=     ${LINKER_RPATH_FLAG} ${SSLBASE}/lib
 FIX_RPATH+=            SSL_RPATH_LDFLAGS
diff -r 03e7ab63f6b3 -r e8cccec59f1e www/ap-ssl/distinfo
--- a/www/ap-ssl/distinfo       Sun Feb 07 18:12:39 2010 +0000
+++ b/www/ap-ssl/distinfo       Wed Feb 10 20:37:32 2010 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.34 2008/02/24 05:29:21 obache Exp $
+$NetBSD: distinfo,v 1.34.20.1 2010/02/10 20:37:32 spz Exp $
 
 SHA1 (mod_ssl-2.8.31-1.3.41.tar.gz) = f2d2210041332fc1d4b7243a856d4d81f961d306
 RMD160 (mod_ssl-2.8.31-1.3.41.tar.gz) = c3083c29710c4537ca8c79ddd8c1992eb95cbfee
 Size (mod_ssl-2.8.31-1.3.41.tar.gz) = 820067 bytes
 SHA1 (patch-aa) = f2db042ff2e15ebfc9387b254467be78747cf947
 SHA1 (patch-ab) = d6e4f5ef249506b9b4f003f84d78e2eb075dcd34
+SHA1 (patch-ac) = 5c5fa8cbcb278f9e4035aafde783537463847d7c
diff -r 03e7ab63f6b3 -r e8cccec59f1e www/ap-ssl/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/ap-ssl/patches/patch-ac       Wed Feb 10 20:37:32 2010 +0000
@@ -0,0 +1,10 @@
+$NetBSD: patch-ac,v 1.2.32.1 2010/02/10 20:37:32 spz Exp $
+
+Hack this brutally to accept the security-fixed apache 1.3 from 2/2010.
+The differences from 1.3.41 to 1.3.42 are minimal.
+
+--- pkg.sslmod/libssl.version~  2008-02-08 06:18:01.000000000 -0500
++++ pkg.sslmod/libssl.version   2010-02-09 05:29:19.000000000 -0500
+@@ -1 +1 @@
+-mod_ssl/2.8.31-1.3.41
++mod_ssl/2.8.31-1.3.42
diff -r 03e7ab63f6b3 -r e8cccec59f1e www/apache/Makefile
--- a/www/apache/Makefile       Sun Feb 07 18:12:39 2010 +0000
+++ b/www/apache/Makefile       Wed Feb 10 20:37:32 2010 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.198 2008/02/23 05:26:01 obache Exp $
+# $NetBSD: Makefile,v 1.198.20.1 2010/02/10 20:37:33 spz 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.41
+DISTNAME=              apache_1.3.42
 PKGNAME=               ${DISTNAME:S/_/-/}
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_APACHE:=httpd/} \
diff -r 03e7ab63f6b3 -r e8cccec59f1e www/apache/distinfo
--- a/www/apache/distinfo       Sun Feb 07 18:12:39 2010 +0000
+++ b/www/apache/distinfo       Wed Feb 10 20:37:32 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.59 2009/07/25 19:55:11 roy Exp $
+$NetBSD: distinfo,v 1.59.4.1 2010/02/10 20:37:33 spz Exp $
 
-SHA1 (apache_1.3.41.tar.gz) = 3bbd4c4bc648e6ad5b696bb83420533f4d23daf8
-RMD160 (apache_1.3.41.tar.gz) = 74786c65c143af123f1d13e9d93dd5ff07e9a201
-Size (apache_1.3.41.tar.gz) = 2483180 bytes
+SHA1 (apache_1.3.42.tar.gz) = b3f8575d855132bc243d79af59ae2a318e7e2c53
+RMD160 (apache_1.3.42.tar.gz) = a1573bd04e17cad5d67388cfe08b7f26e06a9ee1
+Size (apache_1.3.42.tar.gz) = 2661241 bytes
 SHA1 (mod_ssl-2.8.31-1.3.41.tar.gz) = f2d2210041332fc1d4b7243a856d4d81f961d306
 RMD160 (mod_ssl-2.8.31-1.3.41.tar.gz) = c3083c29710c4537ca8c79ddd8c1992eb95cbfee
 Size (mod_ssl-2.8.31-1.3.41.tar.gz) = 820067 bytes