Merge remote-tracking branch 'origin/release/2.7.0' into develop

utils/transifex_translators.py

@@ -13,8 +13,6 @@ LANGS = {
     "da" : "dansk (Danish)",
     "de" : "Deutsch (German)",
     "el" : "ελληνικά (Greek)",
-    "en_GB" : "English (UK)",
-    "en_US" : "English (USA)",
     "eo" : "Esperanto (Esperanto)",
     "es" : "Español (Spanish)",
     "et" : "eesti (Estonian)",

utils/vcpkg_ports/argon2/CMakeLists.txt

@@ -0,0 +1,37 @@
+cmake_minimum_required(VERSION 3.8)
+project(argon2 C)
+
+set(PROJECT_VERSION 20190702)
+
+if(MSVC)
+  add_compile_options(/W3)
+endif()
+
+include_directories(include src)
+
+set(SRC
+  src/argon2.c
+  src/core.c
+  src/encoding.c
+  src/ref.c
+  src/thread.c
+  src/opt.c
+  src/blake2/blake2b.c
+)
+
+set(HEADERS
+  include/argon2.h
+)
+
+add_library(argon2 ${SRC})
+
+install(
+  TARGETS argon2
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+if(NOT DISABLE_INSTALL_HEADERS)
+  install(FILES ${HEADERS} DESTINATION include)
+endif()

utils/vcpkg_ports/argon2/portfile.cmake

@@ -0,0 +1,25 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO P-H-C/phc-winner-argon2
+    REF 20190702
+    SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f    
+    HEAD_REF master
+)
+
+configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        ${FEATURE_OPTIONS}
+    OPTIONS_DEBUG
+        -DDISABLE_INSTALL_HEADERS=ON
+)
+
+vcpkg_install_cmake()
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

utils/vcpkg_ports/argon2/vcpkg.json

@@ -0,0 +1,7 @@
+{
+  "name": "argon2",
+  "version-string": "20190702",
+  "port-version": 1,
+  "description": "Reference C implementation of Argon2, the password-hashing function that won the Password Hashing Competition (PHC).",
+  "homepage": "https://github.com/P-H-C/phc-winner-argon2"
+}