From e1c2b406a8f7c3d1cb2f490ba334ebdba8cc5a99 Mon Sep 17 00:00:00 2001
From: Tomáš Mráz <tmraz@fedoraproject.org>
Date: Aug 22 2009 14:38:34 +0000
Subject: - constify SSL_CIPHER_description()


---

diff --git a/openssl-1.0.0-beta3-const.patch b/openssl-1.0.0-beta3-const.patch
new file mode 100644
index 0000000..77c1c95
--- /dev/null
+++ b/openssl-1.0.0-beta3-const.patch
@@ -0,0 +1,36 @@
+diff -up openssl-1.0.0-beta3/doc/ssl/SSL_CIPHER_get_name.pod.const openssl-1.0.0-beta3/doc/ssl/SSL_CIPHER_get_name.pod
+--- openssl-1.0.0-beta3/doc/ssl/SSL_CIPHER_get_name.pod.const	2009-02-14 22:49:37.000000000 +0100
++++ openssl-1.0.0-beta3/doc/ssl/SSL_CIPHER_get_name.pod	2009-08-22 16:15:32.000000000 +0200
+@@ -11,7 +11,7 @@ SSL_CIPHER_get_name, SSL_CIPHER_get_bits
+  const char *SSL_CIPHER_get_name(const SSL_CIPHER *cipher);
+  int SSL_CIPHER_get_bits(const SSL_CIPHER *cipher, int *alg_bits);
+  char *SSL_CIPHER_get_version(const SSL_CIPHER *cipher);
+- char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int size);
++ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int size);
+ 
+ =head1 DESCRIPTION
+ 
+diff -up openssl-1.0.0-beta3/ssl/ssl_ciph.c.const openssl-1.0.0-beta3/ssl/ssl_ciph.c
+--- openssl-1.0.0-beta3/ssl/ssl_ciph.c.const	2009-08-22 15:56:12.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/ssl_ciph.c	2009-08-22 15:56:12.000000000 +0200
+@@ -1458,7 +1458,7 @@ STACK_OF(SSL_CIPHER) *ssl_create_cipher_
+ 	return(cipherstack);
+ 	}
+ 
+-char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len)
++char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
+ 	{
+ 	int is_export,pkl,kl;
+ 	const char *ver,*exp_str;
+diff -up openssl-1.0.0-beta3/ssl/ssl.h.const openssl-1.0.0-beta3/ssl/ssl.h
+--- openssl-1.0.0-beta3/ssl/ssl.h.const	2009-08-22 15:56:11.000000000 +0200
++++ openssl-1.0.0-beta3/ssl/ssl.h	2009-08-22 15:56:12.000000000 +0200
+@@ -1638,7 +1638,7 @@ long SSL_get_default_timeout(const SSL *
+ 
+ int SSL_library_init(void );
+ 
+-char *SSL_CIPHER_description(SSL_CIPHER *,char *buf,int size);
++char *SSL_CIPHER_description(const SSL_CIPHER *,char *buf,int size);
+ STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);
+ 
+ SSL *SSL_dup(SSL *ssl);
diff --git a/openssl.spec b/openssl.spec
index 4ac5e46..da84457 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -23,7 +23,7 @@
 Summary: A general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.0
-Release: 0.3.%{beta}%{?dist}
+Release: 0.4.%{beta}%{?dist}
 # We remove certain patented algorithms from the openssl source tarball
 # with the hobble-openssl script which is included below.
 Source: openssl-%{version}-%{beta}-usa.tar.bz2
@@ -61,6 +61,7 @@ Patch47: openssl-0.9.8j-readme-warning.patch
 Patch48: openssl-0.9.8j-bad-mime.patch
 Patch49: openssl-0.9.8k-algo-doc.patch
 Patch50: openssl-1.0.0-beta3-curl.patch
+Patch51: openssl-1.0.0-beta3-const.patch
 # Backported fixes including security fixes
 Patch60: openssl-1.0.0-beta3-namingstr.patch
 Patch61: openssl-1.0.0-beta3-namingblk.patch
@@ -151,6 +152,7 @@ from other formats to the formats used by the OpenSSL toolkit.
 %patch48 -p1 -b .bad-mime
 %patch49 -p1 -b .algo-doc
 %patch50 -p1 -b .curl
+%patch51 -p1 -b .const
 %patch60 -p1 -b .namingstr
 %patch61 -p1 -b .namingblk
 
@@ -417,6 +419,9 @@ fi
 /sbin/ldconfig -X
 
 %changelog
+* Sat Aug 22 2009 Tomas Mraz <tmraz@redhat.com> 1.0.0-0.4.beta3
+- constify SSL_CIPHER_description()
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> 1.0.0-0.3.beta3
 - fix WWW:Curl:Easy reference in tsget