rpms/eject/devel eject-2.1.5-lock.patch, 1.4, 1.5 eject-2.1.5-spaces.patch, 1.2, 1.3 eject-2.1.5-umount.patch, 1.5, 1.6 eject.spec, 1.46, 1.47

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/eject/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29444/devel

Modified Files:
	eject-2.1.5-lock.patch eject-2.1.5-spaces.patch 
	eject-2.1.5-umount.patch eject.spec 
Log Message:
- handle multi-partition devices with spaces in mount points properly (#608502)

eject-2.1.5-lock.patch:
 eject.1 |   13 +++++++++++--
 eject.c |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 63 insertions(+), 4 deletions(-)

Index: eject-2.1.5-lock.patch
===================================================================
RCS file: /cvs/extras/rpms/eject/devel/eject-2.1.5-lock.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- eject-2.1.5-lock.patch	9 Apr 2010 09:25:03 -0000	1.4
+++ eject-2.1.5-lock.patch	2 Jul 2010 15:42:32 -0000	1.5
@@ -49,7 +49,7 @@ index 3c388c6..315dc6d 100644
  even if it is mounted according to /etc/mtab or /proc/mounts.
  
 diff --git a/eject.c b/eject.c
-index 54e79f7..bfccd37 100644
+index f7b2a2e..4175756 100644
 --- a/eject.c
 +++ b/eject.c
 @@ -116,6 +116,7 @@ int d_option = 0;
@@ -155,7 +155,7 @@ index 54e79f7..bfccd37 100644
  /* Set or clear auto-eject mode. */
  static void AutoEject(int fd, int onOff)
  {
-@@ -1231,6 +1274,13 @@ int main(int argc, char **argv)
+@@ -1233,6 +1276,13 @@ int main(int argc, char **argv)
  		exit(0);
  	}
  

eject-2.1.5-spaces.patch:
 eject.c |   30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

Index: eject-2.1.5-spaces.patch
===================================================================
RCS file: /cvs/extras/rpms/eject/devel/eject-2.1.5-spaces.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- eject-2.1.5-spaces.patch	31 Mar 2009 09:42:26 -0000	1.2
+++ eject-2.1.5-spaces.patch	2 Jul 2010 15:42:32 -0000	1.3
@@ -1,6 +1,8 @@
---- eject/eject.c.spaces	2009-03-31 11:29:17.000000000 +0200
-+++ eject/eject.c	2009-03-31 11:32:44.000000000 +0200
-@@ -370,6 +370,30 @@ static int FileExists(const char *name, 
+diff --git a/eject.c b/eject.c
+index d67089c..f7b2a2e 100644
+--- a/eject.c
++++ b/eject.c
+@@ -370,6 +370,30 @@ static int FileExists(const char *name, const int try, int *found)
  
  
  /*
@@ -31,7 +33,7 @@
   * Given name, such as foo, see if any of the following exist:
   *
   * foo (if foo starts with '.' or '/')
-@@ -882,6 +906,8 @@ static int MountedDevice(const char *nam
+@@ -882,6 +906,8 @@ static int MountedDevice(const char *name, char **mountName, char **deviceName)
  		rc = sscanf(line, "%1023s %1023s", s1, s2);
  		if (rc >= 2) {
  			int mtabmaj, mtabmin;
@@ -40,7 +42,7 @@
  			GetMajorMinor(s1, &mtabmaj, &mtabmin);
  			if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) ||
  				((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) {
-@@ -928,6 +954,8 @@ static int MountableDevice(const char *n
+@@ -928,6 +954,8 @@ static int MountableDevice(const char *name, char **mountName, char **deviceName
  
  	while (fgets(line, sizeof(line), fp) != 0) {
  		rc = sscanf(line, "%1023s %1023s", s1, s2);
@@ -49,3 +51,12 @@
  		if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) {
  			FCLOSE(fp);
  			*deviceName = strdup(s1);
+@@ -968,6 +996,8 @@ static void UnmountDevices(const char *pattern)
+ 	while (fgets(line, sizeof(line), fp) != 0) {
+ 		status = sscanf(line, "%1023s %1023s", s1, s2);
+ 		if (status >= 2) {
++			DeMangleMount(s1);
++			DeMangleMount(s2);
+ 			status = regexec(&preg, s1, 0, 0, 0);
+ 			if (status == 0) {
+ 				if (v_option)

eject-2.1.5-umount.patch:
 eject.c |  151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)

Index: eject-2.1.5-umount.patch
===================================================================
RCS file: /cvs/extras/rpms/eject/devel/eject-2.1.5-umount.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- eject-2.1.5-umount.patch	2 Feb 2010 09:58:42 -0000	1.5
+++ eject-2.1.5-umount.patch	2 Jul 2010 15:42:32 -0000	1.6
@@ -1,5 +1,5 @@
 diff --git a/eject.c b/eject.c
-index bfccd37..948e2b2 100644
+index 4175756..057d2ea 100644
 --- a/eject.c
 +++ b/eject.c
 @@ -42,6 +42,7 @@
@@ -10,7 +10,7 @@ index bfccd37..948e2b2 100644
  
  #ifdef GETOPTLONG
  #include <getopt.h>
-@@ -1131,6 +1132,145 @@ static char *MultiplePartitions(const char *name)
+@@ -1133,6 +1134,145 @@ static char *MultiplePartitions(const char *name)
  	return 0;
  }
  
@@ -156,7 +156,7 @@ index bfccd37..948e2b2 100644
  
  /* handle -x option */
  static void HandleXOption(char *deviceName)
-@@ -1274,6 +1414,17 @@ int main(int argc, char **argv)
+@@ -1276,6 +1416,17 @@ int main(int argc, char **argv)
  		exit(0);
  	}
  


Index: eject.spec
===================================================================
RCS file: /cvs/extras/rpms/eject/devel/eject.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- eject.spec	25 May 2010 14:14:46 -0000	1.46
+++ eject.spec	2 Jul 2010 15:42:32 -0000	1.47
@@ -1,7 +1,7 @@
 Summary: A program that ejects removable media using software control
 Name: eject
 Version: 2.1.5
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -61,6 +61,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jul 02 2010 Kamil Dudka <kdudka at redhat.com> 2.1.5-20
+- handle multi-partition devices with spaces in mount points properly (#608502)
+
 * Tue May 25 2010 Kamil Dudka <kdudka at redhat.com> 2.1.5-19
 - do not run eject through consolehelper (#592367)
 - remove an invalid URL of the source tarball