Date: Tuesday, July 14, 2015 @ 05:00:26 Author: bisson Revision: 242180
fix FS#45626 Added: conky/trunk/ipv6.patch Modified: conky/trunk/PKGBUILD ------------+ PKGBUILD | 5 ++++- ipv6.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-07-13 21:15:36 UTC (rev 242179) +++ PKGBUILD 2015-07-14 03:00:26 UTC (rev 242180) @@ -6,7 +6,7 @@ pkgname=conky pkgver=1.10.0 -pkgrel=3 +pkgrel=4 pkgdesc='Lightweight system monitor for X' url='http://conky.sourceforge.net/' license=('BSD' 'GPL') @@ -16,10 +16,12 @@ source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz"; 'ascii.patch' 'lua53.patch' + 'ipv6.patch' 'curl.patch') sha1sums=('d5863420150150002947180d0ee96c9ef56c43b1' '96cdbc38e8706c8a3120601983df5c7265716128' 'a3a74542b6524e5663ad37aaba292b48e8bea3b1' + 'a0899973483d0ad664b60e58b3ba899ba88712af' '1c066b439a1e7166d733fb710faa9bf08b81ce4c') options=('!strip' 'debug') @@ -28,6 +30,7 @@ cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../ascii.patch # db2x_manxml fails on non-ascii chars patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3 + patch -p1 -i ../ipv6.patch # https://bugs.archlinux.org/task/45626 patch -p1 -i ../curl.patch # https://github.com/bagder/curl/issues/342 } Added: ipv6.patch =================================================================== --- ipv6.patch (rev 0) +++ ipv6.patch 2015-07-14 03:00:26 UTC (rev 242180) @@ -0,0 +1,28 @@ +From ee08a9e1b045e8d2f4f13a0e60c2f603b66b0d69 Mon Sep 17 00:00:00 2001 +From: Marc Payne <[email protected]> +Date: Mon, 6 Jul 2015 02:51:43 -0600 +Subject: [PATCH] Close file only if it was successfully opened + +If BUILD_IPV6=ON (default), but the user has disabled ipv6 support +in the kernel using the parameter ipv6.disable=1, then conky fails +to open /proc/net/if_inet6. This leads to a segfault when conky +calls fclose(file) regardless. This fix simply moves the fclose call +into the preceding if statement. +--- + src/linux.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/linux.cc b/src/linux.cc +index 847acac..7977fee 100644 +--- a/src/linux.cc ++++ b/src/linux.cc +@@ -643,8 +643,8 @@ int update_net_stats(void) + } + lastv6->next = NULL; + } ++ fclose(file); + } +- fclose(file); + #endif /* BUILD_IPV6 */ + + first = 0;
