Index: head/net-mgmt/mrtg/Makefile =================================================================== --- head/net-mgmt/mrtg/Makefile (revision 296445) +++ head/net-mgmt/mrtg/Makefile (revision 296446) @@ -1,115 +1,116 @@ # New ports collection makefile for: MRTG # Date created: April 18th 1997 # Whom: James FitzGibbon # # $FreeBSD$ # PORTNAME= mrtg PORTVERSION= 2.17.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net-mgmt ipv6 MASTER_SITES= http://oss.oetiker.ch/mrtg/pub/ \ ftp://ftp.idilis.ro/mirrors/mrtg/ \ ftp://ftp.nstu.ru/pub/sources/nettools/monitoring/ \ ftp://ftp.chg.ru/pub/networking/monitoring/mrtg/ MAINTAINER= ports@subnets.ru COMMENT= The multi-router traffic grapher LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd RUN_DEPENDS= ${SITE_PERL}/SNMP_Session.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session CONFIGURE_ARGS= --with-gd-lib=${LOCALBASE}/lib \ --with-gd-inc=${LOCALBASE}/include USERS= mrtg GROUPS= mrtg USE_PERL5= YES MAKE_ENV+= PERL=${PERL} MRTG_RUNDIR?= /var/run/mrtg USE_RC_SUBR= mrtg_daemon SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST= PERL=${PERL} \ MRTG_RUNDIR=${MRTG_RUNDIR} \ USERS=${USERS} \ GROUPS=${GROUPS} PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall GNU_CONFIGURE= YES CONFIGURE_ENV= PERL=${PERL} MAN1= cfgmaker.1 indexmaker.1 mrtg-contrib.1 mrtg-faq.1 mrtg-forum.1 \ mrtg-ipv6.1 mrtg-logfile.1 mrtg-mibhelp.1 mrtg-nt-guide.1 \ mrtg-nw-guide.1 mrtg-reference.1 mrtg-rrd.1 mrtg-squid.1 \ mrtg-unix-guide.1 mrtg-webserver.1 mrtg.1 mrtglib.1 DOCS= CHANGES COPYRIGHT MANIFEST README EXAMPLES= cfgmaker.pod indexmaker.pod mrtg-contrib.pod mrtg-faq.pod \ mrtg-forum.pod mrtg-ipv6.pod mrtg-logfile.pod mrtg-mibhelp.pod \ mrtg-nt-guide.pod mrtg-nw-guide.pod mrtg-reference.pod \ mrtg-rrd.pod mrtg-squid.pod mrtg-unix-guide.pod mrtg.pod \ mrtg-webserver.pod mrtglib.pod cfgmaker.txt indexmaker.txt \ mrtg-contrib.txt mrtg-faq.txt mrtg-forum.txt mrtg-ipv6.txt \ mrtg-logfile.txt mrtg-mibhelp.txt mrtg-nt-guide.txt \ mrtg-nw-guide.txt mrtg-reference.txt mrtg-rrd.txt \ mrtg-squid.txt mrtg-unix-guide.txt mrtg-webserver.txt \ mrtg.txt mrtglib.txt mrtg-l.png mrtg-m.png mrtg-r.png \ mrtg-ti.png mrtg-l.gif mrtg-m.gif mrtg-r.gif IMAGES= favicon.ico mrtg-l.gif mrtg-l.png mrtg-m.gif mrtg-m.png \ mrtg-r.gif mrtg-r.png mrtg-ti.gif mrtg-ti.png SCRIPTS= cfgmaker indexmaker mrtg mrtg-traffic-sum OPTIONS= IPV6 "Enable IPv6 support" OFF \ SNMP "Enable use of SNMPv3" OFF .if !defined(NOPORTDOCS) PORTDOCS= * .endif .if !defined(NOPORTEXAMPLES) PORTEXAMPLES= * .endif .include .if defined(WITH_IPV6) RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-Socket-INET6 .endif .if defined(WITH_SNMP) RUN_DEPENDS+= ${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP .endif post-extract: @${FIND} ${WRKSRC} -type f -name "*.orig" -delete post-patch: @${RM} ${WRKSRC}/lib/mrtg2/BER.pm ${WRKSRC}/lib/mrtg2/SNMP_*.pm do-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ .endif .if !defined(NOPORTEXAMPLES) @${MKDIR} ${EXAMPLESDIR}/doc ${EXAMPLESDIR}/images @${INSTALL_DATA} ${EXAMPLES:S,^,${WRKSRC}/doc/,} ${EXAMPLESDIR}/doc/ @${INSTALL_DATA} ${IMAGES:S,^,${WRKSRC}/images/,} ${EXAMPLESDIR}/images/ .endif @${MKDIR} ${ETCDIR} @${INSTALL_DATA} ${WRKSRC}/contrib/mrtgmk/cfg/mrtg.cfg ${ETCDIR}/mrtg.cfg.sample @${INSTALL_DATA} ${MAN1:S,^,${WRKSRC}/doc/,} ${MAN1PREFIX}/man/man1 @${MKDIR} ${PREFIX}/${SITE_PERL_REL} @${CP} -p ${WRKSRC}/lib/mrtg2/*.pm ${PREFIX}/${SITE_PERL_REL} @${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/bin @${INSTALL_SCRIPT} ${SCRIPTS:S,^,${WRKSRC}/bin/,} ${PREFIX}/bin post-install: @${SETENV} @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL @${CAT} ${PKGMESSAGE} .include Property changes on: head/net-mgmt/mrtg/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.111 \ No newline at end of property +1.112 \ No newline at end of property Index: head/net-mgmt/mrtg/files/patch-src__rateup.c =================================================================== --- head/net-mgmt/mrtg/files/patch-src__rateup.c (nonexistent) +++ head/net-mgmt/mrtg/files/patch-src__rateup.c (revision 296446) @@ -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') + { \ No newline at end of file Property changes on: head/net-mgmt/mrtg/files/patch-src__rateup.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property