[arch-commits] Commit in cvsps/trunk (PKGBUILD cvsps-buffer-overflow.patch)

[Dan McGee]

    Date: Tuesday, January 1, 2013 @ 22:38:51
  Author: dan
Revision: 174028

upgpkg: cvsps 3.4-1

Modified:
  cvsps/trunk/PKGBUILD
Deleted:
  cvsps/trunk/cvsps-buffer-overflow.patch

-----------------------------+
 PKGBUILD                    |   11 ++-----
 cvsps-buffer-overflow.patch |   66 ------------------------------------------
 2 files changed, 4 insertions(+), 73 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-02 02:57:17 UTC (rev 174027)
+++ PKGBUILD	2013-01-02 03:38:51 UTC (rev 174028)
@@ -1,9 +1,9 @@
 # $Id$
-# Maintainer:
+# Maintainer: Dan McGee <dan at archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
 
 pkgname=cvsps
-pkgver=3.2
+pkgver=3.4
 pkgrel=1
 pkgdesc="Generating 'patchset' information from a CVS repository"
 url="http://www.catb.org/esr/cvsps/"
@@ -11,14 +11,11 @@
 arch=('i686' 'x86_64')
 depends=('zlib')
 makedepends=('asciidoc')
-source=("http://www.catb.org/~esr/cvsps/cvsps-${pkgver}.tar.gz"
-        cvsps-buffer-overflow.patch)
-md5sums=('4a00c4b0d504078268db7c6c68decc38'
-         '6cfe55ee7f1137f9d2e670502d8cc3c7')
+source=("http://www.catb.org/~esr/cvsps/cvsps-${pkgver}.tar.gz")
+md5sums=('5bdcc9e49e1837e8016cdd139fe05ce7')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 < ../cvsps-buffer-overflow.patch
   make prefix=/usr
 }
 

Deleted: cvsps-buffer-overflow.patch
===================================================================
--- cvsps-buffer-overflow.patch	2013-01-02 02:57:17 UTC (rev 174027)
+++ cvsps-buffer-overflow.patch	2013-01-02 03:38:51 UTC (rev 174028)
@@ -1,66 +0,0 @@
-diff -Naur cvsps-3.2.orig/cvsps.c cvsps-3.2/cvsps.c
---- cvsps-3.2.orig/cvsps.c	2012-12-24 19:23:24.000000000 +0000
-+++ cvsps-3.2/cvsps.c	2012-12-27 03:28:24.698076155 +0000
-@@ -1078,17 +1078,16 @@
- static CvsFile * parse_rcs_file(const char * buff)
- {
-     char fn[PATH_MAX];
--    int len = strlen(buff + 10);
-+    size_t len = strlen(buff + 10);
-     char * p;
- 
-     /* once a single file has been parsed ok we set this */
-     static bool path_ok;
--    
-+
-     /* chop the ",v" string and the "LF" */
-     len -= 3;
-     memcpy(fn, buff + 10, len);
-     fn[len] = 0;
--    
-     if (strncmp(fn, strip_path, strip_path_len) != 0)
-     {
- 	/* if the very first file fails the strip path,
-@@ -1109,10 +1108,10 @@
- 
- 	    while ((p = strstr(p, repository_path)))
- 		lastp = p++;
--      
-+
- 	    if (lastp)
- 	    {
--		int len = strlen(repository_path);
-+		size_t len = strlen(repository_path);
- 		memcpy(strip_path, fn, lastp - fn + len + 1);
- 		strip_path_len = lastp - fn + len + 1;
- 		strip_path[strip_path_len] = 0;
-@@ -1136,16 +1135,26 @@
- 	 *
- 	 * For now just ignore such files
- 	 */
--	debug(DEBUG_APPWARN, "WARNING: file %s doesn't match strip_path %s. ignoring", 
-+	debug(DEBUG_APPWARN, "WARNING: file %s doesn't match strip_path %s. ignoring",
- 	      fn, strip_path);
- 	return NULL;
-     }
- 
-  ok:
--    path_ok = true;
--
-+     /*
-+     fix for rhbz#576076
-+     ./cvsps --norc -q --cvs-direct -u -A --root :pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot NSS
-+     */
-+    if(len <= strip_path_len)
-+    {
-+        debug(DEBUG_APPWARN, "WARNING: file %s doesn't match strip_path %s. ignoring",
-+	      fn, strip_path);
-+        return NULL;
-+    }
-     /* remove from beginning the 'strip_path' string */
-     len -= strip_path_len;
-+    path_ok = true;
-+
-     memmove(fn, fn + strip_path_len, len);
-     fn[len] = 0;
-