Windows build fixes.

diff --git a/cups/cups.h b/cups/cups.h
index f22fa01bff06e3b35720cf5bd03bd9d24131ba07..dd0fdfed24be10964f166c3df028bffe327f2e5a 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -43,10 +43,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION                 2.0401
+#  define CUPS_VERSION                 2.0402
 #  define CUPS_VERSION_MAJOR           2
 #  define CUPS_VERSION_MINOR           4
-#  define CUPS_VERSION_PATCH           1
+#  define CUPS_VERSION_PATCH           2
 
 #  define CUPS_BC_FD                   3
                                        /* Back-channel file descriptor for

diff --git a/cups/tls-openssl.c b/cups/tls-openssl.c
index b0615bfb9d6cee8933ead7d6842a38ae3377cda4..66f163280fa65f067b6e7077be18297e631aee1f 100644 (file)
--- a/cups/tls-openssl.c
+++ b/cups/tls-openssl.c
@@ -310,7 +310,7 @@ httpCopyCredentials(
   *credentials = cupsArrayNew(NULL, NULL);
   chain        = SSL_get_peer_cert_chain(http->tls);
 
-  DEBUG_printf(("1httpCopyCredentials: cert=%p", cert));
+  DEBUG_printf(("1httpCopyCredentials: chain=%p", chain));
 
   if (chain)
   {
@@ -823,7 +823,9 @@ httpSaveCredentials(
   if ((fp = cupsFileOpen(nfilename, "w")) == NULL)
     return (-1);
 
+#ifndef _WIN32
   fchmod(cupsFileNumber(fp), 0600);
+#endif // !_WIN32
 
   for (cred = (http_credential_t *)cupsArrayFirst(credentials);
        cred;
@@ -1343,7 +1345,11 @@ http_default_path(
                                        // Pointer to library globals
 
 
+#ifdef _WIN32
+  if (cg->home)
+#else
   if (cg->home && getuid())
+#endif // _WIN32
   {
     snprintf(buffer, bufsize, "%s/.cups", cg->home);
     if (access(buffer, 0))

diff --git a/vcnet/config.h b/vcnet/config.h
index f2bc3dd17c303119d8a1d5d2a581d72da4d38139..8bb9212bf45ed006e418a2864a64974c6d7f2f2f 100644 (file)
--- a/vcnet/config.h
+++ b/vcnet/config.h
@@ -100,8 +100,8 @@ typedef unsigned long useconds_t;
  * Version of software...
  */
 
-#define CUPS_SVERSION "CUPS v2.4.1"
-#define CUPS_MINIMAL "CUPS/2.4.1"
+#define CUPS_SVERSION "CUPS v2.4.2"
+#define CUPS_MINIMAL "CUPS/2.4.2"
 
 
 /*

diff --git a/vcnet/cupstestppd.vcxproj b/vcnet/cupstestppd.vcxproj
index 6481918261261f23a9afbf6128a7195fd269c52d..cebce15b388b1bd013cf7d7774d8a8b39b945cb8 100644 (file)
--- a/vcnet/cupstestppd.vcxproj
+++ b/vcnet/cupstestppd.vcxproj
@@ -57,7 +57,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;..\vcnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\vcnet;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -79,7 +79,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..;..\vcnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\vcnet;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />

diff --git a/vcnet/ippeveprinter.vcxproj b/vcnet/ippeveprinter.vcxproj
index 44964bf498f6577f16a87751d47a530effbc1648..1829e2d7fe9a42f83412d79201cc6974fa1c5af0 100644 (file)
--- a/vcnet/ippeveprinter.vcxproj
+++ b/vcnet/ippeveprinter.vcxproj
@@ -57,7 +57,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -80,7 +80,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
@@ -115,7 +115,9 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="packages\zeroc.openssl.v143.1.1.1.1\build\native\zeroc.openssl.v143.targets" Condition="Exists('packages\zeroc.openssl.v143.1.1.1.1\build\native\zeroc.openssl.v143.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <Error Condition="!Exists('packages\zeroc.openssl.v143.1.1.1.1\build\native\zeroc.openssl.v143.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zeroc.openssl.v143.1.1.1.1\build\native\zeroc.openssl.v143.targets'))" />
   </Target>
 </Project>
\ No newline at end of file

diff --git a/vcnet/ippfind.vcxproj b/vcnet/ippfind.vcxproj
index 7fbd591df71f2ee69860096cc0b84bcaefc12aeb..068470ab3693ddb6514574541a858e26b9bfd1cd 100644 (file)
--- a/vcnet/ippfind.vcxproj
+++ b/vcnet/ippfind.vcxproj
@@ -57,7 +57,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -80,7 +80,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />

diff --git a/vcnet/ipptool.vcxproj b/vcnet/ipptool.vcxproj
index f5695f1f59f84438be96f6649153a3c5ba7dd161..836feb3fb7adff64b7aa29bda2be190af7aae6c7 100644 (file)
--- a/vcnet/ipptool.vcxproj
+++ b/vcnet/ipptool.vcxproj
@@ -57,7 +57,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -79,7 +79,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />

diff --git a/vcnet/libcups2.vcxproj b/vcnet/libcups2.vcxproj
index e390be0080668dee5173062644fe5b868fa425c9..caeca42944f51b86e2140d2d31d3e2b80c2667b6 100644 (file)
--- a/vcnet/libcups2.vcxproj
+++ b/vcnet/libcups2.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -68,7 +68,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>bcrypt.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>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)</AdditionalDependencies>
       <OutputFile>$(OutDir)libcups2.dll</OutputFile>
       <ModuleDefinitionFile>..\cups\libcups2.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -84,7 +84,7 @@
     </Midl>
     <ClCompile>
       <Optimization>MinSpace</Optimization>
-      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
@@ -92,7 +92,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>bcrypt.lib;ws2_32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>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)</AdditionalDependencies>
       <OutputFile>$(OutDir)libcups2.dll</OutputFile>
       <ModuleDefinitionFile>..\cups\libcups2.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>

diff --git a/vcnet/libcups2_native.nuspec b/vcnet/libcups2_native.nuspec
index 06261da2edbf0240e5b8ca36080d2d283f5b628d..61c5f31864fc0857e9e9b1f7eee3ed91e399d44e 100644 (file)
--- a/vcnet/libcups2_native.nuspec
+++ b/vcnet/libcups2_native.nuspec
@@ -3,7 +3,7 @@
     <metadata>
         <id>libcups2_native</id>
         <title>OpenPrinting CUPS Library for VS2019+</title>
-        <version>2.4.1.0</version>
+        <version>2.4.2.0</version>
         <authors>Michael R Sweet, OpenPrinting</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/OpenPrinting/cups</projectUrl>
@@ -16,7 +16,7 @@ and other Unix®-like operating systems. The CUPS library provides a convenient
         <copyright>Copyright © 2020-2022 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
         <tags>http ipp native</tags>
        <dependencies>
-           <dependency id="libcups2_native.redist" version="2.4.1.0" />
+           <dependency id="libcups2_native.redist" version="2.4.2.0" />
        </dependencies>
     </metadata>
     <files>

diff --git a/vcnet/libcups2_native.redist.nuspec b/vcnet/libcups2_native.redist.nuspec
index ee4001a59f0da111b6bf95bd64c4201da38038f4..703f92623baf6396e643a8e16eaa22850e2fa063 100644 (file)
--- a/vcnet/libcups2_native.redist.nuspec
+++ b/vcnet/libcups2_native.redist.nuspec
@@ -3,7 +3,7 @@
     <metadata>
         <id>libcups2_native.redist</id>
         <title>OpenPrinting CUPS Library for VS2019+ Redist</title>
-        <version>2.4.1.0</version>
+        <version>2.4.2.0</version>
         <authors>Michael R Sweet, OpenPrinting</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/OpenPrinting/cups</projectUrl>
@@ -26,5 +26,6 @@ and other Unix®-like operating systems. This package provides the redistributab
         <file src="Win32\**\regex*.dll" target="build\native\bin\Win32" />-->
         <file src="x64\**\libcups2*.dll" target="build\native\bin\x64" />
         <file src="x64\**\regex*.dll" target="build\native\bin\x64" />
+       <file src="packages\zeroc.openssl.v143.1.1.1.1\build\native\bin\x64\Release\*.dll" target="build\native\bin\x64" />
     </files>
 </package>

diff --git a/vcnet/packages.config b/vcnet/packages.config
index ddf68c66cd9de08d44835d135c5f8bb43adf2adb..450a90a1a702b943e36ac881be981fed99cac4cf 100644 (file)
--- a/vcnet/packages.config
+++ b/vcnet/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="zeroc.openssl.v143" version="1.1.1.1" targetFramework="native" />
   <package id="zlib_native" version="1.2.11" targetFramework="native" />
   <package id="zlib_native.redist" version="1.2.11" targetFramework="native" />
 </packages>
\ No newline at end of file

diff --git a/vcnet/testhttp.vcxproj b/vcnet/testhttp.vcxproj
index 99ffc90178f2cfda79b62cf6dd82f7f91003207b..05558f3e742f3377fbe522a5702b2a56dd15fda2 100644 (file)
--- a/vcnet/testhttp.vcxproj
+++ b/vcnet/testhttp.vcxproj
@@ -54,7 +54,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\vcnet;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\vcnet;..;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -75,7 +75,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\vcnet;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\vcnet;..;packages\zeroc.openssl.v143.1.1.1.1\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>