OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 25-Jan-2009 19:11:18
Branch: HEAD Handle: 2009012518111800
Modified files:
openpkg-src/apache apache.base apache.conf apache.spec
Log:
use new x509 package
Summary:
Revision Changes Path
1.34 +2 -0 openpkg-src/apache/apache.base
1.9 +4 -4 openpkg-src/apache/apache.conf
1.446 +1 -0 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.base
============================================================================
$ cvs diff -u -r1.33 -r1.34 apache.base
--- openpkg-src/apache/apache.base 25 Jan 2009 11:49:18 -0000 1.33
+++ openpkg-src/apache/apache.base 25 Jan 2009 18:11:18 -0000 1.34
@@ -294,6 +294,8 @@
SSLRandomSeed startup builtin
SSLRandomSeed connect builtin
SSLMutex sem
+ SSLCADNRequestFile @l_prefix@/etc/x509/public-ca.crt.pem
+ SSLCACertificateFile @l_prefix@/etc/x509/public-ca.crt.pem
SSLSessionCache
shm:@l_prefix@/var/apache/run/apache.ssl_scache(512000)
SSLSessionCacheTimeout 300
SSLCipherSuite
ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.conf
============================================================================
$ cvs diff -u -r1.8 -r1.9 apache.conf
--- openpkg-src/apache/apache.conf 1 Aug 2007 09:00:14 -0000 1.8
+++ openpkg-src/apache/apache.conf 25 Jan 2009 18:11:18 -0000 1.9
@@ -63,10 +63,10 @@
</Directory>
SSLEngine on
- SSLCertificateFile @l_prefix@/etc/apache/ssl.crt/snakeoil-rsa.crt
- SSLCertificateKeyFile @l_prefix@/etc/apache/ssl.key/snakeoil-rsa.key
- SSLCertificateFile @l_prefix@/etc/apache/ssl.crt/snakeoil-dsa.crt
- SSLCertificateKeyFile @l_prefix@/etc/apache/ssl.key/snakeoil-dsa.key
+ SSLCADNRequestFile @l_prefix@/etc/x509/example-ca.crt.pem
+ SSLCACertificateFile @l_prefix@/etc/x509/example-ca.crt.pem
+ SSLCertificateFile @l_prefix@/etc/x509/example-server.crt.pem
+ SSLCertificateKeyFile @l_prefix@/etc/x509/example-server.key.pem
</VirtualHost>
</IfModule>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.445 -r1.446 apache.spec
--- openpkg-src/apache/apache.spec 25 Jan 2009 10:41:06 -0000 1.445
+++ openpkg-src/apache/apache.spec 25 Jan 2009 18:11:18 -0000 1.446
@@ -99,6 +99,7 @@
%if "%{with_mod_ssl}" == "yes"
BuildPreReq: openssl >= 0.9.8
PreReq: openssl >= 0.9.8
+PreReq: x509
%endif
%if "%{with_mod_deflate}" == "yes"
BuildPreReq: zlib
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
