diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/ftp.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/ncftp-reproducible.patch | 29 |
3 files changed, 33 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 708bbdd35d5..68b317b32a5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -1519,6 +1519,7 @@ dist_patch_DATA = \ | |||
| 1519 | %D%/packages/patches/m4-gnulib-libio.patch \ | 1519 | %D%/packages/patches/m4-gnulib-libio.patch \ |
| 1520 | %D%/packages/patches/nautilus-add-libportal-gtk3.patch \ | 1520 | %D%/packages/patches/nautilus-add-libportal-gtk3.patch \ |
| 1521 | %D%/packages/patches/ncompress-fix-softlinks.patch \ | 1521 | %D%/packages/patches/ncompress-fix-softlinks.patch \ |
| 1522 | %D%/packages/patches/ncftp-reproducible.patch \ | ||
| 1522 | %D%/packages/patches/netcdf-date-time.patch \ | 1523 | %D%/packages/patches/netcdf-date-time.patch \ |
| 1523 | %D%/packages/patches/netpbm-CVE-2017-2586.patch \ | 1524 | %D%/packages/patches/netpbm-CVE-2017-2586.patch \ |
| 1524 | %D%/packages/patches/netpbm-CVE-2017-2587.patch \ | 1525 | %D%/packages/patches/netpbm-CVE-2017-2587.patch \ |
diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index cf6cdb630fd..3f17dcf4072 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm | |||
| @@ -103,6 +103,9 @@ reliability in mind.") | |||
| 103 | (sha256 | 103 | (sha256 |
| 104 | (base32 | 104 | (base32 |
| 105 | "1389657cwgw5a3kljnqmhvfh4vr2gcr71dwz1mlhf22xq23hc82z")) | 105 | "1389657cwgw5a3kljnqmhvfh4vr2gcr71dwz1mlhf22xq23hc82z")) |
| 106 | (patches | ||
| 107 | (search-patches | ||
| 108 | "ncftp-reproducible.patch")) | ||
| 106 | (modules '((guix build utils))) | 109 | (modules '((guix build utils))) |
| 107 | (snippet | 110 | (snippet |
| 108 | '(begin | 111 | '(begin |
diff --git a/gnu/packages/patches/ncftp-reproducible.patch b/gnu/packages/patches/ncftp-reproducible.patch new file mode 100644 index 00000000000..043b3b1e700 --- /dev/null +++ b/gnu/packages/patches/ncftp-reproducible.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | Author: Reiner Herrmann <reiner@reiner-h.de> | ||
| 2 | Date: 2016-07-01 16:00:02 UTC | ||
| 3 | Bug-Debian: https://bugs.debian.org/829249 | ||
| 4 | |||
| 5 | make ncftp build reproducible. | ||
| 6 | |||
| 7 | diff --git a/ncftp/main.c b/ncftp/main.c | ||
| 8 | index a7fccac..b27a94e 100644 | ||
| 9 | --- a/ncftp/main.c | ||
| 10 | +++ b/ncftp/main.c | ||
| 11 | @@ -62,7 +62,7 @@ static void | ||
| 12 | Usage(void) | ||
| 13 | { | ||
| 14 | FILE *fp; | ||
| 15 | -#ifdef UNAME | ||
| 16 | +#if 0 | ||
| 17 | char s[80]; | ||
| 18 | #endif | ||
| 19 | |||
| 20 | @@ -76,7 +76,7 @@ Usage(void) | ||
| 21 | -F Dump a sample $HOME/.ncftp/firewall prefs file to stdout and exit.\n"); | ||
| 22 | |||
| 23 | (void) fprintf(fp, "\nProgram version: %s\nLibrary version: %s\n", gVersion + 5, gLibNcFTPVersion + 5); | ||
| 24 | -#ifdef UNAME | ||
| 25 | +#if 0 | ||
| 26 | AbbrevStr(s, UNAME, 60, 1); | ||
| 27 | (void) fprintf(fp, "Build system: %s\n", s); | ||
| 28 | #endif | ||
| 29 | |||
