debug-me: update to 1.20190926

This commit is contained in:
slotThe 2020-03-31 13:30:11 +02:00 committed by q66
parent 2c96fbf27a
commit 9ac7d747f5
4 changed files with 27 additions and 15 deletions

View file

@ -1,8 +1,9 @@
packages:
- '.'
resolver: lts-14.1
resolver: lts-15.4
extra-deps:
- posix-pty-0.2.1.1
- graphviz-2999.20.0.3
- sandi-0.5
- protobuf-0.2.1.3@sha256:d8ed3c73027c6b7e7583c6a94ee1835beee8a755a875b06bbf51bc667d53ab69,3048
allow-newer: true

View file

@ -0,0 +1,22 @@
--- Val.hs 2020-03-31 11:00:33.329814064 +0200
+++ Val.hs 2020-03-31 11:00:24.602711845 +0200
@@ -42,7 +42,7 @@
b64 :: B.ByteString -> T.Text
b64 = T.decodeUtf8 . B64.encode
-unb64 :: Monad m => T.Text -> m B.ByteString
+unb64 :: MonadFail m => T.Text -> m B.ByteString
unb64 t = either
(\_ -> fail "bad base64 data")
return
--- Server.hs 2020-03-31 12:53:45.860509650 +0200
+++ Server.hs 2020-03-31 12:52:34.873835069 +0200
@@ -105,7 +105,7 @@
-- (Workaround for
-- https://github.com/jaspervdj/websockets/issues/140)
setHost "*6" $
- setPort (serverPort o) $
+ setPort (CmdLine.serverPort o) $
defaultSettings
checkEnv :: ServerOpts -> IO ServerOpts

View file

@ -1,11 +0,0 @@
--- Role/User.hs
+++ Role/User.hs
@@ -247,7 +247,7 @@ getDeveloperMessage ichan ochan us now = maybe
getDeveloperMessage' :: MissingHashes (Message Entered) -> TMChan (Message Seen) -> TVar UserState -> POSIXTime -> STM Input
getDeveloperMessage' (MissingHashes wiremsg) ochan us now = do
st <- readTVar us
- Developer msg <- restoreHashes (userStateRecentActivity us) (MissingHashes (Developer wiremsg))
+ ~(Developer msg) <- restoreHashes (userStateRecentActivity us) (MissingHashes (Developer wiremsg))
case msg of
ControlMessage (Control (SessionKey spk _) _) -> do
let sigverifier = mkSigVerifier $ case spk of

View file

@ -1,7 +1,7 @@
# Template file for 'debug-me'
pkgname=debug-me
version=1.20181208
revision=3
version=1.20190926
revision=1
build_style=haskell-stack
makedepends="zlib-devel"
short_desc="Secure remote debugging"
@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
license="AGPL-3.0-or-later"
homepage="https://debug-me.branchable.com/"
distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz"
checksum=47cd1f5af1d32b2659c0991466f1ffec34b01211a663b8b0a51ebc2ecb49168b
checksum=bfce3ded4897a2939d68ae9082be30c34bc21bb5b44b744a4417cc87252e8195
nocross=yes # Can't yet cross compile Haskell
nopie_files="/usr/bin/debug-me"