Hello community,
here is the log from the commit of package sddm for openSUSE:Factory checked in
at 2015-03-18 13:06:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sddm (Old)
and /work/SRC/openSUSE:Factory/.sddm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sddm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2014-12-21
11:55:57.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2015-03-18
13:06:30.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Mar 16 19:37:11 UTC 2015 - hrvoje.sen...@gmail.com
+
+- Drop conflict with lightdm, and move DBus configuration file,
+ now that sddm is whitelisted
+- Drop xdm (Build)Requires
+- Install sddm-pam* directly, instead of messing with symlinking
+- Add create_pid_file.patch: openSUSE's generic display-manager
+ service doesn't know what to do without a pid file. drop the patch
+ as soon as that sick dinosaur is killed
+- Drop ommit_systemd_service.patch
+
+-------------------------------------------------------------------
Old:
----
ommit_systemd_service.patch
New:
----
create_pid_file.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sddm.spec ++++++
--- /var/tmp/diff_new_pack.bxz402/_old 2015-03-18 13:06:31.000000000 +0100
+++ /var/tmp/diff_new_pack.bxz402/_new 2015-03-18 13:06:31.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sddm
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -17,6 +17,7 @@
%{!?_rundir: %global _rundir /run}
+%{!?_unitdir: %global _unitdir /usr/lib/systemd/system}
Name: sddm
Version: 0.11.0
@@ -30,8 +31,8 @@
Source2: X11-displaymanagers-%{name}
# PATCH-FIX-OPENSUSE proper_pam.diff -- Use openSUSE pam config
Patch0: proper_pam.diff
-# PATCH-FIX-OPENSUSE ommit_systemd_service.patch -- don't install systemd
service, we still use xdm wrapper
-Patch1: ommit_systemd_service.patch
+# PATCH-FIX-OPENSUSE create_pid_file.patch -- openSUSE's generic
display-manager service doesn't know what to do without a pid file. drop the
patch as soon as that sick dinosaur is killed
+Patch1: create_pid_file.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: kf5-filesystem
@@ -40,7 +41,6 @@
BuildRequires: pkg-config
BuildRequires: python-docutils
BuildRequires: systemd-devel
-BuildRequires: xdm
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Network)
@@ -49,10 +49,7 @@
BuildRequires: pkgconfig(xcb-xkb)
Requires: breeze
Requires: sddm-branding = %{version}
-Requires: xdm
Recommends: %{name}-lang
-# #{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
-Conflicts: lightdm
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -102,16 +99,17 @@
-DSESSION_COMMAND="/etc/X11/xdm/Xsession" \
-DBUILD_MAN_PAGES=ON \
-DSTATE_DIR="/var/lib/sddm" \
- -DRUNTIME_DIR="/run/sddm"
+ -DRUNTIME_DIR="/run/sddm" \
+ -DPID_FILE="/run/sddm.pid"
%make_jobs
%install
%kf5_makeinstall -C build
- ln -sf %{_sysconfdir}/pam.d/xdm %{buildroot}%{_sysconfdir}/pam.d/sddm
- ln -sf %{_sysconfdir}/pam.d/xdm-np
%{buildroot}%{_sysconfdir}/pam.d/sddm-autologin
+ pushd %{buildroot}%{_sysconfdir}/dbus-1/system.d
+ mv org.freedesktop.DisplayManager.conf
sddm_org.freedesktop.DisplayManager.conf
+ popd
- rm -frv %{buildroot}%{_unitdir}
install -Dm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}.conf
install -Dm 0644 %{SOURCE2}
%{buildroot}%{_libexecdir}/X11/displaymanagers/%{name}
install -d %{buildroot}%{_rundir}/sddm
@@ -141,7 +139,8 @@
%config %{_sysconfdir}/pam.d/sddm
%config %{_sysconfdir}/pam.d/sddm-autologin
%config %{_sysconfdir}/pam.d/sddm-greeter
-%config(noreplace)
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
+%config(noreplace)
%{_sysconfdir}/dbus-1/system.d/sddm_org.freedesktop.DisplayManager.conf
+%{_sysconfdir}/pam.d/sddm*
%{_libexecdir}/sddm/
%dir %{_libexecdir}/X11/displaymanagers/
%{_libexecdir}/X11/displaymanagers/%{name}
@@ -156,6 +155,7 @@
%{_mandir}/man*/sddm*.*
%ghost %attr(711,sddm,sddm) %dir %{_rundir}/sddm
%attr(750,sddm,sddm) %dir %{_localstatedir}/lib/sddm
+%{_unitdir}/sddm.service
%files branding-openSUSE
%defattr(-,root,root)
++++++ create_pid_file.patch ++++++
diff --git a/src/common/Constants.h.in b/src/common/Constants.h.in
index f7e31e4..654331d 100644
--- a/src/common/Constants.h.in
+++ b/src/common/Constants.h.in
@@ -33,6 +33,7 @@
#define CONFIG_FILE "@CONFIG_FILE@"
#define LOG_FILE "@LOG_FILE@"
+#define PID_FILE "@PID_FILE@"
#define MINIMUM_VT @MINIMUM_VT@
#define HALT_COMMAND "@HALT_COMMAND@"
diff --git a/src/daemon/DaemonApp.cpp b/src/daemon/DaemonApp.cpp
index 662c0f4..c525efd 100644
--- a/src/daemon/DaemonApp.cpp
+++ b/src/daemon/DaemonApp.cpp
@@ -31,6 +31,7 @@
#include <QDebug>
#include <QHostInfo>
#include <QTimer>
+#include <QFile>
#include <iostream>
@@ -46,6 +47,16 @@ namespace SDDM {
// log message
qDebug() << "Initializing...";
+ // Write PID File
+ if ( ! QString(PID_FILE).isEmpty() ) {
+ QFile pidFile(PID_FILE);
+ QString pid = QString::number(QCoreApplication::applicationPid());
+ if ( pidFile.open(QIODevice::WriteOnly | QIODevice::Text) ) {
+ pidFile.write(pid.toLatin1().data(),
qstrlen(pid.toLatin1().data()));
+ pidFile.close();
+ }
+ }
+
// set testing parameter
m_testing = (arguments().indexOf("--test-mode") != -1);
++++++ proper_pam.diff ++++++
--- /var/tmp/diff_new_pack.bxz402/_old 2015-03-18 13:06:31.000000000 +0100
+++ /var/tmp/diff_new_pack.bxz402/_new 2015-03-18 13:06:31.000000000 +0100
@@ -1,5 +1,28 @@
---- sddm-0.9.0.orig/services/sddm-greeter.pam 2014-08-02 17:09:49.000000000
+0200
-+++ sddm-0.9.0/services/sddm-greeter.pam 2014-08-21 23:45:27.779015333
+0200
+diff --git a/services/sddm-autologin.pam b/services/sddm-autologin.pam
+index 2432b51..4fb3873 100755
+--- a/services/sddm-autologin.pam
++++ b/services/sddm-autologin.pam
+@@ -1,11 +1,6 @@
+ #%PAM-1.0
+-auth required pam_env.so
+-auth required pam_tally.so file=/var/log/faillog onerr=succeed
+-auth required pam_shells.so
+-auth required pam_nologin.so
+-auth required pam_permit.so
+--auth optional pam_gnome_keyring.so
+-account include system-local-login
+-password include system-local-login
+-session include system-local-login
+--session optional pam_gnome_keyring.so auto_start
++auth required pam_permit.so
++account include common-account
++password include common-password
++session required pam_loginuid.so
++session include common-session
+diff --git a/services/sddm-greeter.pam b/services/sddm-greeter.pam
+index 44e209e..a9c2a89 100644
+--- a/services/sddm-greeter.pam
++++ b/services/sddm-greeter.pam
@@ -1,17 +1,7 @@
#%PAM-1.0
-
@@ -18,9 +41,25 @@
-# Setup session
-session required pam_unix.so
-session optional pam_systemd.so
-+# SDDM PAM configuration used only for the greeter session
++# PAM configuration used only for the greeter session
+auth required pam_permit.so
+account required pam_permit.so
+password include common-password
+session required pam_loginuid.so
+session include common-session
+diff --git a/services/sddm.pam b/services/sddm.pam
+index bda5d80..d21651d 100755
+--- a/services/sddm.pam
++++ b/services/sddm.pam
+@@ -1,6 +1,6 @@
+ #%PAM-1.0
+-
+-auth include system-login
+-account include system-login
+-password include system-login
+-session include system-login
++auth include common-auth
++account include common-account
++password include common-password
++session required pam_loginuid.so
++session include common-session
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
