[arch-commits] Commit in hplip/trunk (PKGBUILD reproducible-gzip.patch)

[Jelle van der Waa]

    Date: Wednesday, May 27, 2020 @ 14:57:54
  Author: jelle
Revision: 387726

Make hplip reproducible

Added:
  hplip/trunk/reproducible-gzip.patch
Modified:
  hplip/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   11 ++++++++---
 reproducible-gzip.patch |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-27 14:43:10 UTC (rev 387725)
+++ PKGBUILD	2020-05-27 14:57:54 UTC (rev 387726)
@@ -5,7 +5,7 @@
 
 pkgname=hplip
 pkgver=3.20.5
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('x86_64')
@@ -30,7 +30,8 @@
         0023-Fix-handling-of-unicode-filenames-in-sixext.py.patch
         0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch
         https://launchpadlibrarian.net/480406888/hplip-configure-python.patch
-        python3.diff)
+        python3.diff
+        reproducible-gzip.patch)
 sha512sums=('fce3c7b8a2f3b0d2875bafd2ff65a3312fae867b658cd45eea16d9f3663646b6b0b70b58e6c2b46eb24627cdeefb318b6ca9ccf5a0e9790ff19519518992da07'
             'SKIP'
             'ee0bd240568a7dbb4dc6ef64dba28ea84c4bedf7d688d054960c686666f8f0bc4562961c40845107ef0c936e60d3e676bffb2a1ba708039690bb0520cda3a525'
@@ -38,7 +39,8 @@
             '763949a0bc460dcc9faefc86f2a91cf342781bfce696ed0c3826758572dd03ac266bbeb7b6a4f9376ac298d7d3c9c4def42d94921a8e1d1695e39396e36d95ff'
             '8710e039626878270b8b7bc1569566274d935c84652d758e25ce8fe01c0f44d911148620bb494489e1238201c01f3ba255c19f7dc5c2ff0d45a5f2a79190286b'
             'c41d5812ab9b5994e06f82acb0299c69edeaed548f5df2a3578c6c6428223e9cf7ec3b746f6e3071b6c858e2b0552417ba4695e1032ea41657bf852eb3ffc3fe'
-            '5885b223f96706bc09a147b5c141d620846c9058563e986983ca2ab90922cabe891a651d90d5004d45549b3874c40f8a1570a8a79e067d66f1826681111c7e82')
+            '5885b223f96706bc09a147b5c141d620846c9058563e986983ca2ab90922cabe891a651d90d5004d45549b3874c40f8a1570a8a79e067d66f1826681111c7e82'
+            '7bad907228b7c2f3c43128f087a2f8e03778760b7a26179ff441c1f60127e2fca08c94dff76baea2469d3a253a8f46b285d0af0f62a6d8738926caf7a10f670b')
 validpgpkeys=('4ABA2F66DBD5A95894910E0673D770CDA59047B9') # HPLIP (HP Linux Imaging and Printing) <hplip at hp.com>
 
 prepare() {
@@ -61,6 +63,9 @@
  # broken scanning - https://bugs.archlinux.org/task/66704
  patch -Np1 -i ../hplip-configure-python.patch
 
+ # make gzip creation reproducible by removing the timestamp
+ patch -Np1 -i ../reproducible-gzip.patch
+
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
 }

Added: reproducible-gzip.patch
===================================================================
--- reproducible-gzip.patch	                        (rev 0)
+++ reproducible-gzip.patch	2020-05-27 14:57:54 UTC (rev 387726)
@@ -0,0 +1,38 @@
+--- hplip-3.20.5/createPPD.sh	2020-05-11 15:34:06.000000000 +0200
++++ hplip-3.20.5.old/createPPD.sh	2020-05-27 12:02:44.089477299 +0200
+@@ -54,15 +54,15 @@
+ 	else
+ 		cp prnt/ps/hp-postscript*.ppd ppd/classppd/ps
+ 		for i in ppd/classppd/ps/*.ppd; do
+-			gzip -c "$i" > "$i.gz"
++			gzip -nc "$i" > "$i.gz"
+ 		done
+ 	fi
+         #cp prnt/ps/hp-postscript*.ppd.gz ppd/classppd/ps
+ 	for i in ppd/classppd/hpcups/*.ppd; do
+-		gzip -c "$i" > "$i.gz"
++		gzip -nc "$i" > "$i.gz"
+ 	done
+ 	#for i in ppd/classppd/ps/*.ppd; do
+-	#	gzip -c "$i" > "$i.gz"
++	#	gzip -nc "$i" > "$i.gz"
+ 	#done
+ 
+ 	cat > class_cups_drv.inc <<EOF
+@@ -81,14 +81,14 @@
+ install -d ppd/hpcups
+ ppdc -d ppd/hpcups prnt/drv/hpcups.drv
+ for i in ppd/hpcups/*.ppd; do
+-      gzip -c "$i" > "$i.gz"
++      gzip -nc "$i" > "$i.gz"
+ done
+ 
+ install -d ppd/hpijs
+ ppdc -d ppd/hpijs prnt/drv/hpijs.drv
+ echo "gzip ppd files..."
+ for i in ppd/hpijs/*.ppd; do
+-      gzip -c "$i" > "$i.gz"
++      gzip -nc "$i" > "$i.gz"
+ done
+ echo "building foomatic_drv.inc..."
+ ./hpijs-drv > foomatic_drv.inc $shadow