packages: apache1-mod_ssl/apache1-mod_ssl.spec, apache1-mod_ssl/openssl.pat...

[glen]

Author: glen                         Date: Wed Jul 14 15:14:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- openssl 1.0 patch, builds

---- Files affected:
packages/apache1-mod_ssl:
   apache1-mod_ssl.spec (1.132 -> 1.133) , openssl.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/apache1-mod_ssl/apache1-mod_ssl.spec
diff -u packages/apache1-mod_ssl/apache1-mod_ssl.spec:1.132 packages/apache1-mod_ssl/apache1-mod_ssl.spec:1.133
--- packages/apache1-mod_ssl/apache1-mod_ssl.spec:1.132	Mon Apr 26 13:01:33 2010
+++ packages/apache1-mod_ssl/apache1-mod_ssl.spec	Wed Jul 14 17:14:02 2010
@@ -22,7 +22,7 @@
 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
@@ -34,6 +34,7 @@
 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
@@ -171,16 +172,17 @@
 
 %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, at 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 \
@@ -282,6 +284,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.133  2010/07/14 15:14:02  glen
+- openssl 1.0 patch, builds
+
 Revision 1.132  2010/04/26 11:01:33  glen
 - not so strict apache dep, but needs openssl 1.0 fix
 

================================================================
Index: packages/apache1-mod_ssl/openssl.patch
diff -u /dev/null packages/apache1-mod_ssl/openssl.patch:1.1
--- /dev/null	Wed Jul 14 17:14:07 2010
+++ packages/apache1-mod_ssl/openssl.patch	Wed Jul 14 17:14:02 2010
@@ -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;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache1-mod_ssl/apache1-mod_ssl.spec?r1=1.132&r2=1.133&f=u