Arch Linux User Repository

Dear CvmFS package maintainers, @fsiegert, @vandelli, Thanks from the devs for your great efforts in maintaining this package. I had a look at the PKGBUILD if there's anything to upstream and have added a cmake option in the recently released 2.13.2 that allows you to drop the externals.patch. Here's my proposal for a patch to update:

diff --git a/PKGBUILD b/PKGBUILD
index 361501a..f8957b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,36 +4,26 @@
 # Contributor: Konstantin Gizdov < arch at kge dot pw >
 # Contributor: Lin Further 
 pkgname=cvmfs
-pkgver=2.13.1
-pkgrel=2
+pkgver=2.13.2
+pkgrel=1
 pkgdesc="A client-server file system implemented in FUSE and developed to deliver software distributions onto virtual machines in a fast, scalable, and reliable way."
 arch=('x86_64')
 url="http://cernvm.cern.ch/portal/filesystem"
 license=('BSD')
 depends=('fuse2' 'curl' 'c-ares' 'pacparser' 'sqlite' 'leveldb')
-makedepends=('cmake' 'make' 'gtest' 'sparsehash')
+makedepends=('cmake' 'make' 'gtest' 'sparsehash' 'help2man')
 backup=('etc/cvmfs/default.local')
 install=cvmfs.install
 options=('!emptydirs')
-source=("https://ecsft.cern.ch/dist/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz"
-        'settings.cmake'
-        'externals.patch' # TODO: use libcrypto from system openssl instead of building libressl here?
+source=("https://github.com/cvmfs/cvmfs/archive/refs/tags/$pkgname-$pkgver.tar.gz"
+        'settings.cmake' # TODO: use libcrypto from system openssl instead of building libressl here?
        )
-md5sums=('a47c44910e4e44c9fa7f05dd7dcdfd9d'
-         '20dc60c61077f4a3711463e8686d260d'
-         '0b8d3324e5d7821d0182f1409888f473')
-
-prepare() {
-    cd "$srcdir/$pkgname-$pkgver"
-
-    # Tweak external packages
-    # We remove all those that are provided by Arch/AUR and leave only
-    # the ones not currently available
-    patch -Np1 -i "$srcdir/externals.patch"
-}
+md5sums=('8b64afe4e7acfe1b847a52d67b9a289a'
+         '2c0adcc2f67d0294d47583a77c06a88b')

 build() {
-    cd "$srcdir/$pkgname-$pkgver"
+    # github tarballs have naming convention projectname-tagname, and tags are called cvmfs-2.XX.Y
+    cd "$srcdir/$pkgname-$pkgname-$pkgver"
     mkdir -p build
     cd build
     cmake -C "${srcdir}/settings.cmake" -DCMAKE_BUILD_TYPE=Release ../
@@ -42,11 +32,11 @@ build() {
 }

 package() {
-    cd "$srcdir/$pkgname-$pkgver/build"
+    cd "$srcdir/$pkgname-$pkgname-$pkgver/build"
     make DESTDIR="$pkgdir/" install
     sed -e "s/\/etc\/auto.master/\/etc\/autofs\/auto.master/g" -i $pkgdir/usr/bin/cvmfs_config
     sed "s/\/etc\/auto.cvmfs/\/etc\/autofs\/auto.cvmfs/g" -i $pkgdir/usr/bin/cvmfs_config
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/cvmfs/COPYING"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgname}-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/cvmfs/COPYING"
     mkdir -p ${pkgdir}/etc/autofs
     ln -s /usr/lib/${pkgname}/auto.cvmfs ${pkgdir}/etc/autofs/auto.cvmfs

diff --git a/settings.cmake b/settings.cmake
index ac83d1f..d0889dd 100644
--- a/settings.cmake
+++ b/settings.cmake
@@ -2,3 +2,4 @@ set (BUILD_SERVER              OFF CACHE BOOL "" FORCE)
 set (BUILD_RECEIVER            OFF CACHE BOOL "" FORCE)
 set (BUILD_LIBCVMFS_CACHE      OFF CACHE BOOL "" FORCE)
 set (BUILD_LIBCVMFS            OFF CACHE BOOL "" FORCE)
+set (BUILTIN_EXTERNALS_LIST    "libcrypto;vjson;sha3" CACHE STRING "" FORCE)

• This patch also takes pacparser from the system. The compilation has been fixed recently.
• The source tarball url is changed to github. I feel that that is more reliable
• Also adds help2man to the makedepends in order to install manpages.

I've made a note of the numerous compilation warnings and the questions in the .INSTALL and will update that when I find the time.

Cheers, Valentin

Maybe should update the md5sum to sha256sums

Updated the package with clean build and it worked fine.

Thanks Frank, and no worries - earlier commenters solved the problem and it was easy for me to implement locally.

Cheers, Ben

Hi @bwynneHEP and @kgizdov,

Sorry about the late response. I have updated the PKGBUILD, and it seems to work for me. Can you try?

Best,
Frank

Hi @fsiegert!

@kgizdov told me to submit a patch this way - hope it helps. Of course, it's a patch to a patch, which begins to look a little confusing.

diff --git a/externals.patch b/externals.patch
index e64c4c6..e82c82c 100644
--- a/externals.patch
+++ b/externals.patch
@@ -5,7 +5,7 @@

  # Build a list of libs that need to be built
 -missing_libs="libcurl libcrypto pacparser zlib sparsehash leveldb googletest maxminddb protobuf sqlite3 vjson sha3 libarchive"
-+missing_libs="libcrypto vjson sha3"
++missing_libs="libcrypto vjson sha3 protobuf"

  if [ x"$BUILD_QC_TESTS" != x"" ]; then
      missing_libs="$missing_libs rapidcheck"

@nikoladze Same problem here, I added protobuf back to externals.patch but now I get even more build errors.

@fsiegert Could you please fix the build? I have the current version installed (2.12.7-1) but when trying to mount I get this error:

CernVM-FS: loading Fuse module... failed to load cvmfs library, tried: './libcvmfs_fuse_debug.so

so probably a rebuild is due but currently it fails.

Update: I had a dirty build folder, adding protobuf as suggested by nikoladze and building from clean with makepkg -C worked. After the rebuild the mount is working again.

I had problems recompiling cvmfs after a recent update - got an error related to protobuf. Adding protobuf back in externals.patch fixed it for me.

Thanks for confirming! I have forwarded the fix upstream at https://github.com/cvmfs/cvmfs/pull/3046

Thanks, that builds again now.

@DiV21dSREL Can you try now, please?