!12 fix new function not found when Install

Merge pull request !12 from panchenbo/master

9000-fix-new-function-not-found-when-Install.patch

@@ -0,0 +1,56 @@
+From f11997e1ce300515016be55c5dcef8d52352af9e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E6=BD=98=E6=99=A8=E5=8D=9A?= <panchenbo@uniontech.com>
+Date: Tue, 23 Jun 2020 14:15:14 +0800
+Subject: [PATCH] fix new function not found when Install
+
+---
+ src/pmdas/activemq/GNUmakefile     |  4 +++-
+ src/pmdas/activemq/pmdaactivemq.pl | 14 +++++++-------
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/src/pmdas/activemq/GNUmakefile b/src/pmdas/activemq/GNUmakefile
+index da9c583..26bb78e 100644
+--- a/src/pmdas/activemq/GNUmakefile
++++ b/src/pmdas/activemq/GNUmakefile
+@@ -41,7 +41,9 @@ build-me: check_domain
+ install install_pcp: default
+ 	$(INSTALL) -m 755 -d $(PMDADIR)
+ 	$(INSTALL) -m 755 Install Remove $(PMDADIR)
+-	$(INSTALL) -m 644 pmda$(IAM).pl $(MODULES) $(PMDADIR)
++	$(INSTALL) -m 644 pmda$(IAM).pl $(PMDADIR)/pmda$(IAM).pl
++	$(INSTALL) -m 755 -d $(PMDADIR)/PCP
++	$(INSTALL) -m 644 $(MODULES) $(PMDADIR)/PCP
+ 	@$(INSTALL_MAN)
+ else
+ build-me:
+diff --git a/src/pmdas/activemq/pmdaactivemq.pl b/src/pmdas/activemq/pmdaactivemq.pl
+index 7f835aa..4b54516 100755
+--- a/src/pmdas/activemq/pmdaactivemq.pl
++++ b/src/pmdas/activemq/pmdaactivemq.pl
+@@ -49,16 +49,16 @@ my $jvm_garbage_collection_cluster = 5;
+ for my $file (pmda_config('PCP_PMDAS_DIR') . '/activemq/activemq.conf', 'activemq.conf') {
+     eval `cat $file` unless ! -f $file;
+ }
+-my $timesource = TimeSource->new;
+-my $cache = Cache->new($timesource, $cache_time);
++my $timesource = PCP::TimeSource->new;
++my $cache = PCP::Cache->new($timesource, $cache_time);
+ my $http_client = LWP::UserAgent->new;
+ $http_client->agent('pmdaactivemq');
+ $http_client->timeout($rest_timeout);
+-my $rest_client = RESTClient->new($http_client, $cache, $rest_hostname, $rest_port, $rest_username, $rest_password, $rest_realm);
+-my $activemq = ActiveMQ->new($rest_client);
+-my $jvm_memory = JVMMemory->new($rest_client);
+-my $jvm_memory_pool = JVMMemoryPool->new($rest_client);
+-my $jvm_garbage_collection = JVMGarbageCollection->new($rest_client);
++my $rest_client = PCP::RESTClient->new($http_client, $cache, $rest_hostname, $rest_port, $rest_username, $rest_password, $rest_realm);
++my $activemq = PCP::ActiveMQ->new($rest_client);
++my $jvm_memory = PCP::JVMMemory->new($rest_client);
++my $jvm_memory_pool = PCP::JVMMemoryPool->new($rest_client);
++my $jvm_garbage_collection = PCP::JVMGarbageCollection->new($rest_client);
+ 
+ my %queue_instances;
+ 
+-- 
+2.23.0
+

pcp.spec

@@ -9,7 +9,7 @@
 Name:             pcp
 Version:          4.1.3
 Summary:          System-level performance monitoring and performance management
-Release:          4
+Release:          5
 License:          GPLv2+ and LGPLv2.1+ and CC-BY
 URL:              https://pcp.io
 Source0:          https://dl.bintray.com/pcp/source/pcp-4.1.3.tar.gz
@@ -18,6 +18,7 @@ Source2:          https://github.com/performancecopilot/pcp-webapp-grafana/archi
 Source3:          https://github.com/performancecopilot/pcp-webapp-graphite/archive/0.9.10/pcp-webapp-graphite-0.9.10.tar.gz
 Source4:          https://github.com/performancecopilot/pcp-webapp-blinkenlights/archive/1.0.1/pcp-webapp-blinkenlights-1.0.1.tar.gz
 Patch6000:        CVE-2019-3695-CVE-2019-3696.patch
+Patch9000:        9000-fix-new-function-not-found-when-Install.patch
 
 BuildRequires:    gcc gcc-c++ procps autoconf bison flex nss-devel rpm-devel avahi-devel xz-devel zlib-devel
 BuildRequires:    python2-devel python3-devel ncurses-devel readline-devel cyrus-sasl-devel papi-devel libpfm-devel >= 4
@@ -860,6 +861,7 @@ This package installs selinux support files for PCP.
 %setup -q -T -D -a 4 -c -n blinkenlights
 %setup -q
 %patch6000 -p1
+%patch9000 -p1
 
 %build
 
@@ -2211,6 +2213,12 @@ fi
 %config(noreplace) /etc/pcp/pmrep/*
 
 %changelog
+* Tue Jun Jun 2020 panchenbo <panchenbo@uniontech.com> - 4.1.3-5
+- Type:bugfix
+- ID: NA
+- SUG: install
+- DESC: Fix pcp-pmda-activemq install error
+
 * Wed May 13 2020 huanghaitao <huanghaitao8@huawei.com> - 4.1.3-4
 - Type:cves
 - ID: CVE-2019-3695 CVE-2019-3696