debian/changelog | 17 +++++++++++++++--
debian/compat | 2 +-
debian/control | 8 ++++----
debian/patches/22_systemd_service.diff | 13 +++++++++++++
debian/patches/series | 2 ++
debian/rules | 3 ++-
debian/xdm.README.Debian | 2 +-
debian/xdm.install | 1 +
debian/xdm.pam | 10 ++++++++++
debian/xdm.postinst.in | 18 ++++++++++++++++++
10 files changed, 67 insertions(+), 9 deletions(-)
New commits:
commit 51042aaba7965c13462044fd9c711a852beafe1f
Author: Laurent Bigonville <bi...@debian.org>
Date: Fri Dec 11 18:12:09 2015 +0100
Release to unstable
diff --git a/debian/changelog b/debian/changelog
index e14c2cd..37afa79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xdm (1:1.1.11-2) UNRELEASED; urgency=medium
+xdm (1:1.1.11-2) unstable; urgency=medium
+ * Team upload.
[ Julien Cristau ]
* xdm.init: remove hal dependency (closes: #605750)
@@ -14,7 +15,7 @@ xdm (1:1.1.11-2) UNRELEASED; urgency=medium
* debian/xdm.README.Debian: Fix a typo
* debian/rules: Use dh_prep instead of dh_clean -k
- -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 18:11:00 +0100
+ -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 18:12:00 +0100
xdm (1:1.1.11-1) unstable; urgency=low
commit 6969437abaf3133ff3a10725229121e7912efe7d
Author: Laurent Bigonville <bi...@debian.org>
Date: Fri Dec 11 18:11:16 2015 +0100
debian/rules: Use dh_prep instead of dh_clean -k
diff --git a/debian/changelog b/debian/changelog
index 18b287a..e14c2cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ xdm (1:1.1.11-2) UNRELEASED; urgency=medium
#664807, #677437)
* debian/control: Update the Vcs-* URL's to please lintian
* debian/xdm.README.Debian: Fix a typo
+ * debian/rules: Use dh_prep instead of dh_clean -k
- -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 17:48:10 +0100
+ -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 18:11:00 +0100
xdm (1:1.1.11-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index b758411..e3d9c79 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ install: $(STAMP_DIR)/install
$(STAMP_DIR)/install: $(STAMP_DIR)/build $(STAMP_DIR)/genscripts
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
cd $(BUILD_DIR) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
commit 9580dda467b1b4a8e1178739e19c73ef1286513a
Author: Laurent Bigonville <bi...@debian.org>
Date: Fri Dec 11 17:48:29 2015 +0100
debian/xdm.README.Debian: Fix a typo
diff --git a/debian/changelog b/debian/changelog
index 1ce6f30..18b287a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ xdm (1:1.1.11-2) UNRELEASED; urgency=medium
* debian/xdm.pam: Call pam_loginuid.so and pam_selinux.so modules (Closes:
#664807, #677437)
* debian/control: Update the Vcs-* URL's to please lintian
+ * debian/xdm.README.Debian: Fix a typo
- -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 17:46:30 +0100
+ -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 17:48:10 +0100
xdm (1:1.1.11-1) unstable; urgency=low
diff --git a/debian/xdm.README.Debian b/debian/xdm.README.Debian
index e947369..0a370ff 100644
--- a/debian/xdm.README.Debian
+++ b/debian/xdm.README.Debian
@@ -21,7 +21,7 @@ xdm-config contains X resources specific to xdm itself. See
the X(1)
manual page for more information about X resources, and the xdm(1) manual
pages for documentation of the available xdm resources.
-Xresources contains X resources that are designed to be specfic to sessions
+Xresources contains X resources that are designed to be specific to sessions
running under xdm. Note that this file does contain the resource entries
for xdm itself -- those are contained in the file xdm-config. See the X(1)
manual page for more information about X resources.
commit 5b66ff584c9ac5b2cb37c8a8920e17567454fb58
Author: Laurent Bigonville <bi...@debian.org>
Date: Fri Dec 11 17:46:49 2015 +0100
debian/control: Update the Vcs-* URL's to please lintian
diff --git a/debian/changelog b/debian/changelog
index 1399ecb..1ce6f30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ xdm (1:1.1.11-2) UNRELEASED; urgency=medium
* Bump debhelper compatibility to 9
* debian/xdm.pam: Call pam_loginuid.so and pam_selinux.so modules (Closes:
#664807, #677437)
+ * debian/control: Update the Vcs-* URL's to please lintian
- -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 17:21:55 +0100
+ -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 17:46:30 +0100
xdm (1:1.1.11-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index aacaa68..4886b7d 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,8 @@ Build-Depends:
libtool,
xutils-dev,
Standards-Version: 3.9.6
-Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xdm
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xdm.git
+Vcs-Git: git://anonscm.debian.org/pkg-xorg/app/xdm
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xdm.git
Package: xdm
Architecture: any
commit 62fcdd2fc258ec9c9a99d67465a587ed457b9138
Author: Laurent Bigonville <bi...@debian.org>
Date: Fri Dec 11 17:23:47 2015 +0100
Add xdm.service file and the needed machinery to update the
display-manager.service symlink (Closes: #759005)
diff --git a/debian/changelog b/debian/changelog
index a32a63e..1399ecb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,14 @@ xdm (1:1.1.11-2) UNRELEASED; urgency=medium
* xdm.init: remove hal dependency (closes: #605750)
[ Laurent Bigonville ]
+ * Add xdm.service file and the needed machinery to update the
+ display-manager.service symlink (Closes: #759005)
* debian/control: Bump Standards-Version to 3.9.6 (no further changes)
* Bump debhelper compatibility to 9
* debian/xdm.pam: Call pam_loginuid.so and pam_selinux.so modules (Closes:
#664807, #677437)
- -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 17:05:46 +0100
+ -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 17:21:55 +0100
xdm (1:1.1.11-1) unstable; urgency=low
diff --git a/debian/patches/22_systemd_service.diff
b/debian/patches/22_systemd_service.diff
new file mode 100644
index 0000000..3d8161d
--- /dev/null
+++ b/debian/patches/22_systemd_service.diff
@@ -0,0 +1,13 @@
+--- a/xdm.service.in
++++ b/xdm.service.in
+@@ -3,7 +3,7 @@
+ After=systemd-user-sessions.service
+
+ [Service]
++# temporary safety check until all DMs are converted to correct
++# display-manager.service symlink handling
++ExecStartPre=/bin/sh -c '[ "$(cat /etc/X11/default-display-manager
2>/dev/null)" = "/usr/bin/xdm" ]'
+ ExecStart=BINDIR/xdm -nodaemon
+-
+-[Install]
+-Alias=graphical.target.wants/xdm.service
diff --git a/debian/patches/series b/debian/patches/series
index 854f2c2..33d0e9f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,8 @@ greeter-xrender.diff
20_xdm_log_timestamp.diff
21_xdm_log_append.diff
+22_systemd_service.diff
+
support_logfile_rotation.diff
debian.diff
diff --git a/debian/rules b/debian/rules
index 59da5d4..b758411 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ confflags += \
--with-pixmapdir=/usr/share/X11/xdm/pixmaps \
--with-color-pixmap=debian.xpm \
--with-bw-pixmap=debianbw.xpm \
+ --with-systemdsystemunitdir=yes \
--disable-xdm-auth \
--with-xft \
--disable-silent-rules \
diff --git a/debian/xdm.install b/debian/xdm.install
index 60ec165..78c8c7d 100644
--- a/debian/xdm.install
+++ b/debian/xdm.install
@@ -10,6 +10,7 @@ etc/X11/xdm/Xwilling
etc/X11/xdm/xdm-config
etc/X11/xdm/xdm.options
etc/insserv.conf.d/xdm
+lib/systemd/system/xdm.service
usr/bin/xdm
usr/lib/X11/xdm/chooser
usr/lib/X11/xdm/libXdmGreet.so
diff --git a/debian/xdm.postinst.in b/debian/xdm.postinst.in
index d871e02..1a465e4 100644
--- a/debian/xdm.postinst.in
+++ b/debian/xdm.postinst.in
@@ -63,6 +63,24 @@ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then
rm "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp"
fi
+DEFAULT_SERVICE=/etc/systemd/system/display-manager.service
+# set default-display-manager systemd service link according to our config
+if [ "$1" = configure ] && [ -d /etc/systemd/system/ ]; then
+ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+ SERVICE=/lib/systemd/system/$(basename $(cat
"$DEFAULT_DISPLAY_MANAGER_FILE")).service
+ if [ -h "$DEFAULT_SERVICE" ] && [ $(readlink "$DEFAULT_SERVICE") =
/dev/null ]; then
+ echo "Display manager service is masked" >&2
+ elif [ -e "$SERVICE" ]; then
+ ln -sf "$SERVICE" "$DEFAULT_SERVICE"
+ else
+ echo "WARNING: $SERVICE is the selected default display manager but does
not exist" >&2
+ rm -f "$DEFAULT_SERVICE"
+ fi
+ else
+ rm -f "$DEFAULT_SERVICE"
+ fi
+fi
+
# Registering the init scripts or starting the daemon may cause output to
# stdout, which can confuse debconf.
db_stop
commit 25836cbb72de1ba5befe1d87b7f6989700b22c6b
Author: Laurent Bigonville <bi...@debian.org>
Date: Fri Dec 11 17:06:42 2015 +0100
debian/xdm.pam: Call pam_loginuid.so and pam_selinux.so modules (Closes:
#664807, #677437)
diff --git a/debian/changelog b/debian/changelog
index bf3b44f..a32a63e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ xdm (1:1.1.11-2) UNRELEASED; urgency=medium
[ Laurent Bigonville ]
* debian/control: Bump Standards-Version to 3.9.6 (no further changes)
* Bump debhelper compatibility to 9
+ * debian/xdm.pam: Call pam_loginuid.so and pam_selinux.so modules (Closes:
+ #664807, #677437)
- -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 16:56:23 +0100
+ -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 17:05:46 +0100
xdm (1:1.1.11-1) unstable; urgency=low
diff --git a/debian/xdm.pam b/debian/xdm.pam
index 5d8df50..1108a71 100644
--- a/debian/xdm.pam
+++ b/debian/xdm.pam
@@ -1,6 +1,16 @@
auth requisite pam_nologin.so
auth required pam_env.so
auth required pam_env.so envfile=/etc/default/locale
+
+# SELinux needs to be the first session rule. This ensures that any
+# lingering context has been cleared. Without this it is possible
+# that a module could execute code in the wrong domain.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]
pam_selinux.so close
+session required pam_loginuid.so
+# SELinux needs to intervene at login time to ensure that the process
+# starts in the proper default security context. Only sessions which are
+# intended to run in the user's context should be run after this.
+session [success=ok ignore=ignore module_unknown=ignore default=bad]
pam_selinux.so open
session required pam_limits.so
@include common-auth
commit b7dd932e6e30ea6789c8930b0f811d29708815ff
Author: Laurent Bigonville <bi...@debian.org>
Date: Fri Dec 11 16:56:38 2015 +0100
Bump debhelper compatibility to 9
diff --git a/debian/changelog b/debian/changelog
index 5165960..bf3b44f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ xdm (1:1.1.11-2) UNRELEASED; urgency=medium
[ Laurent Bigonville ]
* debian/control: Bump Standards-Version to 3.9.6 (no further changes)
+ * Bump debhelper compatibility to 9
- -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 16:54:01 +0100
+ -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 16:56:23 +0100
xdm (1:1.1.11-1) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 65a75ae..aacaa68 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <k...@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 9),
dpkg-dev (>= 1.16.1),
pkg-config,
libxmu-dev (>= 1:1.0.1),
commit 23f51ae9cbe3948e2b041e87735ff8c18ff70a38
Author: Laurent Bigonville <bi...@debian.org>
Date: Fri Dec 11 16:54:24 2015 +0100
debian/control: Bump Standards-Version to 3.9.6 (no further changes)
diff --git a/debian/changelog b/debian/changelog
index 66c2a9a..5165960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
xdm (1:1.1.11-2) UNRELEASED; urgency=medium
+ [ Julien Cristau ]
* xdm.init: remove hal dependency (closes: #605750)
- -- Julien Cristau <jcris...@debian.org> Tue, 01 Apr 2014 12:07:56 +0200
+ [ Laurent Bigonville ]
+ * debian/control: Bump Standards-Version to 3.9.6 (no further changes)
+
+ -- Laurent Bigonville <bi...@debian.org> Fri, 11 Dec 2015 16:54:01 +0100
xdm (1:1.1.11-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index cc95297..65a75ae 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
automake,
libtool,
xutils-dev,
-Standards-Version: 3.8.4
+Standards-Version: 3.9.6
Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xdm
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xdm.git
