retitle 697190 unblock: virtuoso-opensource/6.1.4+dfsg1-3 tags 697190 - moreinfo thanks
Hello, I've uploaded Virtuoso again because in the -2 revision of the package I did wrong fix for this bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677286 Hopefully it's now fixed correctly. I'm attaching the debdiff against the testing version.
diff -Nru virtuoso-opensource-6.1.4+dfsg1/debian/changelog virtuoso-opensource-6.1.4+dfsg1/debian/changelog
--- virtuoso-opensource-6.1.4+dfsg1/debian/changelog 2012-06-10 23:21:10.000000000 +0200
+++ virtuoso-opensource-6.1.4+dfsg1/debian/changelog 2013-01-15 23:19:52.000000000 +0100
@@ -1,3 +1,28 @@
+virtuoso-opensource (6.1.4+dfsg1-3) unstable; urgency=low
+
+ * The previous upload didn't actually fix the bug #677286: "unowned files
+ after purge (/root/.odbc.ini)". Looks like this is happening because of a
+ bug in odbcinst, which ignores the -l option (when passing -l it should
+ deal with /etc/odbc.ini and not touch $HOME/.odbc.ini). So I workarounded
+ the bug changing again virtuoso-opensource-6.1.prerm; I removed the
+ previous workaround and now odbinst is executed thus:
+ ODBCSEARCH=ODBC_SYSTEM_DSN odbcinst <arguments_and_stuff>
+ Setting that environment variable should override the arguments given in the
+ command line, it works both as a workaround for the "unowned files after
+ purge" problem and forces obdcinst to actually use the system DSN so it
+ will use /etc/odbc.ini, never $HOME/.odbc.ini (Closes: #677286).
+
+ -- José Manuel Santamaría Lema <panfa...@gmail.com> Tue, 15 Jan 2013 23:19:48 +0100
+
+virtuoso-opensource (6.1.4+dfsg1-2) unstable; urgency=low
+
+ * Add portable-method-for-escaping-symbol-gawk.diff, fixes the conductor web
+ interface (Closes: #680764).
+ * Changed virtuoso-opensource-6.1.prerm to not leave an unowned file
+ (/root/.odbc.ini) after package removal (Closes: #677286).
+
+ -- José Manuel Santamaría Lema <panfa...@gmail.com> Tue, 01 Jan 2013 22:41:57 +0100
+
virtuoso-opensource (6.1.4+dfsg1-1) unstable; urgency=low
* New upstream release (Closes: #650281).
diff -Nru virtuoso-opensource-6.1.4+dfsg1/debian/libvirtodbc0.shlibs virtuoso-opensource-6.1.4+dfsg1/debian/libvirtodbc0.shlibs
--- virtuoso-opensource-6.1.4+dfsg1/debian/libvirtodbc0.shlibs 2012-06-10 20:16:05.000000000 +0200
+++ virtuoso-opensource-6.1.4+dfsg1/debian/libvirtodbc0.shlibs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-libvirtobbdc 8 libvirtodbc0 (= )
diff -Nru virtuoso-opensource-6.1.4+dfsg1/debian/patches/portable-method-for-escaping-symbol-gawk.diff virtuoso-opensource-6.1.4+dfsg1/debian/patches/portable-method-for-escaping-symbol-gawk.diff
--- virtuoso-opensource-6.1.4+dfsg1/debian/patches/portable-method-for-escaping-symbol-gawk.diff 1970-01-01 01:00:00.000000000 +0100
+++ virtuoso-opensource-6.1.4+dfsg1/debian/patches/portable-method-for-escaping-symbol-gawk.diff 2012-11-23 14:27:51.000000000 +0100
@@ -0,0 +1,94 @@
+From b01c641b917485d0e23beb98787e43cb40baae8a Mon Sep 17 00:00:00 2001
+From: VOS Maintainer <vos.ad...@openlinksw.com>
+Date: Thu, 8 Mar 2012 13:52:41 +0000
+Subject: [PATCH] * Fixed use portable method for escaping symbol for gawk 3
+ and 4
+
+---
+ binsrc/cached_resources/res_to_c.awk | 8 +-------
+ binsrc/hosting/perl/pl_to_c.awk | 2 +-
+ binsrc/hosting/python/py_to_c.awk | 2 +-
+ binsrc/ws/wsrm/xsd2sql.awk | 2 +-
+ libsrc/Wi/sql_to_c.awk | 8 +-------
+ 5 files changed, 5 insertions(+), 17 deletions(-)
+
+diff --git a/binsrc/cached_resources/res_to_c.awk b/binsrc/cached_resources/res_to_c.awk
+index 8c6ddbc..f7f4989 100644
+--- a/binsrc/cached_resources/res_to_c.awk
++++ b/binsrc/cached_resources/res_to_c.awk
+@@ -30,13 +30,7 @@ BEGIN {
+ }
+ {
+ fun = $0
+- # was: gsub ( /\\/, "\\\\", fun)
+- q = "\\\\"
+- if (PROCINFO["version"] ~ /^4/)
+- gsub ( q, q q, fun)
+- else
+- gsub ( q, q, fun)
+-
++ gsub ( "\\\\", "&&", fun)
+ gsub ( /"/, "\\\"", fun)
+ gsub ( /\$/, "\\044", fun)
+ gsub ( /.*/, "\"&\\n\",", fun)
+diff --git a/binsrc/hosting/perl/pl_to_c.awk b/binsrc/hosting/perl/pl_to_c.awk
+index 9422a4c..eb4a07d 100644
+--- a/binsrc/hosting/perl/pl_to_c.awk
++++ b/binsrc/hosting/perl/pl_to_c.awk
+@@ -42,7 +42,7 @@ END {
+ }
+
+ x = $0
+- gsub (/\\/, "\\\\", x)
++ gsub ( "\\\\", "&&", x)
+ gsub (/\"/, "\\\"", x)
+ print "\"" x "\\n\""
+ }
+diff --git a/binsrc/hosting/python/py_to_c.awk b/binsrc/hosting/python/py_to_c.awk
+index 7c5b529..6ce5ff4 100644
+--- a/binsrc/hosting/python/py_to_c.awk
++++ b/binsrc/hosting/python/py_to_c.awk
+@@ -48,7 +48,7 @@ END {
+ }
+
+ x = $0
+- gsub (/\\/, "\\\\", x)
++ gsub ( "\\\\", "&&", x)
+ gsub (/\"/, "\\\"", x)
+ print "\"" x "\\n\""
+ }
+diff --git a/binsrc/ws/wsrm/xsd2sql.awk b/binsrc/ws/wsrm/xsd2sql.awk
+index a97aba6..4bba030 100644
+--- a/binsrc/ws/wsrm/xsd2sql.awk
++++ b/binsrc/ws/wsrm/xsd2sql.awk
+@@ -54,7 +54,7 @@ BEGIN {
+ print " ses := string_output ();"
+ }
+ str = $0
+- gsub ( /\\/, "\\\\", str)
++ gsub ( "\\\\", "&&", str)
+ gsub ( /'/, "\\'", str)
+
+ #
+diff --git a/libsrc/Wi/sql_to_c.awk b/libsrc/Wi/sql_to_c.awk
+index 01c5add..57ef36b 100644
+--- a/libsrc/Wi/sql_to_c.awk
++++ b/libsrc/Wi/sql_to_c.awk
+@@ -343,13 +343,7 @@ BEGIN {
+
+ # does escape the symbols
+ fun = $0
+- q = "\\\\"
+- if (PROCINFO["version"] ~ /^4/)
+- gsub ( q, q q, fun)
+- else
+- gsub ( q, q, fun)
+-
+- #WAS: gsub ( /\\/, "\\\\", fun)
++ gsub ("\\\\", "&&", fun)
+
+ # remove whitespace except when there is just a semicolon
+ if ((in_xsl_mode == 0) && (in_xsd_mode == 0))
+--
+1.7.10.4
+
diff -Nru virtuoso-opensource-6.1.4+dfsg1/debian/patches/series virtuoso-opensource-6.1.4+dfsg1/debian/patches/series
--- virtuoso-opensource-6.1.4+dfsg1/debian/patches/series 2012-06-08 22:43:40.000000000 +0200
+++ virtuoso-opensource-6.1.4+dfsg1/debian/patches/series 2012-11-23 14:27:51.000000000 +0100
@@ -1,3 +1,4 @@
+portable-method-for-escaping-symbol-gawk.diff
use-debian-default-csharp-compiler.patch
config-debian-paths.patch
config-universal-variables.patch
diff -Nru virtuoso-opensource-6.1.4+dfsg1/debian/virtuoso-opensource-6.1.prerm virtuoso-opensource-6.1.4+dfsg1/debian/virtuoso-opensource-6.1.prerm
--- virtuoso-opensource-6.1.4+dfsg1/debian/virtuoso-opensource-6.1.prerm 2012-06-09 01:23:52.000000000 +0200
+++ virtuoso-opensource-6.1.4+dfsg1/debian/virtuoso-opensource-6.1.prerm 2013-01-15 23:18:52.000000000 +0100
@@ -9,7 +9,12 @@
db_get virtuoso-opensource-6.1/register-odbc-dsn || true
if [ "$RET" = "true" ]; then
- odbcinst -u -s -l -n VOS || true
+ # We set ODBCSEARCH=ODBC_SYSTEM_DSN because looks like odbcinst has a bug,
+ # it ignores the -l option when uninstalling a data source. See:
+ # http://bugs.debian.org/698248
+ # and
+ # http://bugs.debian.org/677286
+ ODBCSEARCH=ODBC_SYSTEM_DSN odbcinst -u -s -l -n VOS || true
fi
# removing from list of owners of this question removes us from it's choices
signature.asc
Description: This is a digitally signed message part.
