diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..d45274e --- /dev/null +++ b/debian/changelog @@ -0,0 +1,169 @@ +entr (4.8-1) UNRELEASED; urgency=medium + + * New upstream version 4.8: + - Use control sequences to clear the display and specify '-c' twice to erase + the scrollback buffer + + -- Yuri D'Elia Fri, 02 Apr 2021 17:54:54 +0200 + +entr (4.7-1) unstable; urgency=medium + + [ Yuri D'Elia ] + * New upstream version 4.7: + - Use system file descriptor limits when max_user_watches is not + accessible + - Return the exit status of the child process when the '-z' option is used + - Handle SIGHUP so child process are terminated when a terminal is closed + - More accurately return shell exit code using '-s' option + * Update Standards-Version to 4.5.1 (no changes needed) + + -- Otto Kekäläinen Tue, 02 Feb 2021 14:22:32 +0200 + +entr (4.6-1) unstable; urgency=medium + + [ Yuri D'Elia ] + * New upstream version 4.6: + - Always call waitpid(2) to avoid dead processes + - Duplicate STDIN file descriptor before closing; for the '-r' option + * Do not filter pristine-tar (fix signature verification) + * Update watchfile / upstream URL to https + + -- Otto Kekäläinen Wed, 22 Jul 2020 23:11:57 +0300 + +entr (4.5-1) unstable; urgency=medium + + [ Debian Janitor ] + * debian/copyright: use spaces rather than tabs to start continuation + lines. + + [ Yuri D'Elia ] + * New upstream version 4.5 (Closes: #957173) + * Switch to debhelper 13 + + -- Otto Kekäläinen Sat, 30 May 2020 23:01:51 +0300 + +entr (4.4-1) unstable; urgency=medium + + [ Yuri D'Elia ] + * New upstream release 4.4 + * Update libbsd-overlay.patch + * Update Standards-Version to 4.5.0 (no changes needed) + + -- Otto Kekäläinen Fri, 31 Jan 2020 06:47:42 +0200 + +entr (4.3-1) unstable; urgency=low + + [ Yuri D'Elia ] + * New upstream version 4.3 + * Update libbsd-overlay.patch to use the bundled kqueue wrapper + * Allow overriding pkg-config and DEB_HOST_ARCH_OS (Closes: #914660) + * Do not require root for building + * Switch to debhelper 12 + * No longer alias NEWS as the upstream changelog + * Update Standards-Version to 4.4.1 + + -- Otto Kekäläinen Sat, 26 Oct 2019 19:09:56 +0300 + +entr (4.2-1) unstable; urgency=low + + * New upstream version 4.2 + + -- Otto Kekäläinen Fri, 07 Jun 2019 10:56:09 +0300 + +entr (4.1-1) unstable; urgency=low + + [ Otto Kekäläinen ] + * Add .gitlab-ci.yml copied from Salsa-CI team's example + * Add very rudimentary autopkgtests + + [ Yuri D'Elia ] + * New upstream version 4.1: + - New '-n' non-interactive option disables keyboard input + - EV_TRACE environment variable enables file system event tracing + - Track changes to the inode number as a workaround for missing delete + events on the Linux kernel + * Refresh kfreebsd-support.patch + + -- Otto Kekäläinen Tue, 21 Aug 2018 14:51:44 +0300 + +entr (4.0-1) unstable; urgency=medium + + * New upstream version 4.0: + - Warn instead of error if kqueue fails to register on STDIN + - Close STDIN before running the utility when the restart option is used + - Restore terminal settings if terminated by a signal + * Enable LFS using buildflags + * Use secure debian/copyright URL + * Check for upstream signature + * Migrate the debian packaging to salsa.debian.org (update VCS URLs) + * Standards-Version 4.1.3 (no changes needeed) + + -- Yuri D'Elia Sun, 25 Feb 2018 23:40:24 +0100 + +entr (3.9-1) unstable; urgency=medium + + * New upstream version 3.9: + - Handle 'q' and 'space' interactively + - Fix use of poll(2) to avoid possible busy-loop on Linux + - Disable keyboard input if reading STDIN fails + * Filter upstream tarball during import + * Standards-Version 4.1.1 (no changes needeed) + * Add support for GNU/kFreeBSD + + -- Yuri D'Elia Sun, 29 Oct 2017 14:29:49 +0100 + +entr (3.7-1) unstable; urgency=low + + * New upstream version 3.7: + - Terminate subprocess in restart mode if a file under watch disappears + - Allow NOTE_ATTRIB to set '/_' only if file mode changes + - New '-s' option executes commands using $SHELL -c + - Print usage and exit if input is from a terminal instead of a pipe + + -- Yuri D'Elia Tue, 14 Mar 2017 12:19:55 +0100 + +entr (3.6-1) unstable; urgency=low + + * Imported Upstream version 3.6 + * Standards-Version 3.9.8 (no changes needed) + * Switch Vcs-Git and Vcs-Browser to https + * Ship upstream changelog + + -- Yuri D'Elia Sun, 17 Jul 2016 19:40:49 +0200 + +entr (3.4-1) unstable; urgency=low + + * New upstream release 3.4 + + -- Yuri D'Elia Thu, 31 Dec 2015 10:41:07 +0100 + +entr (3.3-1) unstable; urgency=low + + * No-change upload to unstable + + -- Otto Kekäläinen Sun, 06 Dec 2015 20:52:35 +0200 + +entr (3.3-1~exp1) experimental; urgency=low + + * New upstream release (Closes: #788530) + - Refresh patch to match the end result the patch created in 2.6 + - Drop from patch libbsd-overlay hack for Makefile.linux to get + the program compiled. + + -- Otto Kekäläinen Sun, 29 Nov 2015 00:20:39 +0200 + +entr (2.6-1) unstable; urgency=low + + * Update to upstream 2.6: + - New '-c' flag to clear the screen. + - '/_' path replacement. + * Override upstream copy and use 'libbsd' overlay. + * Build support for kFreeBSD. + + -- Yuri D'Elia Wed, 29 Jan 2014 16:29:25 +0100 + +entr (2.5-1) unstable; urgency=low + + * Initial release (Closes: #733563) + + -- Yuri D'Elia Tue, 31 Dec 2013 18:23:31 +0100 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..ef80f3d --- /dev/null +++ b/debian/control @@ -0,0 +1,22 @@ +Source: entr +Section: misc +Priority: optional +Maintainer: Yuri D'Elia +Uploaders: Otto Kekäläinen +Build-Depends: debhelper-compat (= 13), + libbsd-dev, + pkg-config +Standards-Version: 4.5.1 +Rules-Requires-Root: no +Homepage: https://eradman.com/entrproject/ +Vcs-Git: https://salsa.debian.org/debian/entr.git +Vcs-Browser: https://salsa.debian.org/debian/entr + +Package: entr +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: Run arbitrary commands when files change + The Event Notify Test Runner (entr) runs arbitrary commands when + files change. Changes are detected through the kqueue/inotify + kernel interface. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..ee5b4dd --- /dev/null +++ b/debian/copyright @@ -0,0 +1,59 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: entr +Source: https://eradman.com/entrproject/ + +Files: * +Copyright: 2012, Eric Radman +License: ISC + +Files: missing/strlcpy.c +Copyright: 1998, Todd C. Miller +License: ISC + +Files: missing/fmemopen.c +Copyright: 2011, Martin Pieuchot + 2009, Ted Unangst +License: ISC + +Files: missing/sys/event.h +Copyright: 1999-2001, Jonathan Lemon +License: BSD-2-Clause + +Files: debian/* +Copyright: 2013, Yuri D'Elia +License: ISC + +License: ISC + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + . + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +License: BSD-2-Clause + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..8913f46 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +NEWS +README.md diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..338f35f --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,11 @@ +[DEFAULT] +# Ignore requirement to use branch name 'master' to make it easier +# for contributors to work with feature and bugfix branches +ignore-branch = True + +# Always use pristine tar +pristine-tar = True + +# Filter unwanted files from upstream tarball +[import-orig] +filter = ['.hg*'] diff --git a/debian/patches/kfreebsd-support.patch b/debian/patches/kfreebsd-support.patch new file mode 100644 index 0000000..45c93c1 --- /dev/null +++ b/debian/patches/kfreebsd-support.patch @@ -0,0 +1,26 @@ +Description: Support the hybrid GNU/kFreeBSD + Add support for the hybrid combination of kFreeBSD with the GNU libc, + which supports kqueue natively but still requires the libbsd overlay. +Author: Yuri D'Elia +Forwarded: not-needed +Updated: 2019-10-24 + +--- /dev/null ++++ b/Makefile.kfreebsd +@@ -0,0 +1,6 @@ ++PKG_CONFIG ?= pkg-config ++CFLAGS += -D_GNU_SOURCE $(shell $(PKG_CONFIG) --cflags libbsd-overlay) ++LDFLAGS += $(shell $(PKG_CONFIG) --libs libbsd-overlay) ++MANPREFIX ?= ${PREFIX}/share/man ++ ++include Makefile.bsd +--- a/configure ++++ b/configure +@@ -8,6 +8,7 @@ + case `uname` in + Darwin) copy_mk macos ;; + Linux) copy_mk linux ;; ++ GNU/kFreeBSD) copy_mk kfreebsd ;; + *) copy_mk bsd ;; + esac + diff --git a/debian/patches/libbsd-overlay.patch b/debian/patches/libbsd-overlay.patch new file mode 100644 index 0000000..5121e56 --- /dev/null +++ b/debian/patches/libbsd-overlay.patch @@ -0,0 +1,30 @@ +Description: Override upstream copy and use libbsd + Avoid using local copy of strlcpy, use the libbsd library in overlay mode + instead on our supported targets. +Author: Yuri D'Elia +Forwarded: not-needed +Updated: 2020-01-29 + +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -1,5 +1,7 @@ +-CPPFLAGS += -D_GNU_SOURCE -D_LINUX_PORT -Imissing ++PKG_CONFIG ?= pkg-config ++CFLAGS += -D_GNU_SOURCE -D_LINUX_PORT $(shell $(PKG_CONFIG) --cflags libbsd-overlay) -Imissing ++LDFLAGS += -lpthread $(shell $(PKG_CONFIG) --libs libbsd-ctor) + MANPREFIX ?= ${PREFIX}/share/man +-EXTRA_SRC = missing/strlcpy.c missing/kqueue_inotify.c ++EXTRA_SRC = missing/kqueue_inotify.c + + include Makefile.bsd +--- a/missing/compat.h ++++ b/missing/compat.h +@@ -4,7 +4,7 @@ + #define NOTE_TRUNCATE 0 + #endif + +-#if defined(_LINUX_PORT) && defined(__GLIBC__) ++#if defined(_LINUX_PORT) && defined(__GLIBC__) && !defined(LIBBSD_OVERLAY) + #include + size_t strlcpy(char *to, const char *from, int l); + #endif diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..70e5407 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +libbsd-overlay.patch +kfreebsd-support.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..39e7b9b --- /dev/null +++ b/debian/rules @@ -0,0 +1,26 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# Hardening +export DEB_BUILD_MAINT_OPTIONS=hardening=+all future=+lfs + +# Reimplement ./configure without relying on uname. +include /usr/share/dpkg/architecture.mk +ifeq (,$(filter linux kfreebsd,$(DEB_HOST_ARCH_OS))) +UPSTREAM_MAKEFILE=Makefile.bsd +else +UPSTREAM_MAKEFILE=Makefile.$(DEB_HOST_ARCH_OS) +endif + +# Rules +%: + dh $@ --buildsystem=makefile + +override_dh_auto_configure: + ln -sf $(UPSTREAM_MAKEFILE) Makefile + +override_dh_auto_install: + dh_auto_install -- PREFIX=/usr diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..181c297 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,4 @@ +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..f369f0a --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,3 @@ +Tests: smoke +Depends: entr +Restrictions: allow-stderr superficial diff --git a/debian/tests/smoke b/debian/tests/smoke new file mode 100755 index 0000000..f74ab3b --- /dev/null +++ b/debian/tests/smoke @@ -0,0 +1,10 @@ +#!/bin/sh +set -ex + +# dep8 smoke test for entr +# Author: Otto Kekäläinen +# +# This very simple test just checks that the binary starts and prints out +# the usage instructions, detected by keyword "usage". + +entr -h 2>&1 | grep usage diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..8ab6193 --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,51 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +pA== +=8H7j +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..545830e --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=4 +opts="pgpsigurlmangle=s%$%\.asc%" \ + https://eradman.com/entrproject/code/entr-(.*)\.tar\.gz