Thu Jan 5 23:14:48 UTC 2012

2 files changed, 58 insertions, 10 deletions

diff --git a/extra/cvs/PKGBUILD b/extra/cvs/PKGBUILD
index 76f71a2a1..971e0d498 100644
--- a/extra/cvs/PKGBUILD
+++ b/extra/cvs/PKGBUILD
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD 121072 2011-04-28 22:54:58Z stephane $
+# $Id: PKGBUILD 146046 2012-01-04 17:18:48Z dan $
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=cvs
 pkgver=1.11.23
-pkgrel=7
+pkgrel=8
 pkgdesc="Concurrent Versions System - a source control system"
 arch=(i686 x86_64)
-url="http://cvs.nongnu.org"
+url="http://cvs.nongnu.org/"
 license=('GPL')
-depends=('krb5')
-optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh')
+depends=('krb5' 'zlib')
+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
+        cvs-1.11.19-extzlib.patch
+        cvs-1.11.23-getline64.patch
         cvs-1.11.23-cve-2010-3846.patch)
 sha256sums=('400f51b59d85116e79b844f2d5dbbad4759442a789b401a94aa5052c3d7a4aa9'
+            '0587ac3753d1257fa6d22557fa077178ee1ec004178c0a0348720e8171b1e942'
             '9126d7992ace943980ad8a10d5a09aeb6f1eeeb9b921fc796fe31de7b1c220cf'
             'c6506d0a5efc7b0cab6415f26e070ec214fb9781fac8d295506f4d0825431a8f')
 
@@ -22,11 +25,12 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   unset EDITOR VISUAL
 
-  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
+  patch -Np1 < ../cvs-1.11.19-extzlib.patch
+  patch -Np1 < ../cvs-1.11.23-getline64.patch
+  # CVE-2010-3864, https://www.redhat.com/security/data/cve/CVE-2010-3846.html
+  patch -Np1 < ../cvs-1.11.23-cve-2010-3846.patch
 
+  autoreconf
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/cvs/cvs-1.11.19-extzlib.patch b/extra/cvs/cvs-1.11.19-extzlib.patch
new file mode 100644
index 000000000..9a8506da3
--- /dev/null
+++ b/extra/cvs/cvs-1.11.19-extzlib.patch
@@ -0,0 +1,44 @@
+--- cvs-1.11.19/configure.in.old.old4	2005-02-01 00:10:49.000000000 +0100
++++ cvs-1.11.19/configure.in	2005-02-28 13:27:10.000000000 +0100
+@@ -1040,8 +1040,8 @@
+ 	  tools/Makefile \
+ 	  vms/Makefile \
+ 	  windows-NT/Makefile \
+-	  windows-NT/SCC/Makefile \
+-	  zlib/Makefile])
++	  windows-NT/SCC/Makefile
++	  ])
+ 
+ dnl and we're done
+ AC_OUTPUT
+--- cvs-1.11.19/Makefile.am.old.old4	2004-11-11 23:30:36.000000000 +0100
++++ cvs-1.11.19/Makefile.am	2005-02-28 13:25:32.000000000 +0100
+@@ -17,7 +17,7 @@
+ ## Subdirectories to run make in for the primary targets.
+ # Unix source subdirs, where we'll want to run lint and etags:
+ # This is a legacy variable from b4 Automake
+-USOURCE_SUBDIRS = lib zlib diff src
++USOURCE_SUBDIRS = lib diff src
+ # All other subdirs:
+ SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
+ 	windows-NT os2 emx vms
+--- cvs-1.11.19/src/Makefile.am.old.old4	2005-01-31 23:07:35.000000000 +0100
++++ cvs-1.11.19/src/Makefile.am	2005-02-28 13:24:26.000000000 +0100
+@@ -24,7 +24,7 @@
+ # try and remove naming ocnflicts and fix Automake to allow particular includes
+ # to be attached only to particular object files.  Short term fix is either or.
+ ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
+-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
++INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
+ 
+ bin_PROGRAMS = cvs
+ bin_SCRIPTS = cvsbug
+@@ -105,7 +105,7 @@
+ cvs_LDADD = \
+ 	../diff/libdiff.a \
+ 	../lib/libcvs.a \
+-	../zlib/libz.a
++	-lz
+ 
+ # extra clean targets
+ # wish this could be distclean-hdr-local but it's not part of automake