pool/orthanc
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 846154 from graphics

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/846154
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/orthanc?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2020-11-12 21:37:45 +00:00 committed by Git OBS Bridge
commit 82d8cb0ebd
5 changed files with 64 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Orthanc-1.7.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b131c12a0b70a531e5fb2a38ffb258cbced2ab304231a52e491de22d69df8ffc
size 1640397

3
Orthanc-1.8.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0ec12e9ffc90738930b08216d6006ad4063f4a74250be9889ea0eba4faf793a
size 1678584

216
VersionsTests.cpp
View File

@ -1,216 +0,0 @@
/**
* 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
*
* This program is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* In addition, as a special exception, the copyright holders of this
* program give permission to link the code of its release with the
* OpenSSL project's "OpenSSL" library (or with modified versions of it
* that use the same license as the "OpenSSL" library), and distribute
* the linked executables. You must obey the GNU General Public License
* in all respects for all of the code used other than "OpenSSL". If you
* modify file(s) with this exception, you may extend this exception to
* your version of the file(s), but you are not obligated to do so. If
* you do not wish to do so, delete this exception statement from your
* version. If you delete this exception statement from all source files
* in the program, then also delete it here.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
**/
#include "PrecompiledHeadersUnitTests.h"
#include "gtest/gtest.h"
#include <stdint.h>
#include <math.h>
#include <png.h>
#include <ctype.h>
#include <zlib.h>
#include <curl/curl.h>
#include <boost/version.hpp>
#include <sqlite3.h>
#include <lua.h>
#include <jpeglib.h>
#if BUILDING_LIBICONV == 1
# include <iconv.h>
#endif
#if ORTHANC_ENABLE_SSL == 1
# include <openssl/opensslv.h>
#endif
#if ORTHANC_ENABLE_CIVETWEB == 1
# include <civetweb.h>
#endif
#if ORTHANC_ENABLE_PUGIXML == 1
# include <pugixml.hpp>
#endif
TEST(Versions, Zlib)
{
ASSERT_STREQ(zlibVersion(), ZLIB_VERSION);
}
TEST(Versions, Curl)
{
curl_version_info_data* v = curl_version_info(CURLVERSION_NOW);
ASSERT_STREQ(LIBCURL_VERSION, v->version);
}
TEST(Versions, Png)
{
ASSERT_EQ(PNG_LIBPNG_VER_MAJOR * 10000 + PNG_LIBPNG_VER_MINOR * 100 + PNG_LIBPNG_VER_RELEASE,
static_cast<int>(png_access_version_number()));
}
TEST(Versions, SQLite)
{
#if defined(__APPLE__)
// Under OS X, there might exist minor differences between the
// version of the headers and the version of the library, for the
// system-wide SQLite. Ignore these differences.
#else
// http://www.sqlite.org/capi3ref.html#sqlite3_libversion
EXPECT_EQ(sqlite3_libversion_number(), SQLITE_VERSION_NUMBER);
EXPECT_STREQ(sqlite3_libversion(), SQLITE_VERSION);
/**
* On Orthanc > 1.5.8, we comment out the following test, that is
* too strict for some GNU/Linux distributions to apply their own
* security fixes. Checking the main version macros is sufficient.
* https://bugzilla.suse.com/show_bug.cgi?id=1154550#c2
**/
// EXPECT_STREQ(sqlite3_sourceid(), SQLITE_SOURCE_ID);
#endif
// Ensure that the SQLite version is above 3.7.0.
// "sqlite3_create_function_v2" is not defined in previous versions.
ASSERT_GE(SQLITE_VERSION_NUMBER, 3007000);
}
TEST(Versions, Lua)
{
// Ensure that the Lua version is above 5.1.0. This version has
// introduced some API changes.
ASSERT_GE(LUA_VERSION_NUM, 501);
}
#if ORTHANC_STATIC == 1
TEST(Versions, ZlibStatic)
{
ASSERT_STREQ("1.2.11", zlibVersion());
}
TEST(Versions, BoostStatic)
{
ASSERT_STREQ("1_69", BOOST_LIB_VERSION);
}
TEST(Versions, CurlStatic)
{
curl_version_info_data* v = curl_version_info(CURLVERSION_NOW);
ASSERT_STREQ("7.64.0", v->version);
}
TEST(Versions, PngStatic)
{
ASSERT_EQ(10636u, png_access_version_number());
ASSERT_STREQ("1.6.36", PNG_LIBPNG_VER_STRING);
}
TEST(Versions, JpegStatic)
{
ASSERT_EQ(9, JPEG_LIB_VERSION_MAJOR);
ASSERT_EQ(3, JPEG_LIB_VERSION_MINOR);
}
TEST(Versions, CurlSslStatic)
{
curl_version_info_data * vinfo = curl_version_info(CURLVERSION_NOW);
// Check that SSL support is enabled when required
bool curlSupportsSsl = (vinfo->features & CURL_VERSION_SSL) != 0;
#if ORTHANC_ENABLE_SSL == 0
ASSERT_FALSE(curlSupportsSsl);
#else
ASSERT_TRUE(curlSupportsSsl);
#endif
}
TEST(Version, LuaStatic)
{
ASSERT_STREQ("Lua 5.3.5", LUA_RELEASE);
}
#if BUILDING_LIBICONV == 1
TEST(Version, LibIconvStatic)
{
static const int major = 1;
static const int minor = 15;
ASSERT_EQ((major << 8) + minor, _LIBICONV_VERSION);
}
#endif
#if ORTHANC_ENABLE_SSL == 1
TEST(Version, OpenSslStatic)
{
ASSERT_EQ(0x1000210fL /* openssl-1.0.2p */, OPENSSL_VERSION_NUMBER);
}
#endif
#include <json/version.h>
TEST(Version, JsonCpp)
{
#if ORTHANC_LEGACY_JSONCPP == 1
ASSERT_STREQ("0.10.6", JSONCPP_VERSION_STRING);
#elif ORTHANC_LEGACY_JSONCPP == 0
ASSERT_STREQ("1.8.4", JSONCPP_VERSION_STRING);
#else
# error Macro ORTHANC_LEGACY_JSONCPP should be set
#endif
}
#if ORTHANC_ENABLE_CIVETWEB == 1
TEST(Version, Civetweb)
{
ASSERT_EQ(1, CIVETWEB_VERSION_MAJOR);
ASSERT_EQ(11, CIVETWEB_VERSION_MINOR);
ASSERT_EQ(0, CIVETWEB_VERSION_PATCH);
}
#endif
#if ORTHANC_ENABLE_PUGIXML == 1
TEST(Version, Pugixml)
{
ASSERT_EQ(190, PUGIXML_VERSION);
}
#endif
#endif

50
orthanc.changes
View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Fri Oct 16 10:46:46 UTC 2020 - Axel Braun <axel.braun@gmx.de>
- version 1.8.0
* Serving the content of Orthanc as a WebDAV network share
* New config options: "WebDavEnabled", "WebDavDeleteAllowed" and "WebDavUploadAllowed"
-------------------------------------------------------------------
Fri Sep 18 14:50:14 UTC 2020 - Axel Braun <axel.braun@gmx.de>
- Version 1.7.4
* New configuration options to enable HTTP peers identification through certificates:
"SslVerifyPeers" and "SslTrustedClientCertificates"
* New configuration option "SyncStorageArea" to immediately commit the files onto the disk
(through fsync()), so as to avoid discrepencies between DB and filesystem in case of hard
shutdown of the machine running Orthanc. This slows down adding new files into Orthanc.
* Underscores are now allowed in peers/modalities symbolic names
* Fix compatibility with C-MOVE SCU requests issued by Ambra
* Fix transcoding in C-MOVE SCP, in the case where "SynchronousCMove" is "true"
* When checking DICOM allowed methods, if there are multiple modalities with the same AET,
differentiate them from the calling IP
* Enable the access to raw frames in Philips ELSCINT1 proprietary compression
* Support empty key passwords when using HTTP client certificates
* Fix handling of "ModalitiesInStudy" (0008,0061) in C-FIND and "/tools/find"
-------------------------------------------------------------------
Tue Aug 25 09:02:07 UTC 2020 - Axel Braun <axel.braun@gmx.de>
- Version 1.7.3
* API version upgraded to 8
* "/peers/{id}/store": New option "Compress" to compress DICOM data using gzip
* "OrthancPeerStore" jobs now report the transmitted size in their public content
* New config option "Worklist.LimitAnswers" for the sample modality worklist plugin
* Add missing tag "Retrieve AE Title (0008,0054)" in C-FIND SCP responses
* Fix DICOM SCP filters if some query tag has > 256 characters (list of UIDs matching)
* "/series/.../ordered-slices" supports spaces in Image Position/Orientation Patient tags
* Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS)
* Support receiving multipart messages larger than 2GB in the embedded HTTP server
-------------------------------------------------------------------
Sun Aug 2 15:19:18 UTC 2020 - Axel Braun <axel.braun@gmx.de>
- Version 1.7.2
* C-FIND SCP now returns private tags (cf. option "DefaultPrivateCreator")
* Packaging of the Orthanc framework as a shared library
* New change types in the SDK: JobSubmitted, JobSuccess, JobFailure
* Issue #182: Better reporting of errors in plugins reading chunked HTTP body
* Fix issue #183 (C-ECHO always fails in Orthanc Explorer, regression from 1.6.1 to 1.7.0)
-------------------------------------------------------------------
Wed May 27 14:24:06 UTC 2020 - Axel Braun <axel.braun@gmx.de>

21
orthanc.spec
View File

@ -18,7 +18,7 @@
Name: orthanc
Version: 1.7.1
Version: 1.8.0
Release: 0
Summary: RESTful DICOM server for healthcare and medical research
License: GPL-3.0-or-later
@ -30,7 +30,6 @@ Source2: orthanc-readme.SUSE
Source3: serve-folders.json
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
@ -51,6 +50,7 @@ BuildRequires: help2man
BuildRequires: jsoncpp-devel
BuildRequires: libboost_date_time-devel >= 1.66
BuildRequires: libboost_filesystem-devel >= 1.66
BuildRequires: libboost_iostreams-devel >= 1.66
BuildRequires: libboost_locale-devel >= 1.66
BuildRequires: libboost_regex-devel >= 1.66
BuildRequires: libboost_system-devel >= 1.66
@ -121,21 +121,22 @@ This package includes the source files for Orthanc. Use it in conjunction with t
cp %{S:1} %{S:2} .
cp %{S:6} UnitTestsSources/.
##cp %{S:6} UnitTestsSources/.
#slight change in standard configuration for OrthancStorage
cp %{S:8} Resources/.
cp %{S:8} OrthancServer/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/.
mkdir -p OrthancServer/Plugins/Samples/ConnectivityChecks/ThirdPartyDownloads
cp %{S:10} %{S:11} %{S:12} %{S:13} OrthancServer/Plugins/Samples/ConnectivityChecks/ThirdPartyDownloads/.
%build
%cmake .. \
%cmake ../OrthancServer \
-DSTANDALONE_BUILD:BOOL=ON \
-DSTATIC_BUILD:BOOL=OFF \
-DENABLE_CIVETWEB=ON \
-DORTHANC_UNIT_TESTS_LINK_FRAMEWORK=OFF \
-DUSE_SYSTEM_MONGOOSE=OFF \
-DSYSTEM_MONGOOSE_USE_CALLBACKS=OFF \
-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF \
@ -151,7 +152,7 @@ help2man ./Orthanc -N -n "Lightweight, RESTful DICOM server for healthcare and m
%ifarch != ix86
build/UnitTests
%else
build/UnitTests --gtest_filter=-ImageProcessing.Convolution
build/UnitTests --gtest_filter=-ImageProcessing.Convolution --gtest_filter=-Version.CivetwebCompression
%endif
%install
@ -217,8 +218,8 @@ ln -s ../../../..%{_libdir}/%{name}/libConnectivityChecks.so.%{version} \
# Prepare documentation: "index.html", Doxygen of plugin SDK, and sample codes
cp -r %{S:5} %{buildroot}%{_docdir}/%{name}/
cp -r Resources/Samples/ %{buildroot}%{_docdir}/%{name}/Samples
cp -r Plugins/Samples/ %{buildroot}%{_docdir}/%{name}/OrthancPluginSamples
cp -r OrthancServer/Resources/Samples/ %{buildroot}%{_docdir}/%{name}/Samples
cp -r OrthancServer/Plugins/Samples/ %{buildroot}%{_docdir}/%{name}/OrthancPluginSamples
%pre
getent group orthanc >/dev/null || groupadd -r orthanc