summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2017-08-10 14:24:24 -0400
committerSean Whitton <spwhitton@spwhitton.name>2017-08-10 14:24:24 -0400
commit0c245290968dcc14f925c0f05c5c2f4ed1a70a54 (patch)
tree5165874e622a1fba7d173a8c8ea424a38da711ee
parent3b792db55d06c97ee632781fbafffe29f45089c1 (diff)
parent5cbb0a14e5413e3bf7835a48a38df1184129d0b6 (diff)
downloaddebug-me-0c245290968dcc14f925c0f05c5c2f4ed1a70a54.tar.gz
Merge tag '1.20170810'
tagging package debug-me version 1.20170810 # gpg: Signature made Thu 10 Aug 2017 02:18:04 PM EDT # gpg: using RSA key 28A500C35207EAB72F6C0F25DB12DB0FF05F8F38 # gpg: Good signature from "Joey Hess <joeyh@joeyh.name>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: E85A 5F63 B31D 24C1 EBF0 D81C C910 D922 2512 E3C7 # Subkey fingerprint: 28A5 00C3 5207 EAB7 2F6C 0F25 DB12 DB0F F05F 8F38
-rw-r--r--CHANGELOG7
-rw-r--r--Makefile2
-rw-r--r--VirtualTerminal.hs4
-rw-r--r--WebSockets.hs4
-rw-r--r--debug-me.cabal4
-rw-r--r--doc/bugs/fails_to_build_against_current_LTS_Haskell.mdwn15
-rw-r--r--doc/comments.mdwn9
-rw-r--r--doc/faq.mdwn6
-rw-r--r--doc/news/version_1.20170520.mdwn13
-rw-r--r--stack.yaml4
10 files changed, 58 insertions, 10 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 65142bc..b500a85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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 <id@joeyh.name> Thu, 10 Aug 2017 12:36:30 -0400
+
debug-me (1.20170520) unstable; urgency=medium
* debug-me is available in Debian unstable.
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
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
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
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 <joey@kitenet.net>
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/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
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"]]
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?
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
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: