diff -Nru nvi-1.81.6/debian/changelog nvi-1.81.6/debian/changelog --- nvi-1.81.6/debian/changelog 2019-09-05 11:04:29.000000000 +0000 +++ nvi-1.81.6/debian/changelog 2020-04-23 22:54:55.000000000 +0000 @@ -1,8 +1,26 @@ -nvi (1.81.6-15build1) eoan; urgency=medium +nvi (1.81.6-16) unstable; urgency=medium - * No-change upload with strops.h and sys/strops.h removed in glibc. + * QA upload. + + [ Boyuan Yang ] + * debian/control: Clean-up build-dependency on transitional + packages. + * debian/patches/32: Add patch to fix ETXTBSY when executing + nvi-opened files. (Closes: #891174, #497342) + * debian/copyright: Fix DEP5 format. + * debian/control: Add missing ${misc:Pre-Depends} placeholder. + + [ Debian Janitor ] + * Use versioned copyright format URI. + * Wrap long lines in changelog entries: 1.79-20, 1.79-16. + * Move source package lintian overrides to debian/source. + * Bump debhelper from old 9 to 12. + + Set debhelper-compat version in Build-Depends. + - Drop old dh-systemd build-dependency. (Closes: #958595) + * Set upstream metadata fields: Repository. + * Rely on pre-initialized dpkg-architecture variables. - -- Matthias Klose Thu, 05 Sep 2019 11:04:29 +0000 + -- Boyuan Yang Thu, 23 Apr 2020 18:54:55 -0400 nvi (1.81.6-15) unstable; urgency=medium @@ -275,7 +293,8 @@ nvi (1.79-20) unstable; urgency=low - * Added "#include " for declarations for tgoto, tputs (closes: #126116) + * Added "#include " for declarations for tgoto, tputs (closes: + #126116) * Updated copyright file (closes: #123829) * Added option whitespace discusion to manpage. New text courtesy of Kevin Ride; long delay courtesy of me (closes: #49846) @@ -323,7 +342,8 @@ nvi (1.79-16) stable unstable; urgency=medium * Wrangle the program name into standard (nvi, nview, nex) form (closes:64816) - * Added Alexandero Viro's patch against possible document corruption. I think this is worth including in the next stable release. This is bug 77978, + * Added Alexandero Viro's patch against possible document corruption. I think + this is worth including in the next stable release. This is bug 77978, but I don't want to close it until the fix appears in a stable release. -- Steve Greenland Tue, 12 Dec 2000 20:57:07 -0600 diff -Nru nvi-1.81.6/debian/compat nvi-1.81.6/debian/compat --- nvi-1.81.6/debian/compat 2018-12-04 20:36:20.000000000 +0000 +++ nvi-1.81.6/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru nvi-1.81.6/debian/control nvi-1.81.6/debian/control --- nvi-1.81.6/debian/control 2018-12-04 21:25:27.000000000 +0000 +++ nvi-1.81.6/debian/control 2020-04-23 22:54:55.000000000 +0000 @@ -2,14 +2,18 @@ Section: editors Priority: optional Maintainer: Debian QA Group -Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9~), libncurses5-dev, libncursesw5-dev, autotools-dev, libdb-dev, dh-systemd +Standards-Version: 4.5.0 +Build-Depends: + debhelper-compat (= 12), + libncurses-dev, + libdb-dev, Homepage: https://repo.or.cz/nvi.git Vcs-Git: https://salsa.debian.org/debian/nvi.git Vcs-Browser: https://salsa.debian.org/debian/nvi Package: nvi Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: nvi-doc Description: 4.4BSD re-implementation of vi @@ -26,6 +30,7 @@ Architecture: all Multi-Arch: foreign Section: doc +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends} Description: 4.4BSD re-implementation of vi - documentation files Vi is the original screen based text editor for Unix systems. diff -Nru nvi-1.81.6/debian/copyright nvi-1.81.6/debian/copyright --- nvi-1.81.6/debian/copyright 2018-12-04 20:36:03.000000000 +0000 +++ nvi-1.81.6/debian/copyright 2020-04-23 22:54:55.000000000 +0000 @@ -1,7 +1,7 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: nvi -Upstream-Maintainer: Sven Verdoolaege -Upstream-Source: http://www.kotnet.org/~skimo/nvi/devel/ +Upstream-Contact: Sven Verdoolaege +Source: https://repo.or.cz/nvi.git Files: * Copyright: Copyright (c) 1991, 1992, 1993, 1994, The Regents of the University of California. All rights reserved. @@ -15,7 +15,7 @@ License: BSD-3 The following are the copyrights and redistribution conditions that apply to this copy of the Vi software. - + . /* * Copyright (c) 1991, 1992, 1993, 1994 * The Regents of the University of California. All rights reserved. @@ -48,7 +48,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ - + . (The files in the clib/ subdirectory bear a BSD-4 license header, yet the only copyright holder of those files is the University of California, Berkeley, which removed the ad-clause in 1997 retroactively (i.e. it @@ -58,31 +58,31 @@ Files: regex/* Copyright: Copyright (c) 1992, 1993, 1994, Henry Spencer. All rights reserved. Copyright (c) 1994, The Regents of the University of California. All rights reserved. -License: other, BSD-3 +License: other-BSD-3 Original license terms by Henry Spencer: - + . This software is not subject to any license of the American Telephone and Telegraph Company or of the Regents of the University of California. - + . Permission is granted to anyone to use this software for any purpose on any computer system, and to alter it and redistribute it, subject to the following restrictions: - + . 1. The author is not responsible for the consequences of use of this software, no matter how awful, even if they arise from flaws in it. - + . 2. The origin of this software must not be misrepresented, either by explicit claim or by omission. Since few users ever read sources, credits must appear in the documentation. - + . 3. Altered versions must be plainly marked as such, and must not be misrepresented as being the original software. Since few users ever read sources, credits must appear in the documentation. - + . 4. This notice may not be removed or altered. - + . Subsequent modifications made by UCB are covered by BSD-3: - + . =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= /*- * Copyright (c) 1994 diff -Nru nvi-1.81.6/debian/patches/32allow_exec_of_nvi_opened_file.patch nvi-1.81.6/debian/patches/32allow_exec_of_nvi_opened_file.patch --- nvi-1.81.6/debian/patches/32allow_exec_of_nvi_opened_file.patch 1970-01-01 00:00:00.000000000 +0000 +++ nvi-1.81.6/debian/patches/32allow_exec_of_nvi_opened_file.patch 2020-04-23 22:44:21.000000000 +0000 @@ -0,0 +1,36 @@ +From: Jim Lebeau +Date: Fri, 20 May 2016 20:35:51 -0500 +Subject: Allow exec of nvi-opened file + +This patch allows the files that are being edited by nvi to be +executed by others. Otherwise a ETXTBSY will occur. + +Fix proposed in https://bugs.debian.org/891174 . The original +bug report also listed the fix. + +Explanation from Bug#891174: + +Opening the file read-only is enough for flock() -- please notice that +ep->fd is only used to keep the lock hot, that's not the descriptor that +is used for reading or writing data to the file. + +Forwarded: no +Bug-Debian: https://bugs.debian.org/497342 +Signed-off-by: Boyuan Yang +--- + common/exf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/exf.c b/common/exf.c +index 33c6af5..11c1017 100644 +--- a/common/exf.c ++++ b/common/exf.c +@@ -408,7 +408,7 @@ postinit: + * an error. + */ + if (rcv_name == NULL && ep->refcnt == 0) { +- if ((ep->fd = open(oname, O_RDWR)) == -1) ++ if ((ep->fd = open(oname, O_RDONLY)) == -1) + goto no_lock; + + switch (file_lock(sp, oname, &ep->fcntl_fd, ep->fd, 1)) { diff -Nru nvi-1.81.6/debian/patches/series nvi-1.81.6/debian/patches/series --- nvi-1.81.6/debian/patches/series 2018-12-04 20:39:03.000000000 +0000 +++ nvi-1.81.6/debian/patches/series 2020-04-23 22:44:21.000000000 +0000 @@ -27,3 +27,4 @@ 29file_backup.patch 30make_recover_script_init_ready.patch 31regex_heap_overflow.patch +32allow_exec_of_nvi_opened_file.patch diff -Nru nvi-1.81.6/debian/rules nvi-1.81.6/debian/rules --- nvi-1.81.6/debian/rules 2018-12-04 20:59:36.000000000 +0000 +++ nvi-1.81.6/debian/rules 2020-04-23 22:44:39.000000000 +0000 @@ -6,10 +6,10 @@ curdir=$(shell pwd) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +include /usr/share/dpkg/architecture.mk export DEB_BUILD_MAINT_OPTIONS := hardening=+all +DPKG_EXPORT_BUILDFLAGS=1 include /usr/share/dpkg/buildflags.mk ifeq ($(filter nostrip,$(DEB_BUILD_OPTIONS)),nostrip) @@ -19,7 +19,7 @@ endif %: - dh $@ --with=systemd + dh $@ override_dh_auto_clean: rm -f dist/recover diff -Nru nvi-1.81.6/debian/source/lintian-overrides nvi-1.81.6/debian/source/lintian-overrides --- nvi-1.81.6/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ nvi-1.81.6/debian/source/lintian-overrides 2020-04-23 21:33:34.000000000 +0000 @@ -0,0 +1,3 @@ +# dist/ltconfig is shipped by upstream. It isn't even used in the build process, +# so nevermind. +nvi source: ancient-libtool dist/ltconfig diff -Nru nvi-1.81.6/debian/source.lintian-overrides nvi-1.81.6/debian/source.lintian-overrides --- nvi-1.81.6/debian/source.lintian-overrides 2018-12-04 20:36:03.000000000 +0000 +++ nvi-1.81.6/debian/source.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# dist/ltconfig is shipped by upstream. It isn't even used in the build process, -# so nevermind. -nvi source: ancient-libtool dist/ltconfig diff -Nru nvi-1.81.6/debian/upstream/metadata nvi-1.81.6/debian/upstream/metadata --- nvi-1.81.6/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ nvi-1.81.6/debian/upstream/metadata 2020-04-23 21:33:34.000000000 +0000 @@ -0,0 +1 @@ +Repository: https://repo.or.cz/nvi.git