February 2021 - crux-commits

ports/opt (3.6): spirv-headers: 1.5.3-060627f -> 1.5.4-f027d53
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit 84453d9b232d11685bf4d31fd0daf4262f57de4b Author: Danny Rawlins <contact(a)romster.me> Date: Sun Feb 28 00:24:04 2021 +1100 spirv-headers: 1.5.3-060627f -> 1.5.4-f027d53 diff --git a/spirv-headers/.signature b/spirv-headers/.signature index f77e7b7e1..b83da7556 100644 --- a/spirv-headers/.signature +++ b/spirv-headers/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fdjaQ3god4euoPEXY7jDzoHgq23652+Rs8qmv+lzM3JVWfhMjJlVLPEQ33afSPunckXNjHbWCJFp+H/JNOWywM= -SHA256 (Pkgfile) = 58dcdd9db5906b918ad8475261ed5584a369678e42da5fbb3b3749c6174e705e +RWSE3ohX2g5d/fnKB9TYGYirpeEf9o2814JmwTFw67RYlX8vEXJ/CaLEd4yoOvMwbYB3TM86N0Sv2dq6rP2U7bmZkT5ZVC3JDQM= +SHA256 (Pkgfile) = 65df064c376f5119aaa2b8f8c67962c3bc5b8e0fccd5f5d7882a6e3fcbbd751d SHA256 (.footprint) = 051b31aecd3e919aa7f5b6c995e1c913350e6c210ed660ac2cb46030df110d9c -SHA256 (060627f0b0d2fa8581b5acb939f46e3b9e500593.zip) = 6ff599807b355da41140978156698bb64ce0ecee12458ee5f98feb9e81ba3555 +SHA256 (f027d53ded7e230e008d37c8b47ede7cd308e19d.zip) = 134a559f8bedb73c792415965a611b250fcb328de4576c922acf9a2679f746c4 diff --git a/spirv-headers/Pkgfile b/spirv-headers/Pkgfile index bc95994b8..79f3e6d40 100644 --- a/spirv-headers/Pkgfile +++ b/spirv-headers/Pkgfile @@ -4,15 +4,15 @@ # Depends on: cmake ninja name=spirv-headers -version=1.5.3-060627f +version=1.5.4-f027d53 release=1 source=( #https://github.com/KhronosGroup/SPIRV-Headers/archive/$version/SPIRV-Headers-$version.tar.gz - https://github.com/KhronosGroup/SPIRV-Headers/archive/060627f0b0d2fa8581b5a… + https://github.com/KhronosGroup/SPIRV-Headers/archive/f027d53ded7e230e008d3… ) build() { - mv SPIRV-Headers-060627f0b0d2fa8581b5acb939f46e3b9e500593 SPIRV-Headers-$version + mv SPIRV-Headers-f027d53ded7e230e008d37c8b47ede7cd308e19d SPIRV-Headers-$version cmake -SSPIRV-Headers-$version -Bbuild -GNinja \ -DCMAKE_INSTALL_PREFIX=/usr \

1 0

ports/opt (3.6): glslang: 11.0.0-bacaef3 -> 11.0.0-c594de2
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit a693e998e64f0ed41e0b6a2f3cd20cb44ab215dd Author: Danny Rawlins <contact(a)romster.me> Date: Sun Feb 28 00:23:03 2021 +1100 glslang: 11.0.0-bacaef3 -> 11.0.0-c594de2 diff --git a/glslang/.footprint b/glslang/.footprint index b66136611..912739648 100644 --- a/glslang/.footprint +++ b/glslang/.footprint @@ -70,27 +70,39 @@ drwxr-xr-x root/root usr/include/glslang/SPIRV/ -rw-r--r-- root/root usr/include/glslang/build_info.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/cmake/ -drwxr-xr-x root/root usr/lib/cmake/glslang/ --rw-r--r-- root/root usr/lib/cmake/glslang/glslangConfig-release.cmake --rw-r--r-- root/root usr/lib/cmake/glslang/glslangConfig.cmake +-rw-r--r-- root/root usr/lib/cmake/HLSLTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/HLSLTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/OGLCompilerTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/OGLCompilerTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/OSDependentTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/OSDependentTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/SPIRVTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/SPIRVTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/SPVRemapperTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/SPVRemapperTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/glslang-default-resource-limitsTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/glslang-default-resource-limitsTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/glslangTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/glslangTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/glslangValidatorTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/glslangValidatorTargets.cmake +-rw-r--r-- root/root usr/lib/cmake/spirv-remapTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/spirv-remapTargets.cmake -rw-r--r-- root/root usr/lib/libGenericCodeGen.a -rw-r--r-- root/root usr/lib/libHLSL.a -lrwxrwxrwx root/root usr/lib/libHLSL.so -> libHLSL.so.11 -lrwxrwxrwx root/root usr/lib/libHLSL.so.11 -> libHLSL.so.11.0.0 --rwxr-xr-x root/root usr/lib/libHLSL.so.11.0.0 +-rwxr-xr-x root/root usr/lib/libHLSL.so -rw-r--r-- root/root usr/lib/libMachineIndependent.a -rw-r--r-- root/root usr/lib/libOGLCompiler.a -rw-r--r-- root/root usr/lib/libOSDependent.a -rw-r--r-- root/root usr/lib/libSPIRV.a -lrwxrwxrwx root/root usr/lib/libSPIRV.so -> libSPIRV.so.11 -lrwxrwxrwx root/root usr/lib/libSPIRV.so.11 -> libSPIRV.so.11.0.0 --rwxr-xr-x root/root usr/lib/libSPIRV.so.11.0.0 +-rwxr-xr-x root/root usr/lib/libSPIRV.so -rw-r--r-- root/root usr/lib/libSPVRemapper.a -lrwxrwxrwx root/root usr/lib/libSPVRemapper.so -> libSPVRemapper.so.11 -lrwxrwxrwx root/root usr/lib/libSPVRemapper.so.11 -> libSPVRemapper.so.11.0.0 --rwxr-xr-x root/root usr/lib/libSPVRemapper.so.11.0.0 +-rwxr-xr-x root/root usr/lib/libSPVRemapper.so -rw-r--r-- root/root usr/lib/libglslang-default-resource-limits.a -rw-r--r-- root/root usr/lib/libglslang.a lrwxrwxrwx root/root usr/lib/libglslang.so -> libglslang.so.11 lrwxrwxrwx root/root usr/lib/libglslang.so.11 -> libglslang.so.11.0.0 -rwxr-xr-x root/root usr/lib/libglslang.so.11.0.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/glslang.pc +-rw-r--r-- root/root usr/lib/pkgconfig/spirv.pc diff --git a/glslang/.signature b/glslang/.signature index 3e63e8db4..49b627f72 100644 --- a/glslang/.signature +++ b/glslang/.signature @@ -1,10 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XbeOlEBaG+uBoBWpXeNrKnpgH7oTWe8VGN7ikDxC4UaaAx0SfDd5Aa9GmT/Ty/2dPtQn1ek9njf7u1uj10LnAc= -SHA256 (Pkgfile) = ab033d3e4b102c4abe03a2726384861e5fc4fcd8201b431662e67ffcecafe9a5 -SHA256 (.footprint) = 8880cae79882460ff5b41bc7581a5b503f425c06f07f153c132c02481ff82939 -SHA256 (bacaef3237c515e40d1a24722be48c0a0b30f75f.zip) = c3161b15c83f47310afdfc1167f3dd9a67ba48b910e19b19405f0ba67eb1c1fa -SHA256 (0001-CMake-Allow-linking-against-system-installed-SPIRV-T.patch) = 0eec9964c9ccf87f7179011d1a48df8d4c2dc8067c14cb8c660ad2bd3f2218e9 -SHA256 (0001-CMake-Make-glslang-default-resource-limits-STATIC.patch) = f99036f2d07bf45ed80ab3e221a3834ca514ba2dd50ec710ba1604a46b8165bb -SHA256 (0002-CMake-Use-VERSION-SOVERSION-for-all-shared-libs.patch) = 73560f03d7da2861cc870be14b0eb99e7280c2455e5ee81e5eee9ebd04f95b29 -SHA256 (0001-glslang-Rename-and-move-cmake-export.patch) = aee56a7d0b4567f8259c461ea32510a98b394698febf034d32aa520ac9d37781 -SHA256 (0002-cmake-Use-the-same-export-config-for-all-installed-t.patch) = 8390e2537e9006fb5f1f948baa680955cf690b561432eec55ded8aef0bc13ee7 +RWSE3ohX2g5d/SwfbLWEybtFWbT8JHKOkqIOSOEMZrKLVdOE7oTSyJNTE0gqKrfksrjpHlFsLfuGT8oCvO2E9S3iDYesuiDBCQQ= +SHA256 (Pkgfile) = 384d39a0a1b3f922591acc092c51888a26a0980f5f5b12585c96f521caec899e +SHA256 (.footprint) = cf10144f439de699d284ae928f297389273b2b6ce4cdbf96654d6daada5202df +SHA256 (c594de23cdd790d64ad5f9c8b059baae0ee2941d.zip) = e5bfa91af93e48c19babcfdd2cf5391aa67b081c94ad65c416a8c9106d86bf3b +SHA256 (glslang-default-resource-limits_staticlib.patch) = 6a2bbc0c08c2cf257a15f0c03b1fbc53bb150fa449c3f28d180d69860864dcc8 +SHA256 (0001-pkg-config-compatibility.patch) = 1f5f890f9f13bdb436db3c238f0451a56e219e0540f1e50a06a58319949c0542 diff --git a/glslang/0001-CMake-Allow-linking-against-system-installed-SPIRV-T.patch b/glslang/0001-CMake-Allow-linking-against-system-installed-SPIRV-T.patch deleted file mode 100644 index 3af183203..000000000 --- a/glslang/0001-CMake-Allow-linking-against-system-installed-SPIRV-T.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 1504af077935a0bfd1b1b59f77d8b1cd89f913b5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde(a)gmail.com> -Date: Mon, 10 Dec 2018 13:05:15 +0100 -Subject: [PATCH] CMake: Allow linking against system-installed SPIRV-Tools - -Fixes #1585. ---- - CMakeLists.txt | 7 ++++++- - SPIRV/CMakeLists.txt | 21 +++++++++++++-------- - 2 files changed, 19 insertions(+), 9 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ada2b8fb..22243f49 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -320,7 +320,12 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/External) - add_subdirectory(External) - endif() - --if(NOT TARGET SPIRV-Tools-opt) -+find_package(PkgConfig) -+if(PkgConfig_FOUND) -+ pkg_check_modules(SPIRV-Tools SPIRV-Tools) -+endif() -+# Former would be system-installed, later is from External -+if(NOT SPIRV-Tools_FOUND AND NOT TARGET SPIRV-Tools-opt) - set(ENABLE_OPT OFF) - endif() - -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index d699dadd..28beb47b 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -91,14 +91,19 @@ if(WIN32 AND BUILD_SHARED_LIBS) - endif() - - if(ENABLE_OPT) -- target_include_directories(SPIRV -- PRIVATE ${spirv-tools_SOURCE_DIR}/include -- PRIVATE ${spirv-tools_SOURCE_DIR}/source -- ) -- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) -- target_include_directories(SPIRV PUBLIC -- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> -- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) -+ if(SPIRV-Tools_FOUND) -+ target_include_directories(SPIRV PUBLIC ${SPIRV-Tools_INCLUDEDIR}) -+ target_link_libraries(SPIRV glslang ${SPIRV-Tools_LIBRARIES}) -+ else() -+ target_include_directories(SPIRV -+ PRIVATE ${spirv-tools_SOURCE_DIR}/include -+ PRIVATE ${spirv-tools_SOURCE_DIR}/source -+ ) -+ target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) -+ target_include_directories(SPIRV PUBLIC -+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> -+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) -+ endif() - else() - target_link_libraries(SPIRV PRIVATE MachineIndependent) - endif(ENABLE_OPT) --- -2.28.0 - diff --git a/glslang/0001-CMake-Make-glslang-default-resource-limits-STATIC.patch b/glslang/0001-CMake-Make-glslang-default-resource-limits-STATIC.patch deleted file mode 100644 index 93e7a5c44..000000000 --- a/glslang/0001-CMake-Make-glslang-default-resource-limits-STATIC.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d6e59ca08971c261f8297027d9c274f884c9d1e0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde(a)gmail.com> -Date: Mon, 12 Oct 2020 11:20:05 +0200 -Subject: [PATCH 1/2] CMake: Make glslang-default-resource-limits STATIC - ---- - StandAlone/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index 8038c043..a2009165 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -31,7 +31,7 @@ - # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - # POSSIBILITY OF SUCH DAMAGE. - --add_library(glslang-default-resource-limits -+add_library(glslang-default-resource-limits STATIC - ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp) - set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) --- -2.28.0 - diff --git a/glslang/0001-glslang-Rename-and-move-cmake-export.patch b/glslang/0001-glslang-Rename-and-move-cmake-export.patch deleted file mode 100644 index 685a0cbda..000000000 --- a/glslang/0001-glslang-Rename-and-move-cmake-export.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 63927cbb24c80b0cad5829338a6f76da6a873beb Mon Sep 17 00:00:00 2001 -From: Sandy Carter <bwrsandman(a)gmail.com> -Date: Sat, 16 Nov 2019 09:43:29 +0100 -Subject: [PATCH 1/2] glslang: Rename and move cmake export - -CMake when searching for a package in config mode will by default look for -a file called <name>Config.cmake or <lower-case-name>-config.cmake. -The previous naming would force the user to specify the name to -glslangTargets. The name is therefore changed to glslangConfig.cmake. - -On Unix, cmake will look for the config files in the following directories: -<prefix>/(lib/<arch>|lib|share)/cmake/<name>*/ (U) -<prefix>/(lib/<arch>|lib|share)/<name>*/ (U) -<prefix>/(lib/<arch>|lib|share)/<name>*/(cmake|CMake)/ (U) -Previously the destination directory was <prefix>/lib/cmake which would not -be found. -The destination directory now includes the package name. - -A namespace is added to be able to specify components. ---- - glslang/CMakeLists.txt | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt -index 1c7d22a2..7408d81c 100644 ---- a/glslang/CMakeLists.txt -+++ b/glslang/CMakeLists.txt -@@ -200,17 +200,18 @@ endif(WIN32) - if(ENABLE_GLSLANG_INSTALL) - if(BUILD_SHARED_LIBS) - install(TARGETS glslang -- EXPORT glslangTargets -+ EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - else() - install(TARGETS glslang MachineIndependent GenericCodeGen -- EXPORT glslangTargets -+ EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - -- install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) -+ install(EXPORT glslangConfig NAMESPACE glslang:: -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glslang) - - set(ALL_HEADERS - ${GLSLANG_HEADERS} --- -2.28.0 - diff --git a/glslang/0001-pkg-config-compatibility.patch b/glslang/0001-pkg-config-compatibility.patch new file mode 100644 index 000000000..e09de4c95 --- /dev/null +++ b/glslang/0001-pkg-config-compatibility.patch @@ -0,0 +1,178 @@ +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/CMakeLists.txt 2020-11-04 06:32:09.030326238 +1000 +@@ -118,6 +118,13 @@ if(USE_CCACHE) + endif(CCACHE_FOUND) + endif() + ++# using pkg-config to configure include paths and link libraries ++include(FindPkgConfig) ++pkg_check_modules(SPIRV_TOOLS REQUIRED SPIRV-Tools>=2019.2.1) ++if(BUILD_SHARED_LIBS) ++ pkg_check_modules(SPIRV_TOOLS_SHARED REQUIRED SPIRV-Tools-shared>=2019.2.1) ++endif(BUILD_SHARED_LIBS) ++ + if(ENABLE_CTEST) + include(CTest) + endif() +@@ -320,11 +327,7 @@ if(BUILD_EXTERNAL AND IS_DIRECTORY ${CMA + add_subdirectory(External) + endif() + +-if(NOT TARGET SPIRV-Tools-opt) +- set(ENABLE_OPT OFF) +-endif() +- +-if(ENABLE_OPT) ++if(${SPIRV_TOOLS_FOUND} EQUAL 1) + message(STATUS "optimizer enabled") + add_definitions(-DENABLE_OPT=1) + else() +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/External/CMakeLists.txt 2020-11-04 06:32:09.030326238 +1000 +@@ -68,10 +68,3 @@ if(BUILD_TESTING) + endif() + endif() + +-if(ENABLE_OPT AND NOT TARGET SPIRV-Tools-opt) +- if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools) +- set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests") +- add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/spirv-tools spirv-tools) +- endif() +-endif() +- +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/CMakeLists.txt 2020-11-04 06:32:09.031326265 +1000 +@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL) + EXPORT glslangTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in.dma 2020-11-04 06:32:09.031326265 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/glslang/glslang.pc.cmake.in 2020-11-04 06:32:09.031326265 +1000 +@@ -0,0 +1,11 @@ ++ prefix=@CMAKE_INSTALL_PREFIX@ ++ exec_prefix=@CMAKE_INSTALL_PREFIX@ ++ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ ++ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++ ++ Name: @PROJECT_NAME@ ++ Description: OpenGL and OpenGL ES shader front end and validator ++ Requires: ++ Version: @VERSION@ ++ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper ++ Cflags: -I${includedir} +\ No newline at end of file +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt.dma 2020-11-03 14:22:55.000000000 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/CMakeLists.txt 2020-11-04 06:32:09.031326265 +1000 +@@ -77,6 +77,10 @@ target_include_directories(SPIRV PUBLIC + + glslang_add_build_info_dependency(SPIRV) + ++ ++set(SPIRV_NAME spirv) ++set(SPIRV_VERSION 1.3) ++ + if (ENABLE_SPVREMAPPER) + add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) + set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) +@@ -90,15 +94,21 @@ if(WIN32 AND BUILD_SHARED_LIBS) + endif() + endif() + ++target_include_directories(SPIRV PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS}) ++target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_CFLAGS_OTHER}) ++target_link_libraries(SPIRV ${SPIRV_TOOLS_LIBRARIES}) ++if(BUILD_SHARED_LIBS) ++ target_include_directories(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS}) ++ target_compile_options(SPIRV PUBLIC ${SPIRV_TOOLS_SHARED_CFLAGS_OTHER}) ++ target_link_libraries(SPIRV ${SPIRV_TOOLS_SHARED_LIBRARIES}) ++endif(BUILD_SHARED_LIBS) ++ + if(ENABLE_OPT) + target_include_directories(SPIRV + PRIVATE ${spirv-tools_SOURCE_DIR}/include + PRIVATE ${spirv-tools_SOURCE_DIR}/source + ) +- target_link_libraries(SPIRV PRIVATE MachineIndependent SPIRV-Tools-opt) +- target_include_directories(SPIRV PUBLIC +- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> +- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) ++ target_link_libraries(SPIRV glslang) + else() + target_link_libraries(SPIRV PRIVATE MachineIndependent) + endif(ENABLE_OPT) +@@ -133,6 +143,9 @@ if(ENABLE_GLSLANG_INSTALL) + endif() + + install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) ++ # spirv.pc Configuration ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/spirv.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/spirv.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) + endif(ENABLE_GLSLANG_INSTALL) +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in.dma 2020-11-04 06:32:09.032326292 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/spirv.pc.cmake.in 2020-11-04 06:32:09.031326265 +1000 +@@ -0,0 +1,11 @@ ++ prefix=@CMAKE_INSTALL_PREFIX@ ++ exec_prefix=@CMAKE_INSTALL_PREFIX@ ++ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ ++ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++ ++ Name: @SPIRV_NAME@ ++ Description: SPIR-V is a binary intermediate language for representing graphical-shader stages and compute kernels for multiple Khronos APIs, including OpenCL, OpenGL, and Vulkan ++ Requires: ++ Version: @SPIRV_VERSION@ ++ Libs: -L${libdir} -lSPIRV ++ Cflags: -I${includedir} +\ No newline at end of file +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp.dma 2020-11-04 06:32:09.032326292 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/SPIRV/SpvTools.cpp 2020-11-04 06:33:06.481878394 +1000 +@@ -43,7 +43,7 @@ + #include <iostream> + + #include "SpvTools.h" +-#include "spirv-tools/optimizer.hpp" ++#include <spirv-tools/optimizer.hpp> + + namespace glslang { + +diff -up glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt.dma glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt +--- glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt.dma 2020-11-04 06:31:49.139788864 +1000 ++++ glslang-d550bebee919179c9e332a0ab28a67f8fe3ca239/StandAlone/CMakeLists.txt 2020-11-04 06:32:09.032326292 +1000 +@@ -56,6 +56,14 @@ if(ENABLE_SPVREMAPPER) + set(LIBRARIES ${LIBRARIES} SPVRemapper) + endif() + ++if(BUILD_SHARED_LIBS) ++ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_SHARED_LIBRARIES}) ++ target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_SHARED_INCLUDE_DIRS}) ++else() ++ set(LIBRARIES ${LIBRARIES} ${SPIRV_TOOLS_LIBRARIES}) ++ target_include_directories(glslangValidator PUBLIC ${SPIRV_TOOLS_INCLUDE_DIRS}) ++endif(BUILD_SHARED_LIBS) ++ + if(WIN32) + set(LIBRARIES ${LIBRARIES} psapi) + elseif(UNIX) +@@ -65,9 +73,6 @@ elseif(UNIX) + endif(WIN32) + + target_link_libraries(glslangValidator ${LIBRARIES}) +-target_include_directories(glslangValidator PUBLIC +- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> +- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) + + if(ENABLE_OPT) + target_include_directories(glslangValidator diff --git a/glslang/0002-CMake-Use-VERSION-SOVERSION-for-all-shared-libs.patch b/glslang/0002-CMake-Use-VERSION-SOVERSION-for-all-shared-libs.patch deleted file mode 100644 index b5e1ef038..000000000 --- a/glslang/0002-CMake-Use-VERSION-SOVERSION-for-all-shared-libs.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 5868365b3a8636a468c4d12b20a221f5b7602de9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde(a)gmail.com> -Date: Mon, 12 Oct 2020 11:21:05 +0200 -Subject: [PATCH 2/2] CMake: Use VERSION/SOVERSION for all shared libs - ---- - SPIRV/CMakeLists.txt | 14 ++++++++++---- - StandAlone/CMakeLists.txt | 7 +++++-- - hlsl/CMakeLists.txt | 7 +++++-- - 3 files changed, 20 insertions(+), 8 deletions(-) - -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index d699dadd..55d77c45 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -69,8 +69,11 @@ set(SPVREMAP_HEADERS - doc.h) - - add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) --set_property(TARGET SPIRV PROPERTY FOLDER glslang) --set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) -+set_target_properties(SPIRV PROPERTIES -+ FOLDER glslang -+ POSITION_INDEPENDENT_CODE ON -+ VERSION "${GLSLANG_VERSION}" -+ SOVERSION "${GLSLANG_VERSION_MAJOR}") - target_include_directories(SPIRV PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..> - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) -@@ -79,8 +82,11 @@ glslang_add_build_info_dependency(SPIRV) - - if (ENABLE_SPVREMAPPER) - add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) -- set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) -- set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) -+ set_target_properties(SPVRemapper PROPERTIES -+ FOLDER glslang -+ POSITION_INDEPENDENT_CODE ON -+ VERSION "${GLSLANG_VERSION}" -+ SOVERSION "${GLSLANG_VERSION_MAJOR}") - endif() - - if(WIN32 AND BUILD_SHARED_LIBS) -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index a2009165..6ff5e65b 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -34,8 +34,11 @@ - add_library(glslang-default-resource-limits STATIC - ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp) --set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) --set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) -+set_target_properties(glslang-default-resource-limits PROPERTIES -+ FOLDER glslang -+ POSITION_INDEPENDENT_CODE ON -+ VERSION "${GLSLANG_VERSION}" -+ SOVERSION "${GLSLANG_VERSION_MAJOR}") - - target_include_directories(glslang-default-resource-limits - PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> -diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt -index 62faa195..a5472e7e 100644 ---- a/hlsl/CMakeLists.txt -+++ b/hlsl/CMakeLists.txt -@@ -38,8 +38,11 @@ - # projects that referenced this target. - - add_library(HLSL ${LIB_TYPE} "stub.cpp") --set_property(TARGET HLSL PROPERTY FOLDER hlsl) --set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON) -+set_target_properties(HLSL PROPERTIES -+ FOLDER hlsl -+ POSITION_INDEPENDENT_CODE ON -+ VERSION "${GLSLANG_VERSION}" -+ SOVERSION "${GLSLANG_VERSION_MAJOR}") - - if(WIN32 AND BUILD_SHARED_LIBS) - set_target_properties(HLSL PROPERTIES PREFIX "") --- -2.28.0 - diff --git a/glslang/0002-cmake-Use-the-same-export-config-for-all-installed-t.patch b/glslang/0002-cmake-Use-the-same-export-config-for-all-installed-t.patch deleted file mode 100644 index 0142ba17d..000000000 --- a/glslang/0002-cmake-Use-the-same-export-config-for-all-installed-t.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 721a4218fa84604f07f3880971dcd1a473d01331 Mon Sep 17 00:00:00 2001 -From: Sandy Carter <bwrsandman(a)gmail.com> -Date: Sat, 16 Nov 2019 09:49:56 +0100 -Subject: [PATCH 2/2] cmake: Use the same export config for all installed - targets - -Fix issue with finding configuration exports by using the same -configuration as glslang. -The namespace allows for different targets to be used: -``` -target_link_libraries(example PRIVATE glslang::OGLCompiler) -add_custom_target(validator-version COMMAND glslang::glslangValidator -v) -``` ---- - OGLCompilersDLL/CMakeLists.txt | 3 +-- - SPIRV/CMakeLists.txt | 14 ++++---------- - StandAlone/CMakeLists.txt | 9 +++------ - glslang/OSDependent/Unix/CMakeLists.txt | 7 +++---- - glslang/OSDependent/Windows/CMakeLists.txt | 3 +-- - hlsl/CMakeLists.txt | 5 ++--- - 6 files changed, 14 insertions(+), 27 deletions(-) - -diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt -index 0b007d45..dcd014e8 100644 ---- a/OGLCompilersDLL/CMakeLists.txt -+++ b/OGLCompilersDLL/CMakeLists.txt -@@ -42,7 +42,6 @@ if(WIN32) - endif(WIN32) - - if(ENABLE_GLSLANG_INSTALL) -- install(TARGETS OGLCompiler EXPORT OGLCompilerTargets -+ install(TARGETS OGLCompiler EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- install(EXPORT OGLCompilerTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/SPIRV/CMakeLists.txt b/SPIRV/CMakeLists.txt -index d699dadd..014348bb 100644 ---- a/SPIRV/CMakeLists.txt -+++ b/SPIRV/CMakeLists.txt -@@ -111,28 +111,22 @@ endif(WIN32) - if(ENABLE_GLSLANG_INSTALL) - if(BUILD_SHARED_LIBS) - if (ENABLE_SPVREMAPPER) -- install(TARGETS SPVRemapper EXPORT SPVRemapperTargets -+ install(TARGETS SPVRemapper EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() -- install(TARGETS SPIRV EXPORT SPIRVTargets -+ install(TARGETS SPIRV EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - else() - if (ENABLE_SPVREMAPPER) -- install(TARGETS SPVRemapper EXPORT SPVRemapperTargets -+ install(TARGETS SPVRemapper EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() -- install(TARGETS SPIRV EXPORT SPIRVTargets -+ install(TARGETS SPIRV EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - -- if (ENABLE_SPVREMAPPER) -- install(EXPORT SPVRemapperTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) -- endif() -- -- install(EXPORT SPIRVTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) -- - install(FILES ${HEADERS} ${SPVREMAP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glslang/SPIRV/) - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt -index 8038c043..480cdec9 100644 ---- a/StandAlone/CMakeLists.txt -+++ b/StandAlone/CMakeLists.txt -@@ -83,19 +83,16 @@ if(WIN32) - endif(WIN32) - - if(ENABLE_GLSLANG_INSTALL) -- install(TARGETS glslangValidator EXPORT glslangValidatorTargets -+ install(TARGETS glslangValidator EXPORT glslangConfig - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -- install(EXPORT glslangValidatorTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - - if(ENABLE_SPVREMAPPER) -- install(TARGETS spirv-remap EXPORT spirv-remapTargets -+ install(TARGETS spirv-remap EXPORT glslangConfig - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -- install(EXPORT spirv-remapTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif() - - if(BUILD_SHARED_LIBS) -- install(TARGETS glslang-default-resource-limits EXPORT glslang-default-resource-limitsTargets -+ install(TARGETS glslang-default-resource-limits EXPORT glslangConfig - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- install(EXPORT glslang-default-resource-limitsTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif() - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt -index 354a3e97..a7c2ea3c 100644 ---- a/glslang/OSDependent/Unix/CMakeLists.txt -+++ b/glslang/OSDependent/Unix/CMakeLists.txt -@@ -44,16 +44,15 @@ if(${CMAKE_VERSION} VERSION_LESS "3.1.0" OR CMAKE_CROSSCOMPILING) - # Also needed when cross-compiling to work around - # https://gitlab.kitware.com/cmake/cmake/issues/16920 - find_package(Threads) -- target_link_libraries(OSDependent ${CMAKE_THREAD_LIBS_INIT}) -+ target_link_libraries(OSDependent PRIVATE ${CMAKE_THREAD_LIBS_INIT}) - else() - # This is the recommended way, so we use it for 3.1+. - set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads) -- target_link_libraries(OSDependent Threads::Threads) -+ target_link_libraries(OSDependent PRIVATE Threads::Threads) - endif() - - if(ENABLE_GLSLANG_INSTALL) -- install(TARGETS OSDependent EXPORT OSDependentTargets -+ install(TARGETS OSDependent EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/glslang/OSDependent/Windows/CMakeLists.txt b/glslang/OSDependent/Windows/CMakeLists.txt -index 9cf1b7fb..4271596d 100644 ---- a/glslang/OSDependent/Windows/CMakeLists.txt -+++ b/glslang/OSDependent/Windows/CMakeLists.txt -@@ -48,7 +48,6 @@ if(WIN32) - endif(WIN32) - - if(ENABLE_GLSLANG_INSTALL) -- install(TARGETS OSDependent EXPORT OSDependentTargets -+ install(TARGETS OSDependent EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- install(EXPORT OSDependentTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif(ENABLE_GLSLANG_INSTALL) -diff --git a/hlsl/CMakeLists.txt b/hlsl/CMakeLists.txt -index 62faa195..65b75e80 100644 ---- a/hlsl/CMakeLists.txt -+++ b/hlsl/CMakeLists.txt -@@ -47,13 +47,12 @@ endif() - - if(ENABLE_GLSLANG_INSTALL) - if(BUILD_SHARED_LIBS) -- install(TARGETS HLSL EXPORT HLSLTargets -+ install(TARGETS HLSL EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - else() -- install(TARGETS HLSL EXPORT HLSLTargets -+ install(TARGETS HLSL EXPORT glslangConfig - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() -- install(EXPORT HLSLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - endif(ENABLE_GLSLANG_INSTALL) --- -2.28.0 - diff --git a/glslang/Pkgfile b/glslang/Pkgfile index 741b6fd96..b650115c8 100644 --- a/glslang/Pkgfile +++ b/glslang/Pkgfile @@ -4,30 +4,19 @@ # Depends on: spirv-tools name=glslang -version=11.0.0-bacaef3 +version=11.0.0-c594de2 release=1 source=( #https://github.com/KhronosGroup/glslang/archive/$version/$name-$version.tar.gz - https://github.com/KhronosGroup/glslang/archive/bacaef3237c515e40d1a24722be… - 0001-CMake-Allow-linking-against-system-installed-SPIRV-T.patch - 0001-CMake-Make-glslang-default-resource-limits-STATIC.patch - 0002-CMake-Use-VERSION-SOVERSION-for-all-shared-libs.patch - 0001-glslang-Rename-and-move-cmake-export.patch - 0002-cmake-Use-the-same-export-config-for-all-installed-t.patch) + https://github.com/KhronosGroup/glslang/archive/c594de23cdd790d64ad5f9c8b05… + glslang-default-resource-limits_staticlib.patch + 0001-pkg-config-compatibility.patch) build() { - mv $name-bacaef3237c515e40d1a24722be48c0a0b30f75f $name-$version + mv $name-c594de23cdd790d64ad5f9c8b059baae0ee2941d $name-$version - # https://github.com/KhronosGroup/glslang/pull/1621 - patch -d $name-$version -p1 -i $SRC/0001-CMake-Allow-linking-against-system-installed-SPIRV-T.patch - - # https://github.com/KhronosGroup/glslang/pull/2419 - patch -d $name-$version -p1 -i $SRC/0001-CMake-Make-glslang-default-resource-limits-STATIC.patch - patch -d $name-$version -p1 -i $SRC/0002-CMake-Use-VERSION-SOVERSION-for-all-shared-libs.patch - - # https://github.com/KhronosGroup/glslang/pull/1978 - patch -d $name-$version -p1 -i $SRC/0001-glslang-Rename-and-move-cmake-export.patch - patch -d $name-$version -p1 -i $SRC/0002-cmake-Use-the-same-export-config-for-all-installed-t.patch + patch -d $name-$version -p1 -i $SRC/glslang-default-resource-limits_staticlib.patch + patch -d $name-$version -p1 -i $SRC/0001-pkg-config-compatibility.patch local config=" -S$name-$version \ diff --git a/glslang/glslang-default-resource-limits_staticlib.patch b/glslang/glslang-default-resource-limits_staticlib.patch new file mode 100644 index 000000000..94693296a --- /dev/null +++ b/glslang/glslang-default-resource-limits_staticlib.patch @@ -0,0 +1,12 @@ +diff -up glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt.dma glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt +--- glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt.dma 2020-08-04 13:49:34.201893471 +1000 ++++ glslang-5743eed4d16757402517a1068137f4bc1645ee87/StandAlone/CMakeLists.txt 2020-08-04 13:49:40.622063592 +1000 +@@ -31,7 +31,7 @@ + # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + # POSSIBILITY OF SUCH DAMAGE. + +-add_library(glslang-default-resource-limits ++add_library(glslang-default-resource-limits STATIC + ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/resource_limits_c.cpp) + set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)

1 0

ports/opt (3.6): vulkan-loader: 1.2.154.0 -> 1.2.162.0
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit f72efc93c69e9fd72a7ac3631658a6524f4f217a Author: Danny Rawlins <contact(a)romster.me> Date: Sun Feb 28 00:21:13 2021 +1100 vulkan-loader: 1.2.154.0 -> 1.2.162.0 diff --git a/vulkan-loader/.footprint b/vulkan-loader/.footprint index 5835d53c8..21b360e19 100644 --- a/vulkan-loader/.footprint +++ b/vulkan-loader/.footprint @@ -1,7 +1,7 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libvulkan.so -> libvulkan.so.1 -lrwxrwxrwx root/root usr/lib/libvulkan.so.1 -> libvulkan.so.1.2.154 --rwxr-xr-x root/root usr/lib/libvulkan.so.1.2.154 +lrwxrwxrwx root/root usr/lib/libvulkan.so.1 -> libvulkan.so.1.2.162 +-rwxr-xr-x root/root usr/lib/libvulkan.so.1.2.162 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/vulkan.pc diff --git a/vulkan-loader/.signature b/vulkan-loader/.signature index cf54a484b..d3835346f 100644 --- a/vulkan-loader/.signature +++ b/vulkan-loader/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XZzvne3ZhNSYL//ZM/JMpUOwAlw7ddlluNMwt4N7i0A/qpmHUbqHhvtncJxNHvhTT1k6IB3IPNzD/U9Pov0Ogc= -SHA256 (Pkgfile) = 168d3b511297f39980c32d170b96f669f26f64f35db7299e2d5626def061e2b4 -SHA256 (.footprint) = af7e63f64dd91074d8024bf68de7d3b0ab929a5776c1d786aa0cb5498e12e4b6 -SHA256 (Vulkan-Loader-sdk-1.2.154.0.tar.gz) = 418017d7bab907e72291476df231dd0e7dc7fe20b97e55389c975bcfc48d6433 +RWSE3ohX2g5d/QzDnmFzjhPvNK9f4t1k/CdBTUMNpejZh5/OeEn0ijIt2S5Rxv6sORIUO4Lx1MuoKTRbzxjKI1HFKEmQ8o3cBwo= +SHA256 (Pkgfile) = 2a23a15f53fc2dbb824347eadd02fde8c60667ff9984acfc9a26fc1584256382 +SHA256 (.footprint) = 5813d5857dc76fde9827dcb8b807af89dd9e313afd60fddce10eb86e0db956fd +SHA256 (Vulkan-Loader-sdk-1.2.162.0.tar.gz) = f8f5ec2485e7fdba3f58c1cde5a25145ece1c6a686c91ba4016b28c0af3f21dd diff --git a/vulkan-loader/Pkgfile b/vulkan-loader/Pkgfile index a7fccad9e..2831da04e 100644 --- a/vulkan-loader/Pkgfile +++ b/vulkan-loader/Pkgfile @@ -4,7 +4,7 @@ # Depends on: vulkan-headers xorg-libxrandr name=vulkan-loader -version=1.2.154.0 +version=1.2.162.0 release=1 source=(https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$version/…

1 0

ports/opt (3.6): vulkan-headers: 1.2.154.0 -> 1.2.162.0
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit 58b4912af438d8bfee7d06e53075dcfbd99a3faf Author: Danny Rawlins <contact(a)romster.me> Date: Sun Feb 28 00:20:45 2021 +1100 vulkan-headers: 1.2.154.0 -> 1.2.162.0 diff --git a/vulkan-headers/.signature b/vulkan-headers/.signature index 3ab770262..6c69bb808 100644 --- a/vulkan-headers/.signature +++ b/vulkan-headers/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/bfjhpgpSG+vpELZZBRlbZCkaPTiOxDZo3WsSY3utORqHvRg5OwV9ZejySxvygOAa/Vu4Ir7HiizBwAkXqzVBQY= -SHA256 (Pkgfile) = 35ca98da3e1b6802a1119fdb6b118de5c554facb2db99f0939007148b7107a6a +RWSE3ohX2g5d/V2VKkZttb5zgbLpV/GNBhhIP/qyBvGjS44Z3EyrZMAbws11tYlob5b/ECUn4t0i6LEzq9C3rAl1q365YlcHJgI= +SHA256 (Pkgfile) = 69c288170a4bc5cbcac643fc76c0f14906f35df756872c97f05b31b09fa078b1 SHA256 (.footprint) = effd18e132c150c8a69399e92fd4eeed22b5271d37121dd6248212ff0043d3d5 -SHA256 (Vulkan-Headers-sdk-1.2.154.0.tar.gz) = a0528ade4dd3bd826b960ba4ccabc62e92ecedc3c70331b291e0a7671b3520f9 +SHA256 (Vulkan-Headers-sdk-1.2.162.0.tar.gz) = eb0f6a79ac38e137f55a0e13641140e63b765c8ec717a65bf3904614ef754365 diff --git a/vulkan-headers/Pkgfile b/vulkan-headers/Pkgfile index 83b4639f5..e327a8c84 100644 --- a/vulkan-headers/Pkgfile +++ b/vulkan-headers/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cmake ninja name=vulkan-headers -version=1.2.154.0 +version=1.2.162.0 release=1 source=(https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$version…

1 0

ports/opt (3.6): freerdp2: 2.2.0 -> 2.3.0
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit 5fcc25e6cac3fbfde0a01b798fff781e13716417 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Feb 27 11:01:02 2021 +0000 freerdp2: 2.2.0 -> 2.3.0 diff --git a/freerdp2/.footprint b/freerdp2/.footprint index fb33a42c5..c91f7297a 100644 --- a/freerdp2/.footprint +++ b/freerdp2/.footprint @@ -26,6 +26,7 @@ drwxr-xr-x root/root usr/include/freerdp2/freerdp/channels/ -rw-r--r-- root/root usr/include/freerdp2/freerdp/channels/channels.h -rw-r--r-- root/root usr/include/freerdp2/freerdp/channels/cliprdr.h -rw-r--r-- root/root usr/include/freerdp2/freerdp/channels/disp.h +-rw-r--r-- root/root usr/include/freerdp2/freerdp/channels/echo.h -rw-r--r-- root/root usr/include/freerdp2/freerdp/channels/encomsp.h -rw-r--r-- root/root usr/include/freerdp2/freerdp/channels/geometry.h -rw-r--r-- root/root usr/include/freerdp2/freerdp/channels/log.h @@ -241,17 +242,17 @@ drwxr-xr-x root/root usr/lib/cmake/WinPR2/ -rw-r--r-- root/root usr/lib/cmake/WinPR2/WinPRTargets-release.cmake -rw-r--r-- root/root usr/lib/cmake/WinPR2/WinPRTargets.cmake lrwxrwxrwx root/root usr/lib/libfreerdp-client2.so -> libfreerdp-client2.so.2 -lrwxrwxrwx root/root usr/lib/libfreerdp-client2.so.2 -> libfreerdp-client2.so.2.2.0 --rwxr-xr-x root/root usr/lib/libfreerdp-client2.so.2.2.0 +lrwxrwxrwx root/root usr/lib/libfreerdp-client2.so.2 -> libfreerdp-client2.so.2.3.0 +-rwxr-xr-x root/root usr/lib/libfreerdp-client2.so.2.3.0 lrwxrwxrwx root/root usr/lib/libfreerdp2.so -> libfreerdp2.so.2 -lrwxrwxrwx root/root usr/lib/libfreerdp2.so.2 -> libfreerdp2.so.2.2.0 --rwxr-xr-x root/root usr/lib/libfreerdp2.so.2.2.0 +lrwxrwxrwx root/root usr/lib/libfreerdp2.so.2 -> libfreerdp2.so.2.3.0 +-rwxr-xr-x root/root usr/lib/libfreerdp2.so.2.3.0 lrwxrwxrwx root/root usr/lib/libwinpr-tools2.so -> libwinpr-tools2.so.2 -lrwxrwxrwx root/root usr/lib/libwinpr-tools2.so.2 -> libwinpr-tools2.so.2.2.0 --rwxr-xr-x root/root usr/lib/libwinpr-tools2.so.2.2.0 +lrwxrwxrwx root/root usr/lib/libwinpr-tools2.so.2 -> libwinpr-tools2.so.2.3.0 +-rwxr-xr-x root/root usr/lib/libwinpr-tools2.so.2.3.0 lrwxrwxrwx root/root usr/lib/libwinpr2.so -> libwinpr2.so.2 -lrwxrwxrwx root/root usr/lib/libwinpr2.so.2 -> libwinpr2.so.2.2.0 --rwxr-xr-x root/root usr/lib/libwinpr2.so.2.2.0 +lrwxrwxrwx root/root usr/lib/libwinpr2.so.2 -> libwinpr2.so.2.3.0 +-rwxr-xr-x root/root usr/lib/libwinpr2.so.2.3.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/freerdp-client2.pc -rw-r--r-- root/root usr/lib/pkgconfig/freerdp2.pc diff --git a/freerdp2/.signature b/freerdp2/.signature index 98699515e..ff82585c2 100644 --- a/freerdp2/.signature +++ b/freerdp2/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/S69nDrIed4tat6x+zNOes99qkgOI9I5w8dlVSfmhJRQYbTg2coe7nN2b1uMIi3nFmWmhyXq3dNTjpkxziISSgc= -SHA256 (Pkgfile) = b2c3b7df1291bd3e3830686f3cca3c658bccd0df64cd2380d38069f16b27240a -SHA256 (.footprint) = f114c4f412edec10c6966bc706fe69865efb247663d80266db326b1b09cef0e2 -SHA256 (freerdp-2.2.0.tar.gz) = 19b30759e324ce7a9767af880116a4c571761e9ad9c5d6c98c5b302ff8c24c6c +RWSE3ohX2g5d/T1zHGnwx71tBlXxSteLCar6f0PEHoj7cXtp9QFS0UmdA4nfg0LblJ0XC9T5oyB9nN9KDOgHi+OaojFtxBuoggI= +SHA256 (Pkgfile) = 0ad7567a60e767b4f7701314d6d7fa73fecc17e1c024bb351bed5938a1728787 +SHA256 (.footprint) = 197a1e6c55644880e58ad29f387ef7664908c6531ba6813eca189b66a540461b +SHA256 (freerdp-2.3.0.tar.gz) = 94ee88f56b344c7f960d6805ea2db8b1deba3c8f609db097e08ccdf6bdf9bd78 diff --git a/freerdp2/Pkgfile b/freerdp2/Pkgfile index 564d0f876..c789e6eb6 100644 --- a/freerdp2/Pkgfile +++ b/freerdp2/Pkgfile @@ -2,10 +2,10 @@ # URL: https://www.freerdp.com/ # Maintainer: CRUX System Team, core-ports at crux dot nu # Depends on: cmake glib xorg-libxcursor xorg-libxinerama xorg-libxkbfile xorg-libxrandr xorg-libxv -# Optional: ffmpeg gst-plugins-base alsa-lib cups directfb neon pulseaudio xmlto +# Optional: alsa-lib cups directfb ffmpeg gst-plugins-base neon pulseaudio wayland xmlto name=freerdp2 -version=2.2.0 +version=2.3.0 release=1 source=(https://pub.freerdp.com/releases/freerdp-$version.tar.gz) @@ -19,7 +19,7 @@ build() { -D WITH_SERVER=OFF \ -D WITH_CLIENT=ON \ -D WITH_LIBSYSTEMD=OFF \ - -D WITH_WAYLAND=OFF + -Wno-dev cmake --build build DESTDIR=$PKG cmake --install build }

1 0

ports/contrib (3.6): rstudio: 1.4.1103 -> 1.4.1106
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit f33fd81b29587b23782ef1328e2d83acc1fe4979 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Feb 27 11:00:10 2021 +0000 rstudio: 1.4.1103 -> 1.4.1106 diff --git a/rstudio/.footprint b/rstudio/.footprint index c74f8a67d..ce0013a42 100644 --- a/rstudio/.footprint +++ b/rstudio/.footprint @@ -456,14 +456,14 @@ drwxr-xr-x root/root usr/lib/rstudio/resources/tutorial_resources/ -rw-r--r-- root/root usr/lib/rstudio/resources/xref.lua -rw-r--r-- root/root usr/lib/rstudio/rstudio.png drwxr-xr-x root/root usr/lib/rstudio/www-symbolmaps/ --rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/0B10146D1C2B73ED6C0B2E9267C32AAA.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/2C9A040B96954B30F1931679EA2CBFC7.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/6408246100061F8367B7B4A1A526C5DF.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/648A672E931A37E7C7454648926CC401.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/B4BBF0B0BB7B490C8CAFB2334A3211FA.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/C179084576ECBF78880CB2E6FE34F38B.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/C358FD784BBB977D27ECC12828752DCF.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/ED967DA2F7ECC0E17DE712DC0F3ED6CF.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/16A6B2C63746E6D728E729D12D7E885F.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/1A0E4CF63FDCDF0BF7D65600A29DC4F5.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/5A84B2579723BCA1A4F23A33C377D455.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/7BE538A7C7353257B2A0DF9DADD2CBEF.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/8D09EB45EF563E162A065F0CC75483BB.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/DDDF1B3C6ACE2E57EDAD31360DCE55D1.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/EFDE0C171559995BE3BC27A40217657C.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www-symbolmaps/F0D4CD66232244B0A6993511A53C446E.symbolMap drwxr-xr-x root/root usr/lib/rstudio/www/ -rw-r--r-- root/root usr/lib/rstudio/www/.gitignore -rw-r--r-- root/root usr/lib/rstudio/www/404.htm @@ -473,14 +473,14 @@ drwxr-xr-x root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/ drwxr-xr-x root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/rpcPolicyManifest/ -rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/rpcPolicyManifest/manifest.txt drwxr-xr-x root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/ --rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/0B10146D1C2B73ED6C0B2E9267C32AAA.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/2C9A040B96954B30F1931679EA2CBFC7.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/6408246100061F8367B7B4A1A526C5DF.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/648A672E931A37E7C7454648926CC401.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/B4BBF0B0BB7B490C8CAFB2334A3211FA.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/C179084576ECBF78880CB2E6FE34F38B.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/C358FD784BBB977D27ECC12828752DCF.symbolMap --rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/ED967DA2F7ECC0E17DE712DC0F3ED6CF.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/16A6B2C63746E6D728E729D12D7E885F.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/1A0E4CF63FDCDF0BF7D65600A29DC4F5.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/5A84B2579723BCA1A4F23A33C377D455.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/7BE538A7C7353257B2A0DF9DADD2CBEF.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/8D09EB45EF563E162A065F0CC75483BB.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/DDDF1B3C6ACE2E57EDAD31360DCE55D1.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/EFDE0C171559995BE3BC27A40217657C.symbolMap +-rw-r--r-- root/root usr/lib/rstudio/www/WEB-INF/deploy/rstudio/symbolMaps/F0D4CD66232244B0A6993511A53C446E.symbolMap drwxr-xr-x root/root usr/lib/rstudio/www/css/ -rw-r--r-- root/root usr/lib/rstudio/www/css/data.css -rw-r--r-- root/root usr/lib/rstudio/www/css/focus-visible.css @@ -529,10 +529,10 @@ drwxr-xr-x root/root usr/lib/rstudio/www/js/workers/ -rw-r--r-- root/root usr/lib/rstudio/www/rstudio.css drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/ -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/08D39E99E37116919A319FD90BD38C0E.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/0B10146D1C2B73ED6C0B2E9267C32AAA.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/0EB630DA15DFEC65FEFAF62A99058722.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/16A6B2C63746E6D728E729D12D7E885F.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/1A0E4CF63FDCDF0BF7D65600A29DC4F5.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/1D1FF86B2B185D08BD1761C4692239BF.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/2C9A040B96954B30F1931679EA2CBFC7.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/339D7523F4193E7F5E986EB3E4A315E5.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/3A832DE5313E0710510250E024CE01E0.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/3C918A3F295653EFAD61B2A1CD1783A8.cache.js @@ -541,264 +541,264 @@ drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/ -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/44A535C08AF4AF2CEADECC0E538AD04B.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/4D4C9940E9159570E36F67B65E5ABD5D.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/5A17F4C6542C56905E3FF996A2A664D0.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/5A84B2579723BCA1A4F23A33C377D455.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/5B69FC9A48786232C983FE13456B9BB9.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/6408246100061F8367B7B4A1A526C5DF.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/648A672E931A37E7C7454648926CC401.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/7BE538A7C7353257B2A0DF9DADD2CBEF.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/8D09EB45EF563E162A065F0CC75483BB.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/8F7951420339BE404651DAC70BD1C264.cache.css -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/96E2166E8CB10B92485546FF6789922C.cache.png -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/A17593807FCAEB404A8229B8F38A0694.cache.css -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/A2EB630241A0BFE0FC6785A80D600916.cache.png -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/AC5AADB35BD3AFF301FEFC583AAFE0E0.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/B4BBF0B0BB7B490C8CAFB2334A3211FA.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/C179084576ECBF78880CB2E6FE34F38B.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/C358FD784BBB977D27ECC12828752DCF.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/D1DF04970C14BB86C5A411196E422096.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/DDDF1B3C6ACE2E57EDAD31360DCE55D1.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/ED34C7284F6CF0E08BB61C4820E7F279.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/ED967DA2F7ECC0E17DE712DC0F3ED6CF.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/EFDE0C171559995BE3BC27A40217657C.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/F0D4CD66232244B0A6993511A53C446E.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/FEE9FF2946A84AC5E9485866BBA1759E.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/clear.cache.gif -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/compilation-mappings.txt drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/ -drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/ --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/1.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/10.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/11.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/12.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/13.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/14.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/15.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/16.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/17.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/18.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/19.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/2.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/20.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/21.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/22.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/23.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/24.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/25.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/26.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/27.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/28.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/29.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/3.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/4.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/5.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/6.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/7.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/8.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/0B10146D1C2B73ED6C0B2E9267C32AAA/9.cache.js -drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/ --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/1.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/10.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/11.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/12.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/13.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/14.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/15.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/16.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/17.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/18.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/19.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/2.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/20.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/21.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/22.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/23.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/24.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/25.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/26.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/27.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/28.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/29.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/3.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/4.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/5.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/6.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/7.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/8.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/2C9A040B96954B30F1931679EA2CBFC7/9.cache.js -drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/ --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/1.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/10.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/11.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/12.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/13.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/14.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/15.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/16.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/17.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/18.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/19.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/2.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/20.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/21.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/22.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/23.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/24.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/25.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/26.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/27.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/28.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/29.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/3.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/4.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/5.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/6.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/7.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/8.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/6408246100061F8367B7B4A1A526C5DF/9.cache.js -drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/ --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/1.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/10.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/11.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/12.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/13.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/14.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/15.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/16.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/17.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/18.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/19.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/2.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/20.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/21.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/22.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/23.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/24.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/25.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/26.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/27.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/28.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/29.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/3.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/4.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/5.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/6.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/7.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/8.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/648A672E931A37E7C7454648926CC401/9.cache.js -drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/ --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/1.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/10.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/11.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/12.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/13.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/14.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/15.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/16.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/17.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/18.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/19.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/2.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/20.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/21.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/22.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/23.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/24.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/25.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/26.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/27.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/28.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/29.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/3.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/4.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/5.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/6.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/7.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/8.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/B4BBF0B0BB7B490C8CAFB2334A3211FA/9.cache.js -drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/ --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/1.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/10.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/11.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/12.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/13.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/14.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/15.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/16.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/17.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/18.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/19.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/2.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/20.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/21.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/22.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/23.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/24.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/25.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/26.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/27.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/28.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/29.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/3.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/4.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/5.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/6.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/7.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/8.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C179084576ECBF78880CB2E6FE34F38B/9.cache.js -drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/ --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/1.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/10.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/11.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/12.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/13.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/14.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/15.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/16.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/17.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/18.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/19.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/2.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/20.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/21.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/22.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/23.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/24.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/25.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/26.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/27.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/28.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/29.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/3.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/4.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/5.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/6.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/7.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/8.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/C358FD784BBB977D27ECC12828752DCF/9.cache.js -drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/ --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/1.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/10.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/11.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/12.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/13.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/14.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/15.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/16.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/17.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/18.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/19.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/2.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/20.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/21.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/22.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/23.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/24.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/25.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/26.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/27.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/28.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/29.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/3.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/4.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/5.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/6.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/7.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/8.cache.js --rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/ED967DA2F7ECC0E17DE712DC0F3ED6CF/9.cache.js +drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/ +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/1.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/10.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/11.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/12.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/13.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/14.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/15.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/16.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/17.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/18.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/19.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/2.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/20.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/21.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/22.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/23.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/24.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/25.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/26.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/27.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/28.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/29.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/3.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/4.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/5.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/6.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/7.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/8.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/16A6B2C63746E6D728E729D12D7E885F/9.cache.js +drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/ +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/1.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/10.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/11.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/12.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/13.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/14.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/15.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/16.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/17.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/18.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/19.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/2.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/20.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/21.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/22.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/23.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/24.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/25.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/26.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/27.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/28.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/29.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/3.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/4.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/5.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/6.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/7.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/8.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/1A0E4CF63FDCDF0BF7D65600A29DC4F5/9.cache.js +drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/ +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/1.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/10.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/11.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/12.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/13.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/14.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/15.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/16.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/17.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/18.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/19.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/2.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/20.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/21.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/22.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/23.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/24.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/25.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/26.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/27.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/28.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/29.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/3.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/4.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/5.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/6.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/7.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/8.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/5A84B2579723BCA1A4F23A33C377D455/9.cache.js +drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/ +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/1.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/10.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/11.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/12.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/13.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/14.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/15.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/16.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/17.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/18.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/19.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/2.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/20.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/21.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/22.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/23.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/24.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/25.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/26.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/27.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/28.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/29.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/3.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/4.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/5.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/6.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/7.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/8.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/7BE538A7C7353257B2A0DF9DADD2CBEF/9.cache.js +drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/ +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/1.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/10.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/11.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/12.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/13.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/14.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/15.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/16.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/17.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/18.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/19.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/2.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/20.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/21.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/22.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/23.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/24.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/25.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/26.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/27.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/28.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/29.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/3.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/4.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/5.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/6.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/7.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/8.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/8D09EB45EF563E162A065F0CC75483BB/9.cache.js +drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/ +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/1.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/10.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/11.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/12.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/13.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/14.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/15.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/16.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/17.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/18.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/19.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/2.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/20.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/21.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/22.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/23.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/24.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/25.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/26.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/27.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/28.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/29.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/3.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/4.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/5.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/6.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/7.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/8.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/DDDF1B3C6ACE2E57EDAD31360DCE55D1/9.cache.js +drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/ +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/1.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/10.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/11.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/12.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/13.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/14.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/15.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/16.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/17.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/18.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/19.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/2.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/20.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/21.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/22.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/23.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/24.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/25.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/26.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/27.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/28.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/29.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/3.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/4.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/5.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/6.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/7.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/8.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/EFDE0C171559995BE3BC27A40217657C/9.cache.js +drwxr-xr-x root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/ +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/1.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/10.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/11.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/12.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/13.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/14.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/15.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/16.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/17.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/18.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/19.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/2.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/20.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/21.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/22.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/23.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/24.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/25.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/26.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/27.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/28.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/29.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/3.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/4.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/5.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/6.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/7.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/8.cache.js +-rw-r--r-- root/root usr/lib/rstudio/www/rstudio/deferredjs/F0D4CD66232244B0A6993511A53C446E/9.cache.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/rstudio.devmode.js -rw-r--r-- root/root usr/lib/rstudio/www/rstudio/rstudio.nocache.js drwxr-xr-x root/root usr/lib/rstudio/www/templates/ diff --git a/rstudio/.signature b/rstudio/.signature index 31de7f51a..a92e529a4 100644 --- a/rstudio/.signature +++ b/rstudio/.signature @@ -1,8 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+ywlAfxQuQMC+IV6pwystqnCX2fdOsbbCrVP1VcOSpfVGtUTCrYeNeGxXWjLYeCG/ji5897nsNBb3XmtQxRdQY= -SHA256 (Pkgfile) = dce17c9650ed61cf32362024e392cca69b57e603dbfd37a254ec87f2998bcf8a -SHA256 (.footprint) = ec1ade874875c3d22b9a27ee234801f60b053783592cfa2e52a01894e1b5b343 -SHA256 (rstudio-1.4.1103.tar.gz) = e448aaaf7ac7f4fd97197250762bfd28195c71abfd67db6f952463dea552be4c +RWSagIOpLGJF396kXPIMRcrW8Pyx/+4mIT4QtMaT9UBi6yuoy+5/kl6IBpSrpd90IkcRrA6CY0t/Z3dICF34mnK3V9kZUu31NQk= +SHA256 (Pkgfile) = ce065fbc10fe1452aa4622f868b354c043de3cfb300f1a8652b7047e3d5219a6 +SHA256 (.footprint) = ce05501698260ee12ebf829749120c1d7d6abd6315a0210da2598c65b45a7bd4 +SHA256 (rstudio-1.4.1106.tar.gz) = ac84f77529501ea13f0708f0e8726b0bdfb592cd9217e869a0099031f9a888b8 SHA256 (rstudio-1.2.5042-boost-1.73.0.patch) = 5d282059731b64579c0f8c8eeb280b4c4efe810ce829ad7332385b0a92e1215e SHA256 (rstudio-1.3.1056-boost-1.74.0.patch) = e952b6f55b0ffa7eab7ba6fca8126dd8202f37b84687d97bbd1d9d324a099065 -SHA256 (pandoc-version.patch) = 0e52dc1cafeec3e19a34a8f3bbd80dd9d2d99541360a4274ee1ac57163730c52 diff --git a/rstudio/Pkgfile b/rstudio/Pkgfile index 8122b0ac9..370649c2e 100644 --- a/rstudio/Pkgfile +++ b/rstudio/Pkgfile @@ -4,13 +4,12 @@ # Depends on: ant boost hyphen libevent libsoci mathjax nodejs openjdk8 pandoc-bin qtwebengine r name=rstudio -version=1.4.1103 +version=1.4.1106 release=1 source=(https://github.com/rstudio/rstudio/archive/v$version/$name-$version… # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-mathematics/rstudio/files - rstudio-1.2.5042-boost-1.73.0.patch rstudio-1.3.1056-boost-1.74.0.patch - pandoc-version.patch) + rstudio-1.2.5042-boost-1.73.0.patch rstudio-1.3.1056-boost-1.74.0.patch) git=(https://github.com/rstudio/rstudio.git) build() { @@ -20,8 +19,6 @@ build() { patch -Np1 -d $name-$version -i $SRC/rstudio-1.2.5042-boost-1.73.0.patch patch -Np1 -d $name-$version -i $SRC/rstudio-1.3.1056-boost-1.74.0.patch - # it's probing for an old pandoc-version, fixing that - patch -Np1 -d $name-$version -i $SRC/pandoc-version.patch export R_LIBS_USER="$PKG/usr/lib/R/library/" @@ -29,7 +26,7 @@ build() { install -d pandoc node/10.19.0/bin ln -sfT /usr/share/myspell/dicts dictionaries ln -sfT /usr/share/mathjax mathjax-27 - ln -sfT /usr/bin/ "pandoc/2.11.3.2" + ln -sfT /usr/bin/ "pandoc/2.11.4" ln -sfT /usr/bin/node node/10.19.0/bin/node bash install-packages unset pandoc_version)

1 0

ports/opt (3.6): i3: update to 4.19.2
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit eb2069b0bb1882e7df68d15c9c60a546e53f6212 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Feb 27 11:45:25 2021 +0100 i3: update to 4.19.2 diff --git a/i3/.signature b/i3/.signature index aa5d908bb..e6e67c091 100644 --- a/i3/.signature +++ b/i3/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RtxRZ7qioeTDr4gTOp35qe0dVSQ6aycTNAvtOXpfQRfRhYcaQb1c89BxIs6rCSRQ24JyQZ3M4v0rtyGH0h+tAw= -SHA256 (Pkgfile) = def44556a26c9d4cd0e2a6f3f9c435ded9282f8ac708922e70627eb0e05cbc8c +RWSE3ohX2g5d/Y/gxEgxM3DS68208UU6Cc23xwJhuqVkHXcrYl/vHopeA80Mbip5m1mHvZA4doAY1jJR5Qh+pYY+osPfuC0LogA= +SHA256 (Pkgfile) = 10fac51103ed3f5ffd1b4a3125a0e24e001bc0034e448a3ef1d83f5205346803 SHA256 (.footprint) = ffddeda3d45fadfa85e007ad5f4413605d3f52ef3d4489eb7445b4fc8528afbe -SHA256 (i3-4.19.1.tar.xz) = 2284c812fc689e0338d8fe9be0b8d1552e548fc168d165f795b26bf497c22b47 +SHA256 (i3-4.19.2.tar.xz) = 8a6ee177689dcf22964d20b6093014ee4fa0419345d3fd515d5512d9980bb279 diff --git a/i3/Pkgfile b/i3/Pkgfile index 6ff83b2ee..86985d332 100644 --- a/i3/Pkgfile +++ b/i3/Pkgfile @@ -1,10 +1,10 @@ # Description: A tiling window manager # URL: https://i3wm.org/ # Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: cmake pango xorg-xcb-util-cursor xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-xcb-util-xrm libxkbcommon yajl libev startup-notification +# Depends on: pango xorg-xcb-util-cursor xorg-xcb-util-keysyms xorg-xcb-util-wm xorg-xcb-util-xrm libxkbcommon yajl libev startup-notification name=i3 -version=4.19.1 +version=4.19.2 release=1 source=(http://i3wm.org/downloads/$name-$version.tar.xz)

1 0

ports/opt (3.6): wine: 6.2 -> 6.3
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit ddb296d9be94404d539c14aab08d4334cb87b513 Author: Danny Rawlins <contact(a)romster.me> Date: Sat Feb 27 21:01:54 2021 +1100 wine: 6.2 -> 6.3 diff --git a/wine/.footprint b/wine/.footprint index 9f49f02fb..54701c13f 100644 --- a/wine/.footprint +++ b/wine/.footprint @@ -980,6 +980,8 @@ drwxr-xr-x root/root usr/include/wine/windows/ddk/ -rw-r--r-- root/root usr/include/wine/windows/wincrypt.h -rw-r--r-- root/root usr/include/wine/windows/windef.h -rw-r--r-- root/root usr/include/wine/windows/windns.h +-rw-r--r-- root/root usr/include/wine/windows/windows.foundation.collections.h +-rw-r--r-- root/root usr/include/wine/windows/windows.foundation.collections.idl -rw-r--r-- root/root usr/include/wine/windows/windows.foundation.h -rw-r--r-- root/root usr/include/wine/windows/windows.foundation.idl -rw-r--r-- root/root usr/include/wine/windows/windows.h diff --git a/wine/.signature b/wine/.signature index 30f84d6dc..2c2d5db26 100644 --- a/wine/.signature +++ b/wine/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WfanQjA21RTUQ6Y13Plg5qc8058lvYLu2TzqGSLdiq0Y3yARGNcNLhNT3fAHzRF9+yZmKN9Fn0Fdvkz/Lp8VQ0= -SHA256 (Pkgfile) = 4f9f8cbd10eacc191195d10dddc802a186521e0ba1ad57a44d56990e7066c068 -SHA256 (.footprint) = fc570b6550e220b5aecb9fc71bd99e63db8b61e5c386fd6b411f7d35f84896f7 -SHA256 (wine-6.2.tar.xz) = b6609609a3abcc6ad927cdd65c740be01162b801523e0f7ba9fd6691800bbf19 +RWSE3ohX2g5d/Y6yKSgBtnkfC/WlYwjwaF36RtYbFhWl9b17DIZVugRWLY9ItooOK+rIFnX56vQDLxw+2O3FdGF4hziAwv6eKAI= +SHA256 (Pkgfile) = 087ac5abccd24f8d9c52511f5b6d97790c8438c9b7d4dba9a5e2c79a4d877c5c +SHA256 (.footprint) = f5b3ee10c26838242561b53d120bc0c428dc7a02dbcadcefaca6c794709978c3 +SHA256 (wine-6.3.tar.xz) = 682a77c1fd12f56347ca2080d85fe17def1b655d3241d94582f87591d9d0cc3b SHA256 (wine-gecko-2.47.2-x86.msi) = e520ce7336cd420cd09c91337d87e74bb420300fd5cbc6f724c1802766b6a61d SHA256 (wine-gecko-2.47.2-x86_64.msi) = 0596761024823ff3c21f13e1cd5cd3e89dccc698294d62974d8930aeda86ce45 SHA256 (wine-mono-6.0.0-x86.msi) = 5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0 diff --git a/wine/Pkgfile b/wine/Pkgfile index c48496377..28f037d2f 100644 --- a/wine/Pkgfile +++ b/wine/Pkgfile @@ -4,7 +4,7 @@ # Depends on: fontconfig-32 freeglut-32 gnutls-32 lcms2-32 mpg123-32 openal-32 prelink vkd3d-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxxf86dga-32 name=wine -version=6.2 +version=6.3 release=1 source=(https://dl.winehq.org/wine/source/6.x/$name-$version.tar.xz https://dl.winehq.org/wine/wine-gecko/2.47.2/wine-gecko-2.47.2-x86.msi

1 0

ports/opt (3.6): [notify] python: patch 3 security issues: CVE-2019-20907, CVE-2020-26116, and CVE-2021-3177
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit 2e2843fede4d0086e93c9b5434b09c44318882c4 Author: Danny Rawlins <contact(a)romster.me> Date: Sat Feb 27 20:55:11 2021 +1100 [notify] python: patch 3 security issues: CVE-2019-20907, CVE-2020-26116, and CVE-2021-3177 diff --git a/python/.signature b/python/.signature index 97bd0a258..71c6b500a 100644 --- a/python/.signature +++ b/python/.signature @@ -1,6 +1,9 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/a3K/I66yw0JReBFnr+BMNq9XxrSNdzGhoOvHro1VE9PpDKZ5W+6/jMv+GOb43/y/V28Qbhn8Bm96xWQJlj9AQs= -SHA256 (Pkgfile) = 0bdf8c849eb717a9fb4abaa0f71cf5f2d8dfa5a896740b594febf511f961681d +RWSE3ohX2g5d/SLClB71/t4Fok+TXEN5kW8zj7yJYxYSakqmWJY0a9ymGkcO7fRu33meHIdoa13OYWhUjNZS+zlEoMZChuQqIAc= +SHA256 (Pkgfile) = 4a021c82c4cfa9716295e41571af6f5aea29c8b40ec2003a65e9278833b43ef1 SHA256 (.footprint) = 45f6aea32375cc9cd313a77c570abcd08cbb4a9612d868eedf1e52d06ee062b4 SHA256 (Python-2.7.18.tar.xz) = b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 SHA256 (pyconfig.h) = 081426cb9524c2e156a71bb035c25a67e44d389afc6f7e091bcf86a7f4e2002f +SHA256 (CVE-2019-20907.patch) = 59f8039b26f6a4613847fb4b30a1da612b4c0d5ed3c1cc92f498ebd71a734b04 +SHA256 (CVE-2020-26116.patch) = 290f34ab3e6cdd99fff00ab7b1e01d3e9c4acc36ecb87b7db76207c4cdaf692a +SHA256 (CVE-2021-3177.patch) = db7835b3fa3a2897e531a219127a02bbc902e31f3363f27a456a45ddbb4eca31 diff --git a/python/CVE-2019-20907.patch b/python/CVE-2019-20907.patch new file mode 100644 index 000000000..64da85855 --- /dev/null +++ b/python/CVE-2019-20907.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Rishi <rishi_devan(a)mail.com> +Date: Wed, 15 Jul 2020 13:51:00 +0200 +Subject: [PATCH] 00351-cve-2019-20907-fix-infinite-loop-in-tarfile.patch + +00351 # +Avoid infinite loop when reading specially crafted TAR files using the tarfile module +(CVE-2019-20907). +See: https://bugs.python.org/issue39017 +--- + Lib/tarfile.py | 2 ++ + +diff --git a/Lib/tarfile.py b/Lib/tarfile.py +index adf91d53823..574a6bb279d 100644 +--- a/Lib/tarfile.py ++++ b/Lib/tarfile.py +@@ -1400,6 +1400,8 @@ class TarInfo(object): + + length, keyword = match.groups() + length = int(length) ++ if length == 0: ++ raise InvalidHeaderError("invalid header") + value = buf[match.end(2) + 1:match.start(1) + length - 1] + + keyword = keyword.decode("utf8") diff --git a/python/CVE-2020-26116.patch b/python/CVE-2020-26116.patch new file mode 100644 index 000000000..c13655e2e --- /dev/null +++ b/python/CVE-2020-26116.patch @@ -0,0 +1,113 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: AMIR <31338382+amiremohamadi(a)users.noreply.github.com> +Date: Sun, 19 Jul 2020 00:46:10 +0430 +Subject: [PATCH] + 00354-cve-2020-26116-http-request-method-crlf-injection-in-httplib.patch + +00354 # +Reject control chars in HTTP method in httplib.putrequest to prevent +HTTP header injection + +Backported from Python 3.5-3.10 (and adjusted for py2's single-module httplib): +- https://bugs.python.org/issue39603 +- https://github.com/python/cpython/pull/18485 (3.10) +- https://github.com/python/cpython/pull/21946 (3.5) + +Co-authored-by: AMIR <31338382+amiremohamadi(a)users.noreply.github.com> +--- + Lib/httplib.py | 16 +++++++++++++ + Lib/test/test_httplib.py | 23 +++++++++++++++++++ + .../2020-02-12-14-17-39.bpo-39603.Gt3RSg.rst | 2 ++ + 3 files changed, 41 insertions(+) + create mode 100644 Misc/NEWS.d/next/Security/2020-02-12-14-17-39.bpo-39603.Gt3RSg.rst + +diff --git a/Lib/httplib.py b/Lib/httplib.py +index fcc4152aaf2..a63677477d5 100644 +--- a/Lib/httplib.py ++++ b/Lib/httplib.py +@@ -257,6 +257,10 @@ _contains_disallowed_url_pchar_re = re.compile('[\x00-\x20\x7f-\xff]') + # _is_allowed_url_pchars_re = re.compile(r"^[/!$&'()*+,;=:@%a-zA-Z0-9._~-]+$") + # We are more lenient for assumed real world compatibility purposes. + ++# These characters are not allowed within HTTP method names ++# to prevent http header injection. ++_contains_disallowed_method_pchar_re = re.compile('[\x00-\x1f]') ++ + # We always set the Content-Length header for these methods because some + # servers will otherwise respond with a 411 + _METHODS_EXPECTING_BODY = {'PATCH', 'POST', 'PUT'} +@@ -935,6 +939,8 @@ class HTTPConnection: + else: + raise CannotSendRequest() + ++ self._validate_method(method) ++ + # Save the method for use later in the response phase + self._method = method + +@@ -1020,6 +1026,16 @@ class HTTPConnection: + # On Python 2, request is already encoded (default) + return request + ++ def _validate_method(self, method): ++ """Validate a method name for putrequest.""" ++ # prevent http header injection ++ match = _contains_disallowed_method_pchar_re.search(method) ++ if match: ++ raise ValueError( ++ "method can't contain control characters. %r " ++ "(found at least %r)" ++ % (method, match.group())) ++ + def _validate_path(self, url): + """Validate a url for putrequest.""" + # Prevent CVE-2019-9740. +diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py +index d8a57f73530..e295bb796ec 100644 +--- a/Lib/test/test_httplib.py ++++ b/Lib/test/test_httplib.py +@@ -385,6 +385,28 @@ class HeaderTests(TestCase): + conn.putheader(name, value) + + ++class HttpMethodTests(TestCase): ++ def test_invalid_method_names(self): ++ methods = ( ++ 'GET\r', ++ 'POST\n', ++ 'PUT\n\r', ++ 'POST\nValue', ++ 'POST\nHOST:abc', ++ 'GET\nrHost:abc\n', ++ 'POST\rRemainder:\r', ++ 'GET\rHOST:\n', ++ '\nPUT' ++ ) ++ ++ for method in methods: ++ with self.assertRaisesRegexp( ++ ValueError, "method can't contain control characters"): ++ conn = httplib.HTTPConnection('example.com') ++ conn.sock = FakeSocket(None) ++ conn.request(method=method, url="/") ++ ++ + class BasicTest(TestCase): + def test_status_lines(self): + # Test HTTP status lines +@@ -1010,6 +1032,7 @@ class TunnelTests(TestCase): + @test_support.reap_threads + def test_main(verbose=None): + test_support.run_unittest(HeaderTests, OfflineTest, BasicTest, TimeoutTest, ++ HttpMethodTests, + HTTPTest, HTTPSTest, SourceAddressTest, + TunnelTests) + +diff --git a/Misc/NEWS.d/next/Security/2020-02-12-14-17-39.bpo-39603.Gt3RSg.rst b/Misc/NEWS.d/next/Security/2020-02-12-14-17-39.bpo-39603.Gt3RSg.rst +new file mode 100644 +index 00000000000..990affc3edd +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2020-02-12-14-17-39.bpo-39603.Gt3RSg.rst +@@ -0,0 +1,2 @@ ++Prevent http header injection by rejecting control characters in ++http.client.putrequest(...). diff --git a/python/CVE-2021-3177.patch b/python/CVE-2021-3177.patch new file mode 100644 index 000000000..09be782c0 --- /dev/null +++ b/python/CVE-2021-3177.patch @@ -0,0 +1,179 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Petr Viktorin <pviktori(a)redhat.com> +Date: Mon, 1 Feb 2021 19:29:17 +0100 +Subject: [PATCH] 00357-CVE-2021-3177.patch + +00357 # +CVE-2021-3177: Replace snprintf with Python unicode formatting in ctypes param reprs + +Backport of Python3 commit 916610ef90a0d0761f08747f7b0905541f0977c7: +https://bugs.python.org/issue42938 +https://github.com/python/cpython/pull/24239 +--- + Lib/ctypes/test/test_parameters.py | 43 ++++++++++++++++++++ + Modules/_ctypes/callproc.c | 65 +++++++++++++++++------------- + 2 files changed, 80 insertions(+), 28 deletions(-) + +diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py +index 23c1b6e2259..77300d71ae1 100644 +--- a/Lib/ctypes/test/test_parameters.py ++++ b/Lib/ctypes/test/test_parameters.py +@@ -206,6 +206,49 @@ class SimpleTypesTestCase(unittest.TestCase): + with self.assertRaises(ZeroDivisionError): + WorseStruct().__setstate__({}, b'foo') + ++ def test_parameter_repr(self): ++ from ctypes import ( ++ c_bool, ++ c_char, ++ c_wchar, ++ c_byte, ++ c_ubyte, ++ c_short, ++ c_ushort, ++ c_int, ++ c_uint, ++ c_long, ++ c_ulong, ++ c_longlong, ++ c_ulonglong, ++ c_float, ++ c_double, ++ c_longdouble, ++ c_char_p, ++ c_wchar_p, ++ c_void_p, ++ ) ++ self.assertRegexpMatches(repr(c_bool.from_param(True)), r"^<cparam '\?' at 0x[A-Fa-f0-9]+>$") ++ self.assertEqual(repr(c_char.from_param('a')), "<cparam 'c' ('a')>") ++ self.assertRegexpMatches(repr(c_wchar.from_param('a')), r"^<cparam 'u' at 0x[A-Fa-f0-9]+>$") ++ self.assertEqual(repr(c_byte.from_param(98)), "<cparam 'b' (98)>") ++ self.assertEqual(repr(c_ubyte.from_param(98)), "<cparam 'B' (98)>") ++ self.assertEqual(repr(c_short.from_param(511)), "<cparam 'h' (511)>") ++ self.assertEqual(repr(c_ushort.from_param(511)), "<cparam 'H' (511)>") ++ self.assertRegexpMatches(repr(c_int.from_param(20000)), r"^<cparam '[li]' $20000$>$") ++ self.assertRegexpMatches(repr(c_uint.from_param(20000)), r"^<cparam '[LI]' $20000$>$") ++ self.assertRegexpMatches(repr(c_long.from_param(20000)), r"^<cparam '[li]' $20000$>$") ++ self.assertRegexpMatches(repr(c_ulong.from_param(20000)), r"^<cparam '[LI]' $20000$>$") ++ self.assertRegexpMatches(repr(c_longlong.from_param(20000)), r"^<cparam '[liq]' $20000$>$") ++ self.assertRegexpMatches(repr(c_ulonglong.from_param(20000)), r"^<cparam '[LIQ]' $20000$>$") ++ self.assertEqual(repr(c_float.from_param(1.5)), "<cparam 'f' (1.5)>") ++ self.assertEqual(repr(c_double.from_param(1.5)), "<cparam 'd' (1.5)>") ++ self.assertEqual(repr(c_double.from_param(1e300)), "<cparam 'd' (1e+300)>") ++ self.assertRegexpMatches(repr(c_longdouble.from_param(1.5)), r"^<cparam ('d' $1.5$|'g' at 0x[A-Fa-f0-9]+)>$") ++ self.assertRegexpMatches(repr(c_char_p.from_param(b'hihi')), "^<cparam 'z' $0x[A-Fa-f0-9]+$>$") ++ self.assertRegexpMatches(repr(c_wchar_p.from_param('hihi')), "^<cparam 'Z' $0x[A-Fa-f0-9]+$>$") ++ self.assertRegexpMatches(repr(c_void_p.from_param(0x12)), r"^<cparam 'P' $0x0*12$>$") ++ + ################################################################ + + if __name__ == '__main__': +diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c +index 066fefc0cca..5cc3c4cf685 100644 +--- a/Modules/_ctypes/callproc.c ++++ b/Modules/_ctypes/callproc.c +@@ -460,50 +460,62 @@ PyCArg_dealloc(PyCArgObject *self) + static PyObject * + PyCArg_repr(PyCArgObject *self) + { +- char buffer[256]; + switch(self->tag) { + case 'b': + case 'B': +- sprintf(buffer, "<cparam '%c' (%d)>", ++ return PyString_FromFormat("<cparam '%c' (%d)>", + self->tag, self->value.b); +- break; + case 'h': + case 'H': +- sprintf(buffer, "<cparam '%c' (%d)>", ++ return PyString_FromFormat("<cparam '%c' (%d)>", + self->tag, self->value.h); +- break; + case 'i': + case 'I': +- sprintf(buffer, "<cparam '%c' (%d)>", ++ return PyString_FromFormat("<cparam '%c' (%d)>", + self->tag, self->value.i); +- break; + case 'l': + case 'L': +- sprintf(buffer, "<cparam '%c' (%ld)>", ++ return PyString_FromFormat("<cparam '%c' (%ld)>", + self->tag, self->value.l); +- break; + + #ifdef HAVE_LONG_LONG + case 'q': + case 'Q': +- sprintf(buffer, +- "<cparam '%c' (%" PY_FORMAT_LONG_LONG "d)>", ++ return PyString_FromFormat("<cparam '%c' (%lld)>", + self->tag, self->value.q); +- break; + #endif + case 'd': +- sprintf(buffer, "<cparam '%c' (%f)>", +- self->tag, self->value.d); +- break; +- case 'f': +- sprintf(buffer, "<cparam '%c' (%f)>", +- self->tag, self->value.f); +- break; +- ++ case 'f': { ++ PyObject *s = PyString_FromFormat("<cparam '%c' (", self->tag); ++ if (s == NULL) { ++ return NULL; ++ } ++ PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d); ++ if (f == NULL) { ++ Py_DECREF(s); ++ return NULL; ++ } ++ PyObject *r = PyObject_Repr(f); ++ Py_DECREF(f); ++ if (r == NULL) { ++ Py_DECREF(s); ++ return NULL; ++ } ++ PyString_ConcatAndDel(&s, r); ++ if (s == NULL) { ++ return NULL; ++ } ++ r = PyString_FromString(")>"); ++ if (r == NULL) { ++ Py_DECREF(s); ++ return NULL; ++ } ++ PyString_ConcatAndDel(&s, r); ++ return s; ++ } + case 'c': +- sprintf(buffer, "<cparam '%c' (%c)>", ++ return PyString_FromFormat("<cparam '%c' ('%c')>", + self->tag, self->value.c); +- break; + + /* Hm, are these 'z' and 'Z' codes useful at all? + Shouldn't they be replaced by the functionality of c_string +@@ -512,16 +524,13 @@ PyCArg_repr(PyCArgObject *self) + case 'z': + case 'Z': + case 'P': +- sprintf(buffer, "<cparam '%c' (%p)>", ++ return PyUnicode_FromFormat("<cparam '%c' (%p)>", + self->tag, self->value.p); +- break; + + default: +- sprintf(buffer, "<cparam '%c' at %p>", +- self->tag, self); +- break; ++ return PyString_FromFormat("<cparam '%c' at %p>", ++ (unsigned char)self->tag, (void *)self); + } +- return PyString_FromString(buffer); + } + + static PyMemberDef PyCArgType_members[] = { diff --git a/python/Pkgfile b/python/Pkgfile index 558029c06..6618bbf6e 100644 --- a/python/Pkgfile +++ b/python/Pkgfile @@ -5,13 +5,20 @@ name=python version=2.7.18 -release=2 +release=3 source=(https://www.python.org/ftp/$name/${version::6}/Python-$version.tar.… \ - pyconfig.h) + pyconfig.h \ + CVE-2019-20907.patch \ + CVE-2020-26116.patch \ + CVE-2021-3177.patch) build () { cd Python-$version + patch -p1 -i $SRC/CVE-2019-20907.patch + patch -p1 -i $SRC/CVE-2020-26116.patch + patch -p1 -i $SRC/CVE-2021-3177.patch + # remove 2to3, we use the one from python3 rm -r Lib/lib2to3

1 0

ports/contrib (3.6): uthash: 2.2.0 -> 2.3.0
by crux＠crux.nu 27 Feb '21

27 Feb '21

commit 43bcb08ec66ae23dffcf88eb510e329e647e3e46 Author: Danny Rawlins <contact(a)romster.me> Date: Sat Feb 27 14:34:18 2021 +1100 uthash: 2.2.0 -> 2.3.0 diff --git a/uthash/.signature b/uthash/.signature index ac1bea25d..3879817f2 100644 --- a/uthash/.signature +++ b/uthash/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3y3GD0jRC3KuKawe/7FcG03+Sq68rNjQY5nQBg416b9kpI/gPWPCTFa5dVT7Xyf4t9tNjZUd1HdXIk0CGSmxRAk= -SHA256 (Pkgfile) = fc97e93f46b5318450151601b48014c8ab6fcd685490bceca17b1644aaa64d94 +RWSagIOpLGJF34Jo/GdtWoefGrP+IkKsHA/sYJgZVXG34D68bhS0A3l+IxGBY1G3QfIAmc6WN7ZgLxvB3qIYX4SqQj0DXHgYdAs= +SHA256 (Pkgfile) = 4569481ff371dd4d964cb85b42fe1a6038a311af061d72247b7f2a93bb81e1b2 SHA256 (.footprint) = 23ee7e492f3ad3b871080d814482acf6baae8dfe89b669de9a2c8a4ea7cebd13 -SHA256 (uthash-v2.2.0.tar.gz) = 51e31e9e349c3466c7cea25077a9bb5bc722eff2a2915410763d3616099a4b34 +SHA256 (uthash-v2.3.0.tar.gz) = e10382ab75518bad8319eb922ad04f907cb20cccb451a3aa980c9d005e661acc diff --git a/uthash/Pkgfile b/uthash/Pkgfile index dc85a8e95..ebf3df520 100644 --- a/uthash/Pkgfile +++ b/uthash/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Danny Rawlins, crux at romster dot me name=uthash -version=2.2.0 +version=2.3.0 release=1 source=(https://github.com/troydhanson/$name/archive/v$version/$name-v$vers…

1 0