[arch-commits] Commit in xpdf/repos (18 files)
Gaetan Bisson
bisson at nymeria.archlinux.org
Sun Sep 8 17:19:05 UTC 2013
Date: Sunday, September 8, 2013 @ 19:19:05
Author: bisson
Revision: 193958
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xpdf/repos/extra-i686/PKGBUILD
(from rev 193957, xpdf/trunk/PKGBUILD)
xpdf/repos/extra-i686/char.patch
(from rev 193957, xpdf/trunk/char.patch)
xpdf/repos/extra-i686/desktop
(from rev 193957, xpdf/trunk/desktop)
xpdf/repos/extra-i686/install
(from rev 193957, xpdf/trunk/install)
xpdf/repos/extra-i686/sanitize.patch
(from rev 193957, xpdf/trunk/sanitize.patch)
xpdf/repos/extra-x86_64/PKGBUILD
(from rev 193957, xpdf/trunk/PKGBUILD)
xpdf/repos/extra-x86_64/char.patch
(from rev 193957, xpdf/trunk/char.patch)
xpdf/repos/extra-x86_64/desktop
(from rev 193957, xpdf/trunk/desktop)
xpdf/repos/extra-x86_64/install
(from rev 193957, xpdf/trunk/install)
xpdf/repos/extra-x86_64/sanitize.patch
(from rev 193957, xpdf/trunk/sanitize.patch)
Deleted:
xpdf/repos/extra-i686/PKGBUILD
xpdf/repos/extra-i686/char.patch
xpdf/repos/extra-i686/desktop
xpdf/repos/extra-i686/install
xpdf/repos/extra-x86_64/PKGBUILD
xpdf/repos/extra-x86_64/char.patch
xpdf/repos/extra-x86_64/desktop
xpdf/repos/extra-x86_64/install
-----------------------------+
/PKGBUILD | 134 ++++++++++++++++++++++++++++++++++++++++++
/char.patch | 24 +++++++
/desktop | 18 +++++
/install | 22 ++++++
extra-i686/PKGBUILD | 64 --------------------
extra-i686/char.patch | 12 ---
extra-i686/desktop | 9 --
extra-i686/install | 11 ---
extra-i686/sanitize.patch | 55 +++++++++++++++++
extra-x86_64/PKGBUILD | 64 --------------------
extra-x86_64/char.patch | 12 ---
extra-x86_64/desktop | 9 --
extra-x86_64/install | 11 ---
extra-x86_64/sanitize.patch | 55 +++++++++++++++++
14 files changed, 308 insertions(+), 192 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-09-08 17:18:11 UTC (rev 193957)
+++ extra-i686/PKGBUILD 2013-09-08 17:19:05 UTC (rev 193958)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: tobias <tobias at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-
-pkgname=xpdf
-#pkgver=3.03_pl1
-pkgver=3.03
-pkgrel=3
-pkgdesc='Viewer for Portable Document Format (PDF) files'
-url='http://www.foolabs.com/xpdf/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('lesstif' 'gsfonts' 'libxt')
-optdepends=('poppler: tools that used to be included in xpdf'
- 'desktop-file-utils: for desktop environments')
-# "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch"
-source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz"
- 'char.patch'
- 'desktop')
-sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248'
- '5c471944685a6b24a2b0c0e000562d1a3263aeeb'
- '17ebbfe457cb92e97b12b7362e8ce961526012d9')
-
-install=install
-backup=('etc/xpdfrc')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver%_*}"
-
-# patch -p1 -i "../${pkgname}-${_srcver}pl1.patch"
- patch -p1 -i ../char.patch
-
- sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
- sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --enable-multithreaded \
- --enable-wordlist \
- --with-freetype2-library=/usr/lib \
- --with-freetype2-includes=/usr/include/freetype2 \
- --x-includes=/usr/include \
- --with-Xm-library=/usr/lib \
- --with-Xm-includes=/usr/include \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver%_*}"
-
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop"
- install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm"
-
- # stuff provided by poppler
- for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do
- rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1"
- done
-}
Copied: xpdf/repos/extra-i686/PKGBUILD (from rev 193957, xpdf/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-09-08 17:19:05 UTC (rev 193958)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+
+pkgname=xpdf
+#pkgver=3.03_pl1
+pkgver=3.03
+pkgrel=4
+pkgdesc='Viewer for Portable Document Format (PDF) files'
+url='http://www.foolabs.com/xpdf/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('lesstif' 'gsfonts' 'libxt')
+optdepends=('poppler: tools that used to be included in xpdf'
+ 'desktop-file-utils: for desktop environments')
+# "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch"
+source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz"
+ 'sanitize.patch'
+ 'char.patch'
+ 'desktop')
+sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248'
+ '2face78a2f550fd15eeceb8a1ce47c566104f457'
+ '5c471944685a6b24a2b0c0e000562d1a3263aeeb'
+ '17ebbfe457cb92e97b12b7362e8ce961526012d9')
+
+install=install
+backup=('etc/xpdfrc')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver%_*}"
+
+# patch -p1 -i "../${pkgname}-${_srcver}pl1.patch"
+ patch -p1 -i ../sanitize.patch
+ patch -p1 -i ../char.patch
+
+ sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
+ sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --enable-multithreaded \
+ --enable-wordlist \
+ --with-freetype2-library=/usr/lib \
+ --with-freetype2-includes=/usr/include/freetype2 \
+ --x-includes=/usr/include \
+ --with-Xm-library=/usr/lib \
+ --with-Xm-includes=/usr/include \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver%_*}"
+
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop"
+ install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm"
+
+ # stuff provided by poppler
+ for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do
+ rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1"
+ done
+}
Deleted: extra-i686/char.patch
===================================================================
--- extra-i686/char.patch 2013-09-08 17:18:11 UTC (rev 193957)
+++ extra-i686/char.patch 2013-09-08 17:19:05 UTC (rev 193958)
@@ -1,12 +0,0 @@
-diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc
---- old/xpdf/XPDFViewer.cc 2011-08-15 14:08:53.000000000 -0700
-+++ new/xpdf/XPDFViewer.cc 2011-08-17 11:05:55.739431215 -0700
-@@ -1803,7 +1803,7 @@
- menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n);
- for (i = 0; i < nZoomMenuItems; ++i) {
- n = 0;
-- s = XmStringCreateLocalized(zoomMenuInfo[i].label);
-+ s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label);
- XtSetArg(args[n], XmNlabelString, s); ++n;
- XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n;
- sprintf(buf, "zoom%d", i);
Copied: xpdf/repos/extra-i686/char.patch (from rev 193957, xpdf/trunk/char.patch)
===================================================================
--- extra-i686/char.patch (rev 0)
+++ extra-i686/char.patch 2013-09-08 17:19:05 UTC (rev 193958)
@@ -0,0 +1,12 @@
+diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc
+--- old/xpdf/XPDFViewer.cc 2011-08-15 14:08:53.000000000 -0700
++++ new/xpdf/XPDFViewer.cc 2011-08-17 11:05:55.739431215 -0700
+@@ -1803,7 +1803,7 @@
+ menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n);
+ for (i = 0; i < nZoomMenuItems; ++i) {
+ n = 0;
+- s = XmStringCreateLocalized(zoomMenuInfo[i].label);
++ s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label);
+ XtSetArg(args[n], XmNlabelString, s); ++n;
+ XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n;
+ sprintf(buf, "zoom%d", i);
Deleted: extra-i686/desktop
===================================================================
--- extra-i686/desktop 2013-09-08 17:18:11 UTC (rev 193957)
+++ extra-i686/desktop 2013-09-08 17:19:05 UTC (rev 193958)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Xpdf
-Comment=Views Adobe PDF (acrobat) files
-Exec=xpdf %f
-Terminal=false
-Type=Application
-Icon=xpdf
-Categories=Office;
-MimeType=application/pdf;
Copied: xpdf/repos/extra-i686/desktop (from rev 193957, xpdf/trunk/desktop)
===================================================================
--- extra-i686/desktop (rev 0)
+++ extra-i686/desktop 2013-09-08 17:19:05 UTC (rev 193958)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Xpdf
+Comment=Views Adobe PDF (acrobat) files
+Exec=xpdf %f
+Terminal=false
+Type=Application
+Icon=xpdf
+Categories=Office;
+MimeType=application/pdf;
Deleted: extra-i686/install
===================================================================
--- extra-i686/install 2013-09-08 17:18:11 UTC (rev 193957)
+++ extra-i686/install 2013-09-08 17:19:05 UTC (rev 193958)
@@ -1,11 +0,0 @@
-post_install() {
- [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: xpdf/repos/extra-i686/install (from rev 193957, xpdf/trunk/install)
===================================================================
--- extra-i686/install (rev 0)
+++ extra-i686/install 2013-09-08 17:19:05 UTC (rev 193958)
@@ -0,0 +1,11 @@
+post_install() {
+ [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: xpdf/repos/extra-i686/sanitize.patch (from rev 193957, xpdf/trunk/sanitize.patch)
===================================================================
--- extra-i686/sanitize.patch (rev 0)
+++ extra-i686/sanitize.patch 2013-09-08 17:19:05 UTC (rev 193958)
@@ -0,0 +1,55 @@
+From 3945969e0072217c143fefa3044512a31ac2afa8 Mon Sep 17 00:00:00 2001
+From: mancha <mancha1 at hush.com>
+Date: Sun, 11 Aug 2013
+Subject: CVE-2012-2142
+
+Filter stuff that might end up in the shell to address CVE-2012-2142.
+This code was adapted from the Poppler project.
+---
+ Error.cc | 21 ++++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+--- a/xpdf/Error.cc 2013-08-11
++++ b/xpdf/Error.cc 2013-08-11
+@@ -43,7 +43,7 @@ void setErrorCallback(void (*cbk)(void *
+
+ void CDECL error(ErrorCategory category, int pos, const char *msg, ...) {
+ va_list args;
+- GString *s;
++ GString *s, *sanitized;
+
+ // NB: this can be called before the globalParams object is created
+ if (!errorCbk && globalParams && globalParams->getErrQuiet()) {
+@@ -52,17 +52,28 @@ void CDECL error(ErrorCategory category,
+ va_start(args, msg);
+ s = GString::formatv(msg, args);
+ va_end(args);
++
++ sanitized = new GString ();
++ for (int i = 0; i < s->getLength(); ++i) {
++ const char c = s->getChar(i);
++ if (c < (char)0x20 || c >= (char)0x7f) {
++ sanitized->appendf("<{0:02x}>", c & 0xff);
++ } else {
++ sanitized->append(c);
++ }
++ }
++
+ if (errorCbk) {
+- (*errorCbk)(errorCbkData, category, pos, s->getCString());
++ (*errorCbk)(errorCbkData, category, pos, sanitized->getCString());
+ } else {
+ if (pos >= 0) {
+ fprintf(stderr, "%s (%d): %s\n",
+- errorCategoryNames[category], pos, s->getCString());
++ errorCategoryNames[category], pos, sanitized->getCString());
+ } else {
+ fprintf(stderr, "%s: %s\n",
+- errorCategoryNames[category], s->getCString());
++ errorCategoryNames[category], sanitized->getCString());
+ }
+ fflush(stderr);
+ }
+- delete s;
++ delete sanitized;
+ }
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-09-08 17:18:11 UTC (rev 193957)
+++ extra-x86_64/PKGBUILD 2013-09-08 17:19:05 UTC (rev 193958)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: tobias <tobias at archlinux.org>
-# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
-
-pkgname=xpdf
-#pkgver=3.03_pl1
-pkgver=3.03
-pkgrel=3
-pkgdesc='Viewer for Portable Document Format (PDF) files'
-url='http://www.foolabs.com/xpdf/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('lesstif' 'gsfonts' 'libxt')
-optdepends=('poppler: tools that used to be included in xpdf'
- 'desktop-file-utils: for desktop environments')
-# "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch"
-source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz"
- 'char.patch'
- 'desktop')
-sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248'
- '5c471944685a6b24a2b0c0e000562d1a3263aeeb'
- '17ebbfe457cb92e97b12b7362e8ce961526012d9')
-
-install=install
-backup=('etc/xpdfrc')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver%_*}"
-
-# patch -p1 -i "../${pkgname}-${_srcver}pl1.patch"
- patch -p1 -i ../char.patch
-
- sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
- sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --enable-multithreaded \
- --enable-wordlist \
- --with-freetype2-library=/usr/lib \
- --with-freetype2-includes=/usr/include/freetype2 \
- --x-includes=/usr/include \
- --with-Xm-library=/usr/lib \
- --with-Xm-includes=/usr/include \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver%_*}"
-
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop"
- install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm"
-
- # stuff provided by poppler
- for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do
- rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1"
- done
-}
Copied: xpdf/repos/extra-x86_64/PKGBUILD (from rev 193957, xpdf/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-09-08 17:19:05 UTC (rev 193958)
@@ -0,0 +1,67 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
+
+pkgname=xpdf
+#pkgver=3.03_pl1
+pkgver=3.03
+pkgrel=4
+pkgdesc='Viewer for Portable Document Format (PDF) files'
+url='http://www.foolabs.com/xpdf/'
+license=('GPL2')
+arch=('i686' 'x86_64')
+depends=('lesstif' 'gsfonts' 'libxt')
+optdepends=('poppler: tools that used to be included in xpdf'
+ 'desktop-file-utils: for desktop environments')
+# "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch"
+source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz"
+ 'sanitize.patch'
+ 'char.patch'
+ 'desktop')
+sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248'
+ '2face78a2f550fd15eeceb8a1ce47c566104f457'
+ '5c471944685a6b24a2b0c0e000562d1a3263aeeb'
+ '17ebbfe457cb92e97b12b7362e8ce961526012d9')
+
+install=install
+backup=('etc/xpdfrc')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver%_*}"
+
+# patch -p1 -i "../${pkgname}-${_srcver}pl1.patch"
+ patch -p1 -i ../sanitize.patch
+ patch -p1 -i ../char.patch
+
+ sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
+ sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --enable-multithreaded \
+ --enable-wordlist \
+ --with-freetype2-library=/usr/lib \
+ --with-freetype2-includes=/usr/include/freetype2 \
+ --x-includes=/usr/include \
+ --with-Xm-library=/usr/lib \
+ --with-Xm-includes=/usr/include \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver%_*}"
+
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop"
+ install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm"
+
+ # stuff provided by poppler
+ for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do
+ rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1"
+ done
+}
Deleted: extra-x86_64/char.patch
===================================================================
--- extra-x86_64/char.patch 2013-09-08 17:18:11 UTC (rev 193957)
+++ extra-x86_64/char.patch 2013-09-08 17:19:05 UTC (rev 193958)
@@ -1,12 +0,0 @@
-diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc
---- old/xpdf/XPDFViewer.cc 2011-08-15 14:08:53.000000000 -0700
-+++ new/xpdf/XPDFViewer.cc 2011-08-17 11:05:55.739431215 -0700
-@@ -1803,7 +1803,7 @@
- menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n);
- for (i = 0; i < nZoomMenuItems; ++i) {
- n = 0;
-- s = XmStringCreateLocalized(zoomMenuInfo[i].label);
-+ s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label);
- XtSetArg(args[n], XmNlabelString, s); ++n;
- XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n;
- sprintf(buf, "zoom%d", i);
Copied: xpdf/repos/extra-x86_64/char.patch (from rev 193957, xpdf/trunk/char.patch)
===================================================================
--- extra-x86_64/char.patch (rev 0)
+++ extra-x86_64/char.patch 2013-09-08 17:19:05 UTC (rev 193958)
@@ -0,0 +1,12 @@
+diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc
+--- old/xpdf/XPDFViewer.cc 2011-08-15 14:08:53.000000000 -0700
++++ new/xpdf/XPDFViewer.cc 2011-08-17 11:05:55.739431215 -0700
+@@ -1803,7 +1803,7 @@
+ menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n);
+ for (i = 0; i < nZoomMenuItems; ++i) {
+ n = 0;
+- s = XmStringCreateLocalized(zoomMenuInfo[i].label);
++ s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label);
+ XtSetArg(args[n], XmNlabelString, s); ++n;
+ XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n;
+ sprintf(buf, "zoom%d", i);
Deleted: extra-x86_64/desktop
===================================================================
--- extra-x86_64/desktop 2013-09-08 17:18:11 UTC (rev 193957)
+++ extra-x86_64/desktop 2013-09-08 17:19:05 UTC (rev 193958)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Xpdf
-Comment=Views Adobe PDF (acrobat) files
-Exec=xpdf %f
-Terminal=false
-Type=Application
-Icon=xpdf
-Categories=Office;
-MimeType=application/pdf;
Copied: xpdf/repos/extra-x86_64/desktop (from rev 193957, xpdf/trunk/desktop)
===================================================================
--- extra-x86_64/desktop (rev 0)
+++ extra-x86_64/desktop 2013-09-08 17:19:05 UTC (rev 193958)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Xpdf
+Comment=Views Adobe PDF (acrobat) files
+Exec=xpdf %f
+Terminal=false
+Type=Application
+Icon=xpdf
+Categories=Office;
+MimeType=application/pdf;
Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install 2013-09-08 17:18:11 UTC (rev 193957)
+++ extra-x86_64/install 2013-09-08 17:19:05 UTC (rev 193958)
@@ -1,11 +0,0 @@
-post_install() {
- [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: xpdf/repos/extra-x86_64/install (from rev 193957, xpdf/trunk/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2013-09-08 17:19:05 UTC (rev 193958)
@@ -0,0 +1,11 @@
+post_install() {
+ [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: xpdf/repos/extra-x86_64/sanitize.patch (from rev 193957, xpdf/trunk/sanitize.patch)
===================================================================
--- extra-x86_64/sanitize.patch (rev 0)
+++ extra-x86_64/sanitize.patch 2013-09-08 17:19:05 UTC (rev 193958)
@@ -0,0 +1,55 @@
+From 3945969e0072217c143fefa3044512a31ac2afa8 Mon Sep 17 00:00:00 2001
+From: mancha <mancha1 at hush.com>
+Date: Sun, 11 Aug 2013
+Subject: CVE-2012-2142
+
+Filter stuff that might end up in the shell to address CVE-2012-2142.
+This code was adapted from the Poppler project.
+---
+ Error.cc | 21 ++++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+--- a/xpdf/Error.cc 2013-08-11
++++ b/xpdf/Error.cc 2013-08-11
+@@ -43,7 +43,7 @@ void setErrorCallback(void (*cbk)(void *
+
+ void CDECL error(ErrorCategory category, int pos, const char *msg, ...) {
+ va_list args;
+- GString *s;
++ GString *s, *sanitized;
+
+ // NB: this can be called before the globalParams object is created
+ if (!errorCbk && globalParams && globalParams->getErrQuiet()) {
+@@ -52,17 +52,28 @@ void CDECL error(ErrorCategory category,
+ va_start(args, msg);
+ s = GString::formatv(msg, args);
+ va_end(args);
++
++ sanitized = new GString ();
++ for (int i = 0; i < s->getLength(); ++i) {
++ const char c = s->getChar(i);
++ if (c < (char)0x20 || c >= (char)0x7f) {
++ sanitized->appendf("<{0:02x}>", c & 0xff);
++ } else {
++ sanitized->append(c);
++ }
++ }
++
+ if (errorCbk) {
+- (*errorCbk)(errorCbkData, category, pos, s->getCString());
++ (*errorCbk)(errorCbkData, category, pos, sanitized->getCString());
+ } else {
+ if (pos >= 0) {
+ fprintf(stderr, "%s (%d): %s\n",
+- errorCategoryNames[category], pos, s->getCString());
++ errorCategoryNames[category], pos, sanitized->getCString());
+ } else {
+ fprintf(stderr, "%s: %s\n",
+- errorCategoryNames[category], s->getCString());
++ errorCategoryNames[category], sanitized->getCString());
+ }
+ fflush(stderr);
+ }
+- delete s;
++ delete sanitized;
+ }
More information about the arch-commits
mailing list