[arch-commits] Commit in cvs/trunk (PKGBUILD)

[Stéphane Gaudreault]

    Date: Wednesday, December 1, 2010 @ 09:33:51
  Author: stephane
Revision: 101751

upgpkg: cvs 1.11.23-6
Tidy up PKGBUILD, CVE-2010-3846

Modified:
  cvs/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-01 13:49:08 UTC (rev 101750)
+++ PKGBUILD	2010-12-01 14:33:51 UTC (rev 101751)
@@ -3,7 +3,7 @@
 
 pkgname=cvs
 pkgver=1.11.23
-pkgrel=5
+pkgrel=6
 pkgdesc="Concurrent Versions System - a source control system"
 arch=(i686 x86_64)
 url="http://cvs.nongnu.org"
@@ -11,18 +11,29 @@
 depends=('heimdal>=1.3.1')
 optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh')
 install=cvs.install
-source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/$pkgver/$pkgname-$pkgver.tar.bz2
-	cvs-1.11.23-getline64.patch)
+source=(ftp://ftp.gnu.org/non-gnu/cvs/source/stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+	     cvs-1.11.23-getline64.patch
+        cvs-1.11.23-cve-2010-3846.patch)
 sha256sums=('400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9'
-            '9126d7992ace943980ad8a10d5a09aeb6f1eeeb9b921fc796fe31de7b1c220cf')
+            '9126d7992ace943980ad8a10d5a09aeb6f1eeeb9b921fc796fe31de7b1c220cf'
+            'c6506d0a5efc7b0cab6415f26e070ec214fb9781fac8d295506f4d0825431a8f')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
   unset EDITOR VISUAL
 
-  patch -Np1 -i $srcdir/cvs-1.11.23-getline64.patch || return 1
+  patch -Np1 -i ../cvs-1.11.23-getline64.patch
+
+  # CVE-2010-3864, see https://www.redhat.com/security/data/cve/CVE-2010-3846.html
+  patch -Np1 -i ../cvs-1.11.23-cve-2010-3846.patch
+
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$pkgdir install
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR=${pkgdir} install
   rm ${pkgdir}/usr/share/info/dir
 }