Hello community,

here is the log from the commit of package virtuoso for openSUSE:Factory
checked in at Fri Jul 8 15:49:40 CEST 2011.



--------
--- virtuoso/virtuoso.changes   2011-06-27 12:48:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/virtuoso/virtuoso.changes      2011-07-08 
13:18:23.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jul  8 10:00:01 UTC 2011 - idon...@novell.com
+
+- Also package isql/isqlw binaries, useful for debugging Nepomuk 
+- Apply isql-buffer-overflow.patch to fix isql.c buffer overflow
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  isql-buffer-overflow.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ virtuoso.spec ++++++
--- /var/tmp/diff_new_pack.jA2it3/_old  2011-07-08 15:48:50.000000000 +0200
+++ /var/tmp/diff_new_pack.jA2it3/_new  2011-07-08 15:48:50.000000000 +0200
@@ -19,7 +19,7 @@
 
 Name:           virtuoso
 Version:        6.1.3
-Release:        1
+Release:        3
 License:        GPLv2
 Summary:        Relational database server with RDF
 Url:            http://virtuoso.openlinksw.com/
@@ -32,6 +32,8 @@
 Patch1:         rpmlint-fixes.diff
 # PATCH-FIX-OPENSUSE virtuoso-opensource-6.1.0-external_iodbc.patch 
asterios.dra...@gmail.com -- Build with external iodbc
 Patch2:         virtuoso-opensource-6.1.0-external_iodbc.patch
+# PATCH-FIX-UPSTREAM isql-buffer-overflow.patch idoen...@suse.de -- Fix buffer 
overflow in isql.c
+Patch3:         isql-buffer-overflow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  fastjar
@@ -92,12 +94,17 @@
 %patch0
 %patch1
 %patch2 -p1
+%patch3
 
 %build
 rm -rf libsrc/util/pcrelib
 # autogen.sh because of patching Makefile.am
 ./autogen.sh
-%configure --without-internal-zlib --disable-static --with-layout=openSUSE 
--disable-all-vads --with-iodbc=%{_prefix}
+%configure --without-internal-zlib \
+           --disable-static \
+           --with-layout=openSUSE \
+           --disable-all-vads \
+           --with-iodbc=%{_prefix}
 make %{?_smp_mflags}
 
 %install
@@ -106,6 +113,14 @@
 # Both binaries with and without libiodbc are built, keep the iodbc one
 mv %{buildroot}%{_bindir}/virtuoso-iodbc-t %{buildroot}%{_bindir}/virtuoso-t
 
+# Provide useful utilities
+mkdir -p %{buildroot}%{_libdir}/virtuoso
+rm %{buildroot}%{_bindir}/inifile
+rm %{buildroot}%{_bindir}/isql
+rm %{buildroot}%{_bindir}/isqlw
+mv %{buildroot}%{_bindir}/isql-iodbc %{buildroot}%{_libdir}/virtuoso/isql
+mv %{buildroot}%{_bindir}/isqlw-iodbc %{buildroot}%{_libdir}/virtuoso/isqlw
+
 %files
 %defattr(-,root,root,-)
 %dir %{_defaultdocdir}/virtuoso
@@ -113,7 +128,10 @@
 
 %files -n virtuoso-server
 %defattr(-,root,root,-)
+%dir %{_libdir}/virtuoso
 %{_bindir}/virtuoso-t
+%{_libdir}/virtuoso/isql
+%{_libdir}/virtuoso/isqlw
 
 %files -n virtuoso-drivers
 %defattr(-,root,root,-)

++++++ build-sanely.diff ++++++
--- /var/tmp/diff_new_pack.jA2it3/_old  2011-07-08 15:48:50.000000000 +0200
+++ /var/tmp/diff_new_pack.jA2it3/_new  2011-07-08 15:48:50.000000000 +0200
@@ -56,7 +56,7 @@
  #  
  
 -SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting 
bpel b3s tutorial yacutia samples vsp ws sync vspx vad cached_resources 
virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena 
sesame sesame2 sesame3 redland hibernate
-+SUBDIRS = virtuoso driver
++SUBDIRS = virtuoso driver tests
  
  
  # ----------------------------------------------------------------------

++++++ isql-buffer-overflow.patch ++++++
--- binsrc/tests/isql.c 2011-03-28 15:09:54.000000000 +0200
+++ binsrc/tests/isql.c 2011-07-08 13:08:16.359078462 +0200
@@ -10251,7 +10251,7 @@
 {
   TCHAR tmp1[2002];
 
-  return (isqlt_fgetts (tmp1, (sizeof (tmp1) - 1), html_infp));
+  return (isqlt_fgetts (tmp1, ((sizeof (tmp1) / sizeof (TCHAR)) - 1), 
html_infp));
 }
 
 /* Return the whole string in one piece. After that return NULL.

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to