diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index cba1459..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -virtuoso-opensource-6.1.0.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b1b4513 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +virtuoso-opensource-6.1.2.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index a3f7440..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: virtuoso-opensource -# $Id: Makefile,v 1.1 2009/07/26 20:07:12 kevin Exp $ -NAME := virtuoso-opensource -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 72c17df..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -virtuoso-opensource-5_0_11-3_fc11:HEAD:virtuoso-opensource-5.0.11-3.fc11.src.rpm:1248640731 diff --git a/sources b/sources index fd355d3..2eaf4e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49135390d27ab3e445f5e9481ab677bb virtuoso-opensource-6.1.0.tar.gz +0519e1f104428e0c8b25fad89e3c57ef virtuoso-opensource-6.1.2.tar.gz diff --git a/virtuoso-opensource-5.0.11-openssl.patch b/virtuoso-opensource-5.0.11-openssl.patch deleted file mode 100644 index 2c959de..0000000 --- a/virtuoso-opensource-5.0.11-openssl.patch +++ /dev/null @@ -1,114 +0,0 @@ -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); - } diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec index af09771..c2a1276 100644 --- a/virtuoso-opensource.spec +++ b/virtuoso-opensource.spec @@ -3,8 +3,8 @@ %define _disable_all_vads --disable-all-vads Name: virtuoso-opensource -Version: 6.1.0 -Release: 2%{?dist} +Version: 6.1.2 +Release: 1%{?dist} Summary: A high-performance object-relational SQL database Group: Applications/Databases @@ -16,8 +16,6 @@ Source0: http://downloads.sourceforge.net/virtuoso/virtuoso-opensource-%{version BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) ## Upstreamable patches -# fix build with ossl-1.0 -Patch50: virtuoso-opensource-5.0.11-openssl.patch # based on http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/virtuoso-opensource/current/SOURCES/virtuoso-opensource-6.1.0-extern-iodbc.patch Patch51: virtuoso-opensource-6.1.0-external_iodbc.patch Patch52: virtuoso-opensource-6.1.0-nodemos_buildfix.patch @@ -40,6 +38,7 @@ Provides: virtuoso = %{version}-%{release} %if 0%{?_disable_all_vads:1} Obsoletes: virtuoso-opensource-apps < 6.1.0 Obsoletes: virtuoso-opensource-conductor < 6.1.0 +Obsoletes: virtuoso-opensource-doc < 6.1.1 %endif @@ -59,9 +58,7 @@ Requires: %{name} = %{version}-%{release} Summary: Server pages Group: Applications/Databases Requires: %{name} = %{version}-%{release} -%if 0%{?fedora} > 9 BuildArch: noarch -%endif %description conductor %{summary}. @@ -69,9 +66,7 @@ BuildArch: noarch Summary: Documentation Group: Documentation Requires: %{name} = %{version}-%{release} -%if 0%{?fedora} > 9 BuildArch: noarch -%endif %description doc %{summary}. @@ -86,7 +81,6 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}} -%patch50 -p1 -b .openssl %patch51 -p1 -b .external_iodbc %patch52 -p1 -b .nodemos_buildfix @@ -133,7 +127,11 @@ mv %{buildroot}%{_bindir}/{inifile,isql,isqlw} \ rm -vf %{buildroot}%{_bindir}/odbc_mail rm -vf %{buildroot}%{_libdir}/*.{la,a} rm -vf %{buildroot}%{_libdir}/virtuoso/hosting/*.la -rm -vf %{buildroot}%{_libdir}/{jdbc-?.?,jena,sesame}/*.jar +%if 0%{?_disable_all_vads:1} +rm -rvf %{buildroot}%{_docdir}/virtuoso/ +rm -rvf %{buildroot}%{_libdir}/sesame/ +rm -vf %{buildroot}%{_libdir}/{hibernate,jdbc-?.?,jena,sesame}/*.jar +%endif %check @@ -147,7 +145,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc AUTHORS COPYING LICENSE +%doc AUTHORS ChangeLog COPYING CREDITS LICENSE %dir %{_sysconfdir}/virtuoso/ %config(noreplace) %{_sysconfdir}/virtuoso/virtuoso.ini %{_bindir}/virtuoso-t @@ -170,11 +168,11 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_datadir}/virtuoso/vad/conductor_dav.vad %{_var}/lib/virtuoso/vsp/ -%endif %files doc %defattr(-,root,root,-) %{_docdir}/virtuoso/ +%endif %files utils %defattr(-,root,root,-) @@ -183,6 +181,13 @@ rm -rf %{buildroot} %changelog +* Wed Jul 21 2010 Rex Dieter 6.1.2-1 +- virtuoso-opensource-6.1.2 + +* Mon May 10 2010 Rex Dieter 6.1.1-1 +- virtuoso-opensource-6.1.1 +- Obsoletes: -doc + * Tue Feb 09 2010 Rex Dieter 6.1.0-2 - fix Obsoletes: -apps,-conductor