Don't block SIGUSR1 (#524008 by Serge Gavrilov), drop old

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

7 files changed, 113 insertions, 73 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 5585b07dc684..904684f5a45b 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.408 2014/07/28 16:25:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.409 2014/09/29 11:52:45 pacho Exp $
+
+*gdm-3.12.2-r1 (29 Sep 2014)
+
+  29 Sep 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/gdm-3.12.2-SIGUSR1-blocking-1.patch,
+  +files/gdm-3.12.2-SIGUSR1-blocking.patch, +gdm-3.12.2-r1.ebuild,
+  -files/gdm-3.6.0-selinux-automagic.patch, -files/gdm-3.8.4-pam-systemd.patch,
+  -gdm-3.10.0.1-r1.ebuild:
+  Don't block SIGUSR1 (#524008 by Serge Gavrilov), drop old
 
   28 Jul 2014; Pacho Ramos <pacho@gentoo.org> -gdm-3.12.1.ebuild,
   gdm-3.12.2.ebuild:
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 2dc414841069..0140d9dd0242 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -14,27 +14,25 @@ AUX gdm-2.20.11-underlinking.patch 1441 SHA256 90dc3103d54789804b88a171d20353c71
 AUX gdm-2.20.2-gksu.patch 544 SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d SHA512 6fcb5681a47f9bb0aa248e9c0dba27ccc7820ac56e8d1bb4621652a8bd759981899d24c08bd0546a1c4937c664e5d82e101da9900938198a9a0d1a9349891877 WHIRLPOOL 655d16026cf3dfe3a5e7c0007c7e80fa996b5afe6f5704a5326e40540b049c348caa70b7c4e681e5bbeafc28160142be0abb73015905e42a202a9a5f322fe06a
 AUX gdm-2.20.9-parallel-make.patch 1499 SHA256 c8d04d1cae1c2bac16bf3f41fd481eacf5f4a3962f661996f93da39d4161bb0d SHA512 3ba30cdc5c9c665dc1000923d7fe61b2a4bf1ea9b5e8b88d07ed30e4ae28afa529894177e57fb032ec37b0a8ecc426a5f6acc4a6d2b1a973abf0ace50b17a8f3 WHIRLPOOL 7bf3163f549d498ded4f36a0a7f38b48819a676c0ac314286f920ee25e056a128c843b1df683edc2ceb3e8e947ca420f3fea1eb1d43519b2147aa5d262851c06
 AUX gdm-2.32.0-xinitrc-ssh-agent.patch 863 SHA256 71231d08baf41ee7b91c33c3d8a731c078d1d29328e09223efb1f579bacdaffe SHA512 3d7e841c018044ab1fd9804ad57ae75ece0ed2f9a9731023e90a1b25099bff5375c73ac842e353b38328f95f5baf59b84e4859a54f47176da0443aed6b58e3b3 WHIRLPOOL 56302e13dd104ae7f19dabc443403c25ef7a69428934e3d8ce0432442845dfd03854576a2b426b307954f9fc17e7ef846992a210054c7cc0e744450a7e5743a4
+AUX gdm-3.12.2-SIGUSR1-blocking-1.patch 1584 SHA256 adbb4aa5706653b6222ad3e0f29b0a16840b9f5b2f01523955f335a6bcfb70fe SHA512 2d694811fbf71bb32b0f8a03695961409b2136f9fa40f7d820421c5ad9432e5568603f6374cb3006eb3f77626236021ec19786a164f7f37c48ae65304bd63804 WHIRLPOOL a33c0e28d7cd479a5fd91ddcb964a5e71fc388cf8956284f25301c21e64b720e271c65aae4e42085c334a6cf47b687d67622491affaf3fa8ea062a490f3eba41
+AUX gdm-3.12.2-SIGUSR1-blocking.patch 1725 SHA256 8d1e3c7ea31ce777d354f3674f8f554129d11c2306c638b8f9c25535718303ac SHA512 ca0b220b559e4a0a605c1adf06a889ae67528784e6bcd0bff5ec9a3f9126d4e62a9d0d420497e6681d594aa002cd32d2e1225bc6c588d8359b790accf77e390c WHIRLPOOL 36a57864d3aafaf1d768fb335e5a17698e11dc22e22fa5aa636d5d633b4521bd70e18f7347cc34d4f3eb847bb01634ada8fc0681db4f637d15b55d86fdb4a8e3
 AUX gdm-3.2.1.1-custom-session.patch 1317 SHA256 75bd1bdc0d396fee71ff41c2657f922a4c8e290c891cc72f47647ab832d0c285 SHA512 474f839febcebd86449e21ecd7557b599889af7b070b305afcd3c008164de2fc2d42749a4f06e7e405e27671da49a32291468b2940d1d15f05cb1088fb7f42f9 WHIRLPOOL 2310fd849c3a87eab5e78b482f74fb4b97a93b49bc4ecd60197054eadaaad35a6bc73500c246368c031e4646c3effd555233fe5a0cf17e99d81ab4b62e7215e4
-AUX gdm-3.6.0-selinux-automagic.patch 909 SHA256 9b1a3c5913e53f30641dc1177d396060c81abcfff6d8e9acc738e4d19e396580 SHA512 68a6fa710862bde6479b9e35f66d5b65c5cf90df462d8f318ad06ad04fd2106376915250d8b09a6ca0716fab78aedc619e41de6f2c93e57449442a7613fe575b WHIRLPOOL a5ca1901f52be902cb6896759a3ce92f2298782d80ca6c6a023a3fd7a6cea8884f93af7cbc85788fd24166f4bf5da1c357b2056d3d6141fb5540273b9dd63a5a
 AUX gdm-3.8.4-fingerprint-auth.patch 919 SHA256 d7a24f252fe78f3a1ebfe4ab3c3ceceec3ad737be3d0d435d33695c34fbdca81 SHA512 abc0836a0e87cb0e9a276aa6c086a68505140db86c063ead56f4e457f2970a4e1df97f1b4b7b0b5dd03769ddb00c9b5c0be5af13430a2dfe1b00500017d5815c WHIRLPOOL f335a677c72f806d741fbfc5816d1dee7902cfe41eaf2a445f25a2601a9bd82d5eb60cd7ee999a8c2f576ece95b8966b13169c03aac81dc686305d223301627d
 AUX gdm-3.8.4-logo.patch 432 SHA256 78072659f969d2c49ad28c466d1553d49caead71c09acd6aa1552ff1b46ecee7 SHA512 7f2e985f584a6b4f184c452eb7b86161af11b84a7a5d5c94f874fc13b3fea7d6c944adf084fe9ad0435226786444dc0dea0d1dd56caebd9c6ff29a7bc71decbe WHIRLPOOL cf1854933345310ab1ead3d09c2b9194d5e147ff74c20f45cc8a333af1f4790c8730ac39835d27e6ba8307f87602e2b400726f87389e79f5f74e592e023bc59e
-AUX gdm-3.8.4-pam-systemd.patch 522 SHA256 e49e664ee08e7f56995572bdec41d27870261c1a145d50eb096b4ef8baebdbc1 SHA512 30ade75532a8f5a8cd375a519a1c84d2d7f78ee938c70b54cb87f4ee8b01ae7943db6dab42c3e37ea4e14fa9f983b639eb14f3cd269cc0ef68c8fcf3f8ed9744 WHIRLPOOL c0f042be3aa7f7924b37da5f565bd282fc9c81f7999362b440e55b38c0a628313b919803b54b378233c3af77e6dc769fa49341d07185b26bd8dbe512fc2f0f12
 DIST gdm-2.20.11.tar.bz2 4013059 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad1a28ef05f7e0178891f1eaa2 SHA512 ca8ce81161c640ef2753a35b8eb0fd8669a7e42dc6272b2aa7b4a9f525b4d03dc46bb5aa8d41b69aaba36c8715a220c92e75c169ce9d5af39b25853505abeb39 WHIRLPOOL 0bdb90aef849c7b505ffb1b0af1b904970a9cd11c27cf631794b14a01b5e0fb01666a51b68cf288ae79057dd7bfca9a8f1ef9518ec5b04a4867eb7792c631765
 DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9 SHA512 aaf0f4bfdb13f6dc81dbfe93b144343b6a8146698450fce9753396c92bef2c4e699f3f5c2ff9b88736432d2fcb861ab8dc423148109cb9194983e0c07baa8aa5 WHIRLPOOL 698cd66740872260a106f8174a51a44a45817112d696b2741fd537a10362308ffa8917df31190fe042c46b7ea76e2f8d1147f5c15e39cfb33f1f2f7e951ffb78
-DIST gdm-3.10.0.1-patches.tar.xz 10116 SHA256 249b0676498477aaa4da70ea1f39d9612222b1dbd8100cbdbd7b46a37998ed94 SHA512 f4cbf9f96c8f999601bf9e940af6db7172f79013355779869cbbf4be0a6bdecc808bc536a0267608095cd2af362226c291c8f8deac5a642534d31af5007cdbee WHIRLPOOL 51cdbf01ca64154d65152fff69ed3476619c850358a87dae9a765ce2c0bdea2c8a74a3ff2cb6c2660799b519b4e54e1631f0898422c5461ccc2b8551d84222b2
-DIST gdm-3.10.0.1.tar.xz 1552460 SHA256 549a42009af9c79a4e07632e405dcb71ba2e876e766cff02471511ad641b6ae7 SHA512 9c108fd70324c17bd93c1f9ad74a87404350041c4d0c45f72c233a1414202b107502f0154486d8c8cceb9f0826275608045539c8bc96cbc6ef5350fc55d5462a WHIRLPOOL 34dd4595ad94822703b4c9d49ce413b64a93e0ccd50bd757dbdf79b592fb714b24d9c9b87d852d04d62750bec3daa3039e5d0d70ff03611c698f63b3b91c9404
 DIST gdm-3.12.2.tar.xz 1522384 SHA256 cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4 SHA512 0c7f93fa12f1b2c4b6af71ea2767dc2b3367cc0330edfa106b1fe6c1ed6f112cc148f2319801bc44bc9ff6636d0b8cf5bd4be67999b48f1a7275c68ce9d5dbab WHIRLPOOL 3fd6ca8f53316a0cc167741b35a9ac402d00da12feae162c567e62d4b72cf63ef6f695725f7bc8a755c7c567daf0de0661bf8d96e22472da22fd6ba110880ed7
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42
 DIST tango-gentoo-v1.1.tar.gz 29322 SHA256 518efa4257c8e689488399db23397a89f4dcd5990ce537ef6215860ad5606eb0 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045 WHIRLPOOL 9e1635a505ea48f4fe8bdb3b8b3b43cfb9cf99e3204194c51361b198886e719921cfacbc15f9f6407aa7d0c4af178e24c74b998fc370fa2329040e5be1baf153
 EBUILD gdm-2.20.11-r1.ebuild 7373 SHA256 0a27e4a2c37ba6980cc886ddfafdbce65c88d29cd66b79c95d04832f3b993b10 SHA512 493f7d8863fda71849ea7c3385889c1bfa3fe1e95060d0b4c1842338c46aaa912474de38c8531158cdba12db0e24baff1e9b215ab9ad52d6ea8504a857398fc4 WHIRLPOOL d89f68ad7b60493bf6f0bd1cb725942da9b050a10c9cc2c955f541f9e19a1b7ca99fccee6fb2b5dcf944c074c6dde70befb81f2f15a0bff730a53f7698867af3
-EBUILD gdm-3.10.0.1-r1.ebuild 6934 SHA256 bcead6db10a9b83f559a4ed80124edb8f2694c773de67bc42e6de74f1368161d SHA512 e68a1f8ee888b1ba2b44fa7fc44b47c68a90fbcf3f198fd6ae83c39ecd2f6ee0a3ddb3d576ec2d8a58a2bb6184fbd88f17071c15791b6894a5d31280158b2af6 WHIRLPOOL 35dda1238551c9b4c950518dec0a14f2c285161a77b4aea2e5b414d0d5a39b433f2a28aab531e09d5ba83a92f7e0aa20791d2ef49c9cdc6dfdb7bd5b241c95b2
+EBUILD gdm-3.12.2-r1.ebuild 6660 SHA256 5bf8474773b74795a5ab8af4d753a941bba37780c58429e1b459d37a7c584585 SHA512 5629205a4cb9baf13dbd5440fdf44f53e97116ebe136269c30d66ff9b8a2a58b6ffb7bfa2a9f5f2dc6cf85f44058dd836e9d5dcdc79dee5604b81e92b452b69d WHIRLPOOL 49817bb863808956289abd525e996865e2cc34262b10f3d6783312df87898718cfab752ea470d15ded4fe5062b4aa75100074eb5914d4760a17ff0f0464b0c67
 EBUILD gdm-3.12.2.ebuild 6553 SHA256 2f63df3215bd9a6026a282140ff279c9b02a488f73849bb9a744f8f0e8f70cd1 SHA512 9e8f503fc668651990240c3ab8fdc72c6957a7e88afb52f705e13db05999a8cc19afb4acb3845ecc233893d0fab3a9b1979c3f7823505dbb5aafa24980c5b560 WHIRLPOOL d3b31daac9d6767bde8c923938a97a1fd592824b0ec03b4f5a4a5f99442e23f3094662757cd63dd4885f39f3eb0f868980ff998594c8b5236e7831467bb4349a
-MISC ChangeLog 62359 SHA256 317873ebb48b0ca6c6a357d1d98ca0af6ccaebaf24c74125b336c25be112db10 SHA512 95a8bdc4eb479e616f954861397b9bfbc4a0b0760e75a48d5237f555d1fbbb7252042d4182e759e6ca61ce4c5358eec45b3998f09ff7818d838b691003f4d09f WHIRLPOOL 3a1243630b880399691fc2e972bdef16040046e92d4b24968785ce74050f1af752aa70a01973149e6d03fb4791cb25a79f00111a2db328ccbf30655ae50ff583
+MISC ChangeLog 62716 SHA256 40e25b1935117a2da15b16286f871e4b58026baa8ea9615b49aff08aae9a092d SHA512 fc4ff4bf5e94bdc6b9c675b3a375dbf930c18fba5ec30da6d2d90f17f4e81b7ed52d3c679fa219f34b523040d748a8230fd6f8b64039a645417612233808f63f WHIRLPOOL 2b10483f745d1d98e2106f0029f10cd43573b454db40416cc44bdd0f30610bd6a0eca56f05f16d80f93d316861e5b676ab122acbb0f7f3f1a726b110568a1ea0
 MISC metadata.xml 734 SHA256 ef71a7383585093a248a016783da93359975e3d91a4dbc14572d209fe7a44106 SHA512 512897b71e9fe9b1bc119f57ccea852341de68970b6c113d281a7422d6df449c28744301f46aa38190c5f9cb7b4ddf6ed37a44034201e592c097106a92c83b78 WHIRLPOOL d59b6d8ef1776254e52854e08896ae563c48dcdd5c9ca139f7b80085a81931aeb589f926f713e6cd8b24b8023c06e89d47b2ca0958bf63a3917ad398c76f3d16
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPWeX4ACgkQCaWpQKGI+9TIoQCghmitFVgf9TAiNP0hIhU1ET3Z
-0tAAn38NZi0wR2Yz7EMok25gcs0Z5L2A
-=F8Sj
+iEYEAREIAAYFAlQpSA8ACgkQCaWpQKGI+9SI4gCfc2toaalS8IoblPBzvS2TjyIj
+mpIAnA7g8dXxpU1soWlDy92IN2MvvVqP
+=KAcN
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-3.12.2-SIGUSR1-blocking-1.patch b/gnome-base/gdm/files/gdm-3.12.2-SIGUSR1-blocking-1.patch
new file mode 100644
index 000000000000..68b0c35aa22a
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.12.2-SIGUSR1-blocking-1.patch
@@ -0,0 +1,40 @@
+From abaa3e6cd96ca80560848f17a6a314c8405735d6 Mon Sep 17 00:00:00 2001
+From: Colomban Wendling <ban@herbesfolles.org>
+Date: Mon, 1 Sep 2014 01:21:04 +0200
+Subject: worker: really don't block SIGUSR1
+
+The manager process alters the signal mask, so we need to reset it to
+the expected default value when launching the session as the signal
+mask is inherited from the parent.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=731228
+
+diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
+index bc50b37..89505c2 100644
+--- a/daemon/gdm-session-worker.c
++++ b/daemon/gdm-session-worker.c
+@@ -1836,6 +1836,7 @@ gdm_session_worker_start_session (GdmSessionWorker  *worker,
+                 char  *home_dir;
+                 int    stdin_fd = -1, stdout_fd = -1, stderr_fd = -1;
+                 gboolean has_journald = FALSE;
++                sigset_t mask;
+ 
+                 /* Leak the TTY into the session as stdin so that it stays open
+                  * without any races. */
+@@ -1950,6 +1951,13 @@ gdm_session_worker_start_session (GdmSessionWorker  *worker,
+                  */
+                 signal (SIGUSR1, SIG_DFL);
+ 
++                /*
++                 * Reset signal mask to default since it was altered by the
++                 * manager process
++                 */
++                sigemptyset (&mask);
++                sigprocmask (SIG_SETMASK, &mask, NULL);
++
+                 gdm_session_execute (worker->priv->arguments[0],
+                                      worker->priv->arguments,
+                                      (char **)
+-- 
+cgit v0.10.1
+
diff --git a/gnome-base/gdm/files/gdm-3.12.2-SIGUSR1-blocking.patch b/gnome-base/gdm/files/gdm-3.12.2-SIGUSR1-blocking.patch
new file mode 100644
index 000000000000..6aff0d60862d
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.12.2-SIGUSR1-blocking.patch
@@ -0,0 +1,45 @@
+From ef6954833cf43bef8306823d7fcfb6a04b903ad7 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 30 May 2014 10:26:02 -0400
+Subject: worker: don't block SIGUSR1
+
+When the slaves were folded into the main manager process, we had
+to add support for detecting multiple simultaneous X servers starting
+up.
+
+We did that by creating a detected thread to listen for SIGUSR1 and
+then examining the siginfo to find out which X server is ready.
+
+In order to ensure only the dedicated thread received the SIGUSR1
+signals from the X server we blocked SIGUSR1 from the main thread.
+
+That blocked signal is inherited to the worker processes and the
+session.  Some programs depend on SIGUSR1 but don't explicitly unblock
+SIGUSR1 at start up, since the signal is presumed to be unblocked out
+the box.
+
+This commit makes sure SIGUSR1 is unblocked before starting the session
+to keep these programs functioning correctly.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=731228
+
+diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
+index 8af97b0..bc50b37 100644
+--- a/daemon/gdm-session-worker.c
++++ b/daemon/gdm-session-worker.c
+@@ -1944,6 +1944,12 @@ gdm_session_worker_start_session (GdmSessionWorker  *worker,
+                  */
+                 signal (SIGPIPE, SIG_DFL);
+ 
++                /*
++                 * Reset SIGUSR1 to default since it was blocked by the manager
++                 * process for the X server startup handshake
++                 */
++                signal (SIGUSR1, SIG_DFL);
++
+                 gdm_session_execute (worker->priv->arguments[0],
+                                      worker->priv->arguments,
+                                      (char **)
+-- 
+cgit v0.10.1
+
diff --git a/gnome-base/gdm/files/gdm-3.6.0-selinux-automagic.patch b/gnome-base/gdm/files/gdm-3.6.0-selinux-automagic.patch
deleted file mode 100644
index 035d0fa4b173..000000000000
--- a/gnome-base/gdm/files/gdm-3.6.0-selinux-automagic.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8f9bf7b053fc7a6c2e5b33fc43c168ba7250cb98 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 25 Sep 2012 17:38:37 -0400
-Subject: [PATCH] configure: Make selinux check non-automagic
-
----
- configure.ac | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 80a1fd4..61a43d6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -142,9 +142,13 @@ AC_SUBST(UPOWER)
- AC_SUBST(UPOWER_CFLAGS)
- AC_SUBST(UPOWER_LIBS)
- 
-+AC_ARG_WITH(selinux,
-+	    AS_HELP_STRING([--with-selinux],
-+	                   [Add SELinux support]))
-+
- PKG_CHECK_MODULES(LIBSELINUX, libselinux, have_selinux=yes, have_selinux=no)
- 
--if test "x$have_selinux" = "xyes" ; then
-+if test "x$have_selinux" = "xyes" && test "x$with_selinux" != "xno" ; then
-         AC_DEFINE(HAVE_SELINUX, 1, [Define if have selinux])
- fi
- AC_SUBST(LIBSELINUX_CFLAGS)
--- 
-1.7.12
-
diff --git a/gnome-base/gdm/files/gdm-3.8.4-pam-systemd.patch b/gnome-base/gdm/files/gdm-3.8.4-pam-systemd.patch
deleted file mode 100644
index 7ff0f35fd1a4..000000000000
--- a/gnome-base/gdm/files/gdm-3.8.4-pam-systemd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/pam-exherbo/gdm-launch-environment.pam~	2013-06-27 16:39:45.000000000 +0200
-+++ data/pam-exherbo/gdm-launch-environment.pam	2013-10-12 20:44:03.838894768 +0200
-@@ -8,7 +8,7 @@
- 
- password    required    pam_deny.so
- 
--session     required    pam_systemd.so kill-session-processes=1
-+-session    optional    pam_systemd.so kill-session-processes=1
- session     optional    pam_keyinit.so force revoke
- session     required    pam_succeed_if.so audit quiet_success user = gdm
- session     required    pam_permit.so
diff --git a/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild b/gnome-base/gdm/gdm-3.12.2-r1.ebuild
index e6e2567cae03..c29fc792384a 100644
--- a/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.12.2-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.10.0.1-r1.ebuild,v 1.7 2014/05/10 19:37:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.12.2-r1.ebuild,v 1.1 2014/09/29 11:52:45 pacho Exp $
 
 EAPI="5"
+GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2 pam readme.gentoo systemd user
 
 DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/GDM"
+HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
 
 SRC_URI="${SRC_URI}
 	branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-	http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz
 "
 
 LICENSE="
@@ -21,8 +21,9 @@ LICENSE="
 "
 
 SLOT="0"
-IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test xinerama"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard +systemd tcpd test wayland xinerama"
+REQUIRED_USE="wayland? ( systemd )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
@@ -32,7 +33,7 @@ COMMON_DEPEND="
 	app-text/iso-codes
 	>=dev-libs/glib-2.36:2
 	>=x11-libs/gtk+-2.91.1:3
-	>=gnome-base/dconf-0.11.6
+	>=gnome-base/dconf-0.20
 	>=gnome-base/gnome-settings-daemon-3.1.4
 	gnome-base/gsettings-desktop-schemas
 	>=media-libs/fontconfig-2.5.0
@@ -90,7 +91,6 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	x11-proto/inputproto
 	x11-proto/randrproto
@@ -128,7 +128,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# make custom session work, bug #216984
+	# make custom session work, bug #216984, upstream bug #737578
 	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
 
 	# ssh-agent handling must be done at xinitrc.d, bug #220603
@@ -140,8 +140,8 @@ src_prepare() {
 	# Show logo when branding is enabled
 	use branding && epatch "${FILESDIR}/${PN}-3.8.4-logo.patch"
 
-	# Allow many fixes from 3.10 branch and some from master
-	epatch "${WORKDIR}/${P}-patches"/*.patch
+	# Don't block SIGUSR1, bug #524008 (from 'master')
+	epatch "${FILESDIR}"/${PN}-3.12.2-SIGUSR1-blocking{,-1}.patch
 
 	eautoreconf
 
@@ -178,6 +178,7 @@ src_configure() {
 		$(use_enable systemd systemd-journal) \
 		$(systemd_with_unitdir) \
 		$(use_with tcpd tcp-wrappers) \
+		$(use_enable wayland wayland-support) \
 		$(use_with xinerama) \
 		ITSTOOL=$(type -P true) \
 		${myconf}
@@ -194,9 +195,6 @@ src_install() {
 	newins "${FILESDIR}/49-keychain-r1" 49-keychain
 	newins "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
 
-	# log, etc.
-	keepdir /var/log/gdm
-
 	# gdm user's home directory
 	keepdir /var/lib/gdm
 	fowners gdm:gdm /var/lib/gdm
@@ -215,8 +213,6 @@ pkg_postinst() {
 
 	gnome2_pkg_postinst
 
-	dbus-launch dconf update || die "'dconf update' failed"
-
 	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
 	ret=0
 	ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
@@ -227,10 +223,4 @@ pkg_postinst() {
 	eend ${ret}
 
 	readme.gentoo_print_elog
-
-	if [[ -f "/etc/X11/gdm/gdm.conf" ]]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
 }