OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Matthias Kurz
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Jul-2005 21:32:58
Branch: HEAD Handle: 2005072420325800
Modified files:
openpkg-src/apache2 apache2.spec
Log:
incompatible API change in OpenSSL 0.9.8
include/openssl/pem.h: PEM_F_DEF_CALLBACK -> PEM_F_PEM_DEF_CALLBACK
Summary:
Revision Changes Path
1.63 +8 -5 openpkg-src/apache2/apache2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.spec
============================================================================
$ cvs diff -u -r1.62 -r1.63 apache2.spec
--- openpkg-src/apache2/apache2.spec 18 Jun 2005 10:23:17 -0000 1.62
+++ openpkg-src/apache2/apache2.spec 24 Jul 2005 19:32:58 -0000 1.63
@@ -39,7 +39,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20050618
+Release: 20050724
# package options (suexec related)
%option with_suexec yes
@@ -74,12 +74,12 @@
PreReq: zlib
%endif
%if "%{with_mod_ssl}" == "yes"
-BuildPreReq: openssl
-PreReq: openssl
+BuildPreReq: openssl >= 0.9.8
+PreReq: openssl >= 0.9.8
%endif
%if "%{with_mod_ldap}" == "yes"
-BuildPreReq: openldap, openssl
-PreReq: openldap, openssl
+BuildPreReq: openldap, openssl >= 0.9.8
+PreReq: openldap, openssl >= 0.9.8
%endif
%if "%{with_mod_perl}" == "yes"
BuildPreReq: perl
@@ -123,6 +123,9 @@
%if "%{with_mod_perl}" == "yes"
%setup -q -T -D -a 1
%endif
+ # incompatible API change in OpenSSL 0.9.8
+ %{l_shtool} subst -e 's,PEM_F_DEF_CALLBACK,PEM_F_PEM_DEF_CALLBACK,g' \
+ `find . -type f | xargs grep -l PEM_F_DEF_CALLBACK`
%build
# optionally prepare mod_perl
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
