updated to v4.7.0

3 files changed, 17 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e8c34b79536..d9a8f98d852b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xrootd
 	pkgdesc = Software framework for fast, low latency, scalable and fault tolerant data access.
-	pkgver = 4.6.1
+	pkgver = 4.7.0
 	pkgrel = 1
 	url = http://xrootd.org/
 	arch = i686
@@ -12,10 +12,8 @@ pkgbase = xrootd
 	provides = xrootd
 	provides = xrootd-abi0
 	options = !emptydirs
-	source = http://xrootd.org/download/v4.6.1/xrootd-4.6.1.tar.gz
-	source = gcc7.patch
-	sha256sums = 0261ce760e8788f85d68918d7702ae30ec677a8f331dae14adc979b4cc7badf5
-	sha256sums = 20f4d966f302e44e4729df6454f4e12570522632a25726e38523f7fbb4b01941
+	source = http://xrootd.org/download/v4.7.0/xrootd-4.7.0.tar.gz
+	sha256sums = 6cc69d9a3694e8dcf2392e9c3b518bd2497a89b3a9f25ffaec62efa52170349b
 
 pkgname = xrootd
 
diff --git a/PKGBUILD b/PKGBUILD
index 1579bbea0ce8..0765a3e28a8b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Konstantin Gizdov < arch at kge dot pw >
 # Contributor: Jan Kašpar < jan.kaspar at gmail dot com >
 pkgname=xrootd
-pkgver=4.6.1
+pkgver=4.7.0
 pkgrel=1
 pkgdesc="Software framework for fast, low latency, scalable and fault tolerant data access."
 provides=('xrootd' 'xrootd-abi0')
@@ -11,25 +11,27 @@ license=('LGPL3')
 depends=('ceph' 'libxml2')
 makedepends=('cmake')
 options=('!emptydirs')
-source=("http://xrootd.org/download/v${pkgver}/xrootd-${pkgver}.tar.gz"
-        'gcc7.patch')
-sha256sums=('0261ce760e8788f85d68918d7702ae30ec677a8f331dae14adc979b4cc7badf5'
-            '20f4d966f302e44e4729df6454f4e12570522632a25726e38523f7fbb4b01941')
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    patch -p1 -i "${srcdir}/gcc7.patch"
-    cd "${srcdir}"
-    rm -rf "build"
-    mkdir "build"
-    cd "build"
+source=("http://xrootd.org/download/v${pkgver}/xrootd-${pkgver}.tar.gz")
+sha256sums=('6cc69d9a3694e8dcf2392e9c3b518bd2497a89b3a9f25ffaec62efa52170349b')
+
+prepare() {
+    # cd "${srcdir}/${pkgname}-${pkgver}"
+    # patch -p1 -i "${srcdir}/gcc7.patch"
+
+    rm -rf "${srcdir}/build"
+    mkdir -p "${srcdir}/build"
+    cd "${srcdir}/build"
 
     msg2 'Configuring...'
     cmake "${srcdir}/${pkgname}-${pkgver}" \
           -DCMAKE_BUILD_TYPE:STRING=Release \
           -DCMAKE_INSTALL_LIBDIR:PATH=lib \
           -DCMAKE_INSTALL_PREFIX:PATH=/usr
+}
 
+build() {
     msg2 'Compiling...'
+    cd "${srcdir}/build"
     make ${MAKEFLAGS}
 }
 
diff --git a/gcc7.patch b/gcc7.patch
deleted file mode 100644
index afc99c7769ba..000000000000
--- a/gcc7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -aur xrootd-4.6.0-old/src/XrdCns/XrdCnsSsi.cc xrootd-4.6.0-new/src/XrdCns/XrdCnsSsi.cc
---- xrootd-4.6.0-old/src/XrdCns/XrdCnsSsi.cc	2017-02-06 17:12:16.000000000 +0100
-+++ xrootd-4.6.0-new/src/XrdCns/XrdCnsSsi.cc	2017-05-30 14:54:32.220679575 +0200
-@@ -60,7 +60,9 @@
- {
- char Info[XrdCnsLogRec::FixDLen];
- 
--void Updt(const char *nInfo) {strncpy(Info, nInfo, sizeof(Info));}
-+void Updt(const char *nInfo) {
-+     if(nInfo == NULL) nInfo = "";
-+     strncpy(Info, nInfo, sizeof(Info));}
- 
-      XrdCnsSsiFRec(const char *Data) {if (!Data) Data = XrdCnsLogRec::iArg;
-                                       strncpy(Info, Data, sizeof(Info));
-diff -aur xrootd-4.6.0-old/src/XrdXrootd/XrdXrootdJob.cc xrootd-4.6.0-new/src/XrdXrootd/XrdXrootdJob.cc
---- xrootd-4.6.0-old/src/XrdXrootd/XrdXrootdJob.cc	2017-02-06 17:12:16.000000000 +0100
-+++ xrootd-4.6.0-new/src/XrdXrootd/XrdXrootdJob.cc	2017-05-30 14:54:32.224013013 +0200
-@@ -324,6 +324,7 @@
-    for (i = 0; i < numClients; i++)
-        if (!Client[i].Link->isInstance(Client[i].Inst))
-           {k = i;
-+           if(i == numClients - 1) continue;
-            for (j = i+1; j < numClients; j++,k++) Client[k] = Client[j];
-            numClients--; i--;
-           }