rpms/virtuoso-opensource/F-11 virtuoso-opensource-5.0.11-openssl.patch, NONE, 1.1 virtuoso-opensource-5.0.12-zlib.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 virtuoso-opensource.spec, 1.1, 1.2
Rex Dieter
rdieter at fedoraproject.org
Tue Oct 20 14:37:35 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/virtuoso-opensource/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22100
Modified Files:
.cvsignore sources virtuoso-opensource.spec
Added Files:
virtuoso-opensource-5.0.11-openssl.patch
virtuoso-opensource-5.0.12-zlib.patch
Log Message:
* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
- virtuoso-opensource-5.0.12
virtuoso-opensource-5.0.11-openssl.patch:
Dk/Dkernel.c | 24 ++++++++++++++----------
Wi/http.c | 12 ++++++------
2 files changed, 20 insertions(+), 16 deletions(-)
--- NEW FILE virtuoso-opensource-5.0.11-openssl.patch ---
diff -up virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c.openssl virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c
--- virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c.openssl 2009-04-17 22:07:28.000000000 +0200
+++ virtuoso-opensource-5.0.11/libsrc/Dk/Dkernel.c 2009-08-26 16:03:23.000000000 +0200
@@ -4798,7 +4798,11 @@ dk_ssl_free (void *old)
static void
ssl_server_init ()
{
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+ const SSL_METHOD *ssl_server_method = NULL;
+#else
SSL_METHOD *ssl_server_method = NULL;
+#endif
unsigned char tmp[1024];
#ifndef NO_THREAD
char err_buf[1024];
@@ -4888,12 +4892,12 @@ ssl_server_init ()
SSL_CTX_set_session_id_context (ssl_server_ctx, (unsigned char *) &session_id_context, sizeof session_id_context);
skCAList = SSL_CTX_get_client_CA_list (ssl_server_ctx);
- if (sk_num ((STACK *) skCAList) == 0)
+ if (sk_X509_NAME_num (skCAList) == 0)
log_warning ("ODBC X509 Client authentication requested but no CA known for verification");
- for (i = 0; i < sk_num ((STACK *) skCAList); i++)
+ for (i = 0; i < sk_X509_NAME_num (skCAList); i++)
{
char ca_buf[1024];
- X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
+ X509_NAME *ca_name = (X509_NAME *) sk_X509_NAME_value (skCAList, i);
if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
log_debug ("ODBC Server Using X509 Client CA %s", ca_buf);
}
@@ -5058,7 +5062,7 @@ ssl_setup:
if (ca && ca[0] != 0)
{
- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+ sk_X509_pop_free (ca_list, X509_free);
ca_list = NULL;
ca_list = PEM_load_certs (ca, passwd);
}
@@ -5067,30 +5071,30 @@ ssl_setup:
{
X509_free (cert);
EVP_PKEY_free (pkey);
- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+ sk_X509_pop_free (ca_list, X509_free);
return 0;
}
EVP_PKEY_free (pkey);
if (!SSL_use_certificate (ssl, cert))
{
X509_free (cert);
- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+ sk_X509_pop_free (ca_list, X509_free);
return 0;
}
X509_free (cert);
if (!SSL_check_private_key (ssl))
{
- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+ sk_X509_pop_free (ca_list, X509_free);
return 0;
}
- for (i = 0; i < sk_num ((STACK *) ca_list); i++)
+ for (i = 0; i < sk_X509_num (ca_list); i++)
{
- X509 *ca = (X509 *) sk_value ((STACK *) ca_list, i);
+ X509 *ca = sk_X509_value (ca_list, i);
SSL_add_client_CA (ssl, ca);
X509_STORE_add_cert (SSL_CTX_get_cert_store (ssl_ctx), ca);
}
- sk_pop_free ((STACK *) ca_list, (void (*)(void *)) X509_free);
+ sk_X509_pop_free (ca_list, X509_free);
return 1;
}
diff -up virtuoso-opensource-5.0.11/libsrc/Wi/http.c.openssl virtuoso-opensource-5.0.11/libsrc/Wi/http.c
--- virtuoso-opensource-5.0.11/libsrc/Wi/http.c.openssl 2009-04-19 23:48:56.000000000 +0200
+++ virtuoso-opensource-5.0.11/libsrc/Wi/http.c 2009-08-26 16:28:03.000000000 +0200
@@ -7601,13 +7601,13 @@ http_set_ssl_listen (dk_session_t * list
SSL_CTX_set_client_CA_list (ssl_ctx, skCAList);
skCAList = SSL_CTX_get_client_CA_list(ssl_ctx);
- if (sk_num((STACK *) skCAList) == 0)
+ if (sk_X509_NAME_num(skCAList) == 0)
log_warning ("HTTPS Client authentication requested but no CA known for verification");
- for (i = 0; i < sk_num((STACK *) skCAList); i++)
+ for (i = 0; i < sk_X509_NAME_num(skCAList); i++)
{
char ca_buf[1024];
- X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
+ X509_NAME *ca_name = sk_X509_NAME_value (skCAList, i);
if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
log_debug ("HTTPS Using X509 Client CA %s", ca_buf);
}
@@ -9697,13 +9697,13 @@ http_init_part_two ()
SSL_CTX_set_client_CA_list (ssl_ctx, skCAList);
skCAList = SSL_CTX_get_client_CA_list (ssl_ctx);
- if (sk_num((STACK *) skCAList) == 0)
+ if (sk_X509_NAME_num(skCAList) == 0)
log_warning ("HTTPS Client authentication requested but no CA known for verification");
- for (i = 0; i < sk_num((STACK *) skCAList); i++)
+ for (i = 0; i < sk_X509_NAME_num(skCAList); i++)
{
char ca_buf[1024];
- X509_NAME *ca_name = (X509_NAME *) sk_value ((STACK *) skCAList, i);
+ X509_NAME *ca_name = sk_X509_NAME_value (skCAList, i);
if (X509_NAME_oneline (ca_name, ca_buf, sizeof (ca_buf)))
log_debug ("HTTPS Using X509 Client CA %s", ca_buf);
}
virtuoso-opensource-5.0.12-zlib.patch:
bif_file.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- NEW FILE virtuoso-opensource-5.0.12-zlib.patch ---
diff -up virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c
--- virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c.zlib 2009-10-16 05:27:36.000000000 -0500
+++ virtuoso-opensource-5.0.12/libsrc/Wi/bif_file.c 2009-10-20 08:42:56.060132625 -0500
@@ -57,7 +57,13 @@
#endif
#include "zlib.h"
-#include "zutil.h"
+/* #include "zutil.h" */
+#if MAX_MEM_LEVEL >= 8
+# define DEF_MEM_LEVEL 8
+#else
+# define DEF_MEM_LEVEL MAX_MEM_LEVEL
+#endif
+
#include "srvmultibyte.h"
#define FS_MAX_STRING (10L * 1024L * 1024L) /* allow files up to 10 MB */
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 27 Jul 2009 15:37:09 -0000 1.2
+++ .cvsignore 20 Oct 2009 14:37:31 -0000 1.3
@@ -1 +1 @@
-virtuoso-opensource-5.0.11.tar.gz
+virtuoso-opensource-5.0.12.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 27 Jul 2009 15:37:10 -0000 1.2
+++ sources 20 Oct 2009 14:37:31 -0000 1.3
@@ -1 +1 @@
-9d5507b2a8d244c62f32f1203f10b9d1 virtuoso-opensource-5.0.11.tar.gz
+64949660e3f053ec43d00519a19751aa virtuoso-opensource-5.0.12.tar.gz
Index: virtuoso-opensource.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virtuoso-opensource/F-11/virtuoso-opensource.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- virtuoso-opensource.spec 27 Jul 2009 15:37:10 -0000 1.1
+++ virtuoso-opensource.spec 20 Oct 2009 14:37:32 -0000 1.2
@@ -1,15 +1,24 @@
+
Name: virtuoso-opensource
-Version: 5.0.11
-Release: 3%{?dist}
+Version: 5.0.12
+Release: 1%{?dist}
Summary: A high-performance object-relational SQL database
Group: Applications/Databases
# see LICENSE for exception details
License: GPLv2 with exceptions
URL: http://virtuoso.sourceforge.net/
-Source0: http://download.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version}.tar.gz
+#Source0: ftp://download.openlinksw.com/support/vos/virtuoso-opensource-%{snap}.tar.gz
+Patch1: virtuoso-opensource-5.0.11-openssl.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+## Upstreamable patches
+# fix build with ossl-1.0
+Patch50: virtuoso-opensource-5.0.11-openssl.patch
+# fix build --with-external-zlib
+Patch51: virtuoso-opensource-5.0.12-zlib.patch
+
BuildRequires: automake libtool
BuildRequires: bison
BuildRequires: flex
@@ -19,7 +28,9 @@ BuildRequires: htmldoc
#BuildRequires: java-devel
BuildRequires: openldap-devel
BuildRequires: openssl-devel
+BuildRequires: libiodbc-devel
BuildRequires: libxml2-devel
+BuildRequires: zlib-devel
Provides: virtuoso = %{version}-%{release}
@@ -65,7 +76,10 @@ Requires: %{name} = %{version}-%{release
%prep
-%setup -q -n virtuoso-opensource-%{version}
+%setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}}
+
+%patch50 -p1 -b .openssl
+%patch51 -p1 -b .zlib
%build
@@ -73,7 +87,11 @@ Requires: %{name} = %{version}-%{release
%configure \
--with-layout=redhat \
--enable-shared --disable-static \
- --with-debug
+ --without-internal-zlib \
+ --with-debug \
+ --enable-iodbc \
+ --enable-openssl \
+ --enable-xml
# smp busted
make
@@ -139,6 +157,15 @@ rm -rf %{buildroot}
%changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.12-1
+- virtuoso-opensource-5.0.12
+
+* Sun Oct 11 2009 Rex Dieter <rdieter at fedoraproject.rog> 5.0.12-0.1.rc9.20090916
+- virtuoso-opensource-20090916 (5.0.12-rc9)
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 5.0.11-4
+- rebuilt with new openssl
+
* Fri Jul 24 2009 Rex Dieter <rdieter at fedoraproject.org> 5.0.11-3
- BR: htmldoc
- -doc subpkg
More information about the scm-commits
mailing list