head	1.2;
access;
symbols
	RELEASE_7_3_0:1.1
	RELEASE_8_0_0:1.1
	RELEASE_7_2_0:1.1
	RELEASE_7_1_0:1.1
	RELEASE_6_4_0:1.1
	RELEASE_5_EOL:1.1
	RELEASE_7_0_0:1.1
	RELEASE_6_3_0:1.1
	PRE_XORG_7:1.1
	RELEASE_4_EOL:1.1
	RELEASE_6_2_0:1.1
	RELEASE_6_1_0:1.1
	RELEASE_5_5_0:1.1;
locks; strict;
comment	@# @;


1.2
date	2010.05.06.03.37.33;	author pgollucci;	state dead;
branches;
next	1.1;

1.1
date	2005.09.10.14.45.03;	author clement;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- openssl patch is unconditionally applied

With Hat:   apache@@
@
text
@--- modules/ssl/ssl_toolkit_compat.h.orig	Fri Feb  4 21:21:18 2005
+++ modules/ssl/ssl_toolkit_compat.h	Tue Aug 30 01:42:51 2005
@@@@ -99,6 +99,13 @@@@
 #define HAVE_SSL_X509V3_EXT_d2i
 #endif
 
+#ifndef PEM_F_DEF_CALLBACK
+#ifdef PEM_F_PEM_DEF_CALLBACK
+/* In OpenSSL 0.9.8 PEM_F_DEF_CALLBACK was renamed */
+#define PEM_F_DEF_CALLBACK PEM_F_PEM_DEF_CALLBACK
+#endif
+#endif
+
 #elif defined (SSLC_VERSION_NUMBER) /* RSA */
 
 /* sslc does not support this function, OpenSSL has since 9.5.1 */
@


1.1
log
@- Sync with www/apache2
@
text
@@

