From 2677287a2e31969c7dc8f5734532e8b680ffe882 Mon Sep 17 00:00:00 2001
From: recht <recht>
Date: Thu, 5 Aug 2004 22:20:11 +0000
Subject: pullup a fix for libpqmodule from HEAD:

Fixed a buffer overrun error in libPQquoteBytea based on a fix by
James Matthew Farrow. [Bug #838317].

bum PKGREVISION to 2 for the fix
---
 databases/py-PgSQL/Makefile         |  4 ++--
 databases/py-PgSQL/distinfo         |  4 ++--
 databases/py-PgSQL/patches/patch-aa | 29 +++++++++++++++++++++++------
 3 files changed, 27 insertions(+), 10 deletions(-)

(limited to 'databases/py-PgSQL')

diff --git a/databases/py-PgSQL/Makefile b/databases/py-PgSQL/Makefile
index 89acdf0b50a..7bd2ecd4ddb 100644
--- a/databases/py-PgSQL/Makefile
+++ b/databases/py-PgSQL/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2004/07/24 22:45:15 recht Exp $
+# $NetBSD: Makefile,v 1.9 2004/08/05 22:20:11 recht Exp $
 #
 
 DISTNAME=	pyPgSQL-2.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pypgsql/}
 
diff --git a/databases/py-PgSQL/distinfo b/databases/py-PgSQL/distinfo
index 8a006f044a6..32543685f4b 100644
--- a/databases/py-PgSQL/distinfo
+++ b/databases/py-PgSQL/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2004/01/17 13:16:06 recht Exp $
+$NetBSD: distinfo,v 1.3 2004/08/05 22:20:11 recht Exp $
 
 SHA1 (pyPgSQL-2.4.tar.gz) = 478135830e0bf4fc9496452ee3b88de4c218488f
 Size (pyPgSQL-2.4.tar.gz) = 152139 bytes
-SHA1 (patch-aa) = f8db2a753eb76bece779936fae69be60794c0327
+SHA1 (patch-aa) = 4ac2cbb8378557678a51bb3ece2f280eff0b1187
 SHA1 (patch-ab) = 3d387e7d20db3024a0761570f1bbbeeb3fc8f674
diff --git a/databases/py-PgSQL/patches/patch-aa b/databases/py-PgSQL/patches/patch-aa
index 982b370a344..be44a827fcc 100644
--- a/databases/py-PgSQL/patches/patch-aa
+++ b/databases/py-PgSQL/patches/patch-aa
@@ -1,8 +1,25 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/09/09 13:46:24 recht Exp $
+$NetBSD: patch-aa,v 1.2 2004/08/05 22:20:11 recht Exp $
 
---- libpqmodule.c.orig	2003-06-17 03:28:30.000000000 +0200
-+++ libpqmodule.c	2003-07-26 15:26:34.000000000 +0200
-@@ -791,7 +791,7 @@
+--- libpqmodule.c.orig	2004-08-03 20:20:48.000000000 +0200
++++ libpqmodule.c	2004-08-03 20:20:56.000000000 +0200
+@@ -364,7 +364,6 @@
+     }
+ 
+     sout[j++] = (forArray ? '"' : '\'');
+-    sout[j] = (char)0;
+ 
+     result = Py_BuildValue("s#", sout, j);
+     PyMem_Free(sout);
+@@ -411,8 +410,6 @@
+ 	}
+     }
+ 
+-    sout[j] = (char)0;
+-
+     result = Py_BuildValue("s#", sout, j);
+     PyMem_Free(sout);
+ 
+@@ -791,7 +788,7 @@
          return PgInt8_FromString(s, (char **)NULL, 10);
      }
  
@@ -11,7 +28,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/09/09 13:46:24 recht Exp $
      return (PyObject *)NULL;
  }
  #endif
-@@ -855,7 +855,7 @@
+@@ -855,7 +852,7 @@
          return PgInt2_FromString(s, (char **)NULL, 10);
      }
  
@@ -20,7 +37,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/09/09 13:46:24 recht Exp $
      return (PyObject *)NULL;
  }
  
-@@ -907,7 +907,7 @@
+@@ -907,7 +904,7 @@
          return libPQbool_FromString(self, args);
      }
  
-- 
cgit v1.2.3