```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
505 B
Diff
11 lines
505 B
Diff
--- a/src/bzfs/bzfs.cxx 2018-09-27 08:34:45.781489776 +0200
|
|
+++ b/src/bzfs/bzfs.cxx 2018-09-27 08:35:47.688492106 +0200
|
|
@@ -1312,7 +1312,7 @@
|
|
// accept incoming connection on our well known port
|
|
struct sockaddr_in clientAddr;
|
|
AddrLen addr_len = sizeof(clientAddr);
|
|
- int fd = accept(wksSocket, (struct sockaddr*)&clientAddr, &addr_len);
|
|
+ int fd = accept(wksSocket, (struct sockaddr*)&clientAddr, (socklen_t*)&addr_len);
|
|
if (fd == -1)
|
|
{
|
|
nerror("accepting on wks");
|