Rename systemd unit file from xdm@ to xdm as it isn't bound to a specific vt. Fix underlinking (bug #369531).

Package-Manager: portage-2.2.0_alpha51_p30/cvs/Linux x86_64

5 files changed, 74 insertions, 16 deletions

diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 532d34e41ed4..8f3d34fb0999 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.118 2011/06/19 16:07:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.119 2011/08/28 07:46:04 mgorny Exp $
+
+  28 Aug 2011; Michał Górny <mgorny@gentoo.org> xdm-1.1.10-r2.ebuild,
+  +files/0001-Fix-missing-linking-dependency-on-ldl.patch, files/xdm.service:
+  Rename systemd unit file from xdm@ to xdm as it isn't bound to a specific vt.
+  Fix underlinking (bug #369531).
 
   19 Jun 2011; Michał Górny <mgorny@gentoo.org> xdm-1.1.10-r2.ebuild,
   +files/xdm.service, -files/systemd-service.patch:
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 031255e2805f..7d9c3131689b 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0001-Fix-missing-linking-dependency-on-ldl.patch 1159 RMD160 2d44d8bcd5484f65ba6de3db485aae979bc8fce7 SHA1 e8ca1fde1d9716191b1b6263abfcaf2d3e434a1e SHA256 4ce9f99385ab2b851a37e79b01276986853c5c3977dbc3151a5e644e89535b89
 AUX Xsession 1521 RMD160 c02efb9e96a8dc836d71aa1b47c36358ad61129c SHA1 b94699037a667c716462296c25b4d912fd5d783b SHA256 8a09cd1cef9ebce190e13009e8b21a8504eac1cec3fc31a10d3740b6c7aa49b6
-AUX xdm.service 224 RMD160 7ba7db150289c1272e9dd5e4fdcc8bbbf89469d0 SHA1 f78de6486ba5e0eddffb67be3512d5e59742492f SHA256 fce971a7e36c9cf7e6f877b530a1a953a5e0516080ec1b8f427f56dd09e99caf
+AUX xdm.service 176 RMD160 6879cd39adace0fb9a5d56533d074193d97d297b SHA1 a5bfdecec978ee721136f3757d8242782a41d10a SHA256 d4e47166f51638cd7f85905da130cdec8acc8931c70c1d2634287bfa8348f5d2
 AUX xwilling-hang.patch 589 RMD160 1c624acd002d4b45cf6fb318ab4010425120c09b SHA1 df9d176961a1a84da2ee94667fb601634268c923 SHA256 7ee42e52cf2e2aedba74daabee0bb2fa4648262eb00dc92bc778c61b9afb59f4
 DIST xdm-1.1.10.tar.bz2 423578 RMD160 c5f6b3bba2d1294b560ad50e2eaaa90097c62dee SHA1 45eb013aa14ddd8d385b200b94fb0fbcbe09b860 SHA256 1487f7168e65fb7ea8cf21e99cdec412e643680c5dac9688aad5f87beba4f97f
 EBUILD xdm-1.1.10-r1.ebuild 1313 RMD160 7b176ae8c7935b7e493a933d2eaba6d5233be93d SHA1 6fc96802ba63ca46d55915e412144f1e712b0350 SHA256 6bdc61bd529aac883efdf966a3be23741ccd3779a2761f1924a159a078baef8a
-EBUILD xdm-1.1.10-r2.ebuild 1405 RMD160 ffc36ea1bc4931315c244184c63a92e09d585aa5 SHA1 e4c9348f6fb195008279b2b766f9606ea2318a66 SHA256 2fe9ff502014684b89b23bc6159c4c3d3b8a21d1585ed097b6ed33d94ee4dd8d
-MISC ChangeLog 17302 RMD160 c9f07d4b2faee460dc3aba933e4c9cd275ca5d29 SHA1 3b2f4138d35013ef7bbb8f851dc611ae87660064 SHA256 afefa1266a335675bcbbd9465352d60805db5f440ff59a749bc83a4cb5fd4ef2
+EBUILD xdm-1.1.10-r2.ebuild 1981 RMD160 467c1f16a9ceefe1dbfc139d7160066e0618472c SHA1 61b56e3cee02feb82562b7a2a78def926e37ddf2 SHA256 33674a87b3ae5d23bb11e4463af5aaf90001c4c5b12f8c80cc4dc6776884a491
+MISC ChangeLog 17567 RMD160 cda5c0d80a09ec16ada32bc62c50549f42901317 SHA1 bc60efdce8770a8c5c11ade15f20603704b3639f SHA256 d6920b4be8162a626fec611ea7140c45f355a8406f8dbfdb8529a9c7b6127b81
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk3+HuEACgkQfXuS5UK5QB20RwQArkgHJqdA2jm5fNkIXr0U55DT
-4ewApCoATKt3n9JIFcnX5ZW8s1jHuNchW2p33w262HpRecfZWmyLqziqyz8vB4yx
-06z2y1KwDFx3Z9qrd1geeJzo3W7aiFPt+697QNPM5YRHBnbyScqE8YssRbIP7qii
-+U/autl3WS+PPqHsQ4Y=
-=jgPT
+iJwEAQEIAAYFAk5Z8rQACgkQfXuS5UK5QB0NawQAjOD3WTuwEXgCFCVlGwwhA5pY
+SQha15r1G0jnVkmF/mOitUJpNVH7xqPgLXsG0y94VOxFj+zVZZdGZmf/O+1y/eKF
+dYsOLnhnqDdvJwUJho8u8h7ornNB/ZDFrHcw6sDywei5l+rYNl+UBI5Mv1qDE7OY
+UBORIDr4hPZTniAlXOA=
+=qcGH
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/xdm/files/0001-Fix-missing-linking-dependency-on-ldl.patch b/x11-apps/xdm/files/0001-Fix-missing-linking-dependency-on-ldl.patch
new file mode 100644
index 000000000000..c42b67ade5c7
--- /dev/null
+++ b/x11-apps/xdm/files/0001-Fix-missing-linking-dependency-on-ldl.patch
@@ -0,0 +1,38 @@
+From 4014cde16310467e8b826da77f4ca5b0ae3d357f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fernando=20Tarl=C3=A1=20Cardoso=20Lemos?=
+ <fernandotcl@gmail.com>
+Date: Sat, 19 Feb 2011 17:53:08 -0200
+Subject: [PATCH] Fix missing linking dependency on -ldl.
+
+Recent versions of GCC ship with a linker that doesn't add the deps
+of the DSOs to the linking process. This behavior is also found in
+GNU gold. This change fixes building with those linkers.
+
+Some references:
+
+http://wiki.debian.org/ToolChain/DSOLinking
+https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+---
+ configure.ac |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5d0f243..d9aa26a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -455,6 +455,9 @@ AM_CONDITIONAL(HAS_XDM_AUTH, test x$xdmauth = xyes -a x$xdmauth_enable != xno)
+ 
+ AC_SEARCH_LIBS(crypt, crypt)
+ 
++# Function dl() comes from the C library or -ldl
++AC_SEARCH_LIBS([dlopen], [dl])
++
+ AC_SUBST(XDM_CFLAGS)
+ AC_SUBST(XDM_LIBS)
+ AC_SUBST(XDM_LDFLAGS)
+-- 
+1.7.6.1
+
diff --git a/x11-apps/xdm/files/xdm.service b/x11-apps/xdm/files/xdm.service
index faaf72444498..3e4b840a757b 100644
--- a/x11-apps/xdm/files/xdm.service
+++ b/x11-apps/xdm/files/xdm.service
@@ -1,10 +1,9 @@
 [Unit]
-Description=X-Window Display Manager on %I
-Requires=dev-%i.device
-After=dev-%i.device systemd-user-sessions.service
+Description=X-Window Display Manager
+After=systemd-user-sessions.service
 
 [Service]
 ExecStart=/usr/bin/xdm -nodaemon
 
 [Install]
-Alias=graphical.target.wants/xdm@tty7.service
+Alias=graphical.target.wants/xdm.service
diff --git a/x11-apps/xdm/xdm-1.1.10-r2.ebuild b/x11-apps/xdm/xdm-1.1.10-r2.ebuild
index 2b6da9df148a..cc6da01e1766 100644
--- a/x11-apps/xdm/xdm-1.1.10-r2.ebuild
+++ b/x11-apps/xdm/xdm-1.1.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.10-r2.ebuild,v 1.2 2011/06/19 16:07:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.1.10-r2.ebuild,v 1.3 2011/08/28 07:46:04 mgorny Exp $
 
 EAPI=3
 
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/xwilling-hang.patch
+	# bug #369531 (underlinking)
+	"${FILESDIR}"/0001-Fix-missing-linking-dependency-on-ldl.patch
 )
 
 pkg_setup() {
@@ -53,5 +55,18 @@ src_install() {
 	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
 	keepdir /var/lib/xdm
 
-	systemd_newunit "${FILESDIR}"/xdm.service 'xdm@.service' || die
+	systemd_dounit "${FILESDIR}"/xdm.service || die
+}
+
+pkg_postinst() {
+	# Mea culpa, feel free to remove that after some time --mgorny.
+	if [[ -L "${ROOT}"/etc/systemd/system/graphical.target.wants/${PN}'@tty7'.service ]]
+	then
+		ebegin "Renaming ${PN}@tty7.service to ${PN}.service"
+		ln -s "${ROOT}"/lib/systemd/system/xdm.service \
+			"${ROOT}"/etc/systemd/system/graphical.target.wants/${PN}.service && \
+		rm -f "${ROOT}"/etc/systemd/system/graphical.target.wants/${PN}'@tty7'.service
+		eend ${?} \
+			"Please try to re-enable xdm.service"
+	fi
 }