Patch to open device read/write when it's scsi, #116731.

(Portage version: 2.1_pre9-r2)

5 files changed, 71 insertions, 1 deletions

diff --git a/sys-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog
index 456509b058a6..e29c5fbe25a6 100644
--- a/sys-apps/eject/ChangeLog
+++ b/sys-apps/eject/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/eject
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.52 2006/02/19 21:53:41 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.53 2006/04/23 22:46:09 uberlord Exp $
+
+*eject-2.1.4-r1 (23 Apr 2006)
+
+  23 Apr 2006; Roy Marples <uberlord@gentoo.org>
+  +files/eject-2.1.4-scsi-rdwr.patch, +eject-2.1.4-r1.ebuild:
+  Patch to open device read/write when it's scsi, #116731.
+  Now iPod owners can eject their iPods when not root!
 
   19 Feb 2006; Joshua Kinard <kumba@gentoo.org> eject-2.1.0-r1.ebuild:
   Marked stable on mips.
diff --git a/sys-apps/eject/eject-2.1.4-r1.ebuild b/sys-apps/eject/eject-2.1.4-r1.ebuild
new file mode 100644
index 000000000000..42b579e13642
--- /dev/null
+++ b/sys-apps/eject/eject-2.1.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.1.4-r1.ebuild,v 1.1 2006/04/23 22:46:09 uberlord Exp $
+
+inherit eutils
+
+DESCRIPTION="A command to eject a disc from the CD-ROM drive"
+HOMEPAGE="http://eject.sourceforge.net/"
+SRC_URI="http://www.ibiblio.org/pub/Linux/utils/disk-management/${P}.tar.gz
+	http://www.pobox.com/~tranter/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="nls"
+
+DEPEND="!virtual/eject"
+PROVIDE="virtual/eject"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}"-2.0.13-xmalloc.patch
+	epatch "${FILESDIR}/${PN}"-2.1.4-toggle.patch
+	epatch "${FILESDIR}/${PN}"-2.1.4-scsi-rdwr.patch
+}
+
+src_compile() {
+	econf $(use_enable nls) || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog README PORTING TODO AUTHORS NEWS PROBLEMS
+}
diff --git a/sys-apps/eject/files/digest-eject-2.1.0-r1 b/sys-apps/eject/files/digest-eject-2.1.0-r1
index ea145a9572f9..0257fd71f7cb 100644
--- a/sys-apps/eject/files/digest-eject-2.1.0-r1
+++ b/sys-apps/eject/files/digest-eject-2.1.0-r1
@@ -1 +1,3 @@
 MD5 82e3a7a4d7e3323018c6938015ff25f7 eject-2.1.0.tar.gz 66819
+RMD160 69fcc5159ba5ebb9ca30d39dfae0bbdb18da8bcb eject-2.1.0.tar.gz 66819
+SHA256 2b5563a49a4998954297649d7a3c24c849c9dcc70845d0b1c2d9a83abc098d0f eject-2.1.0.tar.gz 66819
diff --git a/sys-apps/eject/files/digest-eject-2.1.4-r1 b/sys-apps/eject/files/digest-eject-2.1.4-r1
new file mode 100644
index 000000000000..0e32186fcbfb
--- /dev/null
+++ b/sys-apps/eject/files/digest-eject-2.1.4-r1
@@ -0,0 +1,3 @@
+MD5 6cb457857318f733177f0c3a780138da eject-2.1.4.tar.gz 101025
+RMD160 dbba76eb84aef1c8c367090389058b7afcc9ad48 eject-2.1.4.tar.gz 101025
+SHA256 317e27f763884148781be189a4c5c779f25b9812dee8f5ae2d0e5de30a4b65be eject-2.1.4.tar.gz 101025
diff --git a/sys-apps/eject/files/eject-2.1.4-scsi-rdwr.patch b/sys-apps/eject/files/eject-2.1.4-scsi-rdwr.patch
new file mode 100644
index 000000000000..613a75b228e8
--- /dev/null
+++ b/sys-apps/eject/files/eject-2.1.4-scsi-rdwr.patch
@@ -0,0 +1,20 @@
+diff -urN eject-2.0.13deb.orig/eject.c eject-2.0.13deb/eject.c
+--- eject-2.0.13deb.orig/eject.c	2005-12-19 16:20:43.000000000 -0500
++++ eject-2.0.13deb/eject.c	2005-12-19 16:23:08.000000000 -0500
+@@ -657,7 +657,15 @@
+ /* Open a device file. */
+ static int OpenDevice(const char *fullName)
+ {
+-	int fd = open(fullName, O_RDONLY|O_NONBLOCK);
++	int flags = O_NONBLOCK;
++	int fd;
++
++ 	if (s_option)
++		flags |= O_RDWR;
++	else
++		flags |= O_RDONLY;
++
++	fd = open(fullName, flags);
+ 	if (fd == -1) {
+ 		fprintf(stderr, _("%s: unable to open `%s'\n"), programName, fullName);
+ 		exit(1);