src/eve.c | 33 14 + 19 - 0 !
1 file changed, 14 insertions(+), 19 deletions(-)

 fix cve-2011-3616; avoid rewriting an arbitrary user file
 The getSkillname function in the eve module in Conky 1.8.1 and earlier allows
 local users to overwrite arbitrary files via a symlink attack on /tmp/.cesf.
 Although this has been patched in upstream git, the latest stable Conky
 releases (including 1.9.0) have not been patched upstream and thus still seem
 to be vulnerable.

src/freebsd.c | 4 0 + 4 - 0 !
1 file changed, 4 deletions(-)

 fix ftbfs on kfreebsd
 freebsd.c:287:11: error: 'struct kinfo_proc' has no member named 'kp_proc'

src/apcupsd.c | 57 30 + 27 - 0 !
src/apcupsd.h | 2 1 + 1 - 0 !
2 files changed, 31 insertions(+), 28 deletions(-)

 fix broken apcupsd support in conky 1.8.1
 Revert apcupsd-related code to Conky 1.8.0 in order to fix broken apcupsd
 support. This is a workaround until upstream properly addresses this issue.