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 <[email protected]> -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 <[email protected]> -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>
