rpms
/
gparted
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- New upstream version

Browse Source
epel8
Deji Akingunola 17 years ago
parent a4c9412f74
commit 9db4c229e5
7 changed files with 89 additions and 81 deletions
Show Stats Download Patch File Download Diff File

2
.cvsignore
Unescape View File

@ -1 +1 @@
gparted-0.3.3.tar.bz2
gparted-0.3.5.tar.bz2

36
gparted-devices.patch
Unescape View File

@ -1,36 +0,0 @@
--- src/GParted_Core.cc 2006/12/08 13:14:05 759
+++ src/GParted_Core.cc 2007/01/07 20:29:03 764
@@ -155,7 +155,20 @@
lp_device = ped_device_get_next( NULL );
while ( lp_device )
{
- device_paths .push_back( lp_device ->path ) ;
+ //only add this device if we can read the first sector (which means it's a real device)
+ char * buf = static_cast<char *>( malloc( lp_device ->sector_size ) ) ;
+ if ( buf )
+ {
+ if ( ped_device_open( lp_device ) )
+ {
+ if ( ped_device_read( lp_device, buf, 0, 1 ) )
+ device_paths .push_back( lp_device ->path ) ;
+
+ ped_device_close( lp_device ) ;
+ }
+
+ free( buf ) ;
+ }
lp_device = ped_device_get_next( lp_device ) ;
}
@@ -163,10 +176,10 @@
std::sort( device_paths .begin(), device_paths .end() ) ;
}
-
+
for ( unsigned int t = 0 ; t < device_paths .size() ; t++ )
{
- if ( device_paths[ t ] .length() > 6 && device_paths[ t ] .is_ascii() && open_device_and_disk( device_paths[ t ], false ) )
+ if ( open_device_and_disk( device_paths[ t ], false ) )
{
temp_device .Reset() ;

58
gparted-dont-lock-hal.patch
Unescape View File

@ -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 ;

35
gparted-realpath-fix.patch
Unescape View File

@ -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 @@
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 )
--- 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 )
{
//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 ) ;
}
- char c_str[255] ;
+ char c_str[PATH_MAX+1] ;
proc_partitions .close() ;
while ( getline( proc_partitions, line ) )
if ( sscanf( line .c_str(), "%*d %*d %*d %255s", c_str ) == 1 )

18
gparted-refresh_crash-fix.patch
Unescape View File

@ -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

17
gparted.spec
Unescape View File

@ -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 @@ Source1: run-gparted
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 @@ will be detected at runtime and don't require a rebuild of GParted
%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 @@ fi
%config(noreplace) %{_sysconfdir}/security/console.apps/gparted
%changelog
* Thu Feb 07 2008 Deji Akingunola <dakingun@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

2
sources
Unescape View File

@ -1 +1 @@
f3d16ccfda72fa1dac9fa1ff9ded2c42 gparted-0.3.3.tar.bz2
c99c3d78192519b0b7c932a0920ac169 gparted-0.3.5.tar.bz2

Write Preview
Loading…
Cancel
Save