diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-09-29 06:05:16 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-09-29 06:05:16 +0000 |
| commit | 034f3e1b0bdb440435ad20da186d126526cfcba0 (patch) | |
| tree | 3d13df27222a8272285743776d96fbf2778d6fc9 /gnome-base | |
| parent | Initial import of curb. (diff) | |
| download | historical-034f3e1b0bdb440435ad20da186d126526cfcba0.tar.gz historical-034f3e1b0bdb440435ad20da186d126526cfcba0.tar.bz2 historical-034f3e1b0bdb440435ad20da186d126526cfcba0.zip | |
Do not install old /etc/pam.d/gdm file, it blocks sys-libs/pam from emerging (bug #435042, thanks to Martin Wegner).
Package-Manager: portage-2.2.0_alpha132/cvs/Linux x86_64
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/gdm/ChangeLog | 9 | ||||
| -rw-r--r-- | gnome-base/gdm/Manifest | 18 | ||||
| -rw-r--r-- | gnome-base/gdm/gdm-3.4.1-r3.ebuild (renamed from gnome-base/gdm/gdm-3.4.1-r2.ebuild) | 5 |
3 files changed, 21 insertions, 11 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog index 93f17752d7f5..6f445fdcf416 100644 --- a/gnome-base/gdm/ChangeLog +++ b/gnome-base/gdm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/gdm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.356 2012/09/27 08:54:42 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.357 2012/09/29 06:05:16 tetromino Exp $ + +*gdm-3.4.1-r3 (29 Sep 2012) + + 29 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + -gdm-3.4.1-r2.ebuild, +gdm-3.4.1-r3.ebuild: + Do not install old /etc/pam.d/gdm file, it blocks sys-libs/pam from emerging + (bug #435042, thanks to Martin Wegner). *gdm-3.4.1-r2 (27 Sep 2012) diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest index 177d182d1fee..afe86d6abab3 100644 --- a/gnome-base/gdm/Manifest +++ b/gnome-base/gdm/Manifest @@ -56,18 +56,18 @@ EBUILD gdm-2.32.1.ebuild 5598 SHA256 07e3f9943690b9ef5b15ca5aec52e4eab8821a98963 EBUILD gdm-3.2.1.1-r1.ebuild 8526 SHA256 f0912fbf728c0d57270c4641ac0c0e592d2c685266cbbe54af03f120f8254d81 SHA512 7d506a0301799bdd74b94ec2f580c03a00110cf45737d37f5fa66ec16bdd95ae667f3d847a370ecab49ed34f8c67065ad60e92be0f72295e8d9f4063e5e22e8d WHIRLPOOL f37b8f19934b010afee6a452af8074bcae76b2b729206443526a7686f81492eea86e2377b68862837043c78bf35bdea05eb58001f3148904cd3e17b7f309cad1 EBUILD gdm-3.2.1.1-r2.ebuild 8495 SHA256 19caabcbbb3ab9e5f134d6b2f1334eab39455b6100343468d812e2e3fb3c5ed6 SHA512 a53db45ce7a772dac65f55d8b23768cd8000178b278652d230954d6a282918e8ad0fc87b70e49b5d35f7a3e1088b1a14a8625de14bea8d64e2bce81a3811ae9d WHIRLPOOL 8f74680bf1b1da81f73f395c0cd9792038aff7e97d261f5ddaf9a51f2a605f6cb6b3dae817b3d27f69fc648b3088dea048103e28c1a9d01bbe2e051e24798c4a EBUILD gdm-3.4.1-r1.ebuild 8792 SHA256 65649cceccdd4ccac39e641ad87d04f2411ffc5d5f223fe80e4a001ee4d17e50 SHA512 45835b2e1b184bb28d839f28a4544b7e438224a75148e576c2d1301c4c1fde1dfd8a715cbe8deebb9120bdd69f064e2834939af94ccfadfe5109fa0c1c02201e WHIRLPOOL 3a075ed9502829048393e10e061ab6ab414b8c4f915f223f1b5539a35ad7c925c2c840983817a2327141254f0b5fd2997badd2cd611f56f6990fcfe1bbe689a3 -EBUILD gdm-3.4.1-r2.ebuild 8595 SHA256 1bb015e25dc89bf734ab732a688f632227fb855aa6a3a8952bbc275433d8a1e6 SHA512 9eaa57aefa029a54fecf412d612617e37ce579c7ebb9b08dbf101ce65ef661bdf368baa14acb81096e24960e5b7a7c7bd590bbb94907983ea1a92c9424e3a770 WHIRLPOOL 5f04c261d854947b27c9b7f380f03e0451884238fc0e08c09717ae040f06567ede12bb8a5f7db8cfdaa2af46c418926f6904c83efb5322f0e1105ba82565c813 +EBUILD gdm-3.4.1-r3.ebuild 8698 SHA256 7caee61fa2339d3fb2b961b9f599f534558ede5fe38ae50ddf688ea1107e7bee SHA512 37542fa07c67dd65f6b7f11f94620c47c1ef67d2f80b87b3335c266cfa35aacb9921e2341c94c98847d108194de95309c91b73dad4bb53e63908c7c344ac9198 WHIRLPOOL d167aeb722035028584b8757b92360b6ae0a8806c52e707f109f8459d14d6760edd54727b205dba82943f4477af19eb43368b82a6d8071e3a20af9e1e874f1bc EBUILD gdm-3.4.1.ebuild 8582 SHA256 fa66031cbd183dd3e6a6a5e72c8ee933070625dfb8cf0ebee3685f69052e10c2 SHA512 9f31ae0e130f8fc36c9c903df75652af666561b838532f340d9f6d74c991ee734520ebfb3531df200651e731df1a9b68b6026db35418d21ea145cba48d397fbd WHIRLPOOL be48b7bb524fe3fa3ebf3cd9d6e2251a1793049f3cfb83a213a75f0f82d7bc6e544beccd9a8317cd52659a7691a6a7a25307f4d18a8d8ef0b89207d7e9983932 -MISC ChangeLog 52829 SHA256 3db07c682e3aabcdefa12fe04ad54c51209a674048e8cadc2f2fa5a0f4194a32 SHA512 e7886280b403b372c9ce148d8e07a403e67c21919adfa538561073744f2b9db3026ae732725d96830e45f5f4127d851e85f7bd6e96bef2d876d9eceb8848c043 WHIRLPOOL c56de7d2c3c1361ffb91adeaf68ce00bff054cbd4a54dcfed08a262142a3beac511c9949db8a53b8e7cebd87815b2a893e244af96c7077b1efa50b72a537c641 +MISC ChangeLog 53085 SHA256 b92bd479d55e4b7a5046e3c416f3f782d70052c106c317e0bfc0a20e1f4d79d1 SHA512 37c7b758de275bbb27f9b9d69b6fe8aa210fbd4642c7a578d0f147f73470cb8d58fe3e2656a08915a1e04ec3d47d884133cb4b301521fb11763dde46e6053c17 WHIRLPOOL c62083d19c7f6fa7c2cc3855aaee99ac623df6c37d838749ac14eb3997bf326b296981c69ee01cee05b7de6ae61042688448889f427169fbc3a8bcdc898ae0f6 MISC metadata.xml 1298 SHA256 6b65a6f30467b69a363f8c6032fce0ded6679baecb1627d1117019f853cbd1ad SHA512 68d672bb7163364eb754b886d690e8ada3527aacc37b8f51e30eb4b79ba27e6b3ad67f656bafa5e316a3c1f774a370c4d788caa8c9123abe82d9fa99d968eae2 WHIRLPOOL 182cda9a217a7f3f32de1e37185ffba41ce83c44a7c02b5654c1bd64fde4e141a12ad6c588bafc285869a972626c8424ea88583b4817bab07441cc1d6813f6d0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJQZBRiAAoJEJ0WA1zPCt1h7DYIAJqA4424mMWUdYV2Jm+72mtl -YH/twjYe7F/z7FbHoYhSJzLY3E2/XS6VjpaDasO9u212BdgOUkNj0xsX5glxZOHQ -c519oDpQey2Bli1phmTZ1Ib2xGikhhXslQ8LMUxoXDKVLpX6tcoGKm7d2hEHxxGV -MQcgsGjS+8fZWEuRM6dsLb7J7EdqYE4PltRuTHXiXycsJNtL+Hrrb0Wm0xWRoaDY -SD0aaQ+wgzaa835qQSZb4SQkdh6kpMFtpy1qIDwj6cVoQ+Q8k+Mtfr3vQCYXKrqL -WPCJZBlQxPzkSDF+HYbUDjGPGVib3iPlhlhib2Z+6vusqUL1Y9peBkRc5bg7ArY= -=2JaZ +iQEcBAEBCAAGBQJQZo+hAAoJEJ0WA1zPCt1hjHwIAIuDAgLUVcc9hscHdAcw+wZa +o9ISK8vUilrRxoc7/k5eFAZURmwKbI7oYM3t8M9KBh2LTl539IfyTZ8UUpM1oqot +meKBcKg4Mifnn9qxkJeUw74hyrRoBpaXzDQblHSdc/HGiXpSsykPkn7yTsWFEQug +7kAWNzYsBXG0mMENQLkIWmFAdUJyOP8QiNNgzkWD1bqB+29PAT0BElgettwQWl/a +tMA1TUTpUvNZjjSAeP/wm0i9Si19ty4xxKtZFQ5yXS77O5G5lKoEaRPtPGFQtS25 +r4MOT2c47M11QWma539znNnr7v12VDDjKB62qpIvTgCM7DJnfuEcdP5LlAmLbsc= +=YIGs -----END PGP SIGNATURE----- diff --git a/gnome-base/gdm/gdm-3.4.1-r2.ebuild b/gnome-base/gdm/gdm-3.4.1-r3.ebuild index 9abbaf2fc45d..af4287f712cb 100644 --- a/gnome-base/gdm/gdm-3.4.1-r2.ebuild +++ b/gnome-base/gdm/gdm-3.4.1-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1-r2.ebuild,v 1.1 2012/09/27 08:54:42 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1-r3.ebuild,v 1.1 2012/09/29 06:05:16 tetromino Exp $ EAPI="4" GNOME2_LA_PUNT="yes" @@ -202,6 +202,9 @@ src_install() { echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm doenvd 99xdg-gdm + # pam.d/gdm is no longer needed, and can block pam-1.1.6, #435042 + rm -v "${ED}etc/pam.d/gdm" || die + cd "${WORKDIR}/${G_P}" local LDAP use ldap && LDAP=yes |