Fix buffer overflow when changing volume wrt #260985, thanks to Guillaume Rosaire and Magnus Granberg.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 98 insertions, 11 deletions

diff --git a/media-sound/aumix/ChangeLog b/media-sound/aumix/ChangeLog
index d24cd4fa1b36..592627831ab4 100644
--- a/media-sound/aumix/ChangeLog
+++ b/media-sound/aumix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/aumix
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.65 2008/03/31 04:10:09 ricmm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.66 2009/05/12 11:43:57 ssuominen Exp $
+
+*aumix-2.8-r5 (12 May 2009)
+
+  12 May 2009; Samuli Suominen <ssuominen@gentoo.org> +aumix-2.8-r5.ebuild,
+  +files/aumix-2.8-noninter_strncpy.patch:
+  Fix buffer overflow when changing volume wrt #260985, thanks to Guillaume
+  Rosaire and Magnus Granberg.
 
   31 Mar 2008; <ricmm@gentoo.org> aumix-2.8-r4.ebuild:
   Drop to ~mips due to unstable deps
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index 8168ee5eecbd..aed2daecd0ce 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -2,10 +2,11 @@ AUX aumix-2.8-close-dialogs.patch 613 RMD160 e06045a6aac2925d4578562d2133ea6a25a
 AUX aumix-2.8-mute.patch 470 RMD160 b1db29828cc06c02a94c0a8c88206f478b30d909 SHA1 34213e7973094b5b4fefa4f2f68a2913766cef04 SHA256 7b19f89a6b5ecb97181c1154c6ee21079ecc2ccfe25a5b3fb8fd670709a61a14
 AUX aumix-2.8-nls.patch 829 RMD160 bbc28e1285acdbadf0f3c58e18ab94f7160e6299 SHA1 dbe73b4599f5ef6834fd546ba795f83b92cb8453 SHA256 b0e2a27c422c6c106863521a7bd43741e74cfa86e490096da8209138c0a03b45
 AUX aumix-2.8-nohome.patch 529 RMD160 93ac976f5dd420ac63806e14fd3abc44d726f244 SHA1 449aaf90721769a806de94378cb943ffc3c5fa19 SHA256 fc0f6ee2a545f7340dc5a78fce6553132d274c607ec4473019f3c8ff62e598c7
+AUX aumix-2.8-noninter_strncpy.patch 1067 RMD160 7447539dc3028b68d3906090af7fb570b79349b5 SHA1 75687879f2ca9525e6a0faf8f6cb4013f9bd757e SHA256 e24130ba17b1d78446b45df7d3cc8f93195af4f12bd0943af542b4dd617e36f1
 AUX aumix-2.8-save_load.patch 1331 RMD160 5568874206654f06bce4a29a3039deee5760b45d SHA1 83b85df37e12f676143543c1b5c95c72455043dd SHA256 01adab9a3da9b1955b805bb2a47cc1cff8865625f6a726331f9911055d578e07
-AUX aumix.desktop 124 RMD160 67231039ee0b0cb250414195339b45b225347436 SHA1 b24a733ec9ef1fbfcbdfbab7fb5c544cf381a879 SHA256 29f48ad86e787da60d4c98bd38e5c2aff92ca690d5692857d3a806c683e11b0c
 AUX aumix.rc6 1143 RMD160 0db7127132b291eabbc7ebe178c6d862ccf8503c SHA1 62bce541e0f6c94f6be9f54db46675ec58d55f9b SHA256 571dc62080770e98c74390a5e7f6baa1187f6e8553b3528d623d5d577ed0eb27
 DIST aumix-2.8.tar.bz2 157503 RMD160 f7ab3737af772b97359dfc5d9852d06fda05aaa5 SHA1 5cea563ae91f628433a1950a36efd23681da4bf4 SHA256 636eef7f400c2f3df489c0d2fa21507e88692113561e75a40a26c52bc422d7fc
 EBUILD aumix-2.8-r4.ebuild 1699 RMD160 2ce8d9e868b21810020eeda14a4b708a2ff01e1c SHA1 a693d2c534757b7ffa5679354b6243b9eb8199f8 SHA256 dfb0bf2622fa72fda8ff3588cbfd4aef33b9e8f1b2abc5556011d647bc5283c5
-MISC ChangeLog 7856 RMD160 55bb2aa2659cc75319a4a1b41a6b17713d8f1dac SHA1 139c1e263bb5a7f50978566022858821ac104462 SHA256 ca00cc4fea6e4e978b0f8b9eca4a5f045540d1f3f45d3e26dc9d782fab75da41
+EBUILD aumix-2.8-r5.ebuild 1564 RMD160 d6cb956e21d382e151ba667b9b4370b2dbf0f5d2 SHA1 0eb7e9dc8b7017e3554a0ad5a747d4bcb93dbde4 SHA256 b05a4af60a00bbd14b9665ff38be2d00f2774dbeea0972f1a980ec0407b13eb6
+MISC ChangeLog 8116 RMD160 8c3a82ce5146626dcbef17a74304986affd4c1b6 SHA1 d66c4e833aa65a2ffccdc664f4d926abfd2cb90f SHA256 ae1373032534ea0348e393ea3c2fc7c6f2a2b8ce479e7b67dfeda03cd0472672
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
diff --git a/media-sound/aumix/aumix-2.8-r5.ebuild b/media-sound/aumix/aumix-2.8-r5.ebuild
new file mode 100644
index 000000000000..8960227ccc09
--- /dev/null
+++ b/media-sound/aumix/aumix-2.8-r5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.8-r5.ebuild,v 1.1 2009/05/12 11:43:57 ssuominen Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Aumix volume/mixer control program"
+HOMEPAGE="http://jpj.net/~trevor/aumix.html"
+SRC_URI="http://jpj.net/~trevor/aumix/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="gpm gtk nls"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	gtk? ( >=x11-libs/gtk+-2:2 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	sys-apps/findutils
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nohome.patch \
+		"${FILESDIR}"/${P}-close-dialogs.patch \
+		"${FILESDIR}"/${P}-save_load.patch \
+		"${FILESDIR}"/${P}-nls.patch \
+		"${FILESDIR}"/${P}-mute.patch \
+		"${FILESDIR}"/${P}-noninter_strncpy.patch
+
+	# Prevent autotools from rerunning, bug #70379.
+	touch aclocal.m4 configure
+	find . -name Makefile.in -o -name stamp-h.in -print0 | xargs -0 touch;
+	touch configure
+}
+
+src_configure() {
+	local myconf="--without-gtk1"
+
+	use gtk || myconf="${myconf} --without-gtk"
+	use gpm || myconf="${myconf} --without-gpm"
+
+	econf \
+		$(use_enable nls) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
+
+	newinitd "${FILESDIR}"/aumix.rc6 aumix
+
+	if use gtk; then
+		doicon data/aumix.xpm
+		make_desktop_entry aumix Aumix aumix
+	fi
+}
diff --git a/media-sound/aumix/files/aumix-2.8-noninter_strncpy.patch b/media-sound/aumix/files/aumix-2.8-noninter_strncpy.patch
new file mode 100644
index 000000000000..2c68873c29ae
--- /dev/null
+++ b/media-sound/aumix/files/aumix-2.8-noninter_strncpy.patch
@@ -0,0 +1,26 @@
+diff -ur aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
+--- aumix-2.8.orig/src/common.c	2002-10-29 23:27:51.000000000 +0200
++++ aumix-2.8/src/common.c	2009-05-12 14:36:08.000000000 +0300
+@@ -612,17 +612,18 @@
+ int             SetShowNoninter(int dev)
+ {
+ /* Change or display settings from the command line. */
+-	char           *devstr, dest;
++	char           *devstr;
++	char            dest[4];
+ 	int             change = 0, tmp, left, right;
+ 	/* Increase or decrease levels, optionally by a number. */
+ 	if (!strncmp(optarg, "+", 1) || !strncmp(optarg, "-", 1)) {
+ 		ErrorExitWarn(ReadLevel(dev, &tmp), 'e');
+ 		right = tmp >> 8;	/* I'll take the high byte, */
+ 		left = tmp & 0xFF;	/* and you take the low byte. */
+-		strncpy(&dest, (optarg + 1), 3);
++		strncpy(dest, (optarg + 1), 3);
+ 		change = 1;	/* For compatibility with versions 1.15 to 1.17, assume one if no number was given. */
+-		if (atoi(&dest))
+-			change = atoi(&dest);
++		if (atoi(dest))
++			change = atoi(dest);
+ 		if (*optarg == '+') {	/* increase */
+ 			right += change;
+ 			left += change;
diff --git a/media-sound/aumix/files/aumix.desktop b/media-sound/aumix/files/aumix.desktop
deleted file mode 100644
index 0bf998c5ffea..000000000000
--- a/media-sound/aumix/files/aumix.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Aumix
-Comment=Aumix volume/mixer control program
-Exec=aumix
-Icon=aumix.xpm
-Terminal=0
-Type=Application