Version bump in reference to bug #47340 which addresses a security flaw in LCDproc.

5 files changed, 133 insertions, 12 deletions

diff --git a/app-misc/lcdproc/ChangeLog b/app-misc/lcdproc/ChangeLog
index 9c2852a4b1f8..5d4a0ffaf2b6 100644
--- a/app-misc/lcdproc/ChangeLog
+++ b/app-misc/lcdproc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/lcdproc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.10 2004/03/31 13:02:43 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/ChangeLog,v 1.11 2004/04/09 13:32:03 plasmaroo Exp $
+
+*lcdproc-0.4.4-r1 (09 Apr 2004)
+
+  09 Apr 2004; <plasmaroo@gentoo.org> lcdproc-0.4.4-r1.ebuild,
+  files/lcdproc-0.4.4-security.patch:
+  Version bump in reference to bug #47340 which addresses a security flaw in
+  LCDproc.
 
 *lcdproc-0.4.4 (31 Mar 2004)
 
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 51dbd1598bca..56f2c620fe97 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -1,15 +1,18 @@
-MD5 f5bde3b5dcf57c75ae292e68cd842413 files/LCDd 554
-MD5 92a88b8b646fbd62d09e04cb1c2a325f files/lcdproc 518
+MD5 7c11976b9644bd3248cd81eea0470e22 ChangeLog 2334
+MD5 ce005923d28d5b51971027604199e859 lcdproc-0.4.3-r2.ebuild 2628
+MD5 4a473a5d169c93265cc78fd575bceb1f lcdproc-0.4.4-r1.ebuild 2682
+MD5 88ba94721753f3dc7569d62c94b6c07e lcdproc-0.4.4.ebuild 2634
+MD5 2f0a48b0b18b1802e55112c40dcb59d3 lcdproc-0.4.3-r1.ebuild 1838
+MD5 5de2ffea92ccd3bca385d2d58bf84574 lcdproc-0.4.3.ebuild 1001
+MD5 bafe654f785d62b7445b6fde1cb00268 lcdproc-0.4.1-r1.ebuild 1006
 MD5 da3032fcae2e2d12071c4843c7ad7aa8 files/digest-lcdproc-0.4.1-r1 65
-MD5 de2f2309ffe3227b6dcba8fc3d7ab65d files/digest-lcdproc-0.4.3 65
-MD5 de2f2309ffe3227b6dcba8fc3d7ab65d files/digest-lcdproc-0.4.3-r1 65
-MD5 de2f2309ffe3227b6dcba8fc3d7ab65d files/digest-lcdproc-0.4.3-r2 65
 MD5 6230f34f250e4f4c7026702e31047d27 files/lcdproc-0.4.3-gentoo.diff 2801
 MD5 041467af40c15c7a566f4c56bb369676 files/lcdproc.confd 331
+MD5 f5bde3b5dcf57c75ae292e68cd842413 files/LCDd 554
+MD5 92a88b8b646fbd62d09e04cb1c2a325f files/lcdproc 518
+MD5 93bc2139ae4ea5fdb0cc9cda7cdf1ec8 files/lcdproc-0.4.4-security.patch 372
 MD5 2f153440be0f08cd266c618d4f0e9d95 files/digest-lcdproc-0.4.4 66
-MD5 1c4bbccaae3350f64428720812472d92 ChangeLog 2106
-MD5 bafe654f785d62b7445b6fde1cb00268 lcdproc-0.4.1-r1.ebuild 1006
-MD5 2f0a48b0b18b1802e55112c40dcb59d3 lcdproc-0.4.3-r1.ebuild 1838
-MD5 ce005923d28d5b51971027604199e859 lcdproc-0.4.3-r2.ebuild 2628
-MD5 5de2ffea92ccd3bca385d2d58bf84574 lcdproc-0.4.3.ebuild 1001
-MD5 88ba94721753f3dc7569d62c94b6c07e lcdproc-0.4.4.ebuild 2634
+MD5 de2f2309ffe3227b6dcba8fc3d7ab65d files/digest-lcdproc-0.4.3-r1 65
+MD5 de2f2309ffe3227b6dcba8fc3d7ab65d files/digest-lcdproc-0.4.3-r2 65
+MD5 de2f2309ffe3227b6dcba8fc3d7ab65d files/digest-lcdproc-0.4.3 65
+MD5 2f153440be0f08cd266c618d4f0e9d95 files/digest-lcdproc-0.4.4-r1 66
diff --git a/app-misc/lcdproc/files/digest-lcdproc-0.4.4-r1 b/app-misc/lcdproc/files/digest-lcdproc-0.4.4-r1
new file mode 100644
index 000000000000..571700b19bcc
--- /dev/null
+++ b/app-misc/lcdproc/files/digest-lcdproc-0.4.4-r1
@@ -0,0 +1 @@
+MD5 75f252a5f068fbf688398ce902947a6e lcdproc-0.4.4.tar.bz2 304388
diff --git a/app-misc/lcdproc/files/lcdproc-0.4.4-security.patch b/app-misc/lcdproc/files/lcdproc-0.4.4-security.patch
new file mode 100644
index 000000000000..299abdeafe5b
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc-0.4.4-security.patch
@@ -0,0 +1,12 @@
+diff -urN lcdproc-0.4.4/server/parse.c lcdproc-0.4.4-fixed/server/parse.c
+--- lcdproc-0.4.4/server/parse.c	2004-03-16 17:06:12.000000000 -0300
++++ lcdproc-0.4.4-fixed/server/parse.c	2004-03-31 13:49:23.000000000 -0300
+@@ -158,7 +158,7 @@
+ 
+ 
+ 					argc++;
+-				} while (*p);
++				} while (*p && i < MAX_ARGUMENTS);
+ 
+ 				/*debug(RPT_DEBUG, "exiting string scan...");*/
+ 
diff --git a/app-misc/lcdproc/lcdproc-0.4.4-r1.ebuild b/app-misc/lcdproc/lcdproc-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..46f45bc7ba12
--- /dev/null
+++ b/app-misc/lcdproc/lcdproc-0.4.4-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/lcdproc-0.4.4-r1.ebuild,v 1.1 2004/04/09 13:32:03 plasmaroo Exp $
+
+SRC_URI="mirror://sourceforge/lcdproc/${P}.tar.bz2"
+DESCRIPTION="Client/Server suite to drive all kinds of LCD (-like) devices"
+HOMEPAGE="http://lcdproc.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc ncurses svga"
+
+DEPEND=">=sys-apps/baselayout-1.6.4
+	>=sys-apps/sed-4
+	doc? ( >=app-text/docbook-sgml-utils-0.6.11-r2 )
+	ncurses? ( >=sys-libs/ncurses-5.3 )
+	svga? ( >=media-libs/svgalib-1.4.3 )"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	sed -i "889s:-O3:${CFLAGS}:" configure
+	epatch ${FILESDIR}/${P}-security.patch
+}
+
+src_compile() {
+
+	# By default, all drivers that are supported by the given plattform/hardware
+	# are compiled (of course respecting the existing USE flags). If the
+	# LCDPROC_DRIVERS environment variable is set to a comma separated list, only
+	# the specified drivers will be compiled.
+	# Example:
+	#
+	#   env LCDPROC_DRIVERS="curses,CFontz" emerge lcdproc
+	#
+	# NOTE: The ebuild still respects your USE variable and will not install any
+	# additional packages unless the corresponding USE flag is set!
+	# You might have to alter it if e.g. ncurses is normally not part of your
+	# USE variable.
+	# Example:
+	#
+	#   env USE="$USE ncurses" LCDPROC_DRIVERS="curses,CFontz" emerge lcdproc
+
+	local myconf
+
+	myconf="--enable-drivers=mtxorb,cfontz,cwlnx,text,lb216,"
+	myconf="${myconf}hd44780,joy,irman,lircin,bayrad,glk,stv5730,"
+	myconf="${myconf}stv5730,sed1330,sed1520,lcdm001,"
+	myconf="${myconf}t6963,wirz-sli,sgx120"
+
+	use ncurses && myconf="${myconf},curses"
+	use svga && myconf="${myconf},svgalib"
+
+	[ x"${LCDPROC_DRIVERS}" = x ] || \
+		myconf="--enable-drivers=${LCDPROC_DRIVERS}"
+
+	use samba && myconf="${myconf} --enable-stat-smbfs"
+	myconf="${myconf} --enable-stat-nfs"
+
+	econf ${myconf} || die
+	emake || die
+
+	if [ `use doc` ]; then
+		cd ${S}/docs/lcdproc-user
+		docbook2html lcdproc-user.docbook
+	fi
+}
+
+src_install() {
+	dosbin server/LCDd
+	dobin clients/lcdproc/lcdproc
+
+	doman docs/lcdproc.1 docs/LCDd.8
+
+	dodoc README ChangeLog COPYING INSTALL
+
+	if [ `use doc` ]; then
+		insinto /usr/share/doc/${PF}/lcdproc-user
+		doins docs/lcdproc-user/*.html
+	fi
+
+	docinto olddocs
+	dodoc docs/README.dg* docs/*.txt
+
+	insinto /usr/share/doc/${PF}/clients/examples
+	doins clients/examples/*.pl
+	insinto /usr/share/doc/${PF}/clients/headlines
+	doins clients/headlines/lcdheadlines
+
+	insinto /etc
+	doins LCDd.conf
+	doins scripts/lcdproc.conf
+
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/LCDd
+	doexe ${FILESDIR}/lcdproc
+}