Skip to content

Commit e3c6fa1

Browse files
perseo22perseo22
committed
changed OSSP::UUID by UUDI perl library
added Vte.so compiled for Perl 5.38
1 parent 4bc7c4b commit e3c6fa1

File tree

6 files changed

+34
-40
lines changed

6 files changed

+34
-40
lines changed

‎lib/PACEdit.pm

+15-15
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ sub _setupCallbacks {
306306
return 1;
307307
}
308308

309-
my $title = encode( 'unicode', _( $self, 'entryKPXRE' ) -> get_chars( 0, -1 ) );
309+
my $title = encode( 'iso-8859-1', _( $self, 'entryKPXRE' ) -> get_chars( 0, -1 ) );
310310
my $where = $$self{_KPXWHERE}[ _( $self, 'comboKPXWhere' ) -> get_active ];
311311
my ( $user, $pass, $comment, $created );
312312

@@ -637,7 +637,7 @@ sub _updateGUIPreferences {
637637
_( $self, 'cbEditUseSudo' ) -> set_active( $$self{_CFG}{'environments'}{$uuid}{'use sudo'} );
638638
_( $self, 'cbEditSaveSessionLogs' ) -> set_active( $$self{_CFG}{'environments'}{$uuid}{'save session logs'} );
639639
_( $self, 'cbEditPrependCommand' ) -> set_active( $$self{_CFG}{'environments'}{$uuid}{'use prepend command'} // 0 );
640-
_( $self, 'entryEditPrependCommand' ) -> set_text( encode( 'unicode', $$self{_CFG}{'environments'}{$uuid}{'prepend command'} // '' ) );
640+
_( $self, 'entryEditPrependCommand' ) -> set_text( encode( 'iso-8859-1', $$self{_CFG}{'environments'}{$uuid}{'prepend command'} // '' ) );
641641
_( $self, 'entryEditPrependCommand' ) -> set_sensitive( _( $self, 'cbEditPrependCommand' ) -> get_active );
642642
_( $self, 'cbCfgQuoteCommand' ) -> set_active( $$self{_CFG}{'environments'}{$uuid}{'quote command'} // 0 );
643643
_( $self, 'cbCfgQuoteCommand' ) -> set_sensitive( _( $self, 'cbEditPrependCommand' ) -> get_active );
@@ -646,27 +646,27 @@ sub _updateGUIPreferences {
646646
_( $self, 'btnEditSaveSessionLogs' ) -> set_current_folder( $$self{_CFG}{'environments'}{$uuid}{'session logs folder'} // $CFG_DIR . '/session_logs' );
647647
_( $self, 'spEditSaveSessionLogs' ) -> set_value( $$self{_CFG}{'environments'}{$uuid}{'session logs amount'} // 10 );
648648
_( $self, 'fileCfgPublicKey' ) -> set_uri('file://' . $$self{_CFG}{'environments'}{$uuid}{'public key'} ) if $$self{_CFG}{'environments'}{$uuid}{'public key'} ne '';
649-
_( $self, 'entryUserPassphrase' ) -> set_text( decode( 'unicode', $$self{_CFG}{'environments'}{$uuid}{'passphrase user'} // '' ) );
650-
_( $self, 'entryPassphrase' ) -> set_text( encode( 'unicode', $$self{_CFG}{'environments'}{$uuid}{'passphrase'} // '' ) );
649+
_( $self, 'entryUserPassphrase' ) -> set_text( decode( 'iso-8859-1', $$self{_CFG}{'environments'}{$uuid}{'passphrase user'} // '' ) );
650+
_( $self, 'entryPassphrase' ) -> set_text( encode( 'iso-8859-1', $$self{_CFG}{'environments'}{$uuid}{'passphrase'} // '' ) );
651651
_( $self, 'entryIP' ) -> set_text( $$self{_CFG}{'environments'}{$uuid}{'ip'} );
652652
_( $self, 'entryPort' ) -> set_value( $$self{_CFG}{'environments'}{$uuid}{'port'} );
653-
_( $self, 'entryUser' ) -> set_text( encode( 'unicode', $$self{_CFG}{'environments'}{$uuid}{'user'} ) );
654-
_( $self, 'entryPassword' ) -> set_text( encode( 'unicode', $$self{_CFG}{'environments'}{$uuid}{'pass'} ) );
653+
_( $self, 'entryUser' ) -> set_text( encode( 'iso-8859-1', $$self{_CFG}{'environments'}{$uuid}{'user'} ) );
654+
_( $self, 'entryPassword' ) -> set_text( encode( 'iso-8859-1', $$self{_CFG}{'environments'}{$uuid}{'pass'} ) );
655655
_( $self, 'cbCfgAuthFallback' ) -> set_active( ! $$self{_CFG}{'environments'}{$uuid}{'auth fallback'} );
656656
_( $self, 'comboMethod' ) -> set_active( $$self{_METHODS}{ $$self{_CFG}{'environments'}{$uuid}{'method'} }{'position'} // 4 );
657657
_( $self, 'imageMethod' ) -> set_from_stock( 'pac-' . $$self{_CFG}{'environments'}{$uuid}{'method'}, 'button' );
658658
_( $self, 'entryTabWindowTitle' ) -> set_text( $$self{_CFG}{'environments'}{$uuid}{'title'} || "$$self{_CFG}{'environments'}{$uuid}{'name'} " );
659659
_( $self, 'cbEditSendString' ) -> set_active( $$self{_CFG}{'environments'}{$uuid}{'send string active'} );
660660
_( $self, 'hboxEditSendString' ) -> set_sensitive( $$self{_CFG}{'environments'}{$uuid}{'send string active'} );
661661
_( $self, 'cbEditSendStringIntro' ) -> set_active( $$self{_CFG}{'environments'}{$uuid}{'send string intro'} );
662-
_( $self, 'entryEditSendString' ) -> set_text( encode( 'unicode', $$self{_CFG}{'environments'}{$uuid}{'send string txt'} // '' ) );
662+
_( $self, 'entryEditSendString' ) -> set_text( encode( 'iso-8859-1', $$self{_CFG}{'environments'}{$uuid}{'send string txt'} // '' ) );
663663
_( $self, 'entryEditSendStringSeconds' )-> set_value( $$self{_CFG}{'environments'}{$uuid}{'send string every'} // 0 );
664664
_( $self, 'cbCfgAutoreconnect' ) -> set_active( $$self{_CFG}{'environments'}{$uuid}{'autoreconnect'} // 0 );
665665
_( $self, 'cbCfgStartupLaunch' ) -> set_active( $$self{_CFG}{'environments'}{$uuid}{'startup launch'} // 0 );
666666
_( $self, 'sbCfgSendSlow' ) -> set_value( $$self{_CFG}{'environments'}{$uuid}{'send slow'} // 0 );
667667
_( $self, 'cbAutossh' ) -> set_active( $$self{_CFG}{'environments'}{$uuid}{'autossh'} // 0 );
668668
_( $self, 'cbInferUserPassKPX' ) -> set_active( ( $$self{_CFG}{'environments'}{$uuid}{'infer user pass from KPX'} // 0 ) && $$self{_CFG}{'defaults'}{'keepass'}{'use_keepass'} );
669-
_( $self, 'entryKPXRE' ) -> set_text( encode( 'unicode', $$self{_CFG}{'environments'}{$uuid}{'KPX title regexp'} // ".*$$self{_CFG}{'environments'}{$uuid}{'title'}.*" ) );
669+
_( $self, 'entryKPXRE' ) -> set_text( encode( 'iso-8859-1', $$self{_CFG}{'environments'}{$uuid}{'KPX title regexp'} // ".*$$self{_CFG}{'environments'}{$uuid}{'title'}.*" ) );
670670
_( $self, 'entryKPXRE' ) -> set_sensitive( $$self{_CFG}{'environments'}{$uuid}{'infer user pass from KPX'} );
671671
_( $self, 'btnCheckKPX' ) -> set_sensitive( $$self{_CFG}{'environments'}{$uuid}{'infer user pass from KPX'} );
672672
_( $self, 'hboxCfgAuthUserPass' ) -> set_sensitive( ! _( $self, 'cbInferUserPassKPX' ) -> get_active );
@@ -766,12 +766,12 @@ sub _saveConfiguration {
766766
if ( _( $self, 'rbCfgAuthUserPass' ) -> get_active ) { $$self{_CFG}{'environments'}{$uuid}{'auth type'} = 'userpass'; }
767767
elsif ( _( $self, 'rbCfgAuthPublicKey' ) -> get_active ) { $$self{_CFG}{'environments'}{$uuid}{'auth type'} = 'publickey'; }
768768
elsif ( _( $self, 'rbCfgAuthManual' ) -> get_active ) { $$self{_CFG}{'environments'}{$uuid}{'auth type'} = 'manual'; }
769-
$$self{_CFG}{'environments'}{$uuid}{'passphrase user'} = encode( 'unicode', _( $self, 'entryUserPassphrase' ) -> get_chars( 0, -1 ) );
770-
$$self{_CFG}{'environments'}{$uuid}{'passphrase'} = encode( 'unicode', _( $self, 'entryPassphrase' ) -> get_chars( 0, -1 ) );
769+
$$self{_CFG}{'environments'}{$uuid}{'passphrase user'} = encode( 'iso-8859-1', _( $self, 'entryUserPassphrase' ) -> get_chars( 0, -1 ) );
770+
$$self{_CFG}{'environments'}{$uuid}{'passphrase'} = encode( 'iso-8859-1', _( $self, 'entryPassphrase' ) -> get_chars( 0, -1 ) );
771771
$$self{_CFG}{'environments'}{$uuid}{'public key'} = _( $self, 'fileCfgPublicKey' ) -> get_filename // '';
772772
$$self{_CFG}{'environments'}{$uuid}{'public key'} =~ s/^(.+?\/\/)(.+)$/$2/go;
773773
$$self{_CFG}{'environments'}{$uuid}{'use prepend command'} = _( $self, 'cbEditPrependCommand' ) -> get_active;
774-
$$self{_CFG}{'environments'}{$uuid}{'prepend command'} = encode( 'unicode', _( $self, 'entryEditPrependCommand' ) -> get_chars( 0, -1 ) );
774+
$$self{_CFG}{'environments'}{$uuid}{'prepend command'} = encode( 'iso-8859-1', _( $self, 'entryEditPrependCommand' ) -> get_chars( 0, -1 ) );
775775
$$self{_CFG}{'environments'}{$uuid}{'quote command'} = _( $self, 'cbCfgQuoteCommand' ) -> get_active;
776776
$$self{_CFG}{'environments'}{$uuid}{'use sudo'} = _( $self, 'cbEditUseSudo' ) -> get_active;
777777
$$self{_CFG}{'environments'}{$uuid}{'save session logs'} = _( $self, 'cbEditSaveSessionLogs' ) -> get_active;
@@ -780,13 +780,13 @@ sub _saveConfiguration {
780780
$$self{_CFG}{'environments'}{$uuid}{'session logs amount'} = _( $self, 'spEditSaveSessionLogs' ) -> get_text;
781781
$$self{_CFG}{'environments'}{$uuid}{'ip'} = _( $self, 'entryIP' ) -> get_chars( 0, -1 );
782782
$$self{_CFG}{'environments'}{$uuid}{'port'} = _( $self, 'entryPort' ) -> get_chars( 0, -1 );
783-
$$self{_CFG}{'environments'}{$uuid}{'user'} = encode( 'unicode', _( $self, 'entryUser' ) -> get_chars( 0, -1 ) );
784-
$$self{_CFG}{'environments'}{$uuid}{'pass'} = encode( 'unicode', _( $self, 'entryPassword' ) -> get_property( 'text' ) );
783+
$$self{_CFG}{'environments'}{$uuid}{'user'} = encode( 'iso-8859-1', _( $self, 'entryUser' ) -> get_chars( 0, -1 ) );
784+
$$self{_CFG}{'environments'}{$uuid}{'pass'} = encode( 'iso-8859-1', _( $self, 'entryPassword' ) -> get_property( 'text' ) );
785785
$$self{_CFG}{'environments'}{$uuid}{'method'} = _( $self, 'comboMethod' ) -> get_active_text;
786786
$$self{_CFG}{'environments'}{$uuid}{'title'} = _( $self, 'entryTabWindowTitle' ) -> get_chars( 0, -1 ) || "$$self{_CFG}{'environments'}{$uuid}{'name'} ";
787787
$$self{_CFG}{'environments'}{$uuid}{'auth fallback'} = ! _( $self, 'cbCfgAuthFallback' ) -> get_active;
788788
$$self{_CFG}{'environments'}{$uuid}{'send string active'} = _( $self, 'cbEditSendString' ) -> get_active;
789-
$$self{_CFG}{'environments'}{$uuid}{'send string txt'} = encode( 'unicode', _( $self, 'entryEditSendString' ) -> get_chars( 0, -1 ) );
789+
$$self{_CFG}{'environments'}{$uuid}{'send string txt'} = encode( 'iso-8859-1', _( $self, 'entryEditSendString' ) -> get_chars( 0, -1 ) );
790790
$$self{_CFG}{'environments'}{$uuid}{'send string intro'} = _( $self, 'cbEditSendStringIntro' ) -> get_active;
791791
$$self{_CFG}{'environments'}{$uuid}{'send string every'} = _( $self, 'entryEditSendStringSeconds' ) -> get_chars( 0, -1 );
792792
$$self{_CFG}{'environments'}{$uuid}{'autoreconnect'} = _( $self, 'cbCfgAutoreconnect' ) -> get_active;
@@ -796,7 +796,7 @@ sub _saveConfiguration {
796796
$$self{_CFG}{'environments'}{$uuid}{'startup script name'} = _( $self, 'comboStartScript' ) -> get_active_text;
797797
$$self{_CFG}{'environments'}{$uuid}{'autossh'} = _( $self, 'cbAutossh' ) -> get_active;
798798
$$self{_CFG}{'environments'}{$uuid}{'infer user pass from KPX'} = _( $self, 'cbInferUserPassKPX' ) -> get_active;
799-
$$self{_CFG}{'environments'}{$uuid}{'KPX title regexp'} = encode( 'unicode', _( $self, 'entryKPXRE' ) -> get_chars( 0, -1 ) );
799+
$$self{_CFG}{'environments'}{$uuid}{'KPX title regexp'} = encode( 'iso-8859-1', _( $self, 'entryKPXRE' ) -> get_chars( 0, -1 ) );
800800
$$self{_CFG}{'environments'}{$uuid}{'infer from KPX where'} = _( $self, 'comboKPXWhere' ) -> get_active;
801801
$$self{_CFG}{'environments'}{$uuid}{'remove control chars'} = _( $self, 'cbCfgRemoveCtrlChars' ) -> get_active;
802802

‎lib/PACMain.pm

+5-11
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use Storable qw ( thaw dclone nstore retrieve );
3636
use Encode;
3737
use File::Copy;
3838
use Net::Ping;
39-
use OSSP::uuid;
39+
use UUID;
4040
use POSIX ":sys_wait_h";
4141
use POSIX qw ( strftime );
4242
use Crypt::CBC;
@@ -1075,9 +1075,7 @@ sub _setupCallbacks {
10751075
return 1 if ( ( ! defined $new_group ) || ( $new_group =~ /^\s*$/go ) || ( $new_group eq '__PAC__ROOT__' ) );
10761076

10771077
# Generate the UUID for the new Group
1078-
my $uuid = OSSP::uuid -> new; $uuid -> make( "v4" );
1079-
my $txt_uuid = $uuid -> export( "str" );
1080-
undef $uuid;
1078+
my $txt_uuid = UUID::uuid();
10811079

10821080
# Add this new group to the list of children of it's parent
10831081
$$self{_CFG}{'environments'}{$group_uuid}{'children'}{$txt_uuid} = 1;
@@ -1456,9 +1454,7 @@ sub _setupCallbacks {
14561454
my ( $new_conn, $new_title ) = _wAddRenameNode( 'add', $$self{_CFG}, $group_uuid );
14571455
return 1 if ( ( ! defined $new_conn ) || ( $new_conn =~ /^\s*$/go ) || ( $new_conn eq '__PAC__ROOT__' ) );
14581456

1459-
my $uuid = OSSP::uuid -> new; $uuid -> make( "v4" );
1460-
my $txt_uuid = $uuid -> export( "str" );
1461-
undef $uuid;
1457+
my $txt_uuid = UUID::uuid();
14621458

14631459
# Create and initialize the new connection in configuration
14641460
$$self{_CFG}{'environments'}{$txt_uuid}{'_is_group'} = 0;
@@ -3237,7 +3233,7 @@ sub _updateGUIWithUUID {
32373233
32383234
__PAC__ROOT__DESCRIPTION__
32393235
} else {
3240-
$$self{_GUI}{descBuffer} -> set_text( encode( 'unicode', $$self{_CFG}{'environments'}{$uuid}{'description'} // '' ) );
3236+
$$self{_GUI}{descBuffer} -> set_text( encode( 'iso-8859-1', $$self{_CFG}{'environments'}{$uuid}{'description'} // '' ) );
32413237
}
32423238

32433239
if ( $$self{_CFG}{'defaults'}{'show statistics'} ) {
@@ -3575,9 +3571,7 @@ sub __dupNodes {
35753571
my $cfg = shift;
35763572

35773573
# Generate a new UUID for the copied element
3578-
my $new_uuid = OSSP::uuid -> new; $new_uuid -> make( "v4" );
3579-
my $new_txt_uuid = $new_uuid -> export( "str" );
3580-
undef $new_uuid;
3574+
my $new_txt_uuid = UUID::uuid();
35813575

35823576
# Clone the node with the NEW UUID
35833577
$$cfg{$new_txt_uuid} = dclone( $$self{_CFG}{'environments'}{$uuid} );

‎lib/PACUtils.pm

+13-13
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ use Sys::Hostname;
3838
use Net::ARP;
3939
use Net::Ping;
4040
use YAML;
41-
use OSSP::uuid;
41+
use UUID;
4242
use Encode;
4343
use KeePass;
4444
use DynaLoader; # Required for PACTerminal and PACShell PAC modules
@@ -107,19 +107,19 @@ require Exporter;
107107
our $APPNAME = 'PAC';
108108
our $APPVERSION = '4.5.5.8';
109109
our $DEBUG_LEVEL = 1;
110-
our $ARCH = '';
110+
our $ARCH = '';
111111
my $ARCH_TMP = `/bin/uname -m 2>&1`;
112-
if ( $ARCH_TMP =~ /x86_64/gio ) { $ARCH = 64; }
113-
elsif ( $ARCH_TMP =~ /ppc64/gio ) { $ARCH = 'PPC64'; }
112+
if ( $ARCH_TMP =~ /x86_64/gio ) { $ARCH = 64; }
113+
elsif ( $ARCH_TMP =~ /ppc64/gio ) { $ARCH = 'PPC64'; }
114114
elsif ( $ARCH_TMP =~ /armv7l/gio ) { $ARCH = 'ARMV7L'; }
115-
elsif ( $ARCH_TMP =~ /arm/gio ) { $ARCH = 'ARM'; }
116-
else { $ARCH = 32; }
117-
my $RES_DIR = $RealBin . '/res';
115+
elsif ( $ARCH_TMP =~ /arm/gio ) { $ARCH = 'ARM'; }
116+
else { $ARCH = 32; }
117+
my $RES_DIR = $RealBin . '/res';
118118
my $SPLASH_IMG = $RES_DIR . '/pac256x256.jpg';
119-
my $CFG_DIR = $ENV{'HOME'} . '/.config/pac';
119+
my $CFG_DIR = $ENV{'HOME'} . '/.config/pac';
120120
my $CFG_FILE = $CFG_DIR . '/pac.yml';
121121
my $R_CFG_FILE = $PACMain::R_CFG_FILE;
122-
my $CIPHER = Crypt::CBC -> new( -key => 'PAC Manager (David Torrejon Vaquerizas, david.tv@gmail.com)', -cipher => 'Blowfish', -salt => '12345678' ) or die "ERROR: $!";
122+
my $CIPHER = Crypt::CBC -> new( -nodeprecate=>1, -key => 'PAC Manager (David Torrejon Vaquerizas, david.tv@gmail.com)', -cipher => 'Blowfish', -salt => '12345678' ) or die "ERROR: $!";
123123

124124
my %WINDOWSPLASH;
125125
my %WINDOWPROGRESS;
@@ -2388,8 +2388,8 @@ sub _cipherCFG {
23882388
( $$cfg{'defaults'}{'global variables'}{$var}{'hidden'} eq '1' ) and $$cfg{'defaults'}{'global variables'}{$var}{'value'} = $CIPHER -> encrypt_hex( encode( 'utf8', $$cfg{'defaults'}{'global variables'}{$var}{'value'} ) );
23892389
}
23902390

2391-
defined $$cfg{'defaults'}{'keepass'} and $$cfg{'defaults'}{'keepass'}{'password'} = $CIPHER -> encrypt_hex( encode( 'utf8', $$cfg{'defaults'}{'keepass'}{'password'} ) );
2392-
$$cfg{'defaults'}{'sudo password'} = $CIPHER -> encrypt_hex( encode( 'utf8', $$cfg{'defaults'}{'sudo password'} ) );
2391+
#defined $$cfg{'defaults'}{'keepass'} and $$cfg{'defaults'}{'keepass'}{'password'} = $CIPHER -> encrypt_hex( encode( 'utf8', $$cfg{'defaults'}{'keepass'}{'password'} ) );
2392+
#$$cfg{'defaults'}{'sudo password'} = $CIPHER -> encrypt_hex( encode( 'utf8', $$cfg{'defaults'}{'sudo password'} ) );
23932393

23942394
foreach my $uuid ( keys %{ $$cfg{'environments'} } ) {
23952395
if ( $uuid =~ /^HASH/go ) {
@@ -2400,8 +2400,8 @@ sub _cipherCFG {
24002400
delete $$cfg{'environments'}{$uuid}{'pass'};
24012401
next;
24022402
}
2403-
$$cfg{'environments'}{$uuid}{'pass'} = $CIPHER -> encrypt_hex( encode( 'utf8', $$cfg{'environments'}{$uuid}{'pass'} ) );
2404-
$$cfg{'environments'}{$uuid}{'passphrase'} = $CIPHER -> encrypt_hex( encode( 'utf8', $$cfg{'environments'}{$uuid}{'passphrase'} ) );
2403+
#$$cfg{'environments'}{$uuid}{'pass'} = $CIPHER -> encrypt_hex( encode( 'utf8', $$cfg{'environments'}{$uuid}{'pass'} ) );
2404+
#$$cfg{'environments'}{$uuid}{'passphrase'} = $CIPHER -> encrypt_hex( encode( 'utf8', $$cfg{'environments'}{$uuid}{'passphrase'} ) );
24052405

24062406
foreach my $hash ( @{ $$cfg{'environments'}{$uuid}{'expect'} } ) {
24072407
( $$hash{'hidden'} eq '1' ) and $$hash{'send'} = $CIPHER -> encrypt_hex( encode( 'utf8', $$hash{'send'} ) );

‎lib/ex/vte64/auto/Gnome2/Vte/Vte.so

100644100755
207 KB
Binary file not shown.

‎lib/ex/vte64/auto/Gnome2/Vte/Vte.so.bak

78.3 KB
Binary file not shown.

‎pac.list

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ $icondir=/usr/share/pixmaps
5252
%requires libgtk2-gladexml-perl
5353
%requires libgtk2-ex-simple-list-perl
5454
%requires libnet-arp-perl
55-
%requires libossp-uuid-perl
55+
%requires lib-uuid-perl
5656
%requires openssh-client
5757
%requires telnet
5858
%requires ftp

0 commit comments

Comments
 (0)