diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-07-14 14:34:15 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-07-14 14:34:15 +0000 |
| commit | 65798fc55f1477913f38d8b6c8c153ba54e1f835 (patch) | |
| tree | bf186bfdd5fb9b0b1ec97c177c9700a17666f6a4 /core | |
| parent | 7c5a774b0d743940326528bc1d6b3102e5ae8210 (diff) | |
| download | aports-fcolista-65798fc55f1477913f38d8b6c8c153ba54e1f835.tar.bz2 aports-fcolista-65798fc55f1477913f38d8b6c8c153ba54e1f835.tar.xz | |
core/apk-tools: remove unused patches
Diffstat (limited to 'core')
| -rw-r--r-- | core/apk-tools/fd-leak.patch | 24 | ||||
| -rw-r--r-- | core/apk-tools/fd-leak2.patch | 30 |
2 files changed, 0 insertions, 54 deletions
diff --git a/core/apk-tools/fd-leak.patch b/core/apk-tools/fd-leak.patch deleted file mode 100644 index 5f6a55ff80..0000000000 --- a/core/apk-tools/fd-leak.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit bd6278fb28d1d87a58a591244fe1069aa4216a6f -Author: Natanael Copa <ncopa@alpinelinux.org> -Date: Tue May 26 14:12:02 2009 +0000 - - fetch: fix fd leak - - we should always close the in-stream, not only on failure. - -diff --git a/src/fetch.c b/src/fetch.c -index 9e0d930..f3c651b 100644 ---- a/src/fetch.c -+++ b/src/fetch.c -@@ -95,10 +95,10 @@ static int fetch_package(struct fetch_ctx *fctx, - } - - r = apk_istream_splice(is, fd, pkg->size, NULL, NULL); -+ is->close(is); - if (fd != STDOUT_FILENO) - close(fd); - if (r != pkg->size) { -- is->close(is); - apk_error("Unable to download '%s'", file); - unlink(file); - return -1; diff --git a/core/apk-tools/fd-leak2.patch b/core/apk-tools/fd-leak2.patch deleted file mode 100644 index 033bc0dc19..0000000000 --- a/core/apk-tools/fd-leak2.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 49c904c993d39cfac7d3373c66f5b910e755f203 -Author: Timo Teras <timo.teras@iki.fi> -Date: Thu Jun 11 13:03:10 2009 +0300 - - io: fix mmap bstream fd leak - - We need to close the fd on destruction. This is what the corresponding - istream variant does too. - -diff --git a/src/io.c b/src/io.c -index e0a9c9b..defbe46 100644 ---- a/src/io.c -+++ b/src/io.c -@@ -4,7 +4,7 @@ - * Copyright (C) 2008 Timo Teräs <timo.teras@iki.fi> - * All rights reserved. - * -- * This program is free software; you can redistribute it and/or modify it -+ * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. See http://www.gnu.org/ for details. - */ -@@ -257,6 +257,7 @@ static void mmap_close(void *stream, csum_t csum, size_t *size) - *size = mbs->size; - - munmap(mbs->ptr, mbs->size); -+ close(mbs->fd); - free(mbs); - } - |