diff --git a/pcp.spec b/pcp.spec index b83319e..98ffa4b 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,6 +1,6 @@ Name: pcp -Version: 4.3.2 -Release: 4%{?dist} +Version: 4.3.3 +Release: 1%{?dist} Summary: System-level performance monitoring and performance management License: GPLv2+ and LGPLv2+ and CC-BY URL: https://pcp.io @@ -157,6 +157,8 @@ Patch0: pmcd-pmlogger-local-context.patch %global disable_libuv 1 %endif +%global disable_openssl 0 + # rpm producing "noarch" packages %if 0%{?rhel} == 0 || 0%{?rhel} > 5 %global disable_noarch 0 @@ -219,6 +221,9 @@ BuildRequires: boost-devel %if !%{disable_libuv} BuildRequires: libuv-devel >= 1.16 %endif +%if !%{disable_openssl} +BuildRequires: openssl-devel >= 1.1.1 +%endif %if 0%{?rhel} == 0 || 0%{?rhel} > 7 BuildRequires: perl-generators %endif @@ -439,6 +444,9 @@ Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} Requires: pcp-libs-devel = %{version}-%{release} Requires: pcp-devel = %{version}-%{release} +%if !%{disable_libuv} +Requires: libuv-devel >= 1.16 +%endif Obsoletes: pcp-gui-testsuite # The following are inherited from pcp-collector and pcp-monitor, # both of which are now obsoleted by the base pcp package @@ -2698,8 +2706,6 @@ pmieconf -c enable dmthin systemctl restart pmie >/dev/null 2>&1 systemctl enable pmcd >/dev/null 2>&1 systemctl enable pmlogger >/dev/null 2>&1 - systemctl enable pmlogger_daily_report >/dev/null 2>&1 - systemctl enable pmlogger_daily_report-poll >/dev/null 2>&1 systemctl enable pmie >/dev/null 2>&1 %else /sbin/chkconfig --add pmcd >/dev/null 2>&1 @@ -2857,8 +2863,10 @@ cd %dir %attr(0775,pcp,pcp) %{_confdir}/nssdb %dir %{_confdir}/discover %config(noreplace) %{_confdir}/discover/pcp-kube-pods.conf +%if !%{disable_libuv} %dir %{_confdir}/pmseries %config(noreplace) %{_confdir}/pmseries/pmseries.conf +%endif %ghost %dir %attr(0775,pcp,pcp) %{_localstatedir}/run/pcp %{_localstatedir}/lib/pcp/config/pmafm @@ -3294,6 +3302,11 @@ cd %endif %changelog +* Fri Jun 28 2019 Mark Goodwin - 4.3.3-1 +- Resolve segv running pmchart with bogus timezone (BZ 1718948) +- Resolve pmrep wait.formula for collectl-dm-sD and collectl-sD (BZ 1724288) +- Update to latest PCP sources. + * Mon Jun 10 22:13:21 CET 2019 Igor Gnatenko - 4.3.2-4 - Rebuild for RPM 4.15 @@ -3303,7 +3316,7 @@ cd * Fri May 31 2019 Jitka Plesnikova - 4.3.2-2 - Perl 5.30 rebuild -* Fri Apr 26 2019 Mark Goodwin 4.3.2-1 +* Fri Apr 26 2019 Mark Goodwin - 4.3.2-1 - Resolve selinux policy issues for pmie daemon mode (BZ 1702589) - Resolve selinux policy issues for BPF permissions (BZ 1693332) - Further improvements to daily archive processing (BZ 1647390) diff --git a/sources b/sources index 40986c8..429adbc 100644 --- a/sources +++ b/sources @@ -1,6 +1,5 @@ -SHA512 (pcp-4.3.2.src.tar.gz) = bcca070564f2766022a0c780a92d3156d5d28f7f9a0e093e73cd892b1d043d43816d83204ec4611707b67319a5fa33233ce965b207f8cb0f893c00c23afe7248 +SHA512 (pcp-4.3.3.src.tar.gz) = 6f9fc479a0e59b19d1a540ebce7c9c17c9a035a84bc47679f39573c4fa8fb08d2624cf624087afb5f72dac7c558446b50ec89adf5dc54b0f2ce8afbbd241fa0e SHA512 (pcp-webapp-blinkenlights-1.0.1.tar.gz) = dadf0bc0742a3344a75f8f304851762572ddc9a5c7c66fd085adcabb70f9e7a9b2c9b6095a8fb358f6a6c64dbf41cf245e2da74a60b8120880f314b6ed3d271c +SHA512 (pcp-webapp-grafana-1.9.1-2.tar.gz) = abd0f360b057853d343e506e352a37d16f78bbae6760124ecdfab0e43ffcf3b31404311f1fe5c962e8abdbf2ad8699df3f27e2920f03f1a10bca3c0e01179e21 SHA512 (pcp-webapp-graphite-0.9.10.tar.gz) = f716e5145e5d39b54be02e39202c51bdd1158d56fa16185a591c0f54fb376a637653f0c13aa9c5ad5700fc62d0c71163e94b9fa689fabe3e6de4ddf19fa827fa SHA512 (pcp-webapp-vector-1.3.1-1.tar.gz) = b1463d4da3727f130752699dd433e997212c19241ac440df389c1153e468ace840b7d5f43a37b2173e4eee4f4a807338a3c40cc9635801e626c1530baf46e289 -SHA512 (pcp-webapp-grafana-1.9.1-2.tar.gz) = abd0f360b057853d343e506e352a37d16f78bbae6760124ecdfab0e43ffcf3b31404311f1fe5c962e8abdbf2ad8699df3f27e2920f03f1a10bca3c0e01179e21 -SHA512 (pmcd-pmlogger-local-context.patch) = 8f4b6b49494781d0a711ac27738a75b1adead72cb1baef9a78754686c48ae2d278d691108233e9cf9ad33fede5ba7b7a43f4674205b9bf448f267c844ddc1a01