[arch-commits] Commit in ncftp/repos/extra-x86_64 (3 files)

[Jelle van der Waa]

    Date: Tuesday, July 13, 2021 @ 12:23:59
  Author: jelle
Revision: 419675

archrelease: copy trunk to extra-x86_64

Added:
  ncftp/repos/extra-x86_64/PKGBUILD
    (from rev 419674, ncftp/trunk/PKGBUILD)
  ncftp/repos/extra-x86_64/ncftp-reproducible.patch
    (from rev 419674, ncftp/trunk/ncftp-reproducible.patch)
Deleted:
  ncftp/repos/extra-x86_64/PKGBUILD

--------------------------+
 PKGBUILD                 |   80 ++++++++++++++++++++++++---------------------
 ncftp-reproducible.patch |   29 ++++++++++++++++
 2 files changed, 73 insertions(+), 36 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-13 12:23:49 UTC (rev 419674)
+++ PKGBUILD	2021-07-13 12:23:59 UTC (rev 419675)
@@ -1,36 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=ncftp
-pkgver=3.2.6
-pkgrel=3
-pkgdesc="A set of free application programs implementing FTP"
-url="https://www.ncftp.com/"
-arch=('x86_64')
-license=('custom')
-depends=('ncurses')
-makedepends=('inetutils')
-source=("ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.xz")
-md5sums=('42d0f896d69a4d603ec097546444245f')
-
-build() {
-  cd "${pkgname}-${pkgver}"
-
-  CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
-
-  # FS#39211
-  unset CPPFLAGS
-
-  CPP=/usr/bin/cpp ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-
-  install -d "${pkgdir}/usr/share"
-  make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man" install
-  install -Dm644 doc/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: ncftp/repos/extra-x86_64/PKGBUILD (from rev 419674, ncftp/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-07-13 12:23:59 UTC (rev 419675)
@@ -0,0 +1,44 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=ncftp
+pkgver=3.2.6
+pkgrel=4
+pkgdesc="A set of free application programs implementing FTP"
+url="https://www.ncftp.com/"
+arch=('x86_64')
+license=('custom')
+depends=('ncurses')
+makedepends=('inetutils')
+source=("ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.xz"
+        ncftp-reproducible.patch)
+md5sums=('42d0f896d69a4d603ec097546444245f'
+         'bf51aa93c785d366e19ccce78820da5a')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  # Make ncftp reproducible by not compiling in the kernel version
+  patch -Np1 -i "${srcdir}/ncftp-reproducible.patch"
+}
+
+build() {
+  cd "${pkgname}-${pkgver}"
+
+  CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
+
+  # FS#39211
+  unset CPPFLAGS
+
+  CPP=/usr/bin/cpp ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+
+  install -d "${pkgdir}/usr/share"
+  make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man" install
+  install -Dm644 doc/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: ncftp/repos/extra-x86_64/ncftp-reproducible.patch (from rev 419674, ncftp/trunk/ncftp-reproducible.patch)
===================================================================
--- ncftp-reproducible.patch	                        (rev 0)
+++ ncftp-reproducible.patch	2021-07-13 12:23:59 UTC (rev 419675)
@@ -0,0 +1,30 @@
+Author: Reiner Herrmann <reiner at 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
+--- 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
+
+