[gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/
commit: 461a73f6072994fe533f623b33bdea8a483daff8 Author: Marek Szuba gentoo org> AuthorDate: Tue May 9 13:36:49 2023 + Commit: Marek Szuba gentoo org> CommitDate: Tue May 9 13:36:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=461a73f6 x11-misc/lightdm: drop 1.30.0-r3, 1.32.0-r1 Signed-off-by: Marek Szuba gentoo.org> x11-misc/lightdm/Manifest | 1 - x11-misc/lightdm/files/Xsession | 74 -- x11-misc/lightdm/files/lightdm.service| 14 --- x11-misc/lightdm/lightdm-1.30.0-r3.ebuild | 155 - x11-misc/lightdm/lightdm-1.32.0-r1.ebuild | 156 -- 5 files changed, 400 deletions(-) diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest index 599ecb3f3678..d830b4edeb81 100644 --- a/x11-misc/lightdm/Manifest +++ b/x11-misc/lightdm/Manifest @@ -1,3 +1,2 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946c0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be -DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce DIST lightdm-1.32.0.tar.xz 518168 BLAKE2B 90191559895a58e2c5892705ea95766a87d3470f1372ab90fcf3991d27f9280d5bbabe0cfce70e25f960d63c1e7eab7beeeb501341996afd155788cbe1c7 SHA512 81497fb25904bc2e8687dc2628eb534f7418f72e1908c4766e917fc1221714210d998739417e1cae2ee15e3197a2eb8d4981cb944cfeb0334dc9e356e716 diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession deleted file mode 100644 index 1fe0110c9d9b.. --- a/x11-misc/lightdm/files/Xsession +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# -# LightDM wrapper to run around X sessions. - -echo "Running X session wrapper" - -# Load profile -for file in "/etc/profile" "${HOME}/.profile" "/etc/xprofile" "${HOME}/.xprofile" ; do -if [ -f "${file}" ] ; then -echo "Loading profile from ${file}"; -. "${file}" -fi -done - -# Load resources -for file in "/etc/X11/Xresources" "${HOME}/.Xresources" ; do -if [ -f "${file}" ] ; then -echo "Loading resource: ${file}" -xrdb -nocpp -merge "${file}" -fi -done - -# Load keymaps -for file in "/etc/X11/Xkbmap" "${HOME}/.Xkbmap" ; do -if [ -f "${file}" ] ; then -echo "Loading keymap: ${file}" -setxkbmap $(cat "${file}") -XKB_IN_USE=yes -fi -done - -# Load xmodmap if not using XKB -if [ -z "${XKB_IN_USE}" ] ; then -for file in "/etc/X11/Xmodmap" "${HOME}/.Xmodmap" ; do -if [ -f "${file}" ] ; then - echo "Loading modmap: ${file}" - xmodmap "${file}" -fi -done -fi - -unset XKB_IN_USE - -# /etc/X11/xinit/xinitrc.d/80-dbus expects $command to be -# set to the Xsession arguments. So make it happy. See -# https://bugs.gentoo.org/show_bug.cgi?id=533456 -command="$@" - -# Run all system xinitrc shell scripts. -xinitdir="/etc/X11/xinit/xinitrc.d" -if [ -d "${xinitdir}" ] ; then -for script in ${xinitdir}/* ; do -if [ -x "${script}" ] && [ ! -d "${script}" ] ; then -echo "Loading xinit script ${script}" -. "${script}" -fi -done -fi - -# Load Xsession scripts -xsessionddir="/etc/X11/Xsession.d" -if [ -d "${xsessionddir}" ] ; then -for i in $(ls ${xsessionddir}) ; do -script="${xsessionddir}/${i}" -if [ -r "${script}" ] && [ -f "${script}" ] && expr "${i}" : '^[[:alnum:]_-]\+$' > /dev/null ; then -echo "Loading X session script ${script}" -. "${script}" -fi -done -fi - -echo "X session wrapper complete, running session ${@}" - -exec ${command} diff --git a/x11-misc/lightdm/files/lightdm.service b/x11-misc/lightdm/files/lightdm.service deleted file mode 100644 index 7eb46cebaa10.. --- a/x11-misc/lightdm/files/lightdm.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Light Display Manager -Documentation=man:lightdm(1) -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/sbin/lightdm -StandardOutput=syslog -Restart=always -IgnoreSIGPIPE=no -BusName=org.freedesktop.DisplayManager - -[Install] -Alias=display-manager.service diff --git a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild deleted file mode 100644 index 5f23bb293fae.. --- a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools pam qmake-utils readme.gento
[gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/
commit: 0326445b2ff09d42d0fa399840e3314e56dd1644 Author: brahmajit das protonmail com> AuthorDate: Thu Jul 21 13:53:18 2022 + Commit: Sam James gentoo org> CommitDate: Thu Sep 1 02:09:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0326445b x11-misc/lightdm: Fix LC_IDENTIFICATION and updwtmpx on musl This commit fixes two issues with lightdm on musl - LC_IDENTIFICATION not being defined, and - updwtmpx giving conflicting types Patches are documented to the best of my abilities. Closes: https://bugs.gentoo.org/766866 Signed-off-by: brahmajit das protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/26469 Signed-off-by: Sam James gentoo.org> .../lightdm/files/lightdm-1.30.0-musl-locale.patch | 42 ++ .../files/lightdm-1.30.0-musl-updwtmpx.patch | 26 ++ x11-misc/lightdm/lightdm-1.30.0-r3.ebuild | 5 +++ 3 files changed, 73 insertions(+) diff --git a/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch b/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch new file mode 100644 index ..46c65d79f764 --- /dev/null +++ b/x11-misc/lightdm/files/lightdm-1.30.0-musl-locale.patch @@ -0,0 +1,42 @@ +https://github.com/canonical/lightdm/pull/261 + +# Fix LC_IDENTIFICATION undeclared on musl or other libc that doesn't have it defined +# Patch is taken from Alpine linux [1] +# [1]: https://git.alpinelinux.org/aports/tree/community/lightdm/musl-language.patch +# Closes: https://bugs.gentoo.org/766866 +diff --git a/liblightdm-gobject/language.c b/liblightdm-gobject/language.c +index 3d4fa96..e38f5ce 100644 +--- a/liblightdm-gobject/language.c b/liblightdm-gobject/language.c +@@ -210,6 +210,7 @@ lightdm_language_get_name (LightDMLanguage *language) + + if (!priv->name) + { ++#if HAVE_LC_IDENTIFICATION + g_autofree gchar *locale = get_locale_name (priv->code); + if (locale) + { +@@ -223,6 +224,7 @@ lightdm_language_get_name (LightDMLanguage *language) + + setlocale (LC_ALL, current); + } ++#endif + if (!priv->name) + { + g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 2); +@@ -250,6 +252,7 @@ lightdm_language_get_territory (LightDMLanguage *language) + + if (!priv->territory && strchr (priv->code, '_')) + { ++#if HAVE_LC_IDENTIFICATION + g_autofree gchar *locale = get_locale_name (priv->code); + if (locale) + { +@@ -263,6 +266,7 @@ lightdm_language_get_territory (LightDMLanguage *language) + + setlocale (LC_ALL, current); + } ++#endif + if (!priv->territory) + { + g_auto(GStrv) tokens = g_strsplit_set (priv->code, "_.@", 3); diff --git a/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch b/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch new file mode 100644 index ..0df9bd4f051e --- /dev/null +++ b/x11-misc/lightdm/files/lightdm-1.30.0-musl-updwtmpx.patch @@ -0,0 +1,26 @@ +https://github.com/canonical/lightdm/pull/261 + +# A little bit modified version of Alpine linux patch [1]. On musl the default +# implementation of updwtmpx will give conflicting types error and build will +# fail. This patch should fix that. This issue is noticed together with bug +# 766866 [2]. +# [1]: https://git.alpinelinux.org/aports/tree/community/lightdm/musl-updwtmpx.patch +# [2]: https://bugs.gentoo.org/766866 +diff --git a/src/session-child.c b/src/session-child.c +index eef51e4..0052904 100644 +--- a/src/session-child.c b/src/session-child.c +@@ -193,8 +193,13 @@ read_xauth (void) + } + + /* GNU provides this but we can't rely on that so let's make our own version */ ++#if defined(__GLIBC__) + static void + updwtmpx (const gchar *wtmp_file, struct utmpx *ut) ++#else // use this version in libc's other than glibc ++void ++updwtmpx (const char *wtmp_file, const struct utmpx *ut) ++#endif + { + struct utmp u; + memset (&u, 0, sizeof (u)); diff --git a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild index 2c0883c92e03..5f23bb293fae 100644 --- a/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild +++ b/x11-misc/lightdm/lightdm-1.30.0-r3.ebuild @@ -51,6 +51,11 @@ DOCS=( NEWS ) RESTRICT="test" REQUIRED_USE="vala? ( introspection )" +PATCHES=( + "${FILESDIR}"/${PN}-1.30.0-musl-locale.patch + "${FILESDIR}"/${PN}-1.30.0-musl-updwtmpx.patch +) + pkg_setup() { export LIGHTDM_USER=${LIGHTDM_USER:-lightdm} }
[gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/
commit: 78187c218bcde260ef8ff50ddb3e3c34db5cb55f Author: Mikle Kolyada gentoo org> AuthorDate: Sun Oct 11 06:58:21 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Oct 11 06:58:21 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78187c21 x11-misc/lightdm: include ⟶ substack pambase files Acked-by: Lars Wendler gentoo.org> Closes: https://bugs.gentoo.org/747625 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Mikle Kolyada gentoo.org> x11-misc/lightdm/files/lightdm-autologin | 4 ++-- .../lightdm/{lightdm-1.30.0-r1.ebuild => lightdm-1.30.0-r2.ebuild}| 0 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-misc/lightdm/files/lightdm-autologin b/x11-misc/lightdm/files/lightdm-autologin index decfba3438b..9063a82f281 100644 --- a/x11-misc/lightdm/files/lightdm-autologin +++ b/x11-misc/lightdm/files/lightdm-autologin @@ -2,5 +2,5 @@ authoptionalpam_env.so auth requiredpam_nologin.so auth requiredpam_permit.so -accountinclude system-local-login -sessioninclude system-local-login +accountsubstacksystem-local-login +sessionsubstacksystem-local-login diff --git a/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r2.ebuild similarity index 100% rename from x11-misc/lightdm/lightdm-1.30.0-r1.ebuild rename to x11-misc/lightdm/lightdm-1.30.0-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/
commit: 8ffbf0d3923ea3c752dccb508d011ae88c66c1af Author: Evgeny Grin narod ru> AuthorDate: Mon Jun 29 19:35:50 2020 + Commit: Lars Wendler gentoo org> CommitDate: Tue Jun 30 07:59:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ffbf0d3 x11-misc/lightdm: Fixed lightdm Xsession wrapper to report only really sourced files Signed-off-by: Karlson2k (Evgeny Grin) narod.ru> Closes: https://github.com/gentoo/gentoo/pull/16496 Signed-off-by: Lars Wendler gentoo.org> x11-misc/lightdm/files/Xsession | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession index 50ce80fd3e1..d982a0ac89e 100644 --- a/x11-misc/lightdm/files/Xsession +++ b/x11-misc/lightdm/files/Xsession @@ -50,8 +50,8 @@ command="$@" xinitdir="/etc/X11/xinit/xinitrc.d" if [ -d "$xinitdir" ]; then for script in $xinitdir/*; do -echo "Loading xinit script $script" if [ -x "$script" -a ! -d "$script" ]; then +echo "Loading xinit script $script" . "$script" fi done @@ -62,8 +62,8 @@ xsessionddir="/etc/X11/Xsession.d" if [ -d "$xsessionddir" ]; then for i in `ls $xsessionddir`; do script="$xsessionddir/$i" -echo "Loading X session script $script" if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then +echo "Loading X session script $script" . "$script" fi done
[gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/
commit: 471fa32b97d78be42a08afb523ca578053989db8 Author: Lars Wendler gentoo org> AuthorDate: Tue Jun 30 07:59:37 2020 + Commit: Lars Wendler gentoo org> CommitDate: Tue Jun 30 07:59:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=471fa32b x11-misc/lightdm: Revbump for changed Xsession file. Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> x11-misc/lightdm/files/Xsession| 60 +++--- ...htdm-1.30.0.ebuild => lightdm-1.30.0-r1.ebuild} | 0 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession index d982a0ac89e..1fe0110c9d9 100644 --- a/x11-misc/lightdm/files/Xsession +++ b/x11-misc/lightdm/files/Xsession @@ -5,36 +5,36 @@ echo "Running X session wrapper" # Load profile -for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do -if [ -f "$file" ]; then -echo "Loading profile from $file"; -. "$file" +for file in "/etc/profile" "${HOME}/.profile" "/etc/xprofile" "${HOME}/.xprofile" ; do +if [ -f "${file}" ] ; then +echo "Loading profile from ${file}"; +. "${file}" fi done # Load resources -for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do -if [ -f "$file" ]; then -echo "Loading resource: $file" -xrdb -nocpp -merge "$file" +for file in "/etc/X11/Xresources" "${HOME}/.Xresources" ; do +if [ -f "${file}" ] ; then +echo "Loading resource: ${file}" +xrdb -nocpp -merge "${file}" fi done # Load keymaps -for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do -if [ -f "$file" ]; then -echo "Loading keymap: $file" -setxkbmap `cat "$file"` +for file in "/etc/X11/Xkbmap" "${HOME}/.Xkbmap" ; do +if [ -f "${file}" ] ; then +echo "Loading keymap: ${file}" +setxkbmap $(cat "${file}") XKB_IN_USE=yes fi done # Load xmodmap if not using XKB -if [ -z "$XKB_IN_USE" ]; then -for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do -if [ -f "$file" ]; then - echo "Loading modmap: $file" - xmodmap "$file" +if [ -z "${XKB_IN_USE}" ] ; then +for file in "/etc/X11/Xmodmap" "${HOME}/.Xmodmap" ; do +if [ -f "${file}" ] ; then + echo "Loading modmap: ${file}" + xmodmap "${file}" fi done fi @@ -48,27 +48,27 @@ command="$@" # Run all system xinitrc shell scripts. xinitdir="/etc/X11/xinit/xinitrc.d" -if [ -d "$xinitdir" ]; then -for script in $xinitdir/*; do -if [ -x "$script" -a ! -d "$script" ]; then -echo "Loading xinit script $script" -. "$script" +if [ -d "${xinitdir}" ] ; then +for script in ${xinitdir}/* ; do +if [ -x "${script}" ] && [ ! -d "${script}" ] ; then +echo "Loading xinit script ${script}" +. "${script}" fi done fi # Load Xsession scripts xsessionddir="/etc/X11/Xsession.d" -if [ -d "$xsessionddir" ]; then -for i in `ls $xsessionddir`; do -script="$xsessionddir/$i" -if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then -echo "Loading X session script $script" -. "$script" +if [ -d "${xsessionddir}" ] ; then +for i in $(ls ${xsessionddir}) ; do +script="${xsessionddir}/${i}" +if [ -r "${script}" ] && [ -f "${script}" ] && expr "${i}" : '^[[:alnum:]_-]\+$' > /dev/null ; then +echo "Loading X session script ${script}" +. "${script}" fi done fi -echo "X session wrapper complete, running session $@" +echo "X session wrapper complete, running session ${@}" -exec $command +exec ${command} diff --git a/x11-misc/lightdm/lightdm-1.30.0.ebuild b/x11-misc/lightdm/lightdm-1.30.0-r1.ebuild similarity index 100% rename from x11-misc/lightdm/lightdm-1.30.0.ebuild rename to x11-misc/lightdm/lightdm-1.30.0-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/
commit: 69f691d952af515350e9b387c24fae9b408e7d49 Author: Lars Wendler gentoo org> AuthorDate: Sun Oct 21 15:00:40 2018 + Commit: Lars Wendler gentoo org> CommitDate: Sun Oct 21 15:01:01 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f691d9 x11-misc/lightdm: Readded acidentally removed file. Closes: https://bugs.gentoo.org/669202 Signed-off-by: Lars Wendler gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 x11-misc/lightdm/files/README.gentoo | 11 +++ 1 file changed, 11 insertions(+) diff --git a/x11-misc/lightdm/files/README.gentoo b/x11-misc/lightdm/files/README.gentoo new file mode 100644 index 000..182f5308754 --- /dev/null +++ b/x11-misc/lightdm/files/README.gentoo @@ -0,0 +1,11 @@ + + * Even though the default /etc/lightdm/lightdm.conf will work for + * most users, make sure you configure it to suit your needs + * before using lightdm for the first time. + * You can test the configuration file using the following + * command: lightdm --test-mode -c /etc/lightdm/lightdm.conf. This + * requires xorg-server to be built with the 'kdrive' useflag. + * + * You can also set your own default values for LIGHTDM_GREETER, + * LIGHTDM_SESSION, and LIGHTDM_USER in /etc/portage/make.conf +
[gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/
commit: 35853a0805440006ae560935f253fe59a858aec0 Author: Lars Wendler gentoo org> AuthorDate: Sun Oct 21 12:48:28 2018 + Commit: Lars Wendler gentoo org> CommitDate: Sun Oct 21 12:48:47 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35853a08 x11-misc/lightdm: Removed old. Signed-off-by: Lars Wendler gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 x11-misc/lightdm/Manifest | 2 - x11-misc/lightdm/files/README.gentoo | 11 --- x11-misc/lightdm/files/lightdm| 8 -- x11-misc/lightdm/lightdm-1.18.3-r1.ebuild | 132 - x11-misc/lightdm/lightdm-1.24.0-r1.ebuild | 133 - x11-misc/lightdm/lightdm-1.26.0.ebuild| 136 -- 6 files changed, 422 deletions(-) diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest index 25267789efa..fbbc49eb359 100644 --- a/x11-misc/lightdm/Manifest +++ b/x11-misc/lightdm/Manifest @@ -1,5 +1,3 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946c0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be -DIST lightdm-1.18.3.tar.xz 503968 BLAKE2B ec1fa0a62880708d223da972b3d9c2f2961e3e8f8baf6da9012de98818b27e0bc0e37cb6f460a25821779d83e9da1cd632484ad75ba95cb26cb9d23254600024 SHA512 dde34e4969d2f04e6729eb1b30d38bac9a89ff42c46f8a21e94b76beadbde450ffaa377201bd3a56e0d8d95d0640eb312ed11ecf94efb9a5a66777b944d4f234 -DIST lightdm-1.24.0.tar.xz 517552 BLAKE2B b4ab92b313bbb3a7bcc48a1d02b7bfb978bbc5041dbb81ceaa59c4296b2e4b069f90d9f09a4289376cb34e11331c39740f4e5370273d1315c75a9a35bd01cbb0 SHA512 30bad8887928f22bf2cc7ce8d7a323637dec669d47d69fb326cfcf1bb5ee9e52c1232cf680af94a25cf90a9de13d9b5ff73307c1dc8829422600d350401555b8 DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7 DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071 diff --git a/x11-misc/lightdm/files/README.gentoo b/x11-misc/lightdm/files/README.gentoo deleted file mode 100644 index 182f5308754..000 --- a/x11-misc/lightdm/files/README.gentoo +++ /dev/null @@ -1,11 +0,0 @@ - - * Even though the default /etc/lightdm/lightdm.conf will work for - * most users, make sure you configure it to suit your needs - * before using lightdm for the first time. - * You can test the configuration file using the following - * command: lightdm --test-mode -c /etc/lightdm/lightdm.conf. This - * requires xorg-server to be built with the 'kdrive' useflag. - * - * You can also set your own default values for LIGHTDM_GREETER, - * LIGHTDM_SESSION, and LIGHTDM_USER in /etc/portage/make.conf - diff --git a/x11-misc/lightdm/files/lightdm b/x11-misc/lightdm/files/lightdm deleted file mode 100644 index 6286d6ab4f6..000 --- a/x11-misc/lightdm/files/lightdm +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -auth optionalpam_env.so -auth include system-login -auth requiredpam_nologin.so -accountinclude system-login -password include system-login -sessionoptional pam_loginuid.so -sessioninclude system-auth diff --git a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild deleted file mode 100644 index 2cd6c3cd5cd..000 --- a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils flag-o-matic pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils - -TRUNK_VERSION="$(get_version_component_range 1-2)" -DESCRIPTION="A lightweight display manager" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"; -SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz - mirror://gentoo/introspection-20110205.m4.tar.bz2" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86" -IUSE="audit +introspection qt5 +gnome" - -COMMON_DEPEND="audit? ( sys-process/audit ) - >=dev-libs/glib-2.32.3:2 - dev-libs/libxml2 - gnome? ( sys-apps/accountsservice ) - virtual/pam - x11-libs/libX11 - >=x11-libs/libxklavier-5 - introspection? ( >=dev-libs/gobje
[gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/
commit: a53723eb13bfa401e1b48c0041518bafd25b96dd Author: Lars Wendler gentoo org> AuthorDate: Thu Sep 27 08:12:44 2018 + Commit: Lars Wendler gentoo org> CommitDate: Thu Sep 27 08:12:44 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53723eb Revert "x11-misc/lightdm: use upstream lightdm-greeter pam config" This reverts commit 39b530b86790bb5d4a909118be9457be22cf7ad3. which was accidentally added. .../lightdm/files/lightdm-1.28.0-pam-greeter.patch | 10 -- x11-misc/lightdm/lightdm-1.28.0-r1.ebuild | 144 - 2 files changed, 154 deletions(-) diff --git a/x11-misc/lightdm/files/lightdm-1.28.0-pam-greeter.patch b/x11-misc/lightdm/files/lightdm-1.28.0-pam-greeter.patch deleted file mode 100644 index 89b47798a79..000 --- a/x11-misc/lightdm/files/lightdm-1.28.0-pam-greeter.patch +++ /dev/null @@ -1,10 +0,0 @@ a/data/pam/lightdm-greeter -+++ b/data/pam/lightdm-greeter -@@ -14,4 +14,6 @@ password required pam_deny.so - - # Setup session - session required pam_unix.so --session optional pam_systemd.so -+-session optional pam_systemd.so -+-session optional pam_elogind.so -+-session optional pam_ck_connector.so nox11 diff --git a/x11-misc/lightdm/lightdm-1.28.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.28.0-r1.ebuild deleted file mode 100644 index 748ee4f83bb..000 --- a/x11-misc/lightdm/lightdm-1.28.0-r1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils - -DESCRIPTION="A lightweight display manager" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"; -SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz - mirror://gentoo/introspection-20110205.m4.tar.bz2" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" -IUSE="audit +gnome +gtk +introspection qt5 vala" - -COMMON_DEPEND=" - >=dev-libs/glib-2.44.0:2 - dev-libs/libxml2 - virtual/pam - x11-libs/libX11 - >=x11-libs/libxklavier-5 - audit? ( sys-process/audit ) - gnome? ( sys-apps/accountsservice ) - introspection? ( >=dev-libs/gobject-introspection-1 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - ) -" -RDEPEND="${COMMON_DEPEND} - >=sys-auth/pambase-20101024-r2" -DEPEND="${COMMON_DEPEND} - dev-util/gtk-doc-am - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig - gnome? ( gnome-base/gnome-common ) - vala? ( $(vala_depend) ) -" -PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )" - -DOCS=( NEWS ) -RESTRICT="test" - -PATCHES=( "${FILESDIR}"/${PN}-1.28.0-pam-greeter.patch ) - -src_prepare() { - xdg_environment_reset - - sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 - sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die - - einfo "Fixing the session-wrapper variable in lightdm.conf" - sed -i -e \ - "/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ - data/lightdm.conf || die "Failed to fix lightdm.conf" - - # use correct version of qmake. bug #566950 - sed \ - -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \ - -i configure.ac || die - - default - - # Remove bogus Makefile statement. This needs to go upstream - sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die - if has_version dev-libs/gobject-introspection; then - eautoreconf - else - AT_M4DIR=${WORKDIR} eautoreconf - fi - - use vala && vala_src_prepare -} - -src_configure() { - # Set default values if global vars unset - local _greeter _session _user - _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} - _session=${LIGHTDM_SESSION:=gnome} - _user=${LIGHTDM_USER:=root} - # Let user know how lightdm is configured - einfo "Gentoo configuration" - einfo "Default greeter: ${_greeter}" - einfo "Default session: ${_session}" - einfo "Greeter user: ${_user}" - - use qt5 && append-cxxflags -std=c++11 - - # also disable tests because libsystem.c does not build. Tests are - # restricted so it does not matter anyway. - local myeconfargs=( - --localstatedir=/var - --disable-static - --disable-tests - $(use_enable audit libaudit) - $(use_enable introspection) - --disable-liblightdm-qt - $(use_enable qt5 liblightdm-qt5) - $(use_enable vala) - --with-user-session=${_session} - --with-greeter-session=${_greeter} - --with-gree
[gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/
commit: 39b530b86790bb5d4a909118be9457be22cf7ad3 Author: Alexander Tsoy tsoy me> AuthorDate: Tue Sep 25 16:09:46 2018 + Commit: Lars Wendler gentoo org> CommitDate: Thu Sep 27 07:41:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b530b8 x11-misc/lightdm: use upstream lightdm-greeter pam config This pam configuration file is only used by the greeter process. Therefore is should't include system-local-login. Closes: https://bugs.gentoo.org/600216 Package-Manager: Portage-2.3.49, Repoman-2.3.10 Signed-off-by: Alexander Tsoy tsoy.me> Closes: https://github.com/gentoo/gentoo/pull/9973 .../lightdm/files/lightdm-1.28.0-pam-greeter.patch | 10 ++ x11-misc/lightdm/lightdm-1.28.0-r1.ebuild | 144 + 2 files changed, 154 insertions(+) diff --git a/x11-misc/lightdm/files/lightdm-1.28.0-pam-greeter.patch b/x11-misc/lightdm/files/lightdm-1.28.0-pam-greeter.patch new file mode 100644 index 000..89b47798a79 --- /dev/null +++ b/x11-misc/lightdm/files/lightdm-1.28.0-pam-greeter.patch @@ -0,0 +1,10 @@ +--- a/data/pam/lightdm-greeter b/data/pam/lightdm-greeter +@@ -14,4 +14,6 @@ password required pam_deny.so + + # Setup session + session required pam_unix.so +-session optional pam_systemd.so ++-session optional pam_systemd.so ++-session optional pam_elogind.so ++-session optional pam_ck_connector.so nox11 diff --git a/x11-misc/lightdm/lightdm-1.28.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.28.0-r1.ebuild new file mode 100644 index 000..748ee4f83bb --- /dev/null +++ b/x11-misc/lightdm/lightdm-1.28.0-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils + +DESCRIPTION="A lightweight display manager" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"; +SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz + mirror://gentoo/introspection-20110205.m4.tar.bz2" + +LICENSE="GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="audit +gnome +gtk +introspection qt5 vala" + +COMMON_DEPEND=" + >=dev-libs/glib-2.44.0:2 + dev-libs/libxml2 + virtual/pam + x11-libs/libX11 + >=x11-libs/libxklavier-5 + audit? ( sys-process/audit ) + gnome? ( sys-apps/accountsservice ) + introspection? ( >=dev-libs/gobject-introspection-1 ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + ) +" +RDEPEND="${COMMON_DEPEND} + >=sys-auth/pambase-20101024-r2" +DEPEND="${COMMON_DEPEND} + dev-util/gtk-doc-am + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig + gnome? ( gnome-base/gnome-common ) + vala? ( $(vala_depend) ) +" +PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )" + +DOCS=( NEWS ) +RESTRICT="test" + +PATCHES=( "${FILESDIR}"/${PN}-1.28.0-pam-greeter.patch ) + +src_prepare() { + xdg_environment_reset + + sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369 + sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die + + einfo "Fixing the session-wrapper variable in lightdm.conf" + sed -i -e \ + "/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \ + data/lightdm.conf || die "Failed to fix lightdm.conf" + + # use correct version of qmake. bug #566950 + sed \ + -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \ + -i configure.ac || die + + default + + # Remove bogus Makefile statement. This needs to go upstream + sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die + if has_version dev-libs/gobject-introspection; then + eautoreconf + else + AT_M4DIR=${WORKDIR} eautoreconf + fi + + use vala && vala_src_prepare +} + +src_configure() { + # Set default values if global vars unset + local _greeter _session _user + _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter} + _session=${LIGHTDM_SESSION:=gnome} + _user=${LIGHTDM_USER:=root} + # Let user know how lightdm is configured + einfo "Gentoo configuration" + einfo "Default greeter: ${_greeter}" + einfo "Default session: ${_session}" + einfo "Greeter user: ${_user}" + + use qt5 && append-cxxflags -std=c++11 + + # also disable tests because libsystem.c does not build. Tests are + # restricted so it does not matter anyway. + local myeconfargs=( + --localstatedir=/var + --disable-static + --disable-tests + $(use_enable audit libaudit) + $(use_enable introspection) + --disable-liblightdm-qt + $(use_ena
[gentoo-commits] repo/gentoo:master commit in: x11-misc/lightdm/files/, x11-misc/lightdm/
commit: a4601a935813ea46ac5f000af531605b7f43f82b Author: Lars Wendler gentoo org> AuthorDate: Mon Apr 4 09:36:44 2016 + Commit: Lars Wendler gentoo org> CommitDate: Mon Apr 4 09:41:21 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4601a93 x11-misc/lightdm: Removed old. Package-Manager: portage-2.2.28 Signed-off-by: Lars Wendler gentoo.org> x11-misc/lightdm/Manifest | 6 - .../files/lightdm-1.2.0-fix-configure.patch| 10 -- .../files/lightdm-1.7.7-session-wrapper.patch | 13 --- .../lightdm/files/session-wrapper-lightdm.patch| 13 --- x11-misc/lightdm/lightdm-1.12.3.ebuild | 119 --- x11-misc/lightdm/lightdm-1.14.4.ebuild | 122 --- x11-misc/lightdm/lightdm-1.15.3.ebuild | 122 --- x11-misc/lightdm/lightdm-1.16.6.ebuild | 129 - x11-misc/lightdm/lightdm-1.17.2.ebuild | 129 - x11-misc/lightdm/lightdm-1.17.3.ebuild | 129 - 10 files changed, 792 deletions(-) diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest index aa4bda8..a3bea7a 100644 --- a/x11-misc/lightdm/Manifest +++ b/x11-misc/lightdm/Manifest @@ -1,12 +1,6 @@ DIST introspection-20110205.m4.tar.bz2 1220 SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be WHIRLPOOL 0765c0a72919b26d0c8c38714450eec578a347bfc1c59d4950b633b64b17aa1cde38dfb87fdcd6e2f364c98d6c0bd3dadaa9c2a9711bd1b5ac09a583b988f500 DIST lightdm-1.10.5.tar.xz 470452 SHA256 90b2133916d46d7eeae9b14fb581ae29d09e099f4c5f82566370c21f5c6c6fcd SHA512 a5ee39228a53a666a6cc764932e27a3d0ea4295640171794d64b11d23938d132073dfa58289df61995512b6e5a210a4fb5bf1f89c663f6372479cad4f766 WHIRLPOOL bfdaecec39d8aafedb531746d2d28ff494f38d532c5807cb9ca258f0cb531437606dcef77c717058bd14a6e1367709239d13732ee21920919568d897b1996159 -DIST lightdm-1.12.3.tar.xz 473512 SHA256 c7dc90fde4f22762f38f06506b64f3b95cc3a1d9ccb8c18efa408087fd054465 SHA512 dca75324e3326a3fdc575837226a9633c7ec967e2484b03e051d5ce2f788dba8e23d4875da3c8d97cb8c6a1da843bc7500876027ca2c40e2bc4844b034acbd08 WHIRLPOOL 22a0c30032dcec66263801285017305b385789ed09b32c3e73c5db27daad44a7c44311d30f2002fe776f10cbaeb5d47727502ff19f61c0465e37987baa231de8 -DIST lightdm-1.14.4.tar.xz 483304 SHA256 9d9c753e018c9fcba540141696b2da56f98dc21ae5af8146ebf96d6f61aaffab SHA512 152e5d4d6105f3f6a08695ab8d398fd82179ae289f12983e97c3d6a708ae482356aaaf7d4ff1ace1d125f441de6c1f05e9407b68b70d4f56f102f70f943ab00f WHIRLPOOL 22fa47e8d9a7ca38144374caa0bb98be9df1ca91af322998d909d5cfbf2f6f79adc6a0fd565bb2af493c60755f6798c17f035c25bc5283c6e7b62931f86dee0d -DIST lightdm-1.15.3.tar.xz 479432 SHA256 0670c6de84e9edfea3210b42aef688a848fa5366d150a71a67cdf83bc64bda5f SHA512 2fde5b1d01c8bbfa1fa74af9947c4ced9211d0f56d9590c9b5253a51774e2f927a4c6c2e76cde7d34351ae8474bf20e27cf71806c0a4e3a4dffc81b070384344 WHIRLPOOL a4765ee04e9faedfe397b561d17e6ac37ee1738358f7dd00f4be6e4fbabca6a83bd76fe845e4605345053350768363c2027a474a0087d5d37b819a0638c35f54 -DIST lightdm-1.16.6.tar.xz 485820 SHA256 f8f5d38886fa3c1f52e92a51663c30aaf6de462a9e4df4407769a7b93bf22a6c SHA512 9a89bb224cb7f6ddc174cd42920ee3d88a205824da5ec4b46fd93fa6bd2cdf35b8127f7784131ac1bb97a9bc2349a0f41402561594ff6d0ec339787a44793c34 WHIRLPOOL a22efdc4823f44f0a9d0aab8eb8e89495ec0d156e9b8fd46a6b38c3704455050f0c65b7c8c4d6614a316ebb4eaa83df0f557730214c51b3206b128bbcfa160b4 DIST lightdm-1.16.7.tar.xz 486692 SHA256 67b72a5dadf823ebc7df1bb523da59342271fcf67fcac9a2a2c30007ccb9ab32 SHA512 8ab35293e90653814ce877697d6cba335906f04129ba63d87e3dcb05efdca64c815023f75920a836064134d7c28dcf3949e993db67c85e93dc954ef48fe4984f WHIRLPOOL 9b3867e37cac072b2883b8621f7604cfda5e769157220aaf76d72c641b14c9c149bd989818d8880b845f569d1a55b80fe690435b4799ea487bbb504ac4f8887f -DIST lightdm-1.17.2.tar.xz 486492 SHA256 dbdcddc8257308198bc6b4b6bd6307753c2a244ddcd6c2637368f2243b3a1a5b SHA512 07fffab17a917e6d03eac1850c205342e8fe7f627abf3820ebfe3107ef827af4fc4443bcaa7ec447760dcf0de9c2b517472854f7562bb3dc915a23c9742ccb15 WHIRLPOOL 4d4b911565be26f98d10da219e6454f013324ef78a1c9a99c97e785355c53bd8cb0f922340453c514d3e1d019581adadec36ada2c91f37b0bfed2010bb346920 -DIST lightdm-1.17.3.tar.xz 487176 SHA256 a9fcfb5edaad4f8c33dcdd695095791e952720d051eef695e07469ed87fa85b3 SHA512 0624fd994dbb0052c2e6092fa9e8ee3785d541d65c3baf911eff5a4f74e5689395a1079139ed6c30e4ad8db07355d9aede859a58718c873a9684c880efdbb6b0 WHIRLPOOL 988e77d998a843d9d168380d1aa5e16f2f491c52679732442e07b8a7b90ffea45fbf3b239f0f65acaac84626e5b9c933f86981250996c6a3524802953654c892 DIST lightdm-1.17.5.tar.xz 488048 SHA256 4661ea0adb9e2fef9b447b604fc46f70821b8b1c271ac7e61ca6ba5d8f043d8d SHA512 6d3bc969978fe536d30882c26c9b5ab4fca4d8ece60d6705c5838032718b20edbee