Bump to upstream released version.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 15 insertions, 54 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/Manifest b/sys-auth/pam-pgsql/Manifest
index 6b1c52ac8585..fa46952f9292 100644
--- a/sys-auth/pam-pgsql/Manifest
+++ b/sys-auth/pam-pgsql/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pam-pgsql-0.7_p20100311-bug309311.patch 1661 RMD160 0abea63024293233f7e765c2e37228b1710c061a SHA1 c78d70ff863507f21e12de30d3de9262b1fe68e4 SHA256 25e2b42aae4ba9acb5f06f5eab7f3cb94337750a3cccc87c724f3b55b28a5fe8
-DIST pam-pgsql-0.7_p20100311.tar.gz 304786 RMD160 4b3af2ffc11e9e54790aecfce0726c43b9c750a1 SHA1 6d642277ec0c512e8c1fd3f2ddbcf208816e7c37 SHA256 71594c1af07c8e37f65c15410c5ad8b97a96ae672828ef44b95c7b607401af1d
-EBUILD pam-pgsql-0.7_p20100311-r1.ebuild 1420 RMD160 3e704b4c0a48e19f42eaf0428b76d9f80d6cec01 SHA1 4e53f957ab6bb738736483f41ac80327a9d4318c SHA256 1f48eeb6bafd7fa3e242a2008238681e687258faf67893650561681af050d504
-MISC ChangeLog 825 RMD160 d76d582041233edd5339d32ab5921e180f4c6e1f SHA1 e186f84eb15b82db1e5cca7832a31be536e87810 SHA256 f7b324445892b8aa8d2e76c9d82e0b520a92b9ac3509bfbf84d4666b93a6a4ee
+DIST pam-pgsql-0.7.1.tar.gz 304824 RMD160 4bde31c836d5a2204e904111f5eb953ce529f1e6 SHA1 bd62b6d66c3972e244e90f7228dc082796957870 SHA256 952b0baff182c270fd4027f75ee6b5663d430bd129067ada80b61d33e8fe9f19
+EBUILD pam-pgsql-0.7.1.ebuild 1347 RMD160 1ee1e952aad70f6f87899d5c358cefaba5336ba0 SHA1 8bfd40918724717bae86c761817338ed3160fe61 SHA256 afd764d23e47d8a0d24ee6ad303601d753d43d80e1eec82c64f6f2be1a41c504
+MISC ChangeLog 1064 RMD160 b91ef70a73c690825e87ba4ef268378a176c0d02 SHA1 f697c683b4d30aa66279408f274de9596c4c663d SHA256 6b7a5a4f5a24b8a46f473dc6c9e7f5f865ae7b66cab1bb28d9f104f8b3339741
 MISC metadata.xml 218 RMD160 1955c7446d4ceb77506ba7b58ee35913c576a72c SHA1 02dacc356a39905402083cb54ae4f6dd0ac59fad SHA256 e0bb49cab71cc84d8bdad26876197164073722b378d27a5bf55bbfd2afdbd19c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkued6YACgkQAiZjviIA2XiyEwCgkXrIcge3b02LJmYfcHuvG+he
-RUAAn3/TPXJZ3b99ramPKZc2UCRvEFvB
-=DkPD
+iEYEARECAAYFAkufceEACgkQAiZjviIA2XghFACfZ05zOWOxJsSUnco3eoeSq22f
+6uUAn2QhRmN8CRhh2EpoBH50Z/7UmXL2
+=NKOO
 -----END PGP SIGNATURE-----
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 \