Fix aumix segfaulting when env(HOME) is not defined. Thanks to Collins Richey <erichey2@comcast.net>. Closes bug #57291

5 files changed, 97 insertions, 5 deletions

diff --git a/media-sound/aumix/ChangeLog b/media-sound/aumix/ChangeLog
index 1214a050af21..2c25a2b2a958 100644
--- a/media-sound/aumix/ChangeLog
+++ b/media-sound/aumix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/aumix
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.31 2004/07/13 20:40:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.32 2004/07/22 08:31:24 eradicator Exp $
+
+*aumix-2.8-r2 (22 Jul 2004)
+
+  22 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/aumix-2.8-nohome.patch, +aumix-2.8-r2.ebuild:
+  Fix aumix segfaulting when env(HOME) is not defined. Thanks to Collins Richey
+  <erichey2@comcast.net>. Closes bug #57291
 
   13 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> aumix-2.8-r1.ebuild:
   Stable on alpha.
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index 82c71f828708..4da53e208fa3 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -1,10 +1,12 @@
-MD5 38cd9c05d169095321629e9583d8d7c2 aumix-2.8.ebuild 1384
-MD5 1da36b17ad3de7a3dd66325a008acafd aumix-2.8-r1.ebuild 1534
-MD5 3ec2efd4f2b55d249cb17b10597bb454 aumix-2.7-r4.ebuild 1257
 MD5 994e5d52f6e6067c6a5ddd437742699f ChangeLog 3623
+MD5 3ec2efd4f2b55d249cb17b10597bb454 aumix-2.7-r4.ebuild 1257
+MD5 1da36b17ad3de7a3dd66325a008acafd aumix-2.8-r1.ebuild 1534
+MD5 38cd9c05d169095321629e9583d8d7c2 aumix-2.8.ebuild 1384
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 857a1fe260905ab09b7befd877affafd files/digest-aumix-2.8 62
+MD5 2674737ff3091f525a988f87a8a5db91 aumix-2.8-r2.ebuild 1632
 MD5 f39abfbf49ff4a33e109eeb14a4325c2 files/aumix.desktop 124
 MD5 f8120ed45b32400a44eb86a710c2b900 files/aumix.rc6 1122
 MD5 e4d29edb4b7c339ca310738a7e9dd174 files/digest-aumix-2.7-r4 61
+MD5 857a1fe260905ab09b7befd877affafd files/digest-aumix-2.8 62
 MD5 857a1fe260905ab09b7befd877affafd files/digest-aumix-2.8-r1 62
+MD5 857a1fe260905ab09b7befd877affafd files/digest-aumix-2.8-r2 62
diff --git a/media-sound/aumix/aumix-2.8-r2.ebuild b/media-sound/aumix/aumix-2.8-r2.ebuild
new file mode 100644
index 000000000000..4467d0763ac2
--- /dev/null
+++ b/media-sound/aumix/aumix-2.8-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.8-r2.ebuild,v 1.1 2004/07/22 08:31:24 eradicator Exp $
+
+IUSE="gtk gtk2 gpm nls"
+
+inherit eutils
+
+DESCRIPTION="Aumix volume/mixer control program."
+SRC_URI="http://jpj.net/~trevor/aumix/${P}.tar.bz2"
+HOMEPAGE="http://jpj.net/~trevor/aumix/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~hppa ~amd64 ~sparc ~alpha ~ia64 ~mips"
+
+#alsa support is broken in 2.8	alsa? ( >=media-libs/alsa-lib-0.9.0_rc1 )
+DEPEND=">=sys-libs/ncurses-5.2
+	gpm?  ( >=sys-libs/gpm-1.19.3 )
+	gtk?  (
+			!gtk2? ( =x11-libs/gtk+-1.2* )
+			gtk2? ( >=x11-libs/gtk+-2.0.0 )
+	)
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-nohome.patch
+}
+
+src_compile() {
+#	`use_with alsa`
+
+	# use_with borks becasue of bad configure script.
+	if use gtk; then
+		if use gtk2; then
+			myconf="${myconf} --without-gtk1";
+		else
+			myconf="${myconf} --without-gtk";
+		fi
+	else
+		myconf="${myconf} --without-gtk --without-gtk1";
+	fi
+
+	if ! use gpm; then
+		myconf="${myconf} --without-gpm"
+	fi
+
+	econf ${myconf} || die
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall
+
+	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+
+	insinto /usr/share/gnome/apps/Multimedia
+	doins ${FILESDIR}/aumix.desktop
+	insinto /usr/share/applnk/Multimedia
+	doins ${FILESDIR}/aumix.desktop
+	insinto /usr/share/applications
+	doins ${FILESDIR}/aumix.desktop
+
+	dodir /usr/share/pixmaps
+	ln -s ../aumix/aumix.xpm ${D}/usr/share/pixmaps
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/aumix.rc6 aumix
+}
diff --git a/media-sound/aumix/files/aumix-2.8-nohome.patch b/media-sound/aumix/files/aumix-2.8-nohome.patch
new file mode 100644
index 000000000000..bf20f0372c00
--- /dev/null
+++ b/media-sound/aumix/files/aumix-2.8-nohome.patch
@@ -0,0 +1,12 @@
+diff -Naur aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
+--- aumix-2.8.orig/src/common.c	2002-10-29 13:27:51.000000000 -0800
++++ aumix-2.8/src/common.c	2004-07-22 01:28:07.684999900 -0700
+@@ -591,7 +591,7 @@
+ 	char            filename[PATH_MAX];
+ 	if (save_filename == NULL) {
+ 		home = getenv("HOME");
+-		if ((strlen(home) + strlen(AUMIXRC) + 2) < PATH_MAX) {
++		if (home && (strlen(home) + strlen(AUMIXRC) + 2) < PATH_MAX) {
+ 			sprintf(filename, "%s/.%s", home, AUMIXRC);
+ 			setfile = CheckAndOpen(filename, mode);
+ 		}
diff --git a/media-sound/aumix/files/digest-aumix-2.8-r2 b/media-sound/aumix/files/digest-aumix-2.8-r2
new file mode 100644
index 000000000000..12537fa60981
--- /dev/null
+++ b/media-sound/aumix/files/digest-aumix-2.8-r2
@@ -0,0 +1 @@
+MD5 dc3fc7209752207c23e7c94ab886b340 aumix-2.8.tar.bz2 157503