ports/167771: [patch] net-mgmt/mrtg fix rateup's coredump

Alexey V. Panfilov ports at subnets.ru
Thu May 10 11:04:07 UTC 2012


Forgot add PORTREVISION to Makefile

--
Simple Lehisnoe ;-)
-------------- next part --------------
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')
+ 	    {


More information about the freebsd-ports-bugs mailing list