From a15281dcde9866a475d37edbded92b8cfc14216f Mon Sep 17 00:00:00 2001
From: raulmateos <noreply@pandorafms.org>
Date: Sat, 15 May 2010 22:36:34 +0000
Subject: [PATCH] 2010-05-16  Raul Mateos  <raulofpandora@gmail.com>

	* linux/pandora_agent_installer, linux/DEBIAN/make_deb_package.sh,
	linux/DEBIAN/control, linux/pandora_agent, linux/pandora_agent_daemon,
	linux/pandora_agent.conf: Updated build. Updated year.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2733 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_agents/ChangeLog                        |  6 ++++++
 pandora_agents/linux/DEBIAN/control             |  2 +-
 pandora_agents/linux/DEBIAN/make_deb_package.sh |  4 ++--
 pandora_agents/linux/pandora_agent              | 12 ++++++------
 pandora_agents/linux/pandora_agent.conf         |  4 ++--
 pandora_agents/linux/pandora_agent_daemon       | 10 +++++-----
 pandora_agents/linux/pandora_agent_installer    |  8 ++++----
 7 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 531d48e5ea..15aec325e7 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-16  Raúl Mateos  <raulofpandora@gmail.com>
+
+	* linux/pandora_agent_installer, linux/DEBIAN/make_deb_package.sh,
+	linux/DEBIAN/control, linux/pandora_agent, linux/pandora_agent_daemon,
+	linux/pandora_agent.conf: Updated build. Updated year.
+
 2010-05-12  Sergio Martin <sergio.martin@artica.es>
 
 	* unix/pandora_agent_installer
diff --git a/pandora_agents/linux/DEBIAN/control b/pandora_agents/linux/DEBIAN/control
index eeeaeb2769..c3f1a2bc31 100755
--- a/pandora_agents/linux/DEBIAN/control
+++ b/pandora_agents/linux/DEBIAN/control
@@ -1,5 +1,5 @@
 package: PandoraFMS-Agent
-Version: 3.0.0
+Version: 3.1.0
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/linux/DEBIAN/make_deb_package.sh b/pandora_agents/linux/DEBIAN/make_deb_package.sh
index 68f2e08e87..8bd44928da 100644
--- a/pandora_agents/linux/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/linux/DEBIAN/make_deb_package.sh
@@ -2,7 +2,7 @@
 
 #Pandora FMS- http:#pandorafms.com
 # ==================================================
-# Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
+# Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
 # Please see http:#pandorafms.org for full contribution list
 
 # This program is free software; you can redistribute it and/or
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_agent_version="3.0.0"
+pandora_agent_version="3.1.0"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/linux/pandora_agent b/pandora_agents/linux/pandora_agent
index abe6d8ac6c..ba9ca3e6d4 100755
--- a/pandora_agents/linux/pandora_agent
+++ b/pandora_agents/linux/pandora_agent
@@ -1,13 +1,13 @@
 #!/bin/bash
 # **********************************************************************
 # Pandora FMS Generic Linux Agent
-# (c) 2009 Artica Soluciones Tecnológicas
+# (c) 2010 Artica Soluciones Tecnológicas
 # with the help of many people. Please see http://pandorafms.org
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-AGENT_VERSION=3.0
-AGENT_BUILD=091216
+AGENT_VERSION=3.1
+AGENT_BUILD=100516
 
 # **********************************************************************
 # function configure_agent()
@@ -172,7 +172,7 @@ function configure_agent {
 	if [ "$CRON_MODE" == "0" ]
 	then
 		# Script banner at start
-		echo "Pandora FMS Agent $AGENT_VERSION (c) Artica ST 2003-2009"
+		echo "Pandora FMS Agent $AGENT_VERSION (c) Artica ST 2003-2010"
 		echo "This program is licensed under GPL2 Terms. http://pandorafms.org"
 		echo "Running in $NOMBRE_HOST at $TIMESTAMP"
 		echo " "
@@ -290,7 +290,7 @@ function recv_file {
 	then
 		WD=`pwd`
 		cd $TEMP
- 		eval tentacle_client -v -g -a $SERVER_IP -p $SERVER_PORT $TENTACLE_OPTS $FILE > /dev/null 2>  $PANDORA_LOGFILE.err
+ 		eval tentacle_client -v -g -a $SERVER_IP -p $SERVER_PORT $TENTACLE_OPTS $FILE > /dev/null 2> $PANDORA_LOGFILE.err
  		STATUS=$?
  		cd $WD
  		return $STATUS
@@ -298,7 +298,7 @@ function recv_file {
 
 	if [ "$TRANSFER_MODE" == "ssh" ]
 	then
- 		scp -P $SERVER_PORT pandora@$SERVER_IP:$SERVER_PATH/$FILE $TEMP > /dev/null 2>  $PANDORA_LOGFILE.err
+ 		scp -P $SERVER_PORT pandora@$SERVER_IP:$SERVER_PATH/$FILE $TEMP > /dev/null 2> $PANDORA_LOGFILE.err
  		return $?
 	fi
 
diff --git a/pandora_agents/linux/pandora_agent.conf b/pandora_agents/linux/pandora_agent.conf
index 0628c6bbdb..6437feff2b 100755
--- a/pandora_agents/linux/pandora_agent.conf
+++ b/pandora_agents/linux/pandora_agent.conf
@@ -1,7 +1,7 @@
 # Base config file for Pandora FMS agents
-# Version 3.0
+# Version 3.1
 # Licensed under GPL license v2,
-# (c) 2003-2009 Artica Soluciones Tecnologicas
+# (c) 2003-2010 Artica Soluciones Tecnologicas
 # please visit http://pandora.sourceforge.net
 
 # General Parameters
diff --git a/pandora_agents/linux/pandora_agent_daemon b/pandora_agents/linux/pandora_agent_daemon
index 1d141c32fc..04e7010f7a 100755
--- a/pandora_agents/linux/pandora_agent_daemon
+++ b/pandora_agents/linux/pandora_agent_daemon
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Pandora FMS Linux Agent, startup script
-# Copyright (c) 2006-2009 Artica ST, <info@artica.es>
+# Copyright (c) 2006-2010 Artica ST, <info@artica.es>
 # Linux Version (generic), for SuSe and Debian/Ubuntu.
 # other Linux distros could not work properly without modifications
 # v3.0.1 Build 091104
@@ -11,7 +11,7 @@
 # Provides: pandora_agent
 # Required-Start: $network
 # Required-Stop: $network
-# Default-Start:  2 3 5
+# Default-Start: 2 3 5
 # Default-Stop: 0 1 6
 # Short-Description: Startup script daemon for Pandora FMS agent
 # Description: Startup script daemon for Pandora FMS agent (linux)
@@ -59,7 +59,7 @@ case "$1" in
 			exit 1
 		else
 			echo "Stopping Pandora FMS Agent."
-			kill $PANDORA_PID > /dev/null 2>&1        
+			kill $PANDORA_PID > /dev/null 2>&1
 		fi
 	;;
 
@@ -81,7 +81,7 @@ case "$1" in
 	;;
 	
 	*)
-        echo "Usage: /etc/init.d/pandora_agent_daemon {start|stop|restart|status|force-reload}"
-        exit 1
+	echo "Usage: /etc/init.d/pandora_agent_daemon {start|stop|restart|status|force-reload}"
+	exit 1
 esac
 
diff --git a/pandora_agents/linux/pandora_agent_installer b/pandora_agents/linux/pandora_agent_installer
index 1ff9b948c9..b963349789 100755
--- a/pandora_agents/linux/pandora_agent_installer
+++ b/pandora_agents/linux/pandora_agent_installer
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-# Pandora FMS Agent Installer (c) 2008-2009 Artica ST
+# Pandora FMS Agent Installer (c) 2008-2010 Artica ST
 # Linux Version (generic), for SuSe and Debian/Ubuntu only
 # other Linux distros could not work properly without modifications
 # Please see http://www.pandorafms.org
-# v3.0.1 Build 091129
+# v3.1.0 Build 100516
 # This code is licensed under GPL 2.0 license.
 # **********************************************************************
 
-PI_VERSION=3.0
+PI_VERSION=3.1
 PANDORA_BIN=/usr/bin/pandora_agent
 PANDORA_HOME=/usr/share/pandora_agent
 PANDORA_TEMP=/var/spool/pandora/data_out
@@ -212,7 +212,7 @@ help () {
 
 # Script banner at start
 echo " "
-echo "Pandora FMS Agent Installer $PI_VERSION (c) 2008-2009 ArticaST"
+echo "Pandora FMS Agent Installer $PI_VERSION (c) 2008-2010 ArticaST"
 echo "This program is licensed under GPL2 Terms. http://pandorafms.com"
 echo " "