bin/117709: Base openssl does not define OPENSSL_THREADS

[Marcin Wisnicki]

>Number:         117709
>Category:       bin
>Synopsis:       Base openssl does not define OPENSSL_THREADS
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 31 02:40:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Marcin Wisnicki
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD ghost.pnet.one.pl 6.2-STABLE FreeBSD 6.2-STABLE #9: Sun Sep 9 04:53:53 CEST 2007 root at ghost.pnet.one.pl:/home/obj/usr/src/sys/SERWER i386


	RELENG_6
>Description:
	Version of OpenSSL in base system of RELENG_[456] lacks definition of
	OPENSSL_THREADS, and only defines THREADS.
	It was previously discussed in 2003 in this thread:
	http://docs.freebsd.org/cgi/getmsg.cgi?fetch=473927+0+archive/2003/freebsd-current/20030302.freebsd-current

	This will fix openssl detection in some ports, most notably in
	mail-notification-4.1 which i'm going to submit right now with a hack to
	support older freebsd releases.

>How-To-Repeat:

>Fix:

	Apply following patch, relative to /usr/src/secure/lib or MFC openssl

--- openssl-threads.patch begins here ---
diff -ruN libcrypto.orig/opensslconf-alpha.h libcrypto/opensslconf-alpha.h
--- libcrypto.orig/opensslconf-alpha.h	2003-01-29 02:06:15.000000000 +0100
+++ libcrypto/opensslconf-alpha.h	2007-10-31 03:12:57.000000000 +0100
@@ -12,6 +12,9 @@
 #  define THREADS
 # endif
 #endif
+#ifndef OPENSSL_THREADS
+# define OPENSSL_THREADS
+#endif
 #ifdef OPENSSL_OTHER_DEFINES
 # ifndef NO_ASM
 #  define NO_ASM
diff -ruN libcrypto.orig/opensslconf-amd64.h libcrypto/opensslconf-amd64.h
--- libcrypto.orig/opensslconf-amd64.h	2003-01-29 02:06:15.000000000 +0100
+++ libcrypto/opensslconf-amd64.h	2007-10-31 03:13:13.000000000 +0100
@@ -12,6 +12,9 @@
 #  define THREADS
 # endif
 #endif
+#ifndef OPENSSL_THREADS
+# define OPENSSL_THREADS
+#endif
 #ifdef OPENSSL_OTHER_DEFINES
 # ifndef NO_ASM
 #  define NO_ASM
diff -ruN libcrypto.orig/opensslconf-arm.h libcrypto/opensslconf-arm.h
--- libcrypto.orig/opensslconf-arm.h	2004-05-14 14:26:51.000000000 +0200
+++ libcrypto/opensslconf-arm.h	2007-10-31 03:13:31.000000000 +0100
@@ -12,6 +12,9 @@
 #  define THREADS
 # endif
 #endif
+#ifndef OPENSSL_THREADS
+# define OPENSSL_THREADS
+#endif
 #ifdef OPENSSL_OTHER_DEFINES
 # ifndef NO_ASM
 #  define NO_ASM
diff -ruN libcrypto.orig/opensslconf-i386.h libcrypto/opensslconf-i386.h
--- libcrypto.orig/opensslconf-i386.h	2003-01-29 02:06:15.000000000 +0100
+++ libcrypto/opensslconf-i386.h	2007-10-31 03:12:43.000000000 +0100
@@ -12,6 +12,9 @@
 #  define THREADS
 # endif
 #endif
+#ifndef OPENSSL_THREADS
+# define OPENSSL_THREADS
+#endif
 #ifdef OPENSSL_OTHER_DEFINES
 # ifndef NO_ASM
 #  define NO_ASM
diff -ruN libcrypto.orig/opensslconf-ia64.h libcrypto/opensslconf-ia64.h
--- libcrypto.orig/opensslconf-ia64.h	2003-01-29 02:06:15.000000000 +0100
+++ libcrypto/opensslconf-ia64.h	2007-10-31 03:13:48.000000000 +0100
@@ -12,6 +12,9 @@
 #  define THREADS
 # endif
 #endif
+#ifndef OPENSSL_THREADS
+# define OPENSSL_THREADS
+#endif
 #ifdef OPENSSL_OTHER_DEFINES
 # ifndef NO_ASM
 #  define NO_ASM
diff -ruN libcrypto.orig/opensslconf-powerpc.h libcrypto/opensslconf-powerpc.h
--- libcrypto.orig/opensslconf-powerpc.h	2003-01-29 02:06:15.000000000 +0100
+++ libcrypto/opensslconf-powerpc.h	2007-10-31 03:14:44.000000000 +0100
@@ -12,6 +12,9 @@
 #  define THREADS
 # endif
 #endif
+#ifndef OPENSSL_THREADS
+# define OPENSSL_THREADS
+#endif
 #ifdef OPENSSL_OTHER_DEFINES
 # ifndef NO_ASM
 #  define NO_ASM
diff -ruN libcrypto.orig/opensslconf-sparc64.h libcrypto/opensslconf-sparc64.h
--- libcrypto.orig/opensslconf-sparc64.h	2003-01-29 02:06:15.000000000 +0100
+++ libcrypto/opensslconf-sparc64.h	2007-10-31 03:14:58.000000000 +0100
@@ -12,6 +12,9 @@
 #  define THREADS
 # endif
 #endif
+#ifndef OPENSSL_THREADS
+# define OPENSSL_THREADS
+#endif
 #ifdef OPENSSL_OTHER_DEFINES
 # ifndef NO_ASM
 #  define NO_ASM
--- openssl-threads.patch ends here ---


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