From owner-p4-projects@FreeBSD.ORG  Thu Aug 20 11:10:21 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 24F04106568F; Thu, 20 Aug 2009 11:10:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DD997106568D
	for <perforce@freebsd.org>; Thu, 20 Aug 2009 11:10:20 +0000 (UTC)
	(envelope-from bz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CD6038FC57
	for <perforce@freebsd.org>; Thu, 20 Aug 2009 11:10:20 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7KBAKY4020042
	for <perforce@freebsd.org>; Thu, 20 Aug 2009 11:10:20 GMT
	(envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7KBAKGo020040
	for perforce@freebsd.org; Thu, 20 Aug 2009 11:10:20 GMT
	(envelope-from bz@freebsd.org)
Date: Thu, 20 Aug 2009 11:10:20 GMT
Message-Id: <200908201110.n7KBAKGo020040@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bz@freebsd.org using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 167528 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Aug 2009 11:10:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=167528

Change 167528 by bz@bz_dumpster on 2009/08/20 11:09:20

	Adjust like SVN r194207 did for other archs.
	
	Found with help from:	simon

Affected files ...

.. //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390.h#4 edit
.. //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390x.h#4 edit

Differences ...

==== //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390.h#4 (text+ko) ====

@@ -9,6 +9,18 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_CMS
+# define OPENSSL_NO_CMS
+#endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_SEED
+# define OPENSSL_NO_SEED
+#endif
+/* jpake is marked experimental in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_JPAKE
+# define OPENSSL_NO_JPAKE
+#endif
 /* libgmp is not in the FreeBSD base system. */
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP

==== //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390x.h#4 (text+ko) ====

@@ -9,6 +9,18 @@
 #ifndef OPENSSL_NO_CAMELLIA
 # define OPENSSL_NO_CAMELLIA
 #endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_CMS
+# define OPENSSL_NO_CMS
+#endif
+/* Disabled by default in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_SEED
+# define OPENSSL_NO_SEED
+#endif
+/* jpake is marked experimental in OpenSSL 0.9.8. */
+#ifndef OPENSSL_NO_JPAKE
+# define OPENSSL_NO_JPAKE
+#endif
 /* libgmp is not in the FreeBSD base system. */
 #ifndef OPENSSL_NO_GMP
 # define OPENSSL_NO_GMP