Date: Sun, 23 Jun 2013 12:08:39 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321630 - in head/www/nginx: . files Message-ID: <201306231208.r5NC8dI8025325@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sun Jun 23 12:08:39 2013 New Revision: 321630 URL: http://svnweb.freebsd.org/changeset/ports/321630 Log: If nginx was compiled without --with-http_ssl_module, but with some other module which uses OpenSSL (e.g. --with-mail_ssl_module), insufficient preprocessor check resulted in build failure. The problem was introduced by e0a3714a36f8 (1.3.14). Reported by: "M.S. Babaei" <info@babaei.net> Patch obtained from: http://hg.nginx.org/nginx/rev/9d83ec073c51 Added: head/www/nginx/files/patch-fix-mail-ssl (contents, props changed) Modified: head/www/nginx/Makefile Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sun Jun 23 12:05:23 2013 (r321629) +++ head/www/nginx/Makefile Sun Jun 23 12:08:39 2013 (r321630) @@ -3,6 +3,7 @@ PORTNAME= nginx PORTVERSION= 1.4.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ Added: head/www/nginx/files/patch-fix-mail-ssl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/patch-fix-mail-ssl Sun Jun 23 12:08:39 2013 (r321630) @@ -0,0 +1,79 @@ + +# HG changeset patch +# User Maxim Dounin <mdounin@mdounin.ru> +# Date 1368283770 -14400 +# Node ID 9d83ec073c514acec7adc84ee15d74692a5def7a +# Parent 3494f14aa46a098bfcb4a1dc24acc7826cdd603b +Fixed build with --with-mail_ssl_module. + +If nginx was compiled without --with-http_ssl_module, but with some +other module which uses OpenSSL (e.g. --with-mail_ssl_module), insufficient +preprocessor check resulted in build failure. The problem was introduced +by e0a3714a36f8 (1.3.14). + +Reported by Roman Arutyunyan. + +diff -r 3494f14aa46a -r 9d83ec073c51 src/http/ngx_http.h +--- src/http/ngx_http.h Sat May 11 18:49:19 2013 +0400 ++++ src/http/ngx_http.h Sat May 11 18:49:30 2013 +0400 +@@ -89,7 +89,7 @@ + void ngx_http_init_connection(ngx_connection_t *c); + void ngx_http_close_connection(ngx_connection_t *c); + +-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME ++#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME) + int ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg); + #endif + +diff -r 3494f14aa46a -r 9d83ec073c51 src/http/ngx_http_request.c +--- src/http/ngx_http_request.c Sat May 11 18:49:19 2013 +0400 ++++ src/http/ngx_http_request.c Sat May 11 18:49:30 2013 +0400 +@@ -1955,7 +1955,7 @@ + + hc = r->http_connection; + +-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME ++#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME) + + if (hc->ssl_servername) { + if (hc->ssl_servername->len == host->len +@@ -1986,7 +1986,7 @@ + return NGX_ERROR; + } + +-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME ++#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME) + + if (hc->ssl_servername) { + ngx_http_ssl_srv_conf_t *sscf; +@@ -2053,7 +2053,7 @@ + + sn = virtual_names->regex; + +-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME ++#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME) + + if (r == NULL) { + ngx_http_connection_t *hc; +@@ -2085,7 +2085,7 @@ + return NGX_DECLINED; + } + +-#endif /* SSL_CTRL_SET_TLSEXT_HOSTNAME */ ++#endif /* NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME */ + + for (i = 0; i < virtual_names->nregex; i++) { + +diff -r 3494f14aa46a -r 9d83ec073c51 src/http/ngx_http_request.h +--- src/http/ngx_http_request.h Sat May 11 18:49:19 2013 +0400 ++++ src/http/ngx_http_request.h Sat May 11 18:49:30 2013 +0400 +@@ -295,7 +295,7 @@ + ngx_http_addr_conf_t *addr_conf; + ngx_http_conf_ctx_t *conf_ctx; + +-#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME ++#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME) + ngx_str_t *ssl_servername; + #if (NGX_PCRE) + ngx_http_regex_t *ssl_servername_regex; +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306231208.r5NC8dI8025325>