Bug#1067147: dcmtk: diff for NMU version 3.6.7-9.2
Hi Aurelien and Michael, On 2024-03-21 08:54, Aurelien Jarno wrote: > On 2024-03-19 11:54, Emanuele Rocca wrote: > > diff -Nru dcmtk-3.6.7/debian/control dcmtk-3.6.7/debian/control > > --- dcmtk-3.6.7/debian/control 2024-02-28 02:17:02.0 +0100 > > +++ dcmtk-3.6.7/debian/control 2024-03-19 11:08:29.0 +0100 > > @@ -16,7 +16,7 @@ > > libxml2-dev, > > zlib1g-dev > > Build-Depends-Indep: doxygen, > > - graphviz > > + graphviz [!armhf !armel] > > This does not look correct. Build-Depends-Indep are only used to build > the arch:all packages, and currently all the arch:all autobuilder run on > amd64. Ah, thanks for spotting this. The change was needed in order to build locally in a clean armel sbuild environment, but as you say is not needed on the buildds. > Therefore it looks to me that this change is not necessary to > help the armel/armhf rebootstrap done as part of the time_t transition. Indeed the main goal of the proposed changes was fixing a FTBFS bug in dcmtk entirely unrelated to the time_t transition (#1060104), but the relevant changelog entry from my NMU mentioning that was forgotten: * Build without stack-clash-protection on armel. See #1060104. Anyways, what matters is that now dcmtk builds fine on armel in sid with stackclash disabled. I've opened https://salsa.debian.org/med-team/dcmtk/-/merge_requests/1 to revert the changes to build-depends-indep. Thanks, Emanuele
Bug#1067147: dcmtk: diff for NMU version 3.6.7-9.2
Hi, On 2024-03-19 11:54, Emanuele Rocca wrote: > Package: dcmtk > Version: 3.6.7-9.1 > Severity: normal > Tags: patch pending > > Dear maintainer, > > I've prepared an NMU for dcmtk (versioned as 3.6.7-9.2) and > uploaded it to DELAYED/2. Please feel free to tell me if I > should delay it longer. > > Emanuele > diff -Nru dcmtk-3.6.7/debian/changelog dcmtk-3.6.7/debian/changelog > --- dcmtk-3.6.7/debian/changelog 2024-02-28 02:17:02.0 +0100 > +++ dcmtk-3.6.7/debian/changelog 2024-03-19 11:08:29.0 +0100 > @@ -1,3 +1,13 @@ > +dcmtk (3.6.7-9.2) unstable; urgency=medium > + > + * Non-maintainer upload. > + * Build without stack-clash-protection on armel. See #1060104. > + * Do not build-depend on graphviz on armhf and armel. The package is > +currently not installable on those arches due to the ongoing t64 > +transition. > + > + -- Emanuele Rocca Tue, 19 Mar 2024 11:08:29 +0100 > + > dcmtk (3.6.7-9.1) unstable; urgency=medium > >* Non-maintainer upload. > diff -Nru dcmtk-3.6.7/debian/control dcmtk-3.6.7/debian/control > --- dcmtk-3.6.7/debian/control2024-02-28 02:17:02.0 +0100 > +++ dcmtk-3.6.7/debian/control2024-03-19 11:08:29.0 +0100 > @@ -16,7 +16,7 @@ > libxml2-dev, > zlib1g-dev > Build-Depends-Indep: doxygen, > - graphviz > + graphviz [!armhf !armel] This does not look correct. Build-Depends-Indep are only used to build the arch:all packages, and currently all the arch:all autobuilder run on amd64. Therefore it looks to me that this change is not necessary to help the armel/armhf rebootstrap done as part of the time_t transition. Regards Aurelien -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://aurel32.net
Bug#1067147: dcmtk: diff for NMU version 3.6.7-9.2
Package: dcmtk Version: 3.6.7-9.1 Severity: normal Tags: patch pending Dear maintainer, I've prepared an NMU for dcmtk (versioned as 3.6.7-9.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Emanuele diff -Nru dcmtk-3.6.7/debian/changelog dcmtk-3.6.7/debian/changelog --- dcmtk-3.6.7/debian/changelog 2024-02-28 02:17:02.0 +0100 +++ dcmtk-3.6.7/debian/changelog 2024-03-19 11:08:29.0 +0100 @@ -1,3 +1,13 @@ +dcmtk (3.6.7-9.2) unstable; urgency=medium + + * Non-maintainer upload. + * Build without stack-clash-protection on armel. See #1060104. + * Do not build-depend on graphviz on armhf and armel. The package is +currently not installable on those arches due to the ongoing t64 +transition. + + -- Emanuele Rocca Tue, 19 Mar 2024 11:08:29 +0100 + dcmtk (3.6.7-9.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru dcmtk-3.6.7/debian/control dcmtk-3.6.7/debian/control --- dcmtk-3.6.7/debian/control 2024-02-28 02:17:02.0 +0100 +++ dcmtk-3.6.7/debian/control 2024-03-19 11:08:29.0 +0100 @@ -16,7 +16,7 @@ libxml2-dev, zlib1g-dev Build-Depends-Indep: doxygen, - graphviz + graphviz [!armhf !armel] Standards-Version: 4.6.2 Vcs-Browser: https://salsa.debian.org/med-team/dcmtk Vcs-Git: https://salsa.debian.org/med-team/dcmtk.git diff -Nru dcmtk-3.6.7/debian/rules dcmtk-3.6.7/debian/rules --- dcmtk-3.6.7/debian/rules 2023-06-22 09:53:48.0 +0200 +++ dcmtk-3.6.7/debian/rules 2024-03-19 11:08:29.0 +0100 @@ -2,7 +2,12 @@ #export DH_VERBOSE=1 # export DEB_BUILD_MAINT_OPTIONS = hardening=+pie -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +ifeq ($(DEB_TARGET_ARCH),armel) + # https://lists.debian.org/debian-arm/2024/01/msg00031.html + export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-stackclash +else + export DEB_BUILD_MAINT_OPTIONS = hardening=+all +endif # needed for the tests export DCMDICTPATH=$(CURDIR)/dcmdata/data/dicom.dic
