rpms/httpd/devel httpd-2.0.54-openssl-098.patch, NONE, 1.1 httpd.spec, 1.77, 1.78

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25198

Modified Files:
	httpd.spec 
Added Files:
	httpd-2.0.54-openssl-098.patch 
Log Message:
- allow compilation with openssl-0.9.8


httpd-2.0.54-openssl-098.patch:
 ssl_engine_pphrase.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE httpd-2.0.54-openssl-098.patch ---
--- httpd-2.0.54/modules/ssl/ssl_engine_pphrase.c.openssl-098	2005-11-04 17:52:43.000000000 +0100
+++ httpd-2.0.54/modules/ssl/ssl_engine_pphrase.c	2005-11-09 12:39:46.000000000 +0100
@@ -681,7 +681,11 @@
                     ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
                                  "Init: Failed to create pass phrase pipe '%s'",
                                  sc->server->pphrase_dialog_path);
+#ifdef PEM_F_DEF_CALLBACK
                     PEMerr(PEM_F_DEF_CALLBACK,PEM_R_PROBLEMS_GETTING_PASSWORD);
+#else
+                    PEMerr(PEM_F_PEM_DEF_CALLBACK,PEM_R_PROBLEMS_GETTING_PASSWORD);
+#endif
                     memset(buf, 0, (unsigned int)bufsize);
                     return (-1);
                 }


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- httpd.spec	9 Nov 2005 11:18:09 -0000	1.77
+++ httpd.spec	9 Nov 2005 11:40:33 -0000	1.78
@@ -76,6 +76,7 @@
 Patch91: httpd-2.0.46-testhook.patch
 Patch92: httpd-2.0.46-dumpcerts.patch
 Patch93: httpd-2.0.54-selinux.patch
+Patch94: httpd-2.0.54-openssl-098.patch
 # Security fixes
 Patch110: httpd-2.0.52-CAN-2005-1268.patch
 Patch111: httpd-2.0.52-CAN-2005-2088.patch
@@ -194,6 +195,7 @@
 %patch91 -p1 -b .testhook
 %patch92 -p1 -b .dumpcerts
 %patch93 -p1 -b .selinux
+%patch94 -p1 -b .openssl-098
 
 %patch41 -p1 -b .sslreneg