Module Name: src
Committed By: mrg
Date: Mon Jun 3 23:25:43 UTC 2013
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: mi shl.mi
src/external/mit/xorg/bin/xdm: Makefile.xdm
Added Files:
src/external/mit/xorg/lib/libXdmGreet: Makefile shlib_version
Log Message:
install libXdmGreet.so so xdm works again.
requires linking xdm with --export-dynamic.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.137 -r1.138 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xdm/Makefile.xdm
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libXdmGreet/Makefile \
src/external/mit/xorg/lib/libXdmGreet/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.49 src/distrib/sets/lists/xbase/shl.mi:1.50
--- src/distrib/sets/lists/xbase/shl.mi:1.49 Mon Jun 3 20:23:40 2013
+++ src/distrib/sets/lists/xbase/shl.mi Mon Jun 3 23:25:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.49 2013/06/03 20:23:40 mrg Exp $
+# $NetBSD: shl.mi,v 1.50 2013/06/03 23:25:43 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -219,6 +219,9 @@
./usr/X11R7/lib/libXdamage.so -unknown- xorg
./usr/X11R7/lib/libXdamage.so.2 -unknown- xorg
./usr/X11R7/lib/libXdamage.so.2.0 -unknown- xorg
+./usr/X11R7/lib/libXdmGreet.so -unknown- xorg
+./usr/X11R7/lib/libXdmGreet.so.0 -unknown- xorg
+./usr/X11R7/lib/libXdmGreet.so.0.0 -unknown- xorg
./usr/X11R7/lib/libXdmcp.so -unknown- xorg
./usr/X11R7/lib/libXdmcp.so.7 -unknown- xorg
./usr/X11R7/lib/libXdmcp.so.7.0 -unknown- xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.137 src/distrib/sets/lists/xcomp/mi:1.138
--- src/distrib/sets/lists/xcomp/mi:1.137 Mon Jun 3 07:08:21 2013
+++ src/distrib/sets/lists/xcomp/mi Mon Jun 3 23:25:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.137 2013/06/03 07:08:21 mrg Exp $
+# $NetBSD: mi,v 1.138 2013/06/03 23:25:43 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6123,6 +6123,8 @@
./usr/X11R7/lib/libXcursor_p.a -unknown- profile,xorg
./usr/X11R7/lib/libXdamage.a -unknown- xorg
./usr/X11R7/lib/libXdamage_p.a -unknown- profile,xorg
+./usr/X11R7/lib/libXdmGreet.a -unknown- xorg
+./usr/X11R7/lib/libXdmGreet_p.a -unknown- profile,xorg
./usr/X11R7/lib/libXdmcp.a -unknown- xorg
./usr/X11R7/lib/libXdmcp_p.a -unknown- profile,xorg
./usr/X11R7/lib/libXevie.a -unknown- xorg
@@ -9170,6 +9172,7 @@
./usr/libdata/lint/llib-lXcursor.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXcursor.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXdamage.ln -unknown- lint,xorg
+./usr/libdata/lint/llib-lXdmGreet.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXdmcp.ln -unknown- lint,x11
./usr/libdata/lint/llib-lXdmcp.ln -unknown- lint,xorg
./usr/libdata/lint/llib-lXevie.ln -unknown- lint,xorg
Index: src/distrib/sets/lists/xcomp/shl.mi
diff -u src/distrib/sets/lists/xcomp/shl.mi:1.32 src/distrib/sets/lists/xcomp/shl.mi:1.33
--- src/distrib/sets/lists/xcomp/shl.mi:1.32 Wed Jan 16 16:01:09 2013
+++ src/distrib/sets/lists/xcomp/shl.mi Mon Jun 3 23:25:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.32 2013/01/16 16:01:09 christos Exp $
+# $NetBSD: shl.mi,v 1.33 2013/06/03 23:25:43 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -64,6 +64,7 @@
./usr/X11R7/lib/libXcomposite_pic.a -unknown- xorg
./usr/X11R7/lib/libXcursor_pic.a -unknown- xorg
./usr/X11R7/lib/libXdamage_pic.a -unknown- xorg
+./usr/X11R7/lib/libXdmGreet_pic.a -unknown- xorg
./usr/X11R7/lib/libXdmcp_pic.a -unknown- xorg
./usr/X11R7/lib/libXevie_pic.a -unknown- xorg
./usr/X11R7/lib/libXext_pic.a -unknown- xorg
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.4 src/distrib/sets/lists/xdebug/mi:1.5
--- src/distrib/sets/lists/xdebug/mi:1.4 Mon Jun 3 20:23:40 2013
+++ src/distrib/sets/lists/xdebug/mi Mon Jun 3 23:25:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.4 2013/06/03 20:23:40 mrg Exp $
+# $NetBSD: mi,v 1.5 2013/06/03 23:25:43 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/libdata/debug/usr/X11R6/bin/Xdmx.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/Xnest.debug -unknown- debug,x11
@@ -329,6 +329,7 @@
./usr/X11R7/lib/libXcomposite_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXcursor_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXdamage_g.a -unknown- debuglib,xorg
+./usr/X11R7/lib/libXdmGreet_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXdmcp_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXevie_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libXext_g.a -unknown- debuglib,xorg
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.8 src/distrib/sets/lists/xdebug/shl.mi:1.9
--- src/distrib/sets/lists/xdebug/shl.mi:1.8 Mon Jun 3 20:23:40 2013
+++ src/distrib/sets/lists/xdebug/shl.mi Mon Jun 3 23:25:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.8 2013/06/03 20:23:40 mrg Exp $
+# $NetBSD: shl.mi,v 1.9 2013/06/03 23:25:43 mrg Exp $
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
@@ -75,6 +75,7 @@
./usr/libdata/debug/usr/X11R7/lib/libXcomposite.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXcursor.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXdamage.so.2.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libXdmGreet.so.0.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXdmcp.so.7.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXevie.so.2.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/libXext.so.7.1.debug -unknown- xorg,debug
Index: src/external/mit/xorg/bin/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.6 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.7
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.6 Fri May 31 22:49:15 2013
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Mon Jun 3 23:25:43 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.xdm,v 1.6 2013/05/31 22:49:15 mrg Exp $
+# $NetBSD: Makefile.xdm,v 1.7 2013/06/03 23:25:43 mrg Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
XDMCHOOSERPATH= ${X11ROOTDIR}/libexec/chooser
-XDMGREETERLIB= ${X11ROOTDIR}/libexec/libXdmGreet.so
+XDMGREETERLIB= ${X11ROOTDIR}/lib/libXdmGreet.so
XDMLOGDIR= /var/log
XDMPIDDIR= /var/run
@@ -26,6 +26,8 @@ CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DX
-I${X11SRCDIR.xdm}/include \
${X11FLAGS.VERSION}
+LDFLAGS+= -Wl,--export-dynamic
+
.if (${USE_PAM} != "no")
CPPFLAGS+= -DUSE_PAM
.endif
Added files:
Index: src/external/mit/xorg/lib/libXdmGreet/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libXdmGreet/Makefile:1.1
--- /dev/null Mon Jun 3 23:25:43 2013
+++ src/external/mit/xorg/lib/libXdmGreet/Makefile Mon Jun 3 23:25:43 2013
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2013/06/03 23:25:43 mrg Exp $
+
+.include <bsd.own.mk>
+
+LIB= XdmGreet
+.PATH: ${X11SRCDIR.xdm}/greeter
+
+SRCS= \
+ Login.c \
+ greet.c \
+ verify.c
+
+CPPFLAGS+= -I${X11SRCDIR.xdm}/include -DRETSIGTYPE=void
+
+.if 0
+CPPFLAGS+= ${X11FLAGS.THREADLIB} \
+ -DHAVE_XEXTPROTO_71 \
+ -DXSERVER_LIBPCIACCESS \
+ -DTRUE=1 -DFALSE=0 \
+ -I${DESTDIR}${X11INCDIR}/xorg
+.endif
+
+.include <bsd.x11.mk>
+.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libXdmGreet/shlib_version
diff -u /dev/null src/external/mit/xorg/lib/libXdmGreet/shlib_version:1.1
--- /dev/null Mon Jun 3 23:25:43 2013
+++ src/external/mit/xorg/lib/libXdmGreet/shlib_version Mon Jun 3 23:25:43 2013
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2013/06/03 23:25:43 mrg Exp $
+#
+major=0
+minor=0
