Author: malat Date: 2013-09-02 09:13:37 +0000 (Mon, 02 Sep 2013) New Revision: 14554
Added: trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.install trunk/packages/dcmtk/branches/experimental/debian/patches/bufoverflow.patch trunk/packages/dcmtk/branches/experimental/debian/patches/fixlog.patch Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog trunk/packages/dcmtk/branches/experimental/debian/dcmtk-www.postinst trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install trunk/packages/dcmtk/branches/experimental/debian/patches/series Log: Prepare next exp Modified: trunk/packages/dcmtk/branches/experimental/debian/changelog =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/changelog 2013-09-02 09:07:08 UTC (rev 14553) +++ trunk/packages/dcmtk/branches/experimental/debian/changelog 2013-09-02 09:13:37 UTC (rev 14554) @@ -1,3 +1,11 @@ +dcmtk (3.6.1~20121102-4) experimental; urgency=low + + * Fix buffer overflow in StudyInstanceUID. Closes: #715011 + * Fix apache 2.4 transition. Closes: #669740 + * Fix -doc installation. Closes: #717968 + + -- Mathieu Malaterre <ma...@debian.org> Fri, 05 Jul 2013 17:33:48 +0200 + dcmtk (3.6.1~20121102-3) experimental; urgency=low * fix lintian warning about jquery.js (doxygen generated) Added: trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.install =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.install (rev 0) +++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk-doc.install 2013-09-02 09:13:37 UTC (rev 14554) @@ -0,0 +1 @@ +usr/share/doc/dcmtk/* Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk-www.postinst =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/dcmtk-www.postinst 2013-09-02 09:07:08 UTC (rev 14553) +++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk-www.postinst 2013-09-02 09:13:37 UTC (rev 14554) @@ -6,7 +6,7 @@ apache_install() { webserver=apache2 if [ -d /etc/$webserver/conf-available ] && [ ! -e /etc/$webserver/conf-available/${pkg} ]; then - ln -s ../../${pkg}/apache.conf /etc/$webserver/conf.d/${pkg} + ln -s ../../${pkg}/apache.conf /etc/$webserver/conf-available/${pkg} # Restart webserver to register configuration for dcmtk if config is considered to be OK if ${webserver}ctl configtest 2>/dev/null; then if [ -x /usr/sbin/invoke-rc.d ]; then Modified: trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install 2013-09-02 09:07:08 UTC (rev 14553) +++ trunk/packages/dcmtk/branches/experimental/debian/dcmtk.install 2013-09-02 09:13:37 UTC (rev 14554) @@ -11,4 +11,3 @@ usr/share/dcmtk/dumppat.txt usr/share/dcmtk/wlistdb usr/share/dcmtk/wlistqry -usr/share/doc/dcmtk/* Added: trunk/packages/dcmtk/branches/experimental/debian/patches/bufoverflow.patch =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/bufoverflow.patch (rev 0) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/bufoverflow.patch 2013-09-02 09:13:37 UTC (rev 14554) @@ -0,0 +1,24 @@ +From c8423ab1fcf0273061462697b8eca56f894984c7 Mon Sep 17 00:00:00 2001 +From: Michael Onken <di...@offis.de> +Date: Fri, 5 Jul 2013 17:24:56 +0200 +Subject: [PATCH] Fixed too small buffer for UID in Q/R server. + +Thanks to Mathieu Malaterre for the report and fix. +--- + CHANGES.361 | 6 ++++++ + dcmqrdb/include/dcmtk/dcmqrdb/dcmqridx.h | 2 +- + 2 files changed, 7 insertions(+), 1 deletions(-) + +Index: dcmtk-3.6.1~20121102/dcmqrdb/include/dcmtk/dcmqrdb/dcmqridx.h +=================================================================== +--- dcmtk-3.6.1~20121102.orig/dcmqrdb/include/dcmtk/dcmqrdb/dcmqridx.h 2012-11-02 14:35:36.000000000 +0100 ++++ dcmtk-3.6.1~20121102/dcmqrdb/include/dcmtk/dcmqrdb/dcmqridx.h 2013-07-05 17:31:32.617794353 +0200 +@@ -237,7 +237,7 @@ + struct DCMTK_DCMQRDB_EXPORT StudyDescRecord + { + /// Study Instance UID of the study described by this record +- char StudyInstanceUID [UI_MAX_LENGTH] ; ++ char StudyInstanceUID [UI_MAX_LENGTH+1] ; + + /// combined size (in bytes) of all images of this study in the database + long StudySize ; Added: trunk/packages/dcmtk/branches/experimental/debian/patches/fixlog.patch =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/fixlog.patch (rev 0) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/fixlog.patch 2013-09-02 09:13:37 UTC (rev 14554) @@ -0,0 +1,119 @@ +From 6fe9adc72bcb9a1ac9202efa9e8f4065ebf40220 Mon Sep 17 00:00:00 2001 +From: Joerg Riesmeier <di...@jriesmeier.com> +Date: Fri, 12 Jul 2013 18:02:26 +0200 +Subject: [PATCH] Fixed issue with misplaced log output. + +This output caused the use of an uninitialized variable ("req"). +--- + CHANGES.361 | 30 +++++++++++++++++++----------- + dcmnet/apps/movescu.cc | 20 ++++++++++---------- + 2 files changed, 29 insertions(+), 21 deletions(-) + +Index: dcmtk-3.6.1~20121102/CHANGES.361 +=================================================================== +--- dcmtk-3.6.1~20121102.orig/CHANGES.361 2012-11-02 14:35:36.000000000 +0100 ++++ dcmtk-3.6.1~20121102/CHANGES.361 2013-09-02 11:07:17.463685439 +0200 +@@ -524,14 +524,14 @@ + - Fixed some minor inconsistencies between the data dictionary and part 6 of + the DICOM standard. This mainly affects the spelling of the attribute names. + Also added some tags that were missing because they are not used in part 3. +- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. ++ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. + Affects: dcmdata/data/dicom.dic + dcmdata/include/dcmtk/dcmdata/dcdeftag.h + dcmdata/libsrc/dcdictzz.cc + dcmnet/libsrc/dimcmd.cc + + - Fixed wrong attribute tags for Row/ColumnPositionInTotalImagePixelMatrix. +- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. ++ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. + Affects: dcmdata/data/dicom.dic + dcmdata/include/dcmtk/dcmdata/dcdeftag.h + dcmdata/libsrc/dcdictzz.cc +@@ -900,7 +900,7 @@ + + - Fixed wrong output format of pixel sequence elements for the DICOM Native + Model (according to PS 3.19). +- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. ++ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. + Affects: dcmdata/include/dcmtk/dcmdata/dcpixseq.h + dcmdata/libsrc/dcpixseq.cc + +@@ -908,13 +908,13 @@ + + - Fixed wrong attribute name of BulkData element: According to the XML Schema + in PS 3.19, the name for the UUID reference is "uuid" and not "UUID". +- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. ++ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. + Affects: dcmdata/libsrc/dcvrobow.cc + dcmdata/libsrc/dcvrof.cc + + - Made sure that hexadecimal numbers of attribute tags are always printed in + uppercase for the Native Model (as required by the XML Schema in PS 3.19). +- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. ++ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. + Affects: dcmdata/libsrc/dcelem.cc + + **** Changes from 2012.07.10 (riesmeier) +@@ -1064,7 +1064,7 @@ + **** Changes from 2012.07.03 (riesmeier) + + - Make sure that "??" is never used for an unknown VR in the XML output. +- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. ++ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. + Affects: dcmdata/libsrc/dcelem.cc + dcmdata/libsrc/dcsequen.cc + +@@ -1129,7 +1129,7 @@ + Affects: dcmdata/libsrc/dcfilefo.cc + + - Fixed wrong error message for conflict check of option --write-binary-data. +- Thanks Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. ++ Thanks to Mathieu Malaterre <mathieu.malate...@gmail.com> for the report. + Affects: dcmdata/apps/dcm2xml.cc + + **** Changes from 2012.06.29 (riesmeier) +Index: dcmtk-3.6.1~20121102/dcmnet/apps/movescu.cc +=================================================================== +--- dcmtk-3.6.1~20121102.orig/dcmnet/apps/movescu.cc 2012-11-02 14:35:36.000000000 +0100 ++++ dcmtk-3.6.1~20121102/dcmnet/apps/movescu.cc 2013-09-02 11:07:17.463685439 +0200 +@@ -1,6 +1,6 @@ + /* + * +- * Copyright (C) 1994-2012, OFFIS e.V. ++ * Copyright (C) 1994-2013, OFFIS e.V. + * All rights reserved. See COPYRIGHT file for details. + * + * This software and supporting documentation were developed by +@@ -1567,15 +1567,6 @@ + presId = ASC_findAcceptedPresentationContextID(assoc, sopClass); + if (presId == 0) return DIMSE_NOVALIDPRESENTATIONCONTEXTID; + +- if (movescuLogger.isEnabledFor(OFLogger::DEBUG_LOG_LEVEL)) +- { +- OFLOG_INFO(movescuLogger, "Sending Move Request"); +- OFLOG_DEBUG(movescuLogger, DIMSE_dumpMessage(temp_str, req, DIMSE_OUTGOING, NULL, presId)); +- } else { +- OFLOG_INFO(movescuLogger, "Sending Move Request (MsgID " << msgId << ")"); +- } +- OFLOG_INFO(movescuLogger, "Request Identifiers:" << OFendl << DcmObject::PrintHelper(*dcmff.getDataset())); +- + callbackData.assoc = assoc; + callbackData.presId = presId; + +@@ -1591,6 +1582,15 @@ + strcpy(req.MoveDestination, opt_moveDestination); + } + ++ if (movescuLogger.isEnabledFor(OFLogger::DEBUG_LOG_LEVEL)) ++ { ++ OFLOG_INFO(movescuLogger, "Sending Move Request"); ++ OFLOG_DEBUG(movescuLogger, DIMSE_dumpMessage(temp_str, req, DIMSE_OUTGOING, NULL, presId)); ++ } else { ++ OFLOG_INFO(movescuLogger, "Sending Move Request (MsgID " << msgId << ")"); ++ } ++ OFLOG_INFO(movescuLogger, "Request Identifiers:" << OFendl << DcmObject::PrintHelper(*dcmff.getDataset())); ++ + OFCondition cond = DIMSE_moveUser(assoc, presId, &req, dcmff.getDataset(), + moveCallback, &callbackData, opt_blockMode, opt_dimse_timeout, net, subOpCallback, + NULL, &rsp, &statusDetail, &rspIds, opt_ignorePendingDatasets); Modified: trunk/packages/dcmtk/branches/experimental/debian/patches/series =================================================================== --- trunk/packages/dcmtk/branches/experimental/debian/patches/series 2013-09-02 09:07:08 UTC (rev 14553) +++ trunk/packages/dcmtk/branches/experimental/debian/patches/series 2013-09-02 09:13:37 UTC (rev 14554) @@ -6,3 +6,5 @@ datadic_install.patch debian_iconv.patch bug706062.patch +bufoverflow.patch +fixlog.patch _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit