diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | buildpkg.sh.in | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -4,6 +4,8 @@ | |||
4 | - (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing for | 4 | - (dtucker) [configure.ac] Set put -lselinux into $LIBS while testing for |
5 | SELinux functions so they're detected correctly. Patch from pebenito at | 5 | SELinux functions so they're detected correctly. Patch from pebenito at |
6 | gentoo.org. | 6 | gentoo.org. |
7 | - (tim) [buildpkg.sh.in] Some systems have really limited nawk (OpenServer). | ||
8 | Allow setting alternate awk in openssh-config.local. | ||
7 | 9 | ||
8 | 20061003 | 10 | 20061003 |
9 | - (tim) [configure.ac] Move CHECK_HEADERS test before platform specific | 11 | - (tim) [configure.ac] Move CHECK_HEADERS test before platform specific |
@@ -2522,4 +2524,4 @@ | |||
2522 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 2524 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
2523 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 2525 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
2524 | 2526 | ||
2525 | $Id: ChangeLog,v 1.4568 2006/10/06 23:07:20 dtucker Exp $ | 2527 | $Id: ChangeLog,v 1.4569 2006/10/07 01:49:36 tim Exp $ |
diff --git a/buildpkg.sh.in b/buildpkg.sh.in index 9e4ff4239..17349f7fc 100644 --- a/buildpkg.sh.in +++ b/buildpkg.sh.in | |||
@@ -24,6 +24,7 @@ PKGNAME=OpenSSH | |||
24 | # revisions within the same version (REV=a) | 24 | # revisions within the same version (REV=a) |
25 | #REV= | 25 | #REV= |
26 | SYSVINIT_NAME=opensshd | 26 | SYSVINIT_NAME=opensshd |
27 | AWK=${AWK:="nawk"} | ||
27 | MAKE=${MAKE:="make"} | 28 | MAKE=${MAKE:="make"} |
28 | SSHDUID=67 # Default privsep uid | 29 | SSHDUID=67 # Default privsep uid |
29 | SSHDGID=67 # Default privsep gid | 30 | SSHDGID=67 # Default privsep gid |
@@ -645,7 +646,7 @@ cat >mk-proto.awk << _EOF | |||
645 | _EOF | 646 | _EOF |
646 | 647 | ||
647 | find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \ | 648 | find . | egrep -v "prototype|pkginfo|mk-proto.awk" | sort | \ |
648 | pkgproto $PROTO_ARGS | nawk -f mk-proto.awk > prototype | 649 | pkgproto $PROTO_ARGS | ${AWK} -f mk-proto.awk > prototype |
649 | 650 | ||
650 | # /usr/local is a symlink on some systems | 651 | # /usr/local is a symlink on some systems |
651 | [ "${USR_LOCAL_IS_SYMLINK}" = yes ] && { | 652 | [ "${USR_LOCAL_IS_SYMLINK}" = yes ] && { |