From 0c27a2a4a3498bee7254d9fb185f0aec054d2992098b621c4df47945a686182f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 4 Jan 2007 01:07:28 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rrdtool?expand=0&rev=1 --- .gitattributes | 23 +++ .gitignore | 1 + cgilib-0.5.tar.bz2 | 3 + ready | 0 rrdtool-1.2.15-changeset_r887.diff | 12 ++ rrdtool-1.2.15-ssize.diff | 16 +++ rrdtool-1.2.15-stderr.diff | 12 ++ rrdtool-1.2.15.tar.bz2 | 3 + rrdtool.changes | 192 +++++++++++++++++++++++++ rrdtool.spec | 221 +++++++++++++++++++++++++++++ 10 files changed, 483 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 cgilib-0.5.tar.bz2 create mode 100644 ready create mode 100644 rrdtool-1.2.15-changeset_r887.diff create mode 100644 rrdtool-1.2.15-ssize.diff create mode 100644 rrdtool-1.2.15-stderr.diff create mode 100644 rrdtool-1.2.15.tar.bz2 create mode 100644 rrdtool.changes create mode 100644 rrdtool.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/cgilib-0.5.tar.bz2 b/cgilib-0.5.tar.bz2 new file mode 100644 index 0000000..84ea577 --- /dev/null +++ b/cgilib-0.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27fd66753def91314339070387b2b22977b1a054855108d2b59d7d74d9bee947 +size 13039 diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/rrdtool-1.2.15-changeset_r887.diff b/rrdtool-1.2.15-changeset_r887.diff new file mode 100644 index 0000000..38d29b2 --- /dev/null +++ b/rrdtool-1.2.15-changeset_r887.diff @@ -0,0 +1,12 @@ +--- src/rrd_graph.c ++++ src/rrd_graph.c +@@ -1063,6 +1063,7 @@ + */ + if (finite(paintval) && im->gdes[ii].gf != GF_TICK ) { +- if (isnan(minval) || paintval < minval) +- minval = paintval; ++ if ((isnan(minval) || paintval < minval ) && ++ ! (im->logarithmic && paintval <= 0.0)) ++ minval = paintval; + if (isnan(maxval) || paintval > maxval) + maxval = paintval; diff --git a/rrdtool-1.2.15-ssize.diff b/rrdtool-1.2.15-ssize.diff new file mode 100644 index 0000000..f499c6c --- /dev/null +++ b/rrdtool-1.2.15-ssize.diff @@ -0,0 +1,16 @@ +--- bindings/python/rrdtoolmodule.c ++++ bindings/python/rrdtoolmodule.c +@@ -57,7 +57,12 @@ + PyObject *o; + int size, i; + +- size = PyTuple_Size(args); ++ if ( PyTuple_Size(args) <= INT_MAX ) ++ size = PyTuple_Size(args); ++ else { ++ PyErr_Format(PyExc_ValueError,"too big return value"); ++ return -1; ++ } + *argv = PyMem_New(char *, size + 1); + if (*argv == NULL) + return -1; diff --git a/rrdtool-1.2.15-stderr.diff b/rrdtool-1.2.15-stderr.diff new file mode 100644 index 0000000..2112d33 --- /dev/null +++ b/rrdtool-1.2.15-stderr.diff @@ -0,0 +1,12 @@ +--- src/rrd_thread_safe.c ++++ src/rrd_thread_safe.c +@@ -51,7 +51,8 @@ + #ifdef HAVE_STRERROR_R + const char *rrd_strerror(int err) { + struct rrd_context *ctx = rrd_get_context(); +- return strerror_r(err, ctx->lib_errstr, ctx->errlen); ++ strerror_r(err, ctx->lib_errstr, ctx->errlen); ++ return ctx->lib_errstr; + } + #else + #undef strerror diff --git a/rrdtool-1.2.15.tar.bz2 b/rrdtool-1.2.15.tar.bz2 new file mode 100644 index 0000000..3a98621 --- /dev/null +++ b/rrdtool-1.2.15.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecf8035b31c869203aefb7e3ad1a14c968cc8adf25f8caef4eaceb695265b6a3 +size 773554 diff --git a/rrdtool.changes b/rrdtool.changes new file mode 100644 index 0000000..d69f75b --- /dev/null +++ b/rrdtool.changes @@ -0,0 +1,192 @@ +------------------------------------------------------------------- +Tue Jan 2 15:17:22 CET 2007 - anicka@suse.cz + +- fix memory allocation bug when graphing logarithmic data + with upstream patch [#231212] + +------------------------------------------------------------------- +Mon Sep 25 14:28:25 CEST 2006 - anicka@suse.cz + +- use %py_requires [#207920] + +------------------------------------------------------------------- +Fri Sep 15 20:43:30 CEST 2006 - anicka@suse.cz + +- store value returned with PyTuple_Size in + Py_ssize_t instead of int + +------------------------------------------------------------------- +Mon Jul 17 15:44:14 CEST 2006 - anicka@suse.cz + +- update to 1.2.15 + * vnames can be up to MAX_VNAME_LEN long + * bugfixes, documentation fixes + +------------------------------------------------------------------- +Wed Jan 25 21:41:13 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Jan 5 16:15:10 CET 2006 - anicka@suse.cz + +- update to 1.2.12 + +------------------------------------------------------------------- +Wed Dec 14 12:00:44 CET 2005 - max@suse.de + +- Fixed installation of the Tcl bindings. + +------------------------------------------------------------------- +Tue Nov 1 13:57:12 CET 2005 - anicka@suse.cz + +- fix build - return proper value from strerror_r + +------------------------------------------------------------------- +Wed Sep 21 12:13:53 CEST 2005 - anicka@suse.cz + +- fix build + +------------------------------------------------------------------- +Sun Jul 31 15:45:44 CEST 2005 - cthiel@suse.de + +- moved pkgIndex.tcl to /usr/share/tcl/tclrrd + +------------------------------------------------------------------- +Tue Jul 26 10:43:57 CEST 2005 - cthiel@suse.de + +- update to 1.2.11 + +------------------------------------------------------------------- +Tue Jun 21 18:26:37 CEST 2005 - anicka@suse.cz + +- update to 1.2.10 +- drop no longer neccessary rrdtool-tcl.patch + +------------------------------------------------------------------- +Thu May 19 14:03:10 CEST 2005 - mcihar@suse.cz + +- update to 1.2.8 +- reneabled tcl (copilation fixed by rrdtool-tcl.patch) +- added python bindings + +------------------------------------------------------------------- +Tue May 10 15:42:40 CEST 2005 - mcihar@suse.cz + +- update to 1.2.6 +- dropped tcl for now, it's somewhat broken + +------------------------------------------------------------------- +Mon Apr 18 11:28:37 CEST 2005 - mcihar@suse.de + +- include correct config.h + +------------------------------------------------------------------- +Wed Aug 11 09:44:35 CEST 2004 - tcrhak@suse.cz + +- update to 1.0.49 + +------------------------------------------------------------------- +Fri Aug 06 16:02:18 CEST 2004 - tcrhak@suse.cz + +- update to 1.0.48 + +------------------------------------------------------------------- +Thu Mar 04 17:39:04 CET 2004 - tcrhak@suse.cz + +- do not use its own (and old) libpng and libz + +------------------------------------------------------------------- +Wed Feb 18 16:11:59 CET 2004 - tcrhak@suse.cz + +- update to version 1.0.46 + +------------------------------------------------------------------- +Sat Jan 10 15:31:20 CET 2004 - adrian@suse.de + +- build as user + +------------------------------------------------------------------- +Wed Aug 20 20:22:29 CEST 2003 - mjancar@suse.cz + +- require the perl version we build with + +------------------------------------------------------------------- +Mon Jul 28 21:26:29 CEST 2003 - tcrhak@suse.cz + +- removed %{vendor_perl}/auto from filelist + +------------------------------------------------------------------- +Mon Jul 28 17:54:01 CEST 2003 - tcrhak@suse.cz + +- update to version 1.0.45 +- fixed file list +- require perl + +------------------------------------------------------------------- +Mon Jul 28 14:27:35 CEST 2003 - ro@suse.de + +- install perl files to vendor location + +------------------------------------------------------------------- +Fri May 23 14:23:53 CEST 2003 - ro@suse.de + +- fix build with current libtool + +------------------------------------------------------------------- +Sun Jan 12 18:39:32 CET 2003 - tcrhak@suse.cz + +- update to 1.0.40 + +------------------------------------------------------------------- +Tue Nov 19 02:05:37 CET 2002 - ro@suse.de + +- run full autoreconf and extend configure.in for that + +------------------------------------------------------------------- +Fri Aug 9 12:48:00 MEST 2002 - mls@suse.de + +- use sitearch macro + +------------------------------------------------------------------- +Tue Jul 09 20:32:48 CEST 2002 - tcrhak@suse.cz + +- update to version 1.0.39 + +------------------------------------------------------------------- +Mon Jun 3 15:34:36 CEST 2002 - ro@suse.de + +- fix build on lib64 platforms + +------------------------------------------------------------------- +Mon May 6 12:20:52 CEST 2002 - tcrhak@suse.cz + +- omitted prefix i386-suse-linux from names of binaries + and example scripts (bug #16105) + +------------------------------------------------------------------- +Fri Feb 8 02:53:26 MET 2002 - draht@suse.de + +- added rrdtool-1.0.33-zlib-zfree.dif against duplicate free() in + zlib + +------------------------------------------------------------------- +Thu Jun 14 14:43:21 CEST 2001 - adostal@suse.cz + +- fix for new autoconf (add libtoolize --force) + +------------------------------------------------------------------- +Wed Apr 11 11:52:52 CEST 2001 - cihlar@suse.cz + +- updated to version 1.0.33 + +------------------------------------------------------------------- +Mon Mar 19 15:40:18 CET 2001 - cihlar@suse.cz + +- fixed call of suse_update_config + +------------------------------------------------------------------- +Fri Jan 26 13:11:32 CET 2001 - cihlar@suse.cz + +- package created + diff --git a/rrdtool.spec b/rrdtool.spec new file mode 100644 index 0000000..78d535a --- /dev/null +++ b/rrdtool.spec @@ -0,0 +1,221 @@ +# +# spec file for package rrdtool (Version 1.2.15) +# +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild + +Name: rrdtool +BuildRequires: freetype2-devel libart_lgpl-devel libpng-devel python-devel tcl-devel +License: GNU General Public License (GPL) +Group: Productivity/Scientific/Math +Autoreqprov: on +Requires: perl = %{perl_version} +Version: 1.2.15 +Release: 33 +Source: %{name}-%{version}.tar.bz2 +Source1: cgilib-0.5.tar.bz2 +Patch: %{name}-%{version}-stderr.diff +Patch1: %{name}-%{version}-ssize.diff +Patch2: %{name}-%{version}-changeset_r887.diff +URL: http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/ +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Summary: A tool for data logging and analysis + +%py_requires + +%description +A tool to log and analyze data gathered from all kinds of data sources. +The data analysis part of RRDtool is based on the ability to quickly +generate graphical representations of the data values collected over a +definable time period. + + + +Authors: +-------- + Tobias Oetiker + +%prep +%setup -q -a1 +%patch +%patch1 +%patch2 + +%build +# first prepare cgilib +cd cgilib* +make CC=gcc CFLAGS="$RPM_OPT_FLAGS -fPIC -I." +mkdir -p ../lb/include +cp *.h ../lb/include +mkdir -p ../lb/lib +cp libcgi* ../lb/lib +cd .. +# build rrdtool +%{suse_update_config} +libtoolize --force +#autoreconf --force --install +aclocal --force +autoconf -f +automake -fca +CFLAGS="$RPM_OPT_FLAGS -fPIC" CXXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-L`pwd`/lb/lib" CPPFLAGS="-I`pwd`/lb/include" \ + ./configure \ + --mandir=%{_mandir} \ + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --datadir=%{_datadir} \ + --infodir=%{_infodir} \ + --sysconfdir=%{_sysconfdir} \ + --enable-shared \ + --with-tcllib=%{_libdir} \ + --with-gnu-ld +make + +%install +#eval `perl -V:installarchlib` +make \ + DESTDIR=$RPM_BUILD_ROOT \ + idocdir=%{_docdir}/%{name}/txt/ \ + ihtmldir=%{_docdir}/%{name}/html/ \ + examplesdir=%{_docdir}/%{name}/examples/ \ + libdir=%{_libdir} \ + pkglibdir=%_datadir/tcl/tclrrd%version \ + TCL_PACKAGE_DIR=%_datadir/tcl/tclrrd%version \ + TCL_PACKAGE_PATH=%_datadir/tcl \ + install +# we install this later again +rm -r $RPM_BUILD_ROOT%{_prefix}/lib/perl +# install correctly perl modules +pushd bindings/perl-piped +perl Makefile.PL +make DESTDIR=$RPM_BUILD_ROOT install_vendor +popd +pushd bindings/perl-shared +perl Makefile.PL +make DESTDIR=$RPM_BUILD_ROOT install_vendor +popd +%perl_process_packlist +#fix build (it would be better to split cgilib) +sed 's/[[:space:]]*-L\/usr\/src\/packages\/BUILD\/%{name}-%{version}\/lb\/lib[[:space:]]*//' $RPM_BUILD_ROOT/%{_libdir}/librrd.la > tmp +mv tmp $RPM_BUILD_ROOT/%{_libdir}/librrd.la +sed 's/[[:space:]]*-L\/usr\/src\/packages\/BUILD\/%{name}-%{version}\/lb\/lib[[:space:]]*//' $RPM_BUILD_ROOT/%{_libdir}/librrd_th.la > tmp +mv tmp $RPM_BUILD_ROOT/%{_libdir}/librrd_th.la + +# documentation +install -m 644 CHANGES CONTRIBUTORS COPYING COPYRIGHT NT-BUILD-TIPS.txt README TODO $RPM_BUILD_ROOT/%{_docdir}/%{name} +# Script libraries for Tcl extensions should be in a package-specific +# subdir of /usr/share/tcl +mkdir -p $RPM_BUILD_ROOT/usr/share/tcl/tclrrd%{version} +#mv $RPM_BUILD_ROOT/usr/lib/tclrrd%{version}/pkgIndex.tcl \ +# $RPM_BUILD_ROOT/usr/share/tcl/tclrrd%{version} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-, root, root) +%doc %{_docdir}/rrdtool +%doc %{_mandir}/*/* +/usr/bin/* +/usr/include/* +%{_datadir}/tcl +%{_libdir}/lib* +%{_libdir}/tclrrd*.so +%{perl_vendorlib}/RRDp.pm +%{perl_vendorarch}/RRDs.pm +%{perl_vendorarch}/ntmake.pl +%{perl_vendorarch}/auto/* +/var/adm/perl-modules/rrdtool +%{_datadir}/%{name} +%{py_sitedir}/rrdtoolmodule.so + +%changelog -n rrdtool +* Tue Jan 02 2007 - anicka@suse.cz +- fix memory allocation bug when graphing logarithmic data + with upstream patch [#231212] +* Mon Sep 25 2006 - anicka@suse.cz +- use %%py_requires [#207920] +* Fri Sep 15 2006 - anicka@suse.cz +- store value returned with PyTuple_Size in + Py_ssize_t instead of int +* Mon Jul 17 2006 - anicka@suse.cz +- update to 1.2.15 + * vnames can be up to MAX_VNAME_LEN long + * bugfixes, documentation fixes +* Wed Jan 25 2006 - mls@suse.de +- converted neededforbuild to BuildRequires +* Thu Jan 05 2006 - anicka@suse.cz +- update to 1.2.12 +* Wed Dec 14 2005 - max@suse.de +- Fixed installation of the Tcl bindings. +* Tue Nov 01 2005 - anicka@suse.cz +- fix build - return proper value from strerror_r +* Wed Sep 21 2005 - anicka@suse.cz +- fix build +* Sun Jul 31 2005 - cthiel@suse.de +- moved pkgIndex.tcl to /usr/share/tcl/tclrrd +* Tue Jul 26 2005 - cthiel@suse.de +- update to 1.2.11 +* Tue Jun 21 2005 - anicka@suse.cz +- update to 1.2.10 +- drop no longer neccessary rrdtool-tcl.patch +* Thu May 19 2005 - mcihar@suse.cz +- update to 1.2.8 +- reneabled tcl (copilation fixed by rrdtool-tcl.patch) +- added python bindings +* Tue May 10 2005 - mcihar@suse.cz +- update to 1.2.6 +- dropped tcl for now, it's somewhat broken +* Mon Apr 18 2005 - mcihar@suse.de +- include correct config.h +* Wed Aug 11 2004 - tcrhak@suse.cz +- update to 1.0.49 +* Fri Aug 06 2004 - tcrhak@suse.cz +- update to 1.0.48 +* Thu Mar 04 2004 - tcrhak@suse.cz +- do not use its own (and old) libpng and libz +* Wed Feb 18 2004 - tcrhak@suse.cz +- update to version 1.0.46 +* Sat Jan 10 2004 - adrian@suse.de +- build as user +* Wed Aug 20 2003 - mjancar@suse.cz +- require the perl version we build with +* Mon Jul 28 2003 - tcrhak@suse.cz +- removed %%{vendor_perl}/auto from filelist +* Mon Jul 28 2003 - tcrhak@suse.cz +- update to version 1.0.45 +- fixed file list +- require perl +* Mon Jul 28 2003 - ro@suse.de +- install perl files to vendor location +* Fri May 23 2003 - ro@suse.de +- fix build with current libtool +* Sun Jan 12 2003 - tcrhak@suse.cz +- update to 1.0.40 +* Tue Nov 19 2002 - ro@suse.de +- run full autoreconf and extend configure.in for that +* Fri Aug 09 2002 - mls@suse.de +- use sitearch macro +* Tue Jul 09 2002 - tcrhak@suse.cz +- update to version 1.0.39 +* Mon Jun 03 2002 - ro@suse.de +- fix build on lib64 platforms +* Mon May 06 2002 - tcrhak@suse.cz +- omitted prefix i386-suse-linux from names of binaries + and example scripts (bug #16105) +* Fri Feb 08 2002 - draht@suse.de +- added rrdtool-1.0.33-zlib-zfree.dif against duplicate free() in + zlib +* Thu Jun 14 2001 - adostal@suse.cz +- fix for new autoconf (add libtoolize --force) +* Wed Apr 11 2001 - cihlar@suse.cz +- updated to version 1.0.33 +* Mon Mar 19 2001 - cihlar@suse.cz +- fixed call of suse_update_config +* Fri Jan 26 2001 - cihlar@suse.cz +- package created