[pkg-virtuoso] 01/02: Update ignore-netstat-failure.patch including new tests.
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Mon Sep 15 17:48:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
lisandro pushed a commit to branch master
in repository pkg-virtuoso.
commit ec74c2d98240db86015adb6e88436e01a17f4e9e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Mon Sep 15 13:39:37 2014 -0300
Update ignore-netstat-failure.patch including new tests.
---
debian/changelog | 3 +
debian/patches/ignore-netstat-failure.patch | 92 ++++++++++++++++++-----------
2 files changed, 62 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 882d057..b4908aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
virtuoso-opensource (6.1.6+dfsg2-2) UNRELEASED; urgency=medium
+ [ Lisandro Damián Nicanor Pérez Meyer ]
+ * Update ignore-netstat-failure.patch including new tests (Closes: #761371).
+
-- Debian Krap Maintainers <debian-qt-kde at lists.debian.org> Mon, 15 Sep 2014 13:32:28 -0300
virtuoso-opensource (6.1.6+dfsg2-1) unstable; urgency=medium
diff --git a/debian/patches/ignore-netstat-failure.patch b/debian/patches/ignore-netstat-failure.patch
index 529acb8..1681f33 100644
--- a/debian/patches/ignore-netstat-failure.patch
+++ b/debian/patches/ignore-netstat-failure.patch
@@ -5,12 +5,12 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663010
NOTE: While this patch at a first sight looks a bit dangerous it isn't that
bad: if virtuoso couldn't actually start in these make_vad.sh scripts, some
- *.vad files wouldn't be genereated; these *.vad files are being installed by
+ *.vad files wouldn't be generated; these *.vad files are being installed by
the package, therefore if one of them is missing the package would fail to
build anyway.
--- a/binsrc/rdf_mappers/make_vad.sh
+++ b/binsrc/rdf_mappers/make_vad.sh
-@@ -278,8 +278,8 @@ virtuoso_start() {
+@@ -278,8 +278,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -23,7 +23,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/bpel/make_vad.sh
+++ b/binsrc/bpel/make_vad.sh
-@@ -281,8 +281,8 @@ virtuoso_start() {
+@@ -281,8 +281,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -36,7 +36,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/b3s/make_vad.sh
+++ b/binsrc/b3s/make_vad.sh
-@@ -231,8 +231,8 @@ virtuoso_start() {
+@@ -231,8 +231,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -49,7 +49,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/tutorial/make_vad.sh
+++ b/binsrc/tutorial/make_vad.sh
-@@ -131,8 +131,8 @@ virtuoso_start() {
+@@ -131,8 +131,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -62,7 +62,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/yacutia/mkvad.sh
+++ b/binsrc/yacutia/mkvad.sh
-@@ -178,8 +178,8 @@ START_SERVER()
+@@ -178,8 +178,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -75,7 +75,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/samples/demo/mkdoc.sh
+++ b/binsrc/samples/demo/mkdoc.sh
-@@ -191,8 +191,8 @@ START_SERVER()
+@@ -191,8 +191,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -88,7 +88,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
fi
--- a/binsrc/samples/sparql_demo/make_vad.sh
+++ b/binsrc/samples/sparql_demo/make_vad.sh
-@@ -141,8 +141,8 @@ virtuoso_start() {
+@@ -141,8 +141,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -101,7 +101,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/sync/make_vad.sh
+++ b/binsrc/sync/make_vad.sh
-@@ -131,8 +131,8 @@ virtuoso_start() {
+@@ -131,8 +131,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -114,7 +114,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/isparql/make_vad.sh
+++ b/binsrc/isparql/make_vad.sh
-@@ -144,8 +144,8 @@ virtuoso_start() {
+@@ -144,8 +144,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -127,7 +127,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Addressbook/make_vad.sh
+++ b/appsrc/ODS-Addressbook/make_vad.sh
-@@ -170,8 +170,8 @@ virtuoso_start() {
+@@ -170,8 +170,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -140,7 +140,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Bookmark/make_vad.sh
+++ b/appsrc/ODS-Bookmark/make_vad.sh
-@@ -170,8 +170,8 @@ virtuoso_start() {
+@@ -170,8 +170,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -153,7 +153,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Briefcase/make_vad.sh
+++ b/appsrc/ODS-Briefcase/make_vad.sh
-@@ -181,8 +181,8 @@ virtuoso_start() {
+@@ -181,8 +181,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -166,7 +166,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Calendar/make_vad.sh
+++ b/appsrc/ODS-Calendar/make_vad.sh
-@@ -169,8 +169,8 @@ virtuoso_start() {
+@@ -169,8 +169,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -179,7 +179,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Community/make_vad.sh
+++ b/appsrc/ODS-Community/make_vad.sh
-@@ -165,8 +165,8 @@ virtuoso_start() {
+@@ -165,8 +165,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -192,7 +192,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Discussion/make_vad.sh
+++ b/appsrc/ODS-Discussion/make_vad.sh
-@@ -137,8 +137,8 @@ virtuoso_start() {
+@@ -137,8 +137,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -205,7 +205,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-FeedManager/make_vad.sh
+++ b/appsrc/ODS-FeedManager/make_vad.sh
-@@ -169,8 +169,8 @@ virtuoso_start() {
+@@ -169,8 +169,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -218,7 +218,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Framework/make_vad.sh
+++ b/appsrc/ODS-Framework/make_vad.sh
-@@ -167,8 +167,8 @@ virtuoso_start() {
+@@ -167,8 +167,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -231,7 +231,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Framework/oauth/make_vad.sh
+++ b/appsrc/ODS-Framework/oauth/make_vad.sh
-@@ -215,8 +215,8 @@ virtuoso_start() {
+@@ -215,8 +215,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -244,7 +244,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Gallery/make_vad.sh
+++ b/appsrc/ODS-Gallery/make_vad.sh
-@@ -153,8 +153,8 @@ virtuoso_start() {
+@@ -153,8 +153,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -257,7 +257,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Polls/make_vad.sh
+++ b/appsrc/ODS-Polls/make_vad.sh
-@@ -157,8 +157,8 @@ virtuoso_start() {
+@@ -157,8 +157,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -270,7 +270,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-WebMail/make_vad.sh
+++ b/appsrc/ODS-WebMail/make_vad.sh
-@@ -168,8 +168,8 @@ virtuoso_start() {
+@@ -168,8 +168,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -283,7 +283,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Wiki/make_vad.sh
+++ b/appsrc/ODS-Wiki/make_vad.sh
-@@ -159,8 +159,8 @@ virtuoso_start() {
+@@ -159,8 +159,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -296,7 +296,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/hosting/mono/tests/tclrsrv.sh
+++ b/binsrc/hosting/mono/tests/tclrsrv.sh
-@@ -241,8 +241,8 @@ START_SERVER ()
+@@ -241,8 +241,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -309,7 +309,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/samples/demo/mkdemo.sh
+++ b/binsrc/samples/demo/mkdemo.sh
-@@ -170,8 +170,8 @@ START_SERVER()
+@@ -170,8 +170,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -322,7 +322,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/samples/xpath/files2dav.sh
+++ b/binsrc/samples/xpath/files2dav.sh
-@@ -121,8 +121,8 @@ START_SERVER()
+@@ -121,8 +121,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -335,7 +335,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/samples/xquery/files2dav.sh
+++ b/binsrc/samples/xquery/files2dav.sh
-@@ -121,8 +121,8 @@ START_SERVER()
+@@ -121,8 +121,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -348,7 +348,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/tests/biftest/thook.sh
+++ b/binsrc/tests/biftest/thook.sh
-@@ -154,8 +154,8 @@ START_SERVER()
+@@ -154,8 +154,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -361,7 +361,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/tests/suite/test_fn.sh
+++ b/binsrc/tests/suite/test_fn.sh
-@@ -334,8 +334,8 @@ START_SERVER()
+@@ -334,8 +334,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -374,7 +374,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/vsp/admin/debug/make_vad.sh
+++ b/binsrc/vsp/admin/debug/make_vad.sh
-@@ -97,8 +97,8 @@ virtuoso_start() {
+@@ -97,8 +97,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -387,7 +387,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/vspx/suite/vspx_suite.sh
+++ b/binsrc/vspx/suite/vspx_suite.sh
-@@ -66,8 +66,8 @@ virtuoso_start() {
+@@ -66,8 +66,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -400,7 +400,7 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/appsrc/ODS-Blog/make_vad.sh
+++ b/appsrc/ODS-Blog/make_vad.sh
-@@ -140,8 +140,8 @@ virtuoso_start() {
+@@ -140,8 +140,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
@@ -413,7 +413,33 @@ Description: This patch avoids FTBFSes on any architecture whose "netstat -an"
}
--- a/binsrc/samples/demo/make_vad.sh
+++ b/binsrc/samples/demo/make_vad.sh
-@@ -142,8 +142,8 @@ virtuoso_start() {
+@@ -142,8 +142,8 @@
+ nows=`expr $nows + $nowh \* 60`
+ if test $nows -ge $timeout
+ then
+- LOG "***FAILED: Could not start $SERVER within $timeout seconds"
+- exit 1
++ LOG "***WARNING: Could not start $SERVER within $timeout seconds"
++ return 1
+ fi
+ done
+ }
+--- a/binsrc/dbpedia/make_vad.sh
++++ b/binsrc/dbpedia/make_vad.sh
+@@ -223,8 +223,8 @@
+ nows=`expr $nows + $nowh \* 60`
+ if test $nows -ge $timeout
+ then
+- LOG "***FAILED: Could not start Virtuoso Server within $timeout seconds"
+- exit 1
++ LOG "***WARNING: Could not start Virtuoso Server within $timeout seconds"
++ return 1
+ fi
+ done
+ }
+--- a/binsrc/rdb2rdf/make_vad.sh
++++ b/binsrc/rdb2rdf/make_vad.sh
+@@ -150,8 +150,8 @@
nows=`expr $nows + $nowh \* 60`
if test $nows -ge $timeout
then
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtuoso/pkg-virtuoso.git
More information about the Pkg-virtuoso-commits
mailing list