From e386766a1f7120f01961996adbffe880bf516736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n?= Date: Mon, 28 Aug 2023 16:10:54 +0200 Subject: [PATCH 1/5] Add missing confs --- reference/config_files/global_conf.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/reference/config_files/global_conf.rst b/reference/config_files/global_conf.rst index 0591a37ba66f..aaafe9d5ef18 100644 --- a/reference/config_files/global_conf.rst +++ b/reference/config_files/global_conf.rst @@ -92,16 +92,20 @@ To list all the possible configurations available, run :command:`conan config li tools.cmake.cmaketoolchain:toolset_arch: Toolset architecture to be used as part of CMAKE_GENERATOR_TOOLSET in CMakeToolchain tools.cmake.cmaketoolchain:user_toolchain: Inject existing user toolchains at the beginning of conan_toolchain.cmake tools.cmake:cmake_program: Path to CMake executable + tools.cmake:install_strip: Add --strip to cmake.instal() tools.compilation:verbosity: Verbosity of compilation tools if set. Possible values are 'quiet' and 'verbose' + tools.deployer:symlinks: Set to False to disable deployers copying symlinks tools.env.virtualenv:powershell: If it is set to True it will generate powershell launchers if os=Windows tools.files.download:retry: Number of retries in case of failure when downloading tools.files.download:retry_wait: Seconds to wait between download attempts + tools.files.download:verify: If set, overrides recipes on whether to perform SSL verification for their downloaded files. Only recommended to be set while testing tools.gnu:define_libcxx11_abi: Force definition of GLIBCXX_USE_CXX11_ABI=1 for libstdc++11 tools.gnu:host_triplet: Custom host triplet to pass to Autotools scripts tools.gnu:make_program: Indicate path to make program tools.gnu:pkg_config: Path to pkg-config executable used by PkgConfig build helper tools.google.bazel:bazelrc_path: Defines Bazel rc-path tools.google.bazel:configs: Define Bazel config file + tools.graph:skip_binaries: Allow the graph to skip binaries not needed in the current configuration (True by default) tools.info.package_id:confs: List of existing configuration to be part of the package ID tools.intel:installation_path: Defines the Intel oneAPI installation root path tools.intel:setvars_args: Custom arguments to be passed onto the setvars.sh|bat script from Intel oneAPI @@ -118,7 +122,7 @@ To list all the possible configurations available, run :command:`conan config li tools.system.package_manager:mode: Mode for package_manager tools: 'check', 'report', 'report-installed' or 'install' tools.system.package_manager:sudo: Use 'sudo' when invoking the package manager tools in Linux (False by default) tools.system.package_manager:sudo_askpass: Use the '-A' argument if using sudo in Linux to invoke the system package manager (False by default) - tools.system.package_manager:tool: Default package manager tool: 'apk', 'apt-get', 'yum', 'dnf', 'brew', 'pacman', 'choco', 'zypper', 'pkg' or 'pkgutil' + tools.system.package_manager:tool: Default package manager tool: 'apt-get', 'yum', 'dnf', 'brew', 'pacman', 'choco', 'zypper', 'pkg' or 'pkgutil' User/Tools configurations From f34ed7892b0037b919ec14388de5a63a7eeafd4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n?= Date: Mon, 28 Aug 2023 16:22:25 +0200 Subject: [PATCH 2/5] Add missing conf --- reference/commands/config.rst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/reference/commands/config.rst b/reference/commands/config.rst index 589fd4b4dbd1..77cb1e0b246b 100644 --- a/reference/commands/config.rst +++ b/reference/commands/config.rst @@ -245,16 +245,20 @@ Displays all the Conan built-in configurations. There are 2 groups: tools.cmake.cmaketoolchain:toolset_arch: Toolset architecture to be used as part of CMAKE_GENERATOR_TOOLSET in CMakeToolchain tools.cmake.cmaketoolchain:user_toolchain: Inject existing user toolchains at the beginning of conan_toolchain.cmake tools.cmake:cmake_program: Path to CMake executable + tools.cmake:install_strip: Add --strip to cmake.instal() tools.compilation:verbosity: Verbosity of compilation tools if set. Possible values are 'quiet' and 'verbose' + tools.deployer:symlinks: Set to False to disable deployers copying symlinks tools.env.virtualenv:powershell: If it is set to True it will generate powershell launchers if os=Windows tools.files.download:retry: Number of retries in case of failure when downloading tools.files.download:retry_wait: Seconds to wait between download attempts + tools.files.download:verify: If set, overrides recipes on whether to perform SSL verification for their downloaded files. Only recommended to be set while testing tools.gnu:define_libcxx11_abi: Force definition of GLIBCXX_USE_CXX11_ABI=1 for libstdc++11 tools.gnu:host_triplet: Custom host triplet to pass to Autotools scripts tools.gnu:make_program: Indicate path to make program tools.gnu:pkg_config: Path to pkg-config executable used by PkgConfig build helper tools.google.bazel:bazelrc_path: Defines Bazel rc-path tools.google.bazel:configs: Define Bazel config file + tools.graph:skip_binaries: Allow the graph to skip binaries not needed in the current configuration (True by default) tools.info.package_id:confs: List of existing configuration to be part of the package ID tools.intel:installation_path: Defines the Intel oneAPI installation root path tools.intel:setvars_args: Custom arguments to be passed onto the setvars.sh|bat script from Intel oneAPI @@ -271,7 +275,7 @@ Displays all the Conan built-in configurations. There are 2 groups: tools.system.package_manager:mode: Mode for package_manager tools: 'check', 'report', 'report-installed' or 'install' tools.system.package_manager:sudo: Use 'sudo' when invoking the package manager tools in Linux (False by default) tools.system.package_manager:sudo_askpass: Use the '-A' argument if using sudo in Linux to invoke the system package manager (False by default) - tools.system.package_manager:tool: Default package manager tool: 'apk', 'apt-get', 'yum', 'dnf', 'brew', 'pacman', 'choco', 'zypper', 'pkg' or 'pkgutil' + tools.system.package_manager:tool: Default package manager tool: 'apt-get', 'yum', 'dnf', 'brew', 'pacman', 'choco', 'zypper', 'pkg' or 'pkgutil' .. seealso:: From 0a3f216ee8156fb37a41e597dbe32bc7eb3100d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n?= Date: Mon, 28 Aug 2023 16:49:25 +0200 Subject: [PATCH 3/5] Add verify=False warning --- reference/config_files/global_conf.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/reference/config_files/global_conf.rst b/reference/config_files/global_conf.rst index aaafe9d5ef18..c93da0e05a36 100644 --- a/reference/config_files/global_conf.rst +++ b/reference/config_files/global_conf.rst @@ -289,6 +289,12 @@ For instance: * :ref:`Managing configuration in your recipes (self.conf_info) ` +* ``tools.files.download:verify``: Setting ``tools.files.download:verify=False`` constitutes a security risk if enabled, + as it disables certificate validation. Do not use it unless you understand the implications + (And even then, properly scoping the conf to only the required recipes is a good idea) + or if you are using it for development purposes + + UX confs -------- From ef5e289437e63ffc167bb9d67ac12a33a75d7905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n=20Blanco?= Date: Tue, 29 Aug 2023 09:19:20 +0200 Subject: [PATCH 4/5] Update reference/commands/config.rst Co-authored-by: Carlos Zoido --- reference/commands/config.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/commands/config.rst b/reference/commands/config.rst index 77cb1e0b246b..da607aaf13ae 100644 --- a/reference/commands/config.rst +++ b/reference/commands/config.rst @@ -275,7 +275,7 @@ Displays all the Conan built-in configurations. There are 2 groups: tools.system.package_manager:mode: Mode for package_manager tools: 'check', 'report', 'report-installed' or 'install' tools.system.package_manager:sudo: Use 'sudo' when invoking the package manager tools in Linux (False by default) tools.system.package_manager:sudo_askpass: Use the '-A' argument if using sudo in Linux to invoke the system package manager (False by default) - tools.system.package_manager:tool: Default package manager tool: 'apt-get', 'yum', 'dnf', 'brew', 'pacman', 'choco', 'zypper', 'pkg' or 'pkgutil' + tools.system.package_manager:tool: Default package manager tool: 'apk', 'apt-get', 'yum', 'dnf', 'brew', 'pacman', 'choco', 'zypper', 'pkg' or 'pkgutil' .. seealso:: From 03964b519bed15e06d54e78986b7454dd33c1bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Rinc=C3=B3n=20Blanco?= Date: Tue, 29 Aug 2023 09:19:27 +0200 Subject: [PATCH 5/5] Update reference/config_files/global_conf.rst Co-authored-by: Carlos Zoido --- reference/config_files/global_conf.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/config_files/global_conf.rst b/reference/config_files/global_conf.rst index c93da0e05a36..28f3b1eb0d9b 100644 --- a/reference/config_files/global_conf.rst +++ b/reference/config_files/global_conf.rst @@ -122,7 +122,7 @@ To list all the possible configurations available, run :command:`conan config li tools.system.package_manager:mode: Mode for package_manager tools: 'check', 'report', 'report-installed' or 'install' tools.system.package_manager:sudo: Use 'sudo' when invoking the package manager tools in Linux (False by default) tools.system.package_manager:sudo_askpass: Use the '-A' argument if using sudo in Linux to invoke the system package manager (False by default) - tools.system.package_manager:tool: Default package manager tool: 'apt-get', 'yum', 'dnf', 'brew', 'pacman', 'choco', 'zypper', 'pkg' or 'pkgutil' + tools.system.package_manager:tool: Default package manager tool: 'apk', 'apt-get', 'yum', 'dnf', 'brew', 'pacman', 'choco', 'zypper', 'pkg' or 'pkgutil' User/Tools configurations