pam_mysql: fix memleak

Package-Manager: portage-2.1.10.37/cvs/Linux x86_64

4 files changed, 72 insertions, 15 deletions

diff --git a/sys-auth/pam_mysql/ChangeLog b/sys-auth/pam_mysql/ChangeLog
index ffed435920ed..552f7afe5d23 100644
--- a/sys-auth/pam_mysql/ChangeLog
+++ b/sys-auth/pam_mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/pam_mysql
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mysql/ChangeLog,v 1.16 2011/09/13 07:29:13 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mysql/ChangeLog,v 1.17 2011/11/24 18:27:15 hanno Exp $
+
+*pam_mysql-0.7_rc1-r4 (24 Nov 2011)
+
+  24 Nov 2011; Hanno Boeck <hanno@gentoo.org> +pam_mysql-0.7_rc1-r4.ebuild,
+  +files/pam_mysql-0.7_rc1-memleak.diff:
+  Fix memleak, closes #364639.
 
 *pam_mysql-0.7_rc1-r3 (13 Sep 2011)
 
diff --git a/sys-auth/pam_mysql/Manifest b/sys-auth/pam_mysql/Manifest
index e1a14e06bb79..4238c747cec9 100644
--- a/sys-auth/pam_mysql/Manifest
+++ b/sys-auth/pam_mysql/Manifest
@@ -2,26 +2,28 @@
 Hash: SHA256
 
 AUX pam_mysql-0.7_rc1-link-to-pam.diff 453 RMD160 b79e1b29eb072538b478f4a03f24bd318db4795e SHA1 8fbe6e597b7ddebadf1f5757dece44a0bd3e9006 SHA256 fbd881e6d82ff1ef133cc6ff05b0de4d35df4944cdb7e89c9d781657312c54d8
+AUX pam_mysql-0.7_rc1-memleak.diff 274 RMD160 2b67db9b440d4a105e466c19355abf79e8fe33b5 SHA1 ebe35d82111f20b67cb29d2a475bc4238eecedc0 SHA256 d692bfb5bfe91e2da35346cd551b5978c68dcfe99e773e4dc750bbb7ced708dd
 DIST pam_mysql-0.7RC1.tar.gz 335240 RMD160 ffa908bf2f458c48571f0f172f841ef861ad0b47 SHA1 a139c4b4bf1a2e591a016069405428eb862f7690 SHA256 cb3cf89b9b51cb196ee8d731f85acbab72b4878a3a7c4183c5534161d4385ce7
 EBUILD pam_mysql-0.7_rc1-r1.ebuild 857 RMD160 810218a17b94312a93a4faa1d85cad4d2a26f445 SHA1 32da24eb87437daaa6f070cbf3c1d9f267dcd43c SHA256 aca0103802c5e4ef681f423a0c2ff04e52a5777403520c49003cb907e7016985
 EBUILD pam_mysql-0.7_rc1-r2.ebuild 939 RMD160 cd84dd0cc9fa2f2c7cb9bd5158d55c64f4d24b20 SHA1 ee5fcbcaf513e898c663648d493d288d83b298d1 SHA256 96072e573bbc5f20c81f29c9cac12731adfe52129fa61c0e3e5fcff0924cf79b
 EBUILD pam_mysql-0.7_rc1-r3.ebuild 1024 RMD160 09c1f8f18349fd46b8246fc48abdcc356ff21386 SHA1 a1b42076846dd91b6561c3b9821ab5a196a58214 SHA256 c0fe25c964aa53cd954bdb7cbec5f98906a27da3d197677975a072bb1951d9fe
-MISC ChangeLog 3354 RMD160 f881403dace9d86c2daa7e094432d32805028c3a SHA1 ab3986147ea40804442a91a43b136342287fc71f SHA256 8d5805b3d82019c0d60f8346ac8e900660d89ec5c1d51d5080eaaf9efd04a9b5
+EBUILD pam_mysql-0.7_rc1-r4.ebuild 1064 RMD160 16b90bcdfbd78c8bb2ba758ac40084769e60b477 SHA1 8755bb36e48a1656776b35164970ed33679f12c9 SHA256 ea3576aaac2712f7048f8223c0e0bb0f3e3a9347772db24967f9ca22b91b1745
+MISC ChangeLog 3540 RMD160 53bd35a8c3db3ed89142550524c5b72471969dac SHA1 c43a1b3f6da06dcf1bffbd3f6dc35aa65d4df859 SHA256 d250eb78d83d4e33c272af693b6bef2c327d307566bae57235c99012ee72297e
 MISC metadata.xml 237 RMD160 f903f5295a205be343b3b59058c4a98b98a1b284 SHA1 460844ff792769a7994a52e70be5c89c222d60fd SHA256 67a8a9e13eb080f318854290ac23bc737105b152282a5ec5a0fa0be524b9e342
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJObwZJAAoJEKWIAHK7tR5C5GwQAIjCSF622magwLPGSVZ31sIz
-rCeku5RxfsbbkHyuU73IV8hR1nIgPmzYErP6CP24s6qZ2RydXauBiSZ2DJCgWZks
-DsRyjNR9vMz0Rzg5KYRift946/6zzh7dRWRitoka4wErIaWqGq2SHWMd1mfpP+d1
-zP30kdTxbffhX8NgRlpZEfVSj7RZuuPDRel5qrmIB1sD9R4YEi3Z7djouHrW0Wjx
-opsXELrZUeeZr5ZCuRTz9uU0Kz8tUxGlGqnesSE2s5Lgf1e7KvyX6W7ELyHvEKmG
-E/EFXHQusbD4rlA/PmTPJLxgWXIxQ+7pv2GJj+3Sy/KUlK5RMqAQsoeb1L+6yLBi
-niNi+t4RZcYvFnmYHMsK3ae4WV0H+/wSwzC8vBozcqyIbo+kZpY7cWVHZ1EyLvnZ
-u6nbtvmM0N9Q0CpIuj0WEWPlTU1oDtGyr7g4Lt3/HzfbFSCzolYQxnBRH0uk8alA
-F+k+pEuV81SripwBQ7RsaoLtWY/ihUSlba6XJVB5wKNO++EUXSAOPe6rsycCqeca
-muovP5muCJn3y6jJMiRtz4xC4vIcDjy5Ugl4b1FQIVzxcNgT36woM3yj89viJdZ4
-1xNdu2ATQnknhsjaclvOP5TeWMlqWlLHlsHHUGxTBJK37abAfmAawrovWTjQ79Go
-aMNCRFp1Lr7mizJgruiM
-=8eA2
+iQIcBAEBCAAGBQJOzoyFAAoJEKWIAHK7tR5CaiwP/3s7jSW9REFyEJJTy324VkjY
+Hq2Lo4a3p9BljYe7zRbx8PtAJd9qqgY5gktsQxar2Y9Lhhd1EbY7J6eEnVP2sdpW
+iWql3QsTH7kIKR6V94dZAw7+CSgBLhrrRePJcPbxsyd3aj/i60M33PxfUVDQkdyV
+iXkFXXgPBnz4ygm159kHunKMpQHEwM69J/5zY9NBsfk2ZlF5bP/LXLV111eT0Wux
+PGBWgfMuxmU2g5SffgSQRUMQQw7BYkaBKUctbVV1utvKBeUKEKs2G9yj6pX2xH20
+UKNeCb31OefioX8rK9suj9czbcSLjQC27wp8C+Qrume5H5XtLePE/aFrSnGLbdeJ
++pSJ9g2DO39n6TVWXQR+8CaXtAta71RhDW7UHesB3CXOK/X2bW/wEFxh+9mq0/2D
+nMvX9Qt5zdGpueCFFnC6S7h3xT99VOEiOqChBw4/+uuhZjgrM1pi+fTlJSI8FHkX
+2YV2Isk6mIsWu4eNASxV17tSutKvBbvXU9lEn3DNT0kQruPyWh5IUzgNd/kuuY1j
+7M99GKf2ZBwZCzjfLkslT/GBOiJWkuHA/4nNt8hhJvwqR1C6f3k7shHhq8CgKSd/
+aE1TPWwAi46qJaYhJOKdU5NvLMFe07mWMue/Im5EjPPBLemss6ikkwYsYFo+T8Dx
+6oiT5UKoscr/EgpowcWw
+=ndKg
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_mysql/files/pam_mysql-0.7_rc1-memleak.diff b/sys-auth/pam_mysql/files/pam_mysql-0.7_rc1-memleak.diff
new file mode 100644
index 000000000000..e746be72029d
--- /dev/null
+++ b/sys-auth/pam_mysql/files/pam_mysql-0.7_rc1-memleak.diff
@@ -0,0 +1,10 @@
+--- pam_mysql-0.7RC1/pam_mysql.c	2006-01-09 11:35:59.000000000 +0100
++++ pam_mysql-0.7RC1-1/pam_mysql.c	2011-10-18 20:26:38.655425994 +0200
+@@ -2338,6 +2338,7 @@
+ 	}
+ 
+ 	mysql_close(ctx->mysql_hdl);
++	mysql_library_end();
+ 
+ 	xfree(ctx->mysql_hdl);
+ 	ctx->mysql_hdl = NULL;
diff --git a/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r4.ebuild b/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r4.ebuild
new file mode 100644
index 000000000000..c1d212502272
--- /dev/null
+++ b/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r4.ebuild,v 1.1 2011/11/24 18:27:15 hanno Exp $
+
+EAPI=2
+inherit autotools libtool pam
+
+DESCRIPTION="pam_mysql is a module for pam to authenticate users with mysql"
+HOMEPAGE="http://pam-mysql.sourceforge.net/"
+
+SRC_URI="mirror://sourceforge/pam-mysql/${P/_rc/RC}.tar.gz"
+DEPEND=">=sys-libs/pam-0.72 virtual/mysql"
+RDEPEND="${DEPEND}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="openssl"
+S="${WORKDIR}/${P/_rc/RC}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-link-to-pam.diff"
+	epatch "${FILESDIR}/${P}-memleak.diff"
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf $(use_with openssl)
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" libdir="$(getpam_mod_dir)" install || die "install failed"
+	rm "${D}/$(getpam_mod_dir)/pam_mysql.la" || die "Failed to remove pam_mysql.la"
+	dodoc CREDITS ChangeLog NEWS README
+}