noodles pushed to ganglia (el5). "Fixing build"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 22 22:51:35 UTC 2015
>From 1b32d952f006aa777e1ef237f9675533b19a13ac Mon Sep 17 00:00:00 2001
From: Nick Le Mouton <nick at noodles.net.nz>
Date: Thu, 23 Apr 2015 10:51:13 +1200
Subject: Fixing build
diff --git a/ganglia.spec b/ganglia.spec
index dca0db5..986f615 100644
--- a/ganglia.spec
+++ b/ganglia.spec
@@ -14,6 +14,7 @@ Summary: Distributed Monitoring System
Group: Applications/Internet
License: BSD
URL: http://ganglia.sourceforge.net/
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://downloads.sourceforge.net/sourceforge/ganglia/ganglia-%{version}.tar.gz
Source1: http://downloads.sourceforge.net/project/ganglia/ganglia-web/%{webver}/ganglia-web-%{webver}.tar.gz
Source2: gmond.service
@@ -146,7 +147,8 @@ cd web
--enable-setuid=ganglia \
--enable-setgid=ganglia \
--with-gmetad \
- --with-shared \
+ --disable-static \
+ --enable-shared \
--sysconfdir=%{_sysconfdir}/ganglia
# Remove rpaths
@@ -166,6 +168,7 @@ cd web
make %{?_smp_mflags}
%install
+rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
## Create directory structures
@@ -175,8 +178,8 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/dwoo/{cache,compiled}
## Install services
%if 0%{?systemd}
-install -Dp -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/gmond.service
-install -Dp -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/gmetad.service
+install -Dp -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/gmond.service
+install -Dp -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/gmetad.service
%else
install -Dp -m 0755 gmond/gmond.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/gmond
install -Dp -m 0755 gmetad/gmetad.init $RPM_BUILD_ROOT%{_sysconfdir}/init.d/gmetad
@@ -195,14 +198,14 @@ cp -p gmond/python_modules/*/*.py $RPM_BUILD_ROOT%{_libdir}/ganglia/python_modul
## Web bits
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
cp -rp web/* $RPM_BUILD_ROOT%{_datadir}/%{name}/
-install -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/ganglia/conf.php
+install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/ganglia/conf.php
ln -s ../../..%{_sysconfdir}/%{name}/conf.php \
$RPM_BUILD_ROOT%{_datadir}/%{name}/conf.php
%if 0%{?fedora} >= 18
-install -Dp -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
%else
-install -Dp -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install -Dp -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
%endif
## Various clean up after install:
@@ -265,7 +268,7 @@ sed -i '1{\@^#!@d}' $RPM_BUILD_ROOT%{_libdir}/%{name}/python_modules/*.py
%postun gmetad
%systemd_postun_with_restart gmetad.service
-%else
+%else
%post gmond
/sbin/chkconfig --add gmond
@@ -359,100 +362,16 @@ fi
%changelog
* Tue Apr 21 2015 Nick Le Mouton <nick at noodles.net.nz> - 3.7.1-1
-- Merged from f23 to bring ganglia up to date
+- Merged from f23 to bring ganglia up to date
- Removed memcache support (libmemcached on el5 and el6 not up-to-date enough)
-* Sun Jul 15 2012 Kostas Georgiou <georgiou at fedoraproject.org> - 3.1.7-6
-- Backport of security patch for gangliabz#333
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.7-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Jun 14 2011 Kostas Georgiou <georgiou at fedoraproject.org> - 3.1.7-4
-- Fix buffer overflow in moddisk.so #689483
-
-* 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
-
-* Thu Apr 22 2010 Kostas Georgiou <georgiou at fedoraproject.org> - 3.1.7-1
+* Tue Jan 20 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.0.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
-
-* Sun Mar 29 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.1.2-3
-- Rebuilt for #492703, no obvious reasons why the previous build was bad :(
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Feb 17 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.1.2-1
-- Update to 3.1.2
-- Remove unneeded patch for CVE-2009-0241
-
-* Tue Jan 20 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.1.1-4
-- [480236] Updated patch for the buffer overflow from upstream with
- additional fixes
-
-* Wed Jan 14 2009 Kostas Georgiou <k.georgiou at imperial.ac.uk> - 3.1.1-3
-- Fix for gmetad server buffer overflow
-- The private_clusters file should not be readable by everyone
-
-* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.1.1-2
-- Rebuild for Python 2.6
-
-* Fri Oct 24 2008 Jarod Wilson <jarod at redhat.com> 3.1.1-1
-- Update to 3.1.1
-
-* Thu Aug 28 2008 Michael Schwendt <mschwendt at fedoraproject.org> 3.1.0-2
-- Include unowned directories.
-
-* Mon Aug 11 2008 Kostas Georgiou <k.georgiou at imperial.ac.uk> 3.1.0-1
-- Upstream patches from 3.1.1
-- Move private_clusters config to /etc and mark it as a config file
-- Only allow connections from localhost by default on the web frontend
-- Add some extra module config files (modules are always loaded at the
- moment so removing the configs has no effect beyond metric collection
- (upstream is working on way way to disable module loading from the
- configs)
-
-* Tue Jul 29 2008 Kostas Georgiou <k.georgiou at imperial.ac.uk> 3.1.0-0.5
-- Add the config files for the python module
-
-* Thu Jul 17 2008 Kostas Georgiou <k.georgiou at imperial.ac.uk> 3.1.0-0.4
-- Update to the 3.1.0 pre-release
-- Fixes gmond.conf to use the ganglia user and not nobody
-- Removal of the ppc64 work-around
-
-* Fri Jun 13 2008 Jarod Wilson <jwilson at redhat.com> 3.1.0-0.3.r1399
-- One more try at work-around. Needs powerpc64, not ppc64...
-
-* Fri Jun 13 2008 Jarod Wilson <jwilson at redhat.com> 3.1.0-0.2.r1399
-- Work-around for incorrectly hard-coded libdir on ppc64
-
-* Wed Jun 11 2008 Jarod Wilson <jwilson at redhat.com> 3.1.0-0.1.r1399
-- Update to 3.1.x pre-release snapshot, svn rev 1399
-
-* Mon Jun 09 2008 Jarod Wilson <jwilson at redhat.com> 3.0.7-2
-- Bump and rebuild against latest rrdtool
-
-* Wed Feb 27 2008 Jarod Wilson <jwilson at redhat.com> 3.0.7-1
-- New upstream release
-- Fixes "Show Hosts" toggle
-- Fixes to host view metric graphs
-- Fixes two memory leaks
-
-* Thu Feb 14 2008 Jarod Wilson <jwilson at redhat.com> 3.0.6-2
-- Bump and rebuild with gcc 4.3
+- [480236] fix for a buffer overflow and an off-by-one bug in gmetad
* Mon Dec 17 2007 Jarod Wilson <jwilson at redhat.com> 3.0.6-1
- New upstream release (security fix for web frontend
- cross-scripting vulnerability) {CVE-2007-6465}
+ cross-scripting vulnerability)
* Wed Oct 24 2007 Jarod Wilson <jwilson at redhat.com> 3.0.5-2
- Reorg packages to fix multilib conflicts (#341201)
@@ -511,4 +430,3 @@ fi
* Thu Jun 01 2006 Jarod Wilson <jwilson at redhat.com> 3.0.3-1
- Initial build for Fedora Extras, converting existing spec to
(attempt to) conform with Fedora packaging guidelines
-
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/ganglia.git/commit/?h=el5&id=1b32d952f006aa777e1ef237f9675533b19a13ac
More information about the scm-commits
mailing list