From acc4e461d3ae1da4cf88722b9962cd6cd5d2bce8e7605cf57fefdc6bc048f259 Mon Sep 17 00:00:00 2001 From: Axel Braun Date: Fri, 27 Mar 2020 17:46:33 +0000 Subject: [PATCH] Accepting request 789123 from home:DocB:Orthanc boo#1167431 OBS-URL: https://build.opensuse.org/request/show/789123 OBS-URL: https://build.opensuse.org/package/show/graphics/orthanc?expand=0&rev=12 --- orthanc-rpmlintrc | 4 ++++ orthanc.changes | 2 +- orthanc.spec | 12 ++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/orthanc-rpmlintrc b/orthanc-rpmlintrc index d7701df..5508685 100644 --- a/orthanc-rpmlintrc +++ b/orthanc-rpmlintrc @@ -5,3 +5,7 @@ addFilter("wrong-file-end-of-line-encoding /usr/share/doc/packages/orthanc/Sampl # some python files are installed under 'examples' # they should be adjusted addFilter("env-script-interpreter"); +# false positive +addFilter("script-without-shebang /etc/orthanc/Configuration.json"); +addFilter("script-without-shebang /etc/orthanc/worklists.json"); +addFilter("script-without-shebang /etc/orthanc/serve-folders.json"); diff --git a/orthanc.changes b/orthanc.changes index 01d61e3..5f5a115 100644 --- a/orthanc.changes +++ b/orthanc.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Mar 25 19:08:48 UTC 2020 - Axel Braun -- various security hardenings +- various security hardenings (boo#1167431) ------------------------------------------------------------------- Tue Mar 24 19:34:05 UTC 2020 - Axel Braun diff --git a/orthanc.spec b/orthanc.spec index 01838af..16fd5f5 100644 --- a/orthanc.spec +++ b/orthanc.spec @@ -2,7 +2,7 @@ # spec file for package orthanc # # Copyright (c) 2020 SUSE LLC -# Copyright (c) 2019-2021 Dr. Axel Braun +# Copyright (c) 2019-2020 Dr. Axel Braun # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,11 +33,11 @@ Source5: index.html Source6: VersionsTests.cpp Source7: orthanc-rpmlintrc Source8: Configuration.json -# Sources for plugin -Source10: bootstrap-4.3.1.zip -Source11: axios-0.19.0.tar.gz -Source12: jquery-3.4.1.min.js -Source13: vuejs-2.6.10.tar.gz +# Sources for plugin - need a defined version, so taking them from orthanc-server +Source10: http://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/bootstrap-4.3.1.zip +Source11: http://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/axios-0.19.0.tar.gz +Source12: http://orthanc.osimis.io/ThirdPartyDownloads/jquery-3.4.1.min.js +Source13: http://orthanc.osimis.io/ThirdPartyDownloads/dicom-web/vuejs-2.6.10.tar.gz BuildRequires: civetweb-devel BuildRequires: cmake >= 2.8.0