sys-auth/pam_mount - tweak system-auth and drop redundant sed accordingly

svn path=/; revision=31

diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index 2b88b5098e78e0d338fc0bbdc6338235e7e0f3f5..800c130d3dcaa9d54e8fed5357ba3420e5a1d45a 100644 (file)
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -6,15 +6,15 @@ AUX pam_mount.conf 10115 RMD160 1fd1af233ce50a6fb231341966982a15c747fedf SHA1 aa
 MD5 b8261fc18126cbabf8670a3d92806448 files/pam_mount.conf 10115
 RMD160 1fd1af233ce50a6fb231341966982a15c747fedf files/pam_mount.conf 10115
 SHA256 7bf16e96d6d4a7e380913316863d06f2b405883b5c790329aeaf3c7ad90e8f12 files/pam_mount.conf 10115
-AUX system-auth 854 RMD160 245e7ce8d62eb0287a407b50da89ab31907bbba4 SHA1 b73d60df937682b0c32b349ee15d17ed5541db1c SHA256 ed92728a3dfcc5a0c56a60fe86b9c4fd604af5187742276de272a932ac964a92
-MD5 f8ee99521dc32770ef1a077dd3c92ea2 files/system-auth 854
-RMD160 245e7ce8d62eb0287a407b50da89ab31907bbba4 files/system-auth 854
-SHA256 ed92728a3dfcc5a0c56a60fe86b9c4fd604af5187742276de272a932ac964a92 files/system-auth 854
+AUX system-auth 788 RMD160 2bd8f3a36e181072708c2e16eb5142abedc92b56 SHA1 0b0925270acadaa87fcfd93dea8f17847da3f85e SHA256 a5683c1fe369facdd41d735ea774e628170fa48e979bb7f4778fff05a2ea6199
+MD5 576010d1897ae496736e03ea81f66aa6 files/system-auth 788
+RMD160 2bd8f3a36e181072708c2e16eb5142abedc92b56 files/system-auth 788
+SHA256 a5683c1fe369facdd41d735ea774e628170fa48e979bb7f4778fff05a2ea6199 files/system-auth 788
 DIST pam_mount-0.13.0.tbz2 287706 RMD160 c389a3148e15f386d71b4372529a383e9083098c SHA1 1534fdd0691259fec8538b7a977948749e6a498d SHA256 0ef31fca4357e10ad0a8dfa89f124d75b25f4341a8b76aece4847954aeaeddb1
-EBUILD pam_mount-0.13.0.ebuild 2329 RMD160 baad8f60a3f0fa917209f0e466461ae774ba9804 SHA1 e693efdd18d4e0b58063fcaee32d39b274cbe4a3 SHA256 a8cfba9d918ee4de763f70c284d2de8c8aedee1964db3704c2b0085d8ffb635a
-MD5 97d76eb156eb4c7f02fd313b2208e3a0 pam_mount-0.13.0.ebuild 2329
-RMD160 baad8f60a3f0fa917209f0e466461ae774ba9804 pam_mount-0.13.0.ebuild 2329
-SHA256 a8cfba9d918ee4de763f70c284d2de8c8aedee1964db3704c2b0085d8ffb635a pam_mount-0.13.0.ebuild 2329
+EBUILD pam_mount-0.13.0.ebuild 2202 RMD160 7bd425ad17dd48eb72400f7a849c5854849ee8c8 SHA1 54e7a9c3bea0071339655422784cb5bc64bdae60 SHA256 833811f0d207a743b6eb7d8ddbe782ab4cc1598857ba1e2d513c7eff50538e96
+MD5 ed411165f252af7e95f4e410fca9245b pam_mount-0.13.0.ebuild 2202
+RMD160 7bd425ad17dd48eb72400f7a849c5854849ee8c8 pam_mount-0.13.0.ebuild 2202
+SHA256 833811f0d207a743b6eb7d8ddbe782ab4cc1598857ba1e2d513c7eff50538e96 pam_mount-0.13.0.ebuild 2202
 MISC ChangeLog 268 RMD160 2bc935a4f466d8c58297afb6bf2922cce304520c SHA1 a9897a77d977863dbcdece0b16083a71c587cb47 SHA256 6b78a01ae9d2bd89bb9af78ea751858fb7d8f73042ca06f3bc1cca9351647a7a
 MD5 a52f72391bb0a79b1da550122973c322 ChangeLog 268
 RMD160 2bc935a4f466d8c58297afb6bf2922cce304520c ChangeLog 268

diff --git a/sys-auth/pam_mount/files/system-auth b/sys-auth/pam_mount/files/system-auth
index 83767b905cfaf35b0ec821ccb3fd9acaa50ea51d..cea944cc5f8b69086f46f576424cf9275142e0fc 100644 (file)
--- a/sys-auth/pam_mount/files/system-auth
+++ b/sys-auth/pam_mount/files/system-auth
@@ -2,12 +2,12 @@
 
 
 auth       required    pam_env.so
-auth       optional     /@get_libdir/security/pam_mount.so service=system-auth
+auth       optional     pam_mount.so service=system-auth
 auth       sufficient  pam_unix.so likeauth nullok use_first_pass
 auth       required    pam_deny.so
 
 # Added for pam_mount support
-auth       required     /@get_libdir/security/pam_stack.so service=system-auth 
+auth       required     pam_stack.so service=system-auth 
 auth       required    pam_tally.so file=/var/log/faillog onerr=succeed no_magic_root
 auth       required    pam_shells.so
 auth       required    pam_nologin.so
@@ -20,4 +20,4 @@ password   required   pam_deny.so
 
 session    required    pam_limits.so
 session    required    pam_unix.so
-session    optional     /@get_libdir/security/pam_mount.so use_first_pass service=system-auth
+session    optional     pam_mount.so use_first_pass service=system-auth

diff --git a/sys-auth/pam_mount/pam_mount-0.13.0.ebuild b/sys-auth/pam_mount/pam_mount-0.13.0.ebuild
index 25c4f8cb8d6e6e8c51b19403dd8b95a490773fa8..282cafe51fc0273c82345f3ffbb384e7158afc8d 100644 (file)
--- a/sys-auth/pam_mount/pam_mount-0.13.0.ebuild
+++ b/sys-auth/pam_mount/pam_mount-0.13.0.ebuild
@@ -29,10 +29,6 @@ src_unpack() {
        # locations, in srcipts/(u)mount.crypt and adds gentoo specific
        # comments to pam_mount.conf
        epatch ${FILESDIR}/pam_mount-gentoo-paths-and-examples.patch || die "patch failed"
-
-       # libdir magic
-       cp ${FILESDIR}/system-auth system-auth
-       sed -ie "s:@get_libdir:$(get_libdir):" ${S}/system-auth || die "sed failed"
 }
 
 src_compile() {
@@ -52,7 +48,7 @@ src_install() {
        insinto /etc/security
        insopts -m0644
        doins ${S}/config/pam_mount.conf
-       dopamd ${S}/system-auth
+       dopamd ${FILESDIR}/system-auth
 
        dodir /sbin
        dosym /usr/bin/mount.crypt /sbin/mount.crypt