Bug#984494: unblock: xpdf/3.04+git20210103-2
Hi Paul,
> > As an unrelated issue, I just noticed after uploading -2 that the
> > -D_FORTIFY_SOURCE=2 hardening buildflag fails to be correctly injected.
> > This can apparently be fixed by a small change to debian/rules:
> >
> > export DEB_BUILD_MAINT_OPTIONS=hardening=+all
> >
> > -export CPPFLAGS+=-DHAVE_PAPER_H
> > +export DEB_CPPFLAGS_MAINT_APPEND = -DHAVE_PAPER_H
> >
> > Does the release team consider this a permissible change for the hard
> > freeze, and should I upload a -3 straight away so that one unblock will
> > suffice for both fixes?
>
> Please go ahead with that. Sounds like something we want for a PDF viewer.
yes, thank you!
xpdf 3.04+git20210103-3 is on its way to the archive, the complete
debdiff follows below.
Florian
diff -Nru xpdf-3.04+git20210103/debian/changelog xpdf-3.04+git20210103/debian/changelog
--- xpdf-3.04+git20210103/debian/changelog 2021-01-28 15:58:32.000000000 +0800
+++ xpdf-3.04+git20210103/debian/changelog 2021-03-04 22:41:56.000000000 +0800
@@ -1,3 +1,15 @@
+xpdf (3.04+git20210103-3) unstable; urgency=medium
+
+ * Fix automatic injection of hardening buildflags
+
+ -- Florian Schlichting <fsfs@debian.org> Thu, 04 Mar 2021 22:41:56 +0800
+
+xpdf (3.04+git20210103-2) unstable; urgency=medium
+
+ * Fix printing when no psLevel is defined in xpdfrc (closes: #983880)
+
+ -- Florian Schlichting <fsfs@debian.org> Thu, 04 Mar 2021 14:20:04 +0800
+
xpdf (3.04+git20210103-1) unstable; urgency=medium
* Import new upstream version 3.04+git20210103
diff -Nru xpdf-3.04+git20210103/debian/patches/983880.patch xpdf-3.04+git20210103/debian/patches/983880.patch
--- xpdf-3.04+git20210103/debian/patches/983880.patch 1970-01-01 08:00:00.000000000 +0800
+++ xpdf-3.04+git20210103/debian/patches/983880.patch 2021-03-04 14:17:41.000000000 +0800
@@ -0,0 +1,23 @@
+commit 1b27cc5bb4491aed9d65c9f98704a693e3aabe59
+Author: Adam Sampson <ats@offog.org>
+Date: Wed Mar 3 14:14:52 2021 +0000
+
+ Initialise XPDFParams::psLevel.
+
+ This meant that PostScript output didn't work unless you specified
+ psLevel explicitly in the config file.
+
+ Reported by Frédéric Brière in Debian bug #983880.
+
+diff --git a/xpdf/XPDFParams.cc b/xpdf/XPDFParams.cc
+index 4929bed..f33dd1e 100644
+--- a/xpdf/XPDFParams.cc
++++ b/xpdf/XPDFParams.cc
+@@ -159,6 +159,7 @@ XPDFParams::XPDFParams(const char *cfgFileName) {
+ psImageableURY = psPaperHeight;
+ psCrop = true;
+ psDuplex = false;
++ psLevel = psLevel2;
+ initialZoom = "125";
+ continuousView = false;
+ createDefaultKeyBindings();
diff -Nru xpdf-3.04+git20210103/debian/patches/series xpdf-3.04+git20210103/debian/patches/series
--- xpdf-3.04+git20210103/debian/patches/series 2021-01-28 14:22:16.000000000 +0800
+++ xpdf-3.04+git20210103/debian/patches/series 2021-03-04 15:09:53.000000000 +0800
@@ -1 +1,2 @@
wrapper-options-manpage.patch
+983880.patch
diff -Nru xpdf-3.04+git20210103/debian/rules xpdf-3.04+git20210103/debian/rules
--- xpdf-3.04+git20210103/debian/rules 2021-01-28 14:12:37.000000000 +0800
+++ xpdf-3.04+git20210103/debian/rules 2021-03-04 15:10:10.000000000 +0800
@@ -2,7 +2,7 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-export CPPFLAGS+=-DHAVE_PAPER_H
+export DEB_CPPFLAGS_MAINT_APPEND = -DHAVE_PAPER_H
export LIBS+=-lpaper
%:
Reply to: