Attachment #221090 for bug #242347




# $FreeBSD$

PORTNAME=	doxygen
PORTVERSION=	1.9.0
PORTREVISION=	3
PORTEPOCH=	2
CATEGORIES=	devel
MASTER_SITES=	SF/${PORTNAME}/rel-${PORTVERSION} \
		http://doxygen.nl/files/

EXTRACT_SUFX=	.src.tar.gz

MAINTAINER=	fluffy@FreeBSD.org
COMMENT=	Documentation system for C, C++, and other languages

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

USES=		bison cmake:noninja compiler:c++14-lang iconv python shebangfix

ALL_TARGET=	all
CMAKE_ARGS+=	-DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}


QT5_USES=	qt:5
QT5_USE=	QT=core,widgets,gui,xml,qmake_build,buildtools_build
QT5_CMAKE_BOOL=	build_wizard
QT5_PLIST_FILES=	bin/doxywizard

SEARCH_CMAKE_BOOL=	build_search

SEARCH_PLIST_FILES=	bin/doxyindexer \
			bin/doxysearch.cgi

post-patch:
	@${REINPLACE_CMD} -e '/PERL_PATH/ s|/usr/bin/perl|${perl_CMD}|' \
		${WRKSRC}/src/config.xml

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)devel/doxygen/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1550430912	1	TIMESTAMP = 1609267206
2	SHA256 (doxygen-1.8.15.src.tar.gz) = bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d	2	SHA256 (doxygen-1.9.0.src.tar.gz) = 636bab2c3c85603302600ed9b95425717aee776e56a3215325fcce15bbfdaef6
3	SIZE (doxygen-1.8.15.src.tar.gz) = 5097791	3	SIZE (doxygen-1.9.0.src.tar.gz) = 5118869

Lines 1-10 Link Here

(-)devel/doxygen/files/patch-CMakeLists.txt (-7 / +7 lines)
1	--- CMakeLists.txt.orig 2015-06-16 17:42:32 UTC	1	--- CMakeLists.txt.orig 2020-12-21 14:08:57 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -122,7 +122,6 @@ if (win_static)	3	@@ -169,7 +169,6 @@ endif()
4	endif()	4	include(cmake/CompilerWarnings.cmake)
		5	include(cmake/Coverage.cmake)
5		6
6
7	-add_subdirectory(libmd5)	7	-add_subdirectory(libmd5)
8	add_subdirectory(qtools)	8	add_subdirectory(liblodepng)
9	add_subdirectory(vhdlparser)	9	add_subdirectory(libmscgen)
10	add_subdirectory(src)	10	add_subdirectory(libversion)

Lines 1-9 Link Here

(-)devel/doxygen/files/patch-doc-doxygen_manual.tex (-5 / +5 lines)
1	--- doc/doxygen_manual.tex.orig 2015-02-28 15:26:54 UTC	1	--- doc/doxygen_manual.tex.orig 2019-08-04 11:51:41 UTC
2	+++ doc/doxygen_manual.tex	2	+++ doc/doxygen_manual.tex
3	@@ -13,7 +13,7 @@	3	@@ -22,7 +22,7 @@
4	% input used in their production; they are not affected by this license.	4	\usepackage{array}[=2016-10-06]
5		5	\fi
6	\documentclass{book}	6	%%
7	-\usepackage[a4paper,left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}	7	-\usepackage[a4paper,left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}
8	+\usepackage[left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}	8	+\usepackage[left=2.5cm,right=2.5cm,top=2.5cm,bottom=2.5cm]{geometry}
9	\usepackage{makeidx}	9	\usepackage{makeidx}

Lines 1-6 Link Here

(-)devel/doxygen/files/patch-doc_CMakeLists.txt (-3 / +3 lines)
1	--- doc/CMakeLists.txt.orig 2017-10-31 19:36:00 UTC	1	--- doc/CMakeLists.txt.orig 2020-11-14 18:13:29 UTC
2	+++ doc/CMakeLists.txt	2	+++ doc/CMakeLists.txt
3	@@ -168,7 +168,7 @@ install(FILES	3	@@ -240,7 +240,7 @@ install(FILES
4	"${PROJECT_BINARY_DIR}/man/doxywizard.1"	4	"${PROJECT_BINARY_DIR}/man/doxywizard.1"
5	"${PROJECT_BINARY_DIR}/man/doxysearch.1"	5	"${PROJECT_BINARY_DIR}/man/doxysearch.1"
6	"${PROJECT_BINARY_DIR}/man/doxyindexer.1"	6	"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
Lines 8-11 Link Here
8	+ DESTINATION man/man1	8	+ DESTINATION man/man1
9	)	9	)
10		10
11	install(FILES	11	install(CODE "if(NOT EXISTS \"${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf\")




--- Doxyfile.orig	2019-07-30 13:23:30 UTC
+++ Doxyfile
@@ -276,7 +276,6 @@ MACRO_EXPANSION        = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = qtools \
-                         libmd5 \
                          liblodepng \
                          libmscgen
 INCLUDE_FILE_PATTERNS  =
 PREDEFINED             =
 EXPAND_AS_DEFINED      =

Lines 1-6 Link Here

(-)devel/doxygen/files/patch-md5-definition (-4 / +4 lines)
1	--- src/definition.cpp.orig 2015-01-03 22:38:57 UTC	1	--- src/definition.cpp.orig 2020-12-01 19:59:57 UTC
2	+++ src/definition.cpp	2	+++ src/definition.cpp
3	@@ -17,6 +17,7 @@	3	@@ -22,6 +22,7 @@
4		4
5	#include <ctype.h>	5	#include <ctype.h>
6	#include <qregexp.h>	6	#include <qregexp.h>
Lines 8-16 Link Here
8	#include "md5.h"	8	#include "md5.h"
9	#include <stdio.h>	9	#include <stdio.h>
10	#include <stdlib.h>	10	#include <stdlib.h>
11	@@ -537,13 +538,11 @@ void Definition::writeDocAnchorsToTagFil	11	@@ -446,13 +447,11 @@ void DefinitionImpl::writeDocAnchorsToTagFile(FTextStr
12		12
13	bool Definition::_docsAlreadyAdded(const QCString &doc,QCString &sigList)	13	bool DefinitionImpl::_docsAlreadyAdded(const QCString &doc,QCString &sigList)
14	{	14	{
15	- uchar md5_sig[16];	15	- uchar md5_sig[16];
16	QCString sigStr(33);	16	QCString sigStr(33);

Lines 1-4 Link Here

(-)devel/doxygen/files/patch-md5-dirdef (-2 / +2 lines)
1	--- src/dirdef.cpp.orig 2015-01-03 22:38:57 UTC	1	--- src/dirdef.cpp.orig 2020-11-27 20:27:34 UTC
2	+++ src/dirdef.cpp	2	+++ src/dirdef.cpp
3	@@ -1,3 +1,4 @@	3	@@ -1,3 +1,4 @@
4	+#include <sys/types.h>	4	+#include <sys/types.h>
Lines 5-11 Link Here
5	#include "md5.h"	5	#include "md5.h"
6		6
7	#include "dirdef.h"	7	#include "dirdef.h"
8	@@ -81,10 +82,8 @@ void DirDef::addFile(FileDef *fd)	8	@@ -167,10 +168,8 @@ void DirDefImpl::sort()
9	static QCString encodeDirName(const QCString &anchor)	9	static QCString encodeDirName(const QCString &anchor)
10	{	10	{
11	// convert to md5 hash	11	// convert to md5 hash




--- src/dot.cpp.orig	2016-05-10 19:51:52 UTC
+++ src/dot.cpp
@@ -39,6 +39,7 @@
 #include "dirdef.h"
 #include "vhdldocgen.h"
 #include "ftextstream.h"
+#include <sys/types.h>
 #include "md5.h"
 #include "memberlist.h"
 #include "groupdef.h"
@@ -2271,10 +2272,8 @@ void DotGfxHierarchyTable::createGraph(D
     }
   }
   writeGraphFooter(md5stream);
-  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());
   bool regenerate=FALSE;
   if (checkAndUpdateMd5Signature(absBaseName,sigStr) || 
       !checkDeliverables(absImgName,absMapName))
@@ -3039,10 +3038,8 @@ QCString computeMd5Signature(DotNode *ro
     }
   }
   writeGraphFooter(md5stream);
-  uchar md5_sig[16];
   QCString sigStr(33);
-  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);
-  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());
   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);
-  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 absBaseName = (QCString)path+"/graph_legend";
   QCString absDotName  = absBaseName+".dot";
   QCString imgExt = getDotImageExtension();
@@ -4507,10 +4500,8 @@ QCString DotGroupCollaboration::writeGra
   }
 
   writeGraphFooter(md5stream);
-  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;




--- src/dotgraph.cpp.orig	2020-10-19 13:24:24 UTC
+++ src/dotgraph.cpp
@@ -16,6 +16,7 @@
 #include "config.h"
 #include "doxygen.h"
 #include "index.h"
+#include <sys/types.h>
 #include "md5.h"
 #include "message.h"
 #include "util.h"
@@ -143,10 +144,8 @@ bool DotGraph::prepareDotFile()
 
   QCString sigStr(33);
   uchar md5_sig[16];
-  // calculate md5
-  MD5Buffer((const unsigned char*)m_theGraph.data(), m_theGraph.length(), md5_sig);
-  // convert result to a string
-  MD5SigToString(md5_sig, sigStr.rawData(), 33);
+  // calculate md5 and convert result to a string
+  MD5Data((const unsigned char*)m_theGraph.data(), m_theGraph.length(), sigStr.rawData());
 
   // already queued files are processed again in case the output format has changed
 

Lines 1-4 Link Here

(-)devel/doxygen/files/patch-md5-memberdef (-3 / +2 lines)
1	--- src/memberdef.cpp.orig 2015-01-03 22:38:57 UTC	1	--- src/memberdef.cpp.orig 2020-12-26 19:49:45 UTC
2	+++ src/memberdef.cpp	2	+++ src/memberdef.cpp
3	@@ -17,6 +17,7 @@	3	@@ -17,6 +17,7 @@
4	#include <qglobal.h>	4	#include <qglobal.h>
Lines 8-14 Link Here
8	#include "md5.h"	8	#include "md5.h"
9	#include "memberdef.h"	9	#include "memberdef.h"
10	#include "membername.h"	10	#include "membername.h"
11	@@ -3326,11 +3327,9 @@ void MemberDef::setAnchor()	11	@@ -4198,10 +4199,8 @@ void MemberDefImpl::setAnchor()
12	}	12	}
13		13
14	// convert to md5 hash	14	// convert to md5 hash
Lines 15-21 Link Here
15	- uchar md5_sig[16];	15	- uchar md5_sig[16];
16	QCString sigStr(33);	16	QCString sigStr(33);
17	- MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);	17	- MD5Buffer((const unsigned char *)memAnchor.data(),memAnchor.length(),md5_sig);
18	//printf("memAnchor=%s\n",memAnchor.data());
19	- MD5SigToString(md5_sig,sigStr.rawData(),33);	18	- MD5SigToString(md5_sig,sigStr.rawData(),33);
20	+ MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData());	19	+ MD5Data((const unsigned char *)memAnchor.data(),memAnchor.length(),sigStr.rawData());
21	m_impl->anc = "a"+sigStr;	20	m_impl->anc = "a"+sigStr;




--- src/membergroup.cpp.orig	2020-11-28 16:00:56 UTC
+++ src/membergroup.cpp
@@ -27,6 +27,7 @@
 #include "doxygen.h"
 #include "docparser.h"
 #include "marshal.h"
 #include "entry.h"
+#include <sys/types.h>
 #include "md5.h"
 
 MemberGroup::MemberGroup(const Definition *container,int id,const char *hdr,const char *d,const char *docFile,int docLine)
@@ -319,12 +320,10 @@ void MemberGroup::setInGroup(bool b)
 
 QCString MemberGroup::anchor() const
 {




--- src/util.cpp.orig	2020-12-26 14:29:40 UTC
+++ src/util.cpp
@@ -25,6 +25,8 @@
 #include <mutex>
 #include <unordered_set>
 
+#include <sys/types.h>
+
 #include "md5.h"
 
 #include <qregexp.h>
@@ -3823,16 +3825,16 @@ QCString convertNameToFile(const char *name,bool allow
     if (resultLen>=128) // prevent names that cannot be created!
     {
       // third algorithm based on MD5 hash

-      MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig);
-      MD5SigToString(md5_sig,sigStr.rawData(),33);
+      MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData());
       result=result.left(128-32)+sigStr;
     }
   }
   if (createSubdirs)

     int l1Dir=0,l2Dir=0;
+#endif
 
 #if MAP_ALGO==ALGO_COUNT
     // old algorithm, has the problem that after regeneration the
@@ -3863,12 +3865,13 @@ QCString convertNameToFile(const char *name,bool allow
     l2Dir = (dirNum>>4)&0xff;
 #elif MAP_ALGO==ALGO_MD5
     // third algorithm based on MD5 hash




--- src/CMakeLists.txt.orig	2020-12-24 14:02:11 UTC
+++ src/CMakeLists.txt
@@ -2,7 +2,6 @@
 # vim:ts=4:sw=4:expandtab:autoindent:
 
 include_directories(
     ${PROJECT_SOURCE_DIR}/qtools
-    ${PROJECT_SOURCE_DIR}/libmd5
     ${PROJECT_SOURCE_DIR}/liblodepng
     ${PROJECT_SOURCE_DIR}/libmscgen
     ${PROJECT_SOURCE_DIR}/libversion
@@ -345,7 +344,7 @@ target_link_libraries(doxygen PRIVATE
     doxymain
     _doxygen
     doxycfg
     qtools
-    md5
+    md
     lodepng
     mscgen
     doxygen_version




Upstream git commit 03daff4 resolving a problem with Ghostscript 9.50.

--- src/formula.cpp
+++ src/formula.cpp
@@ -193,8 +193,8 @@ void FormulaList::generateBitmaps(const char *path)
       // used.  
 
       char gsArgs[4096];
-      sprintf(gsArgs,"-q -g%dx%d -r%dx%dx -sDEVICE=ppmraw "
-                    "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -- %s.ps",
+      sprintf(gsArgs,"-q -g%dx%d -r%dx%d -sDEVICE=ppmraw "
+                    "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -dNOSAFER %s.ps",
                     gx,gy,(int)(scaleFactor*72),(int)(scaleFactor*72),
                     formBase.data(),formBase.data()
              );




--- vhdlparser/CMakeLists.txt.orig	2020-11-17 19:19:24 UTC
+++ vhdlparser/CMakeLists.txt
@@ -36,7 +36,7 @@ add_custom_command(
 )
 set_source_files_properties(${GENERATED_SRC}/VhdlParser_adj.cc PROPERTIES GENERATED 1)
 
-include_directories(${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/qtools ${PROJECT_SOURCE_DIR}/vhdlparser ${GENERATED_SRC})
+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${CMAKE_SOURCE_DIR}/vhdlparser ${GENERATED_SRC})
 add_library(vhdlparser STATIC
 ${GENERATED_SRC}/configvalues.h
 CharStream.cc
 ParseException.cc

Return to bug 242347

Lines 2-21 Link Here

(-)devel/doxygen/Makefile (-10 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= doxygen	4	PORTNAME= doxygen
5	PORTVERSION= 1.8.15	5	PORTVERSION= 1.9.0
6	PORTREVISION= 3
7	PORTEPOCH= 2	6	PORTEPOCH= 2
8	CATEGORIES= devel	7	CATEGORIES= devel
9	MASTER_SITES= http://doxygen.nl/files/	8	MASTER_SITES= SF/${PORTNAME}/rel-${PORTVERSION} \
		9	http://doxygen.nl/files/
		10
10	EXTRACT_SUFX= .src.tar.gz	11	EXTRACT_SUFX= .src.tar.gz
11		12
12	MAINTAINER= cyberbotx@cyberbotx.com	13	MAINTAINER= fluffy@FreeBSD.org
13	COMMENT= Documentation system for C, C++, and other languages	14	COMMENT= Documentation system for C, C++, and other languages
14		15
15	LICENSE= GPLv2	16	LICENSE= GPLv2
16	LICENSE_FILE= ${WRKSRC}/LICENSE	17	LICENSE_FILE= ${WRKSRC}/LICENSE
17		18
18	USES= bison cmake:noninja compiler:c++11-lang iconv python shebangfix	19	USES= bison cmake:noninja compiler:c++14-lang iconv python shebangfix
19		20
20	ALL_TARGET= all	21	ALL_TARGET= all
21	CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}	22	CMAKE_ARGS+= -DDOC_INSTALL_DIR:PATH=${DOCSDIR_REL}
Lines 48-54 Link Here
48		49
49	QT5_USES= qt:5	50	QT5_USES= qt:5
50	QT5_USE= QT=core,widgets,gui,xml,qmake_build,buildtools_build	51	QT5_USE= QT=core,widgets,gui,xml,qmake_build,buildtools_build
51	QT5_CMAKE_ON= -Dbuild_wizard:BOOLEAN=true	52	QT5_CMAKE_BOOL= build_wizard
52	QT5_PLIST_FILES= bin/doxywizard	53	QT5_PLIST_FILES= bin/doxywizard
53		54
54	SEARCH_CMAKE_BOOL= build_search	55	SEARCH_CMAKE_BOOL= build_search
Lines 56-63 Link Here
56	SEARCH_PLIST_FILES= bin/doxyindexer \	57	SEARCH_PLIST_FILES= bin/doxyindexer \
57	bin/doxysearch.cgi	58	bin/doxysearch.cgi
58		59
59	post-patch:
60	@${REINPLACE_CMD} -e '/PERL_PATH/ s\|/usr/bin/perl\|${perl_CMD}\|' \
61	${WRKSRC}/src/config.xml
62
63	.include <bsd.port.mk>	60	.include <bsd.port.mk>

Lines 1-12 Link Here

(-)devel/doxygen/files/patch-md5-Doxyfile (-8 / +6 lines)
1	--- Doxyfile.orig 2014-08-14 17:46:42 UTC	1	--- Doxyfile.orig 2019-07-30 13:23:30 UTC
2	+++ Doxyfile	2	+++ Doxyfile
3	@@ -261,8 +261,7 @@	3	@@ -276,7 +276,6 @@ MACRO_EXPANSION = YES
4	MACRO_EXPANSION = YES
5	EXPAND_ONLY_PREDEF = YES	4	EXPAND_ONLY_PREDEF = YES
6	SEARCH_INCLUDES = YES	5	SEARCH_INCLUDES = YES
7	-INCLUDE_PATH = qtools \	6	INCLUDE_PATH = qtools \
8	- libmd5	7	- libmd5 \
9	+INCLUDE_PATH = qtools	8	liblodepng \
		9	libmscgen
10	INCLUDE_FILE_PATTERNS =	10	INCLUDE_FILE_PATTERNS =
11	PREDEFINED =
12	EXPAND_AS_DEFINED =

Lines 1-70 Link Here

(-)devel/doxygen/files/patch-md5-dot (-70 lines)
1	--- src/dot.cpp.orig 2016-05-10 19:51:52 UTC
2	+++ src/dot.cpp
3	@@ -39,6 +39,7 @@
4	#include "dirdef.h"
5	#include "vhdldocgen.h"
6	#include "ftextstream.h"
7	+#include <sys/types.h>
8	#include "md5.h"
9	#include "memberlist.h"
10	#include "groupdef.h"
11	@@ -2271,10 +2272,8 @@ void DotGfxHierarchyTable::createGraph(D
12	}
13	}
14	writeGraphFooter(md5stream);
15	- uchar md5_sig[16];
16	QCString sigStr(33);
17	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
18	- MD5SigToString(md5_sig,sigStr.rawData(),33);
19	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
20	bool regenerate=FALSE;
21	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
22	!checkDeliverables(absImgName,absMapName))
23	@@ -3039,10 +3038,8 @@ QCString computeMd5Signature(DotNode *ro
24	}
25	}
26	writeGraphFooter(md5stream);
27	- uchar md5_sig[16];
28	QCString sigStr(33);
29	- MD5Buffer((const unsigned char *)buf.data(),buf.length(),md5_sig);
30	- MD5SigToString(md5_sig,sigStr.rawData(),33);
31	+ MD5Data((const unsigned char *)buf.data(),buf.length(),sigStr.rawData());
32	graphStr=buf.data();
33	//printf("md5: %s \| file: %s\n",sigStr,baseName.data());
34	return sigStr;
35	@@ -3954,10 +3951,8 @@ QCString DotDirDeps::writeGraph(FTextStr
36	FTextStream md5stream(&theGraph);
37	//m_dir->writeDepGraph(md5stream);
38	writeDotDirDepGraph(md5stream,m_dir,linkRelations);
39	- uchar md5_sig[16];
40	QCString sigStr(33);
41	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
42	- MD5SigToString(md5_sig,sigStr.rawData(),33);
43	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
44	bool regenerate=FALSE;
45	if (checkAndUpdateMd5Signature(absBaseName,sigStr) \|\|
46	!checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
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";
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);
51	- uchar md5_sig[16];
52	QCString sigStr(33);
53	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
54	- MD5SigToString(md5_sig,sigStr.rawData(),33);
55	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
56	QCString absBaseName = (QCString)path+"/graph_legend";
57	QCString absDotName = absBaseName+".dot";
58	QCString imgExt = getDotImageExtension();
59	@@ -4507,10 +4500,8 @@ QCString DotGroupCollaboration::writeGra
60	}
61
62	writeGraphFooter(md5stream);
63	- uchar md5_sig[16];
64	QCString sigStr(33);
65	- MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig);
66	- MD5SigToString(md5_sig,sigStr.rawData(),33);
67	+ MD5Data((const unsigned char *)theGraph.data(),theGraph.length(),sigStr.rawData());
68	QCString imgExt = getDotImageExtension();
69	QCString imgFmt = Config_getEnum(DOT_IMAGE_FORMAT);
70	QCString baseName = m_diskName;

Line 0 Link Here

(-)devel/doxygen/files/patch-md5-dotgraph (+23 lines)
	1	--- src/dotgraph.cpp.orig 2020-10-19 13:24:24 UTC
	2	+++ src/dotgraph.cpp
	3	@@ -16,6 +16,7 @@
	4	#include "config.h"
	5	#include "doxygen.h"
	6	#include "index.h"
	7	+#include <sys/types.h>
	8	#include "md5.h"
	9	#include "message.h"
	10	#include "util.h"
	11	@@ -143,10 +144,8 @@ bool DotGraph::prepareDotFile()
	12
	13	QCString sigStr(33);
	14	uchar md5_sig[16];
	15	- // calculate md5
	16	- MD5Buffer((const unsigned char*)m_theGraph.data(), m_theGraph.length(), md5_sig);
	17	- // convert result to a string
	18	- MD5SigToString(md5_sig, sigStr.rawData(), 33);
	19	+ // calculate md5 and convert result to a string
	20	+ MD5Data((const unsigned char*)m_theGraph.data(), m_theGraph.length(), sigStr.rawData());
	21
	22	// already queued files are processed again in case the output format has changed
	23

Lines 1-14 Link Here

(-)devel/doxygen/files/patch-md5-membergroup (-5 / +5 lines)
1	--- src/membergroup.cpp.orig 2015-01-03 22:38:57 UTC	1	--- src/membergroup.cpp.orig 2020-11-28 16:00:56 UTC
2	+++ src/membergroup.cpp	2	+++ src/membergroup.cpp
3	@@ -28,6 +28,7 @@	3	@@ -27,6 +27,7 @@
		4	#include "doxygen.h"
4	#include "docparser.h"	5	#include "docparser.h"
5	#include "marshal.h"
6	#include "entry.h"	6	#include "entry.h"
7	+#include <sys/types.h>	7	+#include <sys/types.h>
8	#include "md5.h"	8	#include "md5.h"
9		9
10	//static QCString idToName(int id)	10	MemberGroup::MemberGroup(const Definition container,int id,const char hdr,const char d,const char docFile,int docLine)
11	@@ -307,12 +308,10 @@ void MemberGroup::setInGroup(bool b)	11	@@ -319,12 +320,10 @@ void MemberGroup::setInGroup(bool b)
12		12
13	QCString MemberGroup::anchor() const	13	QCString MemberGroup::anchor() const
14	{	14	{

Lines 1-14 Link Here

(-)devel/doxygen/files/patch-md5-util (-8 / +9 lines)
1	--- src/util.cpp.orig 2015-01-03 22:45:44 UTC	1	--- src/util.cpp.orig 2020-12-26 14:29:40 UTC
2	+++ src/util.cpp	2	+++ src/util.cpp
3	@@ -19,6 +19,7 @@	3	@@ -25,6 +25,8 @@
4	#include <errno.h>	4	#include <mutex>
5	#include <math.h>	5	#include <unordered_set>
6		6
7	+#include <sys/types.h>	7	+#include <sys/types.h>
		8	+
8	#include "md5.h"	9	#include "md5.h"
9		10
10	#include <qregexp.h>	11	#include <qregexp.h>
11	@@ -5335,16 +5336,16 @@ QCString convertNameToFile(const char *n	12	@@ -3823,16 +3825,16 @@ QCString convertNameToFile(const char *name,bool allow
12	if (resultLen>=128) // prevent names that cannot be created!	13	if (resultLen>=128) // prevent names that cannot be created!
13	{	14	{
14	// third algorithm based on MD5 hash	15	// third algorithm based on MD5 hash
Lines 17-23 Link Here
17	- MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig);	18	- MD5Buffer((const unsigned char *)result.data(),resultLen,md5_sig);
18	- MD5SigToString(md5_sig,sigStr.rawData(),33);	19	- MD5SigToString(md5_sig,sigStr.rawData(),33);
19	+ MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData());	20	+ MD5Data((const unsigned char *)result.data(),resultLen,sigStr.rawData());
20	result=result.left(128-32)+sigStr;	21	result=result.left(128-32)+sigStr;
21	}	22	}
22	}	23	}
23	if (createSubdirs)	24	if (createSubdirs)
Lines 26-34 Link Here
26	int l1Dir=0,l2Dir=0;	27	int l1Dir=0,l2Dir=0;
27	+#endif	28	+#endif
28		29
29	#if MAP_ALGO==ALGO_COUNT	30	#if MAP_ALGO==ALGO_COUNT
30	// old algorithm, has the problem that after regeneration the	31	// old algorithm, has the problem that after regeneration the
31	@@ -5375,12 +5376,13 @@ QCString convertNameToFile(const char *n	32	@@ -3863,12 +3865,13 @@ QCString convertNameToFile(const char *name,bool allow
32	l2Dir = (dirNum>>4)&0xff;	33	l2Dir = (dirNum>>4)&0xff;
33	#elif MAP_ALGO==ALGO_MD5	34	#elif MAP_ALGO==ALGO_MD5
34	// third algorithm based on MD5 hash	35	// third algorithm based on MD5 hash

Lines 1-21 Link Here

(-)devel/doxygen/files/patch-src_CMakeLists.txt (-15 / +13 lines)
1	--- src/CMakeLists.txt.orig 2015-05-31 19:01:12 UTC	1	--- src/CMakeLists.txt.orig 2020-12-24 14:02:11 UTC
2	+++ src/CMakeLists.txt	2	+++ src/CMakeLists.txt
3	@@ -1,8 +1,7 @@	3	@@ -2,7 +2,6 @@
4	# vim:ts=4:sw=4:expandtab:autoindent:
5		4
6	-include_directories(	5	include_directories(
7	+include_directories(BEFORE	6	${PROJECT_SOURCE_DIR}/qtools
8	${CMAKE_SOURCE_DIR}/qtools	7	- ${PROJECT_SOURCE_DIR}/libmd5
9	- ${CMAKE_SOURCE_DIR}/libmd5	8	${PROJECT_SOURCE_DIR}/liblodepng
10	${CMAKE_SOURCE_DIR}/vhdlparser/	9	${PROJECT_SOURCE_DIR}/libmscgen
11	${CMAKE_SOURCE_DIR}/src	10	${PROJECT_SOURCE_DIR}/libversion
12	${CLANG_INCLUDEDIR}	11	@@ -345,7 +344,7 @@ target_link_libraries(doxygen PRIVATE
13	@@ -229,7 +228,7 @@ target_link_libraries(doxygen	12	doxymain
14	_doxygen
15	doxycfg	13	doxycfg
16	qtools	14	qtools
17	- md5	15	- md5
18	+ md	16	+ md
19	vhdlparser	17	lodepng
20	${SQLITE3_LIBRARIES}	18	mscgen
21	${ICONV_LIBRARIES}	19	doxygen_version

Lines 1-15 Link Here

(-)devel/doxygen/files/patch-src_formula.cpp (-15 lines)
1	Upstream git commit 03daff4 resolving a problem with Ghostscript 9.50.
2
3	--- src/formula.cpp
4	+++ src/formula.cpp
5	@@ -193,8 +193,8 @@ void FormulaList::generateBitmaps(const char *path)
6	// used.
7
8	char gsArgs[4096];
9	- sprintf(gsArgs,"-q -g%dx%d -r%dx%dx -sDEVICE=ppmraw "
10	- "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -- %s.ps",
11	+ sprintf(gsArgs,"-q -g%dx%d -r%dx%d -sDEVICE=ppmraw "
12	+ "-sOutputFile=%s.pnm -dNOPAUSE -dBATCH -dNOSAFER %s.ps",
13	gx,gy,(int)(scaleFactor72),(int)(scaleFactor72),
14	formBase.data(),formBase.data()
15	);

Lines 1-11 Link Here

(-)devel/doxygen/files/patch-vhdlparser_CMakeLists.txt (-6 / +6 lines)
1	--- vhdlparser/CMakeLists.txt.orig 2016-05-10 19:51:52 UTC	1	--- vhdlparser/CMakeLists.txt.orig 2020-11-17 19:19:24 UTC
2	+++ vhdlparser/CMakeLists.txt	2	+++ vhdlparser/CMakeLists.txt
3	@@ -6,7 +6,7 @@ add_custom_command(	3	@@ -36,7 +36,7 @@ add_custom_command(
4	)	4	)
5	set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1)	5	set_source_files_properties(${GENERATED_SRC}/VhdlParser_adj.cc PROPERTIES GENERATED 1)
6		6
7	-include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})	7	-include_directories(${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/qtools ${PROJECT_SOURCE_DIR}/vhdlparser ${GENERATED_SRC})
8	+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})	8	+include_directories(BEFORE ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${CMAKE_SOURCE_DIR}/vhdlparser ${GENERATED_SRC})
9	add_library(vhdlparser STATIC	9	add_library(vhdlparser STATIC
10	${GENERATED_SRC}/configvalues.h
11	CharStream.cc	10	CharStream.cc
		11	ParseException.cc