mirror of git://anongit.mindrot.org/openssh.git
[contrib/solaris/buildpkg.sh] Allow for the possibility of
/usr/local being a symbolic link. Fixes problem reported by Henry Grebler.
This commit is contained in:
parent
7fe8b72771
commit
c900128e55
|
@ -3,6 +3,8 @@
|
||||||
GSSAPI detection, libs and includes. ok djm@
|
GSSAPI detection, libs and includes. ok djm@
|
||||||
- (dtucker) [session.c] Enable AFS support in conjunction with KRB5 not
|
- (dtucker) [session.c] Enable AFS support in conjunction with KRB5 not
|
||||||
just HEIMDAL.
|
just HEIMDAL.
|
||||||
|
- (tim) [contrib/solaris/buildpkg.sh] Allow for the possibility of
|
||||||
|
/usr/local being a symbolic link. Fixes problem reported by Henry Grebler.
|
||||||
|
|
||||||
20040121
|
20040121
|
||||||
- (djm) OpenBSD CVS Sync
|
- (djm) OpenBSD CVS Sync
|
||||||
|
@ -1707,4 +1709,4 @@
|
||||||
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
|
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
|
||||||
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
|
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.3179 2004/01/22 01:48:26 dtucker Exp $
|
$Id: ChangeLog,v 1.3180 2004/01/23 00:10:03 tim Exp $
|
||||||
|
|
|
@ -23,9 +23,10 @@ SYSVINIT_NAME=opensshd
|
||||||
MAKE=${MAKE:="make"}
|
MAKE=${MAKE:="make"}
|
||||||
SSHDUID=67 # Default privsep uid
|
SSHDUID=67 # Default privsep uid
|
||||||
SSHDGID=67 # Default privsep gid
|
SSHDGID=67 # Default privsep gid
|
||||||
# uncomment these next two as needed
|
# uncomment these next three as needed
|
||||||
#PERMIT_ROOT_LOGIN=no
|
#PERMIT_ROOT_LOGIN=no
|
||||||
#X11_FORWARDING=yes
|
#X11_FORWARDING=yes
|
||||||
|
#USR_LOCAL_IS_SYMLINK=yes
|
||||||
# list of system directories we do NOT want to change owner/group/perms
|
# list of system directories we do NOT want to change owner/group/perms
|
||||||
# when installing our package
|
# when installing our package
|
||||||
SYSTEM_DIR="/etc \
|
SYSTEM_DIR="/etc \
|
||||||
|
@ -370,6 +371,12 @@ _EOF
|
||||||
find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \
|
find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \
|
||||||
pkgproto $PROTO_ARGS | nawk -f mk-proto.awk > prototype
|
pkgproto $PROTO_ARGS | nawk -f mk-proto.awk > prototype
|
||||||
|
|
||||||
|
# /usr/local is a symlink on some systems
|
||||||
|
[ "${USR_LOCAL_IS_SYMLINK}" = yes ] && {
|
||||||
|
grep -v "^d none /usr/local ? ? ?$" prototype > prototype.new
|
||||||
|
mv prototype.new prototype
|
||||||
|
}
|
||||||
|
|
||||||
## Step back a directory and now build the package.
|
## Step back a directory and now build the package.
|
||||||
echo "Building package.."
|
echo "Building package.."
|
||||||
cd ..
|
cd ..
|
||||||
|
|
Loading…
Reference in New Issue