Package: release.debian.org Severity: normal Tags: stretch User: release.debian....@packages.debian.org Usertags: pu
Would like to fix #876251; minor but very annoying bug in init script means the daemon just doesn't start. Was fixed in unstable quite a while ago, just needs a stable update. Proposed debdiff attached. This is fairly large because the --single-debian-patch thing is not deterministic (yuck), but if one ignores that it's a one character fix and a changelog entry. -- System Information: Debian Release: buster/sid APT prefers unstable-debug APT policy: (500, 'unstable-debug'), (500, 'unreleased'), (500, 'unstable'), (500, 'testing'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386, m68k, arm64 Kernel: Linux 4.18.0-2-amd64 (SMP w/8 CPU cores) Locale: LANG=nl_BE.UTF-8, LC_CTYPE=nl_BE.UTF-8 (charmap=UTF-8), LANGUAGE=nl_BE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
diff -Nru ola-0.10.3.nojsmin/debian/changelog ola-0.10.3.nojsmin/debian/changelog --- ola-0.10.3.nojsmin/debian/changelog 2017-03-17 17:13:52.000000000 +0100 +++ ola-0.10.3.nojsmin/debian/changelog 2018-10-31 17:02:06.000000000 +0100 @@ -1,3 +1,9 @@ +ola (0.10.3.nojsmin-2+deb9u1) stretch; urgency=medium + + * Fix typo in /etc/init.d/rdm_test_server; Closes: #876251. + + -- Wouter Verhelst <wou...@debian.org> Wed, 31 Oct 2018 17:02:06 +0100 + ola (0.10.3.nojsmin-2) unstable; urgency=medium * Fix symlink target to point to a .js file rather than a .sj one (whoops); diff -Nru ola-0.10.3.nojsmin/debian/ola-rdm-tests.rdm_test_server.init ola-0.10.3.nojsmin/debian/ola-rdm-tests.rdm_test_server.init --- ola-0.10.3.nojsmin/debian/ola-rdm-tests.rdm_test_server.init 2017-03-09 11:21:39.000000000 +0100 +++ ola-0.10.3.nojsmin/debian/ola-rdm-tests.rdm_test_server.init 2018-10-31 17:01:50.000000000 +0100 @@ -17,7 +17,7 @@ PIDFILE=/var/run/$CMD.pid DESC="OLA RDM Test Server" USER=olad -DAEMON_ARGS="--world-writable" +DAEMON_ARGS="--world-writeable" # Reads config file (will override defaults above) [ -r /etc/default/ola-rdm-tests ] && . /etc/default/ola-rdm-tests diff -Nru ola-0.10.3.nojsmin/debian/patches/debian-changes ola-0.10.3.nojsmin/debian/patches/debian-changes --- ola-0.10.3.nojsmin/debian/patches/debian-changes 2017-03-17 17:13:52.000000000 +0100 +++ ola-0.10.3.nojsmin/debian/patches/debian-changes 2018-10-31 17:02:06.000000000 +0100 @@ -5,12 +5,11 @@ information below has been extracted from the changelog. Adjust it or drop it. . - ola (0.10.2-3) unstable; urgency=medium + ola (0.10.3.nojsmin-3) stretch; urgency=medium . - * Cherry-pick 4 commits from upstream git to fix include issues on - mips*. Closes: #836383. + * Fix typo in /etc/init.d/rdm_test_server; Closes: #876251. Author: Wouter Verhelst <wou...@debian.org> -Bug-Debian: https://bugs.debian.org/836383 +Bug-Debian: https://bugs.debian.org/876251 --- The information above should follow the Patch Tagging Guidelines, please @@ -23,126 +22,9 @@ Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> Forwarded: <no|not-needed|url proving that it has been forwarded> Reviewed-By: <name and email of someone who approved the patch> -Last-Update: 2016-11-22 +Last-Update: 2018-10-31 --- /dev/null -+++ ola-0.10.3.nojsmin/.travis-ci.sh -@@ -0,0 +1,114 @@ -+#!/bin/bash -+ -+# This script is triggered from the script section of .travis.yml -+# It runs the appropriate commands depending on the task requested. -+ -+set -e -+ -+CPP_LINT_URL="https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py";; -+ -+COVERITY_SCAN_BUILD_URL="https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh"; -+ -+if [[ $TASK = 'lint' ]]; then -+ # run the lint tool only if it is the requested task -+ autoreconf -i; -+ ./configure --enable-rdm-tests --enable-ja-rule; -+ # the following is a bit of a hack to build the files normally built during -+ # the build, so they are present for linting to run against -+ make builtfiles -+ # first check we've not got any generic NOLINTs -+ # count the number of generic NOLINTs -+ nolints=$(grep -IR NOLINT * | grep -v "NOLINT(" | wc -l) -+ if [[ $nolints -ne 0 ]]; then -+ # print the output for info -+ echo $(grep -IR NOLINT * | grep -v "NOLINT(") -+ echo "Found $nolints generic NOLINTs" -+ exit 1; -+ else -+ echo "Found $nolints generic NOLINTs" -+ fi; -+ # then fetch and run the main cpplint tool -+ wget -O cpplint.py $CPP_LINT_URL; -+ chmod u+x cpplint.py; -+ ./cpplint.py \ -+ --filter=-legal/copyright,-readability/streams,-runtime/arrays \ -+ $(find ./ \( -name "*.h" -or -name "*.cpp" \) -and ! \( \ -+ -wholename "./common/protocol/Ola.pb.*" -or \ -+ -wholename "./common/rpc/Rpc.pb.*" -or \ -+ -wholename "./common/rpc/TestService.pb.*" -or \ -+ -wholename "./common/rdm/Pids.pb.*" -or \ -+ -wholename "./config.h" -or \ -+ -wholename "./plugins/*/messages/*ConfigMessages.pb.*" -or \ -+ -wholename "./tools/ola_trigger/config.tab.*" -or \ -+ -wholename "./tools/ola_trigger/lex.yy.cpp" \) | xargs) -+ if [[ $? -ne 0 ]]; then -+ exit 1; -+ fi; -+elif [[ $TASK = 'check-licences' ]]; then -+ # check licences only if it is the requested task -+ autoreconf -i; -+ ./configure --enable-rdm-tests --enable-ja-rule; -+ # the following is a bit of a hack to build the files normally built during -+ # the build, so they are present for licence checking to run against -+ make builtfiles -+ ./scripts/enforce_licence.py -+ if [[ $? -ne 0 ]]; then -+ exit 1; -+ fi; -+elif [[ $TASK = 'doxygen' ]]; then -+ # check doxygen only if it is the requested task -+ autoreconf -i; -+ # Doxygen is C++ only, so don't bother with RDM tests -+ ./configure --enable-ja-rule; -+ # the following is a bit of a hack to build the files normally built during -+ # the build, so they are present for Doxygen to run against -+ make builtfiles -+ # count the number of warnings -+ warnings=$(make doxygen-doc 2>&1 >/dev/null | wc -l) -+ if [[ $warnings -ne 0 ]]; then -+ # print the output for info -+ make doxygen-doc -+ echo "Found $warnings doxygen warnings" -+ exit 1; -+ else -+ echo "Found $warnings doxygen warnings" -+ fi; -+elif [[ $TASK = 'coverage' ]]; then -+ # Compile with coverage for coveralls -+ autoreconf -i; -+ # Coverage is C++ only, so don't bother with RDM tests -+ ./configure --enable-gcov --enable-ja-rule; -+ make; -+ make check; -+elif [[ $TASK = 'coverity' ]]; then -+ # Run Coverity Scan unless token is zero length -+ # The Coverity Scan script also relies on a number of other COVERITY_SCAN_ -+ # variables set in .travis.yml -+ if [[ ${#COVERITY_SCAN_TOKEN} -ne 0 ]]; then -+ curl -s $COVERITY_SCAN_BUILD_URL | bash -+ else -+ echo "Skipping Coverity Scan as no token found, probably a Pull Request" -+ fi; -+elif [[ $TASK = 'jshint' ]]; then -+ cd ./javascript/new-src; -+ npm install; -+ grunt test -+elif [[ $TASK = 'flake8' ]]; then -+ autoreconf -i; -+ ./configure --enable-rdm-tests -+ # the following is a bit of a hack to build the files normally built during -+ # the build, so they are present for flake8 to run against -+ make builtfiles -+ flake8 --max-line-length 80 --exclude *_pb2.py,.git,__pycache --ignore E111,E114,E121,E127,E129 data/rdm include/ola python scripts tools/ola_mon tools/rdm -+else -+ # Otherwise compile and check as normal -+ export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule' -+ autoreconf -i; -+ ./configure $DISTCHECK_CONFIGURE_FLAGS; -+ make distcheck; -+ make dist; -+ tarball=$(ls -Ut ola*.tar.gz | head -1) -+ tar -zxf $tarball; -+ tarball_root=$(echo $tarball | sed 's/.tar.gz$//') -+ ./scripts/verify_trees.py ./ $tarball_root -+fi ---- /dev/null +++ ola-0.10.3.nojsmin/.travis.yml @@ -0,0 +1,190 @@ +language: cpp @@ -560,6 +442,23 @@ +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +--- ola-0.10.3.nojsmin.orig/olad/www/Makefile.mk ++++ ola-0.10.3.nojsmin/olad/www/Makefile.mk +@@ -69,14 +69,6 @@ dist_img_DATA = \ + olad/www/new/img/light_bulb.png \ + olad/www/new/img/logo-mini.png \ + olad/www/new/img/logo.png +-dist_jquery_DATA = \ +- olad/www/new/libs/jquery/js/jquery.min.js +-dist_angularroute_DATA = \ +- olad/www/new/libs/angular-route/js/angular-route.min.js +-dist_angular_DATA = \ +- olad/www/new/libs/angular/js/angular.min.js +-dist_bootjs_DATA = \ +- olad/www/new/libs/bootstrap/js/bootstrap.min.js + dist_bootfonts_DATA = \ + olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.eot \ + olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.svg \ --- /dev/null +++ ola-0.10.3.nojsmin/plugins/LICENCE @@ -0,0 +1,13 @@ @@ -1462,6 +1361,31 @@ +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +--- ola-0.10.3.nojsmin.orig/tools/rdm/Makefile.mk ++++ ola-0.10.3.nojsmin/tools/rdm/Makefile.mk +@@ -17,9 +17,7 @@ module_files = \ + testserver_static_files = \ + tools/rdm/static/MIT-LICENSE.txt \ + tools/rdm/static/common.css \ +- tools/rdm/static/jquery-1.7.2.min.js \ + tools/rdm/static/jquery-ui-1.8.21.custom.css \ +- tools/rdm/static/jquery-ui-1.8.21.custom.min.js \ + tools/rdm/static/rdm_tests.js \ + tools/rdm/static/rdmtests.html \ + tools/rdm/static/ui.multiselect.css \ +--- ola-0.10.3.nojsmin.orig/tools/rdm/static/rdmtests.html ++++ ola-0.10.3.nojsmin/tools/rdm/static/rdmtests.html +@@ -3,8 +3,8 @@ + <head> + <link type='text/css' rel='stylesheet' href='/static/jquery-ui-1.8.21.custom.css' /> + <link rel='stylesheet' href='/static/ui.multiselect.css' type='text/css'> +- <script src='/static/jquery-1.7.2.min.js'></script> +- <script src='/static/jquery-ui-1.8.21.custom.min.js'></script> ++ <script src='/static/jquery.min.js'></script> ++ <script src='/static/jquery-ui.custom.min.js'></script> + <script src='/static/ui.multiselect.js'></script> + <script src='/static/rdm_tests.js'></script> + <title>RDM Tests & Publisher</title> --- /dev/null +++ ola-0.10.3.nojsmin/tools/rdmpro/LICENCE @@ -0,0 +1,13 @@ @@ -1494,1353 +1418,120 @@ +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ---- ola-0.10.3.nojsmin.orig/Makefile.in -+++ ola-0.10.3.nojsmin/Makefile.in -@@ -547,10 +547,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(to - $(am__dist_rdmtestsexec_SCRIPTS_DIST) \ - $(am__pkgpython_PYTHON_DIST) $(am__rdminit_PYTHON_DIST) \ - $(am__rdmtests_PYTHON_DIST) $(am__rpcpython_PYTHON_DIST) \ -- $(dist_angular_DATA) $(dist_angularroute_DATA) \ -- $(dist_bootcss_DATA) $(dist_bootfonts_DATA) \ -- $(dist_bootjs_DATA) $(dist_css_DATA) $(dist_img_DATA) \ -- $(dist_jquery_DATA) $(dist_js_DATA) $(dist_new_DATA) \ -+ $(dist_bootcss_DATA) $(dist_bootfonts_DATA) $(dist_css_DATA) \ -+ $(dist_img_DATA) $(dist_js_DATA) $(dist_new_DATA) \ - $(dist_noinst_DATA) $(dist_piddata_DATA) \ - $(am__dist_tools_rdm_testserver_images_DATA_DIST) \ - $(am__dist_tools_rdm_testserver_static_DATA_DIST) \ -@@ -613,11 +611,9 @@ am__installdirs = "$(DESTDIR)$(libdir)" - "$(DESTDIR)$(rdmtestsdir)" "$(DESTDIR)$(rpcpythondir)" \ - "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(rdminitdir)" \ - "$(DESTDIR)$(rdmtestsdir)" "$(DESTDIR)$(rpcpythondir)" \ -- "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(angulardir)" \ -- "$(DESTDIR)$(angularroutedir)" "$(DESTDIR)$(bootcssdir)" \ -- "$(DESTDIR)$(bootfontsdir)" "$(DESTDIR)$(bootjsdir)" \ -- "$(DESTDIR)$(cssdir)" "$(DESTDIR)$(imgdir)" \ -- "$(DESTDIR)$(jquerydir)" "$(DESTDIR)$(jsdir)" \ -+ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(bootcssdir)" \ -+ "$(DESTDIR)$(bootfontsdir)" "$(DESTDIR)$(cssdir)" \ -+ "$(DESTDIR)$(imgdir)" "$(DESTDIR)$(jsdir)" \ - "$(DESTDIR)$(newdir)" "$(DESTDIR)$(piddatadir)" \ - "$(DESTDIR)$(tools_rdm_testserver_imagesdir)" \ - "$(DESTDIR)$(tools_rdm_testserver_staticdir)" \ -@@ -3583,16 +3579,12 @@ am__dist_tools_rdm_testserver_images_DAT - tools/rdm/static/images/ui-icons_fbc856_256x240.png - am__dist_tools_rdm_testserver_static_DATA_DIST = \ - tools/rdm/static/MIT-LICENSE.txt tools/rdm/static/common.css \ -- tools/rdm/static/jquery-1.7.2.min.js \ - tools/rdm/static/jquery-ui-1.8.21.custom.css \ -- tools/rdm/static/jquery-ui-1.8.21.custom.min.js \ - tools/rdm/static/rdm_tests.js tools/rdm/static/rdmtests.html \ - tools/rdm/static/ui.multiselect.css \ - tools/rdm/static/ui.multiselect.js --DATA = $(dist_angular_DATA) $(dist_angularroute_DATA) \ -- $(dist_bootcss_DATA) $(dist_bootfonts_DATA) \ -- $(dist_bootjs_DATA) $(dist_css_DATA) $(dist_img_DATA) \ -- $(dist_jquery_DATA) $(dist_js_DATA) $(dist_new_DATA) \ -+DATA = $(dist_bootcss_DATA) $(dist_bootfonts_DATA) $(dist_css_DATA) \ -+ $(dist_img_DATA) $(dist_js_DATA) $(dist_new_DATA) \ - $(dist_noinst_DATA) $(dist_piddata_DATA) \ - $(dist_tools_rdm_testserver_images_DATA) \ - $(dist_tools_rdm_testserver_static_DATA) $(dist_views_DATA) \ -@@ -4182,6 +4174,7 @@ program_transform_name = @program_transf - psdir = @psdir@ - pyexecdir = @pyexecdir@ - pythondir = @pythondir@ -+runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ -@@ -6401,18 +6394,6 @@ dist_img_DATA = \ - olad/www/new/img/logo-mini.png \ - olad/www/new/img/logo.png - --dist_jquery_DATA = \ -- olad/www/new/libs/jquery/js/jquery.min.js -- --dist_angularroute_DATA = \ -- olad/www/new/libs/angular-route/js/angular-route.min.js -- --dist_angular_DATA = \ -- olad/www/new/libs/angular/js/angular.min.js -- --dist_bootjs_DATA = \ -- olad/www/new/libs/bootstrap/js/bootstrap.min.js -- - dist_bootfonts_DATA = \ - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.eot \ - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.svg \ -@@ -6614,9 +6595,7 @@ module_files = \ - testserver_static_files = \ - tools/rdm/static/MIT-LICENSE.txt \ - tools/rdm/static/common.css \ -- tools/rdm/static/jquery-1.7.2.min.js \ - tools/rdm/static/jquery-ui-1.8.21.custom.css \ -- tools/rdm/static/jquery-ui-1.8.21.custom.min.js \ - tools/rdm/static/rdm_tests.js \ - tools/rdm/static/rdmtests.html \ - tools/rdm/static/ui.multiselect.css \ -@@ -14480,48 +14459,6 @@ uninstall-man1: - } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ - -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) --install-dist_angularDATA: $(dist_angular_DATA) -- @$(NORMAL_INSTALL) -- @list='$(dist_angular_DATA)'; test -n "$(angulardir)" || list=; \ -- if test -n "$$list"; then \ -- echo " $(MKDIR_P) '$(DESTDIR)$(angulardir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(angulardir)" || exit 1; \ -- fi; \ -- for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- echo "$$d$$p"; \ -- done | $(am__base_list) | \ -- while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(angulardir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(angulardir)" || exit $$?; \ -- done -- --uninstall-dist_angularDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(dist_angular_DATA)'; test -n "$(angulardir)" || list=; \ -- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(angulardir)'; $(am__uninstall_files_from_dir) --install-dist_angularrouteDATA: $(dist_angularroute_DATA) -- @$(NORMAL_INSTALL) -- @list='$(dist_angularroute_DATA)'; test -n "$(angularroutedir)" || list=; \ -- if test -n "$$list"; then \ -- echo " $(MKDIR_P) '$(DESTDIR)$(angularroutedir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(angularroutedir)" || exit 1; \ -- fi; \ -- for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- echo "$$d$$p"; \ -- done | $(am__base_list) | \ -- while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(angularroutedir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(angularroutedir)" || exit $$?; \ -- done -- --uninstall-dist_angularrouteDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(dist_angularroute_DATA)'; test -n "$(angularroutedir)" || list=; \ -- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(angularroutedir)'; $(am__uninstall_files_from_dir) - install-dist_bootcssDATA: $(dist_bootcss_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_bootcss_DATA)'; test -n "$(bootcssdir)" || list=; \ -@@ -14564,27 +14501,6 @@ uninstall-dist_bootfontsDATA: - @list='$(dist_bootfonts_DATA)'; test -n "$(bootfontsdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(bootfontsdir)'; $(am__uninstall_files_from_dir) --install-dist_bootjsDATA: $(dist_bootjs_DATA) -- @$(NORMAL_INSTALL) -- @list='$(dist_bootjs_DATA)'; test -n "$(bootjsdir)" || list=; \ -- if test -n "$$list"; then \ -- echo " $(MKDIR_P) '$(DESTDIR)$(bootjsdir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(bootjsdir)" || exit 1; \ -- fi; \ -- for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- echo "$$d$$p"; \ -- done | $(am__base_list) | \ -- while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(bootjsdir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(bootjsdir)" || exit $$?; \ -- done -- --uninstall-dist_bootjsDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(dist_bootjs_DATA)'; test -n "$(bootjsdir)" || list=; \ -- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(bootjsdir)'; $(am__uninstall_files_from_dir) - install-dist_cssDATA: $(dist_css_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_css_DATA)'; test -n "$(cssdir)" || list=; \ -@@ -14627,27 +14543,6 @@ uninstall-dist_imgDATA: - @list='$(dist_img_DATA)'; test -n "$(imgdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(imgdir)'; $(am__uninstall_files_from_dir) --install-dist_jqueryDATA: $(dist_jquery_DATA) -- @$(NORMAL_INSTALL) -- @list='$(dist_jquery_DATA)'; test -n "$(jquerydir)" || list=; \ -- if test -n "$$list"; then \ -- echo " $(MKDIR_P) '$(DESTDIR)$(jquerydir)'"; \ -- $(MKDIR_P) "$(DESTDIR)$(jquerydir)" || exit 1; \ -- fi; \ -- for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- echo "$$d$$p"; \ -- done | $(am__base_list) | \ -- while read files; do \ -- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(jquerydir)'"; \ -- $(INSTALL_DATA) $$files "$(DESTDIR)$(jquerydir)" || exit $$?; \ -- done -- --uninstall-dist_jqueryDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(dist_jquery_DATA)'; test -n "$(jquerydir)" || list=; \ -- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ -- dir='$(DESTDIR)$(jquerydir)'; $(am__uninstall_files_from_dir) - install-dist_jsDATA: $(dist_js_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_js_DATA)'; test -n "$(jsdir)" || list=; \ -@@ -16497,7 +16392,7 @@ install-binPROGRAMS: install-libLTLIBRAR - - installdirs: installdirs-recursive - installdirs-am: -- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rdmtestsexecdir)" "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(rdmtestsdir)" "$(DESTDIR)$(rpcpythondir)" "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(rdminitdir)" "$(DESTDIR)$(rdmtestsdir)" "$(DESTDIR)$(rpcpythondir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(angulardir)" "$(DESTDIR)$(angularroutedir)" "$(DESTDIR)$(bootcssdir)" "$(DESTDIR)$(bootfontsdir)" "$(DESTDIR)$(bootjsdir)" "$(DESTDIR)$(cssdir)" "$(DESTDIR)$(imgdir)" "$(DESTDIR)$(jquerydir)" "$(DESTDIR)$(jsdir)" "$(DESTDIR)$(newdir)" "$(DESTDIR)$(piddatadir)" "$(DESTDIR)$(tools_rdm_testserver_imagesdir)" "$(DESTDIR)$(tools_rdm_testserver_staticdir)" "$(DESTDIR)$(viewsdir)" "$(DESTDIR)$(wwwdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(artnetincludedir)" "$(DESTDIR)$(e131includedir)" "$(DESTDIR)$(olabaseincludedir)" "$(DESTDIR)$(olardmincludedir)" "$(DESTDIR)$(olatimecodeincludedir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(usbproincludedir)" "$(DESTDIR)$(olaacnincludedir)" "$(DESTDIR)$(olabaseincludedir)" "$(DESTDIR)$(olaclientincludedir)" "$(DESTDIR)$(oladincludedir)" "$(DESTDIR)$(oladmxincludedir)" "$(DESTDIR)$(olae133includedir)" "$(DESTDIR)$(olafileincludedir)" "$(DESTDIR)$(olahttpincludedir)" "$(DESTDIR)$(olaioincludedir)" "$(DESTDIR)$(olamathincludedir)" "$(DESTDIR)$(olamessagingincludedir)" "$(DESTDIR)$(olanetworkincludedir)" "$(DESTDIR)$(olardmincludedir)" "$(DESTDIR)$(olarpcincludedir)" "$(DESTDIR)$(olastlincludedir)" "$(DESTDIR)$(olastringsincludedir)" "$(DESTDIR)$(olasystemincludedir)" "$(DESTDIR)$(olathreadincludedir)" "$(DESTDIR)$(olatimecodeincludedir)" "$(DESTDIR)$(olautilincludedir)" "$(DESTDIR)$(olawebincludedir)" "$(DESTDIR)$(olawinincludedir)" "$(DESTDIR)$(pkgincludedir)"; do \ -+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rdmtestsexecdir)" "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(rdmtestsdir)" "$(DESTDIR)$(rpcpythondir)" "$(DESTDIR)$(pkgpythondir)" "$(DESTDIR)$(rdminitdir)" "$(DESTDIR)$(rdmtestsdir)" "$(DESTDIR)$(rpcpythondir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(bootcssdir)" "$(DESTDIR)$(bootfontsdir)" "$(DESTDIR)$(cssdir)" "$(DESTDIR)$(imgdir)" "$(DESTDIR)$(jsdir)" "$(DESTDIR)$(newdir)" "$(DESTDIR)$(piddatadir)" "$(DESTDIR)$(tools_rdm_testserver_imagesdir)" "$(DESTDIR)$(tools_rdm_testserver_staticdir)" "$(DESTDIR)$(viewsdir)" "$(DESTDIR)$(wwwdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(artnetincludedir)" "$(DESTDIR)$(e131includedir)" "$(DESTDIR)$(olabaseincludedir)" "$(DESTDIR)$(olardmincludedir)" "$(DESTDIR)$(olatimecodeincludedir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(usbproincludedir)" "$(DESTDIR)$(olaacnincludedir)" "$(DESTDIR)$(olabaseincludedir)" "$(DESTDIR)$(olaclientincludedir)" "$(DESTDIR)$(oladincludedir)" "$(DESTDIR)$(oladmxincludedir)" "$(DESTDIR)$(olae133includedir)" "$(DESTDIR)$(olafileincludedir)" "$(DESTDIR)$(olahttpincludedir)" "$(DESTDIR)$(olaioincludedir)" "$(DESTDIR)$(olamathincludedir)" "$(DESTDIR)$(olamessagingincludedir)" "$(DESTDIR)$(olanetworkincludedir)" "$(DESTDIR)$(olardmincludedir)" "$(DESTDIR)$(olarpcincludedir)" "$(DESTDIR)$(olastlincludedir)" "$(DESTDIR)$(olastringsincludedir)" "$(DESTDIR)$(olasystemincludedir)" "$(DESTDIR)$(olathreadincludedir)" "$(DESTDIR)$(olatimecodeincludedir)" "$(DESTDIR)$(olautilincludedir)" "$(DESTDIR)$(olawebincludedir)" "$(DESTDIR)$(olawinincludedir)" "$(DESTDIR)$(pkgincludedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done - install: $(BUILT_SOURCES) -@@ -16678,11 +16573,8 @@ info: info-recursive - - info-am: - --install-data-am: install-dist_angularDATA \ -- install-dist_angularrouteDATA install-dist_bootcssDATA \ -- install-dist_bootfontsDATA install-dist_bootjsDATA \ -- install-dist_cssDATA install-dist_imgDATA \ -- install-dist_jqueryDATA install-dist_jsDATA \ -+install-data-am: install-dist_bootcssDATA install-dist_bootfontsDATA \ -+ install-dist_cssDATA install-dist_imgDATA install-dist_jsDATA \ - install-dist_newDATA install-dist_piddataDATA \ - install-dist_tools_rdm_testserver_imagesDATA \ - install-dist_tools_rdm_testserver_staticDATA \ -@@ -16762,11 +16654,9 @@ ps: ps-recursive - - ps-am: - --uninstall-am: uninstall-binPROGRAMS uninstall-dist_angularDATA \ -- uninstall-dist_angularrouteDATA uninstall-dist_bootcssDATA \ -- uninstall-dist_bootfontsDATA uninstall-dist_bootjsDATA \ -- uninstall-dist_cssDATA uninstall-dist_imgDATA \ -- uninstall-dist_jqueryDATA uninstall-dist_jsDATA \ -+uninstall-am: uninstall-binPROGRAMS uninstall-dist_bootcssDATA \ -+ uninstall-dist_bootfontsDATA uninstall-dist_cssDATA \ -+ uninstall-dist_imgDATA uninstall-dist_jsDATA \ - uninstall-dist_newDATA uninstall-dist_piddataDATA \ - uninstall-dist_rdmtestsexecSCRIPTS \ - uninstall-dist_tools_rdm_testserver_imagesDATA \ -@@ -16819,12 +16709,10 @@ uninstall-man: uninstall-man1 - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ -- install-dist_angularDATA install-dist_angularrouteDATA \ - install-dist_bootcssDATA install-dist_bootfontsDATA \ -- install-dist_bootjsDATA install-dist_cssDATA \ -- install-dist_imgDATA install-dist_jqueryDATA \ -- install-dist_jsDATA install-dist_newDATA \ -- install-dist_piddataDATA install-dist_rdmtestsexecSCRIPTS \ -+ install-dist_cssDATA install-dist_imgDATA install-dist_jsDATA \ -+ install-dist_newDATA install-dist_piddataDATA \ -+ install-dist_rdmtestsexecSCRIPTS \ - install-dist_tools_rdm_testserver_imagesDATA \ - install-dist_tools_rdm_testserver_staticDATA \ - install-dist_viewsDATA install-dist_wwwDATA install-dvi \ -@@ -16862,11 +16750,9 @@ uninstall-man: uninstall-man1 - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - recheck tags tags-am uninstall uninstall-am \ -- uninstall-binPROGRAMS uninstall-dist_angularDATA \ -- uninstall-dist_angularrouteDATA uninstall-dist_bootcssDATA \ -- uninstall-dist_bootfontsDATA uninstall-dist_bootjsDATA \ -- uninstall-dist_cssDATA uninstall-dist_imgDATA \ -- uninstall-dist_jqueryDATA uninstall-dist_jsDATA \ -+ uninstall-binPROGRAMS uninstall-dist_bootcssDATA \ -+ uninstall-dist_bootfontsDATA uninstall-dist_cssDATA \ -+ uninstall-dist_imgDATA uninstall-dist_jsDATA \ - uninstall-dist_newDATA uninstall-dist_piddataDATA \ - uninstall-dist_rdmtestsexecSCRIPTS \ - uninstall-dist_tools_rdm_testserver_imagesDATA \ ---- ola-0.10.3.nojsmin.orig/config/config.guess -+++ ola-0.10.3.nojsmin/config/config.guess -@@ -1,8 +1,8 @@ - #! /bin/sh - # Attempt to guess a canonical system name. --# Copyright 1992-2014 Free Software Foundation, Inc. -+# Copyright 1992-2016 Free Software Foundation, Inc. - --timestamp='2014-11-04' -+timestamp='2016-10-02' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -27,7 +27,7 @@ timestamp='2014-11-04' - # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. - # - # You can get the latest version of this script from: --# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess - # - # Please send patches to <config-patc...@gnu.org>. - -@@ -50,7 +50,7 @@ version="\ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright 1992-2014 Free Software Foundation, Inc. -+Copyright 1992-2016 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -168,19 +168,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" -- UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ -- /usr/sbin/$sysctl 2>/dev/null || echo unknown)` -+ UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ -+ /sbin/$sysctl 2>/dev/null || \ -+ /usr/sbin/$sysctl 2>/dev/null || \ -+ echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; -+ earmv*) -+ arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` -+ endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` -+ machine=${arch}${endian}-unknown -+ ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched -- # to ELF recently, or will in the future. -+ # to ELF recently (or will in the future) and ABI. - case "${UNAME_MACHINE_ARCH}" in -+ earm*) -+ os=netbsdelf -+ ;; - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ -@@ -197,6 +207,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - os=netbsd - ;; - esac -+ # Determine ABI tags. -+ case "${UNAME_MACHINE_ARCH}" in -+ earm*) -+ expr='s/^earmv[0-9]/-eabi/;s/eb$//' -+ abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` -+ ;; -+ esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need -@@ -207,13 +224,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - release='-gnu' - ;; - *) -- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` -+ release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. -- echo "${machine}-${os}${release}" -+ echo "${machine}-${os}${release}${abi}" - exit ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -@@ -223,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; -+ *:LibertyBSD:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} -+ exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; -@@ -235,6 +256,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; -+ *:Sortix:*:*) -+ echo ${UNAME_MACHINE}-unknown-sortix -+ exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) -@@ -251,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") -- UNAME_MACHINE="alpha" ;; -+ UNAME_MACHINE=alpha ;; - "EV4.5 (21064)") -- UNAME_MACHINE="alpha" ;; -+ UNAME_MACHINE=alpha ;; - "LCA4 (21066/21068)") -- UNAME_MACHINE="alpha" ;; -+ UNAME_MACHINE=alpha ;; - "EV5 (21164)") -- UNAME_MACHINE="alphaev5" ;; -+ UNAME_MACHINE=alphaev5 ;; - "EV5.6 (21164A)") -- UNAME_MACHINE="alphaev56" ;; -+ UNAME_MACHINE=alphaev56 ;; - "EV5.6 (21164PC)") -- UNAME_MACHINE="alphapca56" ;; -+ UNAME_MACHINE=alphapca56 ;; - "EV5.7 (21164PC)") -- UNAME_MACHINE="alphapca57" ;; -+ UNAME_MACHINE=alphapca57 ;; - "EV6 (21264)") -- UNAME_MACHINE="alphaev6" ;; -+ UNAME_MACHINE=alphaev6 ;; - "EV6.7 (21264A)") -- UNAME_MACHINE="alphaev67" ;; -+ UNAME_MACHINE=alphaev67 ;; - "EV6.8CB (21264C)") -- UNAME_MACHINE="alphaev68" ;; -+ UNAME_MACHINE=alphaev68 ;; - "EV6.8AL (21264B)") -- UNAME_MACHINE="alphaev68" ;; -+ UNAME_MACHINE=alphaev68 ;; - "EV6.8CX (21264D)") -- UNAME_MACHINE="alphaev68" ;; -+ UNAME_MACHINE=alphaev68 ;; - "EV6.9A (21264/EV69A)") -- UNAME_MACHINE="alphaev69" ;; -+ UNAME_MACHINE=alphaev69 ;; - "EV7 (21364)") -- UNAME_MACHINE="alphaev7" ;; -+ UNAME_MACHINE=alphaev7 ;; - "EV7.9 (21364A)") -- UNAME_MACHINE="alphaev79" ;; -+ UNAME_MACHINE=alphaev79 ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 -@@ -359,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build -- SUN_ARCH="i386" -+ SUN_ARCH=i386 - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. -- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then -- SUN_ARCH="x86_64" -+ SUN_ARCH=x86_64 - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -@@ -393,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` -- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 -+ test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} -@@ -618,13 +642,13 @@ EOF - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -+ 32) HP_ARCH=hppa2.0n ;; -+ 64) HP_ARCH=hppa2.0w ;; -+ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 - esac ;; - esac - fi -@@ -663,11 +687,11 @@ EOF - exit (0); - } - EOF -- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` -+ (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac -- if [ ${HP_ARCH} = "hppa2.0w" ] -+ if [ ${HP_ARCH} = hppa2.0w ] - then - eval $set_cc_for_build - -@@ -680,12 +704,12 @@ EOF - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - -- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | -+ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then -- HP_ARCH="hppa2.0w" -+ HP_ARCH=hppa2.0w - else -- HP_ARCH="hppa64" -+ HP_ARCH=hppa64 - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} -@@ -790,14 +814,14 @@ EOF - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) -- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` -+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) -@@ -879,7 +903,7 @@ EOF - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland -- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix -@@ -902,7 +926,7 @@ EOF - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 -- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi -+ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) -@@ -933,6 +957,9 @@ EOF - crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; -+ e2k:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; - frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; -@@ -945,6 +972,9 @@ EOF - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; -+ k1om:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; -@@ -970,6 +1000,9 @@ EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; -+ mips64el:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; - openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} - exit ;; -@@ -1002,6 +1035,9 @@ EOF - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} - exit ;; -+ riscv32:Linux:*:* | riscv64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} - exit ;; -@@ -1021,7 +1057,7 @@ EOF - echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; - x86_64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -+ echo ${UNAME_MACHINE}-pc-linux-${LIBC} - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} -@@ -1100,7 +1136,7 @@ EOF - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub -- # prints for the "djgpp" host, or else GDB configury will decide that -+ # prints for the "djgpp" host, or else GDB configure will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; -@@ -1249,6 +1285,9 @@ EOF - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; -+ SX-ACE:SUPER-UX:*:*) -+ echo sxace-nec-superux${UNAME_RELEASE} -+ exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; -@@ -1262,9 +1301,9 @@ EOF - UNAME_PROCESSOR=powerpc - fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then -- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then -+ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ -+ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in -@@ -1286,7 +1325,7 @@ EOF - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` -- if test "$UNAME_PROCESSOR" = "x86"; then -+ if test "$UNAME_PROCESSOR" = x86; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi -@@ -1317,7 +1356,7 @@ EOF - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. -- if test "$cputype" = "386"; then -+ if test "$cputype" = 386; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" -@@ -1359,7 +1398,7 @@ EOF - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) -- echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos -@@ -1370,23 +1409,25 @@ EOF - x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx - exit ;; -+ amd64:Isilon\ OneFS:*:*) -+ echo x86_64-unknown-onefs -+ exit ;; - esac - - cat >&2 <<EOF - $0: unable to guess system type - --This script, last modified $timestamp, has failed to recognize --the operating system you are using. It is advised that you --download the most up to date version of the config scripts from -+This script (version $timestamp), has failed to recognize the -+operating system you are using. If your script is old, overwrite -+config.guess and config.sub with the latest versions from: - -- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess - and -- http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub - --If the version you run ($0) is already up to date, please --send the following data and any information you think might be --pertinent to <config-patc...@gnu.org> in order to provide the needed --information to handle your system. -+If $0 has already been updated, send the following data and any -+information you think might be pertinent to config-patc...@gnu.org to -+provide the necessary information to handle your system. - - config.guess timestamp = $timestamp - ---- ola-0.10.3.nojsmin.orig/config/config.sub -+++ ola-0.10.3.nojsmin/config/config.sub -@@ -1,8 +1,8 @@ - #! /bin/sh - # Configuration validation subroutine script. --# Copyright 1992-2014 Free Software Foundation, Inc. -+# Copyright 1992-2016 Free Software Foundation, Inc. - --timestamp='2014-12-03' -+timestamp='2016-11-04' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -33,7 +33,7 @@ timestamp='2014-12-03' - # Otherwise, we print the canonical config type on stdout and succeed. - - # You can get the latest version of this script from: --# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub - - # This file is supposed to be the same for all GNU packages - # and recognize all the CPU types, system types and aliases -@@ -53,8 +53,7 @@ timestamp='2014-12-03' - me=`echo "$0" | sed -e 's,.*/,,'` - - usage="\ --Usage: $0 [OPTION] CPU-MFR-OPSYS -- $0 [OPTION] ALIAS -+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS - - Canonicalize a configuration name. - -@@ -68,7 +67,7 @@ Report bugs and patches to <config-patch - version="\ - GNU config.sub ($timestamp) - --Copyright 1992-2014 Free Software Foundation, Inc. -+Copyright 1992-2016 Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -117,8 +116,8 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^- - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -- knetbsd*-gnu* | netbsd*-gnu* | \ -- kopensolaris*-gnu* | \ -+ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ -+ kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` -@@ -255,12 +254,13 @@ case $basic_machine in - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ -+ | ba \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ -- | epiphany \ -- | fido | fr30 | frv \ -+ | e2k | epiphany \ -+ | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia64 \ -@@ -301,11 +301,12 @@ case $basic_machine in - | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ -+ | pru \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ -- | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ -+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -@@ -376,12 +377,13 @@ case $basic_machine in - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ -+ | ba-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ -- | elxsi-* \ -+ | e2k-* | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -@@ -427,13 +429,15 @@ case $basic_machine in - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ -+ | pru-* \ - | pyramid-* \ -+ | riscv32-* | riscv64-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ -@@ -518,6 +522,9 @@ case $basic_machine in - basic_machine=i386-pc - os=-aros - ;; -+ asmjs) -+ basic_machine=asmjs-unknown -+ ;; - aux) - basic_machine=m68k-apple - os=-aux -@@ -638,6 +645,14 @@ case $basic_machine in - basic_machine=m68k-bull - os=-sysv3 - ;; -+ e500v[12]) -+ basic_machine=powerpc-unknown -+ os=$os"spe" -+ ;; -+ e500v[12]-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ os=$os"spe" -+ ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon -@@ -1017,7 +1032,7 @@ case $basic_machine in - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- ppcle | powerpclittle | ppc-le | powerpc-little) -+ ppcle | powerpclittle) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) -@@ -1027,7 +1042,7 @@ case $basic_machine in - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; -- ppc64le | powerpc64little | ppc64-le | powerpc64-little) -+ ppc64le | powerpc64little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) -@@ -1373,18 +1388,18 @@ case $os in - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ -- | -aos* | -aros* \ -+ | -aos* | -aros* | -cloudabi* | -sortix* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -- | -bitrig* | -openbsd* | -solidbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ -@@ -1393,7 +1408,8 @@ case $os in - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -- | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ -+ | -onefs* | -tirtos* | -phoenix* | -fuchsia*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1525,6 +1541,8 @@ case $os in - ;; - -nacl*) - ;; -+ -ios) -+ ;; - -none) - ;; - *) ---- ola-0.10.3.nojsmin.orig/config/install-sh -+++ ola-0.10.3.nojsmin/config/install-sh -@@ -1,7 +1,7 @@ - #!/bin/sh - # install - install a program, script, or datafile - --scriptversion=2013-12-25.23; # UTC -+scriptversion=2014-09-12.12; # UTC - - # This originates from X11R5 (mit/util/scripts/install.sh), which was - # later released in X11R6 (xc/config/util/install.sh) with the -@@ -324,34 +324,41 @@ do - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) -+ # $RANDOM is not portable (e.g. dash); use it when possible to -+ # lower collision chance - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ -- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 -+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - -+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so -+ # create the $tmpdir first (and fail if unsuccessful) to make sure -+ # that nobody tries to guess the $tmpdir name. - if (umask $mkdir_umask && -- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 -+ $mkdirprog $mkdir_mode "$tmpdir" && -+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. -- ls_ld_tmpdir=`ls -ld "$tmpdir"` -+ test_tmpdir="$tmpdir/a" -+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && -- $mkdirprog -m$different_mode -p -- "$tmpdir" && { -- ls_ld_tmpdir_1=`ls -ld "$tmpdir"` -+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { -+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi -- rmdir "$tmpdir/d" "$tmpdir" -+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. -- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null -+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; ---- ola-0.10.3.nojsmin.orig/config/libtool.m4 -+++ ola-0.10.3.nojsmin/config/libtool.m4 -@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([ - cat <<_LT_EOF >> "$cfgfile" - #! $SHELL - # Generated automatically by $as_me ($PACKAGE) $VERSION --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - - # Provide generalized library-building support services. -@@ -2887,6 +2886,18 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -3546,7 +3557,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else -@@ -4424,7 +4435,7 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -4936,6 +4947,9 @@ m4_if([$1], [CXX], [ - ;; - esac - ;; -+ linux* | k*bsd*-gnu | gnu*) -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ ;; - *) - _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -4998,6 +5012,9 @@ dnl Note also adjust exclude_expsyms for - openbsd* | bitrig*) - with_gnu_ld=no - ;; -+ linux* | k*bsd*-gnu | gnu*) -+ _LT_TAGVAR(link_all_deplibs, $1)=no -+ ;; - esac - - _LT_TAGVAR(ld_shlibs, $1)=yes -@@ -5252,7 +5269,7 @@ _LT_EOF - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -5773,6 +5790,7 @@ _LT_EOF - if test yes = "$lt_cv_irix_exported_symbol"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' - fi -+ _LT_TAGVAR(link_all_deplibs, $1)=no - else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' -@@ -5794,7 +5812,7 @@ _LT_EOF - esac - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else ---- ola-0.10.3.nojsmin.orig/config/ltmain.sh -+++ ola-0.10.3.nojsmin/config/ltmain.sh -@@ -31,7 +31,7 @@ - - PROGRAM=libtool - PACKAGE=libtool --VERSION=2.4.6 -+VERSION="2.4.6 Debian-2.4.6-2" - package_revision=2.4.6 - - -@@ -2068,12 +2068,12 @@ include the following information: - compiler: $LTCC - compiler flags: $LTCFLAGS - linker: $LD (gnu? $with_gnu_ld) -- version: $progname (GNU libtool) 2.4.6 -+ version: $progname $scriptversion Debian-2.4.6-2 - automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` - autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` - - Report bugs to <bug-libt...@gnu.org>. --GNU libtool home page: <http://www.gnu.org/software/libtool/>. -+GNU libtool home page: <http://www.gnu.org/s/libtool/>. - General help using GNU software: <http://www.gnu.org/gethelp/>." - exit 0 - } -@@ -7272,12 +7272,13 @@ func_mode_link () - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -+ # -specs=* GCC specs files - # -stdlib=* select c++ std lib with clang -- # -fsanitize=* Clang memory and address sanitizer -+ # -fsanitize=* Clang/GCC memory and address sanitizer - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ -- -fsanitize=*) -+ -specs=*|-fsanitize=*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result - func_append compile_command " $arg" -@@ -7570,7 +7571,10 @@ func_mode_link () - case $pass in - dlopen) libs=$dlfiles ;; - dlpreopen) libs=$dlprefiles ;; -- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; -+ link) -+ libs="$deplibs %DEPLIBS%" -+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" -+ ;; - esac - fi - if test lib,dlpreopen = "$linkmode,$pass"; then -@@ -7889,19 +7893,19 @@ func_mode_link () - # It is a libtool convenience library, so add in its objects. - func_append convenience " $ladir/$objdir/$old_library" - func_append old_convenience " $ladir/$objdir/$old_library" -+ tmp_libs= -+ for deplib in $dependency_libs; do -+ deplibs="$deplib $deplibs" -+ if $opt_preserve_dup_deps; then -+ case "$tmp_libs " in -+ *" $deplib "*) func_append specialdeplibs " $deplib" ;; -+ esac -+ fi -+ func_append tmp_libs " $deplib" -+ done - elif test prog != "$linkmode" && test lib != "$linkmode"; then - func_fatal_error "'$lib' is not a convenience library" - fi -- tmp_libs= -- for deplib in $dependency_libs; do -- deplibs="$deplib $deplibs" -- if $opt_preserve_dup_deps; then -- case "$tmp_libs " in -- *" $deplib "*) func_append specialdeplibs " $deplib" ;; -- esac -- fi -- func_append tmp_libs " $deplib" -- done - continue - fi # $pass = conv - -@@ -8825,6 +8829,9 @@ func_mode_link () - revision=$number_minor - lt_irix_increment=no - ;; -+ *) -+ func_fatal_configuration "$modename: unknown library version type '$version_type'" -+ ;; - esac - ;; - no) ---- ola-0.10.3.nojsmin.orig/configure -+++ ola-0.10.3.nojsmin/configure -@@ -944,6 +944,7 @@ infodir - docdir - oldincludedir - includedir -+runstatedir - localstatedir - sharedstatedir - sysconfdir -@@ -1110,6 +1111,7 @@ datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' -+runstatedir='${localstatedir}/run' - includedir='${prefix}/include' - oldincludedir='/usr/include' - docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -1362,6 +1364,15 @@ do - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - -+ -runstatedir | --runstatedir | --runstatedi | --runstated \ -+ | --runstate | --runstat | --runsta | --runst | --runs \ -+ | --run | --ru | --r) -+ ac_prev=runstatedir ;; -+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ -+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ -+ | --run=* | --ru=* | --r=*) -+ runstatedir=$ac_optarg ;; -+ - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -@@ -1499,7 +1510,7 @@ fi - for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -- libdir localedir mandir -+ libdir localedir mandir runstatedir - do - eval ac_val=\$$ac_var - # Remove trailing slashes. -@@ -1652,6 +1663,7 @@ Fine tuning of the installation director - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] -@@ -8570,7 +8582,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -@@ -12301,6 +12313,9 @@ $as_echo_n "checking whether the $compil - openbsd* | bitrig*) - with_gnu_ld=no - ;; -+ linux* | k*bsd*-gnu | gnu*) -+ link_all_deplibs=no -+ ;; - esac - - ld_shlibs=yes -@@ -12555,7 +12570,7 @@ _LT_EOF - fi - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -13225,6 +13240,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > - if test yes = "$lt_cv_irix_exported_symbol"; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' - fi -+ link_all_deplibs=no - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' -@@ -13246,7 +13262,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > - esac - ;; - -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -14361,6 +14377,18 @@ fi - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -17255,7 +17283,7 @@ lt_prog_compiler_static_CXX= - ;; - esac - ;; -- netbsd*) -+ netbsd* | netbsdelf*-gnu) - ;; - *qnx* | *nto*) - # QNX uses GNU C++, but need to define -shared option too, otherwise -@@ -17630,6 +17658,9 @@ $as_echo_n "checking whether the $compil - ;; - esac - ;; -+ linux* | k*bsd*-gnu | gnu*) -+ link_all_deplibs_CXX=no -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -18323,6 +18354,18 @@ fi - dynamic_linker='GNU/Linux ld.so' - ;; - -+netbsdelf*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='NetBSD ld.elf_so' -+ ;; -+ - netbsd*) - version_type=sunos - need_lib_prefix=no -@@ -28238,7 +28281,6 @@ $as_echo X"$file" | - cat <<_LT_EOF >> "$cfgfile" - #! $SHELL - # Generated automatically by $as_me ($PACKAGE) $VERSION --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - - # Provide generalized library-building support services. ---- ola-0.10.3.nojsmin.orig/java/Makefile.in -+++ ola-0.10.3.nojsmin/java/Makefile.in -@@ -338,6 +338,7 @@ program_transform_name = @program_transf - psdir = @psdir@ - pyexecdir = @pyexecdir@ - pythondir = @pythondir@ -+runstatedir = @runstatedir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ ---- ola-0.10.3.nojsmin.orig/tools/rdm/static/rdmtests.html -+++ ola-0.10.3.nojsmin/tools/rdm/static/rdmtests.html -@@ -3,8 +3,8 @@ - <head> - <link type='text/css' rel='stylesheet' href='/static/jquery-ui-1.8.21.custom.css' /> - <link rel='stylesheet' href='/static/ui.multiselect.css' type='text/css'> -- <script src='/static/jquery-1.7.2.min.js'></script> -- <script src='/static/jquery-ui-1.8.21.custom.min.js'></script> -+ <script src='/static/jquery.min.js'></script> -+ <script src='/static/jquery-ui.custom.min.js'></script> - <script src='/static/ui.multiselect.js'></script> - <script src='/static/rdm_tests.js'></script> - <title>RDM Tests & Publisher</title> ---- ola-0.10.3.nojsmin.orig/olad/www/Makefile.mk -+++ ola-0.10.3.nojsmin/olad/www/Makefile.mk -@@ -69,14 +69,6 @@ dist_img_DATA = \ - olad/www/new/img/light_bulb.png \ - olad/www/new/img/logo-mini.png \ - olad/www/new/img/logo.png --dist_jquery_DATA = \ -- olad/www/new/libs/jquery/js/jquery.min.js --dist_angularroute_DATA = \ -- olad/www/new/libs/angular-route/js/angular-route.min.js --dist_angular_DATA = \ -- olad/www/new/libs/angular/js/angular.min.js --dist_bootjs_DATA = \ -- olad/www/new/libs/bootstrap/js/bootstrap.min.js - dist_bootfonts_DATA = \ - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.eot \ - olad/www/new/libs/bootstrap/fonts/glyphicons-halflings-regular.svg \ ---- ola-0.10.3.nojsmin.orig/tools/rdm/Makefile.mk -+++ ola-0.10.3.nojsmin/tools/rdm/Makefile.mk -@@ -17,9 +17,7 @@ module_files = \ - testserver_static_files = \ - tools/rdm/static/MIT-LICENSE.txt \ - tools/rdm/static/common.css \ -- tools/rdm/static/jquery-1.7.2.min.js \ - tools/rdm/static/jquery-ui-1.8.21.custom.css \ -- tools/rdm/static/jquery-ui-1.8.21.custom.min.js \ - tools/rdm/static/rdm_tests.js \ - tools/rdm/static/rdmtests.html \ - tools/rdm/static/ui.multiselect.css \ +--- /dev/null ++++ ola-0.10.3.nojsmin/.travis-ci.sh +@@ -0,0 +1,114 @@ ++#!/bin/bash ++ ++# This script is triggered from the script section of .travis.yml ++# It runs the appropriate commands depending on the task requested. ++ ++set -e ++ ++CPP_LINT_URL="https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py";; ++ ++COVERITY_SCAN_BUILD_URL="https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh"; ++ ++if [[ $TASK = 'lint' ]]; then ++ # run the lint tool only if it is the requested task ++ autoreconf -i; ++ ./configure --enable-rdm-tests --enable-ja-rule; ++ # the following is a bit of a hack to build the files normally built during ++ # the build, so they are present for linting to run against ++ make builtfiles ++ # first check we've not got any generic NOLINTs ++ # count the number of generic NOLINTs ++ nolints=$(grep -IR NOLINT * | grep -v "NOLINT(" | wc -l) ++ if [[ $nolints -ne 0 ]]; then ++ # print the output for info ++ echo $(grep -IR NOLINT * | grep -v "NOLINT(") ++ echo "Found $nolints generic NOLINTs" ++ exit 1; ++ else ++ echo "Found $nolints generic NOLINTs" ++ fi; ++ # then fetch and run the main cpplint tool ++ wget -O cpplint.py $CPP_LINT_URL; ++ chmod u+x cpplint.py; ++ ./cpplint.py \ ++ --filter=-legal/copyright,-readability/streams,-runtime/arrays \ ++ $(find ./ \( -name "*.h" -or -name "*.cpp" \) -and ! \( \ ++ -wholename "./common/protocol/Ola.pb.*" -or \ ++ -wholename "./common/rpc/Rpc.pb.*" -or \ ++ -wholename "./common/rpc/TestService.pb.*" -or \ ++ -wholename "./common/rdm/Pids.pb.*" -or \ ++ -wholename "./config.h" -or \ ++ -wholename "./plugins/*/messages/*ConfigMessages.pb.*" -or \ ++ -wholename "./tools/ola_trigger/config.tab.*" -or \ ++ -wholename "./tools/ola_trigger/lex.yy.cpp" \) | xargs) ++ if [[ $? -ne 0 ]]; then ++ exit 1; ++ fi; ++elif [[ $TASK = 'check-licences' ]]; then ++ # check licences only if it is the requested task ++ autoreconf -i; ++ ./configure --enable-rdm-tests --enable-ja-rule; ++ # the following is a bit of a hack to build the files normally built during ++ # the build, so they are present for licence checking to run against ++ make builtfiles ++ ./scripts/enforce_licence.py ++ if [[ $? -ne 0 ]]; then ++ exit 1; ++ fi; ++elif [[ $TASK = 'doxygen' ]]; then ++ # check doxygen only if it is the requested task ++ autoreconf -i; ++ # Doxygen is C++ only, so don't bother with RDM tests ++ ./configure --enable-ja-rule; ++ # the following is a bit of a hack to build the files normally built during ++ # the build, so they are present for Doxygen to run against ++ make builtfiles ++ # count the number of warnings ++ warnings=$(make doxygen-doc 2>&1 >/dev/null | wc -l) ++ if [[ $warnings -ne 0 ]]; then ++ # print the output for info ++ make doxygen-doc ++ echo "Found $warnings doxygen warnings" ++ exit 1; ++ else ++ echo "Found $warnings doxygen warnings" ++ fi; ++elif [[ $TASK = 'coverage' ]]; then ++ # Compile with coverage for coveralls ++ autoreconf -i; ++ # Coverage is C++ only, so don't bother with RDM tests ++ ./configure --enable-gcov --enable-ja-rule; ++ make; ++ make check; ++elif [[ $TASK = 'coverity' ]]; then ++ # Run Coverity Scan unless token is zero length ++ # The Coverity Scan script also relies on a number of other COVERITY_SCAN_ ++ # variables set in .travis.yml ++ if [[ ${#COVERITY_SCAN_TOKEN} -ne 0 ]]; then ++ curl -s $COVERITY_SCAN_BUILD_URL | bash ++ else ++ echo "Skipping Coverity Scan as no token found, probably a Pull Request" ++ fi; ++elif [[ $TASK = 'jshint' ]]; then ++ cd ./javascript/new-src; ++ npm install; ++ grunt test ++elif [[ $TASK = 'flake8' ]]; then ++ autoreconf -i; ++ ./configure --enable-rdm-tests ++ # the following is a bit of a hack to build the files normally built during ++ # the build, so they are present for flake8 to run against ++ make builtfiles ++ flake8 --max-line-length 80 --exclude *_pb2.py,.git,__pycache --ignore E111,E114,E121,E127,E129 data/rdm include/ola python scripts tools/ola_mon tools/rdm ++else ++ # Otherwise compile and check as normal ++ export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule' ++ autoreconf -i; ++ ./configure $DISTCHECK_CONFIGURE_FLAGS; ++ make distcheck; ++ make dist; ++ tarball=$(ls -Ut ola*.tar.gz | head -1) ++ tar -zxf $tarball; ++ tarball_root=$(echo $tarball | sed 's/.tar.gz$//') ++ ./scripts/verify_trees.py ./ $tarball_root ++fi
