Update to 0.5.2, which also includes the fix for the security hole I

tried to close before. Note, that the hole WAS STILL THERE in 0.5.1 --
up until  today :-( Although I  added the pqescape.c, I  forgot to add
the patch, that made use of it...

4 files changed, 13 insertions, 75 deletions

diff --git a/security/pam-pgsql/Makefile b/security/pam-pgsql/Makefile
index 885b70ca0cec..7cfbb34cf0ea 100644
--- a/security/pam-pgsql/Makefile
+++ b/security/pam-pgsql/Makefile
@@ -6,25 +6,28 @@
 #
 
 PORTNAME=	pam-pgsql
-PORTVERSION=	0.5.1
+PORTVERSION=	0.5.2
 CATEGORIES=	security databases
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR=	pool/main/p/pam-pgsql
-DISTFILES=	${PORTNAME}_${PORTVERSION}${EXTRACT_SUFX}
+MASTER_SITE_SUBDIR=	pool/non-US/main/p/pam-pgsql
+DISTFILES=	${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX}
+PATCHFILES=	pam-pgsql_0.5.2-1.diff.gz
+PATCH_SITES=	${MASTER_SITES}
 
 MAINTAINER=	mi@aldan.algebra.com
 
 LIB_DEPENDS=	pq:${PORTSDIR}/databases/postgresql7
 
+PATCH_DIST_STRIP=	-p1
 # When the family of Debian mirrors is added to bsd.port.mk,
 # this will suddenly start making sense:
-MASTER_SITE_DEBIAN?= http://ftp.debian.org/debian/%SUBDIR%/
+MASTER_SITE_DEBIAN?= http://debian.yorku.ca/debian/non-US/%SUBDIR%/
 # This should help the users of MASTER_SORT_REGEX:
 .for c in at bg br cz de ee es fi fr hu it jp kr nl no nz pl se si tr uk
-MASTER_SITES_DEBIAN+=	http://ftp.$c.debian.org/debian/%SUBDIR%/
+MASTER_SITES_DEBIAN+=	http://ftp.$c.debian.org/debian-non-US/%SUBDIR%/
 .endfor
-MASTER_SITES_DEBIAN+=	http://ftp.au.debian.org/pub/debian/%SUBDIR%/ \
-	ftp://ftp.bora.net/pub/linux/debian/%SUBDIR%/
+MASTER_SITES_DEBIAN+=	http://ftp.au.debian.org/pub/debian-non-US/%SUBDIR%/ \
+	ftp://ftp.bora.net/pub/linux/debian-non-US/%SUBDIR%/
 
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ARGS+=	-j 2 FILESDIR=${FILESDIR}
diff --git a/security/pam-pgsql/distinfo b/security/pam-pgsql/distinfo
index 67ce617226be..fa2375d7cff7 100644
--- a/security/pam-pgsql/distinfo
+++ b/security/pam-pgsql/distinfo
@@ -1 +1,2 @@
-MD5 (pam-pgsql_0.5.1.tar.gz) = f4c550f10d049e585612bb65386c6140
+MD5 (pam-pgsql_0.5.2.orig.tar.gz) = 3ee046cd64ad9c3e02ad486d0398ad13
+MD5 (pam-pgsql_0.5.2-1.diff.gz) = 3edf05ca84d9545a720162b4ca3b1a3a
diff --git a/security/pam-pgsql/files/pqescape.c b/security/pam-pgsql/files/pqescape.c
deleted file mode 100644
index c13304e0a204..000000000000
--- a/security/pam-pgsql/files/pqescape.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * PQescapeString implementation is from
- * <URL:http://cert.uni-stuttgart.de/doc/postgresql/escape/>
- * It will be available in a later release of PostGreSQL.
- */
-#if !defined(HAVE_PQESCAPESTRING)
-#include <sys/types.h>
-
-/* Quoting strings before inclusion in queries. */
-size_t PQescapeString (char *to, const char *from, size_t length);
-
-/* ---------------
- * Escaping arbitrary strings to get valid SQL strings/identifiers.
- *
- * Replaces "\\" with "\\\\", "\0" with "\\0", and "'" with "''".
- * length is the length of the buffer pointed to by
- * from.  The buffer at to must be at least 2*length + 1 characters
- * long.  A terminating NUL character is written.
- * ---------------
- */
-
-size_t
-PQescapeString (char *to, const char *from, size_t length)
-{
-	const char *source = from;
-	char *target = to;
-	unsigned int remaining = length;
-
-	while (remaining > 0) {
-		switch (*source) {
-		case '\0':
-			*target = '\\';
-			target++;
-			*target = '0';
-			/* target and remaining are updated below. */
-			break;
-			
-		case '\\':
-			*target = '\\';
-			target++;
-			*target = '\\';
-			/* target and remaining are updated below. */
-			break;
-
-		case '\'':
-			*target = '\'';
-			target++;
-			*target = '\'';
-			/* target and remaining are updated below. */
-			break;
-
-		default:
-			*target = *source;
-			/* target and remaining are updated below. */
-		}
-		source++;
-		target++;
-		remaining--;
-	}
-
-	/* Write the terminating NUL character. */
-	*target = '\0';
-	
-	return target - to;
-}
-#endif /* !defined(HAVE_PQESCAPESTRING) */
diff --git a/security/pam-pgsql/pkg-descr b/security/pam-pgsql/pkg-descr
index 528f5f33956a..8c46858936ec 100644
--- a/security/pam-pgsql/pkg-descr
+++ b/security/pam-pgsql/pkg-descr
@@ -4,4 +4,4 @@ It also supports:
 	- Checking account information (pam_acct_expired,new_authtok_reqd)
 	- Updating auth token
 
-WWW: http://www.debian.org/Packages/unstable/admin/libpam-pgsql.html
+WWW: http://packages.debian.org/unstable/non-us/libpam-pgsql.html