commit orthanc for openSUSE:Factory
Hello community, here is the log from the commit of package orthanc for openSUSE:Factory checked in at 2020-06-02 14:34:23 Comparing /work/SRC/openSUSE:Factory/orthanc (Old) and /work/SRC/openSUSE:Factory/.orthanc.new.3606 (New) Package is "orthanc" Tue Jun 2 14:34:23 2020 rev:7 rq:809643 version:1.7.1 Changes: --- /work/SRC/openSUSE:Factory/orthanc/orthanc.changes 2020-05-26 17:21:09.116211063 +0200 +++ /work/SRC/openSUSE:Factory/.orthanc.new.3606/orthanc.changes 2020-06-02 14:34:29.986735659 +0200 @@ -1,0 +2,7 @@ +Wed May 27 14:24:06 UTC 2020 - Axel Braun + +- version 1.7.1 +* Fix decoding of DICOM images for plugins (for compatibility with + Orthanc Web Viewer 2.6) + +--- Old: Orthanc-1.7.0.tar.gz New: Orthanc-1.7.1.tar.gz Other differences: -- ++ orthanc.spec ++ --- /var/tmp/diff_new_pack.dMmLip/_old 2020-06-02 14:34:31.250739659 +0200 +++ /var/tmp/diff_new_pack.dMmLip/_new 2020-06-02 14:34:31.250739659 +0200 @@ -18,7 +18,7 @@ Name: orthanc -Version:1.7.0 +Version:1.7.1 Release:0 Summary:RESTful DICOM server for healthcare and medical research License:GPL-3.0-or-later ++ Orthanc-1.7.0.tar.gz -> Orthanc-1.7.1.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Orthanc-1.7.0/.hg_archival.txt new/Orthanc-1.7.1/.hg_archival.txt --- old/Orthanc-1.7.0/.hg_archival.txt 2020-05-22 12:30:36.0 +0200 +++ new/Orthanc-1.7.1/.hg_archival.txt 2020-05-27 08:12:33.0 +0200 @@ -1,6 +1,6 @@ repo: 3959d33612ccaadc0d4d707227fbed09ac35e5fe -node: 22eb9453b3f5df679edad13152e15d0cfb9da5d1 -branch: Orthanc-1.7.0 +node: adc6f1fa7417d10e7a2e7a1529a0f973a5d67de9 +branch: Orthanc-1.7.1 latesttag: toa2020012703 -latesttagdistance: 226 -changessincelatesttag: 341 +latesttagdistance: 237 +changessincelatesttag: 354 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Orthanc-1.7.0/Core/DicomNetworking/IGetRequestHandler.h new/Orthanc-1.7.1/Core/DicomNetworking/IGetRequestHandler.h --- old/Orthanc-1.7.0/Core/DicomNetworking/IGetRequestHandler.h 2020-05-22 12:30:36.0 +0200 +++ new/Orthanc-1.7.1/Core/DicomNetworking/IGetRequestHandler.h 2020-05-27 08:12:33.0 +0200 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., Belgium + * Copyright (C) 2017-2020 Osimis S.A., Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Orthanc-1.7.0/Core/DicomNetworking/IGetRequestHandlerFactory.h new/Orthanc-1.7.1/Core/DicomNetworking/IGetRequestHandlerFactory.h --- old/Orthanc-1.7.0/Core/DicomNetworking/IGetRequestHandlerFactory.h 2020-05-22 12:30:36.0 +0200 +++ new/Orthanc-1.7.1/Core/DicomNetworking/IGetRequestHandlerFactory.h 2020-05-27 08:12:33.0 +0200 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., Belgium + * Copyright (C) 2017-2020 Osimis S.A., Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Orthanc-1.7.0/Core/DicomNetworking/Internals/GetScp.cpp new/Orthanc-1.7.1/Core/DicomNetworking/Internals/GetScp.cpp --- old/Orthanc-1.7.0/Core/DicomNetworking/Internals/GetScp.cpp 2020-05-22 12:30:36.0 +0200 +++ new/Orthanc-1.7.1/Core/DicomNetworking/Internals/GetScp.cpp 2020-05-27 08:12:33.0 +0200 @@ -2,7 +2,7 @@ * Orthanc - A Lightweight, RESTful DICOM Store * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics * Department, University Hospital of Liege, Belgium - * Copyright (C) 2017-2019 Osimis S.A., Belgium + * Copyright (C) 2017-2020 Osimis S.A., Belgium * * This program is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Orthanc-1.7.0/Core/DicomNetworking/Internals/GetScp.h new/Orthanc-1.7.1/Core/DicomNetworking/Internals/GetScp.h ---
commit orthanc for openSUSE:Factory
Hello community, here is the log from the commit of package orthanc for openSUSE:Factory checked in at 2020-05-26 17:20:53 Comparing /work/SRC/openSUSE:Factory/orthanc (Old) and /work/SRC/openSUSE:Factory/.orthanc.new.2738 (New) Package is "orthanc" Tue May 26 17:20:53 2020 rev:6 rq:808348 version:1.7.0 Changes: --- /work/SRC/openSUSE:Factory/orthanc/orthanc.changes 2020-04-27 23:34:00.891012225 +0200 +++ /work/SRC/openSUSE:Factory/.orthanc.new.2738/orthanc.changes 2020-05-26 17:21:09.116211063 +0200 @@ -1,0 +2,13 @@ +Fri May 22 17:22:11 UTC 2020 - Axel Braun + +- new version 1.7.0 + * Support of DICOM C-GET SCP (contribution by Varian) + * DICOM transcoding over the REST API + * Transcoding from compressed to uncompressed transfer syntaxes over DICOM + C-STORE SCU (if the remote modality doesn't support compressed syntaxes) + * New configuration options related to transcoding: + "TranscodeDicomProtocol", "BuiltinDecoderTranscoderOrder", + "IngestTranscoding" and "DicomLossyTranscodingQuality" + * See NEWS for details + +--- Old: Orthanc-1.6.1.tar.gz New: Orthanc-1.7.0.tar.gz Other differences: -- ++ orthanc.spec ++ --- /var/tmp/diff_new_pack.6lWBIw/_old 2020-05-26 17:21:09.920212791 +0200 +++ /var/tmp/diff_new_pack.6lWBIw/_new 2020-05-26 17:21:09.924212800 +0200 @@ -18,7 +18,7 @@ Name: orthanc -Version:1.6.1 +Version:1.7.0 Release:0 Summary:RESTful DICOM server for healthcare and medical research License:GPL-3.0-or-later ++ Orthanc-1.6.1.tar.gz -> Orthanc-1.7.0.tar.gz ++ 18709 lines of diff (skipped)
commit orthanc for openSUSE:Factory
Hello community, here is the log from the commit of package orthanc for openSUSE:Factory checked in at 2020-04-27 23:33:33 Comparing /work/SRC/openSUSE:Factory/orthanc (Old) and /work/SRC/openSUSE:Factory/.orthanc.new.2738 (New) Package is "orthanc" Mon Apr 27 23:33:33 2020 rev:5 rq:797635 version:1.6.1 Changes: --- /work/SRC/openSUSE:Factory/orthanc/orthanc.changes 2020-04-05 20:57:18.393427341 +0200 +++ /work/SRC/openSUSE:Factory/.orthanc.new.2738/orthanc.changes 2020-04-27 23:34:00.891012225 +0200 @@ -1,0 +2,6 @@ +Wed Apr 22 17:59:05 UTC 2020 - Axel Braun + +- version 1.6.1 + sqlitewrapper.patch removed (included in 1.6.1) + +--- Old: Orthanc-1.6.0.tar.gz sqlitewrapper.patch New: Orthanc-1.6.1.tar.gz Other differences: -- ++ orthanc.spec ++ --- /var/tmp/diff_new_pack.jq6AU7/_old 2020-04-27 23:34:02.907016160 +0200 +++ /var/tmp/diff_new_pack.jq6AU7/_new 2020-04-27 23:34:02.907016160 +0200 @@ -18,7 +18,7 @@ Name: orthanc -Version:1.6.0 +Version:1.6.1 Release:0 Summary:RESTful DICOM server for healthcare and medical research License:GPL-3.0-or-later @@ -38,8 +38,6 @@ 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 -# Patch against SQL injection: -Patch0: sqlitewrapper.patch BuildRequires: civetweb-devel BuildRequires: cmake >= 2.8.0 @@ -121,8 +119,6 @@ %prep %setup -q -n Orthanc-%{version} -%patch0 -p0 - cp %{S:1} %{S:2} . cp %{S:6} UnitTestsSources/. ++ Configuration.json ++ --- /var/tmp/diff_new_pack.jq6AU7/_old 2020-04-27 23:34:02.939016223 +0200 +++ /var/tmp/diff_new_pack.jq6AU7/_new 2020-04-27 23:34:02.943016231 +0200 @@ -52,7 +52,9 @@ // folders, in which case they will be scanned non-recursively to // find shared libraries. Backslashes must be either escaped by // doubling them, or replaced by forward slashes "/". + // global definition for openSUSE "Plugins" : [ + "/usr/share/orthanc/plugins" ], // Maximum number of processing jobs that are simultaneously running ++ Orthanc-1.6.0.tar.gz -> Orthanc-1.6.1.tar.gz ++ 6861 lines of diff (skipped)
commit orthanc for openSUSE:Factory
Hello community, here is the log from the commit of package orthanc for openSUSE:Factory checked in at 2020-04-05 20:57:11 Comparing /work/SRC/openSUSE:Factory/orthanc (Old) and /work/SRC/openSUSE:Factory/.orthanc.new.3248 (New) Package is "orthanc" Sun Apr 5 20:57:11 2020 rev:4 rq:791489 version:1.6.0 Changes: --- /work/SRC/openSUSE:Factory/orthanc/orthanc.changes 2020-03-29 14:26:03.166108469 +0200 +++ /work/SRC/openSUSE:Factory/.orthanc.new.3248/orthanc.changes 2020-04-05 20:57:18.393427341 +0200 @@ -1,0 +2,5 @@ +Sun Apr 5 07:33:34 UTC 2020 - Axel Braun + +- sqlitewrapper.patch (boo#1167431) + +--- New: sqlitewrapper.patch Other differences: -- ++ orthanc.spec ++ --- /var/tmp/diff_new_pack.pTg9iV/_old 2020-04-05 20:57:20.053429122 +0200 +++ /var/tmp/diff_new_pack.pTg9iV/_new 2020-04-05 20:57:20.057429126 +0200 @@ -38,6 +38,8 @@ 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 +# Patch against SQL injection: +Patch0: sqlitewrapper.patch BuildRequires: civetweb-devel BuildRequires: cmake >= 2.8.0 @@ -119,6 +121,8 @@ %prep %setup -q -n Orthanc-%{version} +%patch0 -p0 + cp %{S:1} %{S:2} . cp %{S:6} UnitTestsSources/. ++ orthanc.service ++ --- /var/tmp/diff_new_pack.pTg9iV/_old 2020-04-05 20:57:20.237429319 +0200 +++ /var/tmp/diff_new_pack.pTg9iV/_new 2020-04-05 20:57:20.241429324 +0200 @@ -2,6 +2,9 @@ Description=Orthanc DICOM server Documentation=man:orthanc(1) http://www.orthanc-server.com/ After=syslog.target network.target + +[Service] +# some security settings PrivateTmp=true ProtectSystem=true ProtectHome=true @@ -13,7 +16,6 @@ PrivateDevices=true MemoryDenyWriteExecute=true -[Service] Type=simple User=orthanc Group=orthanc ++ sqlitewrapper.patch ++ # HG changeset patch # User Sebastien Jodogne # Date 1585918057 -7200 # Node ID 2bf30ef727e3c0c0498be75eecb253efbb3c1070 # Parent 7f083dfae62b7031fd964681e7ab01e576e49d54 # enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection diff -r 7f083dfae62b -r 2bf30ef727e3 OrthancServer/Database/SQLiteDatabaseWrapper.cpp --- OrthancServer/Database/SQLiteDatabaseWrapper.cppFri Apr 03 14:06:13 2020 +0200 +++ OrthancServer/Database/SQLiteDatabaseWrapper.cppFri Apr 03 14:47:37 2020 +0200 @@ -296,17 +296,34 @@ int64_t SQLiteDatabaseWrapper::GetTableRecordCount(const std::string& table) { -char buf[128]; -sprintf(buf, "SELECT COUNT(*) FROM %s", table.c_str()); -SQLite::Statement s(db_, buf); - -if (!s.Step()) +/** + * "Generally one cannot use SQL parameters/placeholders for + * database identifiers (tables, columns, views, schemas, etc.) or + * database functions (e.g., CURRENT_DATE), but instead only for + * binding literal values." => To avoid any SQL injection, we + * check that the "table" parameter has only alphabetic + * characters. + * https://stackoverflow.com/a/1274764/881731 + **/ +for (size_t i = 0; i < table.size(); i++) { - throw OrthancException(ErrorCode_InternalError); + if (!isalpha(table[i])) + { +throw OrthancException(ErrorCode_ParameterOutOfRange); + } } -int64_t c = s.ColumnInt(0); -assert(!s.Step()); +// Don't use "SQLITE_FROM_HERE", otherwise "table" would be cached +SQLite::Statement s(db_, "SELECT COUNT(*) FROM " + table); -return c; +if (s.Step()) +{ + int64_t c = s.ColumnInt(0); + assert(!s.Step()); + return c; +} +else +{ + throw OrthancException(ErrorCode_InternalError); +} }
commit orthanc for openSUSE:Factory
Hello community, here is the log from the commit of package orthanc for openSUSE:Factory checked in at 2020-03-29 14:25:48 Comparing /work/SRC/openSUSE:Factory/orthanc (Old) and /work/SRC/openSUSE:Factory/.orthanc.new.3160 (New) Package is "orthanc" Sun Mar 29 14:25:48 2020 rev:3 rq:789124 version:1.6.0 Changes: --- /work/SRC/openSUSE:Factory/orthanc/orthanc.changes 2019-12-17 13:30:43.543397352 +0100 +++ /work/SRC/openSUSE:Factory/.orthanc.new.3160/orthanc.changes 2020-03-29 14:26:03.166108469 +0200 @@ -1,0 +2,17 @@ +Wed Mar 25 19:08:48 UTC 2020 - Axel Braun + +- various security hardenings (boo#1167431) + +--- +Tue Mar 24 19:34:05 UTC 2020 - Axel Braun + +- ConnectivityCheck Plugin enabled in build + +--- +Fri Mar 20 13:16:54 UTC 2020 - Axel Braun + +- version 1.6.0 + bugfixes and improvements (see /usr/share/doc/packages/orthanc/NEWS + rpmlintrc for some rpmlint warnings + +--- Old: Orthanc-1.5.8.tar.gz New: Configuration.json Orthanc-1.6.0.tar.gz axios-0.19.0.tar.gz bootstrap-4.3.1.zip jquery-3.4.1.min.js orthanc-rpmlintrc vuejs-2.6.10.tar.gz Other differences: -- ++ orthanc.spec ++ --- /var/tmp/diff_new_pack.Qqg5K8/_old 2020-03-29 14:26:05.722109776 +0200 +++ /var/tmp/diff_new_pack.Qqg5K8/_new 2020-03-29 14:26:05.754109792 +0200 @@ -1,8 +1,8 @@ # # spec file for package orthanc # -# Copyright (c) 2019 SUSE LLC -# Copyright (c) 2019 Dr. Axel Braun +# Copyright (c) 2020 SUSE LLC +# 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 @@ -18,7 +18,7 @@ Name: orthanc -Version:1.5.8 +Version:1.6.0 Release:0 Summary:RESTful DICOM server for healthcare and medical research License:GPL-3.0-or-later @@ -31,6 +31,13 @@ Source4:worklists.json Source5:index.html Source6:VersionsTests.cpp +Source7:orthanc-rpmlintrc +Source8:Configuration.json +# 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 @@ -116,6 +123,14 @@ cp %{S:6} UnitTestsSources/. +#slight change in standard configuration for OrthancStorage +cp %{S:8} Resources/. + +#OrthanPlugins may ask for additional files to be loaded +#Putting them into this folder prevents download of sources from the web +mkdir -p Plugins/Samples/ConnectivityChecks/ThirdPartyDownloads +cp %{S:10} %{S:11} %{S:12} %{S:13} Plugins/Samples/ConnectivityChecks/ThirdPartyDownloads/. + %build %cmake .. \ -DSTANDALONE_BUILD:BOOL=ON \ @@ -171,6 +186,7 @@ install -m 755 -d %{buildroot}%{_sysconfdir}/%{name} cp %{S:3} %{buildroot}%{_sysconfdir}/%{name} cp %{S:4} %{buildroot}%{_sysconfdir}/%{name} +cp %{S:8} %{buildroot}%{_sysconfdir}/%{name} install -m 755 -d %{buildroot}%{_unitdir} cp orthanc.service %{buildroot}%{_unitdir} @@ -196,6 +212,8 @@ %{buildroot}%{_prefix}/share/%{name}/plugins/libServeFolders.so ln -s ../../../..%{_libdir}/%{name}/libModalityWorklists.so.%{version} \ %{buildroot}%{_prefix}/share/%{name}/plugins/libModalityWorklists.so +ln -s ../../../..%{_libdir}/%{name}/libConnectivityChecks.so.%{version} \ + %{buildroot}%{_prefix}/share/%{name}/plugins/libConnectivityChecks.so # Prepare documentation: "index.html", Doxygen of plugin SDK, and sample codes cp -r %{S:5} %{buildroot}%{_docdir}/%{name}/ @@ -230,10 +248,11 @@ %{_unitdir}/orthanc.service %{_libdir}/orthanc/*.so.%{version} %{_prefix}/share/orthanc/plugins/*.so* -%dir %{_sysconfdir}/orthanc +%dir %attr(0755, orthanc, orthanc) %{_sysconfdir}/orthanc %dir %{_libdir}/orthanc %dir %{_prefix}/share/orthanc %dir %{_prefix}/share/orthanc/plugins +%defattr(0750, orthanc , orthanc) %config(noreplace) %{_sysconfdir}/orthanc/*.json %dir %attr(0755, orthanc, orthanc) %{_sharedstatedir}/orthanc %dir %attr(0755, orthanc, orthanc) %{_sharedstatedir}/orthanc/db-v6 ++ Configuration.json ++ { /** * General configuration of Orthanc **/ // The logical name of this instance of Orthanc. This
commit orthanc for openSUSE:Factory
Hello community, here is the log from the commit of package orthanc for openSUSE:Factory checked in at 2019-12-17 13:30:37 Comparing /work/SRC/openSUSE:Factory/orthanc (Old) and /work/SRC/openSUSE:Factory/.orthanc.new.4691 (New) Package is "orthanc" Tue Dec 17 13:30:37 2019 rev:2 rq:757498 version:1.5.8 Changes: --- /work/SRC/openSUSE:Factory/orthanc/orthanc.changes 2019-12-04 14:19:55.354414995 +0100 +++ /work/SRC/openSUSE:Factory/.orthanc.new.4691/orthanc.changes 2019-12-17 13:30:43.543397352 +0100 @@ -1,0 +2,5 @@ +Tue Dec 17 09:02:21 UTC 2019 - Axel Braun + +- for i586, one test disabled (fail due to rounding issues) + +--- Other differences: -- ++ orthanc.spec ++ --- /var/tmp/diff_new_pack.RXhzST/_old 2019-12-17 13:30:44.359397065 +0100 +++ /var/tmp/diff_new_pack.RXhzST/_new 2019-12-17 13:30:44.367397062 +0100 @@ -1,7 +1,7 @@ # # spec file for package orthanc # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # Copyright (c) 2019 Dr. Axel Braun # # All modifications and additions to the file contributed by third parties @@ -16,12 +16,13 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: orthanc Version:1.5.8 Release:0 Summary:RESTful DICOM server for healthcare and medical research -Group: Productivity/Graphics/Visualization/Other License:GPL-3.0-or-later +Group: Productivity/Graphics/Visualization/Other URL:http://www.orthanc-server.com/ Source0: http://www.orthanc-server.com/downloads/get.php?path=/orthanc/Orthanc-%{version}.tar.gz Source1:orthanc.service @@ -54,13 +55,13 @@ BuildRequires: libwrap0 BuildRequires: libxml2-devel BuildRequires: openssl-devel -BuildRequires: pkgconfig(icu-uc) -BuildRequires: pkgconfig(lua5.1) BuildRequires: pugixml-devel BuildRequires: sqlite3-devel -BuildRequires: pkgconfig(systemd) BuildRequires: tcpd-devel BuildRequires: unzip +BuildRequires: pkgconfig(icu-uc) +BuildRequires: pkgconfig(lua5.1) +BuildRequires: pkgconfig(systemd) Requires: dcmtk Requires(pre): /usr/sbin/groupadd @@ -106,7 +107,7 @@ Group: Development/Sources %description source -This package includes the source files for Orthanc +This package includes the source files for Orthanc. Use it in conjunction with the -devel package %prep %setup -q -n Orthanc-%{version} @@ -131,8 +132,12 @@ help2man ./Orthanc -N -n "Lightweight, RESTful DICOM server for healthcare and medical research" > %{name}.1 %check -# but only with architecture "aarch64" -build/UnitTests --gtest_filter=-PngWriter.ColorPattern +# we disable one test for i586 +%ifarch != ix86 +build/UnitTests +%else +build/UnitTests --gtest_filter=-ImageProcessing.Convolution +%endif %install # install: make some dirs...