- openssl 1.0 patch, builds

Changed files:
    apache1-mod_ssl.spec -> 1.133
    openssl.patch -> 1.1

diff --git a/apache1-mod_ssl.spec b/apache1-mod_ssl.spec
index 4232a2f99787b3788703aa47b644246f848b9b60..a306626bcfa3cd8e3465ee5dc119e3c18ebf0e89 100644 (file)
--- a/apache1-mod_ssl.spec
+++ b/apache1-mod_ssl.spec
@@ -21,7 +21,7 @@ Summary(sv.UTF-8):    Kryptografistöd till webbservern Apache
 Summary(uk.UTF-8):     Модуль підтримки SSL в Apache
 Name:          apache1-mod_%{mod_name}
 Version:       %{SSLVER}_%{APACHEVER}
-Release:       4
+Release:       5
 License:       BSD
 Group:         Networking/Daemons
 Source0:       http://www.modssl.org/source/mod_%{mod_name}-%{SSLVER}-%{APACHEVER}.tar.gz
@@ -33,6 +33,7 @@ Source4:      %{name}-sxnet.html
 Patch1:                mod_%{mod_name}-cca-openssl-path.patch
 Patch2:                mod_%{mod_name}-db3.patch
 Patch3:                %{name}-nohttpd.patch
+Patch4:                openssl.patch
 URL:           http://www.modssl.org/
 BuildRequires: apache1-devel >= %{APACHEVER}
 BuildRequires: db-devel >= 4.1
@@ -170,16 +171,17 @@ System.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{SSLVER}-%{APACHEVER}
+%{__tar} -C pkg.contrib -xf pkg.contrib/sxnet.tar
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__sed} -i -e 's@ /lib /usr/lib @ /%{_lib} /usr/%{_lib} @' pkg.sslmod/libssl.module
 %{__sed} -i -e 's,@APACHE_VERSION@,%{APACHEVER},' configure
-%{__tar} -C pkg.contrib -xf pkg.contrib/sxnet.tar
 
 %build
-SSL_BASE=SYSTEM; export SSL_BASE
+export SSL_BASE=SYSTEM
 %configure \
        --with-apxs=%{apxs} \
        --enable-shared=ssl \

diff --git a/openssl.patch b/openssl.patch
new file mode 100644 (file)
index 0000000..b5bd09e
--- /dev/null
+++ b/openssl.patch
@@ -0,0 +1,31 @@
+--- mod_ssl-2.8.31-1.3.41/pkg.sslmod/ssl_util_ssl.c~   2010-07-14 17:11:10.000000000 +0300
++++ mod_ssl-2.8.31-1.3.41/pkg.sslmod/ssl_util_ssl.c    2010-07-14 17:11:14.991199635 +0300
+@@ -324,7 +324,7 @@
+ {
+     X509_EXTENSION *ext;
+     int ext_nid;
+-    STACK *sk;
++    STACK_OF(SSL_CIPHER) *sk;
+     BOOL is_sgc;
+     int idx;
+     int i;
+@@ -333,7 +333,7 @@
+     idx = X509_get_ext_by_NID(cert, NID_ext_key_usage, -1);
+     if (idx >= 0) {
+         ext = X509_get_ext(cert, idx);
+-        if ((sk = (STACK *)X509V3_EXT_d2i(ext)) != NULL) {
++        if ((sk = X509V3_EXT_d2i(ext)) != NULL) {
+             for (i = 0; i < sk_num(sk); i++) {
+                 ext_nid = OBJ_obj2nid((ASN1_OBJECT *)sk_value(sk, i));
+                 if (ext_nid == NID_ms_sgc || ext_nid == NID_ns_sgc) {
+--- mod_ssl-2.8.31-1.3.41/pkg.contrib/sxnet/sxnet.c~   1999-05-20 13:09:23.000000000 +0300
++++ mod_ssl-2.8.31-1.3.41/pkg.contrib/sxnet/sxnet.c    2010-07-14 17:23:56.590709905 +0300
+@@ -92,7 +92,7 @@
+   ASN1_CTX c;
+   int i;
+   ASN1_INTEGER *version=NULL;
+-  STACK *sk;
++  STACK_OF(SSL_CIPHER) *sk;
+   THAWTE_SXNET_INTERNAL *t;
+   int ret=1;
+   int count=0;