* [gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/, net-fs/cvmfs/files/
@ 2020-06-19 7:20 Guilherme Amadio
0 siblings, 0 replies; 5+ messages in thread
From: Guilherme Amadio @ 2020-06-19 7:20 UTC (permalink / raw
To: gentoo-commits
commit: d2955fe9aeed2e5373b6e09dc3fd8c4720ed7fcf
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 22:52:21 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 07:20:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2955fe9
net-fs/cvmfs: version bump to 2.7.2
Closes: https://bugs.gentoo.org/647152
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
net-fs/cvmfs/Manifest | 1 +
net-fs/cvmfs/cvmfs-2.7.2.ebuild | 112 ++++++++++++++++++++++
net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch | 95 ++++++++++++++++++
net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch | 41 ++++++++
net-fs/cvmfs/files/cvmfs-2.7.2-xattr.patch | 26 +++++
5 files changed, 275 insertions(+)
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index a6cc53c24f9..fbc4c19c412 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1 +1,2 @@
DIST cvmfs-2.3.5.tar.gz 37771779 BLAKE2B 06366cc1bdc2e133b65ec6f348507ef0d5f752f69b87632b0b27bb5b29e0546922d5a12e406f733341e9c8b7d32f8bd32878e247d98a168d6985a620607720d3 SHA512 7f2d05776a747c72d0aa8b5270cfb46f7dc31a458deee65a4a21446718ba813e4c449f6424c7419345e6ffb7cefce3d328dea7b414fe5a5980f9b93ccac0157b
+DIST cvmfs-2.7.2.tar.gz 43121950 BLAKE2B 3f9b23709f7fd7d21f0c141388df9b3f59c0c9ed8c4b27ae4071cff919e6d04eec1c80fe26a70b421d554969d35cb18f1a700be67f046a1a5d53d73a9e64bbe2 SHA512 35f4d949b4f2d002e6ef07e61cd443e55b30031a396f9850fc8d511b2ea3fd37f12e340828878cce151876f7391459f5bb13f0fe325070567f2876eb50185149
diff --git a/net-fs/cvmfs/cvmfs-2.7.2.ebuild b/net-fs/cvmfs/cvmfs-2.7.2.ebuild
new file mode 100644
index 00000000000..3698b92b307
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.7.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info bash-completion-r1
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="http://cernvm.cern.ch/portal/filesystem"
+SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion doc server"
+
+CDEPEND="
+ app-arch/libarchive
+ dev-cpp/sparsehash
+ dev-libs/leveldb:0=
+ dev-libs/openssl:0=
+ dev-libs/protobuf:0=
+ net-libs/pacparser:0=
+ sys-apps/attr
+ sys-fs/fuse:0=
+ sys-fs/fuse:3=
+ sys-libs/libcap:0=
+ sys-libs/zlib:0=
+ server? (
+ net-dns/c-ares
+ net-misc/curl:0[adns]
+ dev-db/sqlite:3=
+ )
+"
+
+RDEPEND="${CDEPEND}
+ app-admin/sudo
+ net-fs/autofs
+"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen[dot] )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-builtins.patch
+ "${FILESDIR}"/${P}-find-package.patch
+ "${FILESDIR}"/${P}-xattr.patch
+)
+
+pkg_setup() {
+ if use server; then
+ CONFIG_CHECK="~OVERLAY_FS"
+ ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ cmake_src_prepare
+ # gentoo stuff
+ rm bootstrap.sh || die
+ sed -i -e "s:/usr/bin/systemctl:systemctl:g" cvmfs/cvmfs_config || die
+ sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
+ CMakeLists.txt || die
+ eapply_user
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILTIN_EXTERNALS=OFF
+ -DBUILD_CVMFS=ON
+ -DBUILD_LIBCVMFS=OFF # static library used only for development
+ -DBUILD_DOCUMENTATION=$(usex doc)
+ -DBUILD_GEOAPI=OFF # only used for stratum 1 servers
+ -DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
+ -DBUILD_PRELOADER=OFF # special purpose utility for HPCs
+ -DBUILD_RECEIVER=OFF # for distributed publishers only
+ -DBUILD_SERVER=$(usex server)
+ -DINSTALL_BASH_COMPLETION=OFF
+ -DINSTALL_MOUNT_SCRIPTS=ON
+ -DINSTALL_PUBLIC_KEYS=ON
+ )
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ use doc && cmake_src_compile doc
+}
+
+src_install() {
+ cmake_src_install
+ use bash-completion && \
+ newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs
+ dodoc doc/*.md
+ if use doc; then
+ insinto /usr/share/doc/${PF}
+ doins -r "${BUILD_DIR}"/html
+ docompress -x /usr/share/doc/${PF}/html
+ fi
+}
+
+pkg_config() {
+ einfo "Setting up CernVM-FS client"
+ cvmfs_config setup
+ einfo "Now edit ${EROOT%/}/etc/cvmfs/default.local"
+ einfo "and restart the autofs service"
+}
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 00000000000..cbc723a7fd7
--- /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 00000000000..ce4b85f7921
--- /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-xattr.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-xattr.patch
new file mode 100644
index 00000000000..e10557923ce
--- /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
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/, net-fs/cvmfs/files/
@ 2020-06-19 9:26 Guilherme Amadio
0 siblings, 0 replies; 5+ messages in thread
From: Guilherme Amadio @ 2020-06-19 9:26 UTC (permalink / raw
To: gentoo-commits
commit: 1ce9390dbcfe41f21b83bd37ae18f6ba78009860
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 09:26:14 2020 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 09:26:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ce9390d
net-fs/cvmfs: fix build with GCC 10
Closes: https://bugs.gentoo.org/728738
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
net-fs/cvmfs/cvmfs-2.7.2.ebuild | 1 +
net-fs/cvmfs/files/cvmfs-2.7.2-gcc-version.patch | 59 ++++++++++++++++++++++++
2 files changed, 60 insertions(+)
diff --git a/net-fs/cvmfs/cvmfs-2.7.2.ebuild b/net-fs/cvmfs/cvmfs-2.7.2.ebuild
index 114e74da16b..8c45c06e3a9 100644
--- a/net-fs/cvmfs/cvmfs-2.7.2.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.7.2.ebuild
@@ -47,6 +47,7 @@ DEPEND="${CDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-builtins.patch
"${FILESDIR}"/${P}-find-package.patch
+ "${FILESDIR}"/${P}-gcc-version.patch
"${FILESDIR}"/${P}-xattr.patch
)
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 00000000000..ff76b574670
--- /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
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/, net-fs/cvmfs/files/
@ 2022-09-19 12:11 Guilherme Amadio
0 siblings, 0 replies; 5+ messages in thread
From: Guilherme Amadio @ 2022-09-19 12:11 UTC (permalink / raw
To: gentoo-commits
commit: 73ba35554bf309bba9058550c7c35490846270c4
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 09:36:10 2022 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 12:11:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ba3555
net-fs/cvmfs: version bump to 2.9.4
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
net-fs/cvmfs/Manifest | 1 +
net-fs/cvmfs/cvmfs-2.9.4.ebuild | 104 +++++++++++++++++++++
net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch | 10 ++
3 files changed, 115 insertions(+)
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 3ed0d0d9b144..8f4bf1677804 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1 +1,2 @@
DIST cvmfs-2.9.2.tar.gz 70806074 BLAKE2B aeb7a246331e2e8453285582934e4da337ff6730f5b826db907b76773968b89138e9e7cc43d7422b5e7588e81b97e7dc0c0f5ea03e6bde89d55297cbab75f70c SHA512 7742678a227a22a8e17bbdba21e68b0e188ccae8e483906cae005d15ff465f60b407f5fc29183b0272ca9572c3512ffc9596b4c9dda764e6adf5edcec97d4547
+DIST cvmfs-2.9.4.tar.gz 70494380 BLAKE2B 615834c37f555e70ef5530bed02ac6593ca2b403b6bb27ce97316a58350f387571a2f0c7dada585d80fc0300319fb532e4d89f1efb8bb0dcc42e15ad7efb4ab6 SHA512 1150816bdb56ebe1ed886040d6a0bbcb61cba07122f3dc01307d14fa40942f8d4aca5d66a9a21388bd68cdee67b6818088cc5022f794b754968348357f510fff
diff --git a/net-fs/cvmfs/cvmfs-2.9.4.ebuild b/net-fs/cvmfs/cvmfs-2.9.4.ebuild
new file mode 100644
index 000000000000..ed1428a69031
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.9.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info bash-completion-r1
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="https://cernvm.cern.ch/fs/"
+SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="server"
+
+CDEPEND="
+ acct-group/cvmfs
+ acct-user/cvmfs
+ app-arch/libarchive
+ dev-cpp/gtest
+ dev-cpp/sparsehash
+ dev-db/sqlite:3=
+ <dev-libs/leveldb-1.23:0=
+ dev-libs/openssl:0=
+ dev-libs/protobuf:0=
+ net-dns/c-ares:0=
+ net-libs/pacparser:0=
+ net-misc/curl:0[adns]
+ sys-apps/attr
+ sys-fs/fuse:0=
+ sys-fs/fuse:3=
+ sys-libs/libcap:0=
+ sys-libs/zlib:0=
+"
+
+RDEPEND="${CDEPEND}
+ app-admin/sudo
+ net-fs/autofs
+"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.7.2-builtins.patch
+ "${FILESDIR}"/${PN}-2.7.2-find-package.patch
+ "${FILESDIR}"/${PN}-2.9.2-include-ctime.patch
+)
+
+pkg_setup() {
+ if use server; then
+ CONFIG_CHECK="~OVERLAY_FS"
+ ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ cmake_src_prepare
+ # gentoo stuff
+ rm bootstrap.sh || die
+ sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
+ sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
+ CMakeLists.txt || die
+ eapply_user
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILTIN_EXTERNALS=OFF
+ -DBUILD_CVMFS=ON
+ -DBUILD_LIBCVMFS=OFF # static library used only for development
+ -DBUILD_DOCUMENTATION=OFF
+ -DBUILD_GEOAPI=OFF # only used for stratum 1 servers
+ -DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
+ -DBUILD_PRELOADER=OFF # special purpose utility for HPCs
+ -DBUILD_RECEIVER=OFF # for distributed publishers only
+ -DBUILD_SERVER=$(usex server)
+ -DINSTALL_BASH_COMPLETION=OFF
+ -DINSTALL_MOUNT_SCRIPTS=ON
+ -DINSTALL_PUBLIC_KEYS=ON
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config
+ bashcomp_alias cvmfs_config cvmfs_server
+ dodoc doc/*.md
+ keepdir /var/lib/cvmfs
+ use server && keepdir /var/lib/cvmfs-server
+}
+
+pkg_config() {
+ einfo "Setting up CernVM-FS client"
+ cvmfs_config setup
+ einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
+ einfo "and restart the autofs service"
+}
diff --git a/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch b/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch
new file mode 100644
index 000000000000..0dd97cc1f709
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch
@@ -0,0 +1,10 @@
+--- a/cvmfs/authz/helper_log.cc 2022-07-04 12:15:08.000000000 +0200
++++ b/cvmfs/authz/helper_log.cc 2022-09-01 17:55:08.200175687 +0200
+@@ -8,6 +8,7 @@
+ #include <fcntl.h>
+ #include <syslog.h>
+ #include <unistd.h>
++#include <ctime>
+
+ #include <cassert>
+ #include <cstdarg>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/, net-fs/cvmfs/files/
@ 2023-02-24 16:37 Guilherme Amadio
0 siblings, 0 replies; 5+ messages in thread
From: Guilherme Amadio @ 2023-02-24 16:37 UTC (permalink / raw
To: gentoo-commits
commit: 818d224bf21089fdcd8a40013469d1873b528281
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 16:31:17 2023 +0000
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 16:37:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=818d224b
net-fs/cvmfs: add 2.10.1
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>
net-fs/cvmfs/Manifest | 1 +
net-fs/cvmfs/cvmfs-2.10.1.ebuild | 102 +++++++++++++++++++++++++++
net-fs/cvmfs/files/cvmfs-2.10.1-gentoo.patch | 85 ++++++++++++++++++++++
3 files changed, 188 insertions(+)
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 909c3f801d1d..1ca1114aab36 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1 +1,2 @@
+DIST cvmfs-2.10.1.tar.gz 76493991 BLAKE2B 8d3632137b0fa15bcf07254bf7e376bbcadd8cb87c55ddb96ed98cb2c6cdee4dfdcadf0054a29ac0df93337aeaeec07b0f1edd2caae9adbaf9b1ed2a21bb9949 SHA512 a0c23c40fdd3ff53bfdfb53b347506b87ac4954efb4419c12702f9e9038de36a4d83de2e497749890f723b3263ad424ebb3a49c3ff09a9a698a43a2ada7f132f
DIST cvmfs-2.9.4.tar.gz 70494380 BLAKE2B 615834c37f555e70ef5530bed02ac6593ca2b403b6bb27ce97316a58350f387571a2f0c7dada585d80fc0300319fb532e4d89f1efb8bb0dcc42e15ad7efb4ab6 SHA512 1150816bdb56ebe1ed886040d6a0bbcb61cba07122f3dc01307d14fa40942f8d4aca5d66a9a21388bd68cdee67b6818088cc5022f794b754968348357f510fff
diff --git a/net-fs/cvmfs/cvmfs-2.10.1.ebuild b/net-fs/cvmfs/cvmfs-2.10.1.ebuild
new file mode 100644
index 000000000000..ed6c307e4adc
--- /dev/null
+++ b/net-fs/cvmfs/cvmfs-2.10.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info bash-completion-r1
+
+DESCRIPTION="HTTP read-only file system for distributing software"
+HOMEPAGE="https://cernvm.cern.ch/fs/"
+SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="server"
+
+CDEPEND="
+ acct-group/cvmfs
+ acct-user/cvmfs
+ app-arch/libarchive
+ dev-cpp/gtest
+ dev-cpp/sparsehash
+ dev-db/sqlite:3=
+ <dev-libs/leveldb-1.23:0=
+ dev-libs/openssl:0=
+ dev-libs/protobuf:0=
+ net-dns/c-ares:0=
+ net-libs/pacparser:0=
+ net-misc/curl:0[adns]
+ sys-apps/attr
+ sys-fs/fuse:0=
+ sys-fs/fuse:3=
+ sys-libs/libcap:0=
+ sys-libs/zlib:0=
+"
+
+RDEPEND="${CDEPEND}
+ app-admin/sudo
+ net-fs/autofs
+"
+
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.10.1-gentoo.patch
+)
+
+pkg_setup() {
+ if use server; then
+ CONFIG_CHECK="~OVERLAY_FS"
+ ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ cmake_src_prepare
+ # gentoo stuff
+ rm bootstrap.sh || die
+ sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
+ sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
+ CMakeLists.txt || die
+ eapply_user
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILTIN_EXTERNALS=OFF
+ -DBUILD_CVMFS=ON
+ -DBUILD_LIBCVMFS=OFF # static library used only for development
+ -DBUILD_DOCUMENTATION=OFF
+ -DBUILD_GEOAPI=OFF # only used for stratum 1 servers
+ -DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
+ -DBUILD_PRELOADER=OFF # special purpose utility for HPCs
+ -DBUILD_RECEIVER=OFF # for distributed publishers only
+ -DBUILD_SERVER=$(usex server)
+ -DINSTALL_BASH_COMPLETION=OFF
+ -DINSTALL_MOUNT_SCRIPTS=ON
+ -DINSTALL_PUBLIC_KEYS=ON
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config
+ bashcomp_alias cvmfs_config cvmfs_server
+ dodoc doc/*.md
+ keepdir /var/lib/cvmfs
+ use server && keepdir /var/lib/cvmfs-server
+}
+
+pkg_config() {
+ einfo "Setting up CernVM-FS client"
+ cvmfs_config setup
+ einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
+ einfo "and restart the autofs service"
+}
diff --git a/net-fs/cvmfs/files/cvmfs-2.10.1-gentoo.patch b/net-fs/cvmfs/files/cvmfs-2.10.1-gentoo.patch
new file mode 100644
index 000000000000..d988b6e67313
--- /dev/null
+++ b/net-fs/cvmfs/files/cvmfs-2.10.1-gentoo.patch
@@ -0,0 +1,85 @@
+
+Patch to unbundle dependencies to build in Gentoo.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 96d509739..1b214f5a6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -337,6 +337,10 @@ endif ()
+ find_package (OpenSSL REQUIRED)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${OPENSSL_INCLUDE_DIR})
+
++set(Libcrypto_LIBRARIES OpenSSL::Crypto)
++set(Libcrypto_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
++add_definitions(-DLIBRESSL_VERSION_NUMBER=1)
++
+ find_package (Libcrypto REQUIRED)
+ # We do not add the Libcrypto include directories to INCLUDE_DIRECTORIES
+ # to avoid a clash with the system openssl. We only use it for libcvmfs_crypto
+--
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -343,7 +343,7 @@ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS})
+ find_package (GMock REQUIRED)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GMOCK_INCLUDE_DIRS})
+
+-find_package (VJSON REQUIRED)
++add_subdirectory(externals/vjson)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${VJSON_INCLUDE_DIRS})
+
+ find_package (LibArchive REQUIRED)
+diff --git a/externals/vjson/CMakeLists.txt b/externals/vjson/CMakeLists.txt
+new file mode 100644
+index 000000000..c1f82ce03
+--- /dev/null
++++ b/externals/vjson/CMakeLists.txt
+@@ -0,0 +1,8 @@
++project(VJSON)
++
++add_library(cvmfs_vjson STATIC src/block_allocator.cpp src/json.cpp)
++set_property(TARGET cvmfs_vjson PROPERTY POSITION_INDEPENDENT_CODE TRUE)
++target_include_directories(cvmfs_vjson PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
++set(VJSON_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src PARENT_SCOPE)
++set(VJSON_LIBRARY $<TARGET_FILE:cvmfs_vjson> PARENT_SCOPE)
++set(VJSON_LIBRARIES cvmfs_vjson PARENT_SCOPE)
+--
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -356,7 +356,7 @@ 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 (SHA3 REQUIRED)
++ add_subdirectory(externals/sha3)
+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${SHA3_INCLUDE_DIRS})
+ endif ()
+
+diff --git a/externals/sha3/CMakeLists.txt b/externals/sha3/CMakeLists.txt
+new file mode 100644
+index 000000000..7efa79b65
+--- /dev/null
++++ b/externals/sha3/CMakeLists.txt
+@@ -0,0 +1,19 @@
++project(SHA3)
++
++add_library(cvmfs_sha3 STATIC
++ src/64opt/KeccakF-1600-opt64.c
++ src/KeccakHash.c
++ src/KeccakSponge.c
++ src/SnP-FBWL-default.c
++)
++
++set_property(TARGET cvmfs_sha3 PROPERTY POSITION_INDEPENDENT_CODE TRUE)
++
++target_include_directories(cvmfs_sha3 PUBLIC
++ ${CMAKE_CURRENT_SOURCE_DIR}/src
++ ${CMAKE_CURRENT_SOURCE_DIR}/src/64opt
++)
++
++set(SHA3_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src/64opt PARENT_SCOPE)
++set(SHA3_LIBRARY $<TARGET_FILE:cvmfs_sha3> PARENT_SCOPE)
++set(SHA3_LIBRARIES cvmfs_sha3 PARENT_SCOPE)
+--
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/, net-fs/cvmfs/files/
@ 2023-05-16 19:32 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2023-05-16 19:32 UTC (permalink / raw
To: gentoo-commits
commit: a9d83d31484c3e52768f979d834f31cdc8279a80
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 08:54:04 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue May 16 19:32:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d83d31
net-fs/cvmfs: drop 2.9.4-r1
Closes: https://bugs.gentoo.org/905343
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-fs/cvmfs/Manifest | 1 -
net-fs/cvmfs/cvmfs-2.9.4-r1.ebuild | 104 ---------------------
net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch | 95 -------------------
net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch | 41 --------
net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch | 10 --
5 files changed, 251 deletions(-)
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 1ca1114aab36..b071ceed0309 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,2 +1 @@
DIST cvmfs-2.10.1.tar.gz 76493991 BLAKE2B 8d3632137b0fa15bcf07254bf7e376bbcadd8cb87c55ddb96ed98cb2c6cdee4dfdcadf0054a29ac0df93337aeaeec07b0f1edd2caae9adbaf9b1ed2a21bb9949 SHA512 a0c23c40fdd3ff53bfdfb53b347506b87ac4954efb4419c12702f9e9038de36a4d83de2e497749890f723b3263ad424ebb3a49c3ff09a9a698a43a2ada7f132f
-DIST cvmfs-2.9.4.tar.gz 70494380 BLAKE2B 615834c37f555e70ef5530bed02ac6593ca2b403b6bb27ce97316a58350f387571a2f0c7dada585d80fc0300319fb532e4d89f1efb8bb0dcc42e15ad7efb4ab6 SHA512 1150816bdb56ebe1ed886040d6a0bbcb61cba07122f3dc01307d14fa40942f8d4aca5d66a9a21388bd68cdee67b6818088cc5022f794b754968348357f510fff
diff --git a/net-fs/cvmfs/cvmfs-2.9.4-r1.ebuild b/net-fs/cvmfs/cvmfs-2.9.4-r1.ebuild
deleted file mode 100644
index ea5bad4096f5..000000000000
--- a/net-fs/cvmfs/cvmfs-2.9.4-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info bash-completion-r1
-
-DESCRIPTION="HTTP read-only file system for distributing software"
-HOMEPAGE="https://cernvm.cern.ch/fs/"
-SRC_URI="https://ecsft.cern.ch/dist/cvmfs/${P}/source.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="server"
-
-CDEPEND="
- acct-group/cvmfs
- acct-user/cvmfs
- app-arch/libarchive
- dev-cpp/gtest
- dev-cpp/sparsehash
- dev-db/sqlite:3=
- dev-libs/leveldb:0=
- dev-libs/openssl:0=
- dev-libs/protobuf:0=
- net-dns/c-ares:0=
- net-libs/pacparser:0=
- net-misc/curl:0[adns]
- sys-apps/attr
- sys-fs/fuse:0=
- sys-fs/fuse:3=
- sys-libs/libcap:0=
- sys-libs/zlib:0=
-"
-
-RDEPEND="${CDEPEND}
- app-admin/sudo
- net-fs/autofs
-"
-
-DEPEND="${CDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.7.2-builtins.patch
- "${FILESDIR}"/${PN}-2.7.2-find-package.patch
- "${FILESDIR}"/${PN}-2.9.2-include-ctime.patch
-)
-
-pkg_setup() {
- if use server; then
- CONFIG_CHECK="~OVERLAY_FS"
- ERROR_AUFS_FS="CONFIG_OVERLAY_FS: is required to be set"
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
- # gentoo stuff
- rm bootstrap.sh || die
- sed -i -e "s:/usr/bin/systemctl:/bin/systemctl:g" cvmfs/cvmfs_config || die
- sed -i -e 's/COPYING//' -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \
- CMakeLists.txt || die
- eapply_user
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILTIN_EXTERNALS=OFF
- -DBUILD_CVMFS=ON
- -DBUILD_LIBCVMFS=OFF # static library used only for development
- -DBUILD_DOCUMENTATION=OFF
- -DBUILD_GEOAPI=OFF # only used for stratum 1 servers
- -DBUILD_LIBCVMFS_CACHE=OFF # for exotic cache configs
- -DBUILD_PRELOADER=OFF # special purpose utility for HPCs
- -DBUILD_RECEIVER=OFF # for distributed publishers only
- -DBUILD_SERVER=$(usex server)
- -DINSTALL_BASH_COMPLETION=OFF
- -DINSTALL_MOUNT_SCRIPTS=ON
- -DINSTALL_PUBLIC_KEYS=ON
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- newbashcomp cvmfs/bash_completion/cvmfs.bash_completion cvmfs_config
- bashcomp_alias cvmfs_config cvmfs_server
- dodoc doc/*.md
- keepdir /var/lib/cvmfs
- use server && keepdir /var/lib/cvmfs-server
-}
-
-pkg_config() {
- einfo "Setting up CernVM-FS client"
- cvmfs_config setup
- einfo "Now edit ${EROOT}/etc/cvmfs/default.local"
- einfo "and restart the autofs service"
-}
diff --git a/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch b/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch
deleted file mode 100644
index cbc723a7fd70..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.7.2-builtins.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-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
deleted file mode 100644
index ce4b85f7921f..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.7.2-find-package.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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.9.2-include-ctime.patch b/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch
deleted file mode 100644
index 0dd97cc1f709..000000000000
--- a/net-fs/cvmfs/files/cvmfs-2.9.2-include-ctime.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cvmfs/authz/helper_log.cc 2022-07-04 12:15:08.000000000 +0200
-+++ b/cvmfs/authz/helper_log.cc 2022-09-01 17:55:08.200175687 +0200
-@@ -8,6 +8,7 @@
- #include <fcntl.h>
- #include <syslog.h>
- #include <unistd.h>
-+#include <ctime>
-
- #include <cassert>
- #include <cstdarg>
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-16 19:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-19 7:20 [gentoo-commits] repo/gentoo:master commit in: net-fs/cvmfs/, net-fs/cvmfs/files/ Guilherme Amadio
-- strict thread matches above, loose matches on Subject: below --
2020-06-19 9:26 Guilherme Amadio
2022-09-19 12:11 Guilherme Amadio
2023-02-24 16:37 Guilherme Amadio
2023-05-16 19:32 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox