- 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

diff --git a/gosa-si/client/events/corefunctions.pm b/gosa-si/client/events/corefunctions.pm
index a25aa98cb89f3ed1fbffa3cf949979c768ab1ad1..ffb00f3d71b5b667928a6efba0cd5789c9969ae8 100644 (file)
--- 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 b6a0a6883c3e7e0797743fbbb543a38ea4a25396..8070221a486fd85c3d3e8658e624706bcac92a5b 100644 (file)
--- 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 fb7c8f8926bc296fcc97805b7ceec1de00f8fb77..3afc78386f30f694eae37b0ae93f266758eb9f83 100644 (file)
--- 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 ecd9204fdf945a3452d5eae0b0cb66cfc58a71f9..62420fe18af48594df451cd92c442106d4c68d20 100644 (file)
--- 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 30d23e008d3b58de6e59f696a045b0b60cbf3ffa..39cf3f47612eecc9ad354c4eae0ae295a8ca30b5 100644 (file)
--- 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 b9cb41e7b52483e1d22d127d64bcdbda574d2bf6..b823237d9d0306e3306c72cd2638bf3a0a85349c 100644 (file)
--- 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 86000d42f38316a3807fab63344fa4cfccbd490e..9e0d05e260e8900d20f2332e35b026337354bce0 100644 (file)
--- 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 fbe9f1d7456b9fc0a3d7c86af3b258e98a13b32c..cb7d7bb41a83ee23c4eae454cab5cf496d86eb32 100644 (file)
--- 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 <cajus@debian.org>  Tue, 23 Jun 2009 16:10:48 +0200
+ -- Cajus Pollmeier <cajus@debian.org>  Tue, 31 Mar 2010 22:09:00 +0200

diff --git a/gosa-si/debian/copyright b/gosa-si/debian/copyright
index 99dd31702e547a9cc9e51b11fca866038bab0566..eec49e49a2fcd3b8ef0b917af4c1dabc597f21a7 100644 (file)
--- 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 <cajus@debian.org> and
+The Debian packaging is (C) Copyright 2008, Cajus Pollmeier <cajus@debian.org> 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 59af8ddafc14815c4b3ab437f7588654bf6be6eb..9a9cb9268e53685cfb5f6d1a940107785293263b 100755 (executable)
--- 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 a96d739df31e2db7534d0c1d879631ab2e579ddf..5a728fcd3cd3d84c1813f9c229edf4eeb5b5cbf0 100755 (executable)
--- 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 255fa3391de4ed93aac794f748b6d230a4378c53..1e56d7ce7066ed3b9cdf0f9ae743cc7880d81eb5 100755 (executable)
--- 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 = <CONFIG>){
+       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 c19fc4b8d94d2240d8b86bd74ba6b705284d66b3..4dc4f57e71b76129956ef04305d02dac6671adcc 100644 (file)
--- 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 b9d4ff8a9c09baee90cdcf40088243e65de6b2e8..f714cd46608c47190ce216a4742670e9586fe968 100644 (file)
--- 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 9f0b12b4ae921313b7c259dee11163394d5fcbf9..985963da4a01e994e99d87dd0a858d8eef26fd9a 100644 (file)
--- 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 00a07fa2dc12f24ba40c11f2d8f8e5d7b9f5e1d9..6c7159dd81c91d82f06cf5e5b7354a4af1c040ed 100644 (file)
--- 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 1e6429b9d156502a6f52c3fd0788334e15ab7e01..9c33df325d1a937c45dfc85392be2cbcda85349a 100644 (file)
--- 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 4a1d1a1400af047eb2680fb95d72793c4b0f6b41..d1583017cd59d9fd774238b4f8154b26a7f873c4 100644 (file)
--- 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 90c8d6abb8e274628e17a0374bb5d9a93903e9ae..9b0d828b58f703c8d5fc269f22f0df485d5d64c7 100644 (file)
--- 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 f4f749ada776f71274894745db53e922c84029aa..3492e4194e1c76a0e7141ef0385326acd43a8e60 100644 (file)
--- 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 e8720b29c56987a82ff14819d510f9f22008fd50..9a6a89880245ba48ddb1ca75552dcafe9b925c0e 100644 (file)
--- 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 1a8a60a3ba70ca3d5b58055123eceaad4ef86672..4eb74cee3fc5b0b7c494e831c9919cf898801e1b 100644 (file)
--- 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 42af112bc225f540ebde56dfb24a82ea46b76b1b..c5b9976e292b20dca079e31992ec69f5b0cf273d 100644 (file)
--- 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 d788716a119f353b65da8b7876c08a3e0632a1ee..0107493facd04b3cacdf8bde2835ace521ac60ea 100644 (file)
--- 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 f1c1fcd975274d24c441dbf96141acd9799b27bb..c6fee306ac2a0b02d626b75da569738457fd5b31 100644 (file)
--- 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 6a73b077757268035b033c815d5f1dd4f7292956..98f11a5675ec325034860c88aaf62f1396de9123 100644 (file)
--- 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 3fcbdc328d9c744d2af0d639b4ebad096a0e6ab5..f190e15fee6f580d6f3f12b3cf0d184a36562bcb 100644 (file)
--- 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 {}