1 |
commit: 3ed024516671b728a7d4b3da458412911a0fac1c |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 3 10:38:34 2018 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 3 10:40:16 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ed02451 |
7 |
|
8 |
net-fs/cvmfs: remove 2.1.20.0_p05 |
9 |
|
10 |
Package-Manager: Portage-2.3.14, Repoman-2.3.6 |
11 |
|
12 |
net-fs/cvmfs/Manifest | 1 - |
13 |
net-fs/cvmfs/cvmfs-2.1.20.0_p05.ebuild | 114 ---------------- |
14 |
.../files/cvmfs-2.1.20.0_p05-cares-underlink.patch | 106 --------------- |
15 |
.../cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch | 151 --------------------- |
16 |
net-fs/cvmfs/metadata.xml | 1 - |
17 |
5 files changed, 373 deletions(-) |
18 |
|
19 |
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest |
20 |
index 4ddbcf00d9a..a6cc53c24f9 100644 |
21 |
--- a/net-fs/cvmfs/Manifest |
22 |
+++ b/net-fs/cvmfs/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST cvmfs-2.1.20.0-fix05.tar.gz 36877322 BLAKE2B b87de45b68cf69f83515e7a4d3a3bda16f47f4e1986c1a01896b672aa25052f4ca826005f6a8df5c7ddadfaa1f93b344a49ee6769d454f58916155b93a0303b4 SHA512 95dc6d5e433630aecd45e15d59f831b4b1ccd8a439f799ae078a61bd6fd8e4dc10ae72d760352913c1d4d9e50cd5bc71ddd82b40b8b9b59d371d62aa7e62abf6 |
25 |
DIST cvmfs-2.3.5.tar.gz 37771779 BLAKE2B 06366cc1bdc2e133b65ec6f348507ef0d5f752f69b87632b0b27bb5b29e0546922d5a12e406f733341e9c8b7d32f8bd32878e247d98a168d6985a620607720d3 SHA512 7f2d05776a747c72d0aa8b5270cfb46f7dc31a458deee65a4a21446718ba813e4c449f6424c7419345e6ffb7cefce3d328dea7b414fe5a5980f9b93ccac0157b |
26 |
|
27 |
diff --git a/net-fs/cvmfs/cvmfs-2.1.20.0_p05.ebuild b/net-fs/cvmfs/cvmfs-2.1.20.0_p05.ebuild |
28 |
deleted file mode 100644 |
29 |
index 6e758132e03..00000000000 |
30 |
--- a/net-fs/cvmfs/cvmfs-2.1.20.0_p05.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,114 +0,0 @@ |
33 |
-# Copyright 1999-2015 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=5 |
37 |
- |
38 |
-inherit cmake-utils |
39 |
- |
40 |
-MYP=${PN}-${PV/_p/-fix} |
41 |
- |
42 |
-DESCRIPTION="HTTP read-only file system for distributing software" |
43 |
-HOMEPAGE="http://cernvm.cern.ch/portal/filesystem" |
44 |
-SRC_URI="https://github.com/cvmfs/${PN}/archive/${MYP}.tar.gz" |
45 |
- |
46 |
-LICENSE="BSD" |
47 |
-SLOT="0" |
48 |
- |
49 |
-KEYWORDS="~amd64 ~x86" |
50 |
-IUSE="+client debug doc test server" |
51 |
- |
52 |
-CDEPEND=" |
53 |
- dev-cpp/gtest |
54 |
- dev-db/sqlite:3= |
55 |
- dev-libs/openssl:0 |
56 |
- net-libs/pacparser:0= |
57 |
- net-misc/curl:0=[adns] |
58 |
- sys-apps/attr |
59 |
- sys-libs/zlib:0= |
60 |
- client? ( |
61 |
- >=dev-cpp/sparsehash-1.12 |
62 |
- dev-libs/leveldb:0= |
63 |
- sys-fs/fuse:0= ) |
64 |
- server? ( |
65 |
- >=dev-python/geoip-python-1.3.1 |
66 |
- >=dev-cpp/tbb-4.2:0= )" |
67 |
- |
68 |
-RDEPEND="${CDEPEND} |
69 |
- client? ( net-fs/autofs )" |
70 |
-# server? ( www-servers/apache[ssl] )" |
71 |
- |
72 |
-DEPEND="${CDEPEND} |
73 |
- virtual/pkgconfig |
74 |
- doc? ( app-doc/doxygen[dot] )" |
75 |
- |
76 |
-S="${WORKDIR}/${PN}-${MYP}" |
77 |
- |
78 |
-src_prepare() { |
79 |
- epatch \ |
80 |
- "${FILESDIR}"/${P}-geoip-missing-cmake.patch \ |
81 |
- "${FILESDIR}"/${P}-cares-underlink.patch |
82 |
- # gentoo stuff |
83 |
- sed -i -e 's/COPYING//' CMakeLists.txt || die |
84 |
- rm bootstrap.sh || die |
85 |
- sed -i \ |
86 |
- -e "s:cvmfs-\${CernVM-FS_VERSION_STRING}:${PF}:" \ |
87 |
- CMakeLists.txt || die |
88 |
- |
89 |
- # hack for bundled vjson |
90 |
- # vjson not worth unbundling, already upstream obsolete |
91 |
- # upstream replaced by gason with a new api |
92 |
- if use server; then |
93 |
- sed -i \ |
94 |
- -e 's/g++/$(CXX)/g' \ |
95 |
- -e 's/-O2/$(CXXFLAGS)/g' \ |
96 |
- -e 's/ar/$(AR)/' \ |
97 |
- -e 's/ranlib/$(RANLIB)/' \ |
98 |
- externals/vjson/src/Makefile || die |
99 |
- mkdir -p "${WORKDIR}/${P}_build"/externals/build_vjson |
100 |
- cp externals/vjson/src/* "${WORKDIR}/${P}_build"/externals/build_vjson/ || die |
101 |
- fi |
102 |
- cmake-utils_src_prepare |
103 |
-} |
104 |
- |
105 |
-src_configure() { |
106 |
- local mycmakeargs=( |
107 |
- -DGEOIP_BUILTIN=OFF |
108 |
- -DGOOGLETEST_BUILTIN=OFF |
109 |
- -DLEVELDB_BUILTIN=OFF |
110 |
- -DLIBCURL_BUILTIN=OFF |
111 |
- -DPACPARSER_BUILTIN=OFF |
112 |
- -DSPARSEHASH_BUILTIN=OFF |
113 |
- -DSQLITE3_BUILTIN=OFF |
114 |
- -DTBB_PRIVATE_LIB=OFF |
115 |
- -DZLIB_BUILTIN=OFF |
116 |
- $(cmake-utils_use debug BUILD_SERVER_DEBUG) |
117 |
- $(cmake-utils_use server BUILD_SERVER) |
118 |
- $(cmake-utils_use client BUILD_CVMFS) |
119 |
- $(cmake-utils_use client BUILD_LIBCVMFS) |
120 |
- $(cmake-utils_use client INSTALL_MOUNT_SCRIPTS) |
121 |
- $(cmake-utils_use test BUILD_UNITTESTS) |
122 |
- ) |
123 |
- cmake-utils_src_configure |
124 |
-} |
125 |
- |
126 |
-src_compile() { |
127 |
- cmake-utils_src_compile |
128 |
- if use doc; then |
129 |
- cd doc |
130 |
- doxygen cvmfs.doxy || die |
131 |
- fi |
132 |
-} |
133 |
- |
134 |
-src_install() { |
135 |
- cmake-utils_src_install |
136 |
- use doc && dohtml -r doc/html/* |
137 |
-} |
138 |
- |
139 |
-pkg_config() { |
140 |
- if use client; then |
141 |
- einfo "Setting up CernVM-FS client" |
142 |
- cvmfs_config setup |
143 |
- einfo "Now edit ${EROOT%/}/etc/cvmfs/default.local" |
144 |
- einfo "and restart the autofs service" |
145 |
- fi |
146 |
-} |
147 |
|
148 |
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 |
149 |
deleted file mode 100644 |
150 |
index 198d137e7d1..00000000000 |
151 |
--- a/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-cares-underlink.patch |
152 |
+++ /dev/null |
153 |
@@ -1,106 +0,0 @@ |
154 |
-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 |
155 |
---- cvmfs-cvmfs-2.1.20.0-fix05.orig/cmake/Modules/FindCARES.cmake 1970-01-01 00:00:00.000000000 +0000 |
156 |
-+++ cvmfs-cvmfs-2.1.20.0-fix05/cmake/Modules/FindCARES.cmake 2015-07-31 18:35:05.859879354 +0000 |
157 |
-@@ -0,0 +1,35 @@ |
158 |
-+# |
159 |
-+# $Id$ |
160 |
-+# |
161 |
-+# - Find cares |
162 |
-+# Find the native CARES includes and library |
163 |
-+# |
164 |
-+# CARES_INCLUDE_DIRS - where to find cares.h, etc. |
165 |
-+# CARES_LIBRARIES - List of libraries when using cares. |
166 |
-+# CARES_FOUND - True if cares found. |
167 |
-+ |
168 |
-+ |
169 |
-+IF (CARES_INCLUDE_DIRS) |
170 |
-+ # Already in cache, be silent |
171 |
-+ SET(CARES_FIND_QUIETLY TRUE) |
172 |
-+ENDIF (CARES_INCLUDE_DIRS) |
173 |
-+ |
174 |
-+FIND_PATH(CARES_INCLUDE_DIR ares.h) |
175 |
-+ |
176 |
-+SET(CARES_NAMES cares) |
177 |
-+FIND_LIBRARY(CARES_LIBRARY NAMES ${CARES_NAMES} ) |
178 |
-+ |
179 |
-+# handle the QUIETLY and REQUIRED arguments and set CARES_FOUND to TRUE if |
180 |
-+# all listed variables are TRUE |
181 |
-+INCLUDE(FindPackageHandleStandardArgs) |
182 |
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CARES DEFAULT_MSG CARES_LIBRARY CARES_INCLUDE_DIR) |
183 |
-+ |
184 |
-+IF(CARES_FOUND) |
185 |
-+ SET( CARES_LIBRARIES ${CARES_LIBRARY} ) |
186 |
-+ SET( CARES_INCLUDE_DIRS ${CARES_INCLUDE_DIR} ) |
187 |
-+ELSE(CARES_FOUND) |
188 |
-+ SET( CARES_LIBRARIES ) |
189 |
-+ SET( CARES_INCLUDE_DIRS ) |
190 |
-+ENDIF(CARES_FOUND) |
191 |
-+ |
192 |
-+MARK_AS_ADVANCED( CARES_LIBRARIES CARES_INCLUDE_DIRS ) |
193 |
-diff -Nur cvmfs-cvmfs-2.1.20.0-fix05.orig/CMakeLists.txt cvmfs-cvmfs-2.1.20.0-fix05/CMakeLists.txt |
194 |
---- cvmfs-cvmfs-2.1.20.0-fix05.orig/CMakeLists.txt 2015-02-23 13:51:47.000000000 +0000 |
195 |
-+++ cvmfs-cvmfs-2.1.20.0-fix05/CMakeLists.txt 2015-07-31 18:32:34.259882076 +0000 |
196 |
-@@ -252,9 +252,12 @@ |
197 |
- include (${CARES_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt) |
198 |
- include (${LIBCURL_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt) |
199 |
- set (CURL_LIBRARIES "") |
200 |
-+ set (CARES_LIBRARIES "") |
201 |
- else (LIBCURL_BUILTIN) |
202 |
- find_package (CURL REQUIRED) |
203 |
-+ find_package (CARES REQUIRED) |
204 |
- set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${CURL_INCLUDE_DIRS}) |
205 |
-+ set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${CARES_INCLUDE_DIRS}) |
206 |
- if (CURL_INCLUDE_DIRS) |
207 |
- find_program(CURL_CONFIG_EXEC NAMES curl-config) |
208 |
- if (CURL_CONFIG_EXEC) |
209 |
-diff -Nur cvmfs-cvmfs-2.1.20.0-fix05.orig/cvmfs/CMakeLists.txt cvmfs-cvmfs-2.1.20.0-fix05/cvmfs/CMakeLists.txt |
210 |
---- cvmfs-cvmfs-2.1.20.0-fix05.orig/cvmfs/CMakeLists.txt 2015-02-23 13:51:47.000000000 +0000 |
211 |
-+++ cvmfs-cvmfs-2.1.20.0-fix05/cvmfs/CMakeLists.txt 2015-07-31 18:34:36.789879876 +0000 |
212 |
-@@ -271,7 +271,7 @@ |
213 |
- set_target_properties (cvmfs_fuse_debug PROPERTIES VERSION ${CernVM-FS_VERSION_STRING}) |
214 |
- |
215 |
- # link the stuff (*_LIBRARIES are dynamic link libraries *_archive are static link libraries ... one of them will be empty for each dependency) |
216 |
-- 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) |
217 |
-+ 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) |
218 |
- |
219 |
- target_link_libraries (cvmfs2 ${CVMFS_LOADER_LIBS} ${OPENSSL_LIBRARIES} ${LIBFUSE} ${RT_LIBRARY} ${UUID_LIBRARIES} pthread dl) |
220 |
- target_link_libraries (cvmfs_fuse_debug ${CVMFS2_DEBUG_LIBS} ${CVMFS_FUSE_LINK_LIBRARIES}) |
221 |
-@@ -331,7 +331,7 @@ |
222 |
- add_dependencies (libcvmfs cvmfs_only) |
223 |
- |
224 |
- add_executable( test_libcvmfs ${TEST_LIBCVMFS_SOURCES} ) |
225 |
-- 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 ) |
226 |
-+ 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 ) |
227 |
- add_dependencies (test_libcvmfs libcvmfs) |
228 |
- |
229 |
- endif (BUILD_LIBCVMFS) |
230 |
-@@ -371,7 +371,7 @@ |
231 |
- set_target_properties (cvmfs_swissknife PROPERTIES COMPILE_FLAGS "${CVMFS_SWISSKNIFE_CFLAGS}" LINK_FLAGS "${CVMFS_SWISSKNIFE_LD_FLAGS}") |
232 |
- |
233 |
- # link the stuff (*_LIBRARIES are dynamic link libraries) |
234 |
-- 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) |
235 |
-+ 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) |
236 |
- |
237 |
- if (BUILD_SERVER_DEBUG) |
238 |
- add_executable (cvmfs_swissknife_debug ${CVMFS_SWISSKNIFE_DEBUG_SOURCES}) |
239 |
-@@ -399,7 +399,7 @@ |
240 |
- message (WARNING "Debug libraries of TBB were not found. Using the release versions instead.") |
241 |
- set (TBB_DEBUG_LIBRARIES ${TBB_LIBRARIES}) |
242 |
- endif (NOT TBB_DEBUG_LIBRARIES) |
243 |
-- 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) |
244 |
-+ 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) |
245 |
- endif (BUILD_SERVER_DEBUG) |
246 |
- endif (BUILD_SERVER) |
247 |
- |
248 |
-diff -Nur cvmfs-cvmfs-2.1.20.0-fix05.orig/cvmfs/CMakeLists.txt cvmfs-cvmfs-2.1.20.0-fix05/cvmfs/CMakeLists.txt |
249 |
---- cvmfs-cvmfs-2.1.20.0-fix05.orig/test/unittests/CMakeLists.txt.orig 2015-07-31 19:03:06.829849170 +0000 |
250 |
-+++ cvmfs-cvmfs-2.1.20.0-fix05/test/unittests/CMakeLists.txt 2015-07-31 19:03:36.459848638 +0000 |
251 |
-@@ -212,7 +212,7 @@ |
252 |
- endif (BUILD_UNITTESTS_DEBUG) |
253 |
- |
254 |
- # link the stuff (*_LIBRARIES are dynamic link libraries) |
255 |
--set (UNITTEST_LINK_LIBRARIES ${GTEST_LIBRARIES} ${GOOGLETEST_ARCHIVE} ${OPENSSL_LIBRARIES} |
256 |
-+set (UNITTEST_LINK_LIBRARIES ${GTEST_LIBRARIES} ${GOOGLETEST_ARCHIVE} ${OPENSSL_LIBRARIES} ${CARES_LIBRARIES} |
257 |
- ${CURL_LIBRARIES} ${LIBCURL_ARCHIVE} ${CARES_ARCHIVE} |
258 |
- ${SQLITE3_LIBRARY} ${SQLITE3_ARCHIVE} ${TBB_LIBRARIES} |
259 |
- ${ZLIB_LIBRARIES} ${ZLIB_ARCHIVE} ${RT_LIBRARY} ${UUID_LIBRARIES} |
260 |
|
261 |
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 |
262 |
deleted file mode 100644 |
263 |
index e47f61ee894..00000000000 |
264 |
--- a/net-fs/cvmfs/files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch |
265 |
+++ /dev/null |
266 |
@@ -1,151 +0,0 @@ |
267 |
---- /dev/null |
268 |
-+++ cmake/Modules/FindLibGeoIP.cmake |
269 |
-@@ -0,0 +1,68 @@ |
270 |
-+# - Try to find GeoIP headers and libraries |
271 |
-+# |
272 |
-+# Usage of this module as follows: |
273 |
-+# |
274 |
-+# find_package(LibGeoIP) |
275 |
-+# |
276 |
-+# Variables used by this module, they can change the default behaviour and need |
277 |
-+# to be set before calling find_package: |
278 |
-+# |
279 |
-+# LibGeoIP_ROOT_DIR Set this variable to the root installation of |
280 |
-+# libGeoIP if the module has problems finding the |
281 |
-+# proper installation path. |
282 |
-+# |
283 |
-+# Variables defined by this module: |
284 |
-+# |
285 |
-+# LIBGEOIP_FOUND System has GeoIP libraries and headers |
286 |
-+# LibGeoIP_LIBRARY The GeoIP library |
287 |
-+# LibGeoIP_INCLUDE_DIR The location of GeoIP headers |
288 |
-+# HAVE_GEOIP_COUNTRY_EDITION_V6 Whether the API support IPv6 country edition |
289 |
-+# HAVE_GEOIP_CITY_EDITION_REV0_V6 Whether the API supports IPv6 city edition |
290 |
-+ |
291 |
-+find_path(LibGeoIP_ROOT_DIR |
292 |
-+ NAMES include/GeoIPCity.h |
293 |
-+) |
294 |
-+ |
295 |
-+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") |
296 |
-+ # the static version of the library is preferred on OS X for the |
297 |
-+ # purposes of making packages (libGeoIP doesn't ship w/ OS X) |
298 |
-+ set(libgeoip_names libGeoIp.a GeoIP) |
299 |
-+else () |
300 |
-+ set(libgeoip_names GeoIP) |
301 |
-+endif () |
302 |
-+ |
303 |
-+find_library(LibGeoIP_LIBRARY |
304 |
-+ NAMES ${libgeoip_names} |
305 |
-+ HINTS ${LibGeoIP_ROOT_DIR}/lib |
306 |
-+) |
307 |
-+ |
308 |
-+find_path(LibGeoIP_INCLUDE_DIR |
309 |
-+ NAMES GeoIPCity.h |
310 |
-+ HINTS ${LibGeoIP_ROOT_DIR}/include |
311 |
-+) |
312 |
-+ |
313 |
-+include(FindPackageHandleStandardArgs) |
314 |
-+find_package_handle_standard_args(LibGeoIP DEFAULT_MSG |
315 |
-+ LibGeoIP_LIBRARY |
316 |
-+ LibGeoIP_INCLUDE_DIR |
317 |
-+) |
318 |
-+ |
319 |
-+if (LIBGEOIP_FOUND) |
320 |
-+ include(CheckCXXSourceCompiles) |
321 |
-+ set(CMAKE_REQUIRED_INCLUDES ${LibGeoIP_INCLUDE_DIR}) |
322 |
-+ check_cxx_source_compiles(" |
323 |
-+ #include <GeoIPCity.h> |
324 |
-+ int main() { GEOIP_COUNTRY_EDITION_V6; return 0; } |
325 |
-+ " HAVE_GEOIP_COUNTRY_EDITION_V6) |
326 |
-+ check_cxx_source_compiles(" |
327 |
-+ #include <GeoIPCity.h> |
328 |
-+ int main() { GEOIP_CITY_EDITION_REV0_V6; return 0; } |
329 |
-+ " HAVE_GEOIP_CITY_EDITION_REV0_V6) |
330 |
-+ set(CMAKE_REQUIRED_INCLUDES) |
331 |
-+endif () |
332 |
-+ |
333 |
-+mark_as_advanced( |
334 |
-+ LibGeoIP_ROOT_DIR |
335 |
-+ LibGeoIP_LIBRARY |
336 |
-+ LibGeoIP_INCLUDE_DIR |
337 |
-+) |
338 |
-\ No newline at end of file |
339 |
-diff --git a/cmake/Modules/FindPythonModule.cmake b/cmake/Modules/FindPythonModule.cmake |
340 |
-new file mode 100644 |
341 |
-index 0000000..1a29315 |
342 |
---- /dev/null |
343 |
-+++ cmake/Modules/FindPythonModule.cmake |
344 |
-@@ -0,0 +1,24 @@ |
345 |
-+# Find if a Python module is installed |
346 |
-+# Found at http://www.cmake.org/pipermail/cmake/2011-January/041666.html |
347 |
-+# To use do: find_python_module(PyQt4 REQUIRED) |
348 |
-+function(find_python_module module) |
349 |
-+ string(TOUPPER ${module} module_upper) |
350 |
-+ if(NOT PYTHON_${module_upper}) |
351 |
-+ include (FindPythonInterp) |
352 |
-+ if(ARGC GREATER 1 AND ARGV1 STREQUAL "REQUIRED") |
353 |
-+ set(PY_${module}_FIND_REQUIRED TRUE) |
354 |
-+ endif() |
355 |
-+ # A module's location is usually a directory, but for binary modules |
356 |
-+ # it's a .so file. |
357 |
-+ execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" |
358 |
-+ "import re, ${module}; print(re.compile('/__init__.py.*').sub('',${module}.__file__))" |
359 |
-+ RESULT_VARIABLE _${module}_status |
360 |
-+ OUTPUT_VARIABLE _${module}_location |
361 |
-+ ERROR_QUIET |
362 |
-+ OUTPUT_STRIP_TRAILING_WHITESPACE) |
363 |
-+ if(${_${module}_status} EQUAL 0) |
364 |
-+ set(PYTHON_${module_upper} ${_${module}_location} CACHE STRING "Location of Python module ${module}") |
365 |
-+ endif(${_${module}_status} EQUAL 0) |
366 |
-+ endif(NOT PYTHON_${module_upper}) |
367 |
-+ find_package_handle_standard_args(PY_${module} DEFAULT_MSG PYTHON_${module_upper}) |
368 |
-+endfunction(find_python_module) |
369 |
-\ No newline at end of file |
370 |
-diff --git a/cvmfs/CMakeLists.txt b/cvmfs/CMakeLists.txt |
371 |
-index cb09b94..44be85e 100644 |
372 |
---- cvmfs/CMakeLists.txt |
373 |
-+++ cvmfs/CMakeLists.txt |
374 |
-@@ -347,9 +347,9 @@ if (BUILD_SERVER) |
375 |
- # create targets with corresponding sources and static link libraries |
376 |
- add_executable (cvmfs_swissknife ${CVMFS_SWISSKNIFE_SOURCES}) |
377 |
- add_executable (cvmfs_suid_helper ${CVMFS_SUID_HELPER_SOURCES}) |
378 |
-- add_custom_target (geoip ALL) |
379 |
- |
380 |
- if (GEOIP_BUILTIN) |
381 |
-+ add_custom_target (geoip ALL) |
382 |
- add_dependencies (python-geoip libgeoip) |
383 |
- add_dependencies (geoip python-geoip) |
384 |
- endif (GEOIP_BUILTIN) |
385 |
---- CMakeLists.txt.orig 2015-08-04 15:33:53.383868890 +0000 |
386 |
-+++ CMakeLists.txt 2015-08-04 15:58:03.133842858 +0000 |
387 |
-@@ -145,6 +145,12 @@ |
388 |
- endif (EXISTS "${CMAKE_SOURCE_DIR}/bootstrap.sh") |
389 |
- |
390 |
- # |
391 |
-+# include some common functionality |
392 |
-+# |
393 |
-+include (FindPythonModule) |
394 |
-+ |
395 |
-+ |
396 |
-+# |
397 |
- # set some default flags |
398 |
- # |
399 |
- # flags in CMAKE_C**_FLAGS are always passed to the compiler |
400 |
-@@ -309,13 +315,15 @@ |
401 |
- set (INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIRS}) |
402 |
- endif (GOOGLETEST_BUILTIN) |
403 |
- |
404 |
-+if (BUILD_SERVER OR BUILD_UNITTESTS) |
405 |
- if (GEOIP_BUILTIN) |
406 |
- include (${LIBGEOIP_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt) |
407 |
- include (${PYTHON_GEOIP_BUILTIN_LOCATION}/CVMFS-CMakeLists.txt) |
408 |
- else (GEOIP_BUILTIN) |
409 |
-- find_package (GeoIP REQUIRED) |
410 |
-- find_package (python-GeoIP REQUIRED) |
411 |
-+ find_package (LibGeoIP REQUIRED) |
412 |
-+ find_python_module (GeoIP REQUIRED) |
413 |
- endif (GEOIP_BUILTIN) |
414 |
-+endif (BUILD_SERVER OR BUILD_UNITTESTS) |
415 |
- |
416 |
- # required libraries for client and libcvmfs |
417 |
- if (BUILD_CVMFS OR BUILD_LIBCVMFS) |
418 |
|
419 |
diff --git a/net-fs/cvmfs/metadata.xml b/net-fs/cvmfs/metadata.xml |
420 |
index fdf8a07d6ac..74533529685 100644 |
421 |
--- a/net-fs/cvmfs/metadata.xml |
422 |
+++ b/net-fs/cvmfs/metadata.xml |
423 |
@@ -15,7 +15,6 @@ |
424 |
</longdescription> |
425 |
<use> |
426 |
<flag name="aufs">Use AUFS instead of OverlayFS for the server</flag> |
427 |
- <flag name="client">Install the cvmfs client programs and init script</flag> |
428 |
<flag name="preload">Install the cvmfs cache preloader for distributed file systems</flag> |
429 |
<flag name="server">Install the cvmfsd program and init script</flag> |
430 |
<flag name="test-programs">Install unit test programs</flag> |