Bump to upstream released version.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 9 insertions, 47 deletions

diff --git a/sys-auth/pam-pgsql/ChangeLog b/sys-auth/pam-pgsql/ChangeLog
index b3f939109efd..6cf573c635b7 100644
--- a/sys-auth/pam-pgsql/ChangeLog
+++ b/sys-auth/pam-pgsql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/pam-pgsql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam-pgsql/ChangeLog,v 1.2 2010/03/15 18:08:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam-pgsql/ChangeLog,v 1.3 2010/03/16 11:56:16 flameeyes Exp $
+
+*pam-pgsql-0.7.1 (16 Mar 2010)
+
+  16 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -pam-pgsql-0.7_p20100311-r1.ebuild,
+  -files/pam-pgsql-0.7_p20100311-bug309311.patch, +pam-pgsql-0.7.1.ebuild:
+  Bump to upstream released version.
 
 *pam-pgsql-0.7_p20100311-r1 (15 Mar 2010)
 
diff --git a/sys-auth/pam-pgsql/files/pam-pgsql-0.7_p20100311-bug309311.patch b/sys-auth/pam-pgsql/files/pam-pgsql-0.7_p20100311-bug309311.patch
deleted file mode 100644
index 07b5f5626414..000000000000
--- a/sys-auth/pam-pgsql/files/pam-pgsql-0.7_p20100311-bug309311.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0ced2f84ec8fcf961a1d89df1194634d5f83d4fd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Mon, 15 Mar 2010 18:51:50 +0100
-Subject: [PATCH] Correct the check for expected values returned by the acct query.
-
-The current code checked for at least two rows and at most three columns,
-while the correct check was to be one row, and between two and three
-columns.
-
-This was reported by Gianpaolo Tomassoni in Gentoo bug #309311
-http://bugs.gentoo.org/show_bug.cgi?id=309311
----
- src/pam_pgsql.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/pam_pgsql.c b/src/pam_pgsql.c
-index 5a31ac1..8126b79 100644
---- a/src/pam_pgsql.c
-+++ b/src/pam_pgsql.c
-@@ -129,7 +129,8 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc,
- 					DBGLOG("query: %s", options->query_acct);
- 					rc = PAM_AUTH_ERR;
- 					if(pg_execParam(conn, &res, options->query_acct, pam_get_service(pamh), user, NULL, rhost) == PAM_SUCCESS) {
--						if (PQntuples(res) >= 2 && PQnfields(res) <= 3) {
-+						if (PQntuples(res) == 1 &&
-+						    PQnfields(res) >= 2 && PQnfields(res) <= 3) {
- 							char *expired_db = PQgetvalue(res, 0, 0);
- 							char *newtok_db = PQgetvalue(res, 0, 1);
- 							rc = PAM_SUCCESS;
-@@ -143,7 +144,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc,
- 							if (!strcmp(expired_db, "t"))
- 								rc = PAM_ACCT_EXPIRED;
- 						} else {
--							DBGLOG("query_acct should return two or three columns");
-+							DBGLOG("query_acct should return one row and two or three columns");
- 							rc = PAM_PERM_DENIED;
- 						}
- 						PQclear(res);
--- 
-1.7.0.2
-
diff --git a/sys-auth/pam-pgsql/pam-pgsql-0.7_p20100311-r1.ebuild b/sys-auth/pam-pgsql/pam-pgsql-0.7.1.ebuild
index c4f65e4d184b..1152c58aeae6 100644
--- a/sys-auth/pam-pgsql/pam-pgsql-0.7_p20100311-r1.ebuild
+++ b/sys-auth/pam-pgsql/pam-pgsql-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam-pgsql/pam-pgsql-0.7_p20100311-r1.ebuild,v 1.1 2010/03/15 18:08:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam-pgsql/pam-pgsql-0.7.1.ebuild,v 1.1 2010/03/16 11:56:16 flameeyes Exp $
 
 EAPI=2
 
@@ -25,10 +25,6 @@ IUSE=""
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-bug309311.patch
-}
-
 src_configure() {
 	econf \
 		--sysconfdir=/etc/security \