Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1683494997130820"
MIME-Version: 1.0
Date: Sun, 7 May 2023 21:29:57 +0000
From: "Nikita" <nikita@netbsd.org>
Subject: CVS commit: pkgsrc/net/ncftp3
To: pkgsrc-changes@NetBSD.org
Reply-To: nikita@netbsd.org
Message-Id: <20230507212957.BEA7EFA87@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1683494997130820
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nikita
Date:		Sun May  7 21:29:57 UTC 2023

Modified Files:
	pkgsrc/net/ncftp3: Makefile distinfo
Added Files:
	pkgsrc/net/ncftp3/patches: patch-main.c

Log Message:
ncftp3: add reproducibility patch from debian.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/ncftp3/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/ncftp3/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ncftp3/patches/patch-main.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1683494997130820
Content-Disposition: inline
Content-Length: 2339
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/net/ncftp3/Makefile
diff -u pkgsrc/net/ncftp3/Makefile:1.36 pkgsrc/net/ncftp3/Makefile:1.37
--- pkgsrc/net/ncftp3/Makefile:1.36	Tue Jun 28 11:35:03 2022
+++ pkgsrc/net/ncftp3/Makefile	Sun May  7 21:29:57 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2022/06/28 11:35:03 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2023/05/07 21:29:57 nikita Exp $
 
 DISTNAME=	ncftp-3.2.6-src
 PKGNAME=	${DISTNAME:S/ncftp/ncftp3/:S/-src//}
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/
 EXTRACT_SUFX=	.tar.xz

Index: pkgsrc/net/ncftp3/distinfo
diff -u pkgsrc/net/ncftp3/distinfo:1.15 pkgsrc/net/ncftp3/distinfo:1.16
--- pkgsrc/net/ncftp3/distinfo:1.15	Tue Oct 26 11:06:05 2021
+++ pkgsrc/net/ncftp3/distinfo	Sun May  7 21:29:57 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 11:06:05 nia Exp $
+$NetBSD: distinfo,v 1.16 2023/05/07 21:29:57 nikita Exp $
 
 BLAKE2s (ncftp-3.2.6-src.tar.xz) = 9f44a5a840f997f48248a2275841eb894e851c0f6d6e5a2a361b59df9802e81e
 SHA512 (ncftp-3.2.6-src.tar.xz) = 8e6091ce2ea1eb463edea322d1b5dde813475fd22096d67f0bfd2f5101ae09747ff25d38816d0b9b1077e6a5a256078361691f816aa2eefa38638aa523b4b382
 Size (ncftp-3.2.6-src.tar.xz) = 420564 bytes
 SHA1 (patch-configure) = 2b5e18ecdc7ad2b6a7e056210c769ff5441cb04f
+SHA1 (patch-main.c) = 3072d00194b7398764e5c736a0e5b07e00c701e4

Added files:

Index: pkgsrc/net/ncftp3/patches/patch-main.c
diff -u /dev/null pkgsrc/net/ncftp3/patches/patch-main.c:1.1
--- /dev/null	Sun May  7 21:29:57 2023
+++ pkgsrc/net/ncftp3/patches/patch-main.c	Sun May  7 21:29:57 2023
@@ -0,0 +1,29 @@
+Author: Reiner Herrmann <reiner@reiner-h.de>
+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
+--- ncftp/main.c.orig
++++ 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
+


--_----------=_1683494997130820--