netpbm-10.73.31-1.parabola1: updating version

2 files changed, 19 insertions, 27 deletions

diff --git a/libre/netpbm/PKGBUILD b/libre/netpbm/PKGBUILD
index 6e2468a3e..d79440322 100644
--- a/libre/netpbm/PKGBUILD
+++ b/libre/netpbm/PKGBUILD
@@ -1,12 +1,10 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
 
-_pkgname=netpbm-libre
 pkgname=netpbm
-pkgver=10.73.22
-_rev=r3413
+pkgver=10.73.31
 pkgrel=1
-pkgrel+=.par1
+pkgrel+=.parabola1
 pkgdesc="A toolkit for manipulation of graphic images"
 pkgdesc+=", without nonfree parts and patent issues"
 arch=('x86_64')
@@ -17,21 +15,19 @@ depends=('perl' 'libpng' 'libtiff' 'libxml2')
 makedepends=('python2' 'jbigkit' 'subversion')
 options=('!makeflags')
 # Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/
-mksource=(svn://svn.code.sf.net/p/netpbm/code/stable#revision=$_rev)
-source=(https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz
+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)
-mksha256sums=('SKIP')
-sha256sums=('ba4f383599c2a0bff5a35d59bf2459722b231fba67e99c1dcdf9f33ccf3fa988'
+sha256sums=('584c95f1ccdcd66d5ca68d7d5501728ae1184cba324d713f6b2a3ca86424243b'
             '74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3'
             'SKIP'
-            '1117c22721bf9bb946992f60022e15ae9454e9fce2b86fbbf989231958de2e7b'
+            '991aba7897e0710687369b4e2edfba1397ecd77d62578eac496afbc47b5ca970'
             '2eaa0f842d90bb3dcbc66273d58ec9117b97029da231b141159e580e65b98eb0'
             '2c397588d9cba2c40dee55c07713d5e77e0e04245db939fdc1962d7de4cf4a33')
 validpgpkeys=('5357F3B111688D88C1D88119FCF2CB179205AC90')
 
-mksource() {
-  cd stable
+prepare() {
+  cd $pkgname-$pkgver
 
   # Removing hpcdtoppm/pcdindex (non comercial)
   rm -rv converter/ppm/hpcdtoppm
@@ -57,10 +53,6 @@ mksource() {
         test/pnmremap2.test test/pnmtopnm-plain.test test/pnm-pam-roundtrip.test test/pnm-plain-roundtrip.test \
         test/ps-alt-roundtrip.test test/ps-roundtrip.test test/sbig-roundtrip.test test/st4-roundtrip.test \
         test/targa-roundtrip.test test/utahrle-roundtrip.test test/winicon-roundtrip.test test/xwd-roundtrip.test
-}
-
-prepare() {
-  cd stable
 
   # Removing references about hpcdtoppm/pcdindex (non comercial)
   sed -i 's/hpcdtoppm//g' converter/ppm/Makefile
@@ -129,27 +121,27 @@ prepare() {
 }
 
 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"
 }
diff --git a/libre/netpbm/netpbm-CAN-2005-2471.patch b/libre/netpbm/netpbm-CAN-2005-2471.patch
index 3759d7ebe..e4e93735b 100644
--- a/libre/netpbm/netpbm-CAN-2005-2471.patch
+++ b/libre/netpbm/netpbm-CAN-2005-2471.patch
@@ -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));