Hello community, here is the log from the commit of package pcp for openSUSE:Factory checked in at 2019-01-29 14:45:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcp (Old) and /work/SRC/openSUSE:Factory/.pcp.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcp" Tue Jan 29 14:45:14 2019 rev:46 rq:666983 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pcp/pcp.changes 2019-01-15 13:16:16.440362544 +0100 +++ /work/SRC/openSUSE:Factory/.pcp.new.28833/pcp.changes 2019-01-29 14:45:19.427047796 +0100 @@ -1,0 +2,24 @@ +Fri Jan 18 13:13:04 UTC 2019 - [email protected] + +- Drop conflicting dstat symlink; (bsc#1122502). + +------------------------------------------------------------------- +Tue Jan 15 00:17:33 UTC 2019 - [email protected] + +- Package missing PMDA binaries; (bsc#1121920). + + refresh 0001-Install-libraries-without-exec-permission.patch +- Don't package pmns .NeedRebuild flag; (bsc#1092160). + + add 0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch + +------------------------------------------------------------------- +Thu Jan 10 17:23:03 UTC 2019 - [email protected] + +- Upgrade to 4.3.0; (bsc#1121914). + +- Refreshed patches + 0001-Install-libraries-without-exec-permission.patch + 0007-pmie-add-systemd-timers-as-cron-alternative.patch + 0008-pmlogger_daily-add-systemd-timers-as-cron-alternativ.patch + 0009-pmlogger_daily_report-add-systemd-timers-as-cron-alt.patch + +------------------------------------------------------------------- Old: ---- pcp-4.2.0.tar.bz2 New: ---- 0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch pcp-4.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcp.spec ++++++ --- /var/tmp/diff_new_pack.l9SaLT/_old 2019-01-29 14:45:20.363046662 +0100 +++ /var/tmp/diff_new_pack.l9SaLT/_new 2019-01-29 14:45:20.367046657 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -73,7 +73,7 @@ License: %{license_gplv2plus} AND %{license_lgplv2plus} AND %{license_cc_by} Group: %{pcp_gr} Name: pcp -Version: 4.2.0 +Version: 4.3.0 Release: 0 %global buildversion 1 @@ -101,6 +101,8 @@ Patch8: 0008-pmlogger_daily-add-systemd-timers-as-cron-alternativ.patch # PATCH-FIX-UPSTREAM, [email protected] Patch9: 0009-pmlogger_daily_report-add-systemd-timers-as-cron-alt.patch +# PATCH-FIX-UPSTREAM, [email protected] +Patch10: 0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch %if 0%{?fedora} || 0%{?rhel} %global disable_selinux 0 @@ -241,17 +243,20 @@ BuildRequires: autoconf BuildRequires: avahi-devel BuildRequires: bison -BuildRequires: zlib-devel -%if 0%{?suse_version} > 1010 -BuildRequires: fdupes -%endif BuildRequires: flex BuildRequires: gcc-c++ +BuildRequires: zlib-devel %if 0%{?suse_version} +BuildRequires: fdupes BuildRequires: mozilla-nss-devel +%if 0%{?is_opensuse} +BuildRequires: openSUSE-release %else -BuildRequires: nss-devel +BuildRequires: sles-release %endif +%else # suse_version +BuildRequires: nss-devel +%endif # suse_version BuildRequires: perl BuildRequires: procps BuildRequires: rpm-devel @@ -2128,6 +2133,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 autoconf @@ -2139,6 +2145,7 @@ --with-tmpdir=%{_tempsdir} \ --datarootdir=%{_datadir} \ --docdir=%{_docdir} \ + --with-dstat-symlink=no \ %{?_with_initd} \ %{?_with_doc} \ %{?_with_ib} \ ++++++ 0001-Install-libraries-without-exec-permission.patch ++++++ --- /var/tmp/diff_new_pack.l9SaLT/_old 2019-01-29 14:45:20.379046642 +0100 +++ /var/tmp/diff_new_pack.l9SaLT/_new 2019-01-29 14:45:20.379046642 +0100 @@ -24,10 +24,10 @@ src/pmdas/solaris/GNUmakefile | 2 +- 18 files changed, 26 insertions(+), 26 deletions(-) -diff --git a/src/genpmda/genpmda b/src/genpmda/genpmda -index 5e5c110d19e1..9670b74614f7 100755 ---- a/src/genpmda/genpmda -+++ b/src/genpmda/genpmda +Index: pcp/src/genpmda/genpmda +=================================================================== +--- pcp.orig/src/genpmda/genpmda ++++ pcp/src/genpmda/genpmda @@ -899,7 +899,7 @@ install: default \$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas \$(INSTALL) -m 755 -d \$(PMDADIR) @@ -46,10 +46,10 @@ \$(INSTALL) -m 755 -f $oflag/Install \$(PMDADIR)/Install \$(INSTALL) -m 755 -f $oflag/Remove \$(PMDADIR)/Remove \$(INSTALL) -m 644 -f $oflag/Makefile.install \$(PMDADIR)/Makefile -diff --git a/src/libpcp/src/GNUmakefile b/src/libpcp/src/GNUmakefile -index c854255875d4..099555588a76 100644 ---- a/src/libpcp/src/GNUmakefile -+++ b/src/libpcp/src/GNUmakefile +Index: pcp/src/libpcp/src/GNUmakefile +=================================================================== +--- pcp.orig/src/libpcp/src/GNUmakefile ++++ pcp/src/libpcp/src/GNUmakefile @@ -124,7 +124,7 @@ endif install : default @@ -68,10 +68,10 @@ endif $(EXT_FILES): -diff --git a/src/libpcp_fault/src/GNUmakefile b/src/libpcp_fault/src/GNUmakefile -index 9c548f08f9c4..726e1b8172cb 100644 ---- a/src/libpcp_fault/src/GNUmakefile -+++ b/src/libpcp_fault/src/GNUmakefile +Index: pcp/src/libpcp_fault/src/GNUmakefile +=================================================================== +--- pcp.orig/src/libpcp_fault/src/GNUmakefile ++++ pcp/src/libpcp_fault/src/GNUmakefile @@ -145,7 +145,7 @@ endif install : default @@ -90,10 +90,10 @@ endif $(INSTALL) -m 644 $(TOPDIR)/src/include/pcp/fault.h $(PCP_INC_DIR)/fault.h -diff --git a/src/libpcp_gui/src/GNUmakefile b/src/libpcp_gui/src/GNUmakefile -index 2a40ac55b14b..4cbb254449e1 100644 ---- a/src/libpcp_gui/src/GNUmakefile -+++ b/src/libpcp_gui/src/GNUmakefile +Index: pcp/src/libpcp_gui/src/GNUmakefile +=================================================================== +--- pcp.orig/src/libpcp_gui/src/GNUmakefile ++++ pcp/src/libpcp_gui/src/GNUmakefile @@ -54,7 +54,7 @@ include $(BUILDRULES) install: default @@ -112,10 +112,10 @@ endif default_pcp: default -diff --git a/src/libpcp_import/src/GNUmakefile b/src/libpcp_import/src/GNUmakefile -index 25aad34f3252..f8155422a9ad 100644 ---- a/src/libpcp_import/src/GNUmakefile -+++ b/src/libpcp_import/src/GNUmakefile +Index: pcp/src/libpcp_import/src/GNUmakefile +=================================================================== +--- pcp.orig/src/libpcp_import/src/GNUmakefile ++++ pcp/src/libpcp_import/src/GNUmakefile @@ -54,7 +54,7 @@ include $(BUILDRULES) install: default @@ -134,10 +134,10 @@ endif default_pcp: default -diff --git a/src/libpcp_mmv/src/GNUmakefile b/src/libpcp_mmv/src/GNUmakefile -index 7cb833f26210..1d0b2202a6c0 100644 ---- a/src/libpcp_mmv/src/GNUmakefile -+++ b/src/libpcp_mmv/src/GNUmakefile +Index: pcp/src/libpcp_mmv/src/GNUmakefile +=================================================================== +--- pcp.orig/src/libpcp_mmv/src/GNUmakefile ++++ pcp/src/libpcp_mmv/src/GNUmakefile @@ -47,7 +47,7 @@ include $(BUILDRULES) install: default @@ -156,10 +156,10 @@ endif default_pcp: default -diff --git a/src/libpcp_pmcd/src/GNUmakefile b/src/libpcp_pmcd/src/GNUmakefile -index 85db369199e6..708c3c2de7ef 100644 ---- a/src/libpcp_pmcd/src/GNUmakefile -+++ b/src/libpcp_pmcd/src/GNUmakefile +Index: pcp/src/libpcp_pmcd/src/GNUmakefile +=================================================================== +--- pcp.orig/src/libpcp_pmcd/src/GNUmakefile ++++ pcp/src/libpcp_pmcd/src/GNUmakefile @@ -73,7 +73,7 @@ include $(BUILDRULES) install : default @@ -169,10 +169,10 @@ endif ifeq "$(ENABLE_PROBES)" "true" -diff --git a/src/libpcp_pmda/src/GNUmakefile b/src/libpcp_pmda/src/GNUmakefile -index e11d8928c5b2..93c2e6f4cd05 100644 ---- a/src/libpcp_pmda/src/GNUmakefile -+++ b/src/libpcp_pmda/src/GNUmakefile +Index: pcp/src/libpcp_pmda/src/GNUmakefile +=================================================================== +--- pcp.orig/src/libpcp_pmda/src/GNUmakefile ++++ pcp/src/libpcp_pmda/src/GNUmakefile @@ -64,7 +64,7 @@ include $(BUILDRULES) install: default @@ -191,10 +191,10 @@ endif $(XFILES): -diff --git a/src/libpcp_trace/src/GNUmakefile b/src/libpcp_trace/src/GNUmakefile -index 10738d63160e..6f11d06600f4 100644 ---- a/src/libpcp_trace/src/GNUmakefile -+++ b/src/libpcp_trace/src/GNUmakefile +Index: pcp/src/libpcp_trace/src/GNUmakefile +=================================================================== +--- pcp.orig/src/libpcp_trace/src/GNUmakefile ++++ pcp/src/libpcp_trace/src/GNUmakefile @@ -56,13 +56,13 @@ include $(BUILDRULES) install : default @@ -211,75 +211,80 @@ endif default_pcp : default -diff --git a/src/pmdas/aix/GNUmakefile b/src/pmdas/aix/GNUmakefile -index deb495ea42de..e0b66397d031 100644 ---- a/src/pmdas/aix/GNUmakefile -+++ b/src/pmdas/aix/GNUmakefile -@@ -44,7 +44,7 @@ build-me: common.h root_aix $(CMDTARGET) $(LIBTARGET) help.dir help.pag +Index: pcp/src/pmdas/aix/GNUmakefile +=================================================================== +--- pcp.orig/src/pmdas/aix/GNUmakefile ++++ pcp/src/pmdas/aix/GNUmakefile +@@ -44,7 +44,8 @@ build-me: common.h root_aix $(CMDTARGET) install: build-me $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help.dir help.pag $(PMDADIR) - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR) ++ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) $(INSTALL) -m 644 root_aix $(PCP_VAR_DIR)/pmns/root_aix else build-me: -diff --git a/src/pmdas/darwin/GNUmakefile b/src/pmdas/darwin/GNUmakefile -index d5be0e87c4a3..b5ee06d930f6 100644 ---- a/src/pmdas/darwin/GNUmakefile -+++ b/src/pmdas/darwin/GNUmakefile -@@ -48,7 +48,7 @@ build-me: root_darwin $(LIBTARGET) $(CMDTARGET) help.dir help.pag +Index: pcp/src/pmdas/darwin/GNUmakefile +=================================================================== +--- pcp.orig/src/pmdas/darwin/GNUmakefile ++++ pcp/src/pmdas/darwin/GNUmakefile +@@ -48,7 +48,8 @@ build-me: root_darwin $(LIBTARGET) $(CMD install: build-me $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help.dir help.pag $(PMDADIR) - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR) ++ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) $(INSTALL) -m 644 root_darwin $(PCP_VAR_DIR)/pmns/root_darwin else build-me: -diff --git a/src/pmdas/freebsd/GNUmakefile b/src/pmdas/freebsd/GNUmakefile -index 34b7f9329412..04f7524be857 100644 ---- a/src/pmdas/freebsd/GNUmakefile -+++ b/src/pmdas/freebsd/GNUmakefile -@@ -48,7 +48,7 @@ build-me: $(LIBTARGET) $(CMDTARGET) help.dir help.pag +Index: pcp/src/pmdas/freebsd/GNUmakefile +=================================================================== +--- pcp.orig/src/pmdas/freebsd/GNUmakefile ++++ pcp/src/pmdas/freebsd/GNUmakefile +@@ -49,7 +49,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) help install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help help.dir help.pag $(PMDADIR) - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR) ++ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) $(INSTALL) -m 644 root_freebsd $(PCP_VAR_DIR)/pmns/root_freebsd - else - build-me: -diff --git a/src/pmdas/linux/GNUmakefile b/src/pmdas/linux/GNUmakefile -index bd76a5938154..b049d7a398ae 100644 ---- a/src/pmdas/linux/GNUmakefile -+++ b/src/pmdas/linux/GNUmakefile -@@ -88,7 +88,7 @@ install: default + $(INSTALL) -m 644 freebsd_disk_units.conf $(LOGREWRITEDIR)/freebsd_disk_units.conf + $(INSTALL) -m 644 freebsd_misc.conf $(LOGREWRITEDIR)/freebsd_misc.conf +Index: pcp/src/pmdas/linux/GNUmakefile +=================================================================== +--- pcp.orig/src/pmdas/linux/GNUmakefile ++++ pcp/src/pmdas/linux/GNUmakefile +@@ -88,7 +88,8 @@ install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help $(HELPTARGETS) $(PMDADIR) $(INSTALL) -m 644 bandwidth.conf $(PMDADIR)/samplebandwidth.conf - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR) ++ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) $(INSTALL) -m 644 root_linux $(PCP_VAR_DIR)/pmns/root_linux $(INSTALL) -m 644 proc_fs_nfsd_fixups.conf $(LOGREWRITEDIR)/linux_proc_fs_nfsd_fixups.conf $(INSTALL) -m 644 proc_net_snmp_migrate.conf $(LOGREWRITEDIR)/linux_proc_net_snmp_migrate.conf -diff --git a/src/pmdas/linux_proc/GNUmakefile b/src/pmdas/linux_proc/GNUmakefile -index 4933c9f56c25..66ac15e2e35b 100644 ---- a/src/pmdas/linux_proc/GNUmakefile -+++ b/src/pmdas/linux_proc/GNUmakefile -@@ -69,7 +69,7 @@ build-me: root_proc $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS) $(LOGREWRITERS) +Index: pcp/src/pmdas/linux_proc/GNUmakefile +=================================================================== +--- pcp.orig/src/pmdas/linux_proc/GNUmakefile ++++ pcp/src/pmdas/linux_proc/GNUmakefile +@@ -69,7 +69,8 @@ build-me: root_proc $(LIBTARGET) $(CMDTA install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help help.dir help.pag root root_proc samplehotproc.conf $(PMDADIR) - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDADIR) ++ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(SCRIPTS) $(PMDADIR) $(INSTALL) -m 644 root_proc $(PCP_VAR_DIR)/pmns/root_proc $(INSTALL) -m 644 $(LOGREWRITERS) $(PCP_VAR_DIR)/config/pmlogrewrite @$(INSTALL_MAN) -diff --git a/src/pmdas/lustrecomm/GNUmakefile b/src/pmdas/lustrecomm/GNUmakefile -index 8d8f801734c8..58375479cdd5 100644 ---- a/src/pmdas/lustrecomm/GNUmakefile -+++ b/src/pmdas/lustrecomm/GNUmakefile +Index: pcp/src/pmdas/lustrecomm/GNUmakefile +=================================================================== +--- pcp.orig/src/pmdas/lustrecomm/GNUmakefile ++++ pcp/src/pmdas/lustrecomm/GNUmakefile @@ -51,7 +51,7 @@ build-me: $(TARGETS) install: default $(INSTALL) -m 755 -d $(PMDADIR) @@ -289,10 +294,10 @@ $(INSTALL) -m 755 Install Remove $(PMDADIR) $(INSTALL) -m 644 $(DFILES) root pmns domain.h help $(PMDADIR) @$(INSTALL_MAN) -diff --git a/src/pmdas/pmcd/src/GNUmakefile b/src/pmdas/pmcd/src/GNUmakefile -index 5ab2f22a565d..9f364f5cc7b5 100644 ---- a/src/pmdas/pmcd/src/GNUmakefile -+++ b/src/pmdas/pmcd/src/GNUmakefile +Index: pcp/src/pmdas/pmcd/src/GNUmakefile +=================================================================== +--- pcp.orig/src/pmdas/pmcd/src/GNUmakefile ++++ pcp/src/pmdas/pmcd/src/GNUmakefile @@ -55,7 +55,7 @@ default: $(LIBTARGET) install: default @@ -302,10 +307,10 @@ include $(BUILDRULES) -diff --git a/src/pmdas/sendmail/GNUmakefile b/src/pmdas/sendmail/GNUmakefile -index c679c880b9a1..3930eedd52e5 100644 ---- a/src/pmdas/sendmail/GNUmakefile -+++ b/src/pmdas/sendmail/GNUmakefile +Index: pcp/src/pmdas/sendmail/GNUmakefile +=================================================================== +--- pcp.orig/src/pmdas/sendmail/GNUmakefile ++++ pcp/src/pmdas/sendmail/GNUmakefile @@ -40,7 +40,7 @@ include $(BUILDRULES) install install_pcp: default @@ -315,19 +320,17 @@ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/pmda$(IAM)$(EXECSUFFIX) $(INSTALL) -m 755 $(SCRIPTS) $(PMDADIR) $(INSTALL) -m 644 $(DFILES) pmns help root domain.h $(PMDADIR) -diff --git a/src/pmdas/solaris/GNUmakefile b/src/pmdas/solaris/GNUmakefile -index 0720b37d98f0..f11a5dc8a25c 100644 ---- a/src/pmdas/solaris/GNUmakefile -+++ b/src/pmdas/solaris/GNUmakefile -@@ -53,7 +53,7 @@ build-me: root_solaris $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS) $(VERSION_SCRIPT +Index: pcp/src/pmdas/solaris/GNUmakefile +=================================================================== +--- pcp.orig/src/pmdas/solaris/GNUmakefile ++++ pcp/src/pmdas/solaris/GNUmakefile +@@ -53,7 +53,8 @@ build-me: root_solaris $(LIBTARGET) $(CM install: build-me $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h $(HELPTARGETS) $(PMDADIR) - $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR) ++ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) $(INSTALL) -m 644 root_solaris $(PCP_VAR_DIR)/pmns/root_solaris else build-me: --- -2.18.0 - ++++++ 0007-pmie-add-systemd-timers-as-cron-alternative.patch ++++++ --- /var/tmp/diff_new_pack.l9SaLT/_old 2019-01-29 14:45:20.399046618 +0100 +++ /var/tmp/diff_new_pack.l9SaLT/_new 2019-01-29 14:45:20.399046618 +0100 @@ -19,10 +19,10 @@ create mode 100644 src/pmie/pmie_daily.service.in create mode 100644 src/pmie/pmie_daily.timer -diff --git a/src/pmie/GNUmakefile b/src/pmie/GNUmakefile -index e27f2968d..11f472c11 100644 ---- a/src/pmie/GNUmakefile -+++ b/src/pmie/GNUmakefile +Index: pcp/src/pmie/GNUmakefile +=================================================================== +--- pcp.orig/src/pmie/GNUmakefile ++++ pcp/src/pmie/GNUmakefile @@ -18,7 +18,7 @@ include $(TOPDIR)/src/include/builddefs SUBDIRS = src examples @@ -62,9 +62,9 @@ include $(BUILDRULES) -@@ -72,6 +78,18 @@ install_pcp : install - pmie.service : pmie.service.in - $(SED) -e 's;@path@;'$(PCP_RC_DIR)';' <$< >$@ +@@ -75,6 +81,18 @@ pmie.service : pmie.service.in + -e 's;@PCP_RUN_DIR@;'$(PCP_RUN_DIR)';' \ + # END +pmie_check.service : pmie_check.service.in + $(SED) <$< >$@ \ @@ -81,11 +81,10 @@ crontab: crontab.in $(SED) -e 's;@user@;'$(CRONTAB_USER)';' -e 's;@path@;'$(PCP_BINADM_DIR)';g' $< > $@ -diff --git a/src/pmie/pmie_check.service.in b/src/pmie/pmie_check.service.in -new file mode 100644 -index 000000000..f216f7a67 +Index: pcp/src/pmie/pmie_check.service.in +=================================================================== --- /dev/null -+++ b/src/pmie/pmie_check.service.in ++++ pcp/src/pmie/pmie_check.service.in @@ -0,0 +1,8 @@ +[Unit] +Description=Check PMIE instances are running @@ -95,11 +94,10 @@ +Type=oneshot +ExecStart=@PCP_BINADM_DIR@/pmie_check -C +User=@PCP_USER@ -diff --git a/src/pmie/pmie_check.timer b/src/pmie/pmie_check.timer -new file mode 100644 -index 000000000..ae91a192b +Index: pcp/src/pmie/pmie_check.timer +=================================================================== --- /dev/null -+++ b/src/pmie/pmie_check.timer ++++ pcp/src/pmie/pmie_check.timer @@ -0,0 +1,10 @@ +[Unit] +Description=Half-hourly check of PMIE instances @@ -111,11 +109,10 @@ +[Install] +WantedBy=timers.target + -diff --git a/src/pmie/pmie_daily.service.in b/src/pmie/pmie_daily.service.in -new file mode 100644 -index 000000000..ea933da4b +Index: pcp/src/pmie/pmie_daily.service.in +=================================================================== --- /dev/null -+++ b/src/pmie/pmie_daily.service.in ++++ pcp/src/pmie/pmie_daily.service.in @@ -0,0 +1,8 @@ +[Unit] +Description=Process PMIE logs @@ -125,11 +122,10 @@ +Type=oneshot +ExecStart=@PCP_BINADM_DIR@/pmie_daily -X xz -x 3 +User=@PCP_USER@ -diff --git a/src/pmie/pmie_daily.timer b/src/pmie/pmie_daily.timer -new file mode 100644 -index 000000000..e36b79990 +Index: pcp/src/pmie/pmie_daily.timer +=================================================================== --- /dev/null -+++ b/src/pmie/pmie_daily.timer ++++ pcp/src/pmie/pmie_daily.timer @@ -0,0 +1,8 @@ +[Unit] +Description=Daily processing of PMIE logs @@ -139,6 +135,3 @@ + +[Install] +WantedBy=timers.target --- -2.13.7 - ++++++ 0008-pmlogger_daily-add-systemd-timers-as-cron-alternativ.patch ++++++ --- /var/tmp/diff_new_pack.l9SaLT/_old 2019-01-29 14:45:20.407046608 +0100 +++ /var/tmp/diff_new_pack.l9SaLT/_new 2019-01-29 14:45:20.407046608 +0100 @@ -23,10 +23,10 @@ create mode 100644 src/pmlogger/pmlogger_daily_poll.service.in create mode 100644 src/pmlogger/pmlogger_daily_poll.timer -diff --git a/src/pmlogger/GNUmakefile b/src/pmlogger/GNUmakefile -index 75af514d5..942458e1f 100644 ---- a/src/pmlogger/GNUmakefile -+++ b/src/pmlogger/GNUmakefile +Index: pcp/src/pmlogger/GNUmakefile +=================================================================== +--- pcp.orig/src/pmlogger/GNUmakefile ++++ pcp/src/pmlogger/GNUmakefile @@ -20,7 +20,9 @@ SUBDIRS = src OTHERS = pmnewlog.sh control rc_pmlogger \ pmlogger_daily.sh pmlogger_check.sh pmlogger_merge.sh pmlogmv.sh \ @@ -38,7 +38,7 @@ ifeq ($(TARGET_OS),linux) CRONTAB_USER = $(PCP_USER) -@@ -31,7 +33,7 @@ CRONTAB_PATH = $(PCP_SYSCONF_DIR)/pmlogger/crontab +@@ -31,7 +33,7 @@ CRONTAB_PATH = $(PCP_SYSCONF_DIR)/pmlogg endif CRONTAB_DAILY_REPORT_PATH = $(CRONTAB_PATH)-daily-report @@ -70,9 +70,9 @@ $(INSTALL) -m 644 utilproc.sh $(PCP_SHARE_DIR)/lib/utilproc.sh $(INSTALL) -m 755 pmlogger_daily_report.sh $(PCP_BINADM_DIR)/pmlogger_daily_report$(SHELLSUFFIX) $(INSTALL) -m 644 crontab.daily_report $(CRONTAB_DAILY_REPORT_PATH) -@@ -83,6 +93,24 @@ install_pcp : install - pmlogger.service : pmlogger.service.in - $(SED) -e 's;@path@;'$(PCP_RC_DIR)';' <$< >$@ +@@ -86,6 +96,24 @@ pmlogger.service : pmlogger.service.in + -e 's;@PCP_RUN_DIR@;'$(PCP_RUN_DIR)';' \ + # END +pmlogger_daily.service : pmlogger_daily.service.in + $(SED) <$< >$@ \ @@ -95,11 +95,10 @@ crontab : crontab.in $(SED) -e 's;@user@;'$(CRONTAB_USER)';' -e 's;@path@;'$(PCP_BINADM_DIR)';' $< > $@ -diff --git a/src/pmlogger/pmlogger_daily.service.in b/src/pmlogger/pmlogger_daily.service.in -new file mode 100644 -index 000000000..d08438370 +Index: pcp/src/pmlogger/pmlogger_daily.service.in +=================================================================== --- /dev/null -+++ b/src/pmlogger/pmlogger_daily.service.in ++++ pcp/src/pmlogger/pmlogger_daily.service.in @@ -0,0 +1,8 @@ +[Unit] +Description=Process archive logs @@ -109,11 +108,10 @@ +Type=oneshot +ExecStart=@PCP_BINADM_DIR@/pmlogger_daily +User=@PCP_USER@ -diff --git a/src/pmlogger/pmlogger_daily.timer b/src/pmlogger/pmlogger_daily.timer -new file mode 100644 -index 000000000..92bc398cf +Index: pcp/src/pmlogger/pmlogger_daily.timer +=================================================================== --- /dev/null -+++ b/src/pmlogger/pmlogger_daily.timer ++++ pcp/src/pmlogger/pmlogger_daily.timer @@ -0,0 +1,8 @@ +[Unit] +Description=Daily processing of archive logs @@ -123,11 +121,10 @@ + +[Install] +WantedBy=timers.target -diff --git a/src/pmlogger/pmlogger_daily_check.service.in b/src/pmlogger/pmlogger_daily_check.service.in -new file mode 100644 -index 000000000..56fd47c55 +Index: pcp/src/pmlogger/pmlogger_daily_check.service.in +=================================================================== --- /dev/null -+++ b/src/pmlogger/pmlogger_daily_check.service.in ++++ pcp/src/pmlogger/pmlogger_daily_check.service.in @@ -0,0 +1,8 @@ +[Unit] +Description=Check pmlogger instances are running @@ -137,11 +134,10 @@ +Type=oneshot +ExecStart=@PCP_BINADM_DIR@/pmlogger_daily -C +User=@PCP_USER@ -diff --git a/src/pmlogger/pmlogger_daily_check.timer b/src/pmlogger/pmlogger_daily_check.timer -new file mode 100644 -index 000000000..381b2c5ab +Index: pcp/src/pmlogger/pmlogger_daily_check.timer +=================================================================== --- /dev/null -+++ b/src/pmlogger/pmlogger_daily_check.timer ++++ pcp/src/pmlogger/pmlogger_daily_check.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Half-hourly check of pmlogger instances @@ -152,11 +148,10 @@ + +[Install] +WantedBy=timers.target -diff --git a/src/pmlogger/pmlogger_daily_poll.service.in b/src/pmlogger/pmlogger_daily_poll.service.in -new file mode 100644 -index 000000000..da5859d8b +Index: pcp/src/pmlogger/pmlogger_daily_poll.service.in +=================================================================== --- /dev/null -+++ b/src/pmlogger/pmlogger_daily_poll.service.in ++++ pcp/src/pmlogger/pmlogger_daily_poll.service.in @@ -0,0 +1,8 @@ +[Unit] +Description=Poll log processing @@ -166,11 +161,10 @@ +Type=oneshot +ExecStart=@PCP_BINADM_DIR@/pmlogger_daily -p +User=@PCP_USER@ -diff --git a/src/pmlogger/pmlogger_daily_poll.timer b/src/pmlogger/pmlogger_daily_poll.timer -new file mode 100644 -index 000000000..0b4650b37 +Index: pcp/src/pmlogger/pmlogger_daily_poll.timer +=================================================================== --- /dev/null -+++ b/src/pmlogger/pmlogger_daily_poll.timer ++++ pcp/src/pmlogger/pmlogger_daily_poll.timer @@ -0,0 +1,8 @@ +[Unit] +Description=Hourly polling of log processing @@ -180,6 +174,3 @@ + +[Install] +WantedBy=timers.target --- -2.13.7 - ++++++ 0009-pmlogger_daily_report-add-systemd-timers-as-cron-alt.patch ++++++ --- /var/tmp/diff_new_pack.l9SaLT/_old 2019-01-29 14:45:20.415046599 +0100 +++ /var/tmp/diff_new_pack.l9SaLT/_new 2019-01-29 14:45:20.415046599 +0100 @@ -19,11 +19,11 @@ create mode 100644 src/pmlogger/pmlogger_daily_report_poll.service.in create mode 100644 src/pmlogger/pmlogger_daily_report_poll.timer -diff --git a/src/pmlogger/GNUmakefile b/src/pmlogger/GNUmakefile -index fe94a3964..845575cb6 100644 ---- a/src/pmlogger/GNUmakefile -+++ b/src/pmlogger/GNUmakefile -@@ -22,7 +22,8 @@ OTHERS = pmnewlog.sh control rc_pmlogger \ +Index: pcp/src/pmlogger/GNUmakefile +=================================================================== +--- pcp.orig/src/pmlogger/GNUmakefile ++++ pcp/src/pmlogger/GNUmakefile +@@ -22,7 +22,8 @@ OTHERS = pmnewlog.sh control rc_pmlogger pmlogger_daily_report.sh pmlogger_rewrite.sh LDIRT = crontab crontab.docker crontab.daily_report pmlogger.service \ pmlogger_daily.service pmlogger_daily_poll.service \ @@ -44,7 +44,7 @@ endif $(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_LOG_DIR)/pmlogger $(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_TMP_DIR)/pmlogger -@@ -79,7 +84,9 @@ ifneq ($(ENABLE_SYSTEMD),true) +@@ -81,7 +86,9 @@ ifneq ($(ENABLE_SYSTEMD),true) endif $(INSTALL) -m 644 utilproc.sh $(PCP_SHARE_DIR)/lib/utilproc.sh $(INSTALL) -m 755 pmlogger_daily_report.sh $(PCP_BINADM_DIR)/pmlogger_daily_report$(SHELLSUFFIX) @@ -54,7 +54,7 @@ $(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_SA_DIR) include $(BUILDRULES) -@@ -109,6 +116,20 @@ pmlogger_daily_check.service : pmlogger_daily_check.service.in +@@ -114,6 +121,20 @@ pmlogger_daily_check.service : pmlogger_ -e 's;@PCP_USER@;'$(PCP_USER)';' \ # END @@ -75,11 +75,10 @@ crontab : crontab.in $(SED) -e 's;@user@;'$(CRONTAB_USER)';' -e 's;@path@;'$(PCP_BINADM_DIR)';' $< > $@ -diff --git a/src/pmlogger/pmlogger_daily_report.service.in b/src/pmlogger/pmlogger_daily_report.service.in -new file mode 100644 -index 000000000..f4b3e8d30 +Index: pcp/src/pmlogger/pmlogger_daily_report.service.in +=================================================================== --- /dev/null -+++ b/src/pmlogger/pmlogger_daily_report.service.in ++++ pcp/src/pmlogger/pmlogger_daily_report.service.in @@ -0,0 +1,8 @@ +[Unit] +Description=Generate system activity reports @@ -89,11 +88,10 @@ +Type=oneshot +ExecStart=@PCP_BINADM_DIR@/pmlogger_daily_report -o @PCP_SA_DIR@ +User=@PCP_USER@ -diff --git a/src/pmlogger/pmlogger_daily_report.timer b/src/pmlogger/pmlogger_daily_report.timer -new file mode 100644 -index 000000000..f2294b9b3 +Index: pcp/src/pmlogger/pmlogger_daily_report.timer +=================================================================== --- /dev/null -+++ b/src/pmlogger/pmlogger_daily_report.timer ++++ pcp/src/pmlogger/pmlogger_daily_report.timer @@ -0,0 +1,8 @@ +[Unit] +Description=Daily generation of system activity reports @@ -103,11 +101,10 @@ + +[Install] +WantedBy=timers.target -diff --git a/src/pmlogger/pmlogger_daily_report_poll.service.in b/src/pmlogger/pmlogger_daily_report_poll.service.in -new file mode 100644 -index 000000000..241138e7e +Index: pcp/src/pmlogger/pmlogger_daily_report_poll.service.in +=================================================================== --- /dev/null -+++ b/src/pmlogger/pmlogger_daily_report_poll.service.in ++++ pcp/src/pmlogger/pmlogger_daily_report_poll.service.in @@ -0,0 +1,8 @@ +[Unit] +Description=Poll system activity report generation @@ -117,11 +114,10 @@ +Type=oneshot +ExecStart=@PCP_BINADM_DIR@/pmlogger_daily_report -o @PCP_SA_DIR@ -p +User=@PCP_USER@ -diff --git a/src/pmlogger/pmlogger_daily_report_poll.timer b/src/pmlogger/pmlogger_daily_report_poll.timer -new file mode 100644 -index 000000000..f74801e47 +Index: pcp/src/pmlogger/pmlogger_daily_report_poll.timer +=================================================================== --- /dev/null -+++ b/src/pmlogger/pmlogger_daily_report_poll.timer ++++ pcp/src/pmlogger/pmlogger_daily_report_poll.timer @@ -0,0 +1,8 @@ +[Unit] +Description=Hourly polling of system activity report generation @@ -131,6 +127,3 @@ + +[Install] +WantedBy=timers.target --- -2.13.7 - ++++++ 0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch ++++++ >From b591bf4f9f73f11d012e40f4860a8635b4096977 Mon Sep 17 00:00:00 2001 From: David Disseldorp <[email protected]> Date: Tue, 15 Jan 2019 01:15:45 +0100 Subject: [PATCH] pmns: don't package .NeedRebuild for SUSE distros .NeedRebuild creation is handled by rpm scripts. This change also fixes the target_distro configure check for modern [open]SUSE distros, which only include /etc/os-release. Signed-off-by: David Disseldorp <[email protected]> --- configure | 1 + configure.ac | 1 + src/pmns/GNUmakefile | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 99e07b368..e69366f07 100755 --- a/configure +++ b/configure @@ -3324,6 +3324,7 @@ then $as_echo "#define IS_LINUX 1" >>confdefs.h test -f /etc/SuSE-release && target_distro=suse + grep -q 'ID_LIKE="suse"' /etc/os-release 2> /dev/null && target_distro=suse test -f /etc/fedora-release && target_distro=fedora test -f /etc/redhat-release && target_distro=redhat test -f /etc/debian_version && target_distro=debian diff --git a/configure.ac b/configure.ac index 359ed5507..7d8082c56 100644 --- a/configure.ac +++ b/configure.ac @@ -281,6 +281,7 @@ if test $target_os = linux then AC_DEFINE(IS_LINUX, [1], [Platform is Linux]) test -f /etc/SuSE-release && target_distro=suse + grep -q 'ID_LIKE="suse"' /etc/os-release 2> /dev/null && target_distro=suse test -f /etc/fedora-release && target_distro=fedora test -f /etc/redhat-release && target_distro=redhat test -f /etc/debian_version && target_distro=debian diff --git a/src/pmns/GNUmakefile b/src/pmns/GNUmakefile index e8707a7e5..9b9458359 100644 --- a/src/pmns/GNUmakefile +++ b/src/pmns/GNUmakefile @@ -60,7 +60,7 @@ install: default $(INSTALL) -m 755 Rebuild $(PMNS_VAR_DIR)/Rebuild $(INSTALL) -m 755 Make.stdpmid $(PMNS_VAR_DIR)/Make.stdpmid $(INSTALL) -m 644 $(STDPMID) $(PMNS_VAR_DIR) -ifeq (, $(filter redhat debian, $(PACKAGE_DISTRIBUTION))) +ifeq (, $(filter redhat debian suse, $(PACKAGE_DISTRIBUTION))) $(INSTALL) -m 644 .NeedRebuild $(PMNS_VAR_DIR)/.NeedRebuild endif -- 2.13.7 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.l9SaLT/_old 2019-01-29 14:45:20.435046575 +0100 +++ /var/tmp/diff_new_pack.l9SaLT/_new 2019-01-29 14:45:20.439046570 +0100 @@ -3,7 +3,7 @@ <param name="scm">git</param> <param name="url">https://github.com/performancecopilot/pcp.git</param> <param name="filename">pcp</param> - <param name="revision">4.2.0</param> + <param name="revision">4.3.0</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">disable</param> </service> ++++++ pcp-4.2.0.tar.bz2 -> pcp-4.3.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/pcp/pcp-4.2.0.tar.bz2 /work/SRC/openSUSE:Factory/.pcp.new.28833/pcp-4.3.0.tar.bz2 differ: char 11, line 1
