diff options
| -rw-r--r-- | sys-auth/pam_mount/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-auth/pam_mount/Manifest | 24 | ||||
| -rw-r--r-- | sys-auth/pam_mount/pam_mount-2.10.ebuild | 30 |
3 files changed, 23 insertions, 37 deletions
diff --git a/sys-auth/pam_mount/ChangeLog b/sys-auth/pam_mount/ChangeLog index 07aa369921db..3676f785261a 100644 --- a/sys-auth/pam_mount/ChangeLog +++ b/sys-auth/pam_mount/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-auth/pam_mount # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/ChangeLog,v 1.51 2011/04/17 00:58:13 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/ChangeLog,v 1.52 2011/05/14 20:27:42 mattst88 Exp $ + + 14 May 2011; Matt Turner <mattst88@gentoo.org> pam_mount-2.10.ebuild: + Fix crypt use flag, add ssl and selinux use flags. Thanks to Sander Sweers + for the patch! (Bug 363149) *pam_mount-2.10 (17 Apr 2011) diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest index 25add1e6e857..54d03109d332 100644 --- a/sys-auth/pam_mount/Manifest +++ b/sys-auth/pam_mount/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX pam_mount-2.6-pmvarrun-bin.diff 352 RMD160 414165bfa7789dcee4a5b97b2503377a2d321f03 SHA1 b696f57cd9a16866bc816cee0c13e63f0669f2f8 SHA256 fcfbaad208c3b0ffcd83ca56de6d5e03d753f7e3f49d402dcd2442c106731e02 DIST pam_mount-2.1.tar.xz 283760 RMD160 b370523a1705f1c18b938bc26a93fd797b45d557 SHA1 b9452927c7b54dcde585b454cd9f4da958bd7bb0 SHA256 c0c87efeaa2c3007784cc7a6e82db3ad4ae65f8588a7e6d02dfbd460bb1f0925 DIST pam_mount-2.10.tar.xz 284152 RMD160 d3305107e75a00fb420672f49b6e06965345c14d SHA1 3ef6fbb077454d6ee5bd3737bf6f99c78be36e83 SHA256 e0241950ee4753e0110dba13a68b8f1dc3c059c45a253452cdb67584d60c361c @@ -8,26 +5,9 @@ DIST pam_mount-2.5.tar.xz 288644 RMD160 8b2562e3dc0cad7ec283387330019c51aae6dff9 DIST pam_mount-2.6.tar.xz 284984 RMD160 b3ffab9a05c8463d3ac694dbdfbe30380abfa5cc SHA1 a825152621d26ff27a748936c7b743d973305221 SHA256 35918a867f5cc1c3a4f534c713d90cf7c591376b658e41c582f58611d769b1e2 DIST pam_mount-2.8.tar.xz 283280 RMD160 258f96a0f1ac569777d921923d41cbf90cd93d5d SHA1 2b2c60553601c390abe98162213ed8a5bdbf5cce SHA256 720ee7d7969189e2bcf8b9c0ac51049e7f6219c95b79049bb9042c6ef21a457b EBUILD pam_mount-2.1.ebuild 964 RMD160 103c403046d0a9d95c86bbf8f263305cbaf9dff5 SHA1 0636a48f120779f6ca4c1848d56764b821a9945e SHA256 e92b235a5cb6031e708a4ba47bf4cbf88392c50d93f186c53eac0f336008eb27 -EBUILD pam_mount-2.10.ebuild 973 RMD160 58055e4a43850c868c776e5f8480cad922f6fcb8 SHA1 6c2c74191939c5899140649f7ef6045106318877 SHA256 bc48b8bfca0532401ab840710d304774e62edcd817e51421070131fa887633be +EBUILD pam_mount-2.10.ebuild 999 RMD160 4ad7a44d2e563b3726e32d8a896f25ba83f0c022 SHA1 a9ea11fb080cb4a35c9c18d80af519f56d0bb98c SHA256 d2d846006c22546de2e3985509346bcccaa8e98083d8097fc2f8ffde13093b26 EBUILD pam_mount-2.5.ebuild 966 RMD160 6f6b95f7b5e886ccc49d19f7e06503247093ea95 SHA1 4eed36ddfed4264332e9e90c3e7526a62187ff4e SHA256 db679341f91f0f2e71ea6efb06b3ac2c5a82474d991a65d15b7aa066569fa4d7 EBUILD pam_mount-2.6.ebuild 1065 RMD160 19419327806e2b254211a892f22107c2c7859022 SHA1 c6b6058d622eaf7724898ddf5e6f21186465649b SHA256 22e2e93eb53ba79af43cd118c4dbbabc7c275ca84fe6ebb75131cc0bdf84dad0 EBUILD pam_mount-2.8.ebuild 969 RMD160 9f6df469045df37f533fc38e98fe8be9e461bd2d SHA1 858d7a4ec2b23a005f3866fd7e5ed63e40e56c3c SHA256 014e04ba87bd9a1d6e835578443b233cef3489cb86caf0a9e6930efc33cabcc6 -MISC ChangeLog 6743 RMD160 bc67245832cec73e7d920a7e2921d193d5d28f28 SHA1 c6e1a12d36ebd03d54c193600268d2a343ad20db SHA256 6d4b9ed4cccfeaaacb868083147f49db2ecf161a943addf28d4c4ff215c36fb7 +MISC ChangeLog 6926 RMD160 a82b513d93c6e507c8d4c09dd92a8b62205b3669 SHA1 c30204b4a2808fa2aebb18695fd00be090f50519 SHA256 87af91d531c9d39ac89682d3ec6d8b9369abd2bc11b015153c9b6768d69c13d2 MISC metadata.xml 277 RMD160 84cc944dcf381bfb0d15944a20663cecb453022f SHA1 3b468d716ba584680dc151162bf35b0eef137039 SHA256 e0f920822e6218d62706e7ebf758af0cdca08c6df3b76c16b918e3beee6b6f87 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBCAAGBQJNqjsqAAoJEKWIAHK7tR5CpYUQAIOiT2Bf3H/iiwV08oWUGdfh -Wvar9FXeiqnHcTGQzfX+bIQpqdZNTLh8ba0CfIYSVOOHttc839MynVxLbcV+3bIP -Q+nR6bfZEx2dxRbaDaWGIDJQGX896pRtaZDtC3eIWQrvneyC8uqQXVncc+UBueER -G/6F722ONRt/bi6E32HkxnAFcI4c2NKBrpuGL7HxOekwjalNF7I3TkPUgXNxGR0c -2X3JiNSh2IcevqD7l7SedQpHUqPPeT6fTPdwDiMiU3HyXlue0s41oz14ynGkO7oL -G2SX3z5VtW6XAmVU/y2lLxbzOmBl6iPtY0dQ8NtPW6gWVWM8CUutEdTlQRk3U/D7 -tbxcDOracu7J9at81Goj93l3/G4rhmA3d9m6r4UpPKydHVfyx4D+/+3r8eeNhHX2 -e1PmGeptEkqdU9j6uxSztqeFr6wVU+VbpLuZppjCtHMbTkA6NOGrW6gDfeb67Wcr -WQUmPVzqvJDESDsfRuOxsuyxhzPtR3WKuPFXL2ytf69YiF7839sLKUO64jVe6Ioz -BUb5xJMaUoyo6ae7XNWww9Ih6gRpIykhVXBPLqneZ9zXUkd6leBUXppB6mCer3bN -7/dDbVNkOjM8fFZp8Sd+HzLArlZzK7sOgrGwRkkWiVuCQgI8WO61munsXs+CzSlb -cUWhkgEbGAx6EkY2FsKo -=U/o6 ------END PGP SIGNATURE----- diff --git a/sys-auth/pam_mount/pam_mount-2.10.ebuild b/sys-auth/pam_mount/pam_mount-2.10.ebuild index e04ab878cc7e..b1341d89b0bf 100644 --- a/sys-auth/pam_mount/pam_mount-2.10.ebuild +++ b/sys-auth/pam_mount/pam_mount-2.10.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 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.10.ebuild,v 1.1 2011/04/17 00:58:13 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.10.ebuild,v 1.2 2011/05/14 20:27:42 mattst88 Exp $ -EAPI=3 +EAPI=4 inherit multilib @@ -14,26 +14,28 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="crypt" -DEPEND=">=sys-libs/pam-0.99 - dev-libs/openssl +IUSE="crypt ssl selinux" + +COMMON_DEPEND=">=sys-libs/pam-0.99 >=sys-libs/libhx-3.10.1 dev-libs/libxml2 - >=sys-fs/cryptsetup-1.1.0 + crypt? ( >=sys-fs/cryptsetup-1.1.0 ) + ssl? ( dev-libs/openssl ) + selinux? ( sys-libs/libselinux )" +DEPEND="${COMMON_DEPEND} dev-util/pkgconfig app-arch/xz-utils" -RDEPEND=">=sys-libs/pam-0.99 - dev-libs/openssl - >=sys-libs/libhx-3.10.1 - dev-libs/libxml2 - >=sys-fs/cryptsetup-1.1.0 +RDEPEND="${COMMON_DEPEND} sys-process/lsof" src_configure() { - econf --with-slibdir="/$(get_libdir)" || die "econf failed" + econf --with-slibdir="/$(get_libdir)" \ + $(use_with crypt cryptsetup) \ + $(use_with ssl crypto) \ + $(use_with selinux) } src_install() { - emake DESTDIR="${D}" install || die "make install failed" - dodoc doc/*.txt || die "dodoc failed" + emake DESTDIR="${D}" install + dodoc doc/*.txt } |