Sync with xdm-archlinux and fix Terminus specifiers

9 files changed, 77 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 472be2489f9b..67187212c7e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Thu Aug 10 21:30:40 UTC 2017
 pkgbase = xdm-minimalist
 	pkgdesc = a minimalist xdm setup.
-	pkgver = 0.1
-	pkgrel = 2
+	pkgver = 0.2
+	pkgrel = 1
 	url = http://xorg.freedesktop.org
 	install = xdm-minimalist.install
 	arch = any
@@ -14,6 +16,7 @@ pkgbase = xdm-minimalist
 	depends = xorg-xwininfo
 	depends = xorg-xkill
 	depends = terminus-font
+	optdepends = systemd-sysvcompat: if you use systemd
 	backup = etc/X11/xdm/minimalist/Xsetup
 	backup = etc/X11/xdm/minimalist/Xresources
 	source = xdm-config
@@ -21,11 +24,13 @@ pkgbase = xdm-minimalist
 	source = Xstartup
 	source = Xresources
 	source = buttons
-	md5sums = e420ef106f97ba5b866164feb031bb14
-	md5sums = d3637c5aca0e787b54db2b78fe99621d
-	md5sums = 1628c6cf77d5da2528265dbaf2eaacf4
-	md5sums = 9c63f8eec798fc13ff7caeb2e628c2a2
-	md5sums = e145d6eee0bbdb5cb674944bc3a09a88
+	source = xdm-minimalist.service
+	sha512sums = 9f363425d331dd52d54350e677004227048c0e1e3a373cf28f17b84cc19af261d05c3254161c43d8e37dc9bcfce7947589d102751beb00a33dbbee7a159707ce
+	sha512sums = 07753a2a538ff18fed5f8501fbf4def2d2cb11170c3d38e10c4c506dbbaf3c03c8585d7250dee68bc9dadd673814be9d55e6e68f9abc611adb22534fdec2bb68
+	sha512sums = 72d3a9c18e6ed1a7906840d9cbcffd45f11b416e13228875c9ecc2603cef9c51535e0fe4ab57658f070f0e7241cd844e2bc652b09fcdc3b5c288ac2ec5bd571d
+	sha512sums = d62479243828565690f298f3b4ddb0516d874a75ade33ad611b882ee06f92fdb2c86f68c1a33f3263011c755c19badf553cef0bd546418c6478d4f9853fca846
+	sha512sums = e501b934761a9bb780f16d46801789ff668a21429d67403c1867a6b9bae19a9bfbf71342b5534547fa54d8d79846d5235d7543ba85430e3b4e6e79ac7768d4f8
+	sha512sums = 5de4629d0bfa890be30817b8549ea27c762b258e6dbba41d56f5ff43971e67a8011e9ef0d8a5065e8e7ebb090b31c28ff24cf40d569f15d3135befd84f388d30
 
 pkgname = xdm-minimalist
 
diff --git a/PKGBUILD b/PKGBUILD
index 39cd767f13b4..cf223ac9d7b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,3 +1,5 @@
+# Comaintainer: pancho horrillo <pancho at pancho dot name>
+# Maintainer: Brian Bidulock <bidulock at openss7 dot org>
 # Contributor: Bernardo Barros <mail-*-AT-*-bbarros.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Truls Becken <becken@stud.ntnu.no>
@@ -6,14 +8,15 @@
 # Based on xdm-archlinux
 
 pkgname=xdm-minimalist
-pkgver=0.1
-pkgrel=2
+pkgver=0.2
+pkgrel=1
 pkgdesc="a minimalist xdm setup."
 arch=(any)
 license=('GPL')
 url="http://xorg.freedesktop.org"
-depends=('xorg-xdm' 'bash' 'xorg-xmessage' 'xorg-xclock' 
-  'xorg-xsetroot' 'xorg-xwininfo' 'xorg-xkill' 'terminus-font')
+depends=('xorg-xdm' 'bash'
+	 'xorg-xmessage' 'xorg-xclock' 'xorg-xsetroot' 'xorg-xwininfo' 'xorg-xkill' 'terminus-font')
+optdepends=('systemd-sysvcompat: if you use systemd')
 backup=(etc/X11/xdm/minimalist/Xsetup
 	etc/X11/xdm/minimalist/Xresources)
 install=xdm-minimalist.install
@@ -21,14 +24,18 @@ source=(xdm-config
 	Xsetup
 	Xstartup
 	Xresources
-	buttons)
-md5sums=('e420ef106f97ba5b866164feb031bb14'
-         'd3637c5aca0e787b54db2b78fe99621d'
-         '1628c6cf77d5da2528265dbaf2eaacf4'
-         '9c63f8eec798fc13ff7caeb2e628c2a2'
-         'e145d6eee0bbdb5cb674944bc3a09a88')
+	buttons
+	xdm-minimalist.service)
+sha512sums=('9f363425d331dd52d54350e677004227048c0e1e3a373cf28f17b84cc19af261d05c3254161c43d8e37dc9bcfce7947589d102751beb00a33dbbee7a159707ce'
+            '07753a2a538ff18fed5f8501fbf4def2d2cb11170c3d38e10c4c506dbbaf3c03c8585d7250dee68bc9dadd673814be9d55e6e68f9abc611adb22534fdec2bb68'
+            '72d3a9c18e6ed1a7906840d9cbcffd45f11b416e13228875c9ecc2603cef9c51535e0fe4ab57658f070f0e7241cd844e2bc652b09fcdc3b5c288ac2ec5bd571d'
+            'd62479243828565690f298f3b4ddb0516d874a75ade33ad611b882ee06f92fdb2c86f68c1a33f3263011c755c19badf553cef0bd546418c6478d4f9853fca846'
+            'e501b934761a9bb780f16d46801789ff668a21429d67403c1867a6b9bae19a9bfbf71342b5534547fa54d8d79846d5235d7543ba85430e3b4e6e79ac7768d4f8'
+            '5de4629d0bfa890be30817b8549ea27c762b258e6dbba41d56f5ff43971e67a8011e9ef0d8a5065e8e7ebb090b31c28ff24cf40d569f15d3135befd84f388d30')
 
 package() {
-  mkdir -p $pkgdir/etc/X11/xdm/minimalist
-  cp * $pkgdir/etc/X11/xdm/minimalist
+  mkdir -p "$pkgdir"/etc/X11/xdm/minimalist
+  cp buttons xdm-config Xresources Xsetup Xstartup "$pkgdir"/etc/X11/xdm/minimalist
+  chmod 0755 "$pkgdir"/etc/X11/xdm/minimalist/{Xsetup,Xstartup,buttons}
+  install -Dm0644 "$srcdir"/xdm-minimalist.service "$pkgdir"/usr/lib/systemd/system/xdm-minimalist.service
 }
diff --git a/Xresources b/Xresources
index e2dae295cbcc..13784a9c83fb 100644
--- a/Xresources
+++ b/Xresources
@@ -1,17 +1,17 @@
-geXlogin*login.translations:#override \
-                                      CtrlR:abort-display()\n\
-                                      F1:set-session-argument(failsafe) finish-field()\n\
-                                      Return:set-session-argument() finish-field()
-                                      CtrlReturn:set-session-argument(failsafe) finish-field()\n\
+Xlogin*login.translations:#override \
+	Ctrl<Key>R:abort-display()\n\
+	<Key>F1:set-session-argument(failsafe) finish-field()\n\
+	<Key>Return:set-session-argument() finish-field()\n\
+	Ctrl<Key>Return:set-session-argument(failsafe) finish-field()\n\
 
 Xlogin*greeting:login
 Xlogin*namePrompt:user:\040
 Xlogin*passwdPrompt:password:\040
 Xlogin*fail:incorrect
-Xlogin*greetFace:-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1 
-Xlogin*promptFace:-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1
-Xlogin*face:-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1
-Xlogin*failFace:-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1
+Xlogin*greetFace:Terminus:foundry=xos4:pixelsize=28
+Xlogin*promptFace:Terminus:foundry=xos4:pixelsize=28
+Xlogin*face:Terminus:foundry=xos4:pixelsize=28
+Xlogin*failFace:Terminus:foundry=xos4:pixelsize=28
 Xlogin*shdColor:#2D2D2D
 Xlogin*hiColor:#2D2D2D
 Xlogin*greetColor:#D8D8D8
@@ -22,14 +22,21 @@ Xlogin*failColor:red
 *foreground:grey80
 *background:#2D2D2D
 
-Xmessage*message.scrollVertical:auto
-Xmessage*message.scrollHorizontal:never
+XClock*analog:false
+XClock*strftime:(%A)\040%F\040%T
+XClock*update:1
+XClock*render:false
+XClock*font:-xos4-terminus-medium-r-normal--28-280-72-72-c-140-iso10646-1
+XClock.width:640
+
+Xmessage*message.scrollVertical:whenNeeded
+Xmessage*message.scrollHorizontal:Never
 Xmessage*Command.highlightThickness:2
 Xmessage*Command.internalWidth:8
 Xmessage*Command.internalHeight:8
 Xmessage*Command.shapeStyle:rectangle
-Xmessage*Command.font:-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1
-Xmessage*font:-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1
+Xmessage*Command.font:-xos4-terminus-medium-r-normal--28-280-72-72-c-140-iso10646-1
+Xmessage*font:-xos4-terminus-medium-r-normal--28-280-72-72-c-140-iso10646-1
 
 XConsole*verbose:true
 XConsole*exitOnFail:true
@@ -37,7 +44,7 @@ XConsole*exitOnFail:true
 Chooser*geometry:700x500
 Chooser*allowShellResize:false
 Chooser*viewport.forceBars:true
-Chooser*label.font:-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1
+Chooser*label.font:-*-terminus-*-*-*-*-*-*-*-*-*-*-*
 Chooser*label.label:XDMCP\040Host\040Menu\040from\040CLIENTHOST
-Chooser*list.font:-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1
-Chooser*Command.font:-xos4-terminus-medium-r-normal--14-140-72-72-c-80-iso10646-1
+Chooser*list.font:-*-terminus-*-*-*-*-*-*-*-*-*-*-*
+Chooser*Command.font:-*-terminus-*-*-*-*-*-*-*-*-*-*-*
diff --git a/Xsetup b/Xsetup
index 7e0eb777590b..b651c375213c 100644
--- a/Xsetup
+++ b/Xsetup
@@ -4,6 +4,6 @@
 xsetroot -solid "#2D2D2D" -cursor_name left_ptr
 
 ## these are all optional
-/etc/X11/xdm/archlinux/buttons -geometry -0-0 &
-#xclock -geometry +0-0 &
+/etc/X11/xdm/minimalist/buttons -geometry -0-0 &
+# xclock -geometry +0-0 &
 # xconsole -daemon -geometry 640x200-0+0
diff --git a/Xstartup b/Xstartup
index ab4c367dbac2..77e9cda0b76e 100644
--- a/Xstartup
+++ b/Xstartup
@@ -3,5 +3,5 @@
 # Get rid of all clients started by Xsetup
 xwininfo -root -children | grep '  0x' | cut -d' ' -f6 | xargs -n1 xkill -id
 
-# From the default Xstartup file; 'GiveConsole'
-chown $USER /dev/console
+# Register a login (derived from GiveConsole as follows:)
+exec /usr/bin/sessreg  -a -w /var/log/wtmp -u /var/run/utmp 	-x /etc/X11/xdm/Xservers -l $DISPLAY -h "" $USER
diff --git a/buttons b/buttons
index 41d5d6b272ae..e4dc6f50b819 100644
--- a/buttons
+++ b/buttons
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-xmessage -buttons reboot,halt "$@" ""
+xmessage -buttons reboot,halt,poweroff "$@" ""
 
 case "$?" in
 	101)
@@ -9,4 +9,7 @@ case "$?" in
 	102)
 		/sbin/halt
 		;;
+	103)
+		/sbin/poweroff
+		;;
 esac
diff --git a/xdm-config b/xdm-config
index 03ae650bbb60..d472aef73c2d 100644
--- a/xdm-config
+++ b/xdm-config
@@ -3,7 +3,7 @@ DisplayManager.pidFile:		/var/run/xdm.pid
 DisplayManager.keyFile:		/etc/X11/xdm/xdm-keys
 DisplayManager.servers:		/etc/X11/xdm/Xservers
 DisplayManager.accessFile:	/etc/X11/xdm/Xaccess
-DisplayManager.willing:		su nobody -c /etc/X11/xdm/Xwilling
+DisplayManager.willing:		su nobody -s /bin/sh -c /etc/X11/xdm/Xwilling
 
 DisplayManager*authorize:	true
 
@@ -15,5 +15,8 @@ DisplayManager*chooser:		/usr/lib/X11/xdm/chooser
 DisplayManager*resources:	/etc/X11/xdm/minimalist/Xresources
 DisplayManager*session:		/etc/X11/xdm/Xsession
 DisplayManager*authComplain:	true
+DisplayManager*startup:		/etc/X11/xdm/minimalist/Xstartup
+DisplayManager*reset:		/etc/X11/xdm/Xreset
+DisplayManager*loginmoveInterval:	10
 
 DisplayManager.requestPort:	0
diff --git a/xdm-minimalist.install b/xdm-minimalist.install
index da6616b84ff8..50bc6b9e545f 100644
--- a/xdm-minimalist.install
+++ b/xdm-minimalist.install
@@ -1,22 +1,9 @@
 post_install() {
   cat << EOF
-
   The Minimalist XDM theme was installed to /etc/X11/xdm/minimalist
 
-  To use it, make the xdm line near the end of /etc/inittab read;
-    x:5:respawn:/usr/bin/xdm -nodaemon -config /etc/X11/xdm/minimalist/xdm-config
-
-  Then make sure the default runlevel is 5 so that Archlinux will boot into XDM.
-  For this, change 3 to 5 on the first line after the comments in inittab;
-    id:5:initdefault:
-
   If you want an xconsole on the login screen, or don't want the clock or the
   halt and reboot buttons, edit /etc/X11/xdm/minimalist/Xsetup
-
-  If you ever have trouble with Arch booting into X, and therefore wish it
-  wouldn't boot to runlevel 5, all you have to do is pass 3 as a perameter
-  to the kernel. This is quite simple to do with both lilo and grub.
-
 EOF
 }
 
diff --git a/xdm-minimalist.service b/xdm-minimalist.service
new file mode 100644
index 000000000000..cb25933c3e4b
--- /dev/null
+++ b/xdm-minimalist.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=X-Window Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/xdm -nodaemon -config /etc/X11/xdm/minimalist/xdm-config
+Type=notify
+NotifyAccess=all
+
+[Install]
+Alias=display-manager.service