From 9a78c2f4bcc69936edde7d9e98414fae65a6b32c Mon Sep 17 00:00:00 2001 From: opensides Date: Wed, 31 Mar 2010 20:15:19 +0000 Subject: [PATCH] - Corrected various perl errors due to buf fixes and merging of patches git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17444 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-si/client/events/corefunctions.pm | 6 ++++-- gosa-si/client/events/dak.pm | 6 ++++-- gosa-si/client/events/gosaTriggered.pm | 6 ++++-- gosa-si/client/events/installation.pm | 6 ++++-- gosa-si/client/events/krb5.pm | 6 ++++-- gosa-si/client/events/load_reporter.pm | 6 ++++-- gosa-si/client/events/mailqueue.pm | 6 ++++-- gosa-si/debian/changelog | 4 ++-- gosa-si/debian/copyright | 4 ++-- gosa-si/debian/gosa-si-common.init | 4 ++-- gosa-si/gosa-si-client | 1 - gosa-si/gosa-si-server | 8 +++----- gosa-si/modules/ArpHandler.pm | 2 +- gosa-si/modules/ClientPackages.pm | 2 +- gosa-si/modules/DBsqlite.pm | 1 + gosa-si/modules/GosaPackages.pm | 2 +- gosa-si/modules/GosaSupportDaemon.pm | 7 ++++--- gosa-si/modules/ServerPackages.pm | 2 +- gosa-si/modules/TestModule.pm | 6 ++++-- gosa-si/server/events/clMessages.pm | 5 +++-- gosa-si/server/events/databases.pm | 6 ++++-- gosa-si/server/events/gosaTriggered.pm | 6 ++++-- gosa-si/server/events/logHandling.pm | 6 ++++-- gosa-si/server/events/mailqueue_com.pm | 6 ++++-- gosa-si/server/events/opsi_com.pm | 6 ++++-- gosa-si/server/events/server_server_com.pm | 6 ++++-- gosa-si/server/events/siTriggered.pm | 6 ++++-- 27 files changed, 81 insertions(+), 51 deletions(-) diff --git a/gosa-si/client/events/corefunctions.pm b/gosa-si/client/events/corefunctions.pm index a25aa98cb..ffb00f3d7 100644 --- a/gosa-si/client/events/corefunctions.pm +++ b/gosa-si/client/events/corefunctions.pm @@ -7,7 +7,8 @@ use Fcntl; use GOSA::GosaSupportDaemon; use File::Basename; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "get_events", "registered", @@ -21,7 +22,8 @@ my @events = ( "ping", "import_events", # no implementations ); -@EXPORT = @events; + +our @EXPORT = @events; my ($ldap_enabled, $offline_enabled, $ldap_config, $pam_config, $nss_config, $fai_logpath, $ldap_config_exit_hook); diff --git a/gosa-si/client/events/dak.pm b/gosa-si/client/events/dak.pm index b6a0a6883..8070221a4 100644 --- a/gosa-si/client/events/dak.pm +++ b/gosa-si/client/events/dak.pm @@ -11,14 +11,16 @@ use Exporter; use GOSA::GosaSupportDaemon; use MIME::Base64; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "get_events", "get_dak_keyring", "import_dak_key", "remove_dak_key", ); -@EXPORT = @events; + +our @EXPORT = @events; BEGIN {} diff --git a/gosa-si/client/events/gosaTriggered.pm b/gosa-si/client/events/gosaTriggered.pm index fb7c8f892..3afc78386 100644 --- a/gosa-si/client/events/gosaTriggered.pm +++ b/gosa-si/client/events/gosaTriggered.pm @@ -36,7 +36,8 @@ use GOSA::GosaSupportDaemon; use MIME::Base64; use File::Temp qw/ tempfile/; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "get_events", "usr_msg", @@ -49,7 +50,8 @@ my @events = ( "trigger_action_instant_update", "trigger_goto_settings_reload", ); -@EXPORT = @events; + +our @EXPORT = @events; BEGIN {} diff --git a/gosa-si/client/events/installation.pm b/gosa-si/client/events/installation.pm index ecd9204fd..62420fe18 100644 --- a/gosa-si/client/events/installation.pm +++ b/gosa-si/client/events/installation.pm @@ -6,9 +6,11 @@ use warnings; use Exporter; use Fcntl; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = qw(get_events set_activated_for_installation); -@EXPORT = @events; + +our @EXPORT = @events; BEGIN {} diff --git a/gosa-si/client/events/krb5.pm b/gosa-si/client/events/krb5.pm index 30d23e008..39cf3f476 100644 --- a/gosa-si/client/events/krb5.pm +++ b/gosa-si/client/events/krb5.pm @@ -9,7 +9,8 @@ use GOSA::GosaSupportDaemon; use Authen::Krb5; use Authen::Krb5::Admin qw(:constants); -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "get_events", "krb5_list_principals", @@ -24,7 +25,8 @@ my @events = ( "krb5_del_policy", "krb5_set_password", ); -@EXPORT = @events; + +our @EXPORT = @events; BEGIN {} diff --git a/gosa-si/client/events/load_reporter.pm b/gosa-si/client/events/load_reporter.pm index b9cb41e7b..b823237d9 100644 --- a/gosa-si/client/events/load_reporter.pm +++ b/gosa-si/client/events/load_reporter.pm @@ -10,7 +10,8 @@ use GOSA::GosaSupportDaemon; BEGIN {} END {} -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "get_events", "get_terminal_server", @@ -18,7 +19,8 @@ my @events = ( "report_load", "set_terminal_server", ); -@EXPORT = @events; + +our @EXPORT = @events; my $ts_load_file; my $waiting_for_ts_info; diff --git a/gosa-si/client/events/mailqueue.pm b/gosa-si/client/events/mailqueue.pm index 86000d42f..9e0d05e26 100644 --- a/gosa-si/client/events/mailqueue.pm +++ b/gosa-si/client/events/mailqueue.pm @@ -34,7 +34,8 @@ use Exporter; use GOSA::GosaSupportDaemon; use MIME::Base64; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "get_events", "mailqueue_query", @@ -44,7 +45,8 @@ my @events = ( "mailqueue_del", "mailqueue_header", ); -@EXPORT = @events; + +our @EXPORT = @events; BEGIN {} diff --git a/gosa-si/debian/changelog b/gosa-si/debian/changelog index fbe9f1d74..cb7d7bb41 100644 --- a/gosa-si/debian/changelog +++ b/gosa-si/debian/changelog @@ -1,5 +1,5 @@ -gosa-si (2.6.7-1) unstable; urgency=low +gosa-si (2.6.9-1) unstable; urgency=low * Initial upload (Closes: #534303) - -- Cajus Pollmeier Tue, 23 Jun 2009 16:10:48 +0200 + -- Cajus Pollmeier Tue, 31 Mar 2010 22:09:00 +0200 diff --git a/gosa-si/debian/copyright b/gosa-si/debian/copyright index 99dd31702..eec49e49a 100644 --- a/gosa-si/debian/copyright +++ b/gosa-si/debian/copyright @@ -24,8 +24,8 @@ License: Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. +Public License can be found in `/usr/share/common-licenses/GPL-2'. -The Debian packaging is (C) 2008, Cajus Pollmeier and +The Debian packaging is (C) Copyright 2008, Cajus Pollmeier and is licensed under the GPL, see above. diff --git a/gosa-si/debian/gosa-si-common.init b/gosa-si/debian/gosa-si-common.init index 59af8ddaf..9a9cb9268 100755 --- a/gosa-si/debian/gosa-si-common.init +++ b/gosa-si/debian/gosa-si-common.init @@ -3,8 +3,8 @@ # ### BEGIN INIT INFO # Provides: gosa-si -# Required-Start: $network $named $syslog $time -# Required-Stop: $network $named $syslog $time +# Required-Start: $network $remote_fs $named $syslog $time +# Required-Stop: $network $remote_fs $named $syslog $time # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: GOsa message server/client component diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client index a96d739df..5a728fcd3 100755 --- a/gosa-si/gosa-si-client +++ b/gosa-si/gosa-si-client @@ -1314,7 +1314,6 @@ foreach my $log_line (@$result) { $gotoHardwareChecksum= &generate_hw_digest(); daemon_log("INFO: gotoHardwareChecksum detected: $gotoHardwareChecksum", 1); - # create socket for incoming xml messages POE::Component::Server::TCP->new( Alias => 'gosa-si-client', diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index 255fa3391..1e56d7ce7 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -467,12 +467,12 @@ sub check_pid { } } } - close( LOCK_FILE ); + close( $LOCK_FILE ); unlink( $pid_file ); } # create a syslog msg if it is not to possible to open PID file - if (not sysopen(LOCK_FILE, $pid_file, O_WRONLY|O_CREAT|O_EXCL, 0644)) { + if (not sysopen(my $LOCK_FILE, $pid_file, O_WRONLY|O_CREAT|O_EXCL, 0644)) { my($msg) = "Couldn't obtain lockfile '$pid_file' "; if (open(my $LOCK_FILE, '<', $pid_file) && ($pid = <$LOCK_FILE>)) @@ -2879,7 +2879,6 @@ sub create_sources_list { &main::daemon_log("$session_id DEBUG: remove an old version of '$result'", 7); } - my $fh; open(my $fh, ">", "$result"); if (not defined $fh) { &main::daemon_log("$session_id DEBUG: cannot open '$result' for writing", 7); @@ -2970,7 +2969,7 @@ sub create_packages_list_db { }; # Read lines - while ($line = ){ + while ($line = <$CONFIG>){ # Unify chop($line); $line =~ s/^\s+//; @@ -3185,7 +3184,6 @@ sub parse_package { my ($path, $dist, $srv_path, $session_id)= @_; if (not defined $session_id) { $session_id = 0;} my ($package, $version, $section, $description); - my $PACKAGES; my $timestamp = &get_time(); if(not stat("$path.in")) { diff --git a/gosa-si/modules/ArpHandler.pm b/gosa-si/modules/ArpHandler.pm index c19fc4b8d..4dc4f57e7 100644 --- a/gosa-si/modules/ArpHandler.pm +++ b/gosa-si/modules/ArpHandler.pm @@ -15,7 +15,7 @@ use Switch; use Data::Dumper; use Socket; -@ISA = ("Exporter"); +our @ISA = ("Exporter"); # Don't start if some of the modules are missing my $start_service=1; diff --git a/gosa-si/modules/ClientPackages.pm b/gosa-si/modules/ClientPackages.pm index b9d4ff8a9..f714cd466 100644 --- a/gosa-si/modules/ClientPackages.pm +++ b/gosa-si/modules/ClientPackages.pm @@ -16,7 +16,7 @@ use Net::LDAP::Util; use Socket; use Net::hostent; -@ISA = ("Exporter"); +our @ISA = ("Exporter"); my $event_dir = "/usr/lib/gosa-si/server/ClientPackages"; use lib "/usr/lib/gosa-si/server/ClientPackages"; diff --git a/gosa-si/modules/DBsqlite.pm b/gosa-si/modules/DBsqlite.pm index 9f0b12b4a..985963da4 100644 --- a/gosa-si/modules/DBsqlite.pm +++ b/gosa-si/modules/DBsqlite.pm @@ -2,6 +2,7 @@ package GOSA::DBsqlite; use strict; use warnings; + use Carp; use DBI; use GOSA::GosaSupportDaemon; diff --git a/gosa-si/modules/GosaPackages.pm b/gosa-si/modules/GosaPackages.pm index 00a07fa2d..6c7159dd8 100644 --- a/gosa-si/modules/GosaPackages.pm +++ b/gosa-si/modules/GosaPackages.pm @@ -13,7 +13,7 @@ use Data::Dumper; use MIME::Base64; use Net::ARP; -@ISA = ("Exporter"); +our @ISA = ("Exporter"); my $event_dir = "/usr/lib/gosa-si/server/GosaPackages"; use lib "/usr/lib/gosa-si/server/GosaPackages"; diff --git a/gosa-si/modules/GosaSupportDaemon.pm b/gosa-si/modules/GosaSupportDaemon.pm index 1e6429b9d..9c33df325 100644 --- a/gosa-si/modules/GosaSupportDaemon.pm +++ b/gosa-si/modules/GosaSupportDaemon.pm @@ -15,7 +15,7 @@ use Net::DNS; use Net::ARP; use DateTime; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); my @functions = ( "create_passwd", @@ -53,8 +53,9 @@ my @functions = ( "check_opsi_res", "calc_timestamp", "opsi_callobj2string", - ); -@EXPORT = @functions; + ); + +our @EXPORT = @functions; my $op_hash = { 'eq' => '=', diff --git a/gosa-si/modules/ServerPackages.pm b/gosa-si/modules/ServerPackages.pm index 4a1d1a140..d1583017c 100644 --- a/gosa-si/modules/ServerPackages.pm +++ b/gosa-si/modules/ServerPackages.pm @@ -11,7 +11,7 @@ use Exporter; use GOSA::GosaSupportDaemon; use Data::Dumper; -@ISA = ("Exporter"); +our @ISA = ("Exporter"); my $event_dir = "/usr/lib/gosa-si/server/ServerPackages"; use lib "/usr/lib/gosa-si/server/ServerPackages"; diff --git a/gosa-si/modules/TestModule.pm b/gosa-si/modules/TestModule.pm index 90c8d6abb..9b0d828b5 100644 --- a/gosa-si/modules/TestModule.pm +++ b/gosa-si/modules/TestModule.pm @@ -1,12 +1,14 @@ package TestModule; -use Exporter; -@ISA = ("Exporter"); use strict; use warnings; + +use Exporter; use GosaSupportDaemon; +our @ISA = ("Exporter"); + BEGIN{ } diff --git a/gosa-si/server/events/clMessages.pm b/gosa-si/server/events/clMessages.pm index f4f749ada..3492e4194 100644 --- a/gosa-si/server/events/clMessages.pm +++ b/gosa-si/server/events/clMessages.pm @@ -13,7 +13,8 @@ use Data::Dumper; use GOSA::GosaSupportDaemon; use MIME::Base64; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "confirm_usr_msg", "PROGRESS", @@ -29,7 +30,7 @@ my @events = ( "CURRENTLY_LOGGED_IN", "save_fai_log", ); -@EXPORT = @events; +our @EXPORT = @events; BEGIN {} diff --git a/gosa-si/server/events/databases.pm b/gosa-si/server/events/databases.pm index e8720b29c..9a6a89880 100644 --- a/gosa-si/server/events/databases.pm +++ b/gosa-si/server/events/databases.pm @@ -7,7 +7,8 @@ use Exporter; use GOSA::GosaSupportDaemon; use Data::Dumper; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "get_events", "query_jobdb", @@ -22,7 +23,8 @@ my @events = ( "query_fai_release", "count_fai_release", ); -@EXPORT = @events; + +our @EXPORT = @events; BEGIN {} diff --git a/gosa-si/server/events/gosaTriggered.pm b/gosa-si/server/events/gosaTriggered.pm index 1a8a60a3b..4eb74cee3 100644 --- a/gosa-si/server/events/gosaTriggered.pm +++ b/gosa-si/server/events/gosaTriggered.pm @@ -17,7 +17,8 @@ use Time::HiRes qw( usleep); use MIME::Base64; use Data::Dumper; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "get_events", "get_login_usr_for_client", @@ -50,7 +51,8 @@ my @events = ( "trigger_activate_new", "get_hosts_with_module", ); -@EXPORT = @events; + +our @EXPORT = @events; BEGIN {} diff --git a/gosa-si/server/events/logHandling.pm b/gosa-si/server/events/logHandling.pm index 42af112bc..c5b9976e2 100644 --- a/gosa-si/server/events/logHandling.pm +++ b/gosa-si/server/events/logHandling.pm @@ -10,7 +10,8 @@ use Data::Dumper; use File::Spec; use MIME::Base64; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "get_events", "show_log_by_mac", @@ -21,7 +22,8 @@ my @events = ( "get_recent_log_by_mac", "delete_log_by_date_and_mac", ); -@EXPORT = @events; + +our @EXPORT = @events; BEGIN {} diff --git a/gosa-si/server/events/mailqueue_com.pm b/gosa-si/server/events/mailqueue_com.pm index d788716a1..0107493fa 100644 --- a/gosa-si/server/events/mailqueue_com.pm +++ b/gosa-si/server/events/mailqueue_com.pm @@ -31,13 +31,15 @@ use Data::Dumper; use Time::HiRes qw( usleep); use MIME::Base64; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "get_events", "mailqueue_query", "mailqueue_header", ); -@EXPORT = @events; + +our @EXPORT = @events; BEGIN {} diff --git a/gosa-si/server/events/opsi_com.pm b/gosa-si/server/events/opsi_com.pm index f1c1fcd97..c6fee306a 100644 --- a/gosa-si/server/events/opsi_com.pm +++ b/gosa-si/server/events/opsi_com.pm @@ -14,7 +14,8 @@ use GOSA::GosaSupportDaemon; use Data::Dumper; use XML::Quote qw(:all); -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "get_events", "opsi_install_client", @@ -51,7 +52,8 @@ my @events = ( "opsi_unboundHostFromLicense", "opsi_test", ); -@EXPORT = @events; + +our @EXPORT = @events; BEGIN {} diff --git a/gosa-si/server/events/server_server_com.pm b/gosa-si/server/events/server_server_com.pm index 6a73b0777..98f11a567 100644 --- a/gosa-si/server/events/server_server_com.pm +++ b/gosa-si/server/events/server_server_com.pm @@ -9,7 +9,8 @@ use GOSA::GosaSupportDaemon; use Time::HiRes qw( usleep); use Socket; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( 'information_sharing', 'new_server', @@ -19,7 +20,8 @@ my @events = ( 'foreign_job_updates', 'confirm_usr_msg', ); -@EXPORT = @events; + +our @EXPORT = @events; BEGIN {} diff --git a/gosa-si/server/events/siTriggered.pm b/gosa-si/server/events/siTriggered.pm index 3fcbdc328..f190e15fe 100644 --- a/gosa-si/server/events/siTriggered.pm +++ b/gosa-si/server/events/siTriggered.pm @@ -8,7 +8,8 @@ use Data::Dumper; use GOSA::GosaSupportDaemon; use Socket; -@ISA = qw(Exporter); +our @ISA = qw(Exporter); + my @events = ( "got_ping", "detected_hardware", @@ -16,7 +17,8 @@ my @events = ( "reload_ldap_config", "get_terminal_server", ); -@EXPORT = @events; + +our @EXPORT = @events; BEGIN {} -- 2.30.2