[SCM] Git repository for pkg-virtuoso branch, master, updated. debian/6.1.3+dfsg1-2.1-24-g3062094
José Manuel Santamar?==?UTF-8?Q?ía Lema
panfaust at gmail.com
Tue May 29 00:05:21 UTC 2012
The following commit has been merged in the master branch:
commit d419ac22b186ffed33885cdc1a4521e90064e6e5
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Tue May 29 00:30:03 2012 +0200
Add ignore-netstat-failure.patch.
diff --git a/debian/changelog b/debian/changelog
index 833e3a2..dd04fb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ virtuoso-opensource (6.1.5+dfsg2-1) UNRELEASED; urgency=low
- drop fix-wide-char-encoding.patch, applied upstream.
- update repack-zlib.patch.
- refresh other patches in order to make them apply without any offset.
+ - add ignore-netstat-failure.patch, to avoid FTBFS on various
+ architectures, including kfreebsd-*, thanks to Steven Chamberlain.
* Bump debhelper compatibility level to 9.
* Fix a bug in the init script, now uses start-stop-daemon with "--user",
this makes the script work when you are running it under Plasma (the KDE
diff --git a/debian/patches/ignore-netstat-failure.patch b/debian/patches/ignore-netstat-failure.patch
new file mode 100644
index 0000000..8c51ab7
--- /dev/null
+++ b/debian/patches/ignore-netstat-failure.patch
@@ -0,0 +1,416 @@
+--- a/binsrc/rdf_mappers/make_vad.sh
++++ b/binsrc/rdf_mappers/make_vad.sh
+@@ -278,8 +278,8 @@ virtuoso_start() {
+ 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/bpel/make_vad.sh
++++ b/binsrc/bpel/make_vad.sh
+@@ -281,8 +281,8 @@ virtuoso_start() {
+ 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/b3s/make_vad.sh
++++ b/binsrc/b3s/make_vad.sh
+@@ -231,8 +231,8 @@ virtuoso_start() {
+ 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/tutorial/make_vad.sh
++++ b/binsrc/tutorial/make_vad.sh
+@@ -131,8 +131,8 @@ virtuoso_start() {
+ 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/yacutia/mkvad.sh
++++ b/binsrc/yacutia/mkvad.sh
+@@ -178,8 +178,8 @@ START_SERVER()
+ nows=`expr $nows + $nowh \* 60`
+ if test $nows -ge $timeout
+ then
+- ECHO "***FAILED: Could not start Virtuoso Server within $timeout seconds"
+- exit 1
++ ECHO "***WARNING: Could not start Virtuoso Server within $timeout seconds"
++ return 1
+ fi
+ done
+ }
+--- a/binsrc/samples/demo/mkdoc.sh
++++ b/binsrc/samples/demo/mkdoc.sh
+@@ -191,8 +191,8 @@ START_SERVER()
+ nows=`expr $nows + $nowh \* 60`
+ if test $nows -ge $timeout
+ then
+- ECHO "***FAILED: Could not start Virtuoso DOC Server within $timeout seconds"
+- exit 1
++ ECHO "***WARNING: Could not start Virtuoso DOC Server within $timeout seconds"
++ return 1
+ fi
+ done
+ fi
+--- a/binsrc/samples/sparql_demo/make_vad.sh
++++ b/binsrc/samples/sparql_demo/make_vad.sh
+@@ -141,8 +141,8 @@ virtuoso_start() {
+ 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/sync/make_vad.sh
++++ b/binsrc/sync/make_vad.sh
+@@ -131,8 +131,8 @@ virtuoso_start() {
+ 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/isparql/make_vad.sh
++++ b/binsrc/isparql/make_vad.sh
+@@ -144,8 +144,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-Addressbook/make_vad.sh
++++ b/appsrc/ODS-Addressbook/make_vad.sh
+@@ -170,8 +170,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-Bookmark/make_vad.sh
++++ b/appsrc/ODS-Bookmark/make_vad.sh
+@@ -170,8 +170,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-Briefcase/make_vad.sh
++++ b/appsrc/ODS-Briefcase/make_vad.sh
+@@ -181,8 +181,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-Calendar/make_vad.sh
++++ b/appsrc/ODS-Calendar/make_vad.sh
+@@ -169,8 +169,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-Community/make_vad.sh
++++ b/appsrc/ODS-Community/make_vad.sh
+@@ -165,8 +165,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-Discussion/make_vad.sh
++++ b/appsrc/ODS-Discussion/make_vad.sh
+@@ -137,8 +137,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-FeedManager/make_vad.sh
++++ b/appsrc/ODS-FeedManager/make_vad.sh
+@@ -169,8 +169,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-Framework/make_vad.sh
++++ b/appsrc/ODS-Framework/make_vad.sh
+@@ -167,8 +167,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-Framework/oauth/make_vad.sh
++++ b/appsrc/ODS-Framework/oauth/make_vad.sh
+@@ -215,8 +215,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-Gallery/make_vad.sh
++++ b/appsrc/ODS-Gallery/make_vad.sh
+@@ -153,8 +153,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-Polls/make_vad.sh
++++ b/appsrc/ODS-Polls/make_vad.sh
+@@ -157,8 +157,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-WebMail/make_vad.sh
++++ b/appsrc/ODS-WebMail/make_vad.sh
+@@ -168,8 +168,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-Wiki/make_vad.sh
++++ b/appsrc/ODS-Wiki/make_vad.sh
+@@ -159,8 +159,8 @@ virtuoso_start() {
+ 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/hosting/mono/tests/tclrsrv.sh
++++ b/binsrc/hosting/mono/tests/tclrsrv.sh
+@@ -241,8 +241,8 @@ START_SERVER ()
+ 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/samples/demo/mkdemo.sh
++++ b/binsrc/samples/demo/mkdemo.sh
+@@ -170,8 +170,8 @@ START_SERVER()
+ nows=`expr $nows + $nowh \* 60`
+ if test $nows -ge $timeout
+ then
+- ECHO "***FAILED: Could not start Virtuoso DEMO Server within $timeout seconds"
+- exit 1
++ ECHO "***WARNING: Could not start Virtuoso DEMO Server within $timeout seconds"
++ return 1
+ fi
+ done
+ }
+--- a/binsrc/samples/xpath/files2dav.sh
++++ b/binsrc/samples/xpath/files2dav.sh
+@@ -121,8 +121,8 @@ START_SERVER()
+ nows=`expr $nows + $nowh \* 60`
+ if test $nows -ge $timeout
+ then
+- ECHO "***FAILED: Could not start Virtuoso DEMO Server within $timeout seconds"
+- exit 1
++ ECHO "***WARNING: Could not start Virtuoso DEMO Server within $timeout seconds"
++ return 1
+ fi
+ done
+ }
+--- a/binsrc/samples/xquery/files2dav.sh
++++ b/binsrc/samples/xquery/files2dav.sh
+@@ -121,8 +121,8 @@ START_SERVER()
+ nows=`expr $nows + $nowh \* 60`
+ if test $nows -ge $timeout
+ then
+- ECHO "***FAILED: Could not start Virtuoso DEMO Server within $timeout seconds"
+- exit 1
++ ECHO "***WARNING: Could not start Virtuoso DEMO Server within $timeout seconds"
++ return 1
+ fi
+ done
+ }
+--- a/binsrc/tests/biftest/thook.sh
++++ b/binsrc/tests/biftest/thook.sh
+@@ -154,8 +154,8 @@ START_SERVER()
+ 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/tests/suite/test_fn.sh
++++ b/binsrc/tests/suite/test_fn.sh
+@@ -334,8 +334,8 @@ START_SERVER()
+ 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/vsp/admin/debug/make_vad.sh
++++ b/binsrc/vsp/admin/debug/make_vad.sh
+@@ -97,8 +97,8 @@ virtuoso_start() {
+ 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/vspx/suite/vspx_suite.sh
++++ b/binsrc/vspx/suite/vspx_suite.sh
+@@ -66,8 +66,8 @@ virtuoso_start() {
+ 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/appsrc/ODS-Blog/make_vad.sh
++++ b/appsrc/ODS-Blog/make_vad.sh
+@@ -140,8 +140,8 @@ virtuoso_start() {
+ 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/samples/demo/make_vad.sh
++++ b/binsrc/samples/demo/make_vad.sh
+@@ -142,8 +142,8 @@ virtuoso_start() {
+ 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
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 655c0d9..3578aef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ repack-pcre.patch
repack-zlib.patch
build-generated-code-multiple-outputs.patch
build-gmake-to-make.patch
+ignore-netstat-failure.patch
--
Git repository for pkg-virtuoso
More information about the Pkg-virtuoso-commits
mailing list