4b97cd2fb4
```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
```
11 lines
528 B
Diff
11 lines
528 B
Diff
--- a/go/channelling/server/users.go 2018-01-15 14:20:19.997694620 +0100
|
|
+++ b/go/channelling/server/users.go 2018-01-15 14:20:41.151902026 +0100
|
|
@@ -456,7 +456,7 @@ func (users *Users) Post(request *http.R
|
|
}
|
|
|
|
// Do this before session validation to avoid timing information.
|
|
- userid := fmt.Sprintf("%s@%s", uuid.NewV4().String(), users.realm)
|
|
+ userid := fmt.Sprintf("%s@%s", uuid.Must(uuid.NewV4()).String(), users.realm)
|
|
|
|
// Make sure Sid matches session and is valid.
|
|
if !users.ValidateSession(snr.Id, snr.Sid) {
|