Deleted Added
sdiff udiff text old ( 180739 ) new ( 180740 )
full compact
buildpkg.sh.in (180739) buildpkg.sh.in (180740)
1#!/bin/sh
2#
3# Fake Root Solaris/SVR4/SVR5 Build System - Prototype
4#
5# The following code has been provide under Public Domain License. I really
6# don't care what you use it for. Just as long as you don't complain to me
7# nor my employer if you break it. - Ben Lindstrom (mouring@eviladmin.org)
8#

--- 34 unchanged lines hidden (view full) ---

43PKG_POSTINSTALL_LOCAL=../pkg-postinstall.local
44PKG_PREREMOVE_LOCAL=../pkg-preremove.local
45PKG_POSTREMOVE_LOCAL=../pkg-postremove.local
46PKG_REQUEST_LOCAL=../pkg-request.local
47# end of sourced files
48#
49OPENSSHD=opensshd.init
50OPENSSH_MANIFEST=openssh.xml
1#!/bin/sh
2#
3# Fake Root Solaris/SVR4/SVR5 Build System - Prototype
4#
5# The following code has been provide under Public Domain License. I really
6# don't care what you use it for. Just as long as you don't complain to me
7# nor my employer if you break it. - Ben Lindstrom (mouring@eviladmin.org)
8#

--- 34 unchanged lines hidden (view full) ---

43PKG_POSTINSTALL_LOCAL=../pkg-postinstall.local
44PKG_PREREMOVE_LOCAL=../pkg-preremove.local
45PKG_POSTREMOVE_LOCAL=../pkg-postremove.local
46PKG_REQUEST_LOCAL=../pkg-request.local
47# end of sourced files
48#
49OPENSSHD=opensshd.init
50OPENSSH_MANIFEST=openssh.xml
51OPENSSH_FMRI=svc:/site/openssh:default
51OPENSSH_FMRI=svc:/site/${SYSVINIT_NAME}:default
52
53PATH_GROUPADD_PROG=@PATH_GROUPADD_PROG@
54PATH_USERADD_PROG=@PATH_USERADD_PROG@
55PATH_PASSWD_PROG=@PATH_PASSWD_PROG@
56#
57# list of system directories we do NOT want to change owner/group/perms
58# when installing our package
59SYSTEM_DIR="/etc \

--- 137 unchanged lines hidden (view full) ---

197 # for start/stop scripts that aren't supplied with the OS, and
198 # similarly /var/svc/manifest/site for manifests.
199 mkdir -p $FAKE_ROOT${TEST_DIR}/lib/svc/method/site
200 mkdir -p $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site
201
202 cp ${OPENSSHD} $FAKE_ROOT${TEST_DIR}/lib/svc/method/site/${SYSVINIT_NAME}
203 chmod 744 $FAKE_ROOT${TEST_DIR}/lib/svc/method/site/${SYSVINIT_NAME}
204
52
53PATH_GROUPADD_PROG=@PATH_GROUPADD_PROG@
54PATH_USERADD_PROG=@PATH_USERADD_PROG@
55PATH_PASSWD_PROG=@PATH_PASSWD_PROG@
56#
57# list of system directories we do NOT want to change owner/group/perms
58# when installing our package
59SYSTEM_DIR="/etc \

--- 137 unchanged lines hidden (view full) ---

197 # for start/stop scripts that aren't supplied with the OS, and
198 # similarly /var/svc/manifest/site for manifests.
199 mkdir -p $FAKE_ROOT${TEST_DIR}/lib/svc/method/site
200 mkdir -p $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site
201
202 cp ${OPENSSHD} $FAKE_ROOT${TEST_DIR}/lib/svc/method/site/${SYSVINIT_NAME}
203 chmod 744 $FAKE_ROOT${TEST_DIR}/lib/svc/method/site/${SYSVINIT_NAME}
204
205 cp ${OPENSSH_MANIFEST} $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site
206 chmod 644 $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site/${OPENSSH_MANIFEST}
205 cat ${OPENSSH_MANIFEST} | sed "s|__SYSVINIT_NAME__|${SYSVINIT_NAME}|" \
206 > $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site/${SYSVINIT_NAME}.xml
207 chmod 644 $FAKE_ROOT${TEST_DIR}/var/svc/manifest/site/${SYSVINIT_NAME}.xml
207else
208 mkdir -p $FAKE_ROOT${TEST_DIR}/etc/init.d
209
210 cp ${OPENSSHD} $FAKE_ROOT${TEST_DIR}/etc/init.d/${SYSVINIT_NAME}
211 chmod 744 $FAKE_ROOT${TEST_DIR}/etc/init.d/${SYSVINIT_NAME}
212fi
213
214[ "${PERMIT_ROOT_LOGIN}" = no ] && \

--- 114 unchanged lines hidden (view full) ---

329if [ $DO_SMF -eq 1 ]
330then
331 # Delete the existing service, if it exists, then import the
332 # new one.
333 if svcs $OPENSSH_FMRI > /dev/null 2>&1
334 then
335 svccfg delete -f $OPENSSH_FMRI
336 fi
208else
209 mkdir -p $FAKE_ROOT${TEST_DIR}/etc/init.d
210
211 cp ${OPENSSHD} $FAKE_ROOT${TEST_DIR}/etc/init.d/${SYSVINIT_NAME}
212 chmod 744 $FAKE_ROOT${TEST_DIR}/etc/init.d/${SYSVINIT_NAME}
213fi
214
215[ "${PERMIT_ROOT_LOGIN}" = no ] && \

--- 114 unchanged lines hidden (view full) ---

330if [ $DO_SMF -eq 1 ]
331then
332 # Delete the existing service, if it exists, then import the
333 # new one.
334 if svcs $OPENSSH_FMRI > /dev/null 2>&1
335 then
336 svccfg delete -f $OPENSSH_FMRI
337 fi
337 # NOTE, if manifest enables sshd by default, this will actually
338 # start the daemon, which may not be what the user wants.
339 svccfg import ${TEST_DIR}/var/svc/manifest/site/$OPENSSH_MANIFEST
338 # NOTE, The manifest disables sshd by default.
339 svccfg import ${TEST_DIR}/var/svc/manifest/site/${SYSVINIT_NAME}.xml
340else
341 if [ "\${USE_SYM_LINKS}" = yes ]
342 then
343 [ "$RCS_D" = yes ] && \
344 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rcS.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s
345 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc0.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s
346 [ "$RC1_D" = no ] || \
347 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc1.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s

--- 75 unchanged lines hidden (view full) ---

423 \$chroot ${PATH_USERADD_PROG} -c 'SSHD PrivSep User' -s /bin/false -g $SSH_PRIVSEP_USER \$sshduid $SSH_PRIVSEP_USER
424 \$chroot ${PATH_PASSWD_PROG} -l $SSH_PRIVSEP_USER
425 }
426
427if [ "\${POST_INS_START}" = "yes" ]
428then
429 if [ $DO_SMF -eq 1 ]
430 then
340else
341 if [ "\${USE_SYM_LINKS}" = yes ]
342 then
343 [ "$RCS_D" = yes ] && \
344 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rcS.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s
345 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc0.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s
346 [ "$RC1_D" = no ] || \
347 installf ${PKGNAME} \${PKG_INSTALL_ROOT}$TEST_DIR/etc/rc1.d/${SYSVINITSTOPT}${SYSVINIT_NAME}=../init.d/${SYSVINIT_NAME} s

--- 75 unchanged lines hidden (view full) ---

423 \$chroot ${PATH_USERADD_PROG} -c 'SSHD PrivSep User' -s /bin/false -g $SSH_PRIVSEP_USER \$sshduid $SSH_PRIVSEP_USER
424 \$chroot ${PATH_PASSWD_PROG} -l $SSH_PRIVSEP_USER
425 }
426
427if [ "\${POST_INS_START}" = "yes" ]
428then
429 if [ $DO_SMF -eq 1 ]
430 then
431 # See svccfg import note above. The service may already
432 # be started.
433 svcadm enable $OPENSSH_FMRI
434 else
435 ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start
436 fi
437fi
438exit 0
439_EOF
440

--- 98 unchanged lines hidden (view full) ---

539then
540 # This could get hairy, as the running sshd may not be under SMF.
541 # We'll assume an earlier version of OpenSSH started via SMF.
542 cat >> request << _EOF
543PRE_INS_STOP=no
544POST_INS_START=no
545# determine if should restart the daemon
546if [ -s ${piddir}/sshd.pid ] && \
431 svcadm enable $OPENSSH_FMRI
432 else
433 ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start
434 fi
435fi
436exit 0
437_EOF
438

--- 98 unchanged lines hidden (view full) ---

537then
538 # This could get hairy, as the running sshd may not be under SMF.
539 # We'll assume an earlier version of OpenSSH started via SMF.
540 cat >> request << _EOF
541PRE_INS_STOP=no
542POST_INS_START=no
543# determine if should restart the daemon
544if [ -s ${piddir}/sshd.pid ] && \
547 /usr/bin/svcs $OPENSSH_FMRI 2>&1 | egrep "^online" > /dev/null 2>&1
545 /usr/bin/svcs -H $OPENSSH_FMRI 2>&1 | egrep "^online" > /dev/null 2>&1
548then
549 ans=\`ckyorn -d n \
550-p "Should the running sshd daemon be restarted? ${DEF_MSG}"\` || exit \$?
551 case \$ans in
552 [y,Y]*) PRE_INS_STOP=yes
553 POST_INS_START=yes
554 ;;
555 esac

--- 127 unchanged lines hidden --- 		546then
547 ans=\`ckyorn -d n \
548-p "Should the running sshd daemon be restarted? ${DEF_MSG}"\` || exit \$?
549 case \$ans in
550 [y,Y]*) PRE_INS_STOP=yes
551 POST_INS_START=yes
552 ;;
553 esac

--- 127 unchanged lines hidden ---