[Pkg-privacy-commits] [mat] 01/01: Import Debian patch 0.3.2-1+deb7u1

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch wheezy
in repository mat.

commit 9fb8f05de959d9a9b9d951160715e7bde9760a7d
Author: Jonas Meurer <mejo at debian.org>
Date:   Sun Oct 9 17:00:57 2016 +0200

    Import Debian patch 0.3.2-1+deb7u1
---
 debian/NEWS                              | 11 +++++
 debian/changelog                         |  7 +++
 debian/patches/Disable-PDF-support.patch | 82 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 4 files changed, 101 insertions(+)

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..b0f24b8
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,11 @@
+mat (0.3.2-1+deb7u1) wheezy-security; urgency=high
+
+  PDF support is disabled in this release, because it is implemented in
+  an unsafe manner: MAT does not remove metadata in embedded images.
+
+  For more information, see:
+
+   * https://bugs.debian.org/826101
+   * https://0xacab.org/mat/mat/issues/11067
+
+ -- Jonas Meurer <mejo at debian.org>  Sun, 09 Oct 2016 16:57:52 +0200
diff --git a/debian/changelog b/debian/changelog
index 23e746d..4220f37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mat (0.3.2-1+deb7u1) wheezy-security; urgency=high
+
+  * Non-maintainer upload by the LTS Team.
+  * New patch: disable PDF support. (Closes: #826101)
+
+ -- Jonas Meurer <mejo at debian.org>  Sun, 09 Oct 2016 17:00:57 +0200
+
 mat (0.3.2-1) unstable; urgency=low
 
   * Imported Upstream version 0.3.2
diff --git a/debian/patches/Disable-PDF-support.patch b/debian/patches/Disable-PDF-support.patch
new file mode 100644
index 0000000..0c66f66
--- /dev/null
+++ b/debian/patches/Disable-PDF-support.patch
@@ -0,0 +1,82 @@
+From: Jonas Meurer <mejo at debian.org>
+Date: Sun, 09 Oct 2016 16:51:38 +0200
+Subject: Disable PDF support. (Closes: #826101)
+
+Bug-Debian: https://bugs.debian.org/826101
+Bug-Upstream: https://0xacab.org/mat/mat/issues/11067
+
+This patch is backported from Debian fix by intrigeri in git commit
+a87b93e13c148479e376f028ec7185b935318b56 (Debian mat packaging Git
+repository).
+
+diff -rNu a/FORMATS b/FORMATS
+--- a/FORMATS	2012-05-27 13:44:58.000000000 +0200
++++ b/FORMATS	2016-10-09 16:49:45.758245570 +0200
+@@ -39,20 +39,6 @@
+     </format>
+ 
+     <format>
+-        <name>Portable Document Fileformat</name>
+-        <extension>.pdf</extension>
+-        <mimetype>application/pdf</mimetype>
+-        <support>full</support>
+-        <metadata>a lot</metadata>
+-        <method> rendering of the PDF file on a cairo surface with the help of
+-                poppler in order to remove all the internal metadata.
+-                For now, cairo create some metadata.
+-                They can be remove if you install either exiftool, or python-pdfrw.
+-                The next version of python-cairo will support PDF metadata.
+-        </method>
+-    </format>
+-
+-    <format>
+         <name>Tape ARchive</name>
+         <extension>.tar, .tar.bz2, .tar.gz</extension>
+         <mimetype>application/x-tar, application/x-gzip, application/x-bzip2</mimetype>
+diff -rNu a/lib/strippers.py b/lib/strippers.py
+--- a/lib/strippers.py	2012-05-27 13:44:58.000000000 +0200
++++ b/lib/strippers.py	2016-10-09 16:47:20.747367677 +0200
+@@ -21,31 +21,6 @@
+ }
+ 
+ 
+-# PDF support
+-pdfSupport = True
+-try:
+-    import poppler
+-except ImportError:
+-    print('Unable to import python-poppler: not PDF support')
+-    pdfSupport = False
+-
+-try:
+-    import cairo
+-except ImportError:
+-    print('Unable to import python-cairo: no PDF support')
+-    pdfSupport = False
+-
+-try:
+-    import pdfrw
+-except ImportError:
+-    print('Unable to import python-pdfrw: no PDf support')
+-    pdfSupport = False
+-
+-if pdfSupport:
+-    STRIPPERS['application/x-pdf'] = office.PdfStripper
+-    STRIPPERS['application/pdf'] = office.PdfStripper
+-
+-
+ # audio format support with mutagen-python
+ try:
+     import mutagen
+diff -rNu a/test/test.py b/test/test.py
+--- a/test/test.py	2012-05-27 13:44:58.000000000 +0200
++++ b/test/test.py	2016-10-09 16:48:47.122689701 +0200
+@@ -23,7 +23,7 @@
+ dirty = glob.glob('dirty*')
+ dirty.sort()
+ 
+-FILE_LIST = zip(clean, dirty)
++FILE_LIST = [pair for pair in zip(clean, dirty) if not pair[0].endswith('pdf')]
+ 
+ try:  # PDF render processing
+     import poppler
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cab3dc5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Disable-PDF-support.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/mat.git