From 7b8a925a9c02b02e4af325f4ad210ae0be84938a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 20 May 2017 17:31:59 -0400 Subject: add news item for debug-me 1.20170520 --- doc/news/version_1.20170520.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/news/version_1.20170520.mdwn diff --git a/doc/news/version_1.20170520.mdwn b/doc/news/version_1.20170520.mdwn new file mode 100644 index 0000000..094f328 --- /dev/null +++ b/doc/news/version_1.20170520.mdwn @@ -0,0 +1,13 @@ +debug-me 1.20170520 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * debug-me is available in Debian unstable. + * gpg keyrings in /usr/share/debug-me/ will be checked + to see if a connecting person is a known developer of software + installed on the system, and so implicitly trusted already. + Software packages/projects can install keyrings to that location. + (Thanks to Sean Whitton for the idea.) + * make install installs /usr/share/debug-me/a\_debug-me\_developer.gpg, + which contains the key of Joey Hess. (stack and cabal installs don't + include this file because they typically don't install system-wide) + * debug-me.cabal: Added dependency on time. + * stack.yaml: Update to new posix-pty version."""]] \ No newline at end of file -- cgit v1.2.3 From 62a38315781fc9dce7e2a8affea69df605ade248 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 20 May 2017 17:38:07 -0400 Subject: add --- doc/faq.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/faq.mdwn b/doc/faq.mdwn index 6884ec0..10d6422 100644 --- a/doc/faq.mdwn +++ b/doc/faq.mdwn @@ -62,6 +62,12 @@ For this to work, you have to have a copy of the session log file. This is why the debug-me server will email it to you at the end of the session, to make sure you get a copy. +To verify a session log file, run: `debug-me --verify debug-me.log` +That will display the gpg key of the developer who was active in +that session, and verify the integrety of the log file. + +A debug-me log file can be replayed by running: `debug-me --reply debug-me.log` + ### For Developers #### What do I need to do to start using debug-me? -- cgit v1.2.3 From c403619d1539c54c0c4af6243359957e064af2e7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 21 May 2017 19:25:41 -0400 Subject: typo --- VirtualTerminal.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VirtualTerminal.hs b/VirtualTerminal.hs index 009f887..1edb061 100644 --- a/VirtualTerminal.hs +++ b/VirtualTerminal.hs @@ -10,11 +10,11 @@ import System.Directory import System.Process import System.Environment --- | Finds a virtual termianl program that looks like it will work +-- | Finds a virtual terminal program that looks like it will work -- to run a command with some parameters. -- -- Note that the parameters are exposed to the shell by some virtual --- termianls, but not by others. +-- terminals, but not by others. runInVirtualTerminal :: String -> String -> [String] -> IO (Maybe CreateProcess) runInVirtualTerminal title cmd params = do path <- getSearchPath -- cgit v1.2.3 From 3f6a0295c1f02f23b4d1d899a6a442dc75185d6b Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 22 May 2017 13:44:40 +0100 Subject: fix typo in manpage markup --- debug-me.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debug-me.1 b/debug-me.1 index 251e636..4640ff1 100644 --- a/debug-me.1 +++ b/debug-me.1 @@ -104,7 +104,7 @@ exits. .IP "~/.debug-me/log/remote/" When using debug-me to connect to a remote session, the session will be logged to here. -.UP "/usr/share/debug-me/keyring/*.gpg" +.IP "/usr/share/debug-me/keyring/*.gpg" When verifying a developer's gpg key, debug-me checks if it's listed in the keyrings in this directory, which can be provided by software installed on the computer. -- cgit v1.2.3 From 6ae3f0c25bbde16e59e76a2487e49a9cace56e58 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 May 2017 16:09:50 -0400 Subject: add --- doc/comments.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/comments.mdwn diff --git a/doc/comments.mdwn b/doc/comments.mdwn new file mode 100644 index 0000000..e19962b --- /dev/null +++ b/doc/comments.mdwn @@ -0,0 +1,9 @@ +[[!sidebar content=""" +[[!inline pages="comment_pending(*)" feedfile=pendingmoderation +description="comments pending moderation" show=-1]] +Comments in the [[!commentmoderation desc="moderation queue"]]: +[[!pagecount pages="comment_pending(*)"]] +"""]] + +Recent comments posted to this site: +[[!inline pages="comment(*)" template="comment"]] -- cgit v1.2.3 From 628ebfe1e5e2c098b6daccb7b9b439dccadacfd5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 12 Jul 2017 17:03:45 -0400 Subject: better way of finding stack built executable --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 01eaad3..00dc6ca 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ debug-me: $(BUILDER) build $(BUILDEROPTIONS); \ fi if [ "$(BUILDER)" = stack ]; then \ - ln -sf $$(find .stack-work/ -name debug-me -type f | grep build/debug-me/debug-me | tail -n 1) debug-me; \ + ln -sf $$(stack path --dist-dir)/build/debug-me/debug-me debug-me; \ else \ ln -sf dist/build/debug-me/debug-me debug-me; \ fi -- cgit v1.2.3 From f108549cc9d5d863a9eef161a09beb9d7f9c6b10 Mon Sep 17 00:00:00 2001 From: spwhitton Date: Mon, 24 Jul 2017 20:10:45 +0000 Subject: report bug --- doc/bugs/fails_to_build_against_current_LTS_Haskell.mdwn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/bugs/fails_to_build_against_current_LTS_Haskell.mdwn diff --git a/doc/bugs/fails_to_build_against_current_LTS_Haskell.mdwn b/doc/bugs/fails_to_build_against_current_LTS_Haskell.mdwn new file mode 100644 index 0000000..52b9faf --- /dev/null +++ b/doc/bugs/fails_to_build_against_current_LTS_Haskell.mdwn @@ -0,0 +1,15 @@ +debug-me fails to build against LTS 8.23: + + ... + [20 of 32] Compiling WebSockets ( WebSockets.hs, + dist/build/debug-me/debug-me-tmp/WebSockets.o ) + + WebSockets.hs:96:9: error: + `fromDataMessage' is not a (visible) method of class `WebSocketsData' + + WebSockets.hs:123:11: error: + Not in scope: `connectionCompressionOptions' + Makefile:29: recipe for target 'debug-me' failed + make[2]: *** [debug-me] Error 1 + +--spwhitton -- cgit v1.2.3 From 22bd67807e8eec78db8895d36fec39b7a8b4a3d0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Aug 2017 12:36:26 -0400 Subject: Fix build with websockets-0.10.0.0 which did not support compression. --- CHANGELOG | 6 ++++++ WebSockets.hs | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 65142bc..bbad328 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +debug-me (1.20170521) unstable; urgency=medium + + * Fix build with websockets-0.10.0.0 which did not support compression. + + -- Joey Hess Thu, 10 Aug 2017 12:35:44 -0400 + debug-me (1.20170520) unstable; urgency=medium * debug-me is available in Debian unstable. diff --git a/WebSockets.hs b/WebSockets.hs index 2a0eb40..c2fcb95 100644 --- a/WebSockets.hs +++ b/WebSockets.hs @@ -92,7 +92,7 @@ instance WebSocketsData WireProtocol where WireProtocolError (Data.Aeson.decode s) _ -> WireProtocolError "received unknown websocket message" -#if MIN_VERSION_websockets(0,10,0) +#if MIN_VERSION_websockets(0,11,0) fromDataMessage = fromLazyByteString . fromDataMessage #endif @@ -118,7 +118,7 @@ supportedWireVersions = [WireVersion "1"] connectionOptions :: ConnectionOptions connectionOptions = defaultConnectionOptions -#if MIN_VERSION_websockets(0,10,0) +#if MIN_VERSION_websockets(0,11,0) -- Enable compression. { connectionCompressionOptions = PermessageDeflateCompression defaultPermessageDeflate -- cgit v1.2.3 From 5cbb0a14e5413e3bf7835a48a38df1184129d0b6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Aug 2017 14:17:59 -0400 Subject: Update to lts-9.0. --- CHANGELOG | 5 +++-- debug-me.cabal | 4 ++-- stack.yaml | 4 +--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bbad328..b500a85 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,8 +1,9 @@ -debug-me (1.20170521) unstable; urgency=medium +debug-me (1.20170810) unstable; urgency=medium * Fix build with websockets-0.10.0.0 which did not support compression. + * Update to lts-9.0. - -- Joey Hess Thu, 10 Aug 2017 12:35:44 -0400 + -- Joey Hess Thu, 10 Aug 2017 12:36:30 -0400 debug-me (1.20170520) unstable; urgency=medium diff --git a/debug-me.cabal b/debug-me.cabal index aa8f0fe..a601e34 100644 --- a/debug-me.cabal +++ b/debug-me.cabal @@ -1,5 +1,5 @@ Name: debug-me -Version: 1.20170510 +Version: 1.20170810 Cabal-Version: >= 1.8 Maintainer: Joey Hess Author: Joey Hess @@ -60,7 +60,7 @@ Executable debug-me , stm-chans (>= 3.0) , posix-pty (>= 0.2.1) , terminal-size (>= 0.3) - , aeson (>= 0.11 && < 1.1) + , aeson (>= 0.11 && < 1.3) , sandi (>= 0.4) , text (>= 1.2.2) , optparse-applicative (>= 0.12) diff --git a/stack.yaml b/stack.yaml index abbdc98..a1a2869 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,7 +1,5 @@ packages: - '.' -resolver: lts-8.12 +resolver: lts-9.0 extra-deps: -- posix-pty-0.2.1.1 -- websockets-0.11.1.0 explicit-setup-deps: -- cgit v1.2.3