On Mon, Apr 21, 2025 at 11:06:24AM +0200, Landry Breuil wrote:
> Le Mon, Apr 21, 2025 at 10:07:27AM +0200, Rafael Sadowski a écrit :
> > On Mon Apr 21, 2025 at 09:43:41AM +0200, Landry Breuil wrote:
> > > hi,
> > >
> > > those two ports are outdated, and in the way of an upcoming boost update
> > > which is already grueling work.
> > >
> > > graphics/orthanc was last updated in 2022, and it was its first update
> > > since its import in 2017.
> >
> > Looks quite active: https://orthanc.uclouvain.be/hg/orthanc/rev/a30cc2fa7250
>
> sure, but the port has to be updated (by someone caring) to check if the
> newer version builds with latest boost :)
>
> > > net/fastnetmon needs an update to 1.2.x branch (that's what freebsd uses
> > > with boost 1.87) but upstream changed its policy and really wants to use
> > > a bunch of bundled common libraries instead of using systemwide
> > > versions, which is somewhat against our portstree policy.
> >
> > I prefer to force our portstree policy and drop it.
> >
> > We should write that down somewhere :-D
> >
> > >
> > > so unless somebody steps up to maintain those ports, ensure they build
> > > with recent boost, and that they actually work, my vote is to cvs rm
> > > them so that they're not in the way of the boost update.
> >
> > My list is long enough that I won't raise my hand, but if we decide to
> > drop Orthanc, we can leave it BROKEN?
>
> definitely, mark BROKEN=does not build with boost 1.87, update needed,
> and in 6 months if nothing happened cvs rm..
This builds with boost 1.84 and 1.88. Someeone else will need to fix the
two plugins and do some actual testing.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/orthanc/server/Makefile,v
diff -u -p -r1.30 Makefile
--- Makefile 28 Jan 2025 09:24:17 -0000 1.30
+++ Makefile 22 Apr 2025 14:31:08 -0000
@@ -1,21 +1,22 @@
COMMENT = RESTful DICOM server for healthcare and medical research
-DISTNAME = Orthanc-1.11.1
+DISTNAME = Orthanc-1.12.7
PKGNAME = ${DISTNAME:L}
-REVISION = 9
HOMEPAGE = https://www.orthanc-server.com/
SITES =
https://orthanc.uclouvain.be/downloads/sources/orthanc/
+SHARED_LIBS = MultitenantDicom 0.0
+
WANTLIB += ${COMPILER_LIBCXX} boost_atomic-mt boost_chrono-mt
WANTLIB += boost_date_time-mt boost_filesystem-mt boost_iostreams-mt
WANTLIB += boost_locale-mt boost_regex-mt boost_system-mt boost_thread-mt
WANTLIB += c civetweb cmr crypto curl dcmdata dcmdsig dcmect dcmfg
WANTLIB += dcmimage dcmimgle dcmiod dcmjpeg dcmjpls dcmnet dcmpmap
WANTLIB += dcmpstat dcmqrdb dcmrt dcmseg dcmsr dcmtkcharls dcmtls
-WANTLIB += dcmtract dcmwlm i2d iconv ijg12 ijg16 ijg8 jpeg jsoncpp
-WANTLIB += lua5.1 m oflog ofstd png pugixml sqlite3 ssl uuid z
+WANTLIB += dcmtract dcmwlm dcmxml i2d iconv ijg12 ijg16 ijg8 jpeg jsoncpp
+WANTLIB += lua5.1 m oficonv oflog ofstd png protobuf pugixml sqlite3 ssl uuid z
# c++11
COMPILER = base-clang ports-gcc
@@ -31,6 +32,7 @@ BUILD_DEPENDS = devel/doxygen>=1.10.0 \
LIB_DEPENDS = databases/sqlite3 \
devel/boost \
+ devel/protobuf \
devel/jsoncpp \
graphics/dcmtk \
net/curl \
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/orthanc/server/distinfo,v
diff -u -p -r1.2 distinfo
--- distinfo 13 Jul 2022 18:44:40 -0000 1.2
+++ distinfo 22 Apr 2025 13:06:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (Orthanc-1.11.1.tar.gz) = pjStyfbdCnTrrrQVZXtfPVGCK0+zR2QdxE87+LW1bbU=
-SIZE (Orthanc-1.11.1.tar.gz) = 1910916
+SHA256 (Orthanc-1.12.7.tar.gz) = 9DSZccnhL3RZm6A2w3zn/n/oB4sI3du4PgjPexPlOts=
+SIZE (Orthanc-1.12.7.tar.gz) = 2097270
Index:
patches/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration_cmake
===================================================================
RCS file:
/cvs/ports/graphics/orthanc/server/patches/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration_cmake,v
diff -u -p -r1.1
patch-OrthancFramework_Resources_CMake_CivetwebConfiguration_cmake
--- patches/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration_cmake
13 Jul 2022 18:44:40 -0000 1.1
+++ patches/patch-OrthancFramework_Resources_CMake_CivetwebConfiguration_cmake
22 Apr 2025 13:35:02 -0000
@@ -1,7 +1,7 @@
Index: OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake
--- OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake.orig
+++ OrthancFramework/Resources/CMake/CivetwebConfiguration.cmake
-@@ -110,32 +110,34 @@ else()
+@@ -111,32 +111,34 @@ else()
cmake_reset_check_state()
set(CMAKE_REQUIRED_LIBRARIES dl pthread)
Index: patches/patch-OrthancFramework_Resources_CMake_DcmtkConfiguration_cmake
===================================================================
RCS file:
/cvs/ports/graphics/orthanc/server/patches/patch-OrthancFramework_Resources_CMake_DcmtkConfiguration_cmake,v
diff -u -p -r1.1 patch-OrthancFramework_Resources_CMake_DcmtkConfiguration_cmake
--- patches/patch-OrthancFramework_Resources_CMake_DcmtkConfiguration_cmake
15 Dec 2024 10:41:34 -0000 1.1
+++ patches/patch-OrthancFramework_Resources_CMake_DcmtkConfiguration_cmake
22 Apr 2025 13:38:51 -0000
@@ -1,10 +1,10 @@
Index: OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake
--- OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake.orig
+++ OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake
-@@ -299,6 +299,7 @@ if (NOT DCMTK_USE_EMBEDDED_DICTIONARIES)
- /usr/share/libdcmtk19
+@@ -309,6 +309,7 @@ if (NOT DCMTK_USE_EMBEDDED_DICTIONARIES)
/usr/share/libdcmtk20
/usr/local/share/dcmtk
+ /usr/local/share/dcmtk-3.6.8
+ /usr/local/share/dcmtk-3.6.9
)
Index:
patches/patch-OrthancFramework_Resources_CMake_LibIconvConfiguration_cmake
===================================================================
RCS file:
/cvs/ports/graphics/orthanc/server/patches/patch-OrthancFramework_Resources_CMake_LibIconvConfiguration_cmake,v
diff -u -p -r1.1
patch-OrthancFramework_Resources_CMake_LibIconvConfiguration_cmake
--- patches/patch-OrthancFramework_Resources_CMake_LibIconvConfiguration_cmake
13 Jul 2022 18:44:40 -0000 1.1
+++ patches/patch-OrthancFramework_Resources_CMake_LibIconvConfiguration_cmake
22 Apr 2025 13:35:06 -0000
@@ -1,7 +1,7 @@
Index: OrthancFramework/Resources/CMake/LibIconvConfiguration.cmake
--- OrthancFramework/Resources/CMake/LibIconvConfiguration.cmake.orig
+++ OrthancFramework/Resources/CMake/LibIconvConfiguration.cmake
-@@ -97,15 +97,10 @@ else()
+@@ -98,15 +98,10 @@ else()
# Check whether the support for libiconv is bundled within the
# standard C library
Index: patches/patch-OrthancFramework_Resources_ThirdParty_minizip_ioapi_h
===================================================================
RCS file: patches/patch-OrthancFramework_Resources_ThirdParty_minizip_ioapi_h
diff -N patches/patch-OrthancFramework_Resources_ThirdParty_minizip_ioapi_h
--- patches/patch-OrthancFramework_Resources_ThirdParty_minizip_ioapi_h 13 Jul
2022 18:44:40 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: OrthancFramework/Resources/ThirdParty/minizip/ioapi.h
---- OrthancFramework/Resources/ThirdParty/minizip/ioapi.h.orig
-+++ OrthancFramework/Resources/ThirdParty/minizip/ioapi.h
-@@ -50,7 +50,7 @@
- #define ftello64 ftell
- #define fseeko64 fseek
- #else
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
- #define fopen64 fopen
- #define ftello64 ftello
- #define fseeko64 fseeko
Index:
patches/patch-OrthancFramework_Sources_DicomNetworking_Internals_DicomTls_cpp
===================================================================
RCS file:
/cvs/ports/graphics/orthanc/server/patches/patch-OrthancFramework_Sources_DicomNetworking_Internals_DicomTls_cpp,v
diff -u -p -r1.1
patch-OrthancFramework_Sources_DicomNetworking_Internals_DicomTls_cpp
---
patches/patch-OrthancFramework_Sources_DicomNetworking_Internals_DicomTls_cpp
13 Dec 2024 12:29:35 -0000 1.1
+++
patches/patch-OrthancFramework_Sources_DicomNetworking_Internals_DicomTls_cpp
22 Apr 2025 13:53:03 -0000
@@ -1,12 +1,13 @@
Index: OrthancFramework/Sources/DicomNetworking/Internals/DicomTls.cpp
--- OrthancFramework/Sources/DicomNetworking/Internals/DicomTls.cpp.orig
+++ OrthancFramework/Sources/DicomNetworking/Internals/DicomTls.cpp
-@@ -132,7 +132,7 @@ namespace Orthanc
- ownPrivateKeyPath);
- }
+@@ -230,6 +230,9 @@ namespace Orthanc
+ }
-- if (IsFailure(tls->setCertificateFile(ownCertificatePath.c_str(),
DCF_Filetype_PEM /*opt_keyFileFormat*/)))
-+ if (IsFailure(tls->setCertificateFile(ownCertificatePath.c_str(),
DCF_Filetype_PEM /*opt_keyFileFormat*/, TSP_Profile_BCP_195_RFC_8996)))
- {
- throw OrthancException(ErrorCode_BadFileFormat, "Cannot parse PEM
file with own certificate for DICOM TLS: " +
- ownCertificatePath);
+ DcmTLSTransportLayer::native_handle_type sslNativeHandle =
tls->getNativeHandle();
++#ifndef SSL_OP_NO_SSL_MASK
++#define SSL_OP_NO_SSL_MASK (SSL_OP_NO_TLSv1_2|SSL_OP_NO_TLSv1_3)
++#endif
+ SSL_CTX_clear_options(sslNativeHandle, SSL_OP_NO_SSL_MASK);
+ if (minimalTlsVersion > 1)
+ {
Index: patches/patch-OrthancFramework_Sources_SystemToolbox_cpp
===================================================================
RCS file:
/cvs/ports/graphics/orthanc/server/patches/patch-OrthancFramework_Sources_SystemToolbox_cpp,v
diff -u -p -r1.1 patch-OrthancFramework_Sources_SystemToolbox_cpp
--- patches/patch-OrthancFramework_Sources_SystemToolbox_cpp 13 Jul 2022
18:44:40 -0000 1.1
+++ patches/patch-OrthancFramework_Sources_SystemToolbox_cpp 22 Apr 2025
13:34:52 -0000
@@ -1,7 +1,7 @@
Index: OrthancFramework/Sources/SystemToolbox.cpp
--- OrthancFramework/Sources/SystemToolbox.cpp.orig
+++ OrthancFramework/Sources/SystemToolbox.cpp
-@@ -47,14 +47,14 @@
+@@ -48,14 +48,14 @@
#endif
@@ -18,7 +18,7 @@ Index: OrthancFramework/Sources/SystemTo
# include <limits.h> // PATH_MAX
# include <signal.h>
# include <unistd.h>
-@@ -1095,7 +1095,7 @@ namespace Orthanc
+@@ -1154,7 +1154,7 @@ namespace Orthanc
while (!interfaces.IsDone())
{
Index: patches/patch-OrthancFramework_Sources_Toolbox_h
===================================================================
RCS file:
/cvs/ports/graphics/orthanc/server/patches/patch-OrthancFramework_Sources_Toolbox_h,v
diff -u -p -r1.1 patch-OrthancFramework_Sources_Toolbox_h
--- patches/patch-OrthancFramework_Sources_Toolbox_h 21 Nov 2023 07:50:51
-0000 1.1
+++ patches/patch-OrthancFramework_Sources_Toolbox_h 22 Apr 2025 13:35:19
-0000
@@ -3,7 +3,7 @@ Fix build with boost 1.84
Index: OrthancFramework/Sources/Toolbox.h
--- OrthancFramework/Sources/Toolbox.h.orig
+++ OrthancFramework/Sources/Toolbox.h
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
#include "Enumerations.h"
#include "OrthancFramework.h"
Index: patches/patch-OrthancServer_CMakeLists_txt
===================================================================
RCS file:
/cvs/ports/graphics/orthanc/server/patches/patch-OrthancServer_CMakeLists_txt,v
diff -u -p -r1.1 patch-OrthancServer_CMakeLists_txt
--- patches/patch-OrthancServer_CMakeLists_txt 13 Jul 2022 18:44:40 -0000
1.1
+++ patches/patch-OrthancServer_CMakeLists_txt 22 Apr 2025 13:38:50 -0000
@@ -1,7 +1,7 @@
Index: OrthancServer/CMakeLists.txt
--- OrthancServer/CMakeLists.txt.orig
+++ OrthancServer/CMakeLists.txt
-@@ -482,8 +482,7 @@ if (ENABLE_PLUGINS AND BUILD_SERVE_FOLDERS)
+@@ -580,14 +580,13 @@ if (ENABLE_PLUGINS AND BUILD_SERVE_FOLDERS)
set_target_properties(
ServeFolders PROPERTIES
@@ -11,7 +11,14 @@ Index: OrthancServer/CMakeLists.txt
)
install(
-@@ -525,8 +524,7 @@ if (ENABLE_PLUGINS AND BUILD_MODALITY_WORKLISTS)
+ TARGETS ServeFolders
+ RUNTIME DESTINATION lib # Destination for Windows
+- LIBRARY DESTINATION share/orthanc/plugins # Destination for Linux
++ LIBRARY DESTINATION libexec/orthanc/plugins # Destination for Linux
+ )
+ endif()
+
+@@ -630,14 +629,13 @@ if (ENABLE_PLUGINS AND BUILD_MODALITY_WORKLISTS)
set_target_properties(
ModalityWorklists PROPERTIES
@@ -21,7 +28,32 @@ Index: OrthancServer/CMakeLists.txt
)
install(
-@@ -715,8 +713,7 @@ if (ENABLE_PLUGINS AND BUILD_HOUSEKEEPER)
+ TARGETS ModalityWorklists
+ RUNTIME DESTINATION lib # Destination for Windows
+- LIBRARY DESTINATION share/orthanc/plugins # Destination for Linux
++ LIBRARY DESTINATION libexec/orthanc/plugins # Destination for Linux
+ )
+ endif()
+
+@@ -701,7 +699,7 @@ if (ENABLE_PLUGINS AND BUILD_CONNECTIVITY_CHECKS)
+ install(
+ TARGETS ConnectivityChecks
+ RUNTIME DESTINATION lib # Destination for Windows
+- LIBRARY DESTINATION share/orthanc/plugins # Destination for Linux
++ LIBRARY DESTINATION libexec/orthanc/plugins # Destination for Linux
+ )
+ endif()
+
+@@ -755,7 +753,7 @@ if (ENABLE_PLUGINS AND BUILD_DELAYED_DELETION)
+ install(
+ TARGETS DelayedDeletion
+ RUNTIME DESTINATION lib # Destination for Windows
+- LIBRARY DESTINATION share/orthanc/plugins # Destination for Linux
++ LIBRARY DESTINATION libexec/orthanc/plugins # Destination for Linux
+ )
+ endif()
+
+@@ -797,14 +795,13 @@ if (ENABLE_PLUGINS AND BUILD_HOUSEKEEPER)
set_target_properties(
Housekeeper PROPERTIES
@@ -31,3 +63,19 @@ Index: OrthancServer/CMakeLists.txt
)
install(
+ TARGETS Housekeeper
+ RUNTIME DESTINATION lib # Destination for Windows
+- LIBRARY DESTINATION share/orthanc/plugins # Destination for Linux
++ LIBRARY DESTINATION libexec/orthanc/plugins # Destination for Linux
+ )
+ endif()
+
+@@ -872,7 +869,7 @@ if (ENABLE_PLUGINS AND BUILD_MULTITENANT_DICOM)
+ install(
+ TARGETS MultitenantDicom
+ RUNTIME DESTINATION lib # Destination for Windows
+- LIBRARY DESTINATION share/orthanc/plugins # Destination for Linux
++ LIBRARY DESTINATION libexec/orthanc/plugins # Destination for Linux
+ )
+ endif()
+
Index: patches/patch-OrthancServer_Sources_Search_ISqlLookupFormatter_cpp
===================================================================
RCS file: patches/patch-OrthancServer_Sources_Search_ISqlLookupFormatter_cpp
diff -N patches/patch-OrthancServer_Sources_Search_ISqlLookupFormatter_cpp
--- patches/patch-OrthancServer_Sources_Search_ISqlLookupFormatter_cpp 21 Nov
2023 07:50:51 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Fix build with boost 1.84
-
-Index: OrthancServer/Sources/Search/ISqlLookupFormatter.cpp
---- OrthancServer/Sources/Search/ISqlLookupFormatter.cpp.orig
-+++ OrthancServer/Sources/Search/ISqlLookupFormatter.cpp
-@@ -39,7 +39,7 @@
- #include "DatabaseConstraint.h"
-
- #include <boost/lexical_cast.hpp>
--
-+#include <cassert>
-
- namespace Orthanc
- {
Index: patches/patch-OrthancServer_Sources_ServerToolbox_h
===================================================================
RCS file:
/cvs/ports/graphics/orthanc/server/patches/patch-OrthancServer_Sources_ServerToolbox_h,v
diff -u -p -r1.1 patch-OrthancServer_Sources_ServerToolbox_h
--- patches/patch-OrthancServer_Sources_ServerToolbox_h 21 Nov 2023 07:50:51
-0000 1.1
+++ patches/patch-OrthancServer_Sources_ServerToolbox_h 22 Apr 2025 13:34:52
-0000
@@ -3,7 +3,7 @@ Fix build with boost 1.84
Index: OrthancServer/Sources/ServerToolbox.h
--- OrthancServer/Sources/ServerToolbox.h.orig
+++ OrthancServer/Sources/ServerToolbox.h
-@@ -26,6 +26,7 @@
+@@ -27,6 +27,7 @@
#include "ServerEnumerations.h"
#include <boost/noncopyable.hpp>
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/orthanc/server/pkg/PLIST,v
diff -u -p -r1.12 PLIST
--- pkg/PLIST 3 Feb 2024 20:35:05 -0000 1.12
+++ pkg/PLIST 22 Apr 2025 13:57:00 -0000
@@ -5,10 +5,12 @@
include/orthanc/
include/orthanc/OrthancCDatabasePlugin.h
include/orthanc/OrthancCPlugin.h
+include/orthanc/OrthancDatabasePlugin.proto
libexec/orthanc/
libexec/orthanc/plugins/
@so libexec/orthanc/plugins/libHousekeeper.so
@so libexec/orthanc/plugins/libModalityWorklists.so
+@lib
libexec/orthanc/plugins/libMultitenantDicom.so.${LIBMultitenantDicom_VERSION}
@so libexec/orthanc/plugins/libServeFolders.so
@bin sbin/Orthanc
share/doc/orthanc/
@@ -23,10 +25,10 @@ share/doc/orthanc/OrthancPlugin/classes.
share/doc/orthanc/OrthancPlugin/clipboard.js
share/doc/orthanc/OrthancPlugin/closed.png
share/doc/orthanc/OrthancPlugin/deprecated.html
-share/doc/orthanc/OrthancPlugin/dir_076e7eee9774f2b95d59a44fc7c5dc4b.html
share/doc/orthanc/OrthancPlugin/dir_18f315041aaf5f48ef65a9b73e2a1470.html
share/doc/orthanc/OrthancPlugin/dir_520ad0f1b6d3f851ab5c24f1548bcbe2.html
share/doc/orthanc/OrthancPlugin/dir_bb38096ab39160dc20d44f3ea6b44507.html
+share/doc/orthanc/OrthancPlugin/dir_d7796c6dc8b9430f24e4b13a7b6e5105.html
share/doc/orthanc/OrthancPlugin/dir_f4d72a64acd8929c0cc9ed96a7a336cc.html
share/doc/orthanc/OrthancPlugin/doc.svg
share/doc/orthanc/OrthancPlugin/docd.svg
@@ -59,10 +61,12 @@ share/doc/orthanc/OrthancPlugin/nav_fd.p
share/doc/orthanc/OrthancPlugin/nav_g.png
share/doc/orthanc/OrthancPlugin/nav_h.png
share/doc/orthanc/OrthancPlugin/nav_hd.png
+share/doc/orthanc/OrthancPlugin/navtree.css
share/doc/orthanc/OrthancPlugin/open.png
share/doc/orthanc/OrthancPlugin/pages.html
share/doc/orthanc/OrthancPlugin/plus.svg
share/doc/orthanc/OrthancPlugin/plusd.svg
+share/doc/orthanc/OrthancPlugin/resize.js
share/doc/orthanc/OrthancPlugin/splitbar.png
share/doc/orthanc/OrthancPlugin/splitbard.png
share/doc/orthanc/OrthancPlugin/structOrthancPluginDictionaryEntry-members.html
