diff options
| author | anholt <anholt@FreeBSD.org> | 2004-06-17 09:53:09 +0800 |
|---|---|---|
| committer | anholt <anholt@FreeBSD.org> | 2004-06-17 09:53:09 +0800 |
| commit | 508c1425f9851d231f8a2bc0e58969f2a2948e40 (patch) | |
| tree | 7706e09cfacfd56d063e8daee316de4765b3ee61 | |
| parent | e6908a59f01b8a12697bd893e73dce2d8478d42f (diff) | |
| download | freebsd-ports-graphics-508c1425f9851d231f8a2bc0e58969f2a2948e40.tar.gz freebsd-ports-graphics-508c1425f9851d231f8a2bc0e58969f2a2948e40.tar.zst freebsd-ports-graphics-508c1425f9851d231f8a2bc0e58969f2a2948e40.zip | |
Fix build on -stable with xorg-libraries installed, and remove an unnecessary
dependency.
| -rw-r--r-- | x11/xorg-clients/Makefile | 1 | ||||
| -rw-r--r-- | x11/xorg-clients/files/patch-xdm_session.c | 30 |
2 files changed, 19 insertions, 12 deletions
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index 7990de299b6..6792c1cc054 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -18,7 +18,6 @@ COMMENT= X client programs and related files from X.Org LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ expat.5:${PORTSDIR}/textproc/expat2 \ - Xcursor.1:${PORTSDIR}/x11/XFree86-4-libraries \ png.5:${PORTSDIR}/graphics/png \ Xft.2:${PORTSDIR}/x11-fonts/libXft diff --git a/x11/xorg-clients/files/patch-xdm_session.c b/x11/xorg-clients/files/patch-xdm_session.c index c7c2d43dce2..f4cff5c5a4e 100644 --- a/x11/xorg-clients/files/patch-xdm_session.c +++ b/x11/xorg-clients/files/patch-xdm_session.c @@ -1,27 +1,35 @@ ---- programs/xdm/session.c.orig Wed May 30 00:56:22 2001 -+++ programs/xdm/session.c Fri Sep 28 23:25:16 2001 -@@ -541,6 +541,7 @@ +--- programs/xdm/session.c.orig Thu Mar 4 09:48:55 2004 ++++ programs/xdm/session.c Wed Jun 16 16:59:46 2004 +@@ -55,7 +55,6 @@ + #ifdef SECURE_RPC + # include <rpc/rpc.h> + # include <rpc/key_prot.h> +-extern int key_setnet(struct key_netstarg *arg); + #endif + #ifdef K5AUTH + # include <krb5/krb5.h> +@@ -529,6 +528,7 @@ int pid; #ifdef HAS_SETUSERCONTEXT struct passwd* pwd; + extern char **environ; #endif - #ifdef USE_PAM - pam_handle_t *pamh = thepamh(); -@@ -623,6 +624,8 @@ + #ifdef USE_PAM + pam_handle_t *pamh = thepamh (); +@@ -610,6 +610,8 @@ * Set the user's credentials: uid, gid, groups, * environment variables, resource limits, and umask. */ + /* destroy user environment before calling setusercontext */ + environ = verify->userEnviron; pwd = getpwnam(name); - if (pwd) - { -@@ -632,6 +635,7 @@ + if (pwd) { + if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) { +@@ -617,6 +619,7 @@ errno); return (0); } + verify->userEnviron = environ; endpwent(); - } - else + } else { + LogError ("getpwnam for \"%s\" failed, errno=%d\n", name, errno); |