Attachment #175021 for bug #212869

View | Details | Raw Unified | Return to bug 212869
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= doxygen	4	PORTNAME= doxygen
5	PORTVERSION= 1.8.11	5	PORTVERSION= 1.8.12
6	PORTEPOCH= 2	6	PORTEPOCH= 2
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \	8	MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1467043745	1	TIMESTAMP = 1474244407
2	SHA256 (doxygen-1.8.11.src.tar.gz) = 65d08b46e48bd97186aef562dc366681045b119e00f83c5b61d05d37ea154049	2	SHA256 (doxygen-1.8.12.src.tar.gz) = 792d4091cbdf228549ff2033dd71ff7ea5029c6b436317cc5ec866e71302df6c
3	SIZE (doxygen-1.8.11.src.tar.gz) = 4834291	3	SIZE (doxygen-1.8.12.src.tar.gz) = 4880613




--- src/dot.cpp.orig	2016-05-10 19:51:52 UTC
+++ src/dot.cpp
@@ -39,6 +39,7 @@
 #include "dirdef.h"

 #include "md5.h"
 #include "memberlist.h"
 #include "groupdef.h"
@@ -2271,10 +2272,8 @@ void DotGfxHierarchyTable::createGraph(D
     }
   }
   writeGraphFooter(md5stream);
   resetReNumbering();
-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);

   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
       !checkDeliverables(absImgName,absMapName))
@@ -3039,10 +3038,8 @@ QCString computeMd5Signature(DotNode *ro
     }
   }
   writeGraphFooter(md5stream);

-  MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.rawData());
   graphStr=buf.data();
   //printf("md5: %s | file: %s\n",sigStr,baseName.data());
   return sigStr;
@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr
   FTextStream md5stream(&theGraph);
   //m_dir->writeDepGraph(md5stream);
   writeDotDirDepGraph(md5stream,m_dir,linkRelations);

   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) ||
       !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
@@ -4099,10 +4094,8 @@ void generateGraphLegend(const char *pat
   md5stream << "  Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
   md5stream << "  Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
   writeGraphFooter(md5stream);

   QCString absBaseName = (QCString)path+"/graph_legend";
   QCString absDotName  = absBaseName+".dot";
   QCString imgExt = getDotImageExtension();
@@ -4507,10 +4500,8 @@ QCString DotGroupCollaboration::writeGra
   }
 
   writeGraphFooter(md5stream);
   resetReNumbering();
-  uchar md5_sig[16];
   QCString sigStr(33);
-  MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);

-  MD5SigToString(md5_sig,sigStr.rawData(),33);
+  MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
   QCString imgExt = getDotImageExtension();
   QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT);
   QCString baseName    = m_diskName;

Return to bug 212869

Lines 1-4 Link Here

(-)files/patch-md5-dot (-12 / +12 lines)
1	--- src/dot.cpp.orig 2015-12-28 19:46:20 UTC	1	--- src/dot.cpp.orig 2016-05-10 19:51:52 UTC
2	+++ src/dot.cpp	2	+++ src/dot.cpp
3	@@ -39,6 +39,7 @@	3	@@ -39,6 +39,7 @@
4	#include "dirdef.h"	4	#include "dirdef.h"
Lines 8-17 Link Here
8	#include "md5.h"	8	#include "md5.h"
9	#include "memberlist.h"	9	#include "memberlist.h"
10	#include "groupdef.h"	10	#include "groupdef.h"
11	@@ -2305,10 +2306,8 @@ void DotGfxHierarchyTable::createGraph(D	11	@@ -2271,10 +2272,8 @@ void DotGfxHierarchyTable::createGraph(D
		12	}
12	}	13	}
13	writeGraphFooter(md5stream);	14	writeGraphFooter(md5stream);
14	resetReNumbering();
15	- uchar md5_sig[16];	15	- uchar md5_sig[16];
16	QCString sigStr(33);	16	QCString sigStr(33);
17	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);	17	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
Lines 20-26 Link Here
20	bool regenerate=FALSE;	20	bool regenerate=FALSE;
21	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|	21	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
22	!checkDeliverables(absImgName,absMapName))	22	!checkDeliverables(absImgName,absMapName))
23	@@ -3072,10 +3071,8 @@ QCString computeMd5Signature(DotNode *ro	23	@@ -3039,10 +3038,8 @@ QCString computeMd5Signature(DotNode *ro
24	}	24	}
25	}	25	}
26	writeGraphFooter(md5stream);	26	writeGraphFooter(md5stream);
Lines 29-38 Link Here
29	- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);	29	- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
30	- MD5SigToString(md5_sig,sigStr.rawData(),33);	30	- MD5SigToString(md5_sig,sigStr.rawData(),33);
31	+ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.rawData());	31	+ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.rawData());
32	if (reNumber)	32	graphStr=buf.data();
33	{	33	//printf("md5: %s \| file: %s\n",sigStr,baseName.data());
34	resetReNumbering();	34	return sigStr;
35	@@ -4009,10 +4006,8 @@ QCString DotDirDeps::writeGraph(FTextStr	35	@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr
36	FTextStream md5stream(&theGraph);	36	FTextStream md5stream(&theGraph);
37	//m_dir->writeDepGraph(md5stream);	37	//m_dir->writeDepGraph(md5stream);
38	writeDotDirDepGraph(md5stream,m_dir,linkRelations);	38	writeDotDirDepGraph(md5stream,m_dir,linkRelations);
Lines 44-50 Link Here
44	bool regenerate=FALSE;	44	bool regenerate=FALSE;
45	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|	45	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
46	!checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :	46	!checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
47	@@ -4154,10 +4149,8 @@ void generateGraphLegend(const char *pat	47	@@ -4099,10 +4094,8 @@ void generateGraphLegend(const char *pat
48	md5stream << " Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";	48	md5stream << " Node18 -> Node9 [dir=\"back\",color=\"darkorchid3\",fontsize=\"" << FONTSIZE << "\",style=\"dashed\",label=\"m_usedClass\",fontname=\"" << FONTNAME << "\"];\n";
49	md5stream << " Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";	49	md5stream << " Node18 [shape=\"box\",label=\"Used\",fontsize=\"" << FONTSIZE << "\",height=0.2,width=0.4,fontname=\"" << FONTNAME << "\",color=\"black\",URL=\"$classUsed" << Doxygen::htmlFileExtension << "\"];\n";
50	writeGraphFooter(md5stream);	50	writeGraphFooter(md5stream);
Lines 56-65 Link Here
56	QCString absBaseName = (QCString)path+"/graph_legend";	56	QCString absBaseName = (QCString)path+"/graph_legend";
57	QCString absDotName = absBaseName+".dot";	57	QCString absDotName = absBaseName+".dot";
58	QCString imgExt = getDotImageExtension();	58	QCString imgExt = getDotImageExtension();
59	@@ -4557,10 +4550,8 @@ QCString DotGroupCollaboration::writeGra	59	@@ -4507,10 +4500,8 @@ QCString DotGroupCollaboration::writeGra
		60	}
60		61
61	writeGraphFooter(md5stream);	62	writeGraphFooter(md5stream);
62	resetReNumbering();
63	- uchar md5_sig[16];	63	- uchar md5_sig[16];
64	QCString sigStr(33);	64	QCString sigStr(33);
65	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);	65	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
Lines 66-70 Link Here
66	- MD5SigToString(md5_sig,sigStr.rawData(),33);	66	- MD5SigToString(md5_sig,sigStr.rawData(),33);
67	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());	67	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
68	QCString imgExt = getDotImageExtension();	68	QCString imgExt = getDotImageExtension();
69	QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT");	69	QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT);
70	QCString baseName = m_diskName;	70	QCString baseName = m_diskName;