From 8b450615d0d33cca4d14c6abf59f893d13a1393a Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 10 May 2017 08:59:47 -0700 Subject: Commit Debian 3.0 (quilt) metadata [dgit (4.0) quilt-fixup] --- debian/patches/debian-changes | 102 ++---------------------------------------- 1 file changed, 4 insertions(+), 98 deletions(-) diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 495e591..ef61bcc 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -15,102 +15,8 @@ upload of upstream version 1.2.3, you could use: clone`.) A single combined diff, containing all the changes, follows. ---- debug-me-1.20170505.orig/CHANGELOG -+++ debug-me-1.20170505/CHANGELOG -@@ -1,3 +1,15 @@ -+debug-me (1.20170506) UNRELEASED; urgency=medium -+ -+ * Server: Use "postmaster" as default --from-email address -+ rather than "unknown@server". -+ * Server: DEBUG_ME_FROM_EMAIL can be used to specify the --from-email. -+ This is used in debug-me.default to encourage configuring it. -+ Thanks, Sean Whitton. -+ * Avoid crash when --use-server is given an url that does not -+ include a path. -+ -+ -- Joey Hess Tue, 09 May 2017 11:45:41 -0400 -+ - debug-me (1.20170505) unstable; urgency=medium - - * First release of debug-me. ---- debug-me-1.20170505.orig/Server.hs -+++ debug-me-1.20170505/Server.hs -@@ -33,6 +33,7 @@ import System.IO - import System.Directory - import System.Mem.Weak - import Network.Mail.Mime -+import System.Environment - - type ServerState = M.Map SessionID Session - -@@ -95,7 +96,9 @@ closeSession :: Session -> STM () - closeSession (Session bchan _ _) = closeTMChan bchan - - server :: ServerOpts -> IO () --server o = runSettings settings . app o =<< newServerState -+server o = do -+ o' <- checkEnv o -+ runSettings settings . app o' =<< newServerState - where - settings = - -- Prefer IPv6 but allow IPv4 as well -@@ -105,6 +108,12 @@ server o = runSettings settings . app o - setPort (serverPort o) $ - defaultSettings - -+checkEnv :: ServerOpts -> IO ServerOpts -+checkEnv o = go <$> lookupEnv "DEBUG_ME_FROM_EMAIL" -+ where -+ go Nothing = o -+ go (Just email) = o { serverEmail = Just (T.pack email) } -+ - app :: ServerOpts -> TVar ServerState -> Application - app o ssv = websocketsOr connectionOptions (websocketApp o ssv) webapp - where -@@ -262,7 +271,7 @@ emailSessionLog email o logfile - | otherwise = return () - where - to = Address Nothing email -- from = Address Nothing $ fromMaybe "unknown@server" (serverEmail o) -+ from = Address Nothing $ fromMaybe "postmaster" (serverEmail o) - subject = "Your recent debug-me session" - body = "Attached is the log from your recent debug-me session." - isemail = "@" `T.isInfixOf` email ---- debug-me-1.20170505.orig/WebSockets.hs -+++ debug-me-1.20170505/WebSockets.hs -@@ -144,7 +144,9 @@ runClientApp serverurl app = do - port = case uriPort serverauth of - (':':s) -> fromMaybe 80 (readMaybe s) - _ -> 80 -- endpoint = uriPath serverurl -+ endpoint = case uriPath serverurl of -+ [] -> "/" -+ p -> p - - catchconnclosed ConnectionClosed = Just () - catchconnclosed _ = Nothing ---- debug-me-1.20170505.orig/debug-me.1 -+++ debug-me-1.20170505/debug-me.1 -@@ -88,6 +88,8 @@ Specify a port for the debug-me server t - .IP "--from-email address" - The server will email session logs to users. It's a good idea to - provide a real email address, otherwise a dummy one will be used. -+You can also set the enviroment variable DEBUG_ME_FROM_EMAIL to configure -+this. - .IP "--delete-old-logs" - Normally the server will retain old log files so that users and developers - can refer to them. This option makes it delete the log file once the ---- debug-me-1.20170505.orig/debug-me.default -+++ debug-me-1.20170505/debug-me.default -@@ -1,2 +1,6 @@ -+# Configure the email address that debug-me uses when emailing logs to -+# users. -+DEBUG_ME_FROM_EMAIL=postmaster -+ - # Parameters to pass to debug-me when it's started as a daemon. - DAEMON_PARAMS="--server /var/log/debug-me/ --delete-old-logs" ---- debug-me-1.20170505.orig/debug-me.init -+++ debug-me-1.20170505/debug-me.init +--- debug-me-1.20170509.orig/debug-me.init ++++ debug-me-1.20170509/debug-me.init @@ -33,7 +33,7 @@ case "$1" in start-stop-daemon --start --quiet --oknodo \ --background --no-close \ @@ -120,8 +26,8 @@ A single combined diff, containing all the changes, follows. --exec "$DAEMON" -- $DAEMON_PARAMS \ > /var/log/debug-me.log log_end_msg $? ---- debug-me-1.20170505.orig/debug-me.service -+++ debug-me-1.20170505/debug-me.service +--- debug-me-1.20170509.orig/debug-me.service ++++ debug-me-1.20170509/debug-me.service @@ -8,8 +8,8 @@ EnvironmentFile=-/etc/default/debug-me ExecStart=/usr/bin/debug-me $DAEMON_PARAMS InaccessiblePaths=/home /etc -- cgit v1.2.3