Merge pull request #148571 from trofi/fix-zookeeper

rubyPackages.zookeeper: drop outdated patch
This commit is contained in:
Jörg Thalheim 2021-12-04 13:31:23 +00:00 committed by GitHub
commit 7ad5852d49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 17 deletions

View file

@ -676,11 +676,5 @@ in
zookeeper = attrs: { zookeeper = attrs: {
buildInputs = lib.optionals stdenv.isDarwin [ cctools ]; buildInputs = lib.optionals stdenv.isDarwin [ cctools ];
dontBuild = false;
postPatch = ''
sed -i ext/extconf.rb -e "4a \
FileUtils.cp '${./zookeeper-ftbfs-with-gcc-8.patch}', 'patches/zkc-3.4.5-gcc-8.patch'
"
'';
}; };
} }

View file

@ -1,11 +0,0 @@
--- zkc-3.4.5/c/src/zookeeper.c 2019-09-13 12:05:20.647034862 +0200
+++ zkc-3.4.5/c/src/zookeeper.c 2019-09-13 12:05:49.125360269 +0200
@@ -3418,7 +3418,7 @@
static const char* format_endpoint_info(const struct sockaddr_storage* ep)
{
- static char buf[128];
+ static char buf[128 + 6]; // include space for the port :xxxxxx
char addrstr[128];
void *inaddr;
#ifdef WIN32