summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Siegert2022-11-08 12:57:42 +0100
committerFrank Siegert2022-11-08 12:58:34 +0100
commit3423da97d5c3f37ec138661e6acbab23f4d58af1 (patch)
treed0b22ec9d91610a53279828c9cd8d99ab2b8bec3
parent7a6bb7fc0efd1787093c06d58727d53361964d4f (diff)
downloadaur-3423da97d5c3f37ec138661e6acbab23f4d58af1.tar.gz
Update to 2.10.0-1
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD15
-rw-r--r--ctime.patch11
-rw-r--r--externals.patch4
4 files changed, 13 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b275e91b4095..69b94fc6aba1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = cvmfs
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.
- pkgver = 2.9.4
- pkgrel = 2
+ pkgver = 2.10.0
+ pkgrel = 1
url = http://cernvm.cern.ch/portal/filesystem
install = cvmfs.install
arch = x86_64
@@ -19,13 +19,11 @@ pkgbase = cvmfs
depends = leveldb
options = !emptydirs
backup = etc/cvmfs/default.local
- source = https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.9.4/cvmfs-2.9.4.tar.gz
+ source = https://ecsft.cern.ch/dist/cvmfs/cvmfs-2.10.0/cvmfs-2.10.0.tar.gz
source = settings.cmake
source = externals.patch
- source = ctime.patch
- md5sums = 14ad4f039fcb780fb46d582e7d0ec8f8
+ md5sums = bdcb429933c35a28ea0f157e2966a507
md5sums = 20dc60c61077f4a3711463e8686d260d
- md5sums = 9c0825047053ac8b6a06228fc06f873f
- md5sums = b93f5abe62e1cb8aecc84910b9458ba6
+ md5sums = b6f47be4cf99ca4ee6a4c183fc6ba92a
pkgname = cvmfs
diff --git a/PKGBUILD b/PKGBUILD
index 7bde5d3aa599..448bd878579a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
# Contributor: Konstantin Gizdov < arch at kge dot pw >
# Contributor: Lin Further
pkgname=cvmfs
-pkgver=2.9.4
-pkgrel=2
+pkgver=2.10.0
+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"
@@ -17,13 +17,11 @@ install=cvmfs.install
options=('!emptydirs')
source=("https://ecsft.cern.ch/dist/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz"
'settings.cmake'
- 'externals.patch'
- 'ctime.patch'
- )
-md5sums=('14ad4f039fcb780fb46d582e7d0ec8f8'
+ 'externals.patch' # TODO: use libcrypto from system openssl instead of building libressl here?
+ )
+md5sums=('bdcb429933c35a28ea0f157e2966a507'
'20dc60c61077f4a3711463e8686d260d'
- '9c0825047053ac8b6a06228fc06f873f'
- 'b93f5abe62e1cb8aecc84910b9458ba6')
+ 'b6f47be4cf99ca4ee6a4c183fc6ba92a')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
@@ -32,7 +30,6 @@ prepare() {
# We remove all those that are provided by Arch/AUR and leave only
# the ones not currently available
patch -Np1 -i "$srcdir/externals.patch"
- patch -Np1 -i "$srcdir/ctime.patch"
}
build() {
diff --git a/ctime.patch b/ctime.patch
deleted file mode 100644
index 001ed3cb3591..000000000000
--- a/ctime.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -ubr cvmfs-2.9.4-orig/cvmfs/authz/helper_log.cc cvmfs-2.9.4-new/cvmfs/authz/helper_log.cc
---- cvmfs-2.9.4-orig/cvmfs/authz/helper_log.cc 2022-07-04 12:15:08.000000000 +0200
-+++ cvmfs-2.9.4-new/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>
diff --git a/externals.patch b/externals.patch
index ed91ebc321a5..5be5c3fd753b 100644
--- a/externals.patch
+++ b/externals.patch
@@ -4,8 +4,8 @@
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# Build a list of libs that need to be built
--missing_libs="libcurl pacparser zlib sparsehash leveldb googletest ipaddress maxminddb protobuf googlebench sqlite3 vjson sha2 sha3 libarchive go"
-+missing_libs="vjson sha2 sha3"
+-missing_libs="libcurl libcrypto pacparser zlib sparsehash leveldb googletest ipaddress maxminddb protobuf googlebench sqlite3 vjson sha3 libarchive go"
++missing_libs="libcrypto vjson sha3"
if [ x"$BUILD_QC_TESTS" != x"" ]; then
missing_libs="$missing_libs rapidcheck"
fi