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/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/dead.package b/dead.package new file mode 100644 index 0000000..164cb9a --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2016-05-19: Retired orphaned package, because it was orphaned for +more than six weeks. + 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 deleted file mode 100644 index fd355d3..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -49135390d27ab3e445f5e9481ab677bb virtuoso-opensource-6.1.0.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-6.1.0-external_iodbc.patch b/virtuoso-opensource-6.1.0-external_iodbc.patch deleted file mode 100644 index 55a4915..0000000 --- a/virtuoso-opensource-6.1.0-external_iodbc.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up virtuoso-opensource-6.1.0/configure.external_iodbc virtuoso-opensource-6.1.0/configure ---- virtuoso-opensource-6.1.0/configure.external_iodbc 2010-02-03 14:54:32.000000000 -0600 -+++ virtuoso-opensource-6.1.0/configure 2010-02-04 08:16:53.058591521 -0600 -@@ -26773,7 +26773,7 @@ _ACEOF - # - if test "x$virt_do_iodbc" = "xyes" - then -- iodbc_CPPFLAGS="-I$virt_iodbc_dir/include" -+ iodbc_CPPFLAGS=`pkg-config --cflags libiodbc` - - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$iodbc_CPPFLAGS $CPPFLAGS" -@@ -26936,7 +26936,7 @@ done - - ccincl="$iodbc_CPPFLAGS $ccincl" - -- iodbc_LDFLAGS="-L$virt_iodbc_dir/lib -liodbc -liodbcinst $LIBDL" -+ iodbc_LDFLAGS=`pkg-config --libs libiodbc` - { $as_echo "$as_me:$LINENO: checking for SQLTables in -liodbc" >&5 - $as_echo_n "checking for SQLTables in -liodbc... " >&6; } - if test "${ac_cv_lib_iodbc_SQLTables+set}" = set; then -diff -up virtuoso-opensource-6.1.0/configure.in.external_iodbc virtuoso-opensource-6.1.0/configure.in ---- virtuoso-opensource-6.1.0/configure.in.external_iodbc 2010-02-03 14:49:18.000000000 -0600 -+++ virtuoso-opensource-6.1.0/configure.in 2010-02-04 08:16:51.265605024 -0600 -@@ -1833,7 +1833,7 @@ AC_DEFINE(NO_UDBC_SDK,1, [Define if usin - # - if test "x$virt_do_iodbc" = "xyes" - then -- iodbc_CPPFLAGS="-I$virt_iodbc_dir/include" -+ iodbc_CPPFLAGS=`pkg-config --cflags libiodbc` - - saved_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$iodbc_CPPFLAGS $CPPFLAGS" -@@ -1842,7 +1842,7 @@ then - - ccincl="$iodbc_CPPFLAGS $ccincl" - -- iodbc_LDFLAGS="-L$virt_iodbc_dir/lib -liodbc -liodbcinst $LIBDL" -+ iodbc_LDFLAGS=`pkg-config --libs libiodbc` - AC_CHECK_LIB(iodbc, SQLTables, - [ - virt_do_iodbc="yes" diff --git a/virtuoso-opensource-6.1.0-nodemos_buildfix.patch b/virtuoso-opensource-6.1.0-nodemos_buildfix.patch deleted file mode 100644 index f6d2796..0000000 --- a/virtuoso-opensource-6.1.0-nodemos_buildfix.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am ---- virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am.nodemos_buildfix 2009-08-31 03:08:47.000000000 -0500 -+++ virtuoso-opensource-6.1.0/binsrc/samples/demo/Makefile.am 2010-02-04 11:51:33.650603771 -0600 -@@ -164,6 +164,7 @@ install-data-local: - chmod +x install_ini.sh - mkdir -p "$(DESTDIR)$(dbdir)" - $(SHELL) install_ini.sh database -+if WITH_DEMO_VAD - if WITH_HTMLDOC - mkdir -p "$(DESTDIR)$(htmldocdir)" - $(INSTALL_DATA) $(top_srcdir)/docsrc/html_virt/*.html "$(DESTDIR)$(htmldocdir)" -@@ -173,6 +174,7 @@ if WITH_HTMLDOC - (cd $(top_srcdir)/docsrc/images; find . -name \*.png -print | cpio -dump "$(DESTDIR)$(htmldocdir)/../images") - (cd $(top_srcdir)/docsrc/images; find . -name \*.ico -print | cpio -dump "$(DESTDIR)$(htmldocdir)/../images") - endif -+endif - - uninstall-local: - rm -f "$(DESTDIR)$(dbdir)/virtuoso.ini" -diff -up virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am ---- virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am.nodemos_buildfix 2008-04-15 16:47:43.000000000 -0500 -+++ virtuoso-opensource-6.1.0/binsrc/vsp/Makefile.am 2010-02-04 11:57:45.894591421 -0600 -@@ -24,6 +24,7 @@ - #dist_httproot_DATA = *.html *.css *.txt - - install-data-local: -+if WITH_DEMO_VAD - @echo Installing in "$(httprootdir)" - mkdir -p "$(DESTDIR)$(httprootdir)" - mkdir -p "$(DESTDIR)$(httprootdir)"/images -@@ -37,6 +38,7 @@ install-data-local: - $(INSTALL_DATA) images/*.png "$(DESTDIR)$(httprootdir)"/images - $(INSTALL_DATA) images/*.jpg "$(DESTDIR)$(httprootdir)"/images - $(INSTALL_DATA) vsmx/*.* "$(DESTDIR)$(httprootdir)"/vsmx -+endif - - - uninstall-local: diff --git a/virtuoso-opensource.spec b/virtuoso-opensource.spec deleted file mode 100644 index af09771..0000000 --- a/virtuoso-opensource.spec +++ /dev/null @@ -1,216 +0,0 @@ - -# set to omit demos -%define _disable_all_vads --disable-all-vads - -Name: virtuoso-opensource -Version: 6.1.0 -Release: 2%{?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 -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 - -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} - -%if 0%{?_disable_all_vads:1} -Obsoletes: virtuoso-opensource-apps < 6.1.0 -Obsoletes: virtuoso-opensource-conductor < 6.1.0 -%endif - - -%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 .external_iodbc -%patch52 -p1 -b .nodemos_buildfix - -./autogen.sh - - -%build -# --with-debug avoids useless -debuginfo -%configure \ - --with-layout=redhat \ - --enable-shared --disable-static \ - --without-internal-zlib \ - --with-debug \ - --with-iodbc \ - --enable-openssl \ - --disable-imagemagick \ - %{?_disable_all_vads} - -make %{?_smp_mflags} - - -%install -rm -rf %{buildroot} - -make install DESTDIR=%{buildroot} - -# silly that both binaries with internal vs. external libiodbc get built -mv %{buildroot}%{_bindir}/virtuoso-iodbc-t %{buildroot}%{_bindir}/virtuoso-t -mv %{buildroot}%{_bindir}/isql-iodbc %{buildroot}%{_bindir}/isql -mv %{buildroot}%{_bindir}/isqlw-iodbc %{buildroot}%{_bindir}/isqlw -mv %{buildroot}%{_bindir}/odbc_mail %{buildroot}%{_bindir}/virt_mail - -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 -# iodbc-ized version of virt_mail, meh. -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 - - -%check -## these take a very long time -#make check - - -%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/ - -%if ! 0%{?_disable_all_vads:1} -%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/ -%endif - -%files doc -%defattr(-,root,root,-) -%{_docdir}/virtuoso/ - -%files utils -%defattr(-,root,root,-) -%{_bindir}/virt_mail -%{_libexecdir}/virtuoso/* - - -%changelog -* Tue Feb 09 2010 Rex Dieter 6.1.0-2 -- fix Obsoletes: -apps,-conductor - -* Thu Feb 04 2010 Rex Dieter 6.1.0-1 -- virtuoso-opensource-6.1.0 -- build only what we need for nepomuk, Obsoletes: -apps,-conductor - -* Sat Jan 09 2010 Rex Dieter 6.0.0-1 -- virtuoso-opensource-6.0.0 - -* Tue Oct 20 2009 Rex Dieter 5.0.12-1 -- virtuoso-opensource-5.0.12 - -* Sun Oct 11 2009 Rex Dieter 5.0.12-0.1.rc9.20090916 -- virtuoso-opensource-20090916 (5.0.12-rc9) - -* Wed Aug 26 2009 Tomas Mraz - 5.0.11-4 -- rebuilt with new openssl - -* Fri Jul 24 2009 Rex Dieter 5.0.11-3 -- BR: htmldoc -- -doc subpkg - -* Sun Jun 07 2009 Rex Dieter 5.0.11-2 -- omit remaining .la files -- fix %%changelog -- fix virtuoso.ini dangling symlink - -* Fri May 22 2009 Rex Dieter 5.0.11-1 -- virtuoso-opensource-5.0.11 -