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

Andreas Radke andyrtr at archlinux.org
Fri May 29 12:07:03 UTC 2020


    Date: Friday, May 29, 2020 @ 12:07:03
  Author: andyrtr
Revision: 387815

upgpkg: x2goserver 4.1.0.3-5: fix reproducable build

Added:
  x2goserver/trunk/reproducible-man-gzip.patch
Modified:
  x2goserver/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   19 ++++++---
 reproducible-man-gzip.patch |   81 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 94 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-29 11:56:43 UTC (rev 387814)
+++ PKGBUILD	2020-05-29 12:07:03 UTC (rev 387815)
@@ -7,7 +7,7 @@
 
 pkgname=x2goserver
 pkgver=4.1.0.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology"
 arch=('x86_64')
 url="https://www.x2go.org/"
@@ -80,16 +80,17 @@
 # no https due to invalid certificate
 source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
        tmpfiles.d
-       sysusers.d)
+       sysusers.d
+       reproducible-man-gzip.patch)
 sha256sums=('6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0'
             'SKIP'
             '548d48925171aeca198494236cfba7232921a25a1c4c81f5d004a734d83d1350'
-            '04d429e8d8fe02c8078d75ba63ba57774274df877b2c6ec942621312b7bf9118')
+            '04d429e8d8fe02c8078d75ba63ba57774274df877b2c6ec942621312b7bf9118'
+            '2d52a5ca28d5b65a9cc9bd8cdc74d030d7faddb6d727d2df520686934ea125fb')
 validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git Administrator <git-admin at x2go.org>
 
-build() {
+prepare() {
   cd ${pkgname}-${pkgver}
-
   # -r option does not exist in Arch linux
   # (However, html man pages do not get installed anyway...)
   for Makefile in $(find . -type f -name Makefile); do
@@ -103,7 +104,13 @@
   done
   # Do not ship xsession - Debian specific
   sed -i -e '/xsession/s/^/#/' Makefile
-  
+
+  # remove timestamp to solve reproducible build
+  patch -Np1 -i ../reproducible-man-gzip.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor
 }
 

Added: reproducible-man-gzip.patch
===================================================================
--- reproducible-man-gzip.patch	                        (rev 0)
+++ reproducible-man-gzip.patch	2020-05-29 12:07:03 UTC (rev 387815)
@@ -0,0 +1,81 @@
+--- x2goserver-4.1.0.3/x2goserver-common/Makefile	2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver-common/Makefile.new	2020-05-29 13:49:19.785916164 +0200
+@@ -70,7 +70,7 @@
+ install_man:
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
+ 	$(INSTALL_FILE) man/man5/*.5           $(DESTDIR)$(MANDIR)/man5
+-	gzip -f $(DESTDIR)$(MANDIR)/man5/x2go*.5
++	gzip -f -n $(DESTDIR)$(MANDIR)/man5/x2go*.5
+ 
+ install_version:
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+--- x2goserver-4.1.0.3/x2goserver/Makefile	2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver/Makefile.new	2020-05-29 13:50:51.578356020 +0200
+@@ -80,10 +80,10 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
+ 	$(INSTALL_FILE) man/man5/*.5           $(DESTDIR)$(MANDIR)/man5
+-	gzip -f $(DESTDIR)$(MANDIR)/man5/x2go*.5
++	gzip -f -n $(DESTDIR)$(MANDIR)/man5/x2go*.5
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
+ 	$(INSTALL_FILE) man/man8/*.8           $(DESTDIR)$(MANDIR)/man8
+-	gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
++	gzip -f -n $(DESTDIR)$(MANDIR)/man8/x2go*.8
+ 
+ install_version:
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+--- x2goserver-4.1.0.3/x2goserver-x2goagent/Makefile	2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver-x2goagent/Makefile.new	2020-05-29 13:52:31.241005436 +0200
+@@ -75,7 +75,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1
+ 	$(INSTALL_FILE) man/man1/*.1           $(DESTDIR)$(MANDIR)/man1
+-	gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.1
++	gzip -f -n $(DESTDIR)$(MANDIR)/man1/x2go*.1
+ 
+ install_version:
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+--- x2goserver-4.1.0.3/x2goserver-printing/Makefile	2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver-printing/Makefile.new	2020-05-29 13:58:14.460132349 +0200
+@@ -62,7 +62,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
+ 	$(INSTALL_FILE) man/man8/*.8           $(DESTDIR)$(MANDIR)/man8
+-	gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
++	gzip -f -n $(DESTDIR)$(MANDIR)/man8/x2go*.8
+ 
+ install_version:
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+--- x2goserver-4.1.0.3/x2goserver-extensions/Makefile	2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver-extensions/Makefile.new	2020-05-29 13:59:21.731921736 +0200
+@@ -94,7 +94,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
+ 	$(INSTALL_FILE) man/man8/*.8           $(DESTDIR)$(MANDIR)/man8
+-	gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
++	gzip -f -n $(DESTDIR)$(MANDIR)/man8/x2go*.8
+ 
+ install_version:
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+--- x2goserver-4.1.0.3/x2goserver-fmbindings/Makefile	2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver-fmbindings/Makefile.new	2020-05-29 14:02:45.167334027 +0200
+@@ -66,7 +66,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
+ 	$(INSTALL_FILE) man/man8/*.8           $(DESTDIR)$(MANDIR)/man8
+-	gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
++	gzip -f -n $(DESTDIR)$(MANDIR)/man8/x2go*.8
+ 
+ install_version:
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
+--- x2goserver-4.1.0.3/x2goserver-desktopsharing/Makefile	2020-05-29 13:47:22.000000000 +0200
++++ x2goserver-4.1.0.3/x2goserver-desktopsharing/Makefile.new	2020-05-29 14:03:36.378699088 +0200
+@@ -64,7 +64,7 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+ 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
+ 	$(INSTALL_FILE) man/man8/*.8           $(DESTDIR)$(MANDIR)/man8
+-	gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
++	gzip -f -n $(DESTDIR)$(MANDIR)/man8/x2go*.8
+ 
+ install_version:
+ 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)



More information about the arch-commits mailing list