mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 13:27:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/varnish: remove calloc patch

Browse Source
This commit is contained in:
tcely 2018-03-17 23:26:19 -04:00 committed by Jakub Jirutka
parent 75fd073337
commit 2690eafd74
2 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/varnish/APKBUILD
View File

@ -18,7 +18,6 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-geoip
pkgusers="varnish"
pkggroups="varnish"
source="http://varnish-cache.org/_downloads/$pkgname-$pkgver.tgz
fix-stack-overflow.patch
musl-include-vpf.patch
musl-include-vsb.patch
@ -101,7 +100,6 @@ geoip() {
}
sha512sums="39bae462fe40bda9b7c93114ab8256c838a7d67f1a9f7397c37ad090163a33232676120eb7609d0512684a563d8e02c1c2ff5e1b9da0ddedef2250db51c3cc79 varnish-6.0.0.tgz
19d2ef52aaecadec42505b52a7bb683f52c9de1186180c0b02afc6a1044127a39c0468470563e7f248ed93b0e45d279adfebf35e78c49f4b79e1dfb5a15b0f46 fix-stack-overflow.patch
2123668169b055f2d88f9b5b8e0877ca8b3cbfcd61e03d91fd7d0513b3267e4ef01a4d858cc6a3298cca0a49aaea2f92ff4fd9c0baf52a6c67b452a53f7e54d0 musl-include-vpf.patch
c51c8964880990c2b01807b2a38d886b146736a918bda9ea2e032c50085bf6745cab3cccb4ee4c561ab936a8b7cfb278cfcb758543ea6c605c15b8973c9f10ce musl-include-vsb.patch
5ac7867e85cbd721f903c524ed4b524423d9dada4acfeefb0e543214a208828df5cc4efe2f012991bea6b38c2b223c24b17d3890ec4ed2c57d2b441b8e5a6900 varnishd.initd

29
main/varnish/fix-stack-overflow.patch
View File

@ -1,29 +0,0 @@
--- ./bin/varnishd/waiter/cache_waiter_epoll.c.orig
+++ ./bin/varnishd/waiter/cache_waiter_epoll.c
@@ -68,7 +68,7 @@
static void *
vwe_thread(void *priv)
{
- struct epoll_event ev[NEEV], *ep;
+ struct epoll_event *ev, *ep;
struct waited *wp;
struct waiter *w;
double now, then;
@@ -80,6 +80,9 @@
w = vwe->waiter;
CHECK_OBJ_NOTNULL(w, WAITER_MAGIC);
THR_SetName("cache-epoll");
+ ev = calloc(NEEV, sizeof(struct epoll_event));
+ assert(ev != NULL);
+
THR_Init();
now = VTIM_real();
@@ -148,6 +151,7 @@
closefd(&vwe->pipe[0]);
closefd(&vwe->pipe[1]);
closefd(&vwe->epfd);
+ free(ev);
return (NULL);
}