Update xdm to 1.1.11 (PR 45554). It works fine on 5.99.56 with modular xorg, build succeeds with native Xorg. Major changes since 1.10 Check for allowRootLogin on PAM and non-OpenBSD passwd authentication backends s/Sun/Oracle/g Add man page for xdmshell Only install xdmshell if --enable-xdmshell is passed to configure config: rename XDM_PRINT to XDM_TOOLKIT xdm itself doesn't need to link with Xinerama library Delete some unused variables greeter: Remove unused extern dpy that is shadowed by local variables greeter: inline valueMask for xpm window to avoid shadowing argument greeter: Add echoPasswdChar resource to set character to display greeter: Make sure text input areas stay inside the lines greeter: Replace several #ifdef XPM blocks with LOGO_W macro greeter: Make sure cursor stays in bounds too Fix potential memory leak in allocation failure cleanup path Stop checking for NULL before calling free() Stop casting free() arguments to (char *) Stop casting return values of malloc and friends Only greeter needs XPM CFLAGS & LIBS, not xdm daemon Add Solaris 11 libsocket to list of libraries to search for getifaddrs() freeifaddrs() when done with it in DefineSelf() xdm.man: address only needs 2 S's, not 3 On Solaris, make sure PAM_TTY is only ever set to an actual /dev path Bug 13455: allowNullPasswd: true doesn't work until the second login attempt Use C99 named initializers for XSetWindowAttributes structure Replace GCC_PRINTFLIKE with xproto's _X_ATTRIBUTE_PRINTF Add _X_ATTRIBUTE_PRINTF to LogVWrite declaration Stop using username retrieved from PAM before pam_end frees it. Simplify FailedLogin code fix whitespace issuesdiff -r1.15 -r1.16 pkgsrc/x11/xdm/Makefile
(cheusov)
@@ -1,32 +1,32 @@ | @@ -1,32 +1,32 @@ | |||
1 | # $NetBSD: Makefile,v 1.15 2011/11/01 06:03:11 sbd Exp $ | 1 | # $NetBSD: Makefile,v 1.16 2011/11/09 18:28:40 cheusov Exp $ | |
2 | 2 | |||
3 | DISTNAME= xdm-1.1.10 | 3 | DISTNAME= xdm-1.1.11 | |
4 | PKGREVISION= 1 | |||
5 | CATEGORIES= x11 | 4 | CATEGORIES= x11 | |
6 | MASTER_SITES= ${MASTER_SITE_XORG:=app/} | 5 | MASTER_SITES= ${MASTER_SITE_XORG:=app/} | |
7 | EXTRACT_SUFX= .tar.bz2 | 6 | EXTRACT_SUFX= .tar.bz2 | |
8 | 7 | |||
9 | MAINTAINER= blair.sadewitz@gmail.com | 8 | MAINTAINER= blair.sadewitz@gmail.com | |
10 | HOMEPAGE= http://xorg.freedesktop.org/ | 9 | HOMEPAGE= http://xorg.freedesktop.org/ | |
11 | COMMENT= X Display Manager from modular X.org | 10 | COMMENT= X Display Manager from modular X.org | |
12 | 11 | |||
13 | DEPENDS+= sessreg-[0-9]*:../../x11/sessreg | 12 | DEPENDS+= sessreg-[0-9]*:../../x11/sessreg | |
14 | 13 | |||
15 | PKG_DESTDIR_SUPPORT= user-destdir | 14 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 15 | |||
17 | CONFIGURE_ARGS+= --enable-dynamic-greeter | 16 | CONFIGURE_ARGS+= --enable-dynamic-greeter | |
18 | CONFIGURE_ARGS+= --enable-tcp-transport | 17 | CONFIGURE_ARGS+= --enable-tcp-transport | |
19 | CONFIGURE_ARGS+= --enable-unix-transport | 18 | CONFIGURE_ARGS+= --enable-unix-transport | |
19 | CONFIGURE_ARGS+= --enable-xdmshell | |||
20 | 20 | |||
21 | USE_TOOLS+= pkg-config | 21 | USE_TOOLS+= pkg-config | |
22 | GNU_CONFIGURE= yes | 22 | GNU_CONFIGURE= yes | |
23 | USE_LIBTOOL= yes | 23 | USE_LIBTOOL= yes | |
24 | 24 | |||
25 | RCD_SCRIPTS= xdm | 25 | RCD_SCRIPTS= xdm | |
26 | 26 | |||
27 | BUILD_DEFS+= VARBASE | 27 | BUILD_DEFS+= VARBASE | |
28 | CONFIGURE_ARGS+= --with-authdir=${VARBASE}/lib/xdm | 28 | CONFIGURE_ARGS+= --with-authdir=${VARBASE}/lib/xdm | |
29 | OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm \ | 29 | OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm \ | |
30 | ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755 | 30 | ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755 | |
31 | 31 | |||
32 | .include "../../mk/compiler.mk" | 32 | .include "../../mk/compiler.mk" |
@@ -1,21 +1,22 @@ | @@ -1,21 +1,22 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2009/06/14 18:25:11 joerg Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2011/11/09 18:28:40 cheusov Exp $ | |
2 | bin/xdm | 2 | bin/xdm | |
3 | bin/xdmshell | 3 | bin/xdmshell | |
4 | lib/X11/app-defaults/Chooser | 4 | lib/X11/app-defaults/Chooser | |
5 | lib/X11/xdm/GiveConsole | 5 | lib/X11/xdm/GiveConsole | |
6 | lib/X11/xdm/TakeConsole | 6 | lib/X11/xdm/TakeConsole | |
7 | lib/X11/xdm/Xaccess | 7 | lib/X11/xdm/Xaccess | |
8 | lib/X11/xdm/Xreset | 8 | lib/X11/xdm/Xreset | |
9 | lib/X11/xdm/Xresources | 9 | lib/X11/xdm/Xresources | |
10 | lib/X11/xdm/Xservers | 10 | lib/X11/xdm/Xservers | |
11 | lib/X11/xdm/Xsession | 11 | lib/X11/xdm/Xsession | |
12 | lib/X11/xdm/Xsetup_0 | 12 | lib/X11/xdm/Xsetup_0 | |
13 | lib/X11/xdm/Xstartup | 13 | lib/X11/xdm/Xstartup | |
14 | lib/X11/xdm/Xwilling | 14 | lib/X11/xdm/Xwilling | |
15 | lib/X11/xdm/chooser | 15 | lib/X11/xdm/chooser | |
16 | lib/X11/xdm/libXdmGreet.la | 16 | lib/X11/xdm/libXdmGreet.la | |
17 | lib/X11/xdm/pixmaps/xorg-bw.xpm | 17 | lib/X11/xdm/pixmaps/xorg-bw.xpm | |
18 | lib/X11/xdm/pixmaps/xorg.xpm | 18 | lib/X11/xdm/pixmaps/xorg.xpm | |
19 | lib/X11/xdm/xdm-config | 19 | lib/X11/xdm/xdm-config | |
20 | man/man1/xdm.1 | 20 | man/man1/xdm.1 | |
21 | man/man1/xdmshell.1 | |||
21 | share/examples/rc.d/xdm | 22 | share/examples/rc.d/xdm |
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.4 2010/07/12 11:39:57 obache Exp $ | 1 | $NetBSD: distinfo,v 1.5 2011/11/09 18:28:40 cheusov Exp $ | |
2 | 2 | |||
3 | SHA1 (xdm-1.1.10.tar.bz2) = 45eb013aa14ddd8d385b200b94fb0fbcbe09b860 | 3 | SHA1 (xdm-1.1.11.tar.bz2) = 8195a8e17d71d18cb89813d04b69a3750e9e818e | |
4 | RMD160 (xdm-1.1.10.tar.bz2) = c5f6b3bba2d1294b560ad50e2eaaa90097c62dee | 4 | RMD160 (xdm-1.1.11.tar.bz2) = 574b5bda0b46a43d0df474279d03e49fa93c9a92 | |
5 | Size (xdm-1.1.10.tar.bz2) = 423578 bytes | 5 | Size (xdm-1.1.11.tar.bz2) = 446612 bytes |