From b53be980d2d8367b898672e7d57e43e747d0400a Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Wed, 21 Sep 2022 17:41:46 -0400 Subject: [PATCH] Bump NuGet versions and pull in newer LibreSSL. --- cups/tls-openssl.c | 4 ++++ vcnet/ippeveprinter.vcxproj | 4 ++-- vcnet/ippfind.vcxproj | 4 ++-- vcnet/ipptool.vcxproj | 4 ++-- vcnet/libcups2.vcxproj | 8 ++++---- vcnet/libcups2_native.nuspec | 4 ++-- vcnet/libcups2_native.redist.nuspec | 4 ++-- vcnet/packages.config | 4 ++-- vcnet/testhttp.vcxproj | 4 ++-- 9 files changed, 22 insertions(+), 18 deletions(-) diff --git a/cups/tls-openssl.c b/cups/tls-openssl.c index 0aa05f01a5..c8d43d5ac3 100644 --- a/cups/tls-openssl.c +++ b/cups/tls-openssl.c @@ -1606,8 +1606,12 @@ http_make_path( *bufend = buffer + bufsize - 1; // End of buffer +#if 0 snprintf(buffer, bufsize, "%s/", dirname); bufptr = buffer + strlen(buffer); +#else + bufptr = buffer; +#endif // 0 while (*filename && bufptr < bufend) { diff --git a/vcnet/ippeveprinter.vcxproj b/vcnet/ippeveprinter.vcxproj index 743fb6f79e..61cb2f6067 100644 --- a/vcnet/ippeveprinter.vcxproj +++ b/vcnet/ippeveprinter.vcxproj @@ -57,7 +57,7 @@ Disabled - ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.2\build\native\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) false EnableFastChecks @@ -80,7 +80,7 @@ X64 - ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.2\build\native\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/vcnet/ippfind.vcxproj b/vcnet/ippfind.vcxproj index 72845f3def..95f503498c 100644 --- a/vcnet/ippfind.vcxproj +++ b/vcnet/ippfind.vcxproj @@ -57,7 +57,7 @@ Disabled - ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.2\build\native\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -80,7 +80,7 @@ X64 - ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.2\build\native\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/vcnet/ipptool.vcxproj b/vcnet/ipptool.vcxproj index ef48ae2ce0..e82bc23758 100644 --- a/vcnet/ipptool.vcxproj +++ b/vcnet/ipptool.vcxproj @@ -57,7 +57,7 @@ Disabled - ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.2\build\native\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -79,7 +79,7 @@ X64 - ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.2\build\native\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/vcnet/libcups2.vcxproj b/vcnet/libcups2.vcxproj index 1bbfdee151..6046025ec6 100644 --- a/vcnet/libcups2.vcxproj +++ b/vcnet/libcups2.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.2\build\native\include;%(AdditionalIncludeDirectories) DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -68,7 +68,7 @@ ProgramDatabase - packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\crypto.lib;bcrypt.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) + packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.5.3.2\build\native\lib\x64\Release\crypto.lib;bcrypt.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) $(OutDir)libcups2.dll ..\cups\libcups2.def true @@ -84,7 +84,7 @@ MinSpace - ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.2\build\native\include;%(AdditionalIncludeDirectories) DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -92,7 +92,7 @@ ProgramDatabase - packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\crypto.lib;bcrypt.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) + packages\libressl_native.3.5.3.1\build\native\lib\x64\Release\ssl.lib;packages\libressl_native.3.5.3.2\build\native\lib\x64\Release\crypto.lib;bcrypt.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) $(OutDir)libcups2.dll ..\cups\libcups2.def true diff --git a/vcnet/libcups2_native.nuspec b/vcnet/libcups2_native.nuspec index ae5d9e7de6..727f34de5b 100644 --- a/vcnet/libcups2_native.nuspec +++ b/vcnet/libcups2_native.nuspec @@ -3,7 +3,7 @@ libcups2_native OpenPrinting CUPS Library for VS2019+ - 2.4.3.2 + 2.4.3.3 Michael R Sweet, OpenPrinting michaelrsweet https://github.com/OpenPrinting/cups @@ -16,7 +16,7 @@ and other Unix®-like operating systems. The CUPS library provides a convenient Copyright © 2020-2022 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products. http ipp native - + diff --git a/vcnet/libcups2_native.redist.nuspec b/vcnet/libcups2_native.redist.nuspec index 46df675a74..cd45f42d20 100644 --- a/vcnet/libcups2_native.redist.nuspec +++ b/vcnet/libcups2_native.redist.nuspec @@ -3,7 +3,7 @@ libcups2_native.redist OpenPrinting CUPS Library for VS2019+ Redist - 2.4.3.2 + 2.4.3.3 Michael R Sweet, OpenPrinting michaelrsweet https://github.com/OpenPrinting/cups @@ -16,7 +16,7 @@ and other Unix®-like operating systems. This package provides the redistributab Copyright © 2020-2022 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products. http ipp native - + diff --git a/vcnet/packages.config b/vcnet/packages.config index 520e6079be..48d46fbf49 100644 --- a/vcnet/packages.config +++ b/vcnet/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/vcnet/testhttp.vcxproj b/vcnet/testhttp.vcxproj index 7e3f3ea46d..15780fe494 100644 --- a/vcnet/testhttp.vcxproj +++ b/vcnet/testhttp.vcxproj @@ -54,7 +54,7 @@ Disabled - ..\vcnet;..;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;packages\libressl_native.3.5.3.2\build\native\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -75,7 +75,7 @@ - ..\vcnet;..;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;packages\libressl_native.3.5.3.2\build\native\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded -- 2.47.2