changelog: Declare 1.2.1

debian/control: Add Rules-Requires-Root

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/control: Re-add missing build-dependency on fonts-dejavu

Fixes FTBFS, this time for sure!  See also #1002919.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/control: Add missing build-dependency on flex. Fixes FTBFS.  Report from Aurelien Jarno.  Closes: #1002914.

changelog: finalise 1.2.1~beta2

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Add missing full stops.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Document further changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/control: Bump Standards-Version

Have reviewed the upgrading checklist.  No changes were needed.

At some point supporting init script modes try-restart and status
would be nice, but it is not required.  (And I couldn't find good docs
for status.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/copyright: Mention /usr/share/common-licenses/GPL-3

As per
  https://lintian.debian.org/tags/copyright-not-using-common-license-for-gpl

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian: Use debhelper to generate maint scripts

Use #DEBHELPER#.  That generates all the necessary boilerplate - and
more modern boilerplate, too.  We need a new Pre-Depends on
init-system-helpers.

Addresses this lintian warning
  https://lintian.debian.org/tags/maintainer-script-lacks-debhelper-token

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Add "Old Changelog:" note to help parser

Fixes this lintian warning:
  https://lintian.debian.org/tags/syntax-error-in-debian-changelog

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/control: Fix debhelper build-depends version

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

init script: Source init-functions

This will supposely make some systemd things better, according to
  https://lintian.debian.org/tags/init.d-script-does-not-source-init-functions

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/rules: Use CURDIR not PWD

https://lintian.debian.org/tags/debian-rules-calls-pwd

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Document transfig fix

Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Categorise and tidy

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: Import info from gbp dch

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

overview diagram: Build as pdf, with a sensible page layout, rather than ps

Use SOURCE_DATE_EPOCH to squash the nonreproducible timestamp,
rather than seddery to delete it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Makefile: Remove obsolete dist target

We will generate release tarballs with `git-archive`.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

overview diagram: Manually strip date from fig2dev output

In aid of reproducibility.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

spec: Correct information about userv's authorship

Mention the contributors.  (Drop my email address here as it's awkward
to format otherwsixse.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

spec: Generate printable file as pdf via docbook

Prompted by the desire to make the build reproducible, which seems
unreasonably hard with debiandoc2ps.

This approach was suggested here as a workaround for another bug:
  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=285885#35

At some point we may want to do a one-off source conversion to
DocBook.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/control: Adding missing transfig dependency

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

copyright etc.: Fix my own email address

  git-grep -l 'ian@davenant' | xargs perl -i~ -pe 's/ian\@davenant/ijackson@chiark/g'

and then undo the change to debian/changelog.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

copyright: Add Matthew Vernon

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

copyright: Fix information in usage output

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

copyright: Update my date from 2017 to 2021

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

copyright: Simplify notices (manual part)

Remove dates and list of authors from most file headings.

After manual edits, regenerate lexer.l and lexer.c.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

copyright: Simplify notices (automatic part)

Remove dates and list of authors from most file headings.

  $ cat >b
   * userv is copyright Ian Jackson and other contributors.
   * See README for full authorship information.
  $ cat >a
   * userv is
   * Copyright 1996-2017 Ian Jackson <ian@davenant.greenend.org.uk>.
   * Copyright 2000      Ben Harris <bjh21@cam.ac.uk>
   * Copyright 2016-2017 Peter Benie <pjb1008@cam.ac.uk>
  $ git-grep -l 'Copyright 1996-2017 Ian Jackson' | A=$(cat a) B=$(cat b) xargs perl -i~ -pe 'BEGIN { $/=undef; }; s/\Q$ENV{A}\E/$ENV{B}/'
  $

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian: Build everything from actual sources

We rely on the upstream "maintainer-clean" target to purge the
upstream-shipped output files.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian: Switch to dh auto sequencer

We drop much code from debian/rules.  In particular, we now use the
upstream `make install` targets.  (As a side effect, we discovered
some bugs ion the upstream Makefile which have just been fixed in the
commits leading up to this one.)

Consequences for the generated binaries:

 * Upstream README is shipped as /usr/share/doc/userv/README,
   not README.upstream.  This seems conventional in Debian nowadays.
 * Control file md5sums are provided.
 * There is a new changelog symlink for changelog.Debian.gz.
 * We use the proper Debian debug information scheme.
 * We use different compiler flags, which will hopefully produce
   better hardening and better reproducibility.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

make install: Install default config files as examples too

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Makefile: Installation refactoring (5)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

make install: Do not pass -m to install -d; introduce INSTALL_DIR

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Makefile: Provide [un]install-docs

We provide "make docs", so it should be "install-docs", not
"install-doc".  Retain the old target for compatibility.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

gitignore: Move debian/ entries to debian/.gitignore

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Makefile: Installation refactoring (4)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

make install: Create bindir and sbindir if needed

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Installation: Honour DESTDIR

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Makefile: Installation refactoring (3)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Makefile: Installation refactoring (2)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Makefile: Installation refactoring (1)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

make install: Ship docs to /usr/share/doc/userv, not /usr/userv (!)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

make install: Ship manpages to /usr/share, not /usr, by default

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

autoconf: Rerun autogen.sh to update to modern autoconf

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

autoconf: Add a missing gitignore entry

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

autoconf: Add some missing quoting

This was always sailing rather close to the wind.  Empirically, it
causes things to break with modern autoconf.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

autoconf: Add autogen.sh

Nothing uses this yet

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

overview.ps: Regenerate (fig2dev from transfig 1:3.2.6a-2+deb9u3)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

regenerate lexer.c using flex 2.6.4-6.2

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

overlord: Explicitly ignore unwanted value from write

Ignoring an error here is consistent with the error handling from the
pevious write(sf,...).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Suppress some warnings about ignoring stderr write errors

Eg,
  servexec.c:239:5: warning: ignoring return value of ‘write’, declared with attribute warn_unused_result [-Wunused-result]

These are calls made while we are bombing out anyway.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

spec.sgml: Update builtin version number

This should normally be done as part of the release.  We do it now
because we're doing build system work and want this to not cause
spurious diffs.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: start 1.2.1~beta2

changelog: document changes and call it 1.2.1~beta1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

systemd service file: Put in upstream part of the source tree

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

systemd service file: Set KillMode

If userv is to spawn long-running processes, and it is desired that
they survive the restarting of userv, then we'll also need KillMode
set to process (rather than the default "control-group").

(From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939573#10)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

spec: Do not claim you can specify numeric id for service user

Closes: #989048
Reported-by: Ben Harris <bjh21@cam.ac.uk>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Provide a systemd service file in the source tree, but do not install it

This endeavours to do what the sysvinit file does - create
/var/run/userv iff necessary and start uservd -daemon.

Matthew's original patch in Debian #939573 also shipped this file in
the .deb.  I'm not sure what the benefit of that would be and it seems
to add more test complications, so for now I am leaving that part out.

Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Do not leak a harmless fd into the service program environment

I have double-checked and this fd is the other end of a socketpair
that the server closes immediately after it reads our byte, so this is
indeed purely a harmless leak.

Closes: #864876
Reported-by: Ben Harris <bjh21@cam.ac.uk>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/rules: Fix FTCBFS: Use host tools provided from dpkg

Use host tools provided from dpkg's buildtools.mk.

Closes: #985998
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

autopkgtests: Test persistence after restart

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

autopkgtests: Test user rc file

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

autopkgtests: Move much stuff into lib

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

autopkgtests: Banners in the test script

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

autopkgtests: Rename the test service

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

autopkgtests: wip, a test for non-root to non-root

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

autopkgtests: wip, an actual very simple test

Passes with
   autopkgtest -- qemu /path/to/buster.image

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

autopkgtests: wip

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

debian/compat: Bump to 12 (stretch-backports)

Checked the debdiff.  There are no changes.

Closes: #965858
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

changelog: start 1.2.1

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Declare fast forward from 1.1.1

[dgit --overwrite]

changelog: finalise 1.2.0

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Upgrade licence to GPLv3+.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

spec.sgml: Update for update copyright notices

Patch from Peter Benie.
* Specify #define YY_NO_INPUT, which avoids an unused function warning. Patch from Peter Benie.

Correct quoting of include-lookup directory.  Closes:#837391. (With new directives to somewhat ease backward-compatibility.)

Update some copyright notices.

Support `range' operator, as promised by the spec.  Closes:#686449. Bug and analysis from Mark Wooding.

spec.sgml: Correct docs for errors-push, which takes no filename.

Closes:#775852.

Use `%option nounput' rather than #define YY_NO_UNPUT.

Patch from Peter Benie, but modified.

Do not ignore errors from readdir.

Closes:#827408

Contribution from Peter Benie.

Parser fixes:
* Support `stdin', `stdout' and `stderr' in fd ranges, as promised by the spec.  Closes:#813005.

debian/rules: Honour dpkg-buildflags.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Upstream Makefiles: Honour XCFLAGS.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Debian packaging: Add some newer debian/ droppings to .gitignore.

changelog WIP

finalise changelog

userv (1.1.1) unstable; urgency=low

  * Include INIT INFO stanza in init script.
  * Draft support for `status' in init script, currently commented
    out pending inclusion into policy of firm specification.
  * Remove spec.ps on make clean.
  * Remove spec.ps and dh log on debian/rules clean.  (Use dh_clean.)
    (To repro bug: dpkg-buildpackage, debian/rules clean, git-ls-files -o)
  * Fix up some copyright messages.

[dgit import package userv 1.1.1]

include required-stop

copyright

draft initd status support

init info stanza

use dh_clean

wip vsn

wip fix clean

wip fix clean

finalise

packaging fixes

lintian fixes