Completely inherit our system-local-login configuration. Bug #524792 by Patrick ...

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

diff --git a/x11-misc/lightdm/ChangeLog b/x11-misc/lightdm/ChangeLog
index d36ac9f7e744756acee9ea52c9092782af573170..aaefb0d8b1a976a565a525bb099d534a31dc55ef 100644 (file)
--- a/x11-misc/lightdm/ChangeLog
+++ b/x11-misc/lightdm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/lightdm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.101 2014/12/05 10:19:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/ChangeLog,v 1.102 2014/12/22 10:21:55 hwoarang Exp $
+
+  22 Dec 2014; Markos Chandras <hwoarang@gentoo.org> lightdm-1.13.0.ebuild:
+  Completely inherit our system-local-login configuration. Bug #524792 by
+  Patrick <gentoo@feystorm.net>
 
   05 Dec 2014; Agostino Sarubbo <ago@gentoo.org> lightdm-1.10.3.ebuild:
   Stable for x86, wrt bug #529834

diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 5ce839e7a7779196f6026eacd88950a8e67a1883..0e2612b360de874c75423657ec7d002c057a5840 100644 (file)
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -20,24 +20,26 @@ EBUILD lightdm-1.10.3.ebuild 3264 SHA256 001f3c85828d6ac1458ead07c2b5688672c5898
 EBUILD lightdm-1.10.4.ebuild 3272 SHA256 ac19caac10f193c977aee89b5846c4e54ed12d00bb36f6090b03642b825cc82b SHA512 568eca2e06640dffeb88813bf593794ea29180c6d3c6c20c2435b09f885262f3f807d854ff0e21a4451ba9e71c34ac1d43dab7e9342a297a4083e1214432121d WHIRLPOOL 4028524cde75f985175751f5fcd82a081786a4b210862239abcb0e6de7c869fa5888d59bf3d8ba2ff79dc7f19a9df5099a89283c4389da50e1c2b39edff311ef
 EBUILD lightdm-1.11.9.ebuild 3314 SHA256 d751381830378f07e3fb7d7e6234d86579bfffcfbb8102698f991d3f64e30317 SHA512 e765213e7badfd1b100f91990846afc2d9af1acfc4bcfd454c527d1e4d709882a71348030582418733b8c4b44a463ccf4ee79845dcfea96555c81008d5f95998 WHIRLPOOL 7ed10fdbfc8c9d3e31974063c15befd2c0646d534022124f39dfd06fd4b2b26e013b7d89c3f63481c369fb4037859cb7aba0bfc90c8b44f94766a9651f1406e4
 EBUILD lightdm-1.12.2.ebuild 3397 SHA256 6b475601530f4cedefd3652f4ffd9af7cc3168d66d05a8eb230331376fd71a65 SHA512 7be17eb76186b45c4f7f9da55d8caff189a1cb5a8f1d7f1ff018d940e9779077fb4eddbaca8c1c4f2b2aa4424dbe6be02fcbe686273a822c70b89e07bfa52489 WHIRLPOOL 20d4997f63030adb81671338d0f60cea8f68106cd0e281cb8d7f4f664c4a66c8558aa198805d1f5f7725bf033f6986c322272b8500d4458b5f819be113ff5112
-EBUILD lightdm-1.13.0.ebuild 3397 SHA256 3806781887bb8c21c01c63e707253650e089cbae85833ede9ac22f0c928ec25a SHA512 1761db04f97b35886aa57bbc327d125d06275c3d97953494e7ec6fd1fd311326de4e668ee829e0a5b59da6ac6526e56907928ece14eb7a1d1bff6670087bc2e7 WHIRLPOOL 4213a71fd3c761997126e98a6cd4adca8200412c0d6e302138a7f074e678d7cc0b3954c89be2fb2d67d2b25de6dc693d94a3aea202c505888cf4700f369cc1f5
+EBUILD lightdm-1.13.0.ebuild 3504 SHA256 30f31c4cf70071b7decf993264b7f8870df6ddf59acc420370a8350ad225b1be SHA512 eb7aa9aa4c5e318b85191798156a4454f70bbef6cab616bac07ace26ed283630a788b79354cf6c3d0f09c85d54c7d0b1c18f02e8bbb1fa65de17e4d4ed947f58 WHIRLPOOL 29437c769c9796383e671f79455624d2d3338c8838a68863ccf1aaeea581d4f4d3bc37b28be1168daea9a503a8573938d78bdfca4cdee7c89907d0e95c0ac9ea
 EBUILD lightdm-1.8.5.ebuild 2803 SHA256 8f9329140c76835a3450966fce40e4def32ebf0ef81f8a79ce78a6723d6a3e3d SHA512 3cf035301b67292dddba3bfa1e348f72044da8f1cd87171bec2f44da64e17aa625be8a0e5540b184f3464d4a0e305c06f9c4c7c44d627cfc013ccc02d6c5e4a4 WHIRLPOOL b8c42bf4ea1d8f9f2e0c282778a84532060ce481d679c56e9d8facde20a6d0462e8b5385f9571ae9dec4fbb1bbdebf81faddb92d51ba099b2c44644328a0d1f4
-MISC ChangeLog 16642 SHA256 57095deed6f1dd0c860a20b5bd552bc969cbda30cfc7419ab0bfedd701ca632e SHA512 eb9b9f57435d4a9eb8fae5b872280496e9e788597c9ad13bd124e8f1282eca843d5453b6e992cf703b5772e457b8b214164919c755171745e921659bb076faa4 WHIRLPOOL 7f99442f182f6f45084b9fd29ae60b78cfdc6f4b381c00177dd77d59cdd080a2368911d3c8fb7bdcdd62e236a71c3b0698aad5132322dd44232880321c7e848d
+MISC ChangeLog 16830 SHA256 e8956a002734fdf5240096ed246ab12f440a72ad30008abf9f7dbe242157af1b SHA512 166ce4499a5d537a565543bf1b5723ea0ede36e6bfa8ee7a094a52994f3c75cb9f3504635dad5fbdfed685b8005391b54fb1592d5aaad4b99cc294701c6446f5 WHIRLPOOL 3e8904b1550e8f88fbacc5a1b4b7b2f3787da4f98ac21ea2e9a7c109b6f18b013dc9c839d924ebd989e2bde623a128f6eb6bd5b1fbcbef780044b82a80f676d3
 MISC metadata.xml 534 SHA256 cc20c58e04e520dc9e21c7a75d92e2714d94b1c1cdfddc94e8694c40af0d9597 SHA512 141fa9fde06c409a2d5ab3bc2f91c6d0a61568e1e94cdc417e530124487ef9f51141eeb74bc6e9ff957ae0f1f166a799634fca5a99995fdec920c3c858300863 WHIRLPOOL ff63e4220de78992417e5f8ecbe5b00b90f54a98bcd8c0dd6c9025db749213534a0b3e79d51a8f958f463726efee952eb8c31d2a161a77637f5eb6fd565f66c1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUgYauAAoJELp701BxlEWfUe0P/04DwNOxOgtqRzs31TrqqhEV
-kaCxHan0fMZcFW/wxI01EglmsDi6dhlvihzXbtYu/M7gk9Da9DQQ8atTezTCCtll
-lMfI9OGRpQnDCyOhbZTAVvnavHL5PvcIUKACA4O1truBpKSMQi8WgxHi2n5/aFQN
-dTY8kpXj40QYMgxJIRkQPyUTNCcCMn8zQPLx3bSQ21Xcxq4P4jn1EGYr3TqCE4NL
-Ibd+9x45OWQ2Pdd9654XiC0q1FLUpsIpUVIUumtjCCjwnitcznVTcL/8xq/vv0Zn
-ongKwa02KjTZhvr/kXZr/XvbVr5j9IH7Dw+HZpnATXbO8qodZSgaMcvqJbej7OhR
-TwpLWQxlA4Bu9pXZF555WMUuOfyUht/EXLR+vTYhtQiGtF3fg4r2n1G0xh+J9vHI
-VC7DO1eFaT10KVJoUgJzvNmqzh9TiaXmTXUJrTzlLOHZ9flpKnQ1Tj0v00GBYHhf
-gKhPJilOy35MVwKZc/d1+/Fp+T8nVTHz/kWyhDqLcKJj/Yj8B91AFkUFoYn+QW/X
-dTydUgaqFXF+sIx1NE7VTHsWqDHNpOQf2aFQEKMek79O54YpUg/UkFhZ6Rxbr2pA
-jdb8BmooPleqT/HwD4wDqKXBZjwrZV3asu9gMcy2jL2a8BduDlzg2gIvDHpuQ5Tn
-G/Nfp86xx3E/uvZluQwn
-=DV3R
+iQJ8BAEBCABmBQJUl/DDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88HEQQALCOeL0/TwDqsdaHKj7u9RA1
+ChDbwEp6wfRM3I/cnCdwXcltq9fWksWUbZ1qJv5yQMd4x0z0nI3HMIluaIul7Z+J
+akH1Ppumadtac5V9DcSQXa53SFzWilYJeRo6NZGlibHnktFZYXmUZ5Vak8EaiZhE
+1+pzshinIbH+KMAo/4cuMxnQeEuhS6UPSgrrpCyd1s6wsd6KIi9LUCv/2GpwLDWT
+HWVjy8TLXncWIL1WQUY/YnTs912abzo8OqaqBNLJLjPtnwQeZ0IlED3nlAoeWde1
+3K1kzHcxXQiqNKvGnXahcexHfareeWQ9vSUoTlRYBy+FeRNchKYeZ2ocM8IWQmRu
+mDnw9+XlaQ4vvTfeeCJCAaCOF83QKUS0iGPzScFhoAhiMSxzp+tFQdNh1EZwMaJK
+s1vToSGdbRHpWF+fXnlAIiEnDH94/69cg5AVKW7VnfqW/ye0qO7B6sLQTF0hutfT
+vwFpbjtDmKDCpa8K+RYjy+YS83Bzd1EhVyeCgTsXHL5rxl4onrAuBxNA1th/GTgo
+HFMFWXk1TM1SQ3hcT4pXywYELWZjdNTRNfmWQAlQKjRa3Stc7mHZcJSmgYepahns
+c1mZy8vDtvt6ZAwWy4f8uYtORv4b+VLSLhDDF0VT+QSZjRt43nuhloSnqZtLMi1E
+Uzamb/EkgFiManJuuHz7
+=zDJ0
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/lightdm/lightdm-1.13.0.ebuild b/x11-misc/lightdm/lightdm-1.13.0.ebuild
index 5caa08fe42e2053eae95c0561f20769382db145c..ebd21f255258c28e5e29d0e77648c346b93c7768 100644 (file)
--- a/x11-misc/lightdm/lightdm-1.13.0.ebuild
+++ b/x11-misc/lightdm/lightdm-1.13.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.13.0.ebuild,v 1.1 2014/11/18 18:46:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.13.0.ebuild,v 1.2 2014/12/22 10:21:55 hwoarang Exp $
 
 EAPI=5
 inherit autotools eutils pam readme.gentoo systemd versionator
@@ -110,7 +110,9 @@ src_install() {
        prune_libtool_files --all
        rm -rf "${ED}"/etc/init
 
-       pamd_mimic system-local-login ${PN} auth account session #372229
+       # Remove existing pam file. We will build a new one. Bug #524792
+       rm -rf "${ED}/etc/pam.d/${PN}"
+       pamd_mimic system-local-login ${PN} auth account password session #372229
        dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
 
        readme.gentoo_create_doc