diff options
author | Tim Rice <tim@multitalents.net> | 2007-07-24 21:40:59 -0700 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2007-07-24 21:40:59 -0700 |
commit | cd22d30f321cf40cb4935896a1aad9768c002127 (patch) | |
tree | 6a1a48836a3de95ed911675b56fef9a2fc18a8bd | |
parent | ffe3a8ec7e53325636f70b35c141578c4d21f200 (diff) |
- (tim) [buildpkg.sh.in] s|$FAKE_ROOT/${sysconfdir}|$FAKE_ROOT${sysconfdir}|
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | buildpkg.sh.in | 14 |
2 files changed, 9 insertions, 9 deletions
@@ -3,7 +3,7 @@ | |||
3 | - (tim) [openbsd-compat/regress/closefromtest.c] Bug 1345: fix open() call. | 3 | - (tim) [openbsd-compat/regress/closefromtest.c] Bug 1345: fix open() call. |
4 | Report/patch by David.Leonard AT quest.com | 4 | Report/patch by David.Leonard AT quest.com |
5 | - (tim) [buildpkg.sh.in openssh.xml.in] Allow more flexibility where smf(5) | 5 | - (tim) [buildpkg.sh.in openssh.xml.in] Allow more flexibility where smf(5) |
6 | files are installed. | 6 | - (tim) [buildpkg.sh.in] s|$FAKE_ROOT/${sysconfdir}|$FAKE_ROOT${sysconfdir}| |
7 | 7 | ||
8 | 20070628 | 8 | 20070628 |
9 | - (djm) bz#1325: Fix SELinux in permissive mode where it would | 9 | - (djm) bz#1325: Fix SELinux in permissive mode where it would |
@@ -3116,4 +3116,4 @@ | |||
3116 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3116 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3117 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3117 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3118 | 3118 | ||
3119 | $Id: ChangeLog,v 1.4714 2007/07/25 04:16:07 tim Exp $ | 3119 | $Id: ChangeLog,v 1.4715 2007/07/25 04:40:59 tim Exp $ |
diff --git a/buildpkg.sh.in b/buildpkg.sh.in index 598056796..22c66fbd4 100644 --- a/buildpkg.sh.in +++ b/buildpkg.sh.in | |||
@@ -218,19 +218,19 @@ fi | |||
218 | 218 | ||
219 | [ "${PERMIT_ROOT_LOGIN}" = no ] && \ | 219 | [ "${PERMIT_ROOT_LOGIN}" = no ] && \ |
220 | perl -p -i -e "s/#PermitRootLogin yes/PermitRootLogin no/" \ | 220 | perl -p -i -e "s/#PermitRootLogin yes/PermitRootLogin no/" \ |
221 | $FAKE_ROOT/${sysconfdir}/sshd_config | 221 | $FAKE_ROOT${sysconfdir}/sshd_config |
222 | [ "${X11_FORWARDING}" = yes ] && \ | 222 | [ "${X11_FORWARDING}" = yes ] && \ |
223 | perl -p -i -e "s/#X11Forwarding no/X11Forwarding yes/" \ | 223 | perl -p -i -e "s/#X11Forwarding no/X11Forwarding yes/" \ |
224 | $FAKE_ROOT/${sysconfdir}/sshd_config | 224 | $FAKE_ROOT${sysconfdir}/sshd_config |
225 | # fix PrintMotd | 225 | # fix PrintMotd |
226 | perl -p -i -e "s/#PrintMotd yes/PrintMotd no/" \ | 226 | perl -p -i -e "s/#PrintMotd yes/PrintMotd no/" \ |
227 | $FAKE_ROOT/${sysconfdir}/sshd_config | 227 | $FAKE_ROOT${sysconfdir}/sshd_config |
228 | 228 | ||
229 | # We don't want to overwrite config files on multiple installs | 229 | # We don't want to overwrite config files on multiple installs |
230 | mv $FAKE_ROOT/${sysconfdir}/ssh_config $FAKE_ROOT/${sysconfdir}/ssh_config.default | 230 | mv $FAKE_ROOT${sysconfdir}/ssh_config $FAKE_ROOT${sysconfdir}/ssh_config.default |
231 | mv $FAKE_ROOT/${sysconfdir}/sshd_config $FAKE_ROOT/${sysconfdir}/sshd_config.default | 231 | mv $FAKE_ROOT${sysconfdir}/sshd_config $FAKE_ROOT${sysconfdir}/sshd_config.default |
232 | [ -f $FAKE_ROOT/${sysconfdir}/ssh_prng_cmds ] && \ | 232 | [ -f $FAKE_ROOT${sysconfdir}/ssh_prng_cmds ] && \ |
233 | mv $FAKE_ROOT/${sysconfdir}/ssh_prng_cmds $FAKE_ROOT/${sysconfdir}/ssh_prng_cmds.default | 233 | mv $FAKE_ROOT${sysconfdir}/ssh_prng_cmds $FAKE_ROOT${sysconfdir}/ssh_prng_cmds.default |
234 | 234 | ||
235 | # local tweeks here | 235 | # local tweeks here |
236 | [ -s "${POST_MAKE_INSTALL_FIXES}" ] && . ${POST_MAKE_INSTALL_FIXES} | 236 | [ -s "${POST_MAKE_INSTALL_FIXES}" ] && . ${POST_MAKE_INSTALL_FIXES} |