Remove vulnerable version, bug #354061.

(Portage version: 2.1.10.27/cvs/Linux i686)

4 files changed, 5 insertions, 269 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 313ef908853f..03c5d27a964e 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,10 @@
 # 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:
diff --git a/app-admin/conky/conky-1.8.0-r1.ebuild b/app-admin/conky/conky-1.8.0-r1.ebuild
deleted file mode 100644
index a36ba4186093..000000000000
--- a/app-admin/conky/conky-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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
-}
diff --git a/app-admin/conky/files/conky-1.8.0-audacious-2.3.patch b/app-admin/conky/files/conky-1.8.0-audacious-2.3.patch
deleted file mode 100644
index 825f5b99ee59..000000000000
--- a/app-admin/conky/files/conky-1.8.0-audacious-2.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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"
diff --git a/app-admin/conky/files/conky-1.8.0-ncurses.patch b/app-admin/conky/files/conky-1.8.0-ncurses.patch
deleted file mode 100644
index 3340faf9936b..000000000000
--- a/app-admin/conky/files/conky-1.8.0-ncurses.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-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]);