Accepting request 297153 from home:dmdiss:pcp_threeten

- Update to 3.10.4
  See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=3.10.4
  for details.

OBS-URL: https://build.opensuse.org/request/show/297153
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=47
This commit is contained in:
David Disseldorp 2015-04-16 10:01:56 +00:00 committed by Git OBS Bridge
parent 9bf36b4827
commit bde517d0e2
6 changed files with 97 additions and 99 deletions

View File

@ -7,11 +7,11 @@ Subject: [PATCH 1/6] Fix XEN build
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index 98d325e2bfdc..648c511dcd72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1079,6 +1079,7 @@ NR == 1 { if ($1 != "UID" && $1 != "USER") exit
Index: pcp-3.10.4/configure.ac
===================================================================
--- pcp-3.10.4.orig/configure.ac
+++ pcp-3.10.4/configure.ac
@@ -1105,6 +1105,7 @@ NR == 1 { if ($1 != "UID" && $1 != "US
# Unix variants
$2 == 1 && / init/ { print "OK"; exit }
$2 == 1 && / \/etc\/init/ { print "OK"; exit }
@ -19,6 +19,3 @@ index 98d325e2bfdc..648c511dcd72 100644
# Fedora 9
$2 == 1 && / \/sbin\/init/ { print "OK"; exit }
# Fedora 15
--
2.1.2

View File

@ -22,10 +22,10 @@ Subject: [PATCH 2/6] Install libraries without exec permission
src/pmdas/solaris/GNUmakefile | 3 ++-
16 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/genpmda/genpmda b/src/genpmda/genpmda
index 46503150c1a5..1bd2cbae3497 100755
--- a/src/genpmda/genpmda
+++ b/src/genpmda/genpmda
Index: pcp-3.10.4/src/genpmda/genpmda
===================================================================
--- pcp-3.10.4.orig/src/genpmda/genpmda
+++ pcp-3.10.4/src/genpmda/genpmda
@@ -909,7 +909,7 @@ install: default
\$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas
\$(INSTALL) -m 755 -d \$(PMDADIR)
@ -44,11 +44,11 @@ index 46503150c1a5..1bd2cbae3497 100755
\$(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 5e9cc76c6027..4c5ced38813c 100644
--- a/src/libpcp/src/GNUmakefile
+++ b/src/libpcp/src/GNUmakefile
@@ -128,7 +128,7 @@ endif
Index: pcp-3.10.4/src/libpcp/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/libpcp/src/GNUmakefile
+++ pcp-3.10.4/src/libpcp/src/GNUmakefile
@@ -125,7 +125,7 @@ endif
install : default
ifneq ($(LIBTARGET),)
@ -57,7 +57,7 @@ index 5e9cc76c6027..4c5ced38813c 100644
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -136,7 +136,7 @@ ifneq ($(SYMTARGET),)
@@ -133,7 +133,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
@ -66,11 +66,11 @@ index 5e9cc76c6027..4c5ced38813c 100644
endif
default_pcp : default
diff --git a/src/libpcp_gui/src/GNUmakefile b/src/libpcp_gui/src/GNUmakefile
index 91589f7448b2..ea44eaec99d1 100644
--- a/src/libpcp_gui/src/GNUmakefile
+++ b/src/libpcp_gui/src/GNUmakefile
@@ -57,7 +57,7 @@ include $(BUILDRULES)
Index: pcp-3.10.4/src/libpcp_gui/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/libpcp_gui/src/GNUmakefile
+++ pcp-3.10.4/src/libpcp_gui/src/GNUmakefile
@@ -54,7 +54,7 @@ include $(BUILDRULES)
install: default
ifneq ($(LIBTARGET),)
@ -79,7 +79,7 @@ index 91589f7448b2..ea44eaec99d1 100644
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -65,7 +65,7 @@ ifneq ($(SYMTARGET),)
@@ -62,7 +62,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
@ -88,10 +88,10 @@ index 91589f7448b2..ea44eaec99d1 100644
endif
default_pcp: default
diff --git a/src/libpcp_import/src/GNUmakefile b/src/libpcp_import/src/GNUmakefile
index 6c3c2aa75489..178eb8197059 100644
--- a/src/libpcp_import/src/GNUmakefile
+++ b/src/libpcp_import/src/GNUmakefile
Index: pcp-3.10.4/src/libpcp_import/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/libpcp_import/src/GNUmakefile
+++ pcp-3.10.4/src/libpcp_import/src/GNUmakefile
@@ -53,7 +53,7 @@ include $(BUILDRULES)
install: default
@ -110,10 +110,10 @@ index 6c3c2aa75489..178eb8197059 100644
endif
default_pcp: default
diff --git a/src/libpcp_mmv/src/GNUmakefile b/src/libpcp_mmv/src/GNUmakefile
index a60029c09ece..a7cf0647ba9d 100644
--- a/src/libpcp_mmv/src/GNUmakefile
+++ b/src/libpcp_mmv/src/GNUmakefile
Index: pcp-3.10.4/src/libpcp_mmv/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/libpcp_mmv/src/GNUmakefile
+++ pcp-3.10.4/src/libpcp_mmv/src/GNUmakefile
@@ -48,7 +48,7 @@ include $(BUILDRULES)
install: default
@ -132,32 +132,32 @@ index a60029c09ece..a7cf0647ba9d 100644
endif
default_pcp: default
diff --git a/src/libpcp_pmda/src/GNUmakefile b/src/libpcp_pmda/src/GNUmakefile
index 583be8109ddd..cc577eaf2023 100644
--- a/src/libpcp_pmda/src/GNUmakefile
+++ b/src/libpcp_pmda/src/GNUmakefile
@@ -81,7 +81,7 @@ include $(BUILDRULES)
Index: pcp-3.10.4/src/libpcp_pmda/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/libpcp_pmda/src/GNUmakefile
+++ pcp-3.10.4/src/libpcp_pmda/src/GNUmakefile
@@ -60,7 +60,7 @@ include $(BUILDRULES)
install : default
install: default
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq ($(LIBTARGET_V1),)
$(INSTALL) -S $(LIBTARGET_V3) $(PCP_LIB_DIR)/$(LIBTARGET_V1)
@@ -90,7 +90,7 @@ ifneq ($(LIBTARGET_V2),)
$(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET_V2)
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -68,7 +68,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
default_pcp : default
diff --git a/src/libpcp_trace/src/GNUmakefile b/src/libpcp_trace/src/GNUmakefile
index a99c493986b8..c1d5ab7aa0cc 100644
--- a/src/libpcp_trace/src/GNUmakefile
+++ b/src/libpcp_trace/src/GNUmakefile
default_pcp: default
Index: pcp-3.10.4/src/libpcp_trace/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/libpcp_trace/src/GNUmakefile
+++ pcp-3.10.4/src/libpcp_trace/src/GNUmakefile
@@ -56,13 +56,13 @@ include $(BUILDRULES)
install : default
@ -174,11 +174,11 @@ index a99c493986b8..c1d5ab7aa0cc 100644
endif
default_pcp : default
diff --git a/src/pmdas/aix/GNUmakefile b/src/pmdas/aix/GNUmakefile
index e4796b9994fa..77ded85a9874 100644
--- a/src/pmdas/aix/GNUmakefile
+++ b/src/pmdas/aix/GNUmakefile
@@ -43,7 +43,8 @@ build-me: common.h root_aix domain.h $(CMDTARGET) $(LIBTARGET) help.dir help.pag
Index: pcp-3.10.4/src/pmdas/aix/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/aix/GNUmakefile
+++ pcp-3.10.4/src/pmdas/aix/GNUmakefile
@@ -43,7 +43,8 @@ build-me: common.h root_aix domain.h $(C
install: build-me
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help.dir help.pag $(PMDADIR)
@ -188,11 +188,11 @@ index e4796b9994fa..77ded85a9874 100644
$(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 60af8940d436..8b8a1e2963cb 100644
--- a/src/pmdas/darwin/GNUmakefile
+++ b/src/pmdas/darwin/GNUmakefile
@@ -47,7 +47,8 @@ build-me: root_darwin domain.h $(LIBTARGET) $(CMDTARGET) help.dir help.pag
Index: pcp-3.10.4/src/pmdas/darwin/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/darwin/GNUmakefile
+++ pcp-3.10.4/src/pmdas/darwin/GNUmakefile
@@ -47,7 +47,8 @@ build-me: root_darwin domain.h $(LIBTARG
install: build-me
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help.dir help.pag $(PMDADIR)
@ -202,11 +202,11 @@ index 60af8940d436..8b8a1e2963cb 100644
$(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 3689e2ad06b9..12c70dd140a3 100644
--- a/src/pmdas/freebsd/GNUmakefile
+++ b/src/pmdas/freebsd/GNUmakefile
@@ -48,7 +48,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTARGET) help.dir help.pag
Index: pcp-3.10.4/src/pmdas/freebsd/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/freebsd/GNUmakefile
+++ pcp-3.10.4/src/pmdas/freebsd/GNUmakefile
@@ -48,7 +48,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTAR
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help help.dir help.pag $(PMDADIR)
@ -216,11 +216,11 @@ index 3689e2ad06b9..12c70dd140a3 100644
$(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 4d645d77561d..49399a0efb8a 100644
--- a/src/pmdas/linux/GNUmakefile
+++ b/src/pmdas/linux/GNUmakefile
@@ -75,7 +75,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
Index: pcp-3.10.4/src/pmdas/linux/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/linux/GNUmakefile
+++ pcp-3.10.4/src/pmdas/linux/GNUmakefile
@@ -75,7 +75,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTAR
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help $(HELPTARGETS) $(PMDADIR)
@ -230,11 +230,11 @@ index 4d645d77561d..49399a0efb8a 100644
$(INSTALL) -m 644 root_linux $(PCP_VAR_DIR)/pmns/root_linux
$(INSTALL) -m 644 proc_net_snmp_migrate.conf $(LOGREWRITEDIR)/linux_proc_net_snmp_migrate.conf
else
diff --git a/src/pmdas/linux_proc/GNUmakefile b/src/pmdas/linux_proc/GNUmakefile
index e015425eff14..6345a97a9afe 100644
--- a/src/pmdas/linux_proc/GNUmakefile
+++ b/src/pmdas/linux_proc/GNUmakefile
@@ -66,7 +66,8 @@ build-me: domain.h root_proc $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
Index: pcp-3.10.4/src/pmdas/linux_proc/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/linux_proc/GNUmakefile
+++ pcp-3.10.4/src/pmdas/linux_proc/GNUmakefile
@@ -66,7 +66,8 @@ build-me: domain.h root_proc $(LIBTARGET
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help help.dir help.pag root root_proc samplehotproc.conf $(PMDADIR)
@ -244,10 +244,10 @@ index e015425eff14..6345a97a9afe 100644
$(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 1f9e031ab5ce..2abbfaa92f5f 100644
--- a/src/pmdas/lustrecomm/GNUmakefile
+++ b/src/pmdas/lustrecomm/GNUmakefile
Index: pcp-3.10.4/src/pmdas/lustrecomm/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/lustrecomm/GNUmakefile
+++ pcp-3.10.4/src/pmdas/lustrecomm/GNUmakefile
@@ -50,7 +50,7 @@ build-me: domain.h $(TARGETS)
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
@ -257,10 +257,10 @@ index 1f9e031ab5ce..2abbfaa92f5f 100644
$(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 a688d73767d3..851066aa10d7 100644
--- a/src/pmdas/pmcd/src/GNUmakefile
+++ b/src/pmdas/pmcd/src/GNUmakefile
Index: pcp-3.10.4/src/pmdas/pmcd/src/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/pmcd/src/GNUmakefile
+++ pcp-3.10.4/src/pmdas/pmcd/src/GNUmakefile
@@ -54,7 +54,7 @@ default: $(LIBTARGET) domain.h
install: default
@ -270,10 +270,10 @@ index a688d73767d3..851066aa10d7 100644
include $(BUILDRULES)
diff --git a/src/pmdas/sendmail/GNUmakefile b/src/pmdas/sendmail/GNUmakefile
index 171c7c06106e..5911c175c74f 100644
--- a/src/pmdas/sendmail/GNUmakefile
+++ b/src/pmdas/sendmail/GNUmakefile
Index: pcp-3.10.4/src/pmdas/sendmail/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/sendmail/GNUmakefile
+++ pcp-3.10.4/src/pmdas/sendmail/GNUmakefile
@@ -39,7 +39,7 @@ include $(BUILDRULES)
install install_pcp: default
@ -283,11 +283,11 @@ index 171c7c06106e..5911c175c74f 100644
$(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 818ba9a08e49..0a9370adb929 100644
--- a/src/pmdas/solaris/GNUmakefile
+++ b/src/pmdas/solaris/GNUmakefile
@@ -53,7 +53,8 @@ build-me: root_solaris domain.h $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS) $(VERSI
Index: pcp-3.10.4/src/pmdas/solaris/GNUmakefile
===================================================================
--- pcp-3.10.4.orig/src/pmdas/solaris/GNUmakefile
+++ pcp-3.10.4/src/pmdas/solaris/GNUmakefile
@@ -53,7 +53,8 @@ build-me: root_solaris domain.h $(LIBTAR
install: build-me
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h $(HELPTARGETS) $(PMDADIR)
@ -297,6 +297,3 @@ index 818ba9a08e49..0a9370adb929 100644
$(INSTALL) -m 644 root_solaris $(PCP_VAR_DIR)/pmns/root_solaris
else
build-me:
--
2.1.2

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f7b72596e687c2dc0d8ab775d26dc2bf08463440d9f39dd7009cdd3faf3e054
size 14205088

3
pcp-3.10.4.src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0215380d2ddb01865f659bbf36ed06020d5865152d430a6b6fc45eda67cc22ba
size 14285544

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Apr 16 09:14:35 UTC 2015 - ddiss@suse.com
- Update to 3.10.4
See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=3.10.4
for details.
-------------------------------------------------------------------
Wed Mar 18 23:13:23 UTC 2015 - ddiss@suse.com

View File

@ -63,7 +63,7 @@ Summary: System-level performance monitoring and performance management
License: %{license_gplv2plus} and %{license_lgplv2plus} and %{license_cc_by}
Group: %{pcp_gr}
Name: pcp
Version: 3.10.3
Version: 3.10.4
Release: 0
%define buildversion 1
@ -1343,12 +1343,9 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
%defattr(-,root,root)
%{_libdir}/libpcp.so
%{_libdir}/libpcp.so.2
%{_libdir}/libpcp_gui.so
%{_libdir}/libpcp_gui.so.1
%{_libdir}/libpcp_mmv.so
%{_libdir}/libpcp_pmda.so
%{_libdir}/libpcp_pmda.so.2
%{_libdir}/libpcp_trace.so
%{_libdir}/libpcp_import.so
%{_includedir}/pcp/*.h