d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

For users of FreeBSD <= 6.2 we recommend during the x.org 7.x upgrade

Browse Source 
that they add X11BASE=${LOCALBASE} to /etc/make.conf since X11BASE was
hard-wired to the now-wrong location in old releases.

However, both X11BASE and LOCALBASE have moved out of scope of src/
into ports/ now, which causes problems for upgraded users who have old
make.conf files still containing the above setting.  X11BASE becomes
null and we instruct ssh and sshd to look for xauth in /bin/xauth
where it is unlikely to be found.

Instead, provide a copy of the default LOCALBASE?=/usr/local setting
here.

We also have to deal with the case where the user only overrides
LOCALBASE and doesn't set an explicit X11BASE (in ports it will be set
implicitly but not here), which will also move the location of xauth.

MFC after:	 3 days
Reported by:	 rwatson
This commit is contained in:
Kris Kennaway 2008-03-05 20:58:15 +00:00
parent b9d442c148
commit ac188d74d6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=176844
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
secure/usr.bin/ssh/Makefile
View File

@ -22,7 +22,16 @@ DPADD+= ${LIBGSSAPI}
LDADD+= -lgssapi
.endif
.if defined(X11BASE)
.if defined(X11BASE) || defined(LOCALBASE)
# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org
# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/
# so we need to provide the default for users with old make.conf
# settings.
LOCALBASE?= /usr/local
# Users may override either LOCALBASE or X11BASE to move the location
# of xauth
X11BASE?= ${LOCALBASE}
CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
.endif

9
secure/usr.sbin/sshd/Makefile
View File

@ -38,6 +38,15 @@ LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lroken
.endif
.if defined(X11BASE)
# Recommended /etc/make.conf setting is X11BASE=${LOCALBASE} for x.org
# 7.x upgrade on <= 6.2, but LOCALBASE has moved out of scope of src/
# so we need to provide the default for users with old make.conf
# settings.
LOCALBASE?= /usr/local
# Users may override either LOCALBASE or X11BASE to move the location
# of xauth
X11BASE?= ${LOCALBASE}
CFLAGS+= -DXAUTH_PATH=\"${X11BASE}/bin/xauth\"
.endif