noodles pushed to ganglia (epel7). "Merge branch 'master' into el6"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 22 02:13:56 UTC 2015
>From e4f9e92a6938003d7c2ece0b3b1a312feb1bbba5 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting at fedoraproject.org>
Date: Wed, 25 Nov 2009 23:19:19 +0000
Subject: Fix typo that causes a failure to update the common directory.
(releng #2781)
diff --git a/Makefile b/Makefile
index 8262c3d..44b4717 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
# Makefile for source rpm: ganglia
-# $Id$
+# $Id: Makefile,v 1.1 2006/06/15 20:15:03 jwilson Exp $
NAME := ganglia
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
--
cgit v0.10.2
>From f7a5443d68202170cb4b659fd7ad16f467a85da9 Mon Sep 17 00:00:00 2001
From: georgiou <georgiou at fedoraproject.org>
Date: Thu, 22 Apr 2010 14:44:00 +0000
Subject: - New upstream release - Spec file cleanups - Use the new name_match
feature to enable the diskusage plugin by default
diff --git a/diskusage-fix.patch b/diskusage-fix.patch
deleted file mode 100644
index 317c3b9..0000000
--- a/diskusage-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- gmond/python_modules/conf.d/diskusage.pyconf-orig 2008-08-12 13:20:42.000000000 +0100
-+++ gmond/python_modules/conf.d/diskusage.pyconf 2008-08-12 13:21:53.000000000 +0100
-@@ -7,6 +7,7 @@
- }
- }
-
-+/*
- collection_group {
- collect_every = 10
- time_threshold = 50
-@@ -23,4 +24,5 @@
- name = "<disk_total-metric-name>"
- }
- }
-+*/
-
diff --git a/diskusage-pcre.patch b/diskusage-pcre.patch
new file mode 100644
index 0000000..8b2ed4a
--- /dev/null
+++ b/diskusage-pcre.patch
@@ -0,0 +1,24 @@
+diff --git a/gmond/python_modules/conf.d/diskusage.pyconf b/gmond/python_modules/conf.d/diskusage.pyconf
+index 04a7ef1..1a7ef17 100644
+--- a/gmond/python_modules/conf.d/diskusage.pyconf
++++ b/gmond/python_modules/conf.d/diskusage.pyconf
+@@ -11,7 +11,8 @@ collection_group {
+ collect_every = 10
+ time_threshold = 50
+ metric {
+- name = "<disk_used-metric-name>"
++ name_match = "([\\S]+)-disk_used"
++ name = "\\1-disk_used"
+ value_threshold = 1.0
+ }
+ }
+@@ -20,7 +21,8 @@ collection_group {
+ collect_once = yes
+ time_threshold = 20
+ metric {
+- name = "<disk_total-metric-name>"
++ name_match = "([\\S]+)-disk_total"
++ name = "\\1-disk_total"
+ }
+ }
+
diff --git a/ganglia.spec b/ganglia.spec
index 27115af..91049fe 100644
--- a/ganglia.spec
+++ b/ganglia.spec
@@ -1,6 +1,6 @@
Name: ganglia
-Version: 3.1.2
-Release: 4%{?svnrev:.r%{svnrev}}%{?dist}
+Version: 3.1.7
+Release: 1%{?svnrev:.r%{svnrev}}%{?dist}
Summary: Ganglia Distributed Monitoring System
Group: Applications/Internet
@@ -8,13 +8,15 @@ License: BSD
URL: http://ganglia.sourceforge.net/
Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
#Source0: http://www.ganglia.info/snapshots/3.1.x/%{name}-%{version}.%{svnrev}.tar.gz
-Patch0: diskusage-fix.patch
+Patch0: diskusage-pcre.patch
+Patch1: setuserid-fix.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: rrdtool-devel, apr-devel >= 1
BuildRequires: libpng-devel, libart_lgpl-devel
BuildRequires: libconfuse-devel, expat-devel
BuildRequires: python-devel, freetype-devel
+BuildRequires: pcre-devel
%description
Ganglia is a scalable, real-time monitoring and execution environment
@@ -88,21 +90,23 @@ programmers can use to build scalable cluster or grid applications
%prep
%setup -q -n %{name}-%{version}%{?svnrev:.%{svnrev}}
-%patch0 -p0
+%patch0 -p1
+%patch1 -p1
## Hey, those shouldn't be executable...
chmod -x lib/*.{h,x}
%build
%configure \
+ --enable-setuid=ganglia \
+ --enable-setgid=ganglia \
--with-gmetad \
--disable-static \
- --enable-shared
+ --enable-shared \
+ --sysconfdir=%{_sysconfdir}/ganglia
## Default to run as user ganglia instead of nobody
%{__perl} -pi.orig -e 's|nobody|ganglia|g' \
- lib/libgmond.c gmetad/conf.c gmond/g25_config.c \
- gmetad/gmetad.conf gmond/gmond.conf.html ganglia.html \
- gmond/conf.pod ganglia.pod README lib/default_conf.h
+ gmond/gmond.conf.html ganglia.html gmond/conf.pod
## Don't have initscripts turn daemons on by default
%{__perl} -pi.orig -e 's|2345|-|g' \
@@ -112,6 +116,7 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
## Put web files in place
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
@@ -160,7 +165,7 @@ gmond/gmond -t | %{__perl} -pe 's|nobody|ganglia|g' > $RPM_BUILD_ROOT%{_sysconfd
# Copy the python metric modules and .conf files
cp -p gmond/python_modules/conf.d/*.pyconf $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/
cp -p gmond/modules/conf.d/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/
-cp -p gmond/python_modules/*/*.{py,pyc} $RPM_BUILD_ROOT%{_libdir}/ganglia/python_modules/
+cp -p gmond/python_modules/*/*.py $RPM_BUILD_ROOT%{_libdir}/ganglia/python_modules/
# Don't install the example modules
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/example.conf
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/example.pyconf
@@ -170,6 +175,8 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/modgstatus.conf
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/*.conf.in
## Disable the diskusage module until it is configured properly
#mv $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/diskusage.pyconf $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.d/diskusage.pyconf.off
+# Don't install Makefile* in the web dir
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/Makefile*
## Install binaries
make install DESTDIR=$RPM_BUILD_ROOT
@@ -249,6 +256,7 @@ fi
%exclude %{_sysconfdir}/ganglia/conf.d/modpython.conf
%files gmond-python
+%defattr(-,root,root,-)
%dir %{_libdir}/ganglia/python_modules/
%{_libdir}/ganglia/python_modules/*.py*
%{_libdir}/ganglia/modpython.so*
@@ -269,6 +277,11 @@ fi
%{_datadir}/%{name}
%changelog
+* Thu Apr 22 2010 Kostas Georgiou <georgiou at fedoraproject.org> - 3.1.7-1
+- New upstream release
+- Spec file cleanups
+- Use the new name_match feature to enable the diskusage plugin by default
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
diff --git a/setuserid-fix.patch b/setuserid-fix.patch
new file mode 100644
index 0000000..972c274
--- /dev/null
+++ b/setuserid-fix.patch
@@ -0,0 +1,51 @@
+diff --git a/gmetad/conf.c.in b/gmetad/conf.c.in
+index c6fd338..27ae87c 100644
+--- a/gmetad/conf.c.in
++++ b/gmetad/conf.c.in
+@@ -274,7 +274,7 @@ set_defaults (gmetad_config_t *config)
+ config->trusted_hosts = NULL;
+ config->debug_level = 0;
+ config->should_setuid = 1;
+- config->setuid_username = "nobody";
++ config->setuid_username = "@setuid_user@";
+ config->rrd_rootdir = "@varstatedir@/ganglia/rrds";
+ config->scalable_mode = 1;
+ config->all_trusted = 0;
+diff --git a/gmetad/gmetad.conf.in b/gmetad/gmetad.conf.in
+index 4e75246..67920eb 100644
+--- a/gmetad/gmetad.conf.in
++++ b/gmetad/gmetad.conf.in
+@@ -88,9 +88,9 @@ data_source "my cluster" localhost
+ # setuid off
+ #
+ #-------------------------------------------------------------------------------
+-# User gmetad will setuid to (defaults to "nobody")
+-# default: "nobody"
+-# setuid_username "nobody"
++# User gmetad will setuid to (defaults to "@setuid_user@")
++# default: "@setuid_user@"
++# setuid_username "@setuid_user@"
+ #
+ #-------------------------------------------------------------------------------
+ # The port gmetad will answer requests for XML
+diff --git a/scripts/fixconfig.in b/scripts/fixconfig.in
+index 9208c22..b666b6b 100644
+--- a/scripts/fixconfig.in
++++ b/scripts/fixconfig.in
+@@ -33,6 +33,8 @@ LDFLAGS="`echo '@LDFLAGS@' | $AWK '{ gsub(/,/, "\\\\,"); print }'`"
+ LIBS="@LIBS@"
+ VERSION="@VERSION@"
+ host_cpu="@host_cpu@"
++setuid_user="@setuid_user@"
++setgid_group="@setgid_group@"
+
+ # Additional paths specific to Ganglia.
+ moduledir="@moduledir@"
+@@ -84,5 +86,7 @@ $SED -e "s, at prefix[@],$prefix,g" \
+ -e "s, at GANGLIA_MINOR_VERSION[@],$GANGLIA_MINOR_VERSION,g" \
+ -e "s, at GANGLIA_VERSION[@],$GANGLIA_VERSION,g" \
+ -e "s, at REL[@],$REL,g" \
++ -e "s, at setuid_user[@],$setuid_user,g" \
++ -e "s, at setgid_group[@],$setgid_group,g" \
+ < "$input" > "$output"
+
--
cgit v0.10.2
>From f3c150e6151be5097cac3e878f6b2a804f87835e Mon Sep 17 00:00:00 2001
From: georgiou <georgiou at fedoraproject.org>
Date: Thu, 22 Apr 2010 14:46:35 +0000
Subject: Forgot the new source :(
diff --git a/.cvsignore b/.cvsignore
index 9cbce87..b437772 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ganglia-3.1.2.tar.gz
+ganglia-3.1.7.tar.gz
diff --git a/sources b/sources
index 12518f5..19a00f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aaba09a6fa897ed581789f679f7ca62d ganglia-3.1.2.tar.gz
+6aa5e2109c2cc8007a6def0799cf1b4c ganglia-3.1.7.tar.gz
--
cgit v0.10.2
>From a104cf4a6e4ca7c6badeccf7c37f00875ed2abc0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 15:02:24 +0000
Subject: dist-git conversion
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index b437772..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-ganglia-3.1.7.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b437772
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+ganglia-3.1.7.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 44b4717..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: ganglia
-# $Id: Makefile,v 1.1 2006/06/15 20:15:03 jwilson Exp $
-NAME := ganglia
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--
cgit v0.10.2
>From a5a4b3281a641817b633782fb6b71de312ef96a6 Mon Sep 17 00:00:00 2001
From: Thomas Spura <tomspur at fedoraproject.org>
Date: Sat, 31 Jul 2010 20:20:01 +0200
Subject: - Rebuild for
https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
diff --git a/ganglia.spec b/ganglia.spec
index 91049fe..fdb3c73 100644
--- a/ganglia.spec
+++ b/ganglia.spec
@@ -1,6 +1,6 @@
Name: ganglia
Version: 3.1.7
-Release: 1%{?svnrev:.r%{svnrev}}%{?dist}
+Release: 2%{?svnrev:.r%{svnrev}}%{?dist}
Summary: Ganglia Distributed Monitoring System
Group: Applications/Internet
@@ -277,6 +277,9 @@ fi
%{_datadir}/%{name}
%changelog
+* Sat Jul 31 2010 Thomas Spura <tomspur at fedoraproject.org> - 3.1.7-2
+- Rebuild for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
* Thu Apr 22 2010 Kostas Georgiou <georgiou at fedoraproject.org> - 3.1.7-1
- New upstream release
- Spec file cleanups
--
cgit v0.10.2
>From 69147a6ae364865b226d11b52608748b98362b46 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis at ausil.us>
Date: Tue, 8 Feb 2011 16:46:23 -0600
Subject: - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/ganglia.spec b/ganglia.spec
index fdb3c73..2f3b4e4 100644
--- a/ganglia.spec
+++ b/ganglia.spec
@@ -1,6 +1,6 @@
Name: ganglia
Version: 3.1.7
-Release: 2%{?svnrev:.r%{svnrev}}%{?dist}
+Release: 3%{?svnrev:.r%{svnrev}}%{?dist}
Summary: Ganglia Distributed Monitoring System
Group: Applications/Internet
@@ -277,6 +277,9 @@ fi
%{_datadir}/%{name}
%changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Sat Jul 31 2010 Thomas Spura <tomspur at fedoraproject.org> - 3.1.7-2
- Rebuild for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/ganglia.git/commit/?h=epel7&id=8cae00000afaa7d346628ec25ddc3dd9fa0b8f1f
More information about the scm-commits
mailing list