From c7f6c17eb7de0be9f59d268165abf8ba340262e8 Mon Sep 17 00:00:00 2001 From: artica Date: Tue, 16 Jun 2015 00:01:12 +0200 Subject: [PATCH 1/2] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_console/pandoradb_data.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index 4b59250818..08c1fee782 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 6.0dev-150615 +Version: 6.0dev-150616 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 41a032a2e7..b83e8b74cf 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="6.0dev-150615" +pandora_version="6.0dev-150616" 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/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 37c0a318e8..65a04ab11e 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '6.0dev'; -use constant AGENT_BUILD => '150615'; +use constant AGENT_BUILD => '150616'; # Commands to retrieve total memory information in kB use constant TOTALMEMORY_CMDS => { diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 863f9fc456..4780f2790b 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 6.0dev -%define release 150615 +%define release 150616 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 4b8f9278cc..9e1abcde4a 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 6.0dev -%define release 150615 +%define release 150616 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index b752a4b346..d40e95e8c5 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{150615} +{150616} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index febfc61758..1395d15798 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("6.0dev(Build 150615)") +#define PANDORA_VERSION ("6.0dev(Build 150616)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index a12f24eaa3..df6d760e30 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(6.0dev(Build 150615))" + VALUE "ProductVersion", "(6.0dev(Build 150616))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 77714a075f..0627f58c93 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 6.0dev-150615 +Version: 6.0dev-150616 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index ce67ff5a6b..86d69df192 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="6.0dev-150615" +pandora_version="6.0dev-150616" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index d13b8aeecb..a08316bf86 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC150615'; +$build_version = 'PC150616'; $pandora_version = 'v6.0dev'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index c1fc5e263e..edb1a08713 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -63,7 +63,7 @@
Date: Tue, 16 Jun 2015 16:11:56 +0200 Subject: [PATCH 2/2] Added the wmi .spec contributed by Robert B. Nelson with small changes. (cherry picked from commit 829c11f99fc2359cde2c95740c0b51e55ca51674) --- .../aditional_rpmspec/wmic-4.0.0tp4.rbn.spec | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 extras/aditional_rpmspec/wmic-4.0.0tp4.rbn.spec diff --git a/extras/aditional_rpmspec/wmic-4.0.0tp4.rbn.spec b/extras/aditional_rpmspec/wmic-4.0.0tp4.rbn.spec new file mode 100644 index 0000000000..e35f75e88d --- /dev/null +++ b/extras/aditional_rpmspec/wmic-4.0.0tp4.rbn.spec @@ -0,0 +1,49 @@ +%define name wmic +%define version 4.0.0tp4.rbn +Summary: Linux WMI client to do WMI querys using DCOM http://samba.org +Name: %{name} +Version: %{version} +Release: 1 +License: GPL2 +Group: System/Management +Packager: Robert B. Nelson +Source: http://www.openvas.org/download/wmi/wmi-1.3.14.tar.bz2 +Patch1: http://www.openvas.org/download/wmi/openvas-wmi-1.3.14.patch +Patch2: http://www.openvas.org/download/wmi/openvas-wmi-1.3.14.patch2 +Patch3: http://www.openvas.org/download/wmi/openvas-wmi-1.3.14.patch3v2 +Patch4: http://www.openvas.org/download/wmi/openvas-wmi-1.3.14.patch4 +Patch5: http://www.openvas.org/download/wmi/openvas-wmi-1.3.14.patch5 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +AutoReq: 1 +Provides: %{name}-%{version} + +%description +Linux WMI client to do WMI querys. More information at SAMBA4 project at http://www.samba.org/ + +%prep +rm -rf $RPM_BUILD_ROOT + +%setup -n wmi-1.3.14 + +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 + +%build +cd Samba/source +./autogen.sh +./configure --without-readline --enable-debug +make "CPP=gcc -E -ffreestanding" proto bin/wmic + +%install +mkdir -p $RPM_BUILD_ROOT/usr/bin/ +install Samba/source/bin/wmic $RPM_BUILD_ROOT%{_bindir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-, root, root) +%{_bindir}/wmic