Pullup ticket #3853 - requested by ryoon www/apache24: bug fix Revisions pulled up: - www/apache24/Makefile 1.8 - www/apache24/distinfo 1.4 - www/apache24/patches/patch-modules_ssl_ssl__private.h 1.1 --- Module Name: pkgsrc Committed By: ryoon Date: Thu Jul 5 12:50:44 UTC 2012 Modified Files: pkgsrc/www/apache24: Makefile distinfo Added Files: pkgsrc/www/apache24/patches: patch-modules_ssl_ssl__private.h Log Message: 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.diff -r1.7 -r1.7.2.1 pkgsrc/www/apache24/Makefile
(tron)
@@ -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.7.2.1 2012/07/07 17:59:51 tron Exp $ | |
2 | 2 | |||
3 | DISTNAME= httpd-2.4.2 | 3 | DISTNAME= httpd-2.4.2 | |
4 | PKGNAME= ${DISTNAME:S/httpd/apache/} | 4 | PKGNAME= ${DISTNAME:S/httpd/apache/} | |
5 | PKGREVISION= 1 | 5 | PKGREVISION= 2 | |
6 | CATEGORIES= www | 6 | CATEGORIES= www | |
7 | MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ | 7 | MASTER_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/ | |
10 | EXTRACT_SUFX= .tar.bz2 | 10 | EXTRACT_SUFX= .tar.bz2 | |
11 | 11 | |||
12 | MAINTAINER= ryoon@NetBSD.org | 12 | MAINTAINER= ryoon@NetBSD.org | |
13 | HOMEPAGE= http://httpd.apache.org/ | 13 | HOMEPAGE= http://httpd.apache.org/ | |
14 | COMMENT= Apache HTTP (Web) server, version 2.4 | 14 | COMMENT= Apache HTTP (Web) server, version 2.4 | |
15 | LICENSE= apache-2.0 | 15 | LICENSE= apache-2.0 | |
16 | 16 | |||
17 | PKG_DESTDIR_SUPPORT= user-destdir | 17 | PKG_DESTDIR_SUPPORT= user-destdir | |
18 | 18 |
@@ -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.3.2.1 2012/07/07 17:59:51 tron Exp $ | |
2 | 2 | |||
3 | SHA1 (httpd-2.4.2.tar.bz2) = 8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2 | 3 | SHA1 (httpd-2.4.2.tar.bz2) = 8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2 | |
4 | RMD160 (httpd-2.4.2.tar.bz2) = 1b97ab44075bea0f398f507dacb5f719a87b720b | 4 | RMD160 (httpd-2.4.2.tar.bz2) = 1b97ab44075bea0f398f507dacb5f719a87b720b | |
5 | Size (httpd-2.4.2.tar.bz2) = 4132105 bytes | 5 | Size (httpd-2.4.2.tar.bz2) = 4132105 bytes | |
6 | SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839 | 6 | SHA1 (patch-aa) = 2d92b1340aaae40289421f164346348c6d7fe839 | |
7 | SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324 | 7 | SHA1 (patch-ab) = a3edcc20b7654e0446c7d442cda1510b23e5d324 | |
8 | SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d | 8 | SHA1 (patch-ac) = 9f86d845df30316d22bce677a4b176f51007ba0d | |
9 | SHA1 (patch-ad) = 4c812b94af32e8493e0b17793a2d065003d32cc6 | 9 | SHA1 (patch-ad) = 4c812b94af32e8493e0b17793a2d065003d32cc6 | |
10 | SHA1 (patch-ae) = 5bd3bf54e792bf8a2916d7e1b49b1702b02c6903 | 10 | SHA1 (patch-ae) = 5bd3bf54e792bf8a2916d7e1b49b1702b02c6903 | |
11 | SHA1 (patch-ag) = 62a40901debb421dac7954362d4934297c54c0c6 | 11 | SHA1 (patch-ag) = 62a40901debb421dac7954362d4934297c54c0c6 | |
12 | SHA1 (patch-ai) = 867ac81fd14b1bd6af048ec57390d915956e9568 | 12 | SHA1 (patch-ai) = 867ac81fd14b1bd6af048ec57390d915956e9568 | |
13 | SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911 | 13 | SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911 | |
14 | SHA1 (patch-am) = f14b260ffad2c7e8d26e5b614d4aeaf8506e195b | 14 | SHA1 (patch-am) = f14b260ffad2c7e8d26e5b614d4aeaf8506e195b | |
15 | SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df | 15 | SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df | |
16 | SHA1 (patch-modules_ssl_ssl__private.h) = 67bb0ec17c4e29cd855467e3cc135bf6a44eb458 | |||
16 | SHA1 (patch-server_core__filters.c) = 331672c9a65691229518f31dcdae64382b392287 | 17 | SHA1 (patch-server_core__filters.c) = 331672c9a65691229518f31dcdae64382b392287 |
$NetBSD: patch-modules_ssl_ssl__private.h,v 1.2.2.2 2012/07/07 17:59:52 tron 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