diff options
| author | ryoon <ryoon@pkgsrc.org> | 2012-07-05 12:50:44 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2012-07-05 12:50:44 +0000 |
| commit | d4ff6cceafd15da756f05a90faf02f2995892d15 (patch) | |
| tree | b3d623191429e4fcf42349f200a261eadc4053ae | |
| parent | b500cf74cfda03eabfeab6f2cba35e1b59aeb542 (diff) | |
| download | pkgsrc-d4ff6cceafd15da756f05a90faf02f2995892d15.tar.gz | |
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.
| -rw-r--r-- | www/apache24/Makefile | 4 | ||||
| -rw-r--r-- | www/apache24/distinfo | 3 | ||||
| -rw-r--r-- | www/apache24/patches/patch-modules_ssl_ssl__private.h | 16 |
3 files changed, 20 insertions, 3 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile index c472ab6e2ee..a3a34752b1a 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2012/05/18 20:56:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.8 2012/07/05 12:50:44 ryoon Exp $ DISTNAME= httpd-2.4.2 PKGNAME= ${DISTNAME:S/httpd/apache/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ http://archive.apache.org/dist/httpd/ \ diff --git a/www/apache24/distinfo b/www/apache24/distinfo index e14d9672781..59612b96370 100644 --- a/www/apache24/distinfo +++ b/www/apache24/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2012/05/18 20:56:28 ryoon Exp $ +$NetBSD: distinfo,v 1.4 2012/07/05 12:50:44 ryoon Exp $ SHA1 (httpd-2.4.2.tar.bz2) = 8d391db515edfb6623c0c7c6ce5c1b2e1f7c64c2 RMD160 (httpd-2.4.2.tar.bz2) = 1b97ab44075bea0f398f507dacb5f719a87b720b @@ -13,4 +13,5 @@ SHA1 (patch-ai) = 867ac81fd14b1bd6af048ec57390d915956e9568 SHA1 (patch-al) = 02d9ade5aac4270182063d5ad413970c832ee911 SHA1 (patch-am) = f14b260ffad2c7e8d26e5b614d4aeaf8506e195b SHA1 (patch-aw) = 43cd64df886853ef7b75b91ed20183f329fcc9df +SHA1 (patch-modules_ssl_ssl__private.h) = 67bb0ec17c4e29cd855467e3cc135bf6a44eb458 SHA1 (patch-server_core__filters.c) = 331672c9a65691229518f31dcdae64382b392287 diff --git a/www/apache24/patches/patch-modules_ssl_ssl__private.h b/www/apache24/patches/patch-modules_ssl_ssl__private.h new file mode 100644 index 00000000000..7feb8d44591 --- /dev/null +++ b/www/apache24/patches/patch-modules_ssl_ssl__private.h @@ -0,0 +1,16 @@ +$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 |