From ed35758291d2d3350a5059b084af5865b7321c18 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 20 Jun 2012 16:09:42 +0200 Subject: [PATCH] kmod: update to 9. --- ...e-gracefully-handle-errors-from-zlib.patch | 34 ------------------- ...d-report-failures-in-loading-symbols.patch | 33 ------------------ srcpkgs/kmod/template | 4 +-- 3 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 srcpkgs/kmod/patches/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch delete mode 100644 srcpkgs/kmod/patches/0002-depmod-report-failures-in-loading-symbols.patch diff --git a/srcpkgs/kmod/patches/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch b/srcpkgs/kmod/patches/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch deleted file mode 100644 index cf0bbe43f0..0000000000 --- a/srcpkgs/kmod/patches/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c7d5a60d3df735a3816bbc1ff1b416a803a4f7a6 Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Mon, 7 May 2012 19:41:41 -0400 -Subject: [PATCH 1/2] libkmod-file: gracefully handle errors from zlib - -zlib won't necessarily set the system errno, and this is particularly -evident on corrupted data (which results in a double free). Use zlib's -gzerror to detect the failure, returning a generic EINVAL when zlib -doesn't provide us with an errno. ---- - libkmod/libkmod-file.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c -index 46ad8d9..8beb7e3 100644 ---- libkmod/libkmod-file.c -+++ libkmod/libkmod-file.c -@@ -199,7 +199,13 @@ static int load_zlib(struct kmod_file *file) - if (r == 0) - break; - else if (r < 0) { -- err = -errno; -+ int gzerr; -+ const char *gz_errmsg = gzerror(file->gzf, &gzerr); -+ -+ ERR(file->ctx, "gzip: %s\n", gz_errmsg); -+ -+ /* gzip might not set errno here */ -+ err = gzerr == Z_ERRNO ? -errno : -EINVAL; - goto error; - } - did += r; --- -1.7.10.1 diff --git a/srcpkgs/kmod/patches/0002-depmod-report-failures-in-loading-symbols.patch b/srcpkgs/kmod/patches/0002-depmod-report-failures-in-loading-symbols.patch deleted file mode 100644 index 4046a61877..0000000000 --- a/srcpkgs/kmod/patches/0002-depmod-report-failures-in-loading-symbols.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 819f79a24d58e3c8429f1631df2f8f85a2f95d4a Mon Sep 17 00:00:00 2001 -From: Dave Reisner -Date: Mon, 7 May 2012 19:41:42 -0400 -Subject: [PATCH 2/2] depmod: report failures in loading symbols - -Previously, depmod would relegate failures of kmod_module_get_symbols() -to debug output, assuming the "error" was simply a lack of symbols. -Leave the ENOENT return to debug output, but report anything else as a -real error. ---- - tools/kmod-depmod.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c -index e89dff6..bceb407 100644 ---- tools/kmod-depmod.c -+++ tools/kmod-depmod.c -@@ -1542,8 +1542,11 @@ static int depmod_load_symbols(struct depmod *depmod) - struct kmod_list *l, *list = NULL; - int err = kmod_module_get_symbols(mod->kmod, &list); - if (err < 0) { -- DBG("ignoring %s: no symbols: %s\n", -- mod->path, strerror(-err)); -+ if (err == -ENOENT) -+ DBG("ignoring %s: no symbols\n", mod->path); -+ else -+ ERR("failed to load symbols from %s: %s\n", -+ mod->path, strerror(-err)); - continue; - } - kmod_list_foreach(l, list) { --- -1.7.10.1 diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template index d64a27da6b..61959e3d4c 100644 --- a/srcpkgs/kmod/template +++ b/srcpkgs/kmod/template @@ -1,6 +1,6 @@ # Template file for 'kmod' pkgname=kmod -version=8 +version=9 revision=1 homepage="http://git.profusion.mobi/cgit.cgi/kmod.git" distfiles="${KERNEL_SITE}/utils/kernel/kmod/kmod-${version}.tar.xz" @@ -13,7 +13,7 @@ subpackages="libkmod libkmod-devel" short_desc="Linux kernel module handling" maintainer="Juan RP " license="GPL-2" -checksum=35f7d1dfcf62ea3d6da1ed0ee41a7997333680033609c5e9658f4fe8d997734d +checksum=0607267cb62dbc9009d0719f442a56f97f64d9983e20dbcaedfff9073abdcecf long_desc=" kmod is a set of tools to handle common tasks with Linux kernel modules like insert, remove, list, check properties, resolve dependencies and aliases.