6718029 Update lbxproxy to the open-src version
authorNiveditha Rau <Niveditha.Rau@Sun.COM>
Thu, 03 Jul 2008 14:01:10 -0700
changeset 456 c1f45bb21b9e
parent 455 8133c25f3a5c
child 457 15f898389c5f
6718029 Update lbxproxy to the open-src version
open-src/app/Makefile
open-src/app/lbxproxy/6718029.patch
open-src/app/lbxproxy/COPYING
open-src/app/lbxproxy/Makefile
open-src/lib/Makefile
open-src/lib/liblbxutil/6718029.patch
open-src/lib/liblbxutil/Makefile
packages/SUNWxwinc/prototype
packages/SUNWxwman/copyright.add
packages/SUNWxwman/prototype_com
packages/SUNWxwplt/copyright.add
packages/SUNWxwplt/prototype_com
--- a/open-src/app/Makefile	Wed Jul 02 11:15:37 2008 -0700
+++ b/open-src/app/Makefile	Thu Jul 03 14:01:10 2008 -0700
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.54	08/07/01
+# @(#)Makefile	1.55	08/07/03
 #
 ###############################################################################
 
@@ -43,6 +43,7 @@
 	fslsfonts \
 	fstobdf \
 	iceauth \
+	lbxproxy \
 	listres \
 	luit \
 	mesa-demos \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/lbxproxy/6718029.patch	Thu Jul 03 14:01:10 2008 -0700
@@ -0,0 +1,47 @@
+
+--- di/main.c	Sun Jun 15 15:54:22 2008
++++ di/main.c	Sun Jun 15 15:55:06 2008
+@@ -80,6 +80,11 @@
+     int	    argc;
+     char    **argv;
+ {
++    /* Temporarily give up gid 0 - ConnectToServer restores when needed
++     * to create pipes/sockets in /tmp/.X11-*
++     */
++    setegid(getgid());
++
+     display = "63";
+ 
+     ProcessCommandLine (argc, argv);
+
+--- di/wire.c	Sun Jun 15 16:04:05 2008
++++ di/wire.c	Sun Jun 15 16:06:02 2008
+@@ -1541,7 +1541,13 @@
+      */
+     for (j=0; j < MAXTRANSPORTS; j++)
+ 	server->listen_fds[j] = -1;
++    if(getegid() == getgid()) {
++        setegid(0);
++    }
+     CreateServerSockets(server->listen_fds);
++    if(getegid() != getgid()) {
++        setegid(getgid());
++    }
+ 
+     /*
+      * Generate the proxy address and save the host name part
+
+--- di/dispatch.c	Sun Jun 15 15:52:10 2008
++++ di/dispatch.c	Sun Jun 15 15:52:32 2008
+@@ -449,6 +449,11 @@
+     void (*zeroPadProc)();
+     extern int lbxZeroPad;
+ 
++    if(MAJOROP == 104) { /* XBell */
++       if ((4 >> 2) != client->req_len)
++          return(BadLength);
++    }
++
+     if (lbxZeroPad &&
+ 	(MAJOROP < 128) && (zeroPadProc = ZeroPadReqVector[MAJOROP]))
+ 	(*zeroPadProc) ((void *) stuff);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/lbxproxy/COPYING	Thu Jul 03 14:01:10 2008 -0700
@@ -0,0 +1,111 @@
+Copyright 1998  The Open Group
+Copyright 1994, 1998  The Open Group
+Copyright 1996, 1998  The Open Group
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+ * Copyright 1994 Network Computing Devices, Inc.
+ * Copyright 1993 Network Computing Devices, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name Network Computing Devices, Inc. not be
+ * used in advertising or publicity pertaining to distribution of this 
+ * software without specific, written prior permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED `AS-IS'.  NETWORK COMPUTING DEVICES, INC.,
+ * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT
+ * LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE, OR NONINFRINGEMENT.  IN NO EVENT SHALL NETWORK
+ * COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING
+ * SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA,
+ * OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS OF
+ * WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * 
+
+ * Copyright 1990, 1991 Network Computing Devices;
+ * Portions Copyright 1987 by Digital Equipment Corporation 
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the names of Network Computing Devices,
+ * or Digital not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  Network Computing Devices, or Digital
+ * make no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * NETWORK COMPUTING DEVICES, AND DIGITAL DISCLAIM ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES, OR DIGITAL BE
+ * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+
+ * Copyright 1992 Network Computing Devices
+ * Copyright 1996 X Consortium, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of NCD. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  NCD. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/lbxproxy/Makefile	Thu Jul 03 14:01:10 2008 -0700
@@ -0,0 +1,52 @@
+###############################################################################
+#
+# lbxproxy 1.x Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile	1.1 08/07/01
+#
+
+# Package name used in tarballs
+APP_NAME=lbxproxy
+
+# Version number (used in path names)
+APP_VERS=1.0.1
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = 6718029.patch
+
+LIB_ADD_LD_OPTIONS += -R$(PROTODIR)$(X11_DIR)/lib -llbxutil
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=*.man
+SUNTOUCH_MAN_FLAGS= \
+ -a '{Availability, SUNWxwplt} {Interface Stability, Committed}'
+
+include ../Makefile.inc
--- a/open-src/lib/Makefile	Wed Jul 02 11:15:37 2008 -0700
+++ b/open-src/lib/Makefile	Thu Jul 03 14:01:10 2008 -0700
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.19	08/05/30
+# @(#)Makefile	1.20	08/07/03
 #
 ###############################################################################
 
@@ -55,6 +55,7 @@
 	libfontenc \
 	libFS \
 	libICE \
+	liblbxutil \
 	libSM \
 	libXt \
 	libXmu \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/liblbxutil/6718029.patch	Thu Jul 03 14:01:10 2008 -0700
@@ -0,0 +1,49 @@
+--- src/delta/src/delta/lbxdelta.c	Sat Jul 30 14:07:25 2005
++++ src/delta/lbxdelta.c	Sun Jun 15 15:37:59 2008
+@@ -55,6 +55,8 @@
+ extern void Xfree(pointer /*ptr*/);
+ #endif
+ 
++#define Xfree(ptr) free((ptr))
++
+ /*
+  * Allocate data structures needed for doing Delta compaction
+  */
+
+--- src/lbx_zlib/lbx_zlib.c	Wed Jul 13 00:23:56 2005
++++ src/lbx_zlib/lbx_zlib.c	Sun Jun 15 15:38:13 2008
+@@ -79,6 +79,8 @@
+ extern int LbxWhoAmI;
+ #endif
+ 
++#define Xfree(ptr) free((ptr))
++
+ struct ZlibInfo {
+     struct compress_private compress_state;
+     struct compress_private decompress_state;
+
+--- src/lbx_zlib/lbx_zlib_io.c	Mon Nov  7 22:33:26 2005
++++ src/lbx_zlib/lbx_zlib_io.c	Sun Jun 15 15:38:13 2008
+@@ -38,6 +38,7 @@
+ 
+ #include <stddef.h>
+ 
++#define Xfree(ptr) free((ptr))
+ 
+ /*
+  * The following is taken from the xtrans code, almost as is,
+@@ -69,6 +70,14 @@
+ }
+ #endif
+ 
++void *
++Xalloc (unsigned long amount)
++{
++    if (amount == 0)
++        amount = 1;
++    return malloc (amount);
++}
++
+ int
+ InitZlibBuffer(b, size)
+     ZlibBufferPtr b;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/liblbxutil/Makefile	Thu Jul 03 14:01:10 2008 -0700
@@ -0,0 +1,59 @@
+###############################################################################
+#
+# lbxutil 1.x Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile	1.1 08/07/01
+#
+
+# Package name used in tarballs
+LIB_MODULE=liblbxutil
+
+# Version number (used in path names)
+LIB_VERS=1.0.1
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = 6718029.patch
+
+# Library name (used for specfiles/mapfiles)
+LIBNAME=lbxutil
+
+# Man pages to apply Sun footer to & attributes to list
+#SUN_PACKAGE=SUNWxwplt
+#LIB_STABILITY=Committed
+#LIB_MAN_SUFFIX=3lbxutil
+
+# Library built in tree
+LIB_BUILT=$(SOURCE_DIR)/src/.libs/liblbxutil.so.1
+
+# pkg-config files that need to have -R added
+FIX_PC_FILES=lbxutil.pc.in
+
+include ../Makefile.inc
--- a/packages/SUNWxwinc/prototype	Wed Jul 02 11:15:37 2008 -0700
+++ b/packages/SUNWxwinc/prototype	Thu Jul 03 14:01:10 2008 -0700
@@ -27,7 +27,7 @@
 # of the copyright holder.
 # 
 #
-# ident	"@(#)prototype	35.84	08/03/24 SMI"
+# ident	"@(#)prototype	35.85	08/07/03 SMI"
 #
 #  X Window System include files
 
@@ -416,6 +416,7 @@
 f none X11/include/X11/extensions/XKBgeom.h 	0444 root bin
 f none X11/include/X11/extensions/XKBproto.h 	0444 root bin
 f none X11/include/X11/extensions/XKBstr.h 	0444 root bin
+f none X11/include/X11/extensions/XLbx.h 	0444 root bin
 f none X11/include/X11/extensions/XResproto.h	0444 root bin
 f none X11/include/X11/extensions/XShm.h 	0444 root bin
 f none X11/include/X11/extensions/XTest.h 	0444 root bin
@@ -689,6 +690,7 @@
 # Libraries
 
 f none lib/pkgconfig/ice.pc			0444 root bin
+f none lib/pkgconfig/lbxutil.pc			0444 root bin
 f none lib/pkgconfig/sm.pc			0444 root bin
 f none lib/pkgconfig/x11.pc			0444 root bin
 f none lib/pkgconfig/xau.pc			0444 root bin
@@ -742,6 +744,7 @@
 
 !search $HOME/lib/$plat_64/pkgconfig
 f none lib/$plat_64/pkgconfig/ice.pc			0444 root bin
+f none lib/$plat_64/pkgconfig/lbxutil.pc		0444 root bin
 f none lib/$plat_64/pkgconfig/sm.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/x11.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xau.pc			0444 root bin
--- a/packages/SUNWxwman/copyright.add	Wed Jul 02 11:15:37 2008 -0700
+++ b/packages/SUNWxwman/copyright.add	Thu Jul 03 14:01:10 2008 -0700
@@ -37,6 +37,12 @@
 
 --------------------------------------------------------------------
 
+Files from the app/lbxproxy package are covered by the following notice:
+
+include app/lbxproxy/COPYING
+
+--------------------------------------------------------------------
+
 Files from the app/fstobdf package are covered by the following notice:
 
 include app/fstobdf/COPYING
--- a/packages/SUNWxwman/prototype_com	Wed Jul 02 11:15:37 2008 -0700
+++ b/packages/SUNWxwman/prototype_com	Thu Jul 03 14:01:10 2008 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype_com 35.79     08/07/01 SMI"
+# ident "@(#)prototype_com 35.80     08/07/03 SMI"
 #
 #  X Window System online user man pages
 
@@ -50,7 +50,6 @@
 
 !search            $HOME/man1
 d none openwin/share/man/man1 0755 root bin
-f none openwin/share/man/man1/lbxproxy.1 0444 root bin
 f none openwin/share/man/man1/proxymngr.1 0444 root bin
 f none openwin/share/man/man1/xfindproxy.1 0444 root bin
 f none openwin/share/man/man1/rstart.1 0444 root bin
@@ -166,6 +165,9 @@
 # open-src/app/fstobdf
 f none X11/share/man/man1/fstobdf.1 	0444 root bin
 
+# open-src/app/lbxproxy
+f none X11/share/man/man1/lbxproxy.1 	0444 root bin
+
 # open-src/app/listres
 f none X11/share/man/man1/listres.1 	0444 root bin
 
--- a/packages/SUNWxwplt/copyright.add	Wed Jul 02 11:15:37 2008 -0700
+++ b/packages/SUNWxwplt/copyright.add	Thu Jul 03 14:01:10 2008 -0700
@@ -191,6 +191,12 @@
 
 --------------------------------------------------------------------
 
+Files from the app/lbxproxy package are covered by the following notice:
+
+include app/lbxproxy/COPYING
+
+--------------------------------------------------------------------
+
 Files from the app/rgb package are covered by the following notice:
 
 include app/rgb/COPYING
--- a/packages/SUNWxwplt/prototype_com	Wed Jul 02 11:15:37 2008 -0700
+++ b/packages/SUNWxwplt/prototype_com	Thu Jul 03 14:01:10 2008 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-#      "@(#)prototype_com	35.186    08/07/01   Sun Microsystems"
+#      "@(#)prototype_com	35.187    08/07/03   Sun Microsystems"
 #
 # X Window System required core package
 
@@ -66,7 +66,6 @@
 #
 # X11R6.4 upgrade changes
 #
-f none openwin/bin/lbxproxy     2755 root root
 f none openwin/bin/proxymngr    0755 root bin
 f none openwin/bin/xkbbell      0755 root bin
 f none openwin/bin/xkbvleds     0755 root bin
@@ -94,6 +93,10 @@
 f none X11/bin/fstobdf 		0755 root bin
 s none openwin/bin/fstobdf=../../X11/bin/fstobdf
 
+# open-src/app/lbxproxy
+f none X11/bin/lbxproxy 	2755 root root
+s none openwin/bin/lbxproxy=../../X11/bin/lbxproxy
+
 # open-src/app/rgb
 f none X11/bin/showrgb 				0755 root bin
 s none openwin/bin/showrgb=../../X11/bin/showrgb
@@ -526,12 +529,8 @@
 # X11R6.4 upgrade changes
 #
 
-d none openwin/lib/X11/lbxproxy                 0755 root bin
 d none openwin/lib/X11/proxymngr                0755 root bin
 
-!search $HOME/openwin/lib/X11/lbxproxy
-f none openwin/lib/X11/lbxproxy/AtomControl     0755 root bin
-
 !search $HOME/openwin/lib/X11/proxymngr
 f none openwin/lib/X11/proxymngr/pmconfig       0755 root bin
 
@@ -1233,6 +1232,10 @@
 d none X11/lib/X11/xinit                        0755 root bin
 f none X11/lib/X11/xinit/xinitrc                0755 root bin
 
+!search      $HOME/X11/lib/X11/lbxproxy
+d none X11/lib/X11/lbxproxy 			0755 root bin
+f none X11/lib/X11/lbxproxy/AtomControl		0755 root bin
+
 # Create links back to openwin
 s none openwin/lib/app-defaults/Bitmap=../../../X11/lib/X11/app-defaults/Bitmap
 s none openwin/lib/app-defaults/Bitmap-color=../../../X11/lib/X11/app-defaults/Bitmap-color
@@ -1240,6 +1243,7 @@
 s none openwin/lib/app-defaults/Clock-color=../../../X11/lib/X11/app-defaults/Clock-color
 s none openwin/lib/app-defaults/Editres=../../../X11/lib/X11/app-defaults/Editres
 s none openwin/lib/app-defaults/Editres-color=../../../X11/lib/X11/app-defaults/Editres-color
+s none openwin/lib/X11/lbxproxy=../../../X11/lib/X11/lbxproxy
 s none openwin/lib/app-defaults/XCalc=../../../X11/lib/X11/app-defaults/XCalc
 s none openwin/lib/app-defaults/XCalc-color=../../../X11/lib/X11/app-defaults/XCalc-color
 s none openwin/lib/app-defaults/XClipboard=../../../X11/lib/X11/app-defaults/XClipboard