Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update & modernize Syncthing aport #1286

Closed
wants to merge 3 commits into from

Conversation

xentec
Copy link
Contributor

@xentec xentec commented Apr 20, 2017

Syncthing on Alpine has been stuck on version 0.14.5 for half a year now. In addition to a version update, I've added check(), but in disabled state as it unfortunately fails due to race in go depending glibc symbols (golang/go#14481).
From build log:

# runtime/race
race_linux_amd64.syso: In function `__sanitizer::InternalAlloc(unsigned long, __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 0ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 20ul, __sanitizer::TwoLevelByteMap<32768ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >*, unsigned long)':
gotsan.cc:(.text+0x1631): undefined reference to `__libc_malloc'
race_linux_amd64.syso: In function `__sanitizer::GetArgv()':
gotsan.cc:(.text+0x43c3): undefined reference to `__libc_stack_end'
race_linux_amd64.syso: In function `__sanitizer::InternalRealloc(void*, unsigned long, __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 0ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 20ul, __sanitizer::TwoLevelByteMap<32768ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >*)':
gotsan.cc:(.text+0x5580): undefined reference to `__libc_realloc'
race_linux_amd64.syso: In function `__sanitizer::ReExec()':
gotsan.cc:(.text+0x10337): undefined reference to `__libc_stack_end'
race_linux_amd64.syso: In function `__sanitizer::WriteOneLineToSyslog(char const*)':
gotsan.cc:(.text+0x4a97): undefined reference to `__syslog_chk'
race_linux_amd64.syso: In function `__sanitizer::InternalFree(void*, __sanitizer::SizeClassAllocatorLocalCache<__sanitizer::SizeClassAllocator32<0ul, 140737488355328ull, 0ul, __sanitizer::SizeClassMap<17ul, 64ul, 14ul>, 20ul, __sanitizer::TwoLevelByteMap<32768ull, 4096ull, __sanitizer::NoOpMapUnmapCallback>, __sanitizer::NoOpMapUnmapCallback> >*)':
gotsan.cc:(.text+0x55f8): undefined reference to `__libc_free'
collect2: error: ld returned 1 exit status

A patch for go/internals/race might be necessary to fix it.

Other than that I hope this PR will be accepted before Alpine 3.6.0. 😄

@jirutka jirutka added A-upgrade Upgrades an abuild A-improve Improves an abuild labels Apr 21, 2017
@shizmob
Copy link
Contributor

shizmob commented May 10, 2017

Could you add a || true to the tests so they at least get ran (and !check is not needed), and a short comment explaining that the race test is expected to fail? The rest LGTM!

@algitbot
Copy link

Merged in e15e54d by @shizmob. Thanks for your contribution!

(This pull request has been closed automatically by GitHub PR Closer. If you think that it’s not resolved yet, please add a comment.)

@algitbot algitbot closed this May 11, 2017
@xentec xentec deleted the syncthing-update branch May 11, 2017 14:27
@xentec xentec restored the syncthing-update branch May 19, 2017 14:02
@xentec xentec deleted the syncthing-update branch May 19, 2017 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-improve Improves an abuild A-upgrade Upgrades an abuild
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants