[SCM] Soprano RDF Framework packaging branch, master, updated. debian/2.7.6+dfsg.1-2-2-g553f79d

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/soprano.git;a=commitdiff;h=553f79d

The following commit has been merged in the master branch:
commit 553f79d661e6e965ec947b5bd34758bc5981e5c0
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon Dec 31 01:20:18 2012 +0100

    Add dont_use_virtuoso_default_port.diff.
---
 debian/changelog                                   |    3 ++
 debian/patches/dont_use_virtuoso_default_port.diff |   34 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b84cf7..d322999 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 soprano (2.7.6+dfsg.1-3) UNRELEASED; urgency=low
 
+  [ José Manuel Santamaría Lema ]
+  * Add dont_use_virtuoso_default_port.diff, prevents hangs when installing or
+    running virtuoso as a standalone server.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 27 Dec 2012 15:31:33 +0100
 
diff --git a/debian/patches/dont_use_virtuoso_default_port.diff b/debian/patches/dont_use_virtuoso_default_port.diff
new file mode 100644
index 0000000..92ea313
--- /dev/null
+++ b/debian/patches/dont_use_virtuoso_default_port.diff
@@ -0,0 +1,34 @@
+Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+Forwarded: yes, upstream is aware of the problem and will fix it
+Description: If possible, don't use the defualt virtuso port (1111)
+ Virtuoso server, by default, opens both tcp and unix sockets to communicate
+ with the clients. The unix socket is named using this template:
+ /tmp/virt_XXXX
+ where XXXX is the tcp port configured for the virtuoso server. If you start
+ other virtuoso server configured to use the same port, with the unix socket
+ enabled (remember it's enabled by default), then it would fail to start. It
+ should fail and return, but currently it hangs.
+ When installing virtuoso-opensource-6.1, the postinst script will try to start
+ virtuoso using the default 1111 port in order to change the admin password. So
+ the problem is the following: since the unix socket /tmp_virt1111 is alredy
+ being used, the virtuoso started by the postinst script won't work, breaking
+ the installation.
+ As I said above, to make it worse, right now virtuoso doesn't just fail and
+ return if the unix socket is already being used, it hangs; therefore an
+ installation of virtuoso as a standalone server may hang.
+--- a/backends/virtuoso/virtuosocontroller.cpp
++++ b/backends/virtuoso/virtuosocontroller.cpp
+@@ -56,11 +56,11 @@ namespace {
+ //         }
+ #ifdef Q_OS_WIN
+         static QMutex portNumberMutex;
+-        static quint16 p = 1111;
++        static quint16 p = 1113;
+         QMutexLocker l(&portNumberMutex);
+         return p++;
+ #else
+-        int p = 1111;
++        int p = 1113;
+         while ( QFile::exists( QString( "/tmp/virt_%1" ).arg( p ) ) ) {
+             ++p;
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 270e0fb..c126512 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+dont_use_virtuoso_default_port.diff
 x11_not_required.diff
 disable_usr_lib_install_rpath.diff
 doxyfile_generate_tagfile.diff

-- 
Soprano RDF Framework packaging