nss: conan v2 support

recipes/nss/all/conandata.yml

@@ -1,40 +1,4 @@
 sources:
-  "3.93":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_93_RTM/src/nss-3.93.tar.gz"
-    sha256: "15f54bb72048eb105f8c0e936a04b899e74c3db9a19bbc1e00acee2af9476a8a"
-  "3.92":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_92_RTM/src/nss-3.92.tar.gz"
-    sha256: "3db192d6e882039af02ae7eaf3217ed114bb7ad83414c646772ab8021e24a254"
-  "3.91":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_91_RTM/src/nss-3.91.tar.gz"
-    sha256: "84bd46376df17118c55f6d73d30fd93a0af21296c66e7690471547e5898fc4b3"
-  "3.89":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_89_RTM/src/nss-3.89.tar.gz"
-    sha256: "55c37a3f4da010d0574fb8b39264cb1e7b4ce9e6c2954c1c7ecf9f41ee00bed5"
-  "3.88.1":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_88_1_RTM/src/nss-3.88.1.tar.gz"
-    sha256: "27d243edf87d1cf1bb9c861f03d387e0e9230ce5017f4308c941f558b54b3496"
-  "3.87":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_87_RTM/src/nss-3.87.tar.gz"
-    sha256: "68a1894496d3d158babc75f8a5dda3f55b7c1560573936e3b101a10fa4ac152d"
-  "3.86":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_86_RTM/src/nss-3.86.tar.gz"
-    sha256: "3f385fc686476bbba811035fa6821b542475d55747b18c20c221d4d66573b975"
-  "3.85":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_85_RTM/src/nss-3.85.tar.gz"
-    sha256: "afd9d64510b1154debbd6cab3571e9ff64a3373898e03483e4c85cdada13d297"
-  "3.84":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_84_RTM/src/nss-3.84.tar.gz"
-    sha256: "9a387ffe350ff14f001d943f96cc0c064891551d71e1a97a5ddbffe7f1207a25"
-  "3.83":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_83_RTM/src/nss-3.83.tar.gz"
-    sha256: "ab23ea67f964090b8b73c80a674082571c36e5f4eba92057ac648c9c1def0128"
-  "3.77":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_77_RTM/src/nss-3.77.tar.gz"
-    sha256: "825edf5a2fd35b788a23ff80face591f82919ae3ad2b8f77d424a450d618dedd"
-  "3.76.1":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_76_1_RTM/src/nss-3.76.1.tar.gz"
-    sha256: "e13104c374e2e1d7890d8f6bc18d0f18eb886ed4dbad4144d1c482f2983d232a"
-  "3.72":
-    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_72_RTM/src/nss-3.72.tar.gz"
-    sha256: "6ea60a9ff113e493ea2ab25f41ea75a9fbd10af7903f26f703dac8680732d02e"
+  "3.104":
+    url: "https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_104_RTM/src/nss-3.104.tar.gz"
+    sha256: "e2763223622d1e76b98a43030873856f248af0a41b03b2fa2ca06a91bc50ac8e"

recipes/nss/all/test_package/CMakeLists.txt

@@ -1,9 +1,7 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.15)
 project(test_package C)
 
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
+find_package(nss REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.c)
-target_link_libraries(${PROJECT_NAME} CONAN_PKG::nss)
-
+target_link_libraries(${PROJECT_NAME} PRIVATE nss::nss)

recipes/nss/all/test_package/conanfile.py

@@ -1,18 +1,26 @@
-from conans import ConanFile, CMake, tools
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import CMake, cmake_layout
 import os
 
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    generators = "cmake", "cmake_find_package"
+    generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv"
+    test_type = "explicit"
+
+    def layout(self):
+        cmake_layout(self)
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
 
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
 
-
     def test(self):
-        if not tools.cross_building(self):
-            bin_path = os.path.join("bin", "test_package")
-            self.run(bin_path, run_environment=True)
+        if can_run(self):
+            bin_path = os.path.join(self.cpp.build.bindir, "test_package")
+            self.run(bin_path, env="conanrun")

recipes/nss/all/test_package/test_package.c

@@ -1,7 +1,8 @@
-#include "nss.h"
-#include "nssutil.h"
-#include "smime.h"
-#include "ssl.h"
+#include <nss.h>
+#include <nssutil.h>
+#include <smime.h>
+#include <ssl.h>
+
 #include <stdio.h>
 
 int main() {

recipes/nss/all/test_v1_package/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.15)
+project(test_package)
+
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup(TARGETS)
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package)

recipes/nss/all/test_v1_package/conanfile.py

@@ -0,0 +1,17 @@
+from conans import ConanFile, CMake, tools
+import os
+
+
+class TestPackageConan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "cmake", "cmake_find_package_multi"
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if not tools.cross_building(self):
+            bin_path = os.path.join("bin", "test_package")
+            self.run(bin_path, run_environment=True)

recipes/nss/config.yml

@@ -1,27 +1,3 @@
 versions:
-  "3.93":
-    folder: all
-  "3.92":
-    folder: all
-  "3.91":
-    folder: all
-  "3.89":
-    folder: all
-  "3.88.1":
-    folder: all
-  "3.87":
-    folder: all
-  "3.86":
-    folder: all
-  "3.85":
-    folder: all
-  "3.84":
-    folder: all
-  "3.83":
-    folder: all
-  "3.77":
-    folder: all
-  "3.76.1":
-    folder: all
-  "3.72":
+  "3.104":
     folder: all