diff -Nru debug-me-1.20170520/CHANGELOG debug-me-1.20170810/CHANGELOG --- debug-me-1.20170520/CHANGELOG 2017-05-20 21:31:39.000000000 +0000 +++ debug-me-1.20170810/CHANGELOG 2017-08-10 18:17:59.000000000 +0000 @@ -1,3 +1,10 @@ +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:36:30 -0400 + debug-me (1.20170520) unstable; urgency=medium * debug-me is available in Debian unstable. diff -Nru debug-me-1.20170520/debian/changelog debug-me-1.20170810/debian/changelog --- debug-me-1.20170520/debian/changelog 2017-07-20 14:41:58.000000000 +0000 +++ debug-me-1.20170810/debian/changelog 2017-08-10 19:56:41.000000000 +0000 @@ -1,14 +1,9 @@ -debug-me (1.20170520-1build2) artful; urgency=medium +debug-me (1.20170810-1) unstable; urgency=medium - * Rebuild against new GHC ABI. + * New upstream release. + * Bump std-ver to 4.0.1 (no changes required). - -- Gianfranco Costamagna Thu, 20 Jul 2017 16:41:58 +0200 - -debug-me (1.20170520-1build1) artful; urgency=medium - - * Rebuild against new GHC ABI. - - -- Gianfranco Costamagna Thu, 22 Jun 2017 19:53:21 +0200 + -- Sean Whitton Thu, 10 Aug 2017 15:56:41 -0400 debug-me (1.20170520-1) unstable; urgency=medium diff -Nru debug-me-1.20170520/debian/control debug-me-1.20170810/debian/control --- debug-me-1.20170520/debian/control 2017-05-22 19:58:47.000000000 +0000 +++ debug-me-1.20170810/debian/control 2017-08-10 18:33:12.000000000 +0000 @@ -6,7 +6,7 @@ dh-exec, ghc, libghc-aeson-dev (>= 0.11), - libghc-aeson-dev (<< 1.1), + libghc-aeson-dev (<< 1.3), libghc-async-dev (>= 2.1), libghc-cereal-dev (>= 0.5), libghc-cryptonite-dev (>= 0.20), @@ -35,7 +35,7 @@ libghc-wai-websockets-dev (>= 3.0), libghc-warp-dev (>= 3.2), libghc-websockets-dev (>= 0.9), -Standards-Version: 3.9.8 +Standards-Version: 4.0.1 Homepage: https://debug-me.branchable.com/ Vcs-Git: https://git.spwhitton.name/debug-me Vcs-Browser: https://git.spwhitton.name/debug-me diff -Nru debug-me-1.20170520/debian/patches/debian-changes debug-me-1.20170810/debian/patches/debian-changes --- debug-me-1.20170520/debian/patches/debian-changes 2017-07-20 14:41:58.000000000 +0000 +++ debug-me-1.20170810/debian/patches/debian-changes 2017-08-10 19:56:41.000000000 +0000 @@ -15,19 +15,8 @@ clone`.) A single combined diff, containing all the changes, follows. ---- debug-me-1.20170520.orig/debug-me.1 -+++ debug-me-1.20170520/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. ---- debug-me-1.20170520.orig/debug-me.init -+++ debug-me-1.20170520/debug-me.init +--- debug-me-1.20170810.orig/debug-me.init ++++ debug-me-1.20170810/debug-me.init @@ -33,7 +33,7 @@ case "$1" in start-stop-daemon --start --quiet --oknodo \ --background --no-close \ @@ -37,8 +26,8 @@ --exec "$DAEMON" -- $DAEMON_PARAMS \ > /var/log/debug-me.log log_end_msg $? ---- debug-me-1.20170520.orig/debug-me.service -+++ debug-me-1.20170520/debug-me.service +--- debug-me-1.20170810.orig/debug-me.service ++++ debug-me-1.20170810/debug-me.service @@ -8,8 +8,8 @@ EnvironmentFile=-/etc/default/debug-me ExecStart=/usr/bin/debug-me $DAEMON_PARAMS InaccessiblePaths=/home /etc diff -Nru debug-me-1.20170520/debug-me.1 debug-me-1.20170810/debug-me.1 --- debug-me-1.20170520/debug-me.1 2017-05-20 21:31:39.000000000 +0000 +++ debug-me-1.20170810/debug-me.1 2017-08-10 18:17:59.000000000 +0000 @@ -104,7 +104,7 @@ .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. diff -Nru debug-me-1.20170520/debug-me.cabal debug-me-1.20170810/debug-me.cabal --- debug-me-1.20170520/debug-me.cabal 2017-05-20 21:31:39.000000000 +0000 +++ debug-me-1.20170810/debug-me.cabal 2017-08-10 18:17:59.000000000 +0000 @@ -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 @@ , 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 -Nru debug-me-1.20170520/doc/bugs/fails_to_build_against_current_LTS_Haskell.mdwn debug-me-1.20170810/doc/bugs/fails_to_build_against_current_LTS_Haskell.mdwn --- debug-me-1.20170520/doc/bugs/fails_to_build_against_current_LTS_Haskell.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ debug-me-1.20170810/doc/bugs/fails_to_build_against_current_LTS_Haskell.mdwn 2017-08-10 18:17:59.000000000 +0000 @@ -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 diff -Nru debug-me-1.20170520/doc/comments.mdwn debug-me-1.20170810/doc/comments.mdwn --- debug-me-1.20170520/doc/comments.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ debug-me-1.20170810/doc/comments.mdwn 2017-08-10 18:17:59.000000000 +0000 @@ -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"]] diff -Nru debug-me-1.20170520/doc/faq.mdwn debug-me-1.20170810/doc/faq.mdwn --- debug-me-1.20170520/doc/faq.mdwn 2017-05-20 21:31:39.000000000 +0000 +++ debug-me-1.20170810/doc/faq.mdwn 2017-08-10 18:17:59.000000000 +0000 @@ -62,6 +62,12 @@ 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? diff -Nru debug-me-1.20170520/doc/news/version_1.20170520.mdwn debug-me-1.20170810/doc/news/version_1.20170520.mdwn --- debug-me-1.20170520/doc/news/version_1.20170520.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ debug-me-1.20170810/doc/news/version_1.20170520.mdwn 2017-08-10 18:17:59.000000000 +0000 @@ -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 diff -Nru debug-me-1.20170520/Makefile debug-me-1.20170810/Makefile --- debug-me-1.20170520/Makefile 2017-05-20 21:31:39.000000000 +0000 +++ debug-me-1.20170810/Makefile 2017-08-10 18:17:59.000000000 +0000 @@ -34,7 +34,7 @@ $(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 diff -Nru debug-me-1.20170520/stack.yaml debug-me-1.20170810/stack.yaml --- debug-me-1.20170520/stack.yaml 2017-05-20 21:31:39.000000000 +0000 +++ debug-me-1.20170810/stack.yaml 2017-08-10 18:17:59.000000000 +0000 @@ -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: diff -Nru debug-me-1.20170520/VirtualTerminal.hs debug-me-1.20170810/VirtualTerminal.hs --- debug-me-1.20170520/VirtualTerminal.hs 2017-05-20 21:31:39.000000000 +0000 +++ debug-me-1.20170810/VirtualTerminal.hs 2017-08-10 18:17:59.000000000 +0000 @@ -10,11 +10,11 @@ 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 diff -Nru debug-me-1.20170520/WebSockets.hs debug-me-1.20170810/WebSockets.hs --- debug-me-1.20170520/WebSockets.hs 2017-05-20 21:31:39.000000000 +0000 +++ debug-me-1.20170810/WebSockets.hs 2017-08-10 18:17:59.000000000 +0000 @@ -92,7 +92,7 @@ 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 @@ connectionOptions :: ConnectionOptions connectionOptions = defaultConnectionOptions -#if MIN_VERSION_websockets(0,10,0) +#if MIN_VERSION_websockets(0,11,0) -- Enable compression. { connectionCompressionOptions = PermessageDeflateCompression defaultPermessageDeflate