[med-svn] [Git][med-team/dicomscope][master] 3 commits: d/p/remove_Tar..: Add patch to remove use of removed interface, Closes: #919739

[Gert Wollny]

Gert Wollny pushed to branch master at Debian Med / dicomscope


Commits:
9dd909f6 by Gert Wollny at 2019-01-23T09:36:31Z
d/p/remove_Tar..: Add patch to remove use of removed interface, Closes: #919739

- - - - -
6dd5eee5 by Gert Wollny at 2019-01-23T09:37:11Z
Update changelog

- - - - -
3c1df7f2 by Gert Wollny at 2019-01-23T10:20:51Z
Update for upload

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/remove_TargetCipher_calls.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,14 @@
-dicomscope (3.6.0-20) UNRELEASED; urgency=medium
+dicomscope (3.6.0-20) unstable; urgency=medium
 
+  [ Jelmer Vernooij ]
   * Trim trailing whitespace.
   * Use secure copyright file specification URI.
 
- -- Jelmer Vernooij <jelmer at debian.org>  Sat, 20 Oct 2018 18:47:24 +0000
+  [ Gert Wollny ]
+  * d/p/remove_Tar..: Add patch to remove use of removed 
+    interface, Closes: #919739
+
+ -- Gert Wollny <gewo at debian.org>  Wed, 23 Jan 2019 11:20:35 +0100
 
 dicomscope (3.6.0-19) unstable; urgency=medium
 


=====================================
debian/patches/remove_TargetCipher_calls.patch
=====================================
@@ -0,0 +1,39 @@
+Description: Remove calls to *CipherSuite*
+ These methods have been removed from the according class in dcmtk and it is not 
+ clear whether there are alternative code path or whether this is simply no longer
+ supported or needed. 
+Author: Gert Wollny <gewo at debian.org>
+Debian-Bug: https://bugs.debian.org/919739
+
+diff -ru dicomscope-3.6.0/interface/libsrc/DVInterface.cpp dicomscope-3.6.0.fix/interface/libsrc/DVInterface.cpp
+--- dicomscope-3.6.0/interface/libsrc/DVInterface.cpp	2019-01-23 10:29:55.000000000 +0100
++++ dicomscope-3.6.0.fix/interface/libsrc/DVInterface.cpp	2019-01-23 10:28:34.947879315 +0100
+@@ -3210,11 +3210,7 @@
+ JNIEXPORT jint JNICALL Java_J2Ci_jDVInterface_getTargetNumberOfCipherSuites
+   (JNIEnv *env, jobject obj, jstring targetID)
+ {
+-    DVInterface *dvi = getAddressOfDVInterface (env, obj);
+-    char *tid = (char*) env->GetStringUTFChars (targetID, 0);
+-    jint res = (jint) dvi->getTargetNumberOfCipherSuites(tid);
+-    env->ReleaseStringUTFChars (targetID, tid);
+-    return res;
++    return 0;
+ }
+ 
+ 
+@@ -3226,13 +3222,7 @@
+ JNIEXPORT jstring JNICALL Java_J2Ci_jDVInterface_getTargetCipherSuite
+   (JNIEnv *env, jobject obj, jstring targetID, jint idx)
+ {
+-    DVInterface *dvi = getAddressOfDVInterface (env, obj);
+-    char *tid = (char*) env->GetStringUTFChars (targetID, 0);
+-    OFString param;
+-    const char* res = dvi->getTargetCipherSuite (tid, idx, param);
+-    env->ReleaseStringUTFChars (targetID, tid);
+-    if (res == NULL) return NULL;
+-    return env->NewStringUTF (res);
++    return NULL;
+ }
+ 
+ 
+Nur in dicomscope-3.6.0.fix/interface/libsrc: DVInterface.cpp~.


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@ cmakelists.txt.patch
 correct_status_returns.patch
 correct_include.patch
 openjdk-1.9.patch
+remove_TargetCipher_calls.patch



View it on GitLab: https://salsa.debian.org/med-team/dicomscope/compare/4773ccbc8b888e9cc3f0a613a21078c4c25cccc2...3c1df7f2943e5fda39b504a804234842303afd4f

-- 
View it on GitLab: https://salsa.debian.org/med-team/dicomscope/compare/4773ccbc8b888e9cc3f0a613a21078c4c25cccc2...3c1df7f2943e5fda39b504a804234842303afd4f
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/20190123/269ded68/attachment-0001.html>