b6bcd8cd34
* daemontools and dmraid is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
22 lines
684 B
Diff
22 lines
684 B
Diff
--- a/Val.hs 2020-03-31 11:00:33.329814064 +0200
|
|
+++ b/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
|
|
--- a/Server.hs 2020-03-31 12:53:45.860509650 +0200
|
|
+++ b/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
|