Thu Jul 5 12:50:44 2012 UTC ()
Bump PKGREVISION

Fix PR pkg/46655.

With NetBSD current and 6.0's OpenSSL, OPENSSL_NO_SSL_INTERN should not
be defined, due to it lacks some functions.
Exclude version 0x10001000 from OPENSSL_NO_SSL_INTERN definition.


(ryoon)
diff -r1.7 -r1.8 pkgsrc/www/apache24/Makefile
diff -r1.3 -r1.4 pkgsrc/www/apache24/distinfo
diff -r0 -r1.1 pkgsrc/www/apache24/patches/patch-modules_ssl_ssl__private.h
cvs diff -r1.7 -r1.8 pkgsrc/www/apache24/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache24/Makefile 2012/05/18 20:56:28 1.7
+++ pkgsrc/www/apache24/Makefile 2012/07/05 12:50:44 1.8
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.7 2012/05/18 20:56:28 ryoon Exp $ 1# $NetBSD: Makefile,v 1.8 2012/07/05 12:50:44 ryoon Exp $
2 2
3DISTNAME= httpd-2.4.2 3DISTNAME= httpd-2.4.2
4PKGNAME= ${DISTNAME:S/httpd/apache/} 4PKGNAME= ${DISTNAME:S/httpd/apache/}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ 7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
8 http://archive.apache.org/dist/httpd/ \ 8 http://archive.apache.org/dist/httpd/ \
9 http://archive.eu.apache.org/dist/httpd/ 9 http://archive.eu.apache.org/dist/httpd/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= ryoon@NetBSD.org 12MAINTAINER= ryoon@NetBSD.org
13HOMEPAGE= http://httpd.apache.org/ 13HOMEPAGE= http://httpd.apache.org/
14COMMENT= Apache HTTP (Web) server, version 2.4 14COMMENT= Apache HTTP (Web) server, version 2.4
15LICENSE= apache-2.0 15LICENSE= apache-2.0
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18 18
cvs diff -r1.3 -r1.4 pkgsrc/www/apache24/distinfo (expand / switch to unified diff)

--- pkgsrc/www/apache24/distinfo 2012/05/18 20:56:28 1.3
+++ pkgsrc/www/apache24/distinfo 2012/07/05 12:50:44 1.4
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: distinfo,v 1.3 2012/05/18 20:56:28 ryoon Exp $ 1$NetBSD: distinfo,v 1.4 2012/07/05 12:50:44 ryoon Exp $
2 2
3SHA1 (httpd-2.4.2.tar.bz2) = 8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2 3SHA1 (httpd-2.4.2.tar.bz2) = 8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2
4RMD160 (httpd-2.4.2.tar.bz2) = 1b97ab44075bea0f398f507dacb5f719a87b720b 4RMD160 (httpd-2.4.2.tar.bz2) = 1b97ab44075bea0f398f507dacb5f719a87b720b
5Size (httpd-2.4.2.tar.bz2) = 4132105 bytes 5Size (httpd-2.4.2.tar.bz2) = 4132105 bytes
6SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839 6SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839
7SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324 7SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324
8SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d 8SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d
9SHA1 (patch-ad) = 4c812b94af32e8493e0b17793a2d065003d32cc6 9SHA1 (patch-ad) = 4c812b94af32e8493e0b17793a2d065003d32cc6
10SHA1 (patch-ae) = 5bd3bf54e792bf8a2916d7e1b49b1702b02c6903 10SHA1 (patch-ae) = 5bd3bf54e792bf8a2916d7e1b49b1702b02c6903
11SHA1 (patch-ag) = 62a40901debb421dac7954362d4934297c54c0c6 11SHA1 (patch-ag) = 62a40901debb421dac7954362d4934297c54c0c6
12SHA1 (patch-ai) = 867ac81fd14b1bd6af048ec57390d915956e9568 12SHA1 (patch-ai) = 867ac81fd14b1bd6af048ec57390d915956e9568
13SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911 13SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911
14SHA1 (patch-am) = f14b260ffad2c7e8d26e5b614d4aeaf8506e195b 14SHA1 (patch-am) = f14b260ffad2c7e8d26e5b614d4aeaf8506e195b
15SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df 15SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df
 16SHA1 (patch-modules_ssl_ssl__private.h) = 67bb0ec17c4e29cd855467e3cc135bf6a44eb458
16SHA1 (patch-server_core__filters.c) = 331672c9a65691229518f31dcdae64382b392287 17SHA1 (patch-server_core__filters.c) = 331672c9a65691229518f31dcdae64382b392287
File Added: pkgsrc/www/apache24/patches/Attic/patch-modules_ssl_ssl__private.h
$NetBSD: patch-modules_ssl_ssl__private.h,v 1.1 2012/07/05 12:50:44 ryoon Exp $

Exclude OpenSSL shipped with NetBSD current and 6.0.
It is pre-beta snapshot of 1.0.1.

--- modules/ssl/ssl_private.h.orig	2012-04-03 12:37:57.000000000 +0000
+++ modules/ssl/ssl_private.h
@@ -83,7 +83,7 @@
 
 /* OpenSSL headers */
 #include <openssl/opensslv.h>
-#if (OPENSSL_VERSION_NUMBER >= 0x10001000)
+#if (OPENSSL_VERSION_NUMBER >= 0x10001001)
 /* must be defined before including ssl.h */
 #define OPENSSL_NO_SSL_INTERN
 #endif