autu: Update to 1.0b7-8

3 files changed, 64 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37070b0b09a8..43d435386341 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,22 @@
-# Generated by makepkg 4.2.1
-# Thu Apr 23 12:32:02 UTC 2015
+# Generated by mksrcinfo v8
+# Sun May 24 20:48:21 UTC 2020
 pkgbase = html2ps
 	pkgdesc = An HTML to PostScript converter written in Perl.
 	pkgver = 1.0b7
-	pkgrel = 7
-	url = http://user.it.uu.se/~jan/html2ps.html
-	arch = i686
-	arch = x86_64
+	pkgrel = 8
+	url = https://linux.die.net/man/1/html2ps
+	arch = any
 	license = GPL2
 	depends = ghostscript
 	depends = perl
 	depends = texlive-bin
-	source = http://user.it.uu.se/~jan/html2ps-1.0b7.tar.gz
-	sha384sums = e1c95370257b22f408848914b56703334ee0f1ef7683b045bbef67142a7577fc5a8c3fba0790fd90a380dcdf4f5c5eb7
+	options = !strip
+	source = https://fossies.org/linux/www/old/html2ps-1.0b7.tar.gz
+	source = 0000-tmpname.patch
+	md5sums = 073ab8a239c8d0e3547192ee9016db15
+	md5sums = af46fab28f1d32c6fc30e3e2bf09f19c
+	sha256sums = d553980468a14bae738982c384c17f426ecf77dafd9a4e2499d520953f156f14
+	sha256sums = 3bedbca6aa76f3accd1c18210c686cddf7168c59f376285bd1c9a35b00e1c74b
 
 pkgname = html2ps
 
diff --git a/0000-tmpname.patch b/0000-tmpname.patch
new file mode 100644
index 000000000000..a6ed488a9761
--- /dev/null
+++ b/0000-tmpname.patch
@@ -0,0 +1,18 @@
+--- a/src/html2ps-1.0b7/html2ps 2020-05-14 18:50:29.237441617 +0200
++++ b/src/html2ps-1.0b7/html2ps 2020-05-15 11:05:13.434238273 +0200
+@@ -487,6 +487,7 @@
+ $giftopm="giftopnm" if($package{'netpbm'});
+ $giftopm="giftoppm" if($package{'pbmplus'});
+
++use File::Temp qw/ :POSIX /;
+ for(keys %option){eval "\$opt_$_='$option{$_}' if(!defined \$opt_$_)"};
+ die $usage if $opt_h;
+ die "$version\n" if $opt_v;
+@@ -495,7 +496,7 @@
+  if($opt_D && !$package{'Ghostscript'});
+ die "Ghostscript is required to generate cross references\n"
+  if($opt_R && !$package{'Ghostscript'});
+-$tmpname=$posix?POSIX::tmpnam():"h2p_$$";
++$tmpname=$posix?tmpnam():"h2p_$$";
+ ($scr=$tmpname)=~/\w+$/;
+ $tempdir=$`;
diff --git a/PKGBUILD b/PKGBUILD
index f05a5045e3a2..fafe6ef0b737 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 set -u
 pkgname='html2ps'
 pkgver='1.0b7'
-pkgrel='7'
+pkgrel='8'
 pkgdesc='An HTML to PostScript converter written in Perl.'
 arch=('any')
 #url='http://user.it.uu.se/~jan/html2ps.html'
@@ -13,36 +13,47 @@ url='https://linux.die.net/man/1/html2ps'
 license=('GPL2')
 depends=('ghostscript' 'perl' 'texlive-bin')
 options=('!strip')
+_srcdir="${pkgname}-${pkgver}"
 source=(
   #"http://user.it.uu.se/~jan/html2ps-${pkgver}.tar.gz"
-  "https://fossies.org/linux/www/old/html2ps-${pkgver}.tar.gz"
+  "https://fossies.org/linux/www/old/${_srcdir}.tar.gz"
+  '0000-tmpname.patch'
 )
-md5sums=('073ab8a239c8d0e3547192ee9016db15')
-sha1sums=('20d508817803af08e397794d4986046ee8128b5c')
-sha256sums=('d553980468a14bae738982c384c17f426ecf77dafd9a4e2499d520953f156f14')
-sha384sums=('e1c95370257b22f408848914b56703334ee0f1ef7683b045bbef67142a7577fc5a8c3fba0790fd90a380dcdf4f5c5eb7')
+md5sums=('073ab8a239c8d0e3547192ee9016db15'
+         'af46fab28f1d32c6fc30e3e2bf09f19c')
+sha256sums=('d553980468a14bae738982c384c17f426ecf77dafd9a4e2499d520953f156f14'
+            '3bedbca6aa76f3accd1c18210c686cddf7168c59f376285bd1c9a35b00e1c74b')
 
-package() {
+prepare() {
   set -u
-  local _script="${srcdir}/${pkgname}-${pkgver}/${pkgname}"
+  cd "${_srcdir}"
+
+  patch -Nup3 -i '../0000-tmpname.patch'
 
-  # Fixes Bug: https://bugzilla.redhat.com/show_bug.cgi?id=822117
-  sed -e '/^  local($\[)=0;$/d' -i "${_script}"
+  sed -e '# Fixes Bug: https://bugzilla.redhat.com/show_bug.cgi?id=822117' \
+      -e '/^  local($\[)=0;$/d' \
+      -e '#' \
+      -e '# Set some variables in the script' \
+      -e "s#/it/sw/share/www/lib/html2ps/html2psrc#/etc/html2psrc#g" \
+      -e "s#/opt/misc/lib/html2ps/html2psrc#/etc/html2psrc#g" \
+      -e "s#/opt/misc/lib/html2ps/html2ps.html#/usr/share/html2ps/html2ps.html#g" \
+      -e "s#Ghostscript: 0;#Ghostscript: 1;#g" \
+      -e "s#TeX: 0;#TeX: 1;#g" \
+      -e 's# file: "";# file: "/usr/share/texmf/tex/generic/hyphen/hyphen.tex";#g' \
+    -i "${pkgname}"
 
-  # Set some variables in the script
-  sed -e "s#/it/sw/share/www/lib/html2ps/html2psrc#/etc/html2psrc#g" -i "${_script}"
-  sed -e "s#/opt/misc/lib/html2ps/html2psrc#/etc/html2psrc#g" -i "${_script}"
-  sed -e "s#/opt/misc/lib/html2ps/html2ps.html#/usr/share/html2ps/html2ps.html#g" -i "${_script}"
-  sed -e "s#Ghostscript: 0;#Ghostscript: 1;#g" -i "${_script}"
-  sed -e "s#TeX: 0;#TeX: 1;#g" -i "${_script}"
-  sed -e 's# file: "";# file: "/usr/share/texmf/tex/generic/hyphen/hyphen.tex";#g' -i "${_script}"
+  set +u
+}
 
-  install -Dpm755 "${srcdir}/${pkgname}-${pkgver}/${pkgname}" -t "${pkgdir}/usr/bin/"
-  install -Dpm644 "${srcdir}/${pkgname}-${pkgver}/sample" "${pkgdir}/etc/html2psrc"
-  install -Dpm644 "${srcdir}/${pkgname}-${pkgver}/sample" "${pkgdir}/usr/share/${pkgname}/etc/html2psrc-sampleconfig"
-  install -Dpm644 "${srcdir}/${pkgname}-${pkgver}/${pkgname}.1" -t "${pkgdir}/usr/share/man/man1/"
-  install -Dpm644 "${srcdir}/${pkgname}-${pkgver}/${pkgname}rc.5" -t "${pkgdir}/usr/share/man/man5/"
-  install -Dpm644 "${srcdir}/${pkgname}-${pkgver}/${pkgname}.html" -t "${pkgdir}/usr/share/${pkgname}/"
+package() {
+  set -u
+  cd "${_srcdir}"
+  install -Dpm755 "${pkgname}" -t "${pkgdir}/usr/bin/"
+  install -Dpm644 'sample' "${pkgdir}/etc/html2psrc"
+  install -Dpm644 'sample' "${pkgdir}/usr/share/${pkgname}/etc/html2psrc-sampleconfig"
+  install -Dpm644 "${pkgname}.1" -t "${pkgdir}/usr/share/man/man1/"
+  install -Dpm644 "${pkgname}rc.5" -t "${pkgdir}/usr/share/man/man5/"
+  install -Dpm644 "${pkgname}.html" -t "${pkgdir}/usr/share/${pkgname}/"
   set +u
 }
 set +u