diff options
author | Tim Rice <tim@multitalents.net> | 2004-01-22 16:10:03 -0800 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2004-01-22 16:10:03 -0800 |
commit | c900128e55134291e2d5dd0ec7ad18d97625cee3 (patch) | |
tree | 2365a7512157701f9533873e6fe51f7e515a7a54 | |
parent | 7fe8b72771ec847d824ce845f851338f1be9e6b2 (diff) |
[contrib/solaris/buildpkg.sh] Allow for the possibility of
/usr/local being a symbolic link. Fixes problem reported by Henry Grebler.
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | contrib/solaris/buildpkg.sh | 9 |
2 files changed, 11 insertions, 2 deletions
@@ -3,6 +3,8 @@ | |||
3 | GSSAPI detection, libs and includes. ok djm@ | 3 | GSSAPI detection, libs and includes. ok djm@ |
4 | - (dtucker) [session.c] Enable AFS support in conjunction with KRB5 not | 4 | - (dtucker) [session.c] Enable AFS support in conjunction with KRB5 not |
5 | just HEIMDAL. | 5 | just HEIMDAL. |
6 | - (tim) [contrib/solaris/buildpkg.sh] Allow for the possibility of | ||
7 | /usr/local being a symbolic link. Fixes problem reported by Henry Grebler. | ||
6 | 8 | ||
7 | 20040121 | 9 | 20040121 |
8 | - (djm) OpenBSD CVS Sync | 10 | - (djm) OpenBSD CVS Sync |
@@ -1707,4 +1709,4 @@ | |||
1707 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1709 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1708 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1710 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1709 | 1711 | ||
1710 | $Id: ChangeLog,v 1.3179 2004/01/22 01:48:26 dtucker Exp $ | 1712 | $Id: ChangeLog,v 1.3180 2004/01/23 00:10:03 tim Exp $ |
diff --git a/contrib/solaris/buildpkg.sh b/contrib/solaris/buildpkg.sh index 55203d7d5..29d096306 100755 --- a/contrib/solaris/buildpkg.sh +++ b/contrib/solaris/buildpkg.sh | |||
@@ -23,9 +23,10 @@ SYSVINIT_NAME=opensshd | |||
23 | MAKE=${MAKE:="make"} | 23 | MAKE=${MAKE:="make"} |
24 | SSHDUID=67 # Default privsep uid | 24 | SSHDUID=67 # Default privsep uid |
25 | SSHDGID=67 # Default privsep gid | 25 | SSHDGID=67 # Default privsep gid |
26 | # uncomment these next two as needed | 26 | # uncomment these next three as needed |
27 | #PERMIT_ROOT_LOGIN=no | 27 | #PERMIT_ROOT_LOGIN=no |
28 | #X11_FORWARDING=yes | 28 | #X11_FORWARDING=yes |
29 | #USR_LOCAL_IS_SYMLINK=yes | ||
29 | # list of system directories we do NOT want to change owner/group/perms | 30 | # list of system directories we do NOT want to change owner/group/perms |
30 | # when installing our package | 31 | # when installing our package |
31 | SYSTEM_DIR="/etc \ | 32 | SYSTEM_DIR="/etc \ |
@@ -370,6 +371,12 @@ _EOF | |||
370 | find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \ | 371 | find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \ |
371 | pkgproto $PROTO_ARGS | nawk -f mk-proto.awk > prototype | 372 | pkgproto $PROTO_ARGS | nawk -f mk-proto.awk > prototype |
372 | 373 | ||
374 | # /usr/local is a symlink on some systems | ||
375 | [ "${USR_LOCAL_IS_SYMLINK}" = yes ] && { | ||
376 | grep -v "^d none /usr/local ? ? ?$" prototype > prototype.new | ||
377 | mv prototype.new prototype | ||
378 | } | ||
379 | |||
373 | ## Step back a directory and now build the package. | 380 | ## Step back a directory and now build the package. |
374 | echo "Building package.." | 381 | echo "Building package.." |
375 | cd .. | 382 | cd .. |