Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / gajim


Commits:
94ef7b74 by Robin Candau at 2025-02-07T22:01:50+01:00
upgpkg: 1.9.5-3: Add a patch to fix reproducibility
Strip timestamps from gzip
See https://dev.gajim.org/gajim/gajim/-/issues/12140

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- + strip_gzip_timestamps.patch


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = gajim
        pkgdesc = Full featured and easy to use XMPP (Jabber) client
        pkgver = 1.9.5
-       pkgrel = 2
+       pkgrel = 3
        url = https://gajim.org/
        arch = any
        license = GPL-3.0-only
@@ -49,7 +49,10 @@ pkgbase = gajim
        optdepends = python-gnupg: encrypting chat messages with OpenPGP
        optdepends = emoji-font: for emojis support
        source = 
https://dev.gajim.org/gajim/gajim/-/archive/1.9.5/gajim-1.9.5.tar.gz
+       source = strip_gzip_timestamps.patch
        sha512sums = 
63138537a384d0914c05ad42d1fa2b4e06805c59180a286fca91fd57ab78ed04f6deaef74ba7285a63c91c750bc94e66c39dfe7f33f3a48f9637aae5428cd3a4
+       sha512sums = 
053f1a209c71da9cc14634b53aaba1f866d66d7290f6a01216b7006b6b7d2bbc44418a2de747af411092003e1b4493003c2f9e3f782e24ebee2ea0db8540705a
        b2sums = 
35d46dac13f71fc2f07a098ff041e6d785742c569448606f0021fca3e3c1607fd911079873dfb0bd58dd300239ee19569ae36aa3c11ca25f8b97c6ef7f5d3b6b
+       b2sums = 
c5a65f74dbb905eb349934ec5e90186bae323d77b1b328bdeecbad928b53ade7189414f3a026a63cff67270d107512fbb494bcc1c8f153a58997308eefbe12f9
 
 pkgname = gajim


=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
 
 pkgname=gajim
 pkgver=1.9.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Full featured and easy to use XMPP (Jabber) client"
 url="https://gajim.org/";
 arch=('any')
@@ -29,9 +29,20 @@ optdepends=('python-dbus: to have gajim-remote working'
             'libxss: for idle time checking on X11'
             'python-gnupg: encrypting chat messages with OpenPGP'
             'emoji-font: for emojis support')
-source=("https://dev.gajim.org/gajim/gajim/-/archive/${pkgver}/gajim-${pkgver}.tar.gz";)
-sha512sums=('63138537a384d0914c05ad42d1fa2b4e06805c59180a286fca91fd57ab78ed04f6deaef74ba7285a63c91c750bc94e66c39dfe7f33f3a48f9637aae5428cd3a4')
-b2sums=('35d46dac13f71fc2f07a098ff041e6d785742c569448606f0021fca3e3c1607fd911079873dfb0bd58dd300239ee19569ae36aa3c11ca25f8b97c6ef7f5d3b6b')
+source=("https://dev.gajim.org/gajim/gajim/-/archive/${pkgver}/gajim-${pkgver}.tar.gz";
+        'strip_gzip_timestamps.patch')
+sha512sums=('63138537a384d0914c05ad42d1fa2b4e06805c59180a286fca91fd57ab78ed04f6deaef74ba7285a63c91c750bc94e66c39dfe7f33f3a48f9637aae5428cd3a4'
+            
'053f1a209c71da9cc14634b53aaba1f866d66d7290f6a01216b7006b6b7d2bbc44418a2de747af411092003e1b4493003c2f9e3f782e24ebee2ea0db8540705a')
+b2sums=('35d46dac13f71fc2f07a098ff041e6d785742c569448606f0021fca3e3c1607fd911079873dfb0bd58dd300239ee19569ae36aa3c11ca25f8b97c6ef7f5d3b6b'
+        
'c5a65f74dbb905eb349934ec5e90186bae323d77b1b328bdeecbad928b53ade7189414f3a026a63cff67270d107512fbb494bcc1c8f153a58997308eefbe12f9')
+
+
+prepare() {
+       cd "${pkgname}-${pkgver}"
+       # Strip gzip timestamps for reproducibility
+       # See https://dev.gajim.org/gajim/gajim/-/issues/12140
+       patch -Np1 -i "${srcdir}/strip_gzip_timestamps.patch"
+}
 
 build() {
        cd "${pkgname}-${pkgver}"


=====================================
strip_gzip_timestamps.patch
=====================================
@@ -0,0 +1,13 @@
+diff --git a/make.py b/make.py
+index 911ad5442..be550e36b 100755
+--- a/make.py
++++ b/make.py
+@@ -96,7 +96,7 @@ def build_man() -> None:
+         man_out_path = METADATA / f'{man_file_name}.gz'
+         logging.info('Compress %s >> %s', man_file_name, man_out_path)
+ 
+-        with gzip.open(man_out_path, 'wb') as f_out:
++        with gzip.GzipFile(man_out_path, 'wb', mtime=0) as f_out:
+             f_out.write(data)
+ 
+ 



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/gajim/-/commit/94ef7b7407648d982f9ee3433218746147dff255

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/gajim/-/commit/94ef7b7407648d982f9ee3433218746147dff255
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to