gentoo resync : 21.06.2020

4 files changed, 221 insertions, 0 deletions

diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch
new file mode 100644
index 000000000000..cbc723a7fd70
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch
@@ -0,0 +1,95 @@
+From 966d98be2d2d6169a29c22eb5565f34fad1c0fb9 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <guilherme@amadio.org>
+Date: Mon, 6 Apr 2020 17:19:19 +0200
+Subject: [PATCH 2/3] Build some externals as part of the regular build
+
+---
+ CMakeLists.txt                     |  9 ++++++---
+ externals/sha2/src/CMakeLists.txt  |  8 ++++++++
+ externals/sha3/src/CMakeLists.txt  | 14 ++++++++++++++
+ externals/vjson/src/CMakeLists.txt |  8 ++++++++
+ 4 files changed, 36 insertions(+), 3 deletions(-)
+ create mode 100644 externals/sha2/src/CMakeLists.txt
+ create mode 100644 externals/sha3/src/CMakeLists.txt
+ create mode 100644 externals/vjson/src/CMakeLists.txt
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a50b603fe..3403ae67b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -320,7 +320,8 @@ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS})
+ find_package (GMock REQUIRED)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS})
+ 
+-find_package (VJSON REQUIRED)
++#find_package (VJSON REQUIRED)
++add_subdirectory(externals/vjson/src)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${VJSON_INCLUDE_DIRS})
+ 
+ find_package (LibArchive REQUIRED)
+@@ -333,10 +334,12 @@ if (BUILD_CVMFS OR BUILD_LIBCVMFS OR BUILD_SERVER OR BUILD_SERVER_DEBUG OR
+   find_package (ZLIB REQUIRED)
+   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${ZLIB_INCLUDE_DIRS})
+ 
+-  find_package (SHA2 REQUIRED)
++  #find_package (SHA2 REQUIRED)
++  add_subdirectory(externals/sha2/src)
+   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${SHA2_INCLUDE_DIRS})
+ 
+-  find_package (SHA3 REQUIRED)
++  # find_package (SHA3 REQUIRED)
++  add_subdirectory(externals/sha3/src)
+   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${SHA3_INCLUDE_DIRS})
+ endif (BUILD_CVMFS OR BUILD_LIBCVMFS OR BUILD_SERVER OR BUILD_SERVER_DEBUG OR
+        BUILD_UNITTESTS OR BUILD_UNITTESTS_DEBUG OR BUILD_PRELOADER OR
+diff --git a/externals/sha2/src/CMakeLists.txt b/externals/sha2/src/CMakeLists.txt
+new file mode 100644
+index 000000000..091e1ed6b
+--- /dev/null
++++ b/externals/sha2/src/CMakeLists.txt
+@@ -0,0 +1,8 @@
++project(SHA2)
++
++add_library(cvmfs_sha2 STATIC sha2.c)
++set_property(TARGET cvmfs_sha2 PROPERTY POSITION_INDEPENDENT_CODE TRUE)
++target_include_directories(cvmfs_sha2 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
++
++set(SHA2_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
++set(SHA2_LIBRARIES cvmfs_sha2 PARENT_SCOPE)
+diff --git a/externals/sha3/src/CMakeLists.txt b/externals/sha3/src/CMakeLists.txt
+new file mode 100644
+index 000000000..15db012d4
+--- /dev/null
++++ b/externals/sha3/src/CMakeLists.txt
+@@ -0,0 +1,14 @@
++project(SHA3)
++
++add_library(cvmfs_sha3 STATIC #GLOBAL
++  64opt/KeccakF-1600-opt64.c
++  KeccakHash.c
++  KeccakSponge.c
++  SnP-FBWL-default.c
++  )
++
++set_property(TARGET cvmfs_sha3 PROPERTY POSITION_INDEPENDENT_CODE TRUE)
++target_include_directories(cvmfs_sha3 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/64opt)
++
++set(SHA3_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/64opt PARENT_SCOPE)
++set(SHA3_LIBRARIES cvmfs_sha3 PARENT_SCOPE)
+diff --git a/externals/vjson/src/CMakeLists.txt b/externals/vjson/src/CMakeLists.txt
+new file mode 100644
+index 000000000..316ab7617
+--- /dev/null
++++ b/externals/vjson/src/CMakeLists.txt
+@@ -0,0 +1,8 @@
++project(VJSON)
++
++add_library(cvmfs_vjson STATIC block_allocator.cpp json.cpp)
++set_property(TARGET cvmfs_vjson PROPERTY POSITION_INDEPENDENT_CODE TRUE)
++target_include_directories(cvmfs_vjson INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
++
++set(VJSON_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
++set(VJSON_LIBRARIES cvmfs_vjson PARENT_SCOPE)
+-- 
+2.26.0
+
diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch
new file mode 100644
index 000000000000..ce4b85f7921f
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch
@@ -0,0 +1,41 @@
+From 3a4881d1dc211ec358995d6d8501818beedc62ac Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <guilherme@amadio.org>
+Date: Mon, 6 Apr 2020 17:26:48 +0200
+Subject: [PATCH 3/3] Comment out unnecessary package lookups
+
+---
+ CMakeLists.txt | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3403ae67b..2895b567a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -295,7 +295,7 @@ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${CMAKE_BINARY_DIR})
+ # set properties for configurable libraries
+ #
+ 
+-find_package (Valgrind)
++# find_package (Valgrind)
+ if (VALGRIND_FOUND)
+   set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${VALGRIND_INCLUDE_DIR})
+   add_definitions(-DHAS_VALGRIND_HEADERS)
+@@ -314,11 +314,11 @@ endif (NOT MACOSX)
+ find_package (OpenSSL REQUIRED)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${OPENSSL_INCLUDE_DIR})
+ 
+-find_package (GTest REQUIRED)
+-set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS})
++# find_package (GTest REQUIRED)
++# set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS})
+ 
+-find_package (GMock REQUIRED)
+-set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS})
++# find_package (GMock REQUIRED)
++# set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS})
+ 
+ #find_package (VJSON REQUIRED)
+ add_subdirectory(externals/vjson/src)
+-- 
+2.26.0
+
diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch
new file mode 100644
index 000000000000..ff76b5746705
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch
@@ -0,0 +1,59 @@
+From cdeb988a7ece84191ec3496d55b99d82ca9face5 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Fri, 19 Jun 2020 11:19:14 +0200
+Subject: [PATCH] Remove broken version checks which fail for GCC 10
+
+---
+ cmake/Modules/cvmfs_compiler.cmake | 27 +++------------------------
+ 1 file changed, 3 insertions(+), 24 deletions(-)
+
+diff --git a/cmake/Modules/cvmfs_compiler.cmake b/cmake/Modules/cvmfs_compiler.cmake
+index 2560d231c..e473467b3 100644
+--- a/cmake/Modules/cvmfs_compiler.cmake
++++ b/cmake/Modules/cvmfs_compiler.cmake
+@@ -35,33 +35,12 @@ set (ENV{LDFLAGS}    "${LDFLAGS}")
+ #
+ set (CVMFS_FIX_FLAGS "")
+ set (CVMFS_OPT_FLAGS "-Os")
+-if (CMAKE_COMPILER_IS_GNUCC)
+-  message (STATUS "checking gcc version...")
+-  execute_process (
+-    COMMAND ${CMAKE_C_COMPILER} -v
+-    OUTPUT_VARIABLE CVMFS_GCC_VERSION
+-    ERROR_VARIABLE  CVMFS_GCC_VERSION
+-  )
+-  STRING(REGEX REPLACE ".*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" CVMFS_GCC_MAJOR "${CVMFS_GCC_VERSION}")
+-  STRING(REGEX REPLACE ".*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" CVMFS_GCC_MINOR "${CVMFS_GCC_VERSION}")
+-  if (${CVMFS_GCC_MAJOR} LESS 4)
+-    message (FATAL_ERROR "GCC < 4.1 unsupported")
+-  endif (${CVMFS_GCC_MAJOR} LESS 4)
+-  if (${CVMFS_GCC_MAJOR} EQUAL 4)
+-    if (${CVMFS_GCC_MINOR} LESS 2)
+-      set (CVMFS_OPT_FLAGS "-O1")
+-    endif (${CVMFS_GCC_MINOR} LESS 2)
+-  endif (${CVMFS_GCC_MAJOR} EQUAL 4)
+-  if (${CVMFS_GCC_MAJOR} GREATER 6)
+-    set (CVMFS_FIX_FLAGS "-Wno-format-truncation")
+-  endif (${CVMFS_GCC_MAJOR} GREATER 6)
+-endif (CMAKE_COMPILER_IS_GNUCC)
+ message (STATUS "using compiler opt flag ${CVMFS_OPT_FLAGS}")
+ set (CVMFS_BASE_C_FLAGS "${CVMFS_OPT_FLAGS} -g -fno-strict-aliasing -fasynchronous-unwind-tables -fno-omit-frame-pointer -fwrapv -fvisibility=hidden -Wall ${CVMFS_FIX_FLAGS}")
+ if (APPLE)
+-  if (${CMAKE_SYSTEM_VERSION} GREATER 14.5.0)
++  if (${CMAKE_SYSTEM_VERSION} VERSION_GREATER 14.5.0)
+     set(CVMFS_BASE_C_FLAGS "${CVMFS_BASE_C_FLAGS} -mmacosx-version-min=10.11")
+-  endif(${CMAKE_SYSTEM_VERSION} GREATER 14.5.0)
++  endif(${CMAKE_SYSTEM_VERSION} VERSION_GREATER 14.5.0)
+ endif(APPLE)
+ set (CVMFS_BASE_CXX_FLAGS "${CVMFS_BASE_C_FLAGS} -fno-exceptions")
+ if (NOT USING_CLANG)
+@@ -94,4 +73,4 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+     message("Enable inotify support")
+     set(CVMFS_ENABLE_INOTIFY ON)
+   endif(HAS_INOTIFY_INIT1)
+-endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+\ No newline at end of file
++endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+-- 
+2.27.0
+
diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-xattr.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-xattr.patch
new file mode 100644
index 000000000000..e10557923ced
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.7.2-xattr.patch
@@ -0,0 +1,26 @@
+From 44cae128f7478ab81be92cdfc7dec6c2aee26e42 Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <guilherme@amadio.org>
+Date: Mon, 6 Apr 2020 17:17:30 +0200
+Subject: [PATCH 1/3] Do not include deprecated attr/xattr.h
+
+---
+ cvmfs/platform_linux.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/cvmfs/platform_linux.h b/cvmfs/platform_linux.h
+index 21e7d81fb..9aa0c9051 100644
+--- a/cvmfs/platform_linux.h
++++ b/cvmfs/platform_linux.h
+@@ -9,9 +9,6 @@
+ 
+ #include <sys/types.h>  // contains ssize_t needed inside <attr/xattr.h>
+ #include <sys/xattr.h>
+-#ifdef HAVE_ATTR_XATTR_H
+-#include <attr/xattr.h>  // NOLINT(build/include_alpha)
+-#endif
+ #include <dirent.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-- 
+2.26.0
+