From ce6d8ca4430e7df27c77e116a677679f241551da Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 5 Jun 2022 20:03:56 -0700 Subject: gnu: ncftp: Build reproducibly. * gnu/packages/patches/ncftp-reproducible.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/ftp.scm (ncftp): Add patch. --- gnu/local.mk | 1 + gnu/packages/ftp.scm | 3 +++ gnu/packages/patches/ncftp-reproducible.patch | 29 +++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 gnu/packages/patches/ncftp-reproducible.patch diff --git a/gnu/local.mk b/gnu/local.mk index 708bbdd35d..68b317b32a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1519,6 +1519,7 @@ dist_patch_DATA = \ %D%/packages/patches/m4-gnulib-libio.patch \ %D%/packages/patches/nautilus-add-libportal-gtk3.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \ + %D%/packages/patches/ncftp-reproducible.patch \ %D%/packages/patches/netcdf-date-time.patch \ %D%/packages/patches/netpbm-CVE-2017-2586.patch \ %D%/packages/patches/netpbm-CVE-2017-2587.patch \ diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index cf6cdb630f..3f17dcf407 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -103,6 +103,9 @@ reliability in mind.") (sha256 (base32 "1389657cwgw5a3kljnqmhvfh4vr2gcr71dwz1mlhf22xq23hc82z")) + (patches + (search-patches + "ncftp-reproducible.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/ncftp-reproducible.patch b/gnu/packages/patches/ncftp-reproducible.patch new file mode 100644 index 0000000000..043b3b1e70 --- /dev/null +++ b/gnu/packages/patches/ncftp-reproducible.patch @@ -0,0 +1,29 @@ +Author: Reiner Herrmann +Date: 2016-07-01 16:00:02 UTC +Bug-Debian: https://bugs.debian.org/829249 + + make ncftp build reproducible. + +diff --git a/ncftp/main.c b/ncftp/main.c +index a7fccac..b27a94e 100644 +--- a/ncftp/main.c ++++ b/ncftp/main.c +@@ -62,7 +62,7 @@ static void + Usage(void) + { + FILE *fp; +-#ifdef UNAME ++#if 0 + char s[80]; + #endif + +@@ -76,7 +76,7 @@ Usage(void) + -F Dump a sample $HOME/.ncftp/firewall prefs file to stdout and exit.\n"); + + (void) fprintf(fp, "\nProgram version: %s\nLibrary version: %s\n", gVersion + 5, gLibNcFTPVersion + 5); +-#ifdef UNAME ++#if 0 + AbbrevStr(s, UNAME, 60, 1); + (void) fprintf(fp, "Build system: %s\n", s); + #endif + -- cgit v1.2.3