dist-git conversion

#2781)

.gitignore

@@ -0,0 +1 @@
+virtuoso-opensource-5.0.12.tar.gz

dead.package

@@ -1,3 +0,0 @@
-2016-05-19: Retired orphaned package, because it was orphaned for
-more than six weeks.
-

sources

@@ -0,0 +1 @@
+64949660e3f053ec43d00519a19751aa  virtuoso-opensource-5.0.12.tar.gz

virtuoso-opensource-5.0.11-openssl.patch

@@ -0,0 +1,114 @@
+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

@@ -0,0 +1,18 @@
+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 */

virtuoso-opensource.spec

@@ -0,0 +1,180 @@
+
+Name:	 virtuoso-opensource
+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://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
+BuildRequires: gperf
+BuildRequires: htmldoc
+## when/if we ever decide to ship .jar's
+#BuildRequires: java-devel
+BuildRequires: openldap-devel
+BuildRequires: openssl-devel
+BuildRequires: libiodbc-devel
+BuildRequires: libxml2-devel
+BuildRequires: zlib-devel
+
+Provides: virtuoso = %{version}-%{release}
+
+
+%description
+Virtuoso is a scalable cross-platform server that combines SQL/RDF/XML
+Data Management with Web Application Server and Web Services Platform
+functionality.
+
+%package apps
+Summary: Applications
+Group:   Applications/Databases
+Requires: %{name} = %{version}-%{release}
+%description apps 
+%{summary}.
+
+%package conductor
+Summary: Server pages 
+Group:   Applications/Databases
+Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description conductor 
+%{summary}.
+
+%package doc 
+Summary: Documentation 
+Group:   Documentation 
+Requires: %{name} = %{version}-%{release}
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+%description doc 
+%{summary}.
+
+%package utils
+Summary: Utilities
+Group:   Applications/Databases
+Requires: %{name} = %{version}-%{release}
+%description utils
+%{summary}.
+
+
+%prep
+%setup -q -n virtuoso-opensource%{!?snap:-%{version}}%{?snap:-%{snap}}
+
+%patch50 -p1 -b .openssl
+%patch51 -p1 -b .zlib
+
+
+%build
+# --with-debug avoids useless -debuginfo
+%configure \
+  --with-layout=redhat \
+  --enable-shared --disable-static \
+  --without-internal-zlib \
+  --with-debug \
+  --enable-iodbc \
+  --enable-openssl \
+  --enable-xml
+
+# smp busted
+make
+
+
+%install
+rm -rf %{buildroot} 
+
+make install DESTDIR=%{buildroot}
+
+mkdir -p %{buildroot}%{_sysconfdir}/virtuoso
+mv %{buildroot}%{_var}/lib/virtuoso/db/virtuoso.ini %{buildroot}%{_sysconfdir}/virtuoso/
+ln -s ../../../..%{_sysconfdir}/virtuoso/virtuoso.ini %{buildroot}%{_var}/lib/virtuoso/db/virtuoso.ini
+
+# generic'ish binaries, hide them away safely
+mkdir -p %{buildroot}%{_libexecdir}/virtuoso/
+mv %{buildroot}%{_bindir}/{inifile,isql,isqlw} \
+   %{buildroot}%{_libexecdir}/virtuoso/
+
+## unpackaged files 
+rm -vf %{buildroot}%{_libdir}/*.{la,a}
+rm -vf %{buildroot}%{_libdir}/virtuoso/hosting/*.la
+rm -vf %{buildroot}%{_libdir}/{jdbc-?.?,jena,sesame}/*.jar
+
+
+%clean
+rm -rf %{buildroot} 
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING LICENSE
+%dir %{_sysconfdir}/virtuoso/
+%config(noreplace) %{_sysconfdir}/virtuoso/virtuoso.ini
+%{_bindir}/virtuoso-t
+%{_libdir}/virt*.so
+%dir %{_datadir}/virtuoso/
+%dir %{_datadir}/virtuoso/vad/
+%dir %{_libdir}/virtuoso/
+%dir %{_libexecdir}/virtuoso/
+%dir %{_var}/lib/virtuoso
+%{_var}/lib/virtuoso/db/
+
+%files apps
+%defattr(-,root,root,-)
+%{_libdir}/virtuoso/hosting/
+%{_datadir}/virtuoso/vad/*.vad
+%exclude %{_datadir}/virtuoso/vad/conductor_dav.vad
+
+%files conductor
+%defattr(-,root,root,-)
+%{_datadir}/virtuoso/vad/conductor_dav.vad
+%{_var}/lib/virtuoso/vsp/
+
+%files doc
+%defattr(-,root,root,-)
+%{_docdir}/virtuoso/
+
+%files utils
+%defattr(-,root,root,-)
+%{_bindir}/virt_mail
+%{_libexecdir}/virtuoso/*
+
+
+%changelog
+* Tue Oct 20 2009 Rex Dieter <rdieter@fedoraproject.org> 5.0.12-1
+- virtuoso-opensource-5.0.12
+
+* Sun Oct 11 2009 Rex Dieter <rdieter@fedoraproject.rog> 5.0.12-0.1.rc9.20090916
+- virtuoso-opensource-20090916 (5.0.12-rc9)
+
+* Wed Aug 26 2009 Tomas Mraz <tmraz@redhat.com> - 5.0.11-4
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Rex Dieter <rdieter@fedoraproject.org> 5.0.11-3
+- BR: htmldoc
+- -doc subpkg
+
+* Sun Jun 07 2009 Rex Dieter <rdieter@fedoraproject.org> 5.0.11-2
+- omit remaining .la files
+- fix %%changelog
+- fix virtuoso.ini dangling symlink
+
+* Fri May 22 2009 Rex Dieter <rdieter@fedoraproject.org> 5.0.11-1
+- virtuoso-opensource-5.0.11
+