rpms/gparted/devel .cvsignore, 1.12, 1.13 gparted-dont-lock-hal.patch, 1.1, 1.2 gparted-realpath-fix.patch, 1.2, 1.3 gparted-refresh_crash-fix.patch, 1.1, 1.2 gparted.spec, 1.36, 1.37 sources, 1.12, 1.13 gparted-devices.patch, 1.1, NONE

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12413

Modified Files:
	.cvsignore gparted-dont-lock-hal.patch 
	gparted-realpath-fix.patch gparted-refresh_crash-fix.patch 
	gparted.spec sources 
Removed Files:
	gparted-devices.patch 
Log Message:
* Thu Feb 07 2008 Deji Akingunola <dakingun at gmail.com> - 0.3.5-1
- New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	7 Dec 2006 06:18:57 -0000	1.12
+++ .cvsignore	9 Feb 2008 04:09:19 -0000	1.13
@@ -1 +1 @@
-gparted-0.3.3.tar.bz2
+gparted-0.3.5.tar.bz2

gparted-dont-lock-hal.patch:

Index: gparted-dont-lock-hal.patch
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted-dont-lock-hal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gparted-dont-lock-hal.patch	3 Apr 2007 03:52:33 -0000	1.1
+++ gparted-dont-lock-hal.patch	9 Feb 2008 04:09:19 -0000	1.2
@@ -1,17 +1,63 @@
---- src/GParted_Core.cc	2006-12-05 14:39:31.000000000 -0500
-+++ src/GParted_Core.cc.new	2007-04-02 21:59:01.000000000 -0400
-@@ -54,21 +54,6 @@
+--- src/GParted_Core.cc	2008-02-04 09:35:47.000000000 -0500
++++ src/GParted_Core.cc.new	2008-02-07 15:26:32.000000000 -0500
+@@ -38,8 +38,6 @@
+ #include "../include/ufs.h"
+ 
+ #include <cerrno>
+-#include <cstdio>
+-#include <csignal>
+ #include <sys/statvfs.h>	
+ 
+ std::vector<Glib::ustring> libparted_messages ; //see ped_exception_handler()
+@@ -47,13 +45,6 @@
+ namespace GParted
+ {
+ 
+-// Clean up the fdi when terminating
+-void sig_fdi_cleanup( int signum )
+-{
+-	remove( "/usr/share/hal/fdi/policy/gparted-disable-automount.fdi" );
+-	raise( signum );
+-}
+-
+ GParted_Core::GParted_Core() 
+ {
+ 	lp_device = NULL ;
+@@ -63,44 +54,6 @@
  
  	ped_exception_set_handler( ped_exception_handler ) ; 
- 	
+ 
+-	//make sure that the fdi is cleaned up on all but the most forceful
+-	//program exits
+-	struct sigaction sa;
+-	sa.sa_handler = sig_fdi_cleanup;
+-	sigemptyset( &sa.sa_mask );
+-	sa.sa_flags = SA_RESETHAND;
+-	if( sigaction( SIGHUP, &sa, NULL ) == -1 ||
+-	    sigaction( SIGINT, &sa, NULL ) == -1 ||
+-	    sigaction( SIGQUIT, &sa, NULL ) == -1 ||
+-	    sigaction( SIGILL, &sa, NULL ) == -1 ||
+-	    sigaction( SIGABRT, &sa, NULL ) == -1 ||
+-	    sigaction( SIGFPE, &sa, NULL ) == -1 ||
+-	    sigaction( SIGSEGV, &sa, NULL ) == -1 ||
+-	    sigaction( SIGPIPE, &sa, NULL ) == -1 ||
+-	    sigaction( SIGALRM, &sa, NULL ) == -1 ||
+-	    sigaction( SIGTERM, &sa, NULL ) == -1 ||
+-	    sigaction( SIGUSR1, &sa, NULL ) == -1 ||
+-	    sigaction( SIGUSR2, &sa, NULL ) == -1 ||
+-	    sigaction( SIGBUS, &sa, NULL ) == -1 ||
+-	    sigaction( SIGXCPU, &sa, NULL ) == -1 ||
+-	    sigaction( SIGXFSZ, &sa, NULL ) == -1 )
+-		perror( "Could not set signal handler" );
+-	
 -	//disable automount //FIXME: temporary hack, till i find a better solution...
 -	std::ofstream fdi_file( "/usr/share/hal/fdi/policy/gparted-disable-automount.fdi" ) ;
 -	if ( fdi_file )
 -	{
 -		fdi_file << "<deviceinfo version='0.2'>" ;
 -		fdi_file << "<device>" ;
--		fdi_file << "<match key='@block.storage_device:storage.hotpluggable' bool='true'>" ;
--		fdi_file << "<merge key='volume.ignore' type='bool'>true</merge>" ;
+-		fdi_file << "<match key='storage.hotpluggable' bool='true'>" ;
+-		fdi_file << "<merge key='storage.automount_enabled_hint' type='bool'>false</merge>" ;
 -		fdi_file << "</match>" ;
 -		fdi_file << "</device>" ;
 -		fdi_file << "</deviceinfo>" ;
@@ -22,7 +68,7 @@
  	//get valid flags ...
  	for ( PedPartitionFlag flag = ped_partition_flag_next( static_cast<PedPartitionFlag>( NULL ) ) ;
  	      flag ;
-@@ -2287,8 +2272,6 @@
+@@ -2332,8 +2285,6 @@
  	if ( p_filesystem )
  		delete p_filesystem ;
  

gparted-realpath-fix.patch:

Index: gparted-realpath-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted-realpath-fix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gparted-realpath-fix.patch	22 Nov 2007 05:16:29 -0000	1.2
+++ gparted-realpath-fix.patch	9 Feb 2008 04:09:19 -0000	1.3
@@ -1,28 +1,11 @@
---- src/GParted_Core.cc	2006-12-05 14:39:31.000000000 -0500
-+++ src/GParted_Core.cc.new	2007-11-22 00:01:43.000000000 -0500
-@@ -487,19 +487,23 @@
+--- src/GParted_Core.cc	2008-02-04 09:35:47.000000000 -0500
++++ src/GParted_Core.cc.new2	2008-02-07 15:57:14.000000000 -0500
+@@ -527,7 +527,7 @@
+ 	std::ifstream proc_partitions( "/proc/partitions" ) ;
+ 	if ( proc_partitions )
+ 	{
+-		char c_str[255] ;
++		char c_str[PATH_MAX+1] ;
+ 		
  		while ( getline( proc_partitions, line ) )
  			if ( sscanf( line .c_str(), "%*d %*d %*d %255s", c_str ) == 1 )
- 			{
-+				char *real_path = NULL;
-+
- 				line = "/dev/" ; 
- 				line += c_str ;
- 				
- 				//FIXME: it seems realpath is very unsafe to use (manpage)...
-+				real_path = realpath( line .c_str(), NULL ) ;
- 				if ( file_test( line, Glib::FILE_TEST_EXISTS ) &&
--				     realpath( line .c_str(), c_str ) &&
-+				     real_path &&
- 				     line != c_str )
- 				{
- 					//because we can make no assumption about which path libparted will detect
- 					//we add all combinations.
- 					alternate_paths[ c_str ] = line ;
--					alternate_paths[ line ] = c_str ;
- 				}
-+				if ( real_path )
-+				  free( real_path ) ;
- 			}
- 
- 		proc_partitions .close() ;

gparted-refresh_crash-fix.patch:

Index: gparted-refresh_crash-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted-refresh_crash-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gparted-refresh_crash-fix.patch	30 Oct 2007 04:58:13 -0000	1.1
+++ gparted-refresh_crash-fix.patch	9 Feb 2008 04:09:19 -0000	1.2
@@ -8,8 +8,8 @@
  									
  	GParted_Core gparted_core ;
  	std::vector<Gtk::Label *> device_info ;
---- src/Win_GParted.cc	2006-12-01 08:14:23.000000000 -0500
-+++ src/Win_GParted.cc.new	2007-10-30 00:35:47.000000000 -0400
+--- src/Win_GParted.cc	2008-02-04 09:35:47.000000000 -0500
++++ src/Win_GParted.cc.new	2008-02-07 15:34:30.000000000 -0500
 @@ -260,7 +260,8 @@
  	combo_devices .pack_start( treeview_devices_columns .device ) ;
  	combo_devices .pack_start( treeview_devices_columns .size, false ) ;
@@ -36,3 +36,17 @@
  	combo_devices .set_active( current_device ) ;
  }
  
+@@ -916,13 +919,8 @@
+ 
+ void Win_GParted::combo_devices_changed()
+ {
+-	unsigned int old_current_device = current_device;
+ 	//set new current device
+ 	current_device = combo_devices .get_active_row_number() ;
+-	if ( current_device == (unsigned int) -1 )
+-		current_device = old_current_device;
+-	if ( current_device >= devices .size() )
+-		current_device = 0 ;
+ 	set_title( String::ucompose( _("%1 - GParted"), devices[ current_device ] .get_path() ) );
+ 	
+ 	//refresh label_device_info


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- gparted.spec	4 Jan 2008 09:23:59 -0000	1.36
+++ gparted.spec	9 Feb 2008 04:09:19 -0000	1.37
@@ -1,7 +1,7 @@
 Summary:	Gnome Partition Editor
 Name:		gparted
-Version:	0.3.3
-Release:	16%{?dist}
+Version:	0.3.5
+Release:	1%{?dist}
 Group:		Applications/System
 License:	GPLv2+
 URL:		http://gparted.sourceforge.net
@@ -10,9 +10,8 @@
 Source2:	gparted-console.apps
 Source3:	gparted-pam.d
 Patch0:		gparted-dont-lock-hal.patch
-Patch1:		gparted-devices.patch
-Patch2:		gparted-realpath-fix.patch
-Patch3:		gparted-refresh_crash-fix.patch
+Patch1:		gparted-realpath-fix.patch
+Patch2:		gparted-refresh_crash-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtkmm24-devel parted-devel 
 BuildRequires:	e2fsprogs-devel gettext perl(XML::Parser) 
@@ -30,9 +29,8 @@
 %prep
 %setup -q
 %patch0 -p0 -b .hal
-%patch1 -p0 -b .devs
-%patch2 -p0 -b .realpath
-%patch3 -p0 -b .refresh
+%patch1 -p0 -b .realpath
+%patch2 -p0 -b .refresh
 
 %build
 %configure
@@ -88,6 +86,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Thu Feb 07 2008 Deji Akingunola <dakingun at gmail.com> - 0.3.5-1
+- New upstream version
+
 * Fri Jan 04 2008 Adam Tkac <atkac redhat com> - 0.3.3-16
 - rebuild against new parted
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	7 Dec 2006 06:18:57 -0000	1.12
+++ sources	9 Feb 2008 04:09:19 -0000	1.13
@@ -1 +1 @@
-f3d16ccfda72fa1dac9fa1ff9ded2c42  gparted-0.3.3.tar.bz2
+c99c3d78192519b0b7c932a0920ac169  gparted-0.3.5.tar.bz2


--- gparted-devices.patch DELETED ---