From b44459c0e76425346165af1fa4a2ce0cc74ed904 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sun, 11 Dec 2005 03:36:33 +0000 Subject: modular X support - bug #115062 and error handling - bug #113921 Package-Manager: portage-2.0.53 --- app-admin/conky/ChangeLog | 9 +- app-admin/conky/Manifest | 11 ++- app-admin/conky/conky-1.3.4-r2.ebuild | 107 +++++++++++++++++++++ .../conky/files/conky-1.3.4-arraybounds.patch | 68 +++++++++++++ app-admin/conky/files/digest-conky-1.3.4-r2 | 1 + 5 files changed, 191 insertions(+), 5 deletions(-) create mode 100644 app-admin/conky/conky-1.3.4-r2.ebuild create mode 100644 app-admin/conky/files/conky-1.3.4-arraybounds.patch create mode 100644 app-admin/conky/files/digest-conky-1.3.4-r2 (limited to 'app-admin') diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 5e09e6bec65e..9c6985db38d2 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/conky # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.14 2005/11/28 07:03:32 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.15 2005/12/11 03:36:33 dragonheart Exp $ + +*conky-1.3.4-r2 (11 Dec 2005) + + 11 Dec 2005; Daniel Black + +files/conky-1.3.4-arraybounds.patch, +conky-1.3.4-r2.ebuild: + modular X support - bug #115062 and error handling - bug #113921 - thanks + Ben Skeggs and Philip Kovacs 28 Nov 2005; Daniel Black conky-1.3.1.ebuild, conky-1.3.3.ebuild, conky-1.3.4-r1.ebuild: diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest index 3eadf41c125e..1b512e04ecef 100644 --- a/app-admin/conky/Manifest +++ b/app-admin/conky/Manifest @@ -1,19 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 3c526529ce52bd4efb7cfa5c6f6e6711 ChangeLog 2593 +MD5 bf58446bed90d751cd0d3b7fe26011bd ChangeLog 2849 MD5 7cf736bd0931fa89a032b455112ce1de conky-1.3.1.ebuild 1916 MD5 fe8b738545f4869bfcbfac38df47ee52 conky-1.3.3.ebuild 1851 MD5 910eeed20139a5579848512bc6b0530f conky-1.3.4-r1.ebuild 2374 +MD5 daec6353bf84e62c4edd4d82d00cd350 conky-1.3.4-r2.ebuild 2662 +MD5 4953a824131c6f1a689660eab403b475 files/conky-1.3.4-arraybounds.patch 2118 MD5 3f930afeab86d38688b8c7fe8a610bc7 files/conky-1.3.4-miscbug.patch 2591 MD5 31acfc146c31ba015fb9b8643deb2d57 files/digest-conky-1.3.1 64 MD5 6e51a33ec07b6f71db430f1839fd7902 files/digest-conky-1.3.3 64 MD5 c5c1fb804afb4bd1255b602c8894a317 files/digest-conky-1.3.4-r1 64 +MD5 c5c1fb804afb4bd1255b602c8894a317 files/digest-conky-1.3.4-r2 64 MD5 32bd4230c3ee12a8d5502d4bd57a9a3d metadata.xml 588 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux) -iD8DBQFDiqvRmdTrptrqvGERAqJ5AJ9kI45/KHAWJdo/EwRVenK7LJaUeACeIv3b -ahbslqIDIRCKBrST9MAma1A= -=hUsS +iD8DBQFDm57PmdTrptrqvGERApvYAKCUAmeZK6Oa+ianMTqwom4vKIciEwCcCntw +qzWsTjwl3LcwJaQ6EZpmT94= +=TnXc -----END PGP SIGNATURE----- diff --git a/app-admin/conky/conky-1.3.4-r2.ebuild b/app-admin/conky/conky-1.3.4-r2.ebuild new file mode 100644 index 000000000000..e648ed5d2065 --- /dev/null +++ b/app-admin/conky/conky-1.3.4-r2.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.3.4-r2.ebuild,v 1.1 2005/12/11 03:36:33 dragonheart Exp $ + +inherit eutils + +DESCRIPTION="Conky is an advanced, highly configurable system monitor for X" +HOMEPAGE="http://conky.sf.net" +SRC_URI="mirror://sourceforge/conky/${P}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="truetype X ipv6" + +DEPEND_COMMON=" + virtual/libc + X? ( + || ( ( x11-libs/libICE + x11-libs/libXext + x11-libs/libX11 + x11-libs/libSM + x11-libs/libXrender + x11-libs/libXft + ) + virtual/x11 + ) + truetype? ( >=media-libs/freetype-2 ) + )" + +RDEPEND="${DEPEND_COMMON}" +# seti? ( sci-astronomy/setiathome )" + +DEPEND=" + ${DEPEND_COMMON} + X? ( + || ( ( x11-libs/libXt + x11-proto/xextproto + x11-proto/xproto + ) + virtual/x11 + ) + ) + sys-devel/libtool + sys-apps/grep + sys-apps/sed + sys-devel/gcc" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-miscbug.patch + epatch ${FILESDIR}/${P}-arraybounds.patch +} + +src_compile() { + local mymake + if useq ipv6 ; then + ewarn + ewarn "You have the ipv6 USE flag enabled. Please note that" + ewarn "using the ipv6 USE flag with Conky disables the port" + ewarn "monitor." + ewarn + sleep 5 + else + mymake="MPD_NO_IPV6=noipv6" + fi + local myconf + myconf="--enable-double-buffer --enable-own-window --enable-proc-uptime + --enable-mpd --enable-mldonkey" + econf \ + ${myconf} \ + $(use_enable truetype xft) \ + $(use_enable X x11) \ + $(use_enable !ipv6 portmon) || die "econf failed" +# $(use_enable seti) + emake ${mymake} || die "compile failed" +} + +src_install() { + emake DESTDIR=${D} install || die "make install failed" + dodoc ChangeLog AUTHORS README doc/conkyrc.sample doc/variables.html + dodoc doc/docs.html doc/config_settings.html +} + +pkg_postinst() { + einfo 'Default configuration file is "~/.conkyrc"' + einfo "you can find a sample configuration file in" + einfo "/usr/share/doc/${PF}/conkyrc.sample.gz" + einfo + einfo "For more info on Conky's new features," + einfo "please look at the README and ChangeLog:" + einfo "/usr/share/doc/${PF}/README.gz" + einfo "/usr/share/doc/${PF}/ChangeLog.gz" + einfo "There are also pretty html docs available" + einfo "on Conky's site or in /usr/share/doc/${PF}" + einfo + einfo "Comment out temperature info lines if you have no kernel" + einfo "support for it." + einfo + einfo "Check out app-vim/conky-syntax for conkyrc" + einfo "syntax highlighting in Vim" + einfo + ewarn "Conky doesn't work with window managers that" + ewarn "take control over root window such as Gnome's nautilus." + ewarn +} diff --git a/app-admin/conky/files/conky-1.3.4-arraybounds.patch b/app-admin/conky/files/conky-1.3.4-arraybounds.patch new file mode 100644 index 000000000000..954f900d191b --- /dev/null +++ b/app-admin/conky/files/conky-1.3.4-arraybounds.patch @@ -0,0 +1,68 @@ +--- src/conky.h.old 2005-11-30 01:08:25.000000000 -0500 ++++ src/conky.h 2005-11-29 12:35:21.000000000 -0500 +@@ -3,7 +3,7 @@ + * + * This program is licensed under BSD license, read COPYING + * +- * $Id: conky-1.3.4-arraybounds.patch,v 1.1 2005/12/11 03:36:33 dragonheart Exp $ ++ * $Id: conky-1.3.4-arraybounds.patch,v 1.1 2005/12/11 03:36:33 dragonheart Exp $ + */ + + #ifndef _conky_h_ +@@ -55,6 +55,9 @@ + #define CRIT_ERR(s, varargs...) \ + { fprintf(stderr, "Conky: " s "\n", ##varargs); exit(EXIT_FAILURE); } + ++#define MIN(a,b) (a>b ? b : a) ++#define MAX(a,b) (a TEXT_BUFFER_SIZE-1 ) ++ fprintf(stderr,"buffer overrun detected\n"); ++ */ ++ tmpstring2[ MIN(pos + i2, TEXT_BUFFER_SIZE-1) ] = ' '; /* guard against overrun */ + added++; + } + pos += i2; + } else { + if (tmpstring1[i] != 9) { +- tmpstring2[pos] = tmpstring1[i]; ++ /* ++ if ( pos > TEXT_BUFFER_SIZE-1 ) ++ fprintf(stderr,"buffer overrun detected\n"); ++ */ ++ tmpstring2[ MIN(pos, TEXT_BUFFER_SIZE-1) ] = tmpstring1[i]; /* guard against overrun */ + pos++; + } + } diff --git a/app-admin/conky/files/digest-conky-1.3.4-r2 b/app-admin/conky/files/digest-conky-1.3.4-r2 new file mode 100644 index 000000000000..3d1c4064a29c --- /dev/null +++ b/app-admin/conky/files/digest-conky-1.3.4-r2 @@ -0,0 +1 @@ +MD5 91f7d4ce29a6bc2d785f13224ea4aaac conky-1.3.4.tar.bz2 332871 -- cgit v1.2.3-65-gdbad