[packages/gdm2.20] do not load backup files from /etc/X11/xinit/xinitrc.d
glen
glen at pld-linux.org
Tue Mar 5 23:28:07 CET 2013
commit c658dfc810bea32edb3290939c0232fe7fe8d8b7
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Mar 6 00:20:24 2013 +0200
do not load backup files from /etc/X11/xinit/xinitrc.d
source only known *.sh files
see also similar thread in xinitrc-ng
http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2012-January/022432.html
and http://svn.pld-linux.org/trac/svn/changeset/12470/xinitrc-ng/trunk/xinitdefs
gdm2.20.spec | 5 +++--
xinit-sh.patch | 11 +++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/gdm2.20.spec b/gdm2.20.spec
index f7ada55..cd78702 100644
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -5,7 +5,7 @@
#
# Conditiional build:
%bcond_without selinux # without selinux
-#
+
Summary: GNOME Display Manager
Summary(es.UTF-8): Administrador de Entrada del GNOME
Summary(ja.UTF-8): GNOME ディスプレイマネージャ
@@ -15,7 +15,7 @@ Summary(ru.UTF-8): Дисплейный менеджер GNOME
Summary(uk.UTF-8): Дисплейний менеджер GNOME
Name: gdm2.20
Version: 2.20.11
-Release: 5
+Release: 6
License: GPL/LGPL
Group: X11/Applications
Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/gdm-%{version}.tar.bz2
@@ -32,6 +32,7 @@ Patch1: gdm-conf.patch
Patch2: gdm-xsession.patch
Patch3: gdm-desktop.patch
Patch4: gdm-defaults.patch
+Patch5: xinit-sh.patch
URL: http://www.gnome.org/projects/gdm/
BuildRequires: ConsoleKit-devel
BuildRequires: attr-devel
diff --git a/xinit-sh.patch b/xinit-sh.patch
new file mode 100644
index 0000000..90fffa9
--- /dev/null
+++ b/xinit-sh.patch
@@ -0,0 +1,11 @@
+--- gdm-2.20.11/config/Xsession.in~ 2013-03-06 00:17:36.000000000 +0200
++++ gdm-2.20.11/config/Xsession.in 2013-03-06 00:18:31.189137195 +0200
+@@ -183,7 +183,7 @@
+
+ # run all system xinitrc shell scripts.
+ if [ -d /etc/X11/xinit/xinitrc.d ]; then
+- for i in /etc/X11/xinit/xinitrc.d/* ; do
++ for i in /etc/X11/xinit/xinitrc.d/*.sh; do
+ if [ -x "$i" ]; then
+ . "$i"
+ fi
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gdm2.20.git/commitdiff/c658dfc810bea32edb3290939c0232fe7fe8d8b7
More information about the pld-cvs-commit
mailing list