Date: Tue, 07 Mar 2006 15:17:10 +0300 From: "Boris B. Samorodov" <bsam@ipt.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/94167: [patch] x11/xorg-clients: install xdm/Xstartup and /Xreset Message-ID: <E1FGb7m-000GZ6-83@srv.sem.ipt.ru> Resent-Message-ID: <200603071220.k27CK90c022959@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 94167
>Category: ports
>Synopsis: [patch] x11/xorg-clients: install xdm/Xstartup and /Xreset
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 07 12:20:09 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Boris B. Samorodov
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
InPharmTech, Co.
>Environment:
System: FreeBSD srv.sem.ipt.ru 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #0: Tue Mar 7 00:13:29 MSK 2006 bsam@srv.sem.ipt.ru:/usr/obj/usr/src/sys/SRV i386
>Description:
XORG distfiles has scripts Xstartup and Xreset at
programs/xdm/config directory. These scripts are needed to use
XDMCP. Current port doesn't install them.
>How-To-Repeat:
Try to connect via XDMCP to fresh installed XORG. You will see...
"xdm error (pid 62401): can't execute "/usr/X11R6/lib/X11/xdm/Xstartup" (err 2)" or
"xdm error (pid 62719): can't execute "/usr/X11R6/lib/X11/xdm/Xreset" (err 2)"
...at xdm.log and a connection will not be made.
>Fix:
The patch is relative to the port:
# cd /usr/ports/x11
# patch -p0 < _the_patch_
<delete *.orig and files/*.orig files)
Note: the patch introduces two new files (patches):
o files/patch-Xreset
o files/patch-Xstartup
--- xorg-clients.patch begins here ---
diff -ruN xorg-clients.orig/Makefile xorg-clients/Makefile
--- xorg-clients.orig/Makefile Tue Mar 7 13:51:17 2006
+++ xorg-clients/Makefile Tue Mar 7 13:51:50 2006
@@ -32,7 +32,8 @@
USE_XLIB= yes
XDMCONFDATA= Xaccess Xresources Xservers xdm-config
-XDMCONFSCRIPTS= GiveConsole TakeConsole Xsession Xsetup_0 Xwilling
+XDMCONFSCRIPTS= GiveConsole TakeConsole Xsession Xsetup_0 Xwilling \
+ Xstartup Xreset
.if !defined(WITH_SETUID_LUIT)
pre-everything::
diff -ruN xorg-clients.orig/files/patch-Xreset xorg-clients/files/patch-Xreset
--- xorg-clients.orig/files/patch-Xreset Thu Jan 1 03:00:00 1970
+++ xorg-clients/files/patch-Xreset Tue Mar 7 14:16:13 2006
@@ -0,0 +1,8 @@
+--- programs/xdm/config/Xreset.orig Tue Mar 7 14:07:55 2006
++++ programs/xdm/config/Xreset Tue Mar 7 14:08:50 2006
+@@ -2,4 +2,4 @@
+ # Deregister a login. (Derived from TakeConsole as follows:)
+ #
+ /usr/X11R6/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \
+- -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
++ -x "/usr/X11R6/lib/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff -ruN xorg-clients.orig/files/patch-Xstartup xorg-clients/files/patch-Xstartup
--- xorg-clients.orig/files/patch-Xstartup Thu Jan 1 03:00:00 1970
+++ xorg-clients/files/patch-Xstartup Tue Mar 7 14:16:25 2006
@@ -0,0 +1,8 @@
+--- programs/xdm/config/Xstartup.orig Tue Mar 7 14:09:49 2006
++++ programs/xdm/config/Xstartup Tue Mar 7 14:10:08 2006
+@@ -2,4 +2,4 @@
+ # Register a login (derived from GiveConsole as follows:)
+ #
+ /usr/X11R6/bin/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \
+- -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
++ -x "/usr/X11R6/lib/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff -ruN xorg-clients.orig/pkg-install xorg-clients/pkg-install
--- xorg-clients.orig/pkg-install Tue Mar 7 13:51:17 2006
+++ xorg-clients/pkg-install Tue Mar 7 14:32:50 2006
@@ -8,7 +8,7 @@
XDMCONFDIR=${PKG_PREFIX}/lib/X11/xdm
XDMCONFFILES="GiveConsole TakeConsole Xaccess Xresources Xservers Xsession \
- Xsetup_0 Xwilling xdm-config"
+ Xsetup_0 Xwilling xdm-config Xstartup Xreset"
for file in $XDMCONFFILES; do
if [ ! -f ${XDMCONFDIR}/$file ]; then
cp ${XDMCONFDIR}/$file.default ${XDMCONFDIR}/$file
diff -ruN xorg-clients.orig/pkg-plist xorg-clients/pkg-plist
--- xorg-clients.orig/pkg-plist Tue Mar 7 13:51:17 2006
+++ xorg-clients/pkg-plist Tue Mar 7 13:53:19 2006
@@ -367,6 +367,10 @@
lib/X11/xdm/Xsetup_0.default
@unexec if cmp -s %D/lib/X11/xdm/Xwilling.default %D/lib/X11/xdm/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
lib/X11/xdm/Xwilling.default
+@unexec if cmp -s %D/lib/X11/xdm/Xstartup.default %D/lib/X11/xdm/Xstartup; then rm -f %D/lib/X11/xdm/Xstartup; fi
+lib/X11/xdm/Xstartup.default
+@unexec if cmp -s %D/lib/X11/xdm/Xreset.default %D/lib/X11/xdm/Xreset; then rm -f %D/lib/X11/xdm/Xreset; fi
+lib/X11/xdm/Xreset.default
lib/X11/xdm/chooser
lib/X11/xdm/pixmaps/xorg-bw.xpm
lib/X11/xdm/pixmaps/xorg.xpm
--- xorg-clients.patch ends here ---
WBR
--
bsam
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1FGb7m-000GZ6-83>