From: Peter Avalos <pavalos@dragonflybsd.org>
Date: Sat, 25 Sep 2010 06:24:48 +0000 (-1000)
Subject: Fix WANT_IDEA knob.
X-Git-Tag: v2.9.0~74^2~53
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/89078d1fa25915899e3e5bd12d439cff52fd1812

Fix WANT_IDEA knob.

I broke this in my last OpenSSL import.  Add a note to README.DRAGONFLY
to automatically generate opensslconf.h when Configure is run, and
adjust Makefile.inc to compensate for the generated code.
---

diff --git a/crypto/openssl/README.DRAGONFLY b/crypto/openssl/README.DRAGONFLY
index 3d513cb062..1dee049a1c 100644
--- a/crypto/openssl/README.DRAGONFLY
+++ b/crypto/openssl/README.DRAGONFLY
@@ -2,9 +2,9 @@ Original source can be downloaded from OpenSSL at
 <http://www.openssl.org/source/>.
 
 Here's some hints to upgrading:
-./Configure shared no-asm --prefix=/usr --openssldir=/etc/ssl BSD-x86-elf
+./Configure shared no-asm no-idea --prefix=/usr --openssldir=/etc/ssl BSD-x86-elf
 cp crypto/opensslconf.h ../../secure/lib/libcrypto/opensslconf-i386.h
-./Configure shared no-asm --prefix=/usr --openssldir=/etc/ssl BSD-x86_64
+./Configure shared no-asm no-idea --prefix=/usr --openssldir=/etc/ssl BSD-x86_64
 cp crypto/opensslconf.h ../../secure/lib/libcrypto/opensslconf-x86_64.h
 cd ../../secure/lib/libcrypto
 # Update the version in Makefile.inc
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc
index 05234099c3..03d5f85ff9 100644
--- a/secure/lib/libcrypto/Makefile.inc
+++ b/secure/lib/libcrypto/Makefile.inc
@@ -95,7 +95,7 @@ buildinf.h:
 
 openssl/opensslconf.h: openssl/.dummy ../../lib/libcrypto/opensslconf-${MACHINE_ARCH}.h
 .if defined(WANT_IDEA)
-	sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.ALLSRC:Nopenssl/.dummy} > ${.TARGET}
+	sed '/^# define OPENSSL_NO_IDEA$$/d;/^#  define NO_IDEA$$/d' ${.ALLSRC:Nopenssl/.dummy} > ${.TARGET}
 .else
 	cp ${.ALLSRC:Nopenssl/.dummy} ${.TARGET}
 .endif
diff --git a/secure/lib/libcrypto/opensslconf-i386.h b/secure/lib/libcrypto/opensslconf-i386.h
index 3857155776..b729ea30bf 100644
--- a/secure/lib/libcrypto/opensslconf-i386.h
+++ b/secure/lib/libcrypto/opensslconf-i386.h
@@ -17,6 +17,9 @@
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
 #endif
+#ifndef OPENSSL_NO_IDEA
+# define OPENSSL_NO_IDEA
+#endif
 #ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
 #endif
@@ -65,6 +68,9 @@
 # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
 #  define NO_GMP
 # endif
+# if defined(OPENSSL_NO_IDEA) && !(defined(NO_IDEA)
+#  define NO_IDEA
+# endif
 # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
 #  define NO_JPAKE
 # endif
diff --git a/secure/lib/libcrypto/opensslconf-x86_64.h b/secure/lib/libcrypto/opensslconf-x86_64.h
index 33f09f5e8f..a9c4746f9c 100644
--- a/secure/lib/libcrypto/opensslconf-x86_64.h
+++ b/secure/lib/libcrypto/opensslconf-x86_64.h
@@ -17,6 +17,9 @@
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP
 #endif
+#ifndef OPENSSL_NO_IDEA
+# define OPENSSL_NO_IDEA
+#endif
 #ifndef OPENSSL_NO_JPAKE
 # define OPENSSL_NO_JPAKE
 #endif
@@ -65,6 +68,9 @@
 # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
 #  define NO_GMP
 # endif
+# if defined(OPENSSL_NO_IDEA) && !(defined(NO_IDEA)
+#  define NO_IDEA
+# endif
 # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
 #  define NO_JPAKE
 # endif