[med-svn] [Git][med-team/orthanc][master] 6 commits: fix compatibility with glibc 2.34
Andreas Tille (@tille)
gitlab at salsa.debian.org
Wed Dec 8 12:26:01 GMT 2021
Andreas Tille pushed to branch master at Debian Med / orthanc
Commits:
235742b3 by Andreas Tille at 2021-12-08T12:28:37+01:00
fix compatibility with glibc 2.34
- - - - -
7e5824e9 by Andreas Tille at 2021-12-08T12:33:42+01:00
Drop unneeded versioned Depends
- - - - -
edf0f546 by Andreas Tille at 2021-12-08T12:34:49+01:00
upstream/metadata belongs to debian/
- - - - -
1ac0dd8e by Andreas Tille at 2021-12-08T12:35:55+01:00
Remove metadata in wrong location
- - - - -
cbd8a412 by Andreas Tille at 2021-12-08T13:11:10+01:00
Fix lintian-override
- - - - -
9bfff836 by Andreas Tille at 2021-12-08T13:24:05+01:00
Upload to unstable
- - - - -
7 changed files:
- debian/changelog
- debian/control
- + debian/patches/glibc-2.34.patch
- debian/patches/series
- debian/source/lintian-overrides
- debian/upstream/metadata
- − upstream/metadata
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+orthanc (1.9.7+dfsg-4) unstable; urgency=medium
+
+ [ Steve Langasek ]
+ * fix compatibility with glibc 2.34
+ Closes: #1001305
+
+ [ Andreas Tille ]
+ * Drop unneeded versioned Depends
+ * Fix lintian-override
+
+ -- Andreas Tille <tille at debian.org> Wed, 08 Dec 2021 13:11:32 +0100
+
orthanc (1.9.7+dfsg-3) unstable; urgency=medium
[ Adrian Bunk ]
=====================================
debian/control
=====================================
@@ -38,7 +38,7 @@ Architecture: any
Depends: adduser,
dcmtk,
locales,
- libcivetweb1 (>= 1.13+dfsg-3),
+ libcivetweb1,
lsb-base,
tzdata,
${misc:Depends},
@@ -98,12 +98,11 @@ Description: Orthanc development files
This package includes the header files to develop C/C++ plugins
for Orthanc.
-
Package: liborthancframework1
Architecture: any
Section: libs
Depends: locales,
- libcivetweb1 (>= 1.13+dfsg-3),
+ libcivetweb1,
${shlibs:Depends},
${misc:Depends}
Description: Orthanc Framework library
@@ -113,7 +112,6 @@ Description: Orthanc Framework library
.
This package contains the shared library of the Orthanc Framework.
-
Package: liborthancframework-dev
Architecture: any
Section: libdevel
=====================================
debian/patches/glibc-2.34.patch
=====================================
@@ -0,0 +1,27 @@
+Description: fix compatibility with glibc 2.34
+ In glibc 2.34, libdl.so no longer exists because the shared library has been
+ rolled into libc.so. This causes the dlopen tests to fail. Use
+ libmemusage.so instead, which is also provided by libc6-dev.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Last-Update: 2021-12-07
+Bug-Debian: https://bugs.debian.org/1001305
+Forwarded: no
+
+Index: orthanc-1.9.7+dfsg/OrthancServer/UnitTestsSources/PluginsTests.cpp
+===================================================================
+--- orthanc-1.9.7+dfsg.orig/OrthancServer/UnitTestsSources/PluginsTests.cpp
++++ orthanc-1.9.7+dfsg/OrthancServer/UnitTestsSources/PluginsTests.cpp
+@@ -86,10 +86,10 @@
+ //ASSERT_TRUE(l.HasFunction("_init"));
+
+ #elif defined(__linux__) || defined(__FreeBSD_kernel__)
+- SharedLibrary l("libdl.so");
++ SharedLibrary l("libmemusage.so");
+ ASSERT_THROW(l.GetFunction("world"), OrthancException);
+- ASSERT_TRUE(l.GetFunction("dlopen") != NULL);
+- ASSERT_TRUE(l.HasFunction("dlclose"));
++ ASSERT_TRUE(l.GetFunction("munmap") != NULL);
++ ASSERT_TRUE(l.HasFunction("free"));
+ ASSERT_FALSE(l.HasFunction("world"));
+
+ #elif defined(__FreeBSD__) || defined(__OpenBSD__)
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
donotforcec++11.patch
+glibc-2.34.patch
=====================================
debian/source/lintian-overrides
=====================================
@@ -1,4 +1,4 @@
# The following lines are wrongly interpreted as minimified JavaScript
# by lintian, as some of their lines contain more than 256 characters
-orthanc source: source-is-missing OrthancServer/OrthancExplorer/libs/jquery.mobile.simpledialog2.js line length is 366 characters (>256)
-orthanc source: source-is-missing OrthancServer/OrthancExplorer/libs/tree.jquery.js line length is 292 characters (>256)
+orthanc source: source-is-missing OrthancServer/OrthancExplorer/libs/jquery.mobile.simpledialog2.js
+orthanc source: source-is-missing OrthancServer/OrthancExplorer/libs/tree.jquery.js
=====================================
debian/upstream/metadata
=====================================
@@ -1,10 +1,16 @@
Repository: https://hg.orthanc-server.com/orthanc/
-Bug-Database: https://bugs.orthanc-server.com/
+Repository-Browse: https://hg.orthanc-server.com/orthanc/
+Bug-Database: https://bugs.orthanc-server.com/query.cgi
+Bug-Submit: https://bugs.orthanc-server.com/query.cgi
Reference:
- Author: Sebastien Jodogne
- Title: The Orthanc Ecosystem for Medical Imaging
- Type: article
- Journal: J Digit Imaging
- Year: 2018
- DOI: 10.1007/s10278-018-0082-y
- URL: https://doi.org/10.1007/s10278-018-0082-y
+ Author: Sébastien Jodogne
+ Title: The Orthanc Ecosystem for Medical Imaging
+ Journal: Journal of Digital Imaging
+ Year: 2018
+ Volume: 31
+ Number: 3
+ Pages: 341–352
+ DOI: 10.1007/s10278-018-0082-y
+ PMID: 20204640
+ URL: https://link.springer.com/content/pdf/10.1007/s10278-018-0082-y.pdf
+ eprint: https://link.springer.com/content/pdf/10.1007/s10278-018-0082-y.pdf
=====================================
upstream/metadata deleted
=====================================
@@ -1,16 +0,0 @@
-Repository: https://hg.orthanc-server.com/orthanc/
-Repository-Browse: https://hg.orthanc-server.com/orthanc/
-Bug-Database: https://bugs.orthanc-server.com/query.cgi
-Bug-Submit: https://bugs.orthanc-server.com/query.cgi
-Reference:
- Author: Sébastien Jodogne
- Title: The Orthanc Ecosystem for Medical Imaging
- Journal: Journal of Digital Imaging
- Year: 2018
- Volume: 31
- Number: 3
- Pages: 341–352
- DOI: 10.1007/s10278-018-0082-y
- PMID: 20204640
- URL: https://link.springer.com/content/pdf/10.1007/s10278-018-0082-y.pdf
- eprint: https://link.springer.com/content/pdf/10.1007/s10278-018-0082-y.pdf
View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/compare/43afba416848392bd23553c32a058bdd5020955f...9bfff8369e7fe5ac4b8103ff69b9622ef296f706
--
View it on GitLab: https://salsa.debian.org/med-team/orthanc/-/compare/43afba416848392bd23553c32a058bdd5020955f...9bfff8369e7fe5ac4b8103ff69b9622ef296f706
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211208/e0706f73/attachment-0001.htm>
More information about the debian-med-commit
mailing list