Attachment 124260 Details for Bug 167771 – mrtg_diff.txt

mrtg_diff.txt

mrtg_diff.txt (text/plain; charset=KOI8-R), 1.46 KB, created by Alexey V. Panfilov on 2012-05-10 11:57:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey V. Panfilov

Created: 2012-05-10 11:57:22 UTC

Size: 1.46 KB

patch

obsolete

>diff -ruN mrtg.old/Makefile mrtg/Makefile
>--- mrtg/Makefile	2012-05-10 14:51:08.000000000 +0400
>+++ mrtg/Makefile	2012-05-10 14:48:26.000000000 +0400
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	mrtg
> PORTVERSION=	2.17.4
>+PORTREVISION=	1
> PORTEPOCH=	1
> CATEGORIES=	net-mgmt ipv6
> MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
>diff -ruN mrtg.old/files/patch-aaa.txt mrtg/files/patch-aaa.txt
>--- mrtg/files/patch-aaa.txt	1970-01-01 03:00:00.000000000 +0300
>+++ mrtg/files/patch-aaa.txt	2012-05-10 14:34:05.000000000 +0400
>@@ -0,0 +1,36 @@
>+--- src/rateup.c.orig	2012-05-10 05:40:49.259760823 -0300
>++++ src/rateup.c	2012-05-10 05:44:32.297657818 -0300
>+@@ -1132,9 +1132,10 @@
>+   gdImageDestroy (brush_outp);
>+   free (lhist);
>+   free (graph_label);
>+-  if (kMG)
>++  if (kMG) {
>+     free(short_si);
>+-
>++    short_si = short_si_def;
>++  }
>+
>+ #ifdef WIN32
>+   /* got to remove the target under win32
>+@@ -1563,8 +1564,10 @@
>+ 	}
>+       else
>+ 	{
>+-	  strcpy (last.in, in);
>+-	  strcpy (last.out, out);
>++	  strncpy (last.in, in, MAXL);
>++	  last.in[MAXL-1]='\0';
>++	  strncpy (last.out, out,MAXL);
>++	  last.out[MAXL-1]='\0';
>+ 	}
>+       fprintf (fo, "%lu " LLD " " LLD " " LLD " " LLD "\n",
>+ 	       (unsigned long) now, inrate, outrate, inrate, outrate);
>+@@ -2114,6 +2117,7 @@
>+ 	      history[x].in = rand () % atoi (argv[argi + 1]);
>+ 	      history[x].out = rand () % atoi (argv[argi + 2]);
>+ 	    }
>++	   /* fallthrough */
>+ 	case 'u':		/* Update file */
>+ 	  if (argv[argi][1] == 'p')
>+ 	    {

Actions: View

Attachments on bug 167771: 124259 | 124260