From: Michael R Sweet Date: Fri, 29 Jul 2022 17:41:18 +0000 (-0400) Subject: Update NuGet/VC packages to use LibreSSL packages. X-Git-Tag: v2.4.3~155 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20b5bf09d45dabd2c0dcd4a90fe72540f87a5443;p=thirdparty%2Fcups.git Update NuGet/VC packages to use LibreSSL packages. --- diff --git a/vcnet/cupstestppd.vcxproj b/vcnet/cupstestppd.vcxproj index cebce15b38..1517751af0 100644 --- a/vcnet/cupstestppd.vcxproj +++ b/vcnet/cupstestppd.vcxproj @@ -57,7 +57,7 @@ Disabled - ..;..\vcnet;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories) + ..;..\vcnet;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -79,7 +79,7 @@ X64 - ..;..\vcnet;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories) + ..;..\vcnet;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/vcnet/ippeveprinter.vcxproj b/vcnet/ippeveprinter.vcxproj index 1829e2d7fe..743fb6f79e 100644 --- a/vcnet/ippeveprinter.vcxproj +++ b/vcnet/ippeveprinter.vcxproj @@ -57,7 +57,7 @@ Disabled - ..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) false EnableFastChecks @@ -80,7 +80,7 @@ X64 - ..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -114,10 +114,4 @@ - - - - - - \ No newline at end of file diff --git a/vcnet/ippfind.vcxproj b/vcnet/ippfind.vcxproj index 068470ab36..72845f3def 100644 --- a/vcnet/ippfind.vcxproj +++ b/vcnet/ippfind.vcxproj @@ -57,7 +57,7 @@ Disabled - ..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -80,7 +80,7 @@ X64 - ..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/vcnet/ipptool.vcxproj b/vcnet/ipptool.vcxproj index 836feb3fb7..ef48ae2ce0 100644 --- a/vcnet/ipptool.vcxproj +++ b/vcnet/ipptool.vcxproj @@ -57,7 +57,7 @@ Disabled - ..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks @@ -79,7 +79,7 @@ X64 - ..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/vcnet/libcups2.vcxproj b/vcnet/libcups2.vcxproj index caeca42944..1bbfdee151 100644 --- a/vcnet/libcups2.vcxproj +++ b/vcnet/libcups2.vcxproj @@ -58,7 +58,7 @@ Disabled - ..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\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\zeroc.openssl.v143.1.1.1.1\build\native\lib\x64\Release\libssl.lib;packages\zeroc.openssl.v143.1.1.1.1\build\native\lib\x64\Release\libcrypto.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.1\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\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.5.3.1\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\zeroc.openssl.v143.1.1.1.1\build\native\lib\x64\Release\libssl.lib;packages\zeroc.openssl.v143.1.1.1.1\build\native\lib\x64\Release\libcrypto.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.1\build\native\lib\x64\Release\crypto.lib;bcrypt.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies) $(OutDir)libcups2.dll ..\cups\libcups2.def true @@ -103,101 +103,37 @@ $(OutDir)libcups2.lib MachineX64 - - if not "%25RC_XBS%25" == "YES" goto END -if not exist "$(DSTROOT)\Program Files\Bonjour\$(Platform)" mkdir "$(DSTROOT)\Program Files\Bonjour\$(Platform)" -xcopy /I/Y "$(TargetPath)" "$(DSTROOT)\Program Files\Bonjour\$(Platform)" -:END - - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - + + - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - + + + + - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - + + - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - + + + + - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - + - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - + + + + + - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - + @@ -207,10 +143,7 @@ xcopy /I/Y "$(TargetPath)" - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - + @@ -218,32 +151,14 @@ xcopy /I/Y "$(TargetPath)" - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - + + + - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - - - WIN32;%(PreprocessorDefinitions) - WIN32;%(PreprocessorDefinitions) - + + + diff --git a/vcnet/libcups2_native.nuspec b/vcnet/libcups2_native.nuspec index ccb920373e..cd2b84fec8 100644 --- a/vcnet/libcups2_native.nuspec +++ b/vcnet/libcups2_native.nuspec @@ -3,7 +3,7 @@ libcups2_native OpenPrinting CUPS Library for VS2019+ - 2.4.2.1 + 2.4.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 c9ba7b6e54..6b17caed9f 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.2.1 + 2.4.3 Michael R Sweet, OpenPrinting michaelrsweet https://github.com/OpenPrinting/cups @@ -16,6 +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 + @@ -26,6 +27,5 @@ and other Unix®-like operating systems. This package provides the redistributab --> - diff --git a/vcnet/packages.config b/vcnet/packages.config index 450a90a1a7..520e6079be 100644 --- a/vcnet/packages.config +++ b/vcnet/packages.config @@ -1,6 +1,7 @@  - + + \ No newline at end of file diff --git a/vcnet/testhttp.vcxproj b/vcnet/testhttp.vcxproj index 05558f3e74..7e3f3ea46d 100644 --- a/vcnet/testhttp.vcxproj +++ b/vcnet/testhttp.vcxproj @@ -54,7 +54,7 @@ Disabled - ..\vcnet;..;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -75,7 +75,7 @@ - ..\vcnet;..;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories) + ..\vcnet;..;packages\libressl_native.3.5.3.1\build\native\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded