# ChangeLog for app-admin/conky
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.165 2011/08/06 23:14:18 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.166 2011/10/13 18:45:04 billie Exp $
+
+ 13 Oct 2011; Daniel Pielmeier <billie@gentoo.org> -conky-1.8.0-r1.ebuild,
+ -files/conky-1.8.0-audacious-2.3.patch, -files/conky-1.8.0-ncurses.patch:
+ Remove vulnerable version, bug #354061.
06 Aug 2011; Daniel Pielmeier <billie@gentoo.org> conky-1.8.0-r1.ebuild,
conky-1.8.1-r2.ebuild, +files/conky-1.8.1-maxinterfaces.patch:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX conky-1.8.0-audacious-2.3.patch 595 RMD160 5ce471fc07a8f8dfe85e0b74f5ffc18a71ebef25 SHA1 d44055c6b4878b189cd5555747611d444cca3b25 SHA256 41ba5c1934992116b792e399064e1d517b7715b5338b8f9d782a0c7dfd96ea52
-AUX conky-1.8.0-ncurses.patch 4359 RMD160 deb00ff8338881bf97a8ed26aeb6cdb3d53c0a07 SHA1 13dd57185c5ab8118cf2ca9c7e86222b9dc4e166 SHA256 9ac58ffcebe10447ac0255a5e7c569d1f22ddb3f6b1a1b8b0854e55d781c6f59
AUX conky-1.8.1-acpitemp.patch 2415 RMD160 dcef233f8ba2ca192bfac3b16f0c671e1381fffe SHA1 d5000bfdddb134c4cd61e90e8bcc3bce5866c33c SHA256 57815044cd972139171b76e75267792821c783e03537eb6cf7ba8105c46cdf8d
AUX conky-1.8.1-curl-headers.patch 494 RMD160 26c0e9060991a9ece1e38a552da828109566daa3 SHA1 0cb58b354bbd91a44af183e4ac7022246843552d SHA256 53ff30aa933163a1feb646720ea21b4727d515e33521ac53e77b8bd9d0473eba
AUX conky-1.8.1-maxinterfaces.patch 720 RMD160 85a267900576b3e80d0e7f55ce3ac454383a5d79 SHA1 528e8547fcecd64bd82ba8e2f6249655fd78ab91 SHA256 e732dee459cf0e9901f65af1b2c322d526b8a22f55229c68152d2ab38acd2ad4
AUX conky-1.8.1-nvidia-x.patch 883 RMD160 f6e85e117ba5b895ba23db0d6e4160a0c0141c21 SHA1 1e3dc3f2a8e44d62e25ab2ab22726e0e91ecf666 SHA256 290ffdf4094167715bf11b86ee2cf73574a3af32ffb50fa09517d89c56bc0853
AUX conky-1.8.1-secunia-SA43225.patch 1620 RMD160 3206a288819bc33048d9eee2444308b04b25fc1b SHA1 7c88144711911a6b38465311c7cf8cf6b0e6d45f SHA256 61c2d204796f51d0d51cd62e9a37a9f4f318e8fe8f955278ef86b64d5b2ff99f
AUX conky-1.8.1-xmms2.patch 1190 RMD160 6ec093e08f55c198b5b2321acc7f3d1d7f74e267 SHA1 0e05fe363521145bde14eca99d3aebc28e258833 SHA256 1b64047f04239dbf24b3171fcd8d5c950e9f8aa6af5e94cd4836cd14c70e2bdc
-DIST conky-1.8.0.tar.bz2 610545 RMD160 5ea6accf73e1d41ebe8390722a53ae50e0c23df8 SHA1 eef214c2917ea5666d24f03128b12d00fa313b58 SHA256 badb3824a9655eee90281939df8bdb3ca95cf8bab03269b3b3775bfea2ed0a51
DIST conky-1.8.1.tar.bz2 612481 RMD160 f3203131e2d8f3756eb29f5c5a9034b9c269fdc6 SHA1 9581419b1a53a8a7e37b0291cd4e55ab166d221a SHA256 f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43
-EBUILD conky-1.8.0-r1.ebuild 4060 RMD160 e4f5a72c42f590a99eada7cfaa916f46fa9ca6e9 SHA1 0c8c3f9b6936cb932b2345dc26a65dcab372f0d4 SHA256 1690f1a684660c78a24cd57b20e804db21109e45274e077deaa91b5fc03893db
EBUILD conky-1.8.1-r2.ebuild 4080 RMD160 f9ad842b52ade41f3955398a654ea79a3c031574 SHA1 fa0f0755ec0b528acb8f7ac298a8feee47cd7854 SHA256 5350840bc4c00bfa8c778fa8d2642981aa196c43368955cb3e3d7efe675af364
-MISC ChangeLog 25173 RMD160 9ea5eb446da1fec5d79ab4a6b14be9cd0efdfe93 SHA1 2b903ff7811a8a57a1431ad094ca090cc5992200 SHA256 e5ccabf21e9496dbfe8d1a5fed8f3b0c14f16f619c2987a50c1bd66ab0749dbd
+MISC ChangeLog 25368 RMD160 e4975ba2e8274776cc7cced88306c05a69594683 SHA1 c9aac7232a62d46565ded6c25985dc4def6d3318 SHA256 c013b7cad7088eeead74d243a03f269332f04f3c011887895c0028f53d9b75d6
MISC metadata.xml 2035 RMD160 c4c5aca3e9d74df22ceec820eab9b1f25798cdb0 SHA1 791f5991269e7d531c11c3f9eeb784607a3730b0 SHA256 7629c0d86a74d086f1b9934919881b5ee82c285e94d58d4a802694633ea11302
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iJwEAQEIAAYFAk589RMACgkQfXuS5UK5QB1kdAP7BILDgH6tlqKdrBVifpwMLaVT
-nipPoNcbKC40Zd/p9TXr+T6EcP/yWf3eM0gKRmV1XB+ALeSmFymAZQD+HChSKRGe
-w/EO7l7RUmqvkACe8755a+b8SHoCk18113i7wyPy+WvXo1NWKAbkThE/I8yD0fuj
-KSi+qCBb8hapER7kOzk=
-=qPmV
+iEYEAREIAAYFAk6XMdAACgkQlcuUeyFa0U1AfgCdFVCu/HGLTZJpDkYp1zIGHgOT
+c3IAoNY+Kl2y3EFR3GAQztDKMx4FnLWk
+=uvYF
-----END PGP SIGNATURE-----
+++ /dev/null
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r1.ebuild,v 1.10 2011/08/06 23:14:18 billie Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="http://conky.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="apcupsd audacious curl debug eve hddtemp imlib iostats lua lua-cairo lua-imlib math moc mpd nano-syntax ncurses nvidia +portmon rss thinkpad truetype vim-syntax weather-metar weather-xoap wifi X"
-
-DEPEND_COMMON="
- X? (
- imlib? ( media-libs/imlib2 )
- lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
- lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 )
- nvidia? ( media-video/nvidia-settings )
- truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXext
- )
- audacious? ( >=media-sound/audacious-1.5 dev-libs/glib )
- curl? ( net-misc/curl )
- eve? ( net-misc/curl dev-libs/libxml2 )
- portmon? ( dev-libs/glib )
- lua? ( >=dev-lang/lua-5.1 )
- ncurses? ( sys-libs/ncurses )
- rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib )
- wifi? ( net-wireless/wireless-tools )
- weather-metar? ( net-misc/curl )
- weather-xoap? ( dev-libs/libxml2 net-misc/curl )
- virtual/libiconv
- "
-RDEPEND="
- ${DEPEND_COMMON}
- apcupsd? ( sys-power/apcupsd )
- hddtemp? ( app-admin/hddtemp )
- moc? ( media-sound/moc )
- nano-syntax? ( app-editors/nano )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
- "
-DEPEND="
- ${DEPEND_COMMON}
- dev-util/pkgconfig
- "
-
-src_prepare() {
- epatch "${FILESDIR}/conky-1.8.0-ncurses.patch" \
- "${FILESDIR}/conky-1.8.0-audacious-2.3.patch" \
- "${FILESDIR}/${PN}-1.8.1-curl-headers.patch" \
- "${FILESDIR}/${PN}-1.8.1-maxinterfaces.patch"
- eautoreconf
-}
-
-src_configure() {
- local myconf
- if use X; then
- myconf="--enable-x11 --enable-double-buffer --enable-xdamage --enable-argb"
- myconf="${myconf} --enable-own-window"
- myconf="${myconf} $(use_enable imlib imlib2) $(use_enable lua-cairo)"
- myconf="${myconf} $(use_enable lua-imlib lua-imlib2)"
- myconf="${myconf} $(use_enable nvidia) $(use_enable truetype xft)"
- else
- myconf="--disable-x11 --disable-own-window --disable-argb"
- myconf="${myconf} --disable-imlib --disable-lua-cairo --disable-lua-imlib"
- myconf="${myconf} --disable-nvidia --disable-xft"
- fi
-
- econf \
- ${myconf} \
- $(use_enable apcupsd) \
- $(use_enable audacious) \
- $(use_enable curl) \
- $(use_enable debug) \
- $(use_enable eve) \
- $(use_enable hddtemp) \
- $(use_enable iostats) \
- $(use_enable lua) \
- $(use_enable thinkpad ibm) \
- $(use_enable math) \
- $(use_enable moc) \
- $(use_enable mpd) \
- $(use_enable ncurses) \
- $(use_enable portmon) \
- $(use_enable rss) \
- $(use_enable weather-metar) \
- $(use_enable weather-xoap) \
- $(use_enable wifi wlan)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc ChangeLog AUTHORS TODO || die "dodoc failed"
- dohtml doc/docs.html doc/config_settings.html doc/variables.html \
- || die "dohtml failed"
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die "doins failed"
-
- insinto /usr/share/vim/vimfiles/syntax
- doins "${S}"/extras/vim/syntax/conkyrc.vim|| die "doins failed"
- fi
-
- if use nano-syntax; then
- insinto /usr/share/nano/
- doins "${S}"/extras/nano/conky.nanorc|| die "doins failed"
- fi
-}
-
-pkg_postinst() {
- elog "You can find a sample configuration file at ${ROOT%/}/etc/conky/conky.conf."
- elog "To customize, copy it to ~/.conkyrc and edit it to your liking."
- elog
- elog "For more info on Conky's features please look at the Changelog in"
- elog "${ROOT%/}/usr/share/doc/${PF}. There are also pretty html docs available"
- elog "on Conky's site or in ${ROOT%/}/usr/share/doc/${PF}/html."
- elog
- elog "Also see http://www.gentoo.org/doc/en/conky-howto.xml"
- elog
-}
+++ /dev/null
---- configure.ac.old 2010-03-30 19:50:36.000000000 +0200
-+++ configure.ac 2010-06-12 23:10:51.978440907 +0200
-@@ -149,7 +149,7 @@
-
- AM_CONDITIONAL(BUILD_AUDACIOUS, test x$want_audacious = xyes -o x$want_audacious = xlegacy)
- if test x$want_audacious = xyes; then
-- PKG_CHECK_MODULES([Audacious], [audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0])
-+ PKG_CHECK_MODULES([Audacious], [audacious >= 1.4.0 audclient dbus-glib-1 glib-2.0 gobject-2.0])
- conky_CFLAGS="$conky_CFLAGS $Audacious_CFLAGS"
- conky_LIBS="$conky_LIBS $Audacious_LIBS"
- save_CPPFLAGS="$CPPFLAGS"
+++ /dev/null
-From: Brenden Matthews <brenden@diddyinc.com>
-Date: Wed, 7 Apr 2010 16:34:33 +0000 (-0700)
-Subject: Fix build failure with ncurses disabled.
-X-Git-Url: http://git.omp.am/?p=conky.git;a=commitdiff_plain;h=c8e687406502be8c6f4e75b077113591823405f0
-
-Fix build failure with ncurses disabled.
-
-Ref: http://bugs.gentoo.org/show_bug.cgi?id=313081
----
-
-diff --git a/configure.ac.in b/configure.ac.in
-index ebef3f8..5cda4b8 100644
---- a/configure.ac.in
-+++ b/configure.ac.in
-@@ -1011,6 +1011,7 @@ dnl OpenMP: $want_openmp
- ALSA mixer: $want_alsa
- apcupsd: $want_apcupsd
- I/O stats: $want_iostats
-+ ncurses: $want_ncurses
-
- * Lua ($want_lua) bindings:
- Cairo: $want_lua_cairo
-diff --git a/src/conky.c b/src/conky.c
-index 500261b..7e61f51 100644
---- a/src/conky.c
-+++ b/src/conky.c
-@@ -3119,36 +3119,49 @@ int draw_each_line_inner(char *s, int special_index, int last_special_applied)
- if (seconds != 0) {
- timeunits = seconds / 86400; seconds %= 86400;
- if (timeunits > 0) {
-- asprintf(&tmp_day_str, "%dd", timeunits);
-+ if (asprintf(&tmp_day_str, "%dd", timeunits) < 0) {
-+ tmp_day_str = 0;
-+ }
- } else {
- tmp_day_str = strdup("");
- }
- timeunits = seconds / 3600; seconds %= 3600;
- if (timeunits > 0) {
-- asprintf(&tmp_hour_str, "%dh", timeunits);
-+ if (asprintf(&tmp_hour_str, "%dh", timeunits) < 0) {
-+ tmp_day_str = 0;
-+ }
- } else {
- tmp_hour_str = strdup("");
- }
- timeunits = seconds / 60; seconds %= 60;
- if (timeunits > 0) {
-- asprintf(&tmp_min_str, "%dm", timeunits);
-+ if (asprintf(&tmp_min_str, "%dm", timeunits) < 0) {
-+ tmp_min_str = 0;
-+ }
- } else {
- tmp_min_str = strdup("");
- }
- if (seconds > 0) {
-- asprintf(&tmp_sec_str, "%ds", seconds);
-+ if (asprintf(&tmp_sec_str, "%ds", seconds) < 0) {
-+ tmp_sec_str = 0;
-+ }
- } else {
- tmp_sec_str = strdup("");
- }
-- asprintf(&tmp_str, "%s%s%s%s", tmp_day_str, tmp_hour_str, tmp_min_str, tmp_sec_str);
-- free(tmp_day_str); free(tmp_hour_str); free(tmp_min_str); free(tmp_sec_str);
-+ if (asprintf(&tmp_str, "%s%s%s%s", tmp_day_str,
-+ tmp_hour_str, tmp_min_str, tmp_sec_str) < 0) {
-+ tmp_str = 0;
-+ }
-+#define FREE(a) if ((a)) free((a));
-+ FREE(tmp_day_str); FREE(tmp_hour_str); FREE(tmp_min_str); FREE(tmp_sec_str);
- } else {
-- asprintf(&tmp_str, "Range not possible"); // should never happen, but better safe then sorry
-+ tmp_str = strdup("Range not possible"); /* should never happen, but better safe then sorry */
- }
- cur_x += (w / 2) - (font_ascent() * (strlen(tmp_str) / 2));
- cur_y += font_h / 2;
- draw_string(tmp_str);
-- free(tmp_str);
-+ FREE(tmp_str);
-+#undef FREE
- cur_x = tmp_x;
- cur_y = tmp_y;
- }
-@@ -4518,13 +4531,13 @@ void setalignment(int* ltext_alignment, unsigned int windowtype, const char* val
- int a = string_to_alignment(value);
-
- if (a <= 0) {
-- if(setbyconffile == true) {
-+ if (setbyconffile) {
- CONF_ERR;
- } else NORM_ERR("'%s' is not a alignment setting", value);
- } else {
- *ltext_alignment = a;
- }
-- } else if(setbyconffile == true) {
-+ } else if (setbyconffile) {
- CONF_ERR;
- }
- }
-@@ -4573,7 +4586,7 @@ char load_config_file(const char *f)
- }
- }
- CONF("alignment") {
-- setalignment(&text_alignment, window.type, value, f, line, true);
-+ setalignment(&text_alignment, window.type, value, f, line, 1);
- }
- CONF("background") {
- fork_to_background = string_to_bool(value);
-@@ -5696,7 +5709,7 @@ void initialisation(int argc, char **argv) {
- set_first_font(optarg);
- break;
- case 'a':
-- setalignment(&text_alignment, window.type, optarg, NULL, 0, false);
-+ setalignment(&text_alignment, window.type, optarg, NULL, 0, 0);
- break;
-
- #ifdef OWN_WINDOW
-@@ -5895,7 +5908,9 @@ int main(int argc, char **argv)
- current_config = strndup(optarg, max_user_text);
- break;
- case 'q':
-- freopen("/dev/null", "w", stderr);
-+ if (!freopen("/dev/null", "w", stderr)) {
-+ NORM_ERR("unable to redirect stderr to /dev/null");
-+ }
- break;
- case 'h':
- print_help(argv[0]);
projects / gentoo.git / commitdiff