From nobody@FreeBSD.org  Sat May  1 13:36:49 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 08F18106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  1 May 2010 13:36:49 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id EBF268FC19
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  1 May 2010 13:36:48 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o41DamSw000362
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 1 May 2010 13:36:48 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o41DalkV000361;
	Sat, 1 May 2010 13:36:47 GMT
	(envelope-from nobody)
Message-Id: <201005011336.o41DalkV000361@www.freebsd.org>
Date: Sat, 1 May 2010 13:36:47 GMT
From: Kazuo Dohzono <dohzono@axion-software.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] www/apache20: compile error with security/openssl
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         146218
>Category:       ports
>Synopsis:       [PATCH] www/apache20: compile error with security/openssl
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    apache
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 01 13:40:09 UTC 2010
>Closed-Date:    Thu May 06 21:10:46 UTC 2010
>Last-Modified:  Thu May  6 21:20:01 UTC 2010
>Originator:     Kazuo Dohzono
>Release:        FreeBSD 8.0-RELEASE
>Organization:
>Environment:
FreeBSD platinum.axion-software.com 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #1: Fri
Apr 30 21:52:39 JST 2010    
dohzono@platinum.axion-software.com:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
Compile error occurs when you compile www/apache20 after installng security/openssl. 


>How-To-Repeat:
1) install security/openssl.
2)
# cd /usr/ports/www/apache20/
# make WITH_DBM=bdb WITH_LDAP=yes WITH_SSL_MODULES=yes WITH_SUEXEC_MODULES=yes WITH_PROXY_MODULES=yes WITH_KQUEUE_MODULES=yes WITHOUT_IPV6=yes clean
(snip)
> /usr/local/tmp/usr/ports/www/apache20/work/httpd-2.0.63/srclib/apr/libtool --silent
> --mode=compile cc    -O2 -pipe -DLDAP_DEPRECATED -fno-strict-aliasing  -D_REENTRANT
> -D_THREAD_SAFE -DAP_HAVE_DESIGNATED_INITIALIZER  
> -I/usr/local/tmp/usr/ports/www/apache20/work/httpd-2.0.63/srclib/apr/include
> -I/usr/local/tmp/usr/ports/www/apache20/work/httpd-2.0.63/srclib/apr-util/include
> -I/usr/local/include -I.
> -I/usr/local/tmp/usr/ports/www/apache20/work/httpd-2.0.63/os/unix
> -I/usr/local/tmp/usr/ports/www/apache20/work/httpd-2.0.63/server/mpm/prefork
> -I/usr/local/tmp/usr/ports/www/apache20/work/httpd-2.0.63/modules/http
> -I/usr/local/tmp/usr/ports/www/apache20/work/httpd-2.0.63/modules/filters
> -I/usr/local/tmp/usr/ports/www/apache20/work/httpd-2.0.63/modules/proxy
> -I/usr/local/tmp/usr/ports/www/apache20/work/httpd-2.0.63/include
> -I/usr/local/tmp/usr/ports/www/apache20/work/httpd-2.0.63/modules/generators
> -I/usr/local/include/openssl
> -I/usr/local/tmp/usr/ports/www/apache20/work/httpd-2.0.63/modules/dav/main
> -prefer-pic -c ssl_engine_init.c && touch ssl_engine_init.slo
> ssl_engine_init.c: In function 'ssl_init_ctx_protocol':
> ssl_engine_init.c:391: warning: assignment discards qualifiers from pointer target type
> ssl_engine_init.c:397: warning: assignment discards qualifiers from pointer target type
> ssl_engine_init.c: In function 'ssl_init_ctx_verify':
> ssl_engine_init.c:534: error: 'STACK' undeclared (first use in this function)
> ssl_engine_init.c:534: error: (Each undeclared identifier is reported only once
> ssl_engine_init.c:534: error: for each function it appears in.)
> ssl_engine_init.c:534: error: expected expression before ')' token
> ssl_engine_init.c: In function 'ssl_init_FindCAList':
> ssl_engine_init.c:1109: warning: pointer type mismatch in conditional expression
> *** Error code 1

>Fix:
You can refer this problem at:

http://mail-index.netbsd.org/pkgsrc-users/2009/08/25/msg010537.html

--- ssl_engine_init.c.orig        2007-12-29 00:07:53.000000000 +0900
+++ ssl_engine_init.c        2010-05-01 22:17:22.000000000 +0900
@@ -531,7 +531,7 @@
             ssl_die();
         }
 
-        SSL_CTX_set_client_CA_list(ctx, (STACK *)ca_list);
+        SSL_CTX_set_client_CA_list(ctx, ca_list);
     }
 
     /*
--- ssl_util_ssl.c.orig        2006-07-12 16:40:55.000000000 +0900
+++ ssl_util_ssl.c        2010-05-01 22:20:18.000000000 +0900
@@ -291,7 +291,7 @@
 #ifdef HAVE_SSL_X509V3_EXT_d2i
     X509_EXTENSION *ext;
     int ext_nid;
-    STACK *sk;
+    STACK_OF(SSL_CIPHER) *sk;
     BOOL is_sgc;
     int idx;
     int i;
@@ -300,7 +300,7 @@
     idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
     if (idx >= 0) {
         ext = X509_get_ext(cert, idx);
-        if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) {
+        if ((sk = X509V3_EXT_d2i(ext)) != NULL) {
             for (i = 0; i < sk_num(sk); i++) {
                 ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i));
                 if (ext_nid == NID_ms_sgc || ext_nid == NID_ns_sgc) {
@@ -466,7 +466,7 @@
     X509 *x509;
     unsigned long err;
     int n;
-    STACK *extra_certs;
+    STACK_OF(X509) *extra_certs;
 
     if ((bio = BIO_new(BIO_s_file_internal())) == NULL)
         return -1;


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->apache 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat May 1 13:40:33 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146218 
State-Changed-From-To: open->closed 
State-Changed-By: pgollucci 
State-Changed-When: Thu May 6 21:10:45 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146218 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146218: commit references a PR
Date: Thu,  6 May 2010 21:10:50 +0000 (UTC)

 pgollucci    2010-05-06 21:10:36 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/apache20         Makefile 
   Added files:
     www/apache20/files   extra-openssl-9.8up.patch 
   Log:
   - Fix compile with security/openssl
   - No PORTREVISION bump [security/openssl is not the default]
   
   PR:             ports/146218
   Submitted by:   Kazuo Dohzono <dohzono@axion-software.com>
   Obtained from:  http://mail-index.netbsd.org/pkgsrc-users/2009/08/25/msg010537.html
   With Hat:       apache@
   
   [I will contemplate sending this back to dev@httpd for branches/2.0.x for 2.0.64]
   
   Revision  Changes    Path
   1.269     +4 -0      ports/www/apache20/Makefile
   1.1       +40 -0     ports/www/apache20/files/extra-openssl-9.8up.patch (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
