Fix bugs #379267 and #395147.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x974CA72A

5 files changed, 103 insertions, 28 deletions

diff --git a/sys-auth/pam_mount/ChangeLog b/sys-auth/pam_mount/ChangeLog
index 6f0c74fcdd8c..11096932f3fd 100644
--- a/sys-auth/pam_mount/ChangeLog
+++ b/sys-auth/pam_mount/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/pam_mount
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/ChangeLog,v 1.67 2012/05/28 00:17:34 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/ChangeLog,v 1.68 2012/12/29 04:48:23 mattst88 Exp $
+
+*pam_mount-2.13-r1 (29 Dec 2012)
+
+  29 Dec 2012; Matt Turner <mattst88@gentoo.org> +pam_mount-2.13-r1.ebuild,
+  +files/pam_mount-2.13-fix-build-without-cryptsetup.patch,
+  +files/pam_mount-2.13-remove-useless-log-message.patch:
+  Fix bugs #379267 and #395147.
 
   28 May 2012; Matt Turner <mattst88@gentoo.org> -pam_mount-2.1.ebuild,
   -pam_mount-2.5.ebuild, -pam_mount-2.6.ebuild,
diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index dde694255cf9..6b2febe03a9e 100644
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -1,27 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX pam_mount-2.11-fix-build-without-cryptsetup.patch 720 RMD160 b1edda85dd3cb43a3f3e53bbbfaef41b81feb350 SHA1 8a1c699038e7e5310a93ed841375ef7875cdc26e SHA256 79f9e663a37e2d979f49d9d04bbf4abb6ed1418863b292c5b05091397d2b22f8
-DIST pam_mount-2.11.tar.xz 283960 RMD160 95b5a2e3c6d53f34ca265489a10d07e956ad401a SHA1 2b133afc122f3ce76bd9373d3b569109c2c584db SHA256 48e3048f6e28fb1c69dee6bdd7f60af8772fe5ddab135c9f6b543202e6dbec2d
-DIST pam_mount-2.13.tar.xz 300648 RMD160 614f192c55b3bdd8883b6a321be0033580033fd2 SHA1 397ef72923286debe43a9fe466e9a3e1c2fd68a2 SHA256 077af9626a3ae2d68395392f6af1cb2d795329cd648ab8c6b60f814d7121ab2a
-EBUILD pam_mount-2.11.ebuild 1119 RMD160 335fe4efd2db0ce7dcf24078866e80f985fe6e46 SHA1 2d8eec76697d86eba632e9cecfaab9fdf20aea51 SHA256 da37989fd30103fb793bffb2cf1f004a14c30b9831b2052f720074bbf1dab8c5
-EBUILD pam_mount-2.13.ebuild 1040 RMD160 e17ed961f8ba2b31bb2417fe2b93e38d5ea8e46c SHA1 e1182742bebe5fd4872f8a51922d2784508a43b8 SHA256 dccb6562660f400d2511064e0950d2018b2db57a71641540d8977cbbd31423ed
-MISC ChangeLog 9221 RMD160 c9acbfa8f08df74b00e11660e1d740be8c3a1035 SHA1 59e4049bc24d70cf4ea7b02810b03cafa1455c10 SHA256 cf74d8aeb97f2adaf25eb9f97e08842f40a3125629a0061748fcdcc6d100ec53
-MISC metadata.xml 285 RMD160 ed48ee11fb63e8fd0331a581783739854f9a07a1 SHA1 62f651690fe6db24f642d49d10e74e28c3f88caf SHA256 951563190418f8d90bca7f736bc3a3605fae7932f9ecd13eabfe09ab0b5858b3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPwsQhAAoJEA/daC2XTKcqr4IQAJV2HpgAj/G985Vqwu7f2Cuo
-ddh1DPPS43Mcb260GAQC0FvNatVlIXpYBOKYZtdyktXQYPVkd/1yJ/R1KMtTt7oV
-bHXWvNyNojVI6pd/8YMLGazHvbEzGiQT8WeiwvOwGtI+3s2T0EkTCk6I721EvI87
-tJeUWUDBYVmJyB37j067RIDVdPkMUp9qzzuYcpp0pHE2suz2qbuZZzElZ3qjRnu0
-O2I5WyIO0JuXG/JB6dpVMUvVhhwtXr8piXFyN1VJLaeKpnd0S+yuuuAKVE8fiqhC
-Sk+v33t2R8+sUM6BzXsYLyE6TGdixgLdarAQ4byYHW7oxRm8cAn9OMNX/XgrCXuo
-ZruC1+umUBMZp6H7wObcR7RtJ21h+AMM4MMJZEI9drchfeHEv7PN9hpqXKGOOs3/
-ECyhswAY9rXmSH1fBSOBvSELdQgcOrd3aVK52sgLFfjPg/lKl5V167rQI5+c9tQB
-uUOkbO3aPgnBfvqSbhWmPrAux6gzcAIv4zsHDr/MqqhvdEYeKmXDqFIJbMAcuQYf
-yRFrr3tShe5+AUvV8ZjF4wJlNx2nsKi/+L/0redCc0QRo1yT2gAjkr6Pc98CKpHl
-rCIcbA3rnchf9sORQmQFmsbZ4f2emPXaaGfvdIcW+kdtr8frinftLrIjihCjcNbo
-WdfPWSjCkmi/pz4OW4Db
-=s7hq
------END PGP SIGNATURE-----
+AUX pam_mount-2.11-fix-build-without-cryptsetup.patch 720 SHA256 79f9e663a37e2d979f49d9d04bbf4abb6ed1418863b292c5b05091397d2b22f8 SHA512 10e68dd954a2baa877f9d4156dfcf3a729ac52a9ed19209b1e3917b3366396899a694ff310287d1ae38bde7892a6f3e07337758e6101efc33311afa4a64cc3fb WHIRLPOOL c10d84cf371140df3fe19a7a57842d15a3d81cedcc60225735c85dc6b6c35432d2ad45964579d9178f8740eef47e91b7d08830c8b64c28a11d4f80a5b7764a0d
+AUX pam_mount-2.13-fix-build-without-cryptsetup.patch 764 SHA256 de56e7deb979b44cb95471989b9e0747149fd54be2b8139552e0f5283a657d47 SHA512 9db6a1236bcfcb52d73df43ef50650932d0c87e4878c3ba26d39a734802b702eed8becd64aa16f61f93d80fc7d0d36cfbf4c52eb46c3729064b7164fc7dca384 WHIRLPOOL 76c812281a21dc67e291e18a1017210bee965ecc0911ec8b6ee16df98405cfe7063c2d2737eca61f99590a9f6a6f77d745e2267add493f29a5e9e098ef533854
+AUX pam_mount-2.13-remove-useless-log-message.patch 658 SHA256 2d1212c6a25d646a8c12e1a7d6b67c805d9a13c6e830da4c5ae7c36dcb12feac SHA512 93ec4858fcd44081185419cb532c4f9d6a595a15878115415f6be2a264615ea32bf499c3320eb82819e29119a045dd899189eb0c1d8e9b3e08bc6d7a17198c80 WHIRLPOOL 8a0ec746537757837f556311d8546c61f110a3bc6d8517adfc3cccc17dfc0a732443ee679090ee6734da5c193be4b273f8d9b3a085689c9aa79a92cdcc88ce81
+DIST pam_mount-2.11.tar.xz 283960 SHA256 48e3048f6e28fb1c69dee6bdd7f60af8772fe5ddab135c9f6b543202e6dbec2d SHA512 e140ba538b1fe357f71b7dfe9c61919497db32c12c9bf4c4a474fbf3166b24ce3165984a5032a84791f7d528cfe2f25a6d4b8558dc14b6051ff5249afcdc1b70 WHIRLPOOL 240a976e6f91ceb9d20d398e4d4eab16d407607c9c9872af7a20d585f6f1ddef167bd1d89711c45fedf92c4d2654ea4b3b55f33dfb7a8c312f1a797475d4bbb8
+DIST pam_mount-2.13.tar.xz 300648 SHA256 077af9626a3ae2d68395392f6af1cb2d795329cd648ab8c6b60f814d7121ab2a SHA512 01ec43fdac42e4ce86c31c098089fbb1933d41c7dab92d6a2d3ae9505bd19c9e6563890d39852fe26d6dd89905bfe4b56d367dfa73756ce999a39b8d6af55263 WHIRLPOOL 75f265354460d02310cc62158296c465415a802419ccb58715d0d868628e535a3821375efdd340bcfb93c5a4243f3b657546a349b684f8c2d2c88c3bd6a8a9ac
+EBUILD pam_mount-2.11.ebuild 1119 SHA256 da37989fd30103fb793bffb2cf1f004a14c30b9831b2052f720074bbf1dab8c5 SHA512 4f21d270cce7f73a872185d77a6b51160a4cd1f621c7cb139ad7446710f93fda954bd2b9a5de13ce889aedb07504e801d7993168846779fb1d8810a6b2aea1a7 WHIRLPOOL 3ddec1d1b168bc54f9d7cbfa5eb07f6032fb8a61244dadddcb0575ff53045e4e9d67129ff71e1f1e8fb15b21d1c5792767adc67dbbba67dc851282301ebbb29d
+EBUILD pam_mount-2.13-r1.ebuild 1217 SHA256 87f0b8101dc32d40751b28bc87f9b7c59724202d76aac2b6f03d122409a6649b SHA512 8716fc939c1bb15271afcebe24b314e0532ed3dbc22e88a2021c02bd5eeab314239afc737d5e81699ac77c24e5b8cfe229f8f9967f166fe90540376baea2792c WHIRLPOOL 49560495a429d5bf59d8e837f97416793a4fd5bc4e51cc3ed989c6d5060f4505aac2fb3f38d713b33fe15dd225bc874d271d9b4671b0674c604593e5e93029d0
+EBUILD pam_mount-2.13.ebuild 1040 SHA256 dccb6562660f400d2511064e0950d2018b2db57a71641540d8977cbbd31423ed SHA512 db283cb791414b90d0747841b2c326bdfccf353bb4c2ab779a3ac7f23c66b3c65986c48d628f21b407a808e6de88d84f772144566e7d93f67d6a00ca94b70dc7 WHIRLPOOL 5c841da2a65c414e6b0efc0b6f32a5d3119dcc58ca0763657e6ad61d187318d9d430c873e03ca770537c70b697162e565b44a92c99676745e5b735ae112d8ea2
+MISC ChangeLog 9482 SHA256 61b421e4627f7e37383567c5216ed78413ee5d3cad132bfe4bdd5234d563ad38 SHA512 2016b3f223c9edae9c67c7e2bd38955b4cdf5961fdda933972d5906467876847da33782ce3c7583555847ff7ed61812df4def8235f38c34d4592fab9680bddcf WHIRLPOOL 6f59f5e4989602cf0bff17fa1b16ade6beccb6b89a1d58cd7cbd8307fc6e35d12f5e70cdfcc082d551a1f5ba44ce6d1da756f2ae18f3ed38e21df5579b0deaf9
+MISC metadata.xml 285 SHA256 951563190418f8d90bca7f736bc3a3605fae7932f9ecd13eabfe09ab0b5858b3 SHA512 b48132bbae6c9100acde7572d79424c1fc26d1a49fdf4bc64c41f749d78a291547b98b51d2c82b987c2e18d362555ccf93a9bc6d2416e77ad5468da7bb753474 WHIRLPOOL 3c2c769f35f6fca1140a8ef545df4c5d513b42b97c61b7ae173b3b1852e5064f51a0863b377a5b53ad7724e21abd7fc379a72cf7a1c3754e9dbb2cb0097e60d7
diff --git a/sys-auth/pam_mount/files/pam_mount-2.13-fix-build-without-cryptsetup.patch b/sys-auth/pam_mount/files/pam_mount-2.13-fix-build-without-cryptsetup.patch
new file mode 100644
index 000000000000..4733c6b62dd7
--- /dev/null
+++ b/sys-auth/pam_mount/files/pam_mount-2.13-fix-build-without-cryptsetup.patch
@@ -0,0 +1,22 @@
+diff -ruN pam_mount-2.13.orig/src/Makefile.am pam_mount-2.13/src/Makefile.am
+--- pam_mount-2.13.orig/src/Makefile.am	2011-12-15 04:12:10.000000000 -0800
++++ pam_mount-2.13/src/Makefile.am	2012-12-28 20:41:44.878975018 -0800
+@@ -8,7 +8,9 @@
+ moduledir		= @PAM_MODDIR@
+ module_LTLIBRARIES	= pam_mount.la
+ sbin_PROGRAMS		= pmvarrun
++if HAVE_LIBCRYPTSETUP
+ sbin_PROGRAMS		+= pmt-ehd
++endif
+ ssbin_PROGRAMS		= mount.crypt
+ noinst_PROGRAMS		= autoloop ismnt
+ noinst_SCRIPTS 		= umount.crypt
+@@ -75,7 +77,7 @@
+ mount_crypt_LDADD	= libcryptmount.la libpmt_mtab.la ${libHX_LIBS}
+ 
+ pmt_ehd_SOURCES		= ehd.c bdev.c misc.c spawn.c
+-pmt_ehd_LDADD		= libcryptmount.la ${libHX_LIBS}
++pmt_ehd_LDADD		= libcryptmount.la ${libHX_LIBS} ${libcryptsetup_LIBS}
+ 
+ #
+ # runtime helpers
diff --git a/sys-auth/pam_mount/files/pam_mount-2.13-remove-useless-log-message.patch b/sys-auth/pam_mount/files/pam_mount-2.13-remove-useless-log-message.patch
new file mode 100644
index 000000000000..8f5e58dc6bd3
--- /dev/null
+++ b/sys-auth/pam_mount/files/pam_mount-2.13-remove-useless-log-message.patch
@@ -0,0 +1,14 @@
+X-Git-Url: http://pam-mount.git.sourceforge.net/git/gitweb.cgi?p=pam-mount%2Fpam-mount;a=blobdiff_plain;f=src%2Frdconf1.c;h=827d36ad2a8873f9342c9fd94fae506dabf5f4af;hp=e8ccd2d4fc96811986a1bd9e57bc8803d93576aa;hb=38a15cc36c7fe6714dd3010fde6ad808b3792ac0;hpb=8bbab5ce3520d361398bdcd65290af8f9cd8ea64
+
+diff --git a/src/rdconf1.c b/src/rdconf1.c
+index e8ccd2d..827d36a 100644
+--- a/src/rdconf1.c
++++ b/src/rdconf1.c
+@@ -340,6 +340,7 @@ void initconfig(struct config *config)
+ 	char options_require[] = "nosuid,nodev";
+ 
+ 	memset(config, 0, sizeof(*config));
++	ehd_logctl(EHD_LOGFT_DEBUG, EHD_LOG_SET);
+ 	config->debug      = true;
+ 	config->mkmntpoint = true;
+ 
diff --git a/sys-auth/pam_mount/pam_mount-2.13-r1.ebuild b/sys-auth/pam_mount/pam_mount-2.13-r1.ebuild
new file mode 100644
index 000000000000..d4b41476bab2
--- /dev/null
+++ b/sys-auth/pam_mount/pam_mount-2.13-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.13-r1.ebuild,v 1.1 2012/12/29 04:48:23 mattst88 Exp $
+
+EAPI=4
+
+inherit eutils multilib autotools
+
+DESCRIPTION="A PAM module that can mount volumes for a user session"
+HOMEPAGE="http://pam-mount.sourceforge.net"
+SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="crypt ssl selinux"
+
+COMMON_DEPEND=">=sys-libs/pam-0.99
+	>=sys-libs/libhx-3.12.1
+	>=dev-libs/libxml2-2.6
+	crypt? ( >=sys-fs/cryptsetup-1.1.0 )
+	ssl? ( >=dev-libs/openssl-0.9.8 )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	app-arch/xz-utils"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/util-linux-2.20"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-build-without-cryptsetup.patch
+	epatch "${FILESDIR}"/${P}-remove-useless-log-message.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-slibdir="/$(get_libdir)" \
+			$(use_with crypt cryptsetup) \
+			$(use_with ssl crypto) \
+			$(use_with selinux)
+}
+
+src_install() {
+	default
+	use selinux || rm -r "${D}"/etc/selinux
+	dodoc doc/*.txt
+}