diff -Nru ncftp-3.2.5/debian/changelog ncftp-3.2.5/debian/changelog --- ncftp-3.2.5/debian/changelog 2016-07-04 06:54:27.000000000 +0000 +++ ncftp-3.2.5/debian/changelog 2016-07-02 11:31:26.000000000 +0000 @@ -1,8 +1,15 @@ -ncftp (2:3.2.5-1.1build1) xenial; urgency=medium +ncftp (2:3.2.5-2) unstable; urgency=medium - * No-change rebuild for ncurses6 transition. + * acknowledge the NMU: Thanks Jakub and Lucas! closes: #666352 + * debian/compat "raised" to compat 9 + * added reproducible patch. Thanks Reiner closes: #829249 + * fixed rmdir with trailing /. Thanks Bart closes: #352425 + * updated to Standard-Version 3.9.8. removed debian/menu + * fixed lintian hardening-no-* + * fixed lintian maintainer-script-without-set-e + * added debian/watch - -- Matthias Klose Sun, 07 Feb 2016 09:43:37 +0000 + -- Noël Köthe Fri, 01 Jul 2016 19:19:28 +0200 ncftp (2:3.2.5-1.1) unstable; urgency=low diff -Nru ncftp-3.2.5/debian/compat ncftp-3.2.5/debian/compat --- ncftp-3.2.5/debian/compat 2016-07-04 06:54:27.000000000 +0000 +++ ncftp-3.2.5/debian/compat 2016-07-01 17:27:27.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru ncftp-3.2.5/debian/control ncftp-3.2.5/debian/control --- ncftp-3.2.5/debian/control 2016-07-04 06:54:27.000000000 +0000 +++ ncftp-3.2.5/debian/control 2016-07-01 17:47:50.000000000 +0000 @@ -1,9 +1,9 @@ Source: ncftp Section: net Priority: optional -Maintainer: Noèl Köthe -Build-Depends: libncurses5-dev, debhelper (>> 5.0.0), libreadline-dev -Standards-Version: 3.9.2 +Maintainer: Noël Köthe +Build-Depends: debhelper (>> 9.0.0), libncurses5-dev, libreadline-dev +Standards-Version: 3.9.8 Homepage: http://www.ncftpd.com/ncftp/ Package: ncftp diff -Nru ncftp-3.2.5/debian/copyright ncftp-3.2.5/debian/copyright --- ncftp-3.2.5/debian/copyright 2016-07-04 06:54:27.000000000 +0000 +++ ncftp-3.2.5/debian/copyright 2016-07-01 17:22:29.000000000 +0000 @@ -3,7 +3,7 @@ Martin Mitchell since Sun, 12 Oct 1997 05:56:17 +1000 Chris Lawrence since Fri, 15 Oct 1999 01:55:48 -0500 Muhammad Hussain Yusuf since Thu, 1 Mar 2001 21:22:02 +0000 -Noèl Köthe since Mon, 23 Sep 2002 21:20:00 +0200 +Noël Köthe since Mon, 23 Sep 2002 21:20:00 +0200 It was downloaded from http://www.ncftpd.com/ncftp/ diff -Nru ncftp-3.2.5/debian/menu ncftp-3.2.5/debian/menu --- ncftp-3.2.5/debian/menu 2016-07-04 06:54:27.000000000 +0000 +++ ncftp-3.2.5/debian/menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -?package(ncftp):needs="text" section="Applications/Network/File Transfer" \ -title="ncftp" command="/usr/bin/ncftp3" hints="File transfer" diff -Nru ncftp-3.2.5/debian/patches/ncftp-352425.patch ncftp-3.2.5/debian/patches/ncftp-352425.patch --- ncftp-3.2.5/debian/patches/ncftp-352425.patch 1970-01-01 00:00:00.000000000 +0000 +++ ncftp-3.2.5/debian/patches/ncftp-352425.patch 2016-07-02 09:07:11.000000000 +0000 @@ -0,0 +1,28 @@ +Author: Bart Martens +Date: 2006-02-11 20:48:08 UTC +Bug-Debian: https://bugs.debian.org/352425 + + fix rmdir fails on trailing slash added by tab completion + +diff -ruN orig/ncftp-3.1.9/libncftp/c_rmdir.c ncftp-3.1.9/libncftp/c_rmdir.c +--- orig/ncftp-3.1.9/libncftp/c_rmdir.c 2005-01-01 22:29:02.000000000 +0100 ++++ ncftp-3.1.9/libncftp/c_rmdir.c 2006-02-11 21:50:05.000000000 +0100 +@@ -15,7 +15,7 @@ + { + FTPLineList fileList; + FTPLinePtr filePtr; +- char *file; ++ char *file, *tail; + int onceResult, batchResult; + + if (cip == NULL) +@@ -37,6 +37,9 @@ + cip->errNo = kErrBadLineList; + break; + } ++ tail = file + strlen( file ); ++ while( tail > file + 1 && *(--tail) == '/' ) ++ *tail = '\0'; + onceResult = FTPCmd(cip, "RMD %s", file); + if (onceResult < 0) { + batchResult = onceResult; diff -Nru ncftp-3.2.5/debian/patches/ncftpbookmarks.1 ncftp-3.2.5/debian/patches/ncftpbookmarks.1 --- ncftp-3.2.5/debian/patches/ncftpbookmarks.1 1970-01-01 00:00:00.000000000 +0000 +++ ncftp-3.2.5/debian/patches/ncftpbookmarks.1 2016-07-01 17:15:19.000000000 +0000 @@ -0,0 +1,55 @@ +.TH ncftpbookmarks 1 2003-07-09 "NcFTP Software" + +.SH NAME +ncftpbookmarks \- full screen bookmarks editor for ncftp + +.SH SYNOPSIS +ncftpbookmarks + +.SH DESCRIPTION +.PP +.I ncftpbookmarks +is a full-screen bookmark editor for the +.I "File Transfer Protocol" +client +.IR "ncftp". +.PP +.I ncftp +can bookmark server name, login name and password +of your favorite ftp servers. +.I ncftpbookmarks +is used to handle these +bookmarks. + +This full-screen editor can also be launched from the ncftp prompt with +the +.I bookmarks +command. + +While using +.IR ncftpbookmarks , +the screen is divided into two parts. +The left one gives a brief description of keyboard controls. +The right one lists all existing bookmarks. +Up and down arrows (or "u" and "d" keys) are used to move the cursor +in this list. +The "x" key is used to quit the editor. +Other commands have to be typed in full (e.g.\& +.IR /ed , +.IR /del ). + +.SH FILES +.IP $HOME/\.ncftp/bookmarks +Saves bookmark and host information. + +.SH AUTHORS +.PP +Mike Gleason, NcFTP Software (mgleason@ncftp.com). + +This man page was written by Nicolas Duboc (nicolas@duboc.net) for +the Debian distribution of the ncftp package. + +.SH "SEE ALSO" +.PP +.IR ncftp (1) + diff -Nru ncftp-3.2.5/debian/patches/ncftp-reproducible.patch ncftp-3.2.5/debian/patches/ncftp-reproducible.patch --- ncftp-3.2.5/debian/patches/ncftp-reproducible.patch 1970-01-01 00:00:00.000000000 +0000 +++ ncftp-3.2.5/debian/patches/ncftp-reproducible.patch 2016-07-02 09:07:37.000000000 +0000 @@ -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 + diff -Nru ncftp-3.2.5/debian/patches/series ncftp-3.2.5/debian/patches/series --- ncftp-3.2.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ ncftp-3.2.5/debian/patches/series 2016-07-01 17:42:48.000000000 +0000 @@ -0,0 +1,2 @@ +ncftp-352425.patch +ncftp-reproducible.patch diff -Nru ncftp-3.2.5/debian/postinst ncftp-3.2.5/debian/postinst --- ncftp-3.2.5/debian/postinst 2016-07-04 06:54:27.000000000 +0000 +++ ncftp-3.2.5/debian/postinst 2016-07-01 18:35:34.000000000 +0000 @@ -1,7 +1,9 @@ -#!/bin/sh -e +#!/bin/sh # # postinst for ncftp3 +set -e + update-alternatives --install /usr/bin/ncftp ncftp /usr/bin/ncftp3 10 \ --slave /usr/share/man/man1/ncftp.1.gz ncftp.1.gz /usr/share/man/man1/ncftp3.1.gz diff -Nru ncftp-3.2.5/debian/prerm ncftp-3.2.5/debian/prerm --- ncftp-3.2.5/debian/prerm 2016-07-04 06:54:27.000000000 +0000 +++ ncftp-3.2.5/debian/prerm 2016-07-01 18:35:48.000000000 +0000 @@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/sh + +set -e if [ "$1" != "upgrade" ] then diff -Nru ncftp-3.2.5/debian/rules ncftp-3.2.5/debian/rules --- ncftp-3.2.5/debian/rules 2016-07-04 06:54:27.000000000 +0000 +++ ncftp-3.2.5/debian/rules 2016-07-02 08:46:43.000000000 +0000 @@ -1,20 +1,31 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -CFLAGS = -O2 -Wall +DEB_HOST_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -configure: configure-stamp -configure-stamp: +ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) +confflags= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +else +confflags= --build $(DEB_BUILD_GNU_TYPE) +endif + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk +CFLAGS += -DNO_SSLv2 -D_FILE_OFFSET_BITS=64 -g -Wall + +config.status: dh_testdir + cp /usr/share/misc/config.guess /usr/share/misc/config.sub . # Add here commands to configure the package. - ./configure --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --sysconfdir=/etc \ - --enable-readline + CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --sysconfdir=/etc \ + --enable-readline touch configure-stamp @@ -24,29 +35,29 @@ build-indep: build-stamp -build-stamp: configure-stamp +build-stamp: config.status dh_testdir # Add here commands to compile the package. $(MAKE) - #/usr/bin/docbook-to-man debian/ncftp.sgml > ncftp.1 touch build-stamp -clean: +clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - [ ! -f Makefile ] || $(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean + dh_prep dh_clean install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs # Add here commands to install the package into debian/ncftp. @@ -67,7 +78,7 @@ dh_installexamples dh_installmenu dh_installcron - dh_installman doc/man/ncftpbookmarks.1 + dh_installman debian/patches/ncftpbookmarks.1 dh_installinfo dh_installchangelogs doc/CHANGELOG.txt dh_link @@ -81,4 +92,4 @@ dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build clean binary-indep binary-arch binary install diff -Nru ncftp-3.2.5/debian/source/format ncftp-3.2.5/debian/source/format --- ncftp-3.2.5/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ ncftp-3.2.5/debian/source/format 2016-07-01 17:26:58.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru ncftp-3.2.5/debian/watch ncftp-3.2.5/debian/watch --- ncftp-3.2.5/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ ncftp-3.2.5/debian/watch 2016-07-02 11:31:12.000000000 +0000 @@ -0,0 +1,3 @@ +version=3 +http://www.ncftpd.com/download/ .*/ncftp-(\d.*)-src\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)) + diff -Nru ncftp-3.2.5/doc/man/ncftpbookmarks.1 ncftp-3.2.5/doc/man/ncftpbookmarks.1 --- ncftp-3.2.5/doc/man/ncftpbookmarks.1 2016-07-04 06:54:27.000000000 +0000 +++ ncftp-3.2.5/doc/man/ncftpbookmarks.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -.TH ncftpbookmarks 1 2003-07-09 "NcFTP Software" - -.SH NAME -ncftpbookmarks \- full screen bookmarks editor for ncftp - -.SH SYNOPSIS -ncftpbookmarks - -.SH DESCRIPTION -.PP -.I ncftpbookmarks -is a full-screen bookmark editor for the -.I "File Transfer Protocol" -client -.IR "ncftp". -.PP -.I ncftp -can bookmark server name, login name and password -of your favorite ftp servers. -.I ncftpbookmarks -is used to handle these -bookmarks. - -This full-screen editor can also be launched from the ncftp prompt with -the -.I bookmarks -command. - -While using -.IR ncftpbookmarks , -the screen is divided into two parts. -The left one gives a brief description of keyboard controls. -The right one lists all existing bookmarks. -Up and down arrows (or "u" and "d" keys) are used to move the cursor -in this list. -The "x" key is used to quit the editor. -Other commands have to be typed in full (e.g.\& -.IR /ed , -.IR /del ). - -.SH FILES -.IP $HOME/\.ncftp/bookmarks -Saves bookmark and host information. - -.SH AUTHORS -.PP -Mike Gleason, NcFTP Software (mgleason@ncftp.com). - -This man page was written by Nicolas Duboc (nicolas@duboc.net) for -the Debian distribution of the ncftp package. - -.SH "SEE ALSO" -.PP -.IR ncftp (1) -