diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-fs/cvmfs/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-fs/cvmfs/files')
-rw-r--r-- | net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-cares-underlink.patch | 106 | ||||
-rw-r--r-- | net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch | 151 |
2 files changed, 257 insertions, 0 deletions
diff --git a/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-cares-underlink.patch b/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-cares-underlink.patch new file mode 100644 index 000000000000..198d137e7d15 --- /dev/null +++ b/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-cares-underlink.patch @@ -0,0 +1,106 @@ +diff -Nur cvmfs-cvmfs-2.1.20.0-fix05.orig/cmake/Modules/FindCARES.cmake cvmfs-cvmfs-2.1.20.0-fix05/cmake/Modules/FindCARES.cmake +--- cvmfs-cvmfs-2.1.20.0-fix05.orig/cmake/Modules/FindCARES.cmake 1970-01-01 00:00:00.000000000 +0000 ++++ cvmfs-cvmfs-2.1.20.0-fix05/cmake/Modules/FindCARES.cmake 2015-07-31 18:35:05.859879354 +0000 +@@ -0,0 +1,35 @@ ++# ++# $Id$ ++# ++# - Find cares ++# Find the native CARES includes and library ++# ++# CARES_INCLUDE_DIRS - where to find cares.h, etc. ++# CARES_LIBRARIES - List of libraries when using cares. ++# CARES_FOUND - True if cares found. ++ ++ ++IF (CARES_INCLUDE_DIRS) ++ # Already in cache, be silent ++ SET(CARES_FIND_QUIETLY TRUE) ++ENDIF (CARES_INCLUDE_DIRS) ++ ++FIND_PATH(CARES_INCLUDE_DIR ares.h) ++ ++SET(CARES_NAMES cares) ++FIND_LIBRARY(CARES_LIBRARY NAMES ${CARES_NAMES} ) ++ ++# handle the QUIETLY and REQUIRED arguments and set CARES_FOUND to TRUE if ++# all listed variables are TRUE ++INCLUDE(FindPackageHandleStandardArgs) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(CARES DEFAULT_MSG CARES_LIBRARY CARES_INCLUDE_DIR) ++ ++IF(CARES_FOUND) ++ SET( CARES_LIBRARIES ${CARES_LIBRARY} ) ++ SET( CARES_INCLUDE_DIRS ${CARES_INCLUDE_DIR} ) ++ELSE(CARES_FOUND) ++ SET( CARES_LIBRARIES ) ++ SET( CARES_INCLUDE_DIRS ) ++ENDIF(CARES_FOUND) ++ ++MARK_AS_ADVANCED( CARES_LIBRARIES CARES_INCLUDE_DIRS ) +diff -Nur cvmfs-cvmfs-2.1.20.0-fix05.orig/CMakeLists.txt cvmfs-cvmfs-2.1.20.0-fix05/CMakeLists.txt +--- cvmfs-cvmfs-2.1.20.0-fix05.orig/CMakeLists.txt 2015-02-23 13:51:47.000000000 +0000 ++++ cvmfs-cvmfs-2.1.20.0-fix05/CMakeLists.txt 2015-07-31 18:32:34.259882076 +0000 +@@ -252,9 +252,12 @@ + include (${CARES_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt) + include (${LIBCURL_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt) + set (CURL_LIBRARIES "") ++ set (CARES_LIBRARIES "") + else (LIBCURL_BUILTIN) + find_package (CURL REQUIRED) ++ find_package (CARES REQUIRED) + set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${CURL_INCLUDE_DIRS}) ++ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${CARES_INCLUDE_DIRS}) + if (CURL_INCLUDE_DIRS) + find_program(CURL_CONFIG_EXEC NAMES curl-config) + if (CURL_CONFIG_EXEC) +diff -Nur cvmfs-cvmfs-2.1.20.0-fix05.orig/cvmfs/CMakeLists.txt cvmfs-cvmfs-2.1.20.0-fix05/cvmfs/CMakeLists.txt +--- cvmfs-cvmfs-2.1.20.0-fix05.orig/cvmfs/CMakeLists.txt 2015-02-23 13:51:47.000000000 +0000 ++++ cvmfs-cvmfs-2.1.20.0-fix05/cvmfs/CMakeLists.txt 2015-07-31 18:34:36.789879876 +0000 +@@ -271,7 +271,7 @@ + set_target_properties (cvmfs_fuse_debug PROPERTIES VERSION ${CernVM-FS_VERSION_STRING}) + + # link the stuff (*_LIBRARIES are dynamic link libraries *_archive are static link libraries ... one of them will be empty for each dependency) +- set (CVMFS_FUSE_LINK_LIBRARIES ${SQLITE3_LIBRARY} ${CURL_LIBRARIES} ${PACPARSER_LIBRARIES} ${ZLIB_LIBRARIES} ${LEVELDB_LIBRARIES} ${OPENSSL_LIBRARIES} ${FUSE_LIBRARIES} ${LIBFUSE_ARCHIVE} ${SQLITE3_ARCHIVE} ${LIBCURL_ARCHIVE} ${PACPARSER_ARCHIVE} ${LEVELDB_ARCHIVE} ${CARES_ARCHIVE} ${ZLIB_ARCHIVE} ${RT_LIBRARY} ${UUID_LIBRARIES} pthread dl) ++ set (CVMFS_FUSE_LINK_LIBRARIES ${SQLITE3_LIBRARY} ${CARES_LIBRARIES} ${CURL_LIBRARIES} ${PACPARSER_LIBRARIES} ${ZLIB_LIBRARIES} ${LEVELDB_LIBRARIES} ${OPENSSL_LIBRARIES} ${FUSE_LIBRARIES} ${LIBFUSE_ARCHIVE} ${SQLITE3_ARCHIVE} ${LIBCURL_ARCHIVE} ${PACPARSER_ARCHIVE} ${LEVELDB_ARCHIVE} ${CARES_ARCHIVE} ${ZLIB_ARCHIVE} ${RT_LIBRARY} ${UUID_LIBRARIES} pthread dl) + + target_link_libraries (cvmfs2 ${CVMFS_LOADER_LIBS} ${OPENSSL_LIBRARIES} ${LIBFUSE} ${RT_LIBRARY} ${UUID_LIBRARIES} pthread dl) + target_link_libraries (cvmfs_fuse_debug ${CVMFS2_DEBUG_LIBS} ${CVMFS_FUSE_LINK_LIBRARIES}) +@@ -331,7 +331,7 @@ + add_dependencies (libcvmfs cvmfs_only) + + add_executable( test_libcvmfs ${TEST_LIBCVMFS_SOURCES} ) +- target_link_libraries( test_libcvmfs ${CMAKE_CURRENT_BINARY_DIR}/libcvmfs.a ${SQLITE3_LIBRARY} ${CURL_LIBRARIES} ${PACPARSER_LIBRARIES} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} ${RT_LIBRARY} ${UUID_LIBRARIES} pthread dl ) ++ target_link_libraries( test_libcvmfs ${CMAKE_CURRENT_BINARY_DIR}/libcvmfs.a ${SQLITE3_LIBRARY} ${CARES_LIBRARIES} ${CURL_LIBRARIES} ${PACPARSER_LIBRARIES} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} ${RT_LIBRARY} ${UUID_LIBRARIES} pthread dl ) + add_dependencies (test_libcvmfs libcvmfs) + + endif (BUILD_LIBCVMFS) +@@ -371,7 +371,7 @@ + set_target_properties (cvmfs_swissknife PROPERTIES COMPILE_FLAGS "${CVMFS_SWISSKNIFE_CFLAGS}" LINK_FLAGS "${CVMFS_SWISSKNIFE_LD_FLAGS}") + + # link the stuff (*_LIBRARIES are dynamic link libraries) +- target_link_libraries (cvmfs_swissknife ${CVMFS_SWISSKNIFE_LIBS} ${SQLITE3_LIBRARY} ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${TBB_LIBRARIES} ${OPENSSL_LIBRARIES} ${LIBCURL_ARCHIVE} ${CARES_ARCHIVE} ${SQLITE3_ARCHIVE} ${ZLIB_ARCHIVE} ${RT_LIBRARY} ${VJSON_ARCHIVE} pthread dl) ++ target_link_libraries (cvmfs_swissknife ${CVMFS_SWISSKNIFE_LIBS} ${SQLITE3_LIBRARY} ${CARES_LIBRARIES} ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${TBB_LIBRARIES} ${OPENSSL_LIBRARIES} ${LIBCURL_ARCHIVE} ${CARES_ARCHIVE} ${SQLITE3_ARCHIVE} ${ZLIB_ARCHIVE} ${RT_LIBRARY} ${VJSON_ARCHIVE} pthread dl) + + if (BUILD_SERVER_DEBUG) + add_executable (cvmfs_swissknife_debug ${CVMFS_SWISSKNIFE_DEBUG_SOURCES}) +@@ -399,7 +399,7 @@ + message (WARNING "Debug libraries of TBB were not found. Using the release versions instead.") + set (TBB_DEBUG_LIBRARIES ${TBB_LIBRARIES}) + endif (NOT TBB_DEBUG_LIBRARIES) +- target_link_libraries (cvmfs_swissknife_debug ${CVMFS_SWISSKNIFE_LIBS} ${SQLITE3_LIBRARY} ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} ${LIBCURL_ARCHIVE} ${CARES_ARCHIVE} ${SQLITE3_ARCHIVE} ${ZLIB_ARCHIVE} ${TBB_DEBUG_LIBRARIES} ${RT_LIBRARY} ${VJSON_ARCHIVE} pthread dl) ++ target_link_libraries (cvmfs_swissknife_debug ${CVMFS_SWISSKNIFE_LIBS} ${SQLITE3_LIBRARY} ${CARES_LIBRARIES} ${CURL_LIBRARIES} ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES} ${LIBCURL_ARCHIVE} ${CARES_ARCHIVE} ${SQLITE3_ARCHIVE} ${ZLIB_ARCHIVE} ${TBB_DEBUG_LIBRARIES} ${RT_LIBRARY} ${VJSON_ARCHIVE} pthread dl) + endif (BUILD_SERVER_DEBUG) + endif (BUILD_SERVER) + +diff -Nur cvmfs-cvmfs-2.1.20.0-fix05.orig/cvmfs/CMakeLists.txt cvmfs-cvmfs-2.1.20.0-fix05/cvmfs/CMakeLists.txt +--- cvmfs-cvmfs-2.1.20.0-fix05.orig/test/unittests/CMakeLists.txt.orig 2015-07-31 19:03:06.829849170 +0000 ++++ cvmfs-cvmfs-2.1.20.0-fix05/test/unittests/CMakeLists.txt 2015-07-31 19:03:36.459848638 +0000 +@@ -212,7 +212,7 @@ + endif (BUILD_UNITTESTS_DEBUG) + + # link the stuff (*_LIBRARIES are dynamic link libraries) +-set (UNITTEST_LINK_LIBRARIES ${GTEST_LIBRARIES} ${GOOGLETEST_ARCHIVE} ${OPENSSL_LIBRARIES} ++set (UNITTEST_LINK_LIBRARIES ${GTEST_LIBRARIES} ${GOOGLETEST_ARCHIVE} ${OPENSSL_LIBRARIES} ${CARES_LIBRARIES} + ${CURL_LIBRARIES} ${LIBCURL_ARCHIVE} ${CARES_ARCHIVE} + ${SQLITE3_LIBRARY} ${SQLITE3_ARCHIVE} ${TBB_LIBRARIES} + ${ZLIB_LIBRARIES} ${ZLIB_ARCHIVE} ${RT_LIBRARY} ${UUID_LIBRARIES} diff --git a/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch b/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch new file mode 100644 index 000000000000..e47f61ee894a --- /dev/null +++ b/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch @@ -0,0 +1,151 @@ +--- /dev/null ++++ cmake/Modules/FindLibGeoIP.cmake +@@ -0,0 +1,68 @@ ++# - Try to find GeoIP headers and libraries ++# ++# Usage of this module as follows: ++# ++# find_package(LibGeoIP) ++# ++# Variables used by this module, they can change the default behaviour and need ++# to be set before calling find_package: ++# ++# LibGeoIP_ROOT_DIR Set this variable to the root installation of ++# libGeoIP if the module has problems finding the ++# proper installation path. ++# ++# Variables defined by this module: ++# ++# LIBGEOIP_FOUND System has GeoIP libraries and headers ++# LibGeoIP_LIBRARY The GeoIP library ++# LibGeoIP_INCLUDE_DIR The location of GeoIP headers ++# HAVE_GEOIP_COUNTRY_EDITION_V6 Whether the API support IPv6 country edition ++# HAVE_GEOIP_CITY_EDITION_REV0_V6 Whether the API supports IPv6 city edition ++ ++find_path(LibGeoIP_ROOT_DIR ++ NAMES include/GeoIPCity.h ++) ++ ++if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ++ # the static version of the library is preferred on OS X for the ++ # purposes of making packages (libGeoIP doesn't ship w/ OS X) ++ set(libgeoip_names libGeoIp.a GeoIP) ++else () ++ set(libgeoip_names GeoIP) ++endif () ++ ++find_library(LibGeoIP_LIBRARY ++ NAMES ${libgeoip_names} ++ HINTS ${LibGeoIP_ROOT_DIR}/lib ++) ++ ++find_path(LibGeoIP_INCLUDE_DIR ++ NAMES GeoIPCity.h ++ HINTS ${LibGeoIP_ROOT_DIR}/include ++) ++ ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(LibGeoIP DEFAULT_MSG ++ LibGeoIP_LIBRARY ++ LibGeoIP_INCLUDE_DIR ++) ++ ++if (LIBGEOIP_FOUND) ++ include(CheckCXXSourceCompiles) ++ set(CMAKE_REQUIRED_INCLUDES ${LibGeoIP_INCLUDE_DIR}) ++ check_cxx_source_compiles(" ++ #include <GeoIPCity.h> ++ int main() { GEOIP_COUNTRY_EDITION_V6; return 0; } ++ " HAVE_GEOIP_COUNTRY_EDITION_V6) ++ check_cxx_source_compiles(" ++ #include <GeoIPCity.h> ++ int main() { GEOIP_CITY_EDITION_REV0_V6; return 0; } ++ " HAVE_GEOIP_CITY_EDITION_REV0_V6) ++ set(CMAKE_REQUIRED_INCLUDES) ++endif () ++ ++mark_as_advanced( ++ LibGeoIP_ROOT_DIR ++ LibGeoIP_LIBRARY ++ LibGeoIP_INCLUDE_DIR ++) +\ No newline at end of file +diff --git a/cmake/Modules/FindPythonModule.cmake b/cmake/Modules/FindPythonModule.cmake +new file mode 100644 +index 0000000..1a29315 +--- /dev/null ++++ cmake/Modules/FindPythonModule.cmake +@@ -0,0 +1,24 @@ ++# Find if a Python module is installed ++# Found at http://www.cmake.org/pipermail/cmake/2011-January/041666.html ++# To use do: find_python_module(PyQt4 REQUIRED) ++function(find_python_module module) ++ string(TOUPPER ${module} module_upper) ++ if(NOT PYTHON_${module_upper}) ++ include (FindPythonInterp) ++ if(ARGC GREATER 1 AND ARGV1 STREQUAL "REQUIRED") ++ set(PY_${module}_FIND_REQUIRED TRUE) ++ endif() ++ # A module's location is usually a directory, but for binary modules ++ # it's a .so file. ++ execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" ++ "import re, ${module}; print(re.compile('/__init__.py.*').sub('',${module}.__file__))" ++ RESULT_VARIABLE _${module}_status ++ OUTPUT_VARIABLE _${module}_location ++ ERROR_QUIET ++ OUTPUT_STRIP_TRAILING_WHITESPACE) ++ if(${_${module}_status} EQUAL 0) ++ set(PYTHON_${module_upper} ${_${module}_location} CACHE STRING "Location of Python module ${module}") ++ endif(${_${module}_status} EQUAL 0) ++ endif(NOT PYTHON_${module_upper}) ++ find_package_handle_standard_args(PY_${module} DEFAULT_MSG PYTHON_${module_upper}) ++endfunction(find_python_module) +\ No newline at end of file +diff --git a/cvmfs/CMakeLists.txt b/cvmfs/CMakeLists.txt +index cb09b94..44be85e 100644 +--- cvmfs/CMakeLists.txt ++++ cvmfs/CMakeLists.txt +@@ -347,9 +347,9 @@ if (BUILD_SERVER) + # create targets with corresponding sources and static link libraries + add_executable (cvmfs_swissknife ${CVMFS_SWISSKNIFE_SOURCES}) + add_executable (cvmfs_suid_helper ${CVMFS_SUID_HELPER_SOURCES}) +- add_custom_target (geoip ALL) + + if (GEOIP_BUILTIN) ++ add_custom_target (geoip ALL) + add_dependencies (python-geoip libgeoip) + add_dependencies (geoip python-geoip) + endif (GEOIP_BUILTIN) +--- CMakeLists.txt.orig 2015-08-04 15:33:53.383868890 +0000 ++++ CMakeLists.txt 2015-08-04 15:58:03.133842858 +0000 +@@ -145,6 +145,12 @@ + endif (EXISTS "${CMAKE_SOURCE_DIR}/bootstrap.sh") + + # ++# include some common functionality ++# ++include (FindPythonModule) ++ ++ ++# + # set some default flags + # + # flags in CMAKE_C**_FLAGS are always passed to the compiler +@@ -309,13 +315,15 @@ + set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS}) + endif (GOOGLETEST_BUILTIN) + ++if (BUILD_SERVER OR BUILD_UNITTESTS) + if (GEOIP_BUILTIN) + include (${LIBGEOIP_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt) + include (${PYTHON_GEOIP_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt) + else (GEOIP_BUILTIN) +- find_package (GeoIP REQUIRED) +- find_package (python-GeoIP REQUIRED) ++ find_package (LibGeoIP REQUIRED) ++ find_python_module (GeoIP REQUIRED) + endif (GEOIP_BUILTIN) ++endif (BUILD_SERVER OR BUILD_UNITTESTS) + + # required libraries for client and libcvmfs + if (BUILD_CVMFS OR BUILD_LIBCVMFS) |