summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD11
-rw-r--r--fix_buffer_overflow.patch12
3 files changed, 25 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cf934e517ad4..8ad8aed40983 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.8.2
+ pkgver = 4.8.3
pkgrel = 1
url = http://xrootd.org/
arch = i686
@@ -12,8 +12,10 @@ pkgbase = xrootd
provides = xrootd
provides = xrootd-abi0
options = !emptydirs
- source = http://xrootd.org/download/v4.8.2/xrootd-4.8.2.tar.gz
- sha256sums = 8f28ec53e799d4aa55bd0cc4ab278d9762e0e57ac40a4b02af7fc53dcd1bef39
+ source = http://xrootd.org/download/v4.8.3/xrootd-4.8.3.tar.gz
+ source = fix_buffer_overflow.patch
+ sha256sums = 9cd30a343758b8f50aea4916fa7bd37de3c37c5b670fe059ae77a8b2bbabf299
+ sha256sums = d52b193d3e8c96064f2d151484abd433dd47835cfe0031b31bcfab2c17b69b85
pkgname = xrootd
diff --git a/PKGBUILD b/PKGBUILD
index 1d7b35f6649f..dd27715302fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Jan Kašpar < jan.kaspar at gmail dot com >
# Contributor: Alex Pearce < alex at alexpearce dot me >
pkgname=xrootd
-pkgver=4.8.2
+pkgver=4.8.3
pkgrel=1
pkgdesc="Software framework for fast, low latency, scalable and fault tolerant data access."
provides=('xrootd' 'xrootd-abi0')
@@ -12,10 +12,15 @@ license=('LGPL3')
depends=('ceph' 'libxml2')
makedepends=('cmake')
options=('!emptydirs')
-source=("http://xrootd.org/download/v${pkgver}/xrootd-${pkgver}.tar.gz")
-sha256sums=('8f28ec53e799d4aa55bd0cc4ab278d9762e0e57ac40a4b02af7fc53dcd1bef39')
+source=("http://xrootd.org/download/v${pkgver}/xrootd-${pkgver}.tar.gz"
+ 'fix_buffer_overflow.patch')
+sha256sums=('9cd30a343758b8f50aea4916fa7bd37de3c37c5b670fe059ae77a8b2bbabf299'
+ 'd52b193d3e8c96064f2d151484abd433dd47835cfe0031b31bcfab2c17b69b85')
prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i "${srcdir}/fix_buffer_overflow.patch"
+
rm -rf "${srcdir}/build"
mkdir -p "${srcdir}/build"
cd "${srcdir}/build"
diff --git a/fix_buffer_overflow.patch b/fix_buffer_overflow.patch
new file mode 100644
index 000000000000..32d3e1a3d907
--- /dev/null
+++ b/fix_buffer_overflow.patch
@@ -0,0 +1,12 @@
+diff -aur xrootd-4.8.3-old/src/XrdApps/XrdCpFile.cc xrootd-4.8.3-new/src/XrdApps/XrdCpFile.cc
+--- xrootd-4.8.3-old/src/XrdApps/XrdCpFile.cc 2018-05-13 19:01:03.602433537 +0200
++++ xrootd-4.8.3-new/src/XrdApps/XrdCpFile.cc 2018-05-13 19:01:48.269454421 +0200
+@@ -88,7 +88,7 @@
+ for (i = 0; i < pTnum; i++)
+ {if (!strncmp(FSpec, pTab[i].pHdr, pTab[i].pHsz))
+ {Protocol = pTab[i].pVal;
+- strncpy(ProtName, pTab[i].pHdr, pTab[i].pHsz-3);
++ memcpy(ProtName, pTab[i].pHdr, pTab[i].pHsz-3);
+ return;
+ }
+ }