You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by gs...@apache.org on 2017/08/17 19:14:45 UTC
svn commit: r1805330 - in /apr/apr-util/branches/1.6.x: CMakeLists.txt
xml/xml.dsp xml/xml.mak
Author: gsmith
Date: Thu Aug 17 19:14:45 2017
New Revision: 1805330
URL: http://svn.apache.org/viewvc?rev=1805330&view=rev
Log:
To fix CVE-2017-11742, Expat 2.2.3 has an additional file that must be compiled in Windows.
https://www.cvedetails.com/cve/CVE-2017-11742/
Modified:
apr/apr-util/branches/1.6.x/CMakeLists.txt
apr/apr-util/branches/1.6.x/xml/xml.dsp
apr/apr-util/branches/1.6.x/xml/xml.mak
Modified: apr/apr-util/branches/1.6.x/CMakeLists.txt
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/CMakeLists.txt?rev=1805330&r1=1805329&r2=1805330&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/CMakeLists.txt (original)
+++ apr/apr-util/branches/1.6.x/CMakeLists.txt Thu Aug 17 19:14:45 2017
@@ -218,6 +218,7 @@ SET(APR_TEST_SOURCES
)
SET(EXPAT_SOURCES
+ xml/expat/lib/loadlibrary.c
xml/expat/lib/xmlrole.c
xml/expat/lib/xmltok.c
xml/expat/lib/xmlparse.c
Modified: apr/apr-util/branches/1.6.x/xml/xml.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/xml/xml.dsp?rev=1805330&r1=1805329&r2=1805330&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/xml/xml.dsp (original)
+++ apr/apr-util/branches/1.6.x/xml/xml.dsp Thu Aug 17 19:14:45 2017
@@ -137,6 +137,10 @@ LIB32=link.exe -lib
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
+SOURCE=.\expat\lib\loadlibrary.c
+# End Source File
+# Begin Source File
+
SOURCE=.\expat\lib\xmlparse.c
# End Source File
# Begin Source File
Modified: apr/apr-util/branches/1.6.x/xml/xml.mak
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.6.x/xml/xml.mak?rev=1805330&r1=1805329&r2=1805330&view=diff
==============================================================================
--- apr/apr-util/branches/1.6.x/xml/xml.mak (original)
+++ apr/apr-util/branches/1.6.x/xml/xml.mak Thu Aug 17 19:14:45 2017
@@ -41,6 +41,7 @@ ALL : "$(OUTDIR)\xml.lib"
CLEAN :
-@erase "$(INTDIR)\xml.idb"
-@erase "$(INTDIR)\xml.pdb"
+ -@erase "$(INTDIR)\loadlibrary.obj"
-@erase "$(INTDIR)\xmlparse.obj"
-@erase "$(INTDIR)\xmlrole.obj"
-@erase "$(INTDIR)\xmltok.obj"
@@ -90,6 +91,7 @@ BSC32_SBRS= \
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib"
LIB32_OBJS= \
+ "$(INTDIR)\loadlibrary.obj" \
"$(INTDIR)\xmlparse.obj" \
"$(INTDIR)\xmlrole.obj" \
"$(INTDIR)\xmltok.obj"
@@ -113,6 +115,7 @@ ALL : "$(OUTDIR)\xml.lib"
CLEAN :
-@erase "$(INTDIR)\xml.idb"
-@erase "$(INTDIR)\xml.pdb"
+ -@erase "$(INTDIR)\loadlibrary.obj"
-@erase "$(INTDIR)\xmlparse.obj"
-@erase "$(INTDIR)\xmlrole.obj"
-@erase "$(INTDIR)\xmltok.obj"
@@ -162,6 +165,7 @@ BSC32_SBRS= \
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib"
LIB32_OBJS= \
+ "$(INTDIR)\loadlibrary.obj" \
"$(INTDIR)\xmlparse.obj" \
"$(INTDIR)\xmlrole.obj" \
"$(INTDIR)\xmltok.obj"
@@ -185,6 +189,7 @@ ALL : "$(OUTDIR)\xml.lib"
CLEAN :
-@erase "$(INTDIR)\xml.idb"
-@erase "$(INTDIR)\xml.pdb"
+ -@erase "$(INTDIR)\loadlibrary.obj"
-@erase "$(INTDIR)\xmlparse.obj"
-@erase "$(INTDIR)\xmlrole.obj"
-@erase "$(INTDIR)\xmltok.obj"
@@ -234,6 +239,7 @@ BSC32_SBRS= \
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib"
LIB32_OBJS= \
+ "$(INTDIR)\loadlibrary.obj" \
"$(INTDIR)\xmlparse.obj" \
"$(INTDIR)\xmlrole.obj" \
"$(INTDIR)\xmltok.obj"
@@ -257,6 +263,7 @@ ALL : "$(OUTDIR)\xml.lib"
CLEAN :
-@erase "$(INTDIR)\xml.idb"
-@erase "$(INTDIR)\xml.pdb"
+ -@erase "$(INTDIR)\loadlibrary.obj"
-@erase "$(INTDIR)\xmlparse.obj"
-@erase "$(INTDIR)\xmlrole.obj"
-@erase "$(INTDIR)\xmltok.obj"
@@ -306,6 +313,7 @@ BSC32_SBRS= \
LIB32=link.exe -lib
LIB32_FLAGS=/nologo /out:"$(OUTDIR)\xml.lib"
LIB32_OBJS= \
+ "$(INTDIR)\loadlibrary.obj" \
"$(INTDIR)\xmlparse.obj" \
"$(INTDIR)\xmlrole.obj" \
"$(INTDIR)\xmltok.obj"
@@ -328,6 +336,12 @@ LIB32_OBJS= \
!IF "$(CFG)" == "xml - Win32 Release" || "$(CFG)" == "xml - Win32 Debug" || "$(CFG)" == "xml - x64 Release" || "$(CFG)" == "xml - x64 Debug"
+SOURCE=.\expat\lib\loadlibrary.c
+
+"$(INTDIR)\loadlibrary.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
SOURCE=.\expat\lib\xmlparse.c
"$(INTDIR)\xmlparse.obj" : $(SOURCE) "$(INTDIR)"