ports/167350: [PATCH] security/openssl: Fix redundant declaration / -Werror failure

[Bryan Drewery]

>Number:         167350
>Category:       ports
>Synopsis:       [PATCH] security/openssl: Fix redundant declaration / -Werror failure
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 27 03:20:04 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Bryan Drewery
>Release:        8.3
>Organization:
>Environment:
FreeBSD 8.3-RELEASE i386

>Description:
The header openssl/srtp.h defines SSL_get_selected_srtp_profile twice, resulting in failure when compiling with -Werror, or gcc46.

Upstream issue: http://rt.openssl.org/Ticket/Display.html?id=2724&user=guest&pass=guest#lasttrans

>How-To-Repeat:
Compile an SSL application using ports openssl with -Werror, or with lang/gcc46.

For instance, try compiling ports-mgmt/pkg with CC=gcc46 in /etc/make.conf

Failure:

In file included from /usr/local/include/openssl/ssl.h:1363:0,
                 from pkg_repo.c:43:
/usr/local/include/openssl/srtp.h:138:26: error: redundant redeclaration of 'SSL_get_selected_srtp_profile' [-Werror=redundant-decls]
/usr/local/include/openssl/srtp.h:135:26: note: previous declaration of 'SSL_get_selected_srtp_profile' was here
cc1: all warnings being treated as errors

>Fix:
Patch fixes issue.

Patch attached with submission follows:

--- /dev/null	2012-04-26 22:09:12.000000000 -0500
+++ files/patch-include-openssl-srtp.h	2012-04-26 22:08:02.000000000 -0500
@@ -0,0 +1,10 @@
+--- include/openssl/srtp.h	2011-11-21 14:52:01.000000000 -0800
++++ include/openssl/srtp.h	2012-02-02 15:13:01.757319600 -0800
+@@ -135,7 +135,6 @@
+ SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
+ 
+ STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
+-SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
+ 
+ #ifdef  __cplusplus
+ }


>Release-Note:
>Audit-Trail:
>Unformatted: