Fixed geoip patch to only check when server flag is set (bug #556570). Applied upstream.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

3 files changed, 18 insertions, 6 deletions

diff --git a/net-fs/cvmfs/ChangeLog b/net-fs/cvmfs/ChangeLog
index b1e3e9d62398..2cb95d89090e 100644
--- a/net-fs/cvmfs/ChangeLog
+++ b/net-fs/cvmfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/cvmfs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/ChangeLog,v 1.12 2015/07/31 20:09:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/cvmfs/ChangeLog,v 1.13 2015/08/04 16:18:46 bicatali Exp $
+
+  04 Aug 2015; Sébastien Fabbro <bicatali@gentoo.org>
+  files/cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch:
+  Fixed geoip patch to only check when server flag is set (bug #556570). Applied
+  upstream.
 
 *cvmfs-2.1.20.0_p05 (31 Jul 2015)
 
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 9771c22331d4..1797b45cb5e9 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,9 +1,9 @@
 AUX cvmfs-2.1.20.0_p05-cares-underlink.patch 7033 SHA256 0d1e816d27fe1915020ec363fbe970d1d3aea4482dd0d43dbd74c9a430bf3561 SHA512 dd56aea82874746a122929bcd5cd9884ac1460385bdbe31ad034c54eea30c4e9432e423ab213215a5b6bf7d9b3913dccc5c9caa6b3149b4b454f3b19171ee6b9 WHIRLPOOL 78c6337b237d7ced33a76a09768d7a2bbc4d47f2263981d869c606f9b6b9d5f898f97a7bae9b4e74127f5f18c5b545e0e378e5d805bf325ebd84781d9760ce32
-AUX cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch 4902 SHA256 3331cee12cdec3a085489dd95f371eaaad1a437483c6d7b3251f379cf2293d38 SHA512 315e8a4513d4df1ed83bc685c41f8b0015269a49689f7850a669bf4beb6c219ed3c2647ef9690d8da9f5f819f0b88b7a7f2e643b0b775ee00a3282ee30a4fa6d WHIRLPOOL d5981df8646ee722c2f63974132a344843c0fd6022275c5270ee7bc72b804846c11e9864b080d1ca0a4c90b236085b018198c37a1dfcbb83a305df57745542a3
+AUX cvmfs-2.1.20.0_p05-geoip-missing-cmake.patch 5143 SHA256 070ed4e5d873637c9e88c5a90f5a048002f71f55f7fbde40242adcb085160f6f SHA512 0aebcabfef27a04f9ba88253ead2c323f2871434d1c397a26e61981970cc838ae7988337676dd75ac0f3eaf02933664960c57e6671a066f7a91e61e5844a49f5 WHIRLPOOL ba199f8cdbf7a40cb975afd4b90ff9dc0ec6f62abd84a06e313bf9ef10a96eb5a31475b6c5f903875d100bcd5c7370cc35778b0ea65d5eb63a1cc1d9bd42822b
 DIST cvmfs-2.1.19.tar.gz 34454888 SHA256 9f86629eba17d8f21222f50e3f693038b6a99798b74913d12c7583199df677b1 SHA512 ea2b68a545b5b20eacbe5244283f71f977365dce7cf09e3b0ef045fe5044b2835e81a79deaed74afaec44cfd25df602ebffaf26d0fe1f5ce6032e71ba10ffdc7 WHIRLPOOL 14fa079be91dce64151c60ec2fda6c2a874957e3388da98e1d51ce1536e67b9b56d40a1c7f98862743120d7230b789f6c7e524983a58e58ef409f028613d2c64
 DIST cvmfs-2.1.20.0-fix05.tar.gz 36877322 SHA256 83d9358bebdd3987472ed602efb7b0d06b586216030e02bc100a363dc7bbfc20 SHA512 95dc6d5e433630aecd45e15d59f831b4b1ccd8a439f799ae078a61bd6fd8e4dc10ae72d760352913c1d4d9e50cd5bc71ddd82b40b8b9b59d371d62aa7e62abf6 WHIRLPOOL a9ab8500ddd31466df26c12fbcaf0403e748fc1d52c9b5eefa495bc1aaa1f1c67e5f679407d55143fe161f7de7be0d52284cb947a63ff0e0a3f63ade879bb21c
 EBUILD cvmfs-2.1.19.ebuild 2470 SHA256 02cf4a7d937d20369c7c98df7eea7e0031ad393466130c71252b4fd415266dfe SHA512 ab7a83b992c1706938b08ac1c5382dd39f640efd039f671a594f0473f06dfb9be40d80e912d6e5d4fc24826293097e5832da7d72c836fad87049ebd49afddc0c WHIRLPOOL 5f95efe363b676d521f9f6f8b28153591dc65bd67f2bcc87e21b119d25af95a2c146e4763e2f42ca77e28a79013c382bd87c024ba06001c523e5a47b1287081e
 EBUILD cvmfs-2.1.20.0_p05.ebuild 2741 SHA256 ca5768b4c63ef967fe0baf488d72fa1fae0fa991b9679c9130d7a7f186e81989 SHA512 77d384a0e4102aa42afc665b68885fc1c6d17809797e0338fa5dd63e9e96b8df8f53208a7b4f6ed5a7e3a484e6e51ef6f48ee6283fdc7411249e36b69eb571f4 WHIRLPOOL 8220fa2a4ae4289706996557868d689fb379fd7e6750c386d68a13d67caccaf9fe070c4ca54f1715be8a790d2d76b100c482d000d83354a0dd74f52886a788a8
 EBUILD cvmfs-9999.ebuild 2571 SHA256 be441299cf84a9f3851854aaf65509b2b0238eabe2b37fdeb475bc1acaf11447 SHA512 0e93f2eae2bd6e18fd5846f04e46a470c397b4ae2537d607b5494540eb7049684b713e8e978c5853d804cbfa85b2aaeb0abeebab50a3ae19edc98f94533e2b08 WHIRLPOOL 2b47825cc163478b6936eb6b8442150f27d9aba77db7cb6431a34708df0f326bec4706cdffb2d862bc19d3793786050b4dbee32241dc59c93cd0b2fed82268e4
-MISC ChangeLog 3350 SHA256 8ced64b192716eb95e6545f2c07303f5b3214ed243703e965e0159c2e16627d4 SHA512 dd9c42be641edc638ee3b84186937391d5ee1e26ef3bc4fb748d14ec59ad5b522900002c32e626a88ad59d823aff9345f8cd0a1929befc65ba82b81fbe66ac06 WHIRLPOOL 59d58e65fc79fefde05ec89107589daf7f89993d5dc681c67a43beb054bdc658960636f3753e4f668e4410579f6e71240a77bb0766a6a8af948f34ff1702dc60
+MISC ChangeLog 3553 SHA256 9be9437747604ba974b467796fdeeab5de2d6503f368939b12de1cebe3ec8b5f SHA512 f54bb3c798e98be1c53fbc27cfe51a40fd9616da28f1415fdfab268e3551626c4f15922b567e3bdbf6c9827810635b70a61c23f1a9b450b6bd9c1fbff0cd192e WHIRLPOOL e88225aaf7bc76cedf95aeb5cbc517b777f4b308714fdf8f555ad9fdac39d588c1e94c6444819fbcbee741be25c4a39af94273ad3626196b4de12f82056f9945
 MISC metadata.xml 962 SHA256 8e663c6e3488bdb8cf49d7a3f03549fe093597522e25dd61a4cdde390ccc0091 SHA512 ad7ae2a380fabb7a3d65d04318e084f2e19310e6a4c22abf2f23ecf90cffd8be762fc93e26e3f4d7ddd05a168baca4cf903d7bff7f87d0dbe7dfc5c57b303b9d WHIRLPOOL bfd28004471a97a1a708ad42b84bd0aad99a9eb94fb200dc39986d3eaacfccf767fda17712533a217e623031dca0f1fb2e5bf3ba2ced122d9014d7cd11c8f7fc
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
index 9f4ba360a509..e47f61ee894a 100644
--- 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
@@ -116,8 +116,8 @@ index cb09b94..44be85e 100644
      add_dependencies (python-geoip libgeoip)
      add_dependencies (geoip python-geoip)
    endif (GEOIP_BUILTIN)
---- CMakeLists.txt.orig	2015-02-23 13:51:47.000000000 +0000
-+++ CMakeLists.txt	2015-07-31 17:57:17.019920094 +0000
+--- 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")
  
@@ -131,7 +131,12 @@ index cb09b94..44be85e 100644
  # set some default flags
  #
  # flags in CMAKE_C**_FLAGS are always passed to the compiler
-@@ -313,8 +319,8 @@
+@@ -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)
@@ -140,5 +145,7 @@ index cb09b94..44be85e 100644
 +  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)