chiark / gitweb /
Ian Jackson [Wed, 14 Dec 2022 20:31:42 +0000 (20:31 +0000)]
test/capture-log: Fix error handling
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 14 Dec 2022 21:52:06 +0000 (21:52 +0000)]
tests: Fix check target
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 12 Dec 2022 19:32:14 +0000 (19:32 +0000)]
cargo: Fix some errors in the lockfile
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
squash! cargo: Fix some errors in the lockfile
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
squash! cargo: Fix some errors in the lockfile
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 28 Sep 2022 19:07:59 +0000 (20:07 +0100)]
Revert "Fix publish version"
This reverts commit
bfe741895a7a4859be4b0cdf2a4cdfcbe0e0e61a.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 28 Sep 2022 19:07:19 +0000 (20:07 +0100)]
Fix publish version
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 28 Sep 2022 18:56:55 +0000 (19:56 +0100)]
cargo metadata: Claim the licence is GPL
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 28 Sep 2022 18:54:58 +0000 (19:54 +0100)]
suggest cargo build as an alternative
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 28 Sep 2022 18:52:37 +0000 (19:52 +0100)]
metadata for 1.0
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 28 Sep 2022 18:34:05 +0000 (19:34 +0100)]
docs installation code
Copied some of the Makefile from my own code in the Otter Makefile.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 28 Sep 2022 18:22:33 +0000 (19:22 +0100)]
docs
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 27 Sep 2022 22:37:46 +0000 (23:37 +0100)]
Apply OpenSSL exception to files with psusan content
psusan (like PuTTY) is permissively licenced, and we upgraded the
licence when incorporating it, so this is fine.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 27 Sep 2022 22:37:20 +0000 (23:37 +0100)]
Apply OpenSSL exception to files with Eyre content
eyre is permissively licenced, and we upgraded the licence when
incorporating it, so this is fine.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 27 Sep 2022 22:37:04 +0000 (23:37 +0100)]
Apply OpenSSL exception to Hippotat files
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 27 Sep 2022 22:31:29 +0000 (23:31 +0100)]
OpenSSL exception as agreed, with new SPDX expression
Licence text approved by co-contributor Mark Wooding in personal
email.
DPDX expression roughly following
https://spdx.github.io/spdx-spec/v2.3/using-SPDX-short-identifiers-in-source-files/
which doesn't contemplate using LicenseRef for an exception, but I
think the meaning is clear, and it is useful to do it this way.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 17:52:55 +0000 (18:52 +0100)]
draft OpenSSL exception - not signed off yet!
Ian Jackson [Sun, 25 Sep 2022 17:44:16 +0000 (18:44 +0100)]
draft OpenSSL exception - not signed off yet!
Ian Jackson [Sun, 25 Sep 2022 17:19:49 +0000 (18:19 +0100)]
draft OpenSSL exception - not signed off yet!
Ian Jackson [Tue, 27 Sep 2022 22:26:18 +0000 (23:26 +0100)]
docs: install docs wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 27 Sep 2022 21:39:52 +0000 (22:39 +0100)]
docs: install docs wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 27 Sep 2022 21:22:42 +0000 (22:22 +0100)]
docs: install docs wip
The rune here built a thing.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 27 Sep 2022 21:22:27 +0000 (22:22 +0100)]
control: Add missing build-deps
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 27 Sep 2022 21:20:23 +0000 (22:20 +0100)]
Makefile: Fix very-clean target
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 27 Sep 2022 21:16:59 +0000 (22:16 +0100)]
use c_int from std::os::raw
The entry in std:ffi is MSRV 1.64 which is rather new!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 23:01:01 +0000 (00:01 +0100)]
docs: wip markdown
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 22:39:34 +0000 (23:39 +0100)]
docs: wip markdown
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 22:29:32 +0000 (23:29 +0100)]
update sha2 (sadly, API change)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 22:27:55 +0000 (23:27 +0100)]
update parking_lot (relaxedly)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 22:21:23 +0000 (23:21 +0100)]
cargo update
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 19:31:53 +0000 (20:31 +0100)]
config: Drop mention of DEFAULT here too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 19:13:57 +0000 (20:13 +0100)]
pidfile option
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 18:57:23 +0000 (19:57 +0100)]
print config value
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 18:44:52 +0000 (19:44 +0100)]
config: inspectable config keys
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 18:17:25 +0000 (19:17 +0100)]
config: Fix up some indent
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 17:33:39 +0000 (18:33 +0100)]
packaging: fix junk!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 17:17:37 +0000 (18:17 +0100)]
copyright: notice re formalities
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:55:04 +0000 (17:55 +0100)]
packaging: lintian
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:38:01 +0000 (17:38 +0100)]
packaging: lintian
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:31:21 +0000 (17:31 +0100)]
packaging: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:25:24 +0000 (17:25 +0100)]
packaging: fix init script user name (again)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:24:48 +0000 (17:24 +0100)]
packaging: move #DEBHELPER# to before we umask, just in case
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:21:19 +0000 (17:21 +0100)]
packaging: fix names of dh files
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:19:43 +0000 (17:19 +0100)]
packaging: make -doc be -common
It will contain the user.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:19:37 +0000 (17:19 +0100)]
packaging: fix init script adduser
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:19:11 +0000 (17:19 +0100)]
packaging: fix architectures
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:09:20 +0000 (17:09 +0100)]
packaging: move maint scripts
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:09:15 +0000 (17:09 +0100)]
packaging: remove old compat
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:04:06 +0000 (17:04 +0100)]
packaging: consolidate control
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 16:00:29 +0000 (17:00 +0100)]
packaging: consolidate changelog
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:59:39 +0000 (16:59 +0100)]
Rust changelog: Update version number
Before merging changelogs.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:58:57 +0000 (16:58 +0100)]
Consolidate copies of GPLv3
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:58:14 +0000 (16:58 +0100)]
Abolish old copy of DEVELOPER-CERTIFICATE
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:57:51 +0000 (16:57 +0100)]
PROTOCOL: Abolish old copy
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:57:16 +0000 (16:57 +0100)]
init script: Abolish old copy
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:56:27 +0000 (16:56 +0100)]
README.config: Move from old-python
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:56:06 +0000 (16:56 +0100)]
Replace COPYING with a symlink
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:54:19 +0000 (16:54 +0100)]
debian/copyright: Update for new licence
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:53:06 +0000 (16:53 +0100)]
Move debian/copyright from old-python
It needs some updating.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:52:35 +0000 (16:52 +0100)]
old-python: Delete copy of AGPL
It's GPLv3+ now.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:52:02 +0000 (16:52 +0100)]
old-python: Delete python code
We don't need this any more.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:48:37 +0000 (16:48 +0100)]
old-python: Relax licence from AGPLv3+ + CAFv2+ to GPLv3+
Have received confirmation from Mark Wooding, the other contributor,
that this is OK.
Have not yet updated all copyright notices.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:46:54 +0000 (16:46 +0100)]
Merge remote-tracking branch 'python/master' into old-python/
Merge into subdirectory. This retains the history. We will copy some
files and delete others.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:32:06 +0000 (16:32 +0100)]
init script: Talk of "main"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:30:40 +0000 (16:30 +0100)]
init script: Put in right package
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:30:21 +0000 (16:30 +0100)]
init script: Change default user to _hippotat
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:18:08 +0000 (16:18 +0100)]
init script: copy from python version
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 15:15:47 +0000 (16:15 +0100)]
daemon: drop some unneded allows
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 13:47:33 +0000 (14:47 +0100)]
daemon: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 13:36:01 +0000 (14:36 +0100)]
daemon: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 13:17:51 +0000 (14:17 +0100)]
daemon: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 12:35:13 +0000 (13:35 +0100)]
daemon: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 11:18:17 +0000 (12:18 +0100)]
daemon: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 11:12:55 +0000 (12:12 +0100)]
Fix two sets of copyright dates
git-grep 'Copyright.*2021 '
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 25 Sep 2022 11:12:02 +0000 (12:12 +0100)]
Update copyright dates
git-grep -l 'Copyright.* 2021 ' | xargs perl -i~ -pe 's{Copyright 2021 }{Copyright 2021-2022 }g'
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 24 Sep 2022 18:29:37 +0000 (19:29 +0100)]
syslog: printing level in messages
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 24 Sep 2022 18:19:27 +0000 (19:19 +0100)]
syslog: prep for printing level: Make a copy of the Record
This will provide us somewhere to add the level prefix.
No functional change yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 24 Sep 2022 18:07:27 +0000 (19:07 +0100)]
syslog: prep for printing level: Move max level handling
We're going to want to add a note to every message. It makes sense to
use the same wrapper struct and give it more of the functionality.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 24 Sep 2022 18:06:44 +0000 (19:06 +0100)]
syslog: prep for printing level: Move debug handling
We're going to want to add a note to every message. It makes sense to
use the same wrapper struct and give it more of the functionality.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 24 Sep 2022 18:04:58 +0000 (19:04 +0100)]
syslog: prep for printing level: Rename LogWrapper
We're going to want to add a note to every message. It makes sense to
use the same wrapper struct and give it more of the functionality.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Sep 2022 18:01:49 +0000 (19:01 +0100)]
syslog: Add syslog support
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Sep 2022 15:01:42 +0000 (16:01 +0100)]
packaging wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 18 Sep 2022 15:01:50 +0000 (16:01 +0100)]
Makefile: install target, and cargo wrangling
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 14 Sep 2022 09:56:13 +0000 (10:56 +0100)]
Makefile: clean: Do not run cargo clean by default
cargo clean isn't really the same thing. Building Rust is's so slow
we have to reuse cargo's cached builds.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 14 Sep 2022 09:41:44 +0000 (10:41 +0100)]
packaging wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 13 Sep 2022 13:21:08 +0000 (14:21 +0100)]
warning fixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 23:33:25 +0000 (00:33 +0100)]
work around lack of io::ErrorKind::IsADirectory
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 22:06:56 +0000 (23:06 +0100)]
wire tests into Makefile
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 22:06:09 +0000 (23:06 +0100)]
fix tests
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 21:58:07 +0000 (22:58 +0100)]
fix tests
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 21:48:09 +0000 (22:48 +0100)]
log capturing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 21:40:34 +0000 (22:40 +0100)]
update versions in lockfile too
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 21:28:05 +0000 (22:28 +0100)]
uml/run-test: Note that this is a decoy
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 21:24:52 +0000 (22:24 +0100)]
a passing test!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 20:30:21 +0000 (21:30 +0100)]
syn: enable extra-traits feature
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 19:53:38 +0000 (20:53 +0100)]
bump versions for publication of 0.0.1
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 18:51:56 +0000 (19:51 +0100)]
wip tests, but they don't work
UML trouble
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 17:58:45 +0000 (18:58 +0100)]
discussion of hardcoded backpressure constants
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 17:47:03 +0000 (18:47 +0100)]
rename a const
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 17:34:35 +0000 (18:34 +0100)]
early return deadlines
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 17:34:10 +0000 (18:34 +0100)]
downgrade a message (happens if client drops)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 22 Aug 2021 17:16:55 +0000 (18:16 +0100)]
wip, fixes, still no early return apparently
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
~ian / hippotat.git / log