Author: malat Date: 2013-09-02 09:07:08 +0000 (Mon, 02 Sep 2013) New Revision: 14553
Added: trunk/packages/dcmtk/trunk/debian/patches/doubledes.patch Modified: trunk/packages/dcmtk/trunk/debian/changelog trunk/packages/dcmtk/trunk/debian/control trunk/packages/dcmtk/trunk/debian/copyright trunk/packages/dcmtk/trunk/debian/dcmtk-www.install trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm trunk/packages/dcmtk/trunk/debian/patches/series Log: Prepare new upload Modified: trunk/packages/dcmtk/trunk/debian/changelog =================================================================== --- trunk/packages/dcmtk/trunk/debian/changelog 2013-09-02 06:31:33 UTC (rev 14552) +++ trunk/packages/dcmtk/trunk/debian/changelog 2013-09-02 09:07:08 UTC (rev 14553) @@ -1,3 +1,12 @@ +dcmtk (3.6.0-15) unstable; urgency=low + + * Transition to Apache 2.4. Closes: #669740 + * Use wrap and sort + * Fix possible double free() + - debian/patches/doubledes.patch + + -- Mathieu Malaterre <ma...@debian.org> Mon, 02 Sep 2013 10:54:17 +0200 + dcmtk (3.6.0-14) unstable; urgency=low * Install *.dic within libdcmtk2/ as per policy, section ยง8.2. Closes: #709123 Modified: trunk/packages/dcmtk/trunk/debian/control =================================================================== --- trunk/packages/dcmtk/trunk/debian/control 2013-09-02 06:31:33 UTC (rev 14552) +++ trunk/packages/dcmtk/trunk/debian/control 2013-09-02 09:07:08 UTC (rev 14553) @@ -3,10 +3,21 @@ Priority: optional Maintainer: Debian Med Packaging Team <debian-med-packag...@lists.alioth.debian.org> Uploaders: Juergen Salk <j...@debian.org>, - Andreas Tille <ti...@debian.org>, - Mathieu Malaterre <ma...@debian.org> -Build-Depends: debhelper (>= 9), autoconf, autotools-dev, zlib1g-dev, libtiff-dev, dpkg-dev (>= 1.16.1~), - libpng-dev, libxml2-dev, libwrap0-dev, libssl-dev, doxygen (>= 1.7.4), graphviz, libcharls-dev + Andreas Tille <ti...@debian.org>, + Mathieu Malaterre <ma...@debian.org> +Build-Depends: autoconf, + autotools-dev, + debhelper (>= 9), + doxygen (>= 1.7.4), + dpkg-dev (>= 1.16.1~), + graphviz, + libcharls-dev, + libpng-dev, + libssl-dev, + libtiff-dev, + libwrap0-dev, + libxml2-dev, + zlib1g-dev Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/dcmtk/trunk/ Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/dcmtk/trunk/ @@ -14,11 +25,11 @@ Package: dcmtk Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>=3.34) +Depends: adduser (>= 3.34), ${misc:Depends}, ${shlibs:Depends} Description: OFFIS DICOM toolkit command line utilities - DCMTK includes a collection of libraries and applications for examining, - constructing and converting DICOM image files, handling offline media, - sending and receiving images over a network connection, as well as + DCMTK includes a collection of libraries and applications for examining, + constructing and converting DICOM image files, handling offline media, + sending and receiving images over a network connection, as well as demonstrative image storage and worklist servers. . This package contains the DCMTK utility applications. @@ -28,15 +39,15 @@ Package: libdcmtk2 Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} Conflicts: dcmtk (<< 3.6.0) Description: OFFIS DICOM toolkit runtime libraries - DCMTK includes a collection of libraries and applications for examining, - constructing and converting DICOM image files, handling offline media, - sending and receiving images over a network connection, as well as - demonstrative image storage and worklist servers. + DCMTK includes a collection of libraries and applications for examining, + constructing and converting DICOM image files, handling offline media, + sending and receiving images over a network connection, as well as + demonstrative image storage and worklist servers. . - This package contains the runtime libraries for the DCMTK utility + This package contains the runtime libraries for the DCMTK utility applications. . Note: This version was compiled with libssl support. @@ -44,19 +55,19 @@ Package: libdcmtk2-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libdcmtk2 (= ${binary:Version}) +Depends: libdcmtk2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Conflicts: libdcmtk1-dev Replaces: libdcmtk1-dev Provides: libdcmtk-dev Suggests: dcmtk-doc Description: OFFIS DICOM toolkit development libraries and headers - DCMTK includes a collection of libraries and applications for examining, - constructing and converting DICOM image files, handling offline media, - sending and receiving images over a network connection, as well as - demonstrative image storage and worklist servers. + DCMTK includes a collection of libraries and applications for examining, + constructing and converting DICOM image files, handling offline media, + sending and receiving images over a network connection, as well as + demonstrative image storage and worklist servers. . - This package contains development libraries and headers for DCMTK. You - only need to install this if you are developing programs that use the + This package contains development libraries and headers for DCMTK. You + only need to install this if you are developing programs that use the DCMTK libraries. . Note: This version was compiled with libssl support. @@ -64,15 +75,16 @@ Package: dcmtk-www Section: web Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, dcmtk, apache2 | httpd, ${perl:Depends} +Depends: dcmtk, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends} +Recommends: apache2 | httpd Description: OFFIS DICOM toolkit worklist www server application - DCMTK includes a collection of libraries and applications for examining, - constructing and converting DICOM image files, handling offline media, - sending and receiving images over a network connection, as well as - demonstrative image storage and worklist servers. + DCMTK includes a collection of libraries and applications for examining, + constructing and converting DICOM image files, handling offline media, + sending and receiving images over a network connection, as well as + demonstrative image storage and worklist servers. . - This package contains the DICOM basic worklist management web server - application. You only need to install this if you want to manage worklist + This package contains the DICOM basic worklist management web server + application. You only need to install this if you want to manage worklist entries using a web browser. Package: dcmtk-doc @@ -81,12 +93,12 @@ Depends: ${misc:Depends} Suggests: dcmtk, libdcmtk2-dev Description: OFFIS DICOM toolkit documentation - DCMTK includes a collection of libraries and applications for examining, - constructing and converting DICOM image files, handling offline media, - sending and receiving images over a network connection, as well as - demonstrative image storage and worklist servers. + DCMTK includes a collection of libraries and applications for examining, + constructing and converting DICOM image files, handling offline media, + sending and receiving images over a network connection, as well as + demonstrative image storage and worklist servers. . - This package contains the on-line documentation for the DCMTK libraries + This package contains the on-line documentation for the DCMTK libraries and utilities in HTML format. Package: libdcmtk2-dbg @@ -95,9 +107,9 @@ Priority: extra Depends: libdcmtk2 (= ${binary:Version}), ${misc:Depends} Description: OFFIS DICOM toolkit library debugging symbols - DCMTK includes a collection of libraries and applications for examining, - constructing and converting DICOM image files, handling offline media, - sending and receiving images over a network connection, as well as - demonstrative image storage and worklist servers. + DCMTK includes a collection of libraries and applications for examining, + constructing and converting DICOM image files, handling offline media, + sending and receiving images over a network connection, as well as + demonstrative image storage and worklist servers. . This package contains the debugging symbols for libdcmtk2. Modified: trunk/packages/dcmtk/trunk/debian/copyright =================================================================== --- trunk/packages/dcmtk/trunk/debian/copyright 2013-09-02 06:31:33 UTC (rev 14552) +++ trunk/packages/dcmtk/trunk/debian/copyright 2013-09-02 09:07:08 UTC (rev 14553) @@ -6,7 +6,7 @@ It was downloaded from ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk -Upstream Author: OFFIS DICOM Team <di...@offis.de> +Upstream Author: OFFIS DICOM Team <di...@offis.de> Copyright: Modified: trunk/packages/dcmtk/trunk/debian/dcmtk-www.install =================================================================== --- trunk/packages/dcmtk/trunk/debian/dcmtk-www.install 2013-09-02 06:31:33 UTC (rev 14552) +++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.install 2013-09-02 09:07:08 UTC (rev 14553) @@ -1,3 +1,5 @@ +dcmwlm/images/* usr/share/dcmtk/www +dcmwlm/perl/* usr/lib/dcmtk/cgi-bin dcmwlm/wwwapps/preplock usr/lib/dcmtk/cgi-bin dcmwlm/wwwapps/readoviw usr/lib/dcmtk/cgi-bin dcmwlm/wwwapps/readwlst usr/lib/dcmtk/cgi-bin @@ -2,4 +4,2 @@ dcmwlm/wwwapps/writwlst usr/lib/dcmtk/cgi-bin -dcmwlm/perl/* usr/lib/dcmtk/cgi-bin -dcmwlm/images/* usr/share/dcmtk/www debian/apache.conf etc/dcmtk Modified: trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst =================================================================== --- trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst 2013-09-02 06:31:33 UTC (rev 14552) +++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst 2013-09-02 09:07:08 UTC (rev 14553) @@ -5,8 +5,8 @@ apache_install() { webserver=apache2 - if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/${pkg} ]; then - ln -s ../../${pkg}/apache.conf /etc/$webserver/conf.d/${pkg} + if [ -d /etc/$webserver/conf-available ] && [ ! -e /etc/$webserver/conf-available/${pkg} ]; then + 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/trunk/debian/dcmtk-www.postrm =================================================================== --- trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm 2013-09-02 06:31:33 UTC (rev 14552) +++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm 2013-09-02 09:07:08 UTC (rev 14553) @@ -5,8 +5,8 @@ case "$1" in purge|remove) - if [ -h /etc/apache2/conf.d/dcmtk ]; then - unlink /etc/apache2/conf.d/dcmtk + if [ -h /etc/apache2/conf-available/dcmtk ]; then + unlink /etc/apache2/conf-available/dcmtk fi ;; upgrade) Added: trunk/packages/dcmtk/trunk/debian/patches/doubledes.patch =================================================================== --- trunk/packages/dcmtk/trunk/debian/patches/doubledes.patch (rev 0) +++ trunk/packages/dcmtk/trunk/debian/patches/doubledes.patch 2013-09-02 09:07:08 UTC (rev 14553) @@ -0,0 +1,31 @@ +From d229d6fe6650427ca7319e5c86032291a5bfe39d Mon Sep 17 00:00:00 2001 +From: Michael Onken <di...@offis.de> +Date: Fri, 26 Jul 2013 22:51:07 +0200 +Subject: [PATCH] Fixed possible doubled destruction of association. + +--- + CHANGES.361 | 5 +++++ + dcmnet/libsrc/scp.cc | 3 +-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +Index: dcmtk-3.6.0/dcmnet/libsrc/scp.cc +=================================================================== +--- dcmtk-3.6.0.orig/dcmnet/libsrc/scp.cc 2010-10-20 10:09:34.000000000 +0200 ++++ dcmtk-3.6.0/dcmnet/libsrc/scp.cc 2013-09-02 11:00:10.455689161 +0200 +@@ -650,7 +650,6 @@ + { + notifyReleaseRequest(); + ASC_acknowledgeRelease(m_assoc); +- ASC_dropSCPAssociation(m_assoc); + } + else if( cond == DUL_PEERABORTEDASSOCIATION ) + { +@@ -1416,7 +1415,7 @@ + if (m_assoc) + { + notifyAssociationTermination(); +- ASC_dropAssociation( m_assoc ); ++ ASC_dropSCPAssociation( m_assoc ); + ASC_destroyAssociation( &m_assoc ); + } + } Modified: trunk/packages/dcmtk/trunk/debian/patches/series =================================================================== --- trunk/packages/dcmtk/trunk/debian/patches/series 2013-09-02 06:31:33 UTC (rev 14552) +++ trunk/packages/dcmtk/trunk/debian/patches/series 2013-09-02 09:07:08 UTC (rev 14553) @@ -15,3 +15,4 @@ fixnull.patch nothrow.patch noleak.patch +doubledes.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