Hello community, here is the log from the commit of package gdm for openSUSE:Factory checked in at 2018-01-16 09:29:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdm (Old) and /work/SRC/openSUSE:Factory/.gdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdm" Tue Jan 16 09:29:44 2018 rev:202 rq:563686 version:3.26.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gdm/gdm.changes 2018-01-06 18:45:32.141474552 +0100 +++ /work/SRC/openSUSE:Factory/.gdm.new/gdm.changes 2018-01-16 09:29:46.681046848 +0100 @@ -1,0 +2,20 @@ +Wed Jan 10 13:08:23 UTC 2018 - [email protected] + +- Add gdm-nb-translations.patch: Update Norwegian Bokmål + translations. +- Drop gdmflexiserver Obsoletes from main package, we ship + gdmflexiserver again, so this is not needed nor wanted. +- Do minor spec-cleanup, silence a couple of rpmlint warnings. + +------------------------------------------------------------------- +Tue Jan 9 07:38:30 UTC 2018 - [email protected] + +- Add gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch: When run + PreSession script, don't set DISPLAY and XAUTHORITY environment + variable, avoiding environment variable equal (null) + (bsc#1068016 bgo#792150). + +- Remove gdm-ignore-SLE-CLASSIC-MODE.patch: SLE-Classic doesn't use + environment variable SLE_CLASSIC_MODE anymore. + +------------------------------------------------------------------- Old: ---- gdm-ignore-SLE-CLASSIC-MODE.patch New: ---- gdm-nb-translations.patch gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.2KYZnV/_old 2018-01-16 09:29:47.485009233 +0100 +++ /var/tmp/diff_new_pack.2KYZnV/_new 2018-01-16 09:29:47.489009047 +0100 @@ -1,7 +1,7 @@ # # spec file for package gdm # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,6 +45,8 @@ Source8: autogen.sh # PATCH-FEATURE-OPENSUSE gdm-workaround-boo971852.patch [email protected] -- Work around boo971852 - xsessions is just not going to happen for a gdm user - Those users ALL have gnome-shell installed (which is mandatory for gdm to operate) - openSUSE only Patch0: gdm-workaround-boo971852.patch +# PATCH-FIX-UPSTREAM gdm-nb-translations.patch [email protected] -- Update Norwegian Bokmål translations. +Patch1: gdm-nb-translations.patch # PATCH-FIX-OPENSUSE gdm-suse-xsession.patch [email protected] -- Use the /etc/X11/xdm/* scripts Patch7: gdm-suse-xsession.patch # WARNING: do not remove/significantly change patch8 without updating the relevant patch in accountsservice too @@ -62,10 +64,10 @@ Patch41: gdm-plymouth-vt1.patch # PATCH-FIX-UPSTREAM gdm-fails-to-restart-gnome-shell.patch bsc#981976 bgo#769969 [email protected] -- Gdm should stop after a few times fails Patch42: gdm-fails-to-restart-gnome-shell.patch +# PATCH-FIX-UPSTREAM gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch bsc#1068016 bgo#792150 [email protected] -- When run PreSession script, don't set DISPLAY and XAUTHORITY environment variable +Patch43: gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch # PATCH-FIX-SLE gdm-default-wm-sle12.patch bnc#881659 [email protected] -- set default/fallback session type to SLE Classic Patch49: gdm-default-wm-sle12.patch -# PATCH-FIX-SLE gdm-ignore-SLE-CLASSIC-MODE.patch bsc#1060630 [email protected] -- ignore env SLE_CLASSIC_MODE variable when switching from sle-classic session to gnome-classic session -Patch51: gdm-ignore-SLE-CLASSIC-MODE.patch # PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 [email protected] -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login. Patch52: gdm-disable-gnome-initial-setup.patch BuildRequires: check-devel @@ -126,9 +128,6 @@ Obsoletes: gdm2 < %{version} Provides: gnome-applets-gdm = %{version} Obsoletes: gnome-applets-gdm < %{version} -# gdmflexiserver is dropped since 3.5.90 -Obsoletes: gdmflexiserver < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build DocDir: %{_defaultdocdir} %description @@ -145,7 +144,7 @@ providing graphical log-ins and managing local and remote displays. %package -n typelib-1_0-Gdm-1_0 -Summary: Client Library for Communicating with GDM Greeter Server -- Introspection bindings +Summary: Introspection bindings for gdm Group: System/Libraries %description -n typelib-1_0-Gdm-1_0 @@ -184,7 +183,7 @@ This package provides the upstream default configuration for gdm. %package -n gdmflexiserver -Summary: Gdmflexiserver Compatibility Wrapper for Display Managers +Summary: Compatibility Wrapper for Display Managers Group: System/GUI/GNOME Suggests: gdm BuildArch: noarch @@ -206,6 +205,7 @@ # Disabled for now, see boo#981372 and boo#971852 #patch0 -p1 %endif +%patch1 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 @@ -214,9 +214,9 @@ %patch36 -p1 %patch41 -p1 %patch42 -p1 +%patch43 -p1 %if !0%{?is_opensuse} %patch49 -p1 -%patch51 -p1 %patch52 -p1 %endif @@ -342,11 +342,9 @@ --remove default-displaymanager %{_libexecdir}/X11/displaymanagers/gdm %post -n libgdm1 -p /sbin/ldconfig - %postun -n libgdm1 -p /sbin/ldconfig %files -%defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README %doc %{_datadir}/help/C/%{name}/ %dir %config %{_sysconfdir}/gdm @@ -386,15 +384,12 @@ %ghost %{_sysconfdir}/alternatives/default-displaymanager %files -n libgdm1 -%defattr(-,root,root) %{_libdir}/libgdm.so.* %files -n typelib-1_0-Gdm-1_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/Gdm-1.0.typelib %files devel -%defattr(-,root,root) %{_includedir}/gdm/ %{_libdir}/libgdm.so %{_libdir}/pkgconfig/gdm.pc @@ -402,11 +397,9 @@ %{_datadir}/gir-1.0/Gdm-1.0.gir %files branding-upstream -%defattr(-,root,root) %config(noreplace) %{_sysconfdir}/gdm/custom.conf %files -n gdmflexiserver -%defattr(-,root,root) %{_bindir}/gdmflexiserver %files lang -f %{name}.lang ++++++ gdm-nb-translations.patch ++++++ >From d2e36b2bb527f6dee13e1a788b00455efe4c373c Mon Sep 17 00:00:00 2001 From: Kjartan Maraas <[email protected]> Date: Mon, 6 Nov 2017 12:52:57 +0100 Subject: =?UTF-8?q?Updated=20Norwegian=20bokm=C3=A5l=20translation.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- po/nb.po | 146 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 77 insertions(+), 69 deletions(-) diff --git a/po/nb.po b/po/nb.po index 52f8062..4f2a61c 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,16 +1,16 @@ # Norwegian bokmål translation of gdm. # Copyright (C) 1998-2005 Free Software Foundation, Inc. -# Kjartan Maraas <[email protected]>, 1998-2016. +# Kjartan Maraas <[email protected]>, 1998-2017. # Terance Edward Sola <[email protected]>, 2005. # Torstein Adolf Winterseth <[email protected]>, 2010. # msgid "" msgstr "" -"Project-Id-Version: gdm 3.20.x\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-05-03 23:26+0200\n" -"PO-Revision-Date: 2016-05-03 23:27+0200\n" -"Last-Translator: Åka Sikrom <[email protected]>\n" +"Project-Id-Version: gdm 3.26.x\n" +"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=gdm&keywords=I18N+L10N&component=general\n"; +"POT-Creation-Date: 2017-10-20 16:41+0000\n" +"PO-Revision-Date: 2017-11-06 12:52+0100\n" +"Last-Translator: Kjartan Maraas <[email protected]>\n" "Language-Team: Norwegian bokmål <[email protected]>\n" "Language: nb\n" "MIME-Version: 1.0\n" @@ -18,6 +18,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: ../chooser/gdm-host-chooser-dialog.c:147 +msgid "Select System" +msgstr "Velg system" + +#: ../chooser/gdm-host-chooser-widget.c:254 +msgid "XDMCP: Could not create XDMCP buffer!" +msgstr "XDMCP: Klarte ikke å lage XDMCP-mellomlager!" + +#: ../chooser/gdm-host-chooser-widget.c:260 +msgid "XDMCP: Could not read XDMCP header!" +msgstr "XDMCP: Klarte ikke å lese XDMCP-hode!" + +#: ../chooser/gdm-host-chooser-widget.c:266 +msgid "XDMCP: Incorrect XDMCP version!" +msgstr "XDMCP: Feil XDMCP-versjon!" + +#: ../chooser/gdm-host-chooser-widget.c:272 +msgid "XDMCP: Unable to parse address" +msgstr "XDMCP: Klarte ikke å tolke adresse" + #: ../common/gdm-common.c:298 #, c-format msgid "/dev/urandom is not a character device" @@ -49,7 +69,7 @@ msgstr "Systemet kan ikke starte en ny innloggingsskjerm." #: ../daemon/gdm-display-access-file.c:300 #, c-format -msgid "could not find user \"%s\" on system" +msgid "could not find user “%s” on system" msgstr "fant ikke brukeren «%s» på systemet" #: ../daemon/gdm-legacy-display.c:235 @@ -64,63 +84,67 @@ msgstr "" "som er feil. I mellomtiden blir denne skjermen slått av. Start GDM på nytt " "når problemet er rettet." -#: ../daemon/gdm-manager.c:766 +#: ../daemon/gdm-manager.c:777 msgid "No display available" msgstr "Ingen skjerm tilgjengelig" -#: ../daemon/gdm-manager.c:833 ../daemon/gdm-manager.c:1088 +#: ../daemon/gdm-manager.c:846 ../daemon/gdm-manager.c:1122 msgid "No session available" msgstr "Ingen økt tilgjengelig" -#: ../daemon/gdm-manager.c:844 +#: ../daemon/gdm-manager.c:865 +msgid "Chooser session unavailable" +msgstr "Økt for velger utilgjengelig" + +#: ../daemon/gdm-manager.c:877 msgid "Can only be called before user is logged in" msgstr "Kan bare kalles før bruker er logget inn" -#: ../daemon/gdm-manager.c:854 +#: ../daemon/gdm-manager.c:888 msgid "Caller not GDM" msgstr "Kaller er ikke GDM" -#: ../daemon/gdm-manager.c:864 +#: ../daemon/gdm-manager.c:898 msgid "Unable to open private communication channel" msgstr "Klarte ikke å åpne privat kommunikasjonskanal" -#: ../daemon/gdm-server.c:391 +#: ../daemon/gdm-server.c:383 #, c-format -msgid "Server was to be spawned by user %s but that user doesn't exist" +msgid "Server was to be spawned by user %s but that user doesn’t exist" msgstr "Tjeneren skulle startes av bruker %s, men denne brukeren finnes ikke" -#: ../daemon/gdm-server.c:402 ../daemon/gdm-server.c:422 +#: ../daemon/gdm-server.c:394 ../daemon/gdm-server.c:414 #, c-format -msgid "Couldn't set groupid to %d" +msgid "Couldn’t set groupid to %d" msgstr "Klarte ikke å velge %d som gruppe-ID" -#: ../daemon/gdm-server.c:408 +#: ../daemon/gdm-server.c:400 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () mislyktes for %s" -#: ../daemon/gdm-server.c:414 +#: ../daemon/gdm-server.c:406 #, c-format -msgid "Couldn't set userid to %d" -msgstr "Klarte ikke å velge %d som bruker-id" +msgid "Couldn’t set userid to %d" +msgstr "Klarte ikke å velge %d som bruker-ID" -#: ../daemon/gdm-server.c:492 +#: ../daemon/gdm-server.c:484 #, c-format msgid "%s: Could not open log file for display %s!" msgstr "%s: Klarte ikke å åpne loggfil for skjerm %s!" -#: ../daemon/gdm-server.c:513 ../daemon/gdm-server.c:519 -#: ../daemon/gdm-server.c:525 +#: ../daemon/gdm-server.c:505 ../daemon/gdm-server.c:511 +#: ../daemon/gdm-server.c:517 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: Feil under setting av %s til %s" -#: ../daemon/gdm-server.c:545 +#: ../daemon/gdm-server.c:537 #, c-format -msgid "%s: Server priority couldn't be set to %d: %s" -msgstr "%s: Klarte ikke å velge %d som tjenerprioritet. %s" +msgid "%s: Server priority couldn’t be set to %d: %s" +msgstr "%s: Klarte ikke å velge %d som tjenerprioritet: %s" -#: ../daemon/gdm-server.c:697 +#: ../daemon/gdm-server.c:689 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: Tjenerkommandoen for skjerm %s er tom" @@ -149,48 +173,48 @@ msgstr "Skjerm-enhet" msgid "The display device" msgstr "Skjermenheten" -#: ../daemon/gdm-session.c:1205 +#: ../daemon/gdm-session.c:1215 msgid "Could not create authentication helper process" msgstr "Klarte ikke å lage hjelpeprosess for autentisering" #: ../daemon/gdm-session-worker.c:642 -msgid "Your account was given a time limit that's now passed." +msgid "Your account was given a time limit that’s now passed." msgstr "Kontoen din ble gitt en tidsgrense som har gått ut nå." #: ../daemon/gdm-session-worker.c:649 -msgid "Sorry, that didn't work. Please try again." +msgid "Sorry, that didn’t work. Please try again." msgstr "Beklager, men det fungerte ikke. Prøv igjen." -#: ../daemon/gdm-session-worker.c:1037 +#: ../daemon/gdm-session-worker.c:1039 msgid "Username:" msgstr "Brukernavn:" -#: ../daemon/gdm-session-worker.c:1539 ../daemon/gdm-session-worker.c:1556 +#: ../daemon/gdm-session-worker.c:1541 ../daemon/gdm-session-worker.c:1558 #, c-format msgid "no user account available" msgstr "ingen brukerkonto tilgjengelig" -#: ../daemon/gdm-session-worker.c:1583 +#: ../daemon/gdm-session-worker.c:1585 msgid "Unable to change to user" msgstr "Klarte ikke å bytte til bruker" -#: ../daemon/gdm-wayland-session.c:385 +#: ../daemon/gdm-wayland-session.c:478 msgid "GNOME Display Manager Wayland Session Launcher" msgstr "Wayland-øktstarter for GNOME skjermbehandler" -#: ../daemon/gdm-xdmcp-display-factory.c:609 +#: ../daemon/gdm-xdmcp-display-factory.c:612 msgid "Could not create socket!" msgstr "Klarte ikke å lage sokkel!" -#: ../daemon/gdm-x-session.c:734 +#: ../daemon/gdm-x-session.c:826 msgid "Run program through /etc/gdm/Xsession wrapper script" msgstr "Kjør program via omslagssskript i /etc/gdm/Xsession" -#: ../daemon/gdm-x-session.c:735 +#: ../daemon/gdm-x-session.c:827 msgid "Listen on TCP socket" msgstr "Lytt til TCP-sokkel" -#: ../daemon/gdm-x-session.c:746 +#: ../daemon/gdm-x-session.c:838 msgid "GNOME Display Manager X Session Launcher" msgstr "X-øktstarter for GNOME skjermbehandler" @@ -211,7 +235,7 @@ msgstr "Klarte ikke å lage loggmappe %s: %s" #: ../daemon/main.c:223 #, c-format -msgid "Can't find the GDM user '%s'. Aborting!" +msgid "Can’t find the GDM user “%s”. Aborting!" msgstr "Finner ikke GDM-bruker «%s». Avbryter!" #: ../daemon/main.c:229 @@ -220,31 +244,31 @@ msgstr "Bruker av GDM bør ikke være root. Avbryter!" #: ../daemon/main.c:235 #, c-format -msgid "Can't find the GDM group '%s'. Aborting!" +msgid "Can’t find the GDM group “%s”. Aborting!" msgstr "Finner ikke GDM-gruppe «%s». Avbryter." #: ../daemon/main.c:241 msgid "The GDM group should not be root. Aborting!" msgstr "Gruppetilhørighet for GDM bør ikke være root. Avbryter!" -#: ../daemon/main.c:318 +#: ../daemon/main.c:317 msgid "Make all warnings fatal" msgstr "Gjør alle advarsler kritiske" -#: ../daemon/main.c:319 +#: ../daemon/main.c:318 msgid "Exit after a time (for debugging)" msgstr "Avslutt etter en tid (for feilsøking)" -#: ../daemon/main.c:320 +#: ../daemon/main.c:319 msgid "Print GDM version" msgstr "Skriv ut GDM-versjon" -#: ../daemon/main.c:333 +#: ../daemon/main.c:330 msgid "GNOME Display Manager" msgstr "GNOME skjermbehandler" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:381 +#: ../daemon/main.c:351 msgid "Only the root user can run GDM" msgstr "Bare root-bruker kan kjøre GDM" @@ -297,13 +321,17 @@ msgstr "Sti til bilde øverst i brukerlisten" msgid "" "The login screen can optionally show a small image to provide site " "administrators and distributions a way to display branding." -msgstr "Innloggingsskjermen kan vise et lite bilde for å la administratorer og distributører legge inn symboler på merkevare." +msgstr "" +"Innloggingsskjermen kan vise et lite bilde for å la administratorer og " +"distributører legge inn symboler på merkevare." #: ../data/org.gnome.login-screen.gschema.xml.in.h:9 msgid "" "The fallback login screen can optionally show a small image to provide site " "administrators and distributions a way to display branding." -msgstr "Reserveinnloggingsskjermen kan vise et lite bilde for å la administratorer og distributører legge inn symboler på merkevare." +msgstr "" +"Reserveinnloggingsskjermen kan vise et lite bilde for å la administratorer " +"og distributører legge inn symboler på merkevare." #: ../data/org.gnome.login-screen.gschema.xml.in.h:10 msgid "Avoid showing user list" @@ -355,26 +383,6 @@ msgstr "" "Antall ganger en bruker kan utføre mislykkede innloggingsforsøk før man gir " "opp og går tilbake til valg av bruker." -#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 -msgid "Select System" -msgstr "Velg system" - -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 -msgid "XDMCP: Could not create XDMCP buffer!" -msgstr "XDMCP: Klarte ikke å lage XDMCP-mellomlager!" - -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 -msgid "XDMCP: Could not read XDMCP header!" -msgstr "XDMCP: Klarte ikke å lese XDMCP-hode!" - -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 -msgid "XDMCP: Incorrect XDMCP version!" -msgstr "XDMCP: Feil XDMCP-versjon!" - -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 -msgid "XDMCP: Unable to parse address" -msgstr "XDMCP: Klarte ikke å tolke adresse" - #: ../libgdm/gdm-user-switching.c:59 msgid "Unable to create transient display: " msgstr "Klarte ikke å lage midlertidig skjerm: " @@ -406,8 +414,8 @@ msgstr "Versjon av dette programmet" #. Option parsing #: ../utils/gdmflexiserver.c:137 -msgid "- New GDM login" -msgstr "- Ny GDM-innlogging" +msgid "— New GDM login" +msgstr "– Ny GDM-innlogging" #: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" -- cgit v0.12 ++++++ gdm-not-run-with-bogus-DISPLAY-XAUTHORITY.patch ++++++ >From 5dd631c9d5dbb1dc8e548c3dc6a21ef656f44944 Mon Sep 17 00:00:00 2001 From: Ray Strode <[email protected]> Date: Thu, 4 Jan 2018 11:09:55 -0500 Subject: [PATCH 1/5] common: don't run scripts with bogus DISPLAY and XAUTHORITY DISPLAY and XAUTHORITY might not be set if we're starting the X server as part of the session. In that case we should ensure the variables aren't set in the environment of the gdm session scripts. This commit fixes that. https://bugzilla.gnome.org/show_bug.cgi?id=792150 --- common/gdm-common.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/common/gdm-common.c b/common/gdm-common.c index 31fc810a..c4fc7073 100644 --- a/common/gdm-common.c +++ b/common/gdm-common.c @@ -594,8 +594,13 @@ gdm_get_script_environment (const char *username, } /* Runs as root */ - g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (display_x11_authority_file)); - g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (display_name)); + if (display_x11_authority_file) { + g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (display_x11_authority_file)); + } + + if (display_name) { + g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (display_name)); + } g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (GDM_SESSION_DEFAULT_PATH)); g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true")); -- 2.12.3
