- Remove disabled patch rrdtool-tclsegfault.patch

- Small spec file modernisation

OBS-URL: https://build.opensuse.org/package/show/server:database/rrdtool?expand=0&rev=10
This commit is contained in:
Martin Pluskal 2024-07-29 07:26:32 +00:00 committed by Git OBS Bridge
parent 382e5030de
commit 1b3b3f2b0f
3 changed files with 8 additions and 32 deletions

View File

@ -1,30 +0,0 @@
Index: bindings/tcl/tclrrd.c
===================================================================
--- a/bindings/tcl/tclrrd.c
+++ b/bindings/tcl/tclrrd.c
@@ -472,6 +472,12 @@ static int Rrd_Graph(
char **argv2;
CONST84 char *save;
+ if (argc < 2) {
+ Tcl_AppendResult(interp, "RRD Error: needs image filename",
+ (char *) NULL);
+ return TCL_ERROR;
+ }
+
/*
* If the "filename" is a Tcl fileID, then arrange for rrd_graph() to write to
* that file descriptor. Will this work with windoze? I have no idea.
@@ -597,6 +603,12 @@ static int Rrd_Resize(
{
char **argv2;
+ if (argc < 2) {
+ Tcl_AppendResult(interp, "RRD Error: needs rrd filename",
+ (char *) NULL);
+ return TCL_ERROR;
+ }
+
argv2 = getopt_init(argc, argv);
rrd_resize(argc, argv2);
getopt_cleanup(argc, argv2);

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jul 29 07:19:23 UTC 2024 - Martin Pluskal <mpluskal@suse.com>
- Remove disabled patch rrdtool-tclsegfault.patch
- Small spec file modernisation
-------------------------------------------------------------------
Fri Jul 12 15:12:22 UTC 2024 - Martin Jambor <mjambor@suse.com>

View File

@ -272,7 +272,7 @@ autoreconf -fi
--with-gnu-ld \
--with-systemdsystemunitdir=%{_unitdir}
make %{?_smp_mflags}
%make_build
%install
make \
@ -320,7 +320,7 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrrdcached
%check
# Follow upstream, disable the following, failing tests: rpn1
# https://github.com/oetiker/rrdtool-1.x/blob/master/.travis.yml#L30
make %{?_smp_mflags} check TESTS="modify1 modify2 modify3 modify4 modify5 rpn2 xport1 \
%make_build check TESTS="modify1 modify2 modify3 modify4 modify5 rpn2 xport1 \
tune1 tune2 graph1 rrdcreate dump-restore create-with-source-1 create-with-source-2 \
create-with-source-3 create-with-source-4 create-with-source-and-mapping-1 \
create-from-template-1 dcounter1 vformatter1 list1 pdp-calc1"