[arch-commits] Commit in netpbm/trunk (PKGBUILD netpbm-CAN-2005-2471.patch)

[Antonio Rojas]

    Date: Wednesday, July 24, 2019 @ 18:08:03
  Author: arojas
Revision: 358549

Update to 10.73.28

Modified:
  netpbm/trunk/PKGBUILD
  netpbm/trunk/netpbm-CAN-2005-2471.patch

----------------------------+
 PKGBUILD                   |   32 ++++++++++++++++----------------
 netpbm-CAN-2005-2471.patch |    8 ++++----
 2 files changed, 20 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-24 17:13:22 UTC (rev 358548)
+++ PKGBUILD	2019-07-24 18:08:03 UTC (rev 358549)
@@ -1,7 +1,7 @@
 # Maintainer: 
 
 pkgname=netpbm
-pkgver=10.73.22
+pkgver=10.73.28
 _rev=r3413
 pkgrel=1
 pkgdesc="A toolkit for manipulation of graphic images"
@@ -12,19 +12,19 @@
 makedepends=('python2' 'jbigkit' 'subversion')
 options=('!makeflags')
 # Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
-source=(svn://svn.code.sf.net/p/netpbm/code/stable#revision=$_rev
+source=(https://downloads.sourceforge.net/project/netpbm/super_stable/$pkgver/netpbm-$pkgver.tgz
         https://sources.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig}
         netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch)
-sha1sums=('SKIP'
-          '25a58975bd8cd383238b4ae31f4405c60914faac'
-          'SKIP'
-          'b79cf9d42488fea065ba16262ed97694c47af08d'
-          '60088182b44ed2f10914413f7c95841a71a594fe'
-          'ca61aabdeb24a6421781ca975719ce7314be2bb9')
+sha256sums=('c0d32d4b9a53fde47dd9a36f45653e0ef51f6c390517f10b0c5056d1a8a844bd'
+            '74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3'
+            'SKIP'
+            '991aba7897e0710687369b4e2edfba1397ecd77d62578eac496afbc47b5ca970'
+            'd39951cf96db6b3f430edef6fddcab5ef082db49968f09eb1c3e891205bcdb5f'
+            '2c397588d9cba2c40dee55c07713d5e77e0e04245db939fdc1962d7de4cf4a33')
 validpgpkeys=('5357F3B111688D88C1D88119FCF2CB179205AC90')
 
 prepare() {
-  cd stable
+  cd $pkgname-$pkgver
 
   patch -p1 < ../netpbm-CAN-2005-2471.patch
   patch -p1 < ../netpbm-security-code.patch
@@ -47,27 +47,27 @@
 }
 
 build() {
-  cd stable
+  cd $pkgname-$pkgver
   make
   # Generating useful man pages with html doc
-  make MAKEMAN="${srcdir}/stable/buildtools/makeman" USERGUIDE=. \
-    -C ../doc -f "${srcdir}/stable/buildtools/manpage.mk" manpages
+  make MAKEMAN="${srcdir}/$pkgname-$pkgver/buildtools/makeman" USERGUIDE=. \
+    -C ../doc -f "${srcdir}/$pkgname-$pkgver/buildtools/manpage.mk" manpages
 }
 
 package() {
-  cd stable
+  cd $pkgname-$pkgver
   make pkgdir="${pkgdir}/usr" PKGMANDIR=share/man install-run install-dev
 
 # Removing dummy man pages
   rm "${pkgdir}"/usr/share/man/man{1,3,5}/*
 
-  make MAKEMAN="${srcdir}/stable/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \
-    -C ../doc -f "${srcdir}/stable/buildtools/manpage.mk" installman
+  make MAKEMAN="${srcdir}/$pkgname-$pkgver/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \
+    -C ../doc -f "${srcdir}/$pkgname-$pkgver/buildtools/manpage.mk" installman
 
 # Replace obsolete utility
   echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > "${pkgdir}/usr/bin/pgmtopbm"
 
 # Licensing.  Note that each program in the package has a separate license.
-  install -D -m644 "${srcdir}/stable/doc/copyright_summary" \
+  install -D -m644 "${srcdir}/$pkgname-$pkgver/doc/copyright_summary" \
     "${pkgdir}/usr/share/licenses/${pkgname}/copyright_summary.txt"
 }

Modified: netpbm-CAN-2005-2471.patch
===================================================================
--- netpbm-CAN-2005-2471.patch	2019-07-24 17:13:22 UTC (rev 358548)
+++ netpbm-CAN-2005-2471.patch	2019-07-24 18:08:03 UTC (rev 358549)
@@ -1,6 +1,6 @@
 --- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471	2005-08-15 02:39:46.000000000 +0200
 +++ netpbm-10.29/converter/other/pstopnm.c	2005-08-16 15:38:15.000000000 +0200
-@@ -711,11 +711,11 @@
+@@ -818,11 +818,11 @@
                     ghostscriptProg, arg0,
                     deviceopt, outfileopt, gopt, ropt, textalphabitsopt,
                     "-q", "-dNOPAUSE", 
@@ -8,9 +8,9 @@
 +                   "-dPARANOIDSAFER", "-");
      }
  
-     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q",
--          "-dNOPAUSE", "-dSAFER", "-", NULL);
-+          "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
+     execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, 
+-	  textalphabitsopt, "-q", "-dNOPAUSE", "-dSAFER", "-", NULL);
++         textalphabitsopt, "-q", "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL);
      
      pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)",
               ghostscriptProg, errno, strerror(errno));