=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- openbsd/update_openbsd/update_openbsd 2009/01/14 18:13:23 1.18 +++ openbsd/update_openbsd/update_openbsd 2009/03/14 02:09:23 1.19 @@ -1,5 +1,5 @@ #!/bin/sh -# $RedRiver: update_openbsd,v 1.17 2009/01/14 17:58:40 andrew Exp $ +# $RedRiver: update_openbsd,v 1.18 2009/01/14 18:13:23 andrew Exp $ installed_sets() { local misc=/usr/share/doc/README @@ -23,6 +23,11 @@ echo -n " $_d" fi done + + sendmail -d0.1 root < /dev/null | grep -q SASL + if [ $? == 0 ]; then + echo -n ' sendmail-smtp_auth' + fi } version_in() { @@ -166,10 +171,15 @@ done for _s in $INSTALLED_SETS; do - if [ ! -e ./${_s}${_v}.tgz ]; then - echo $FTP_CMD ${FTP}/${_s}${_v}.tgz - $FTP_CMD ${FTP}/${_s}${_v}.tgz + local _file=${_s}${_v}.tgz + if [ ${_s} == sendmail-smtp_auth ]; then + _file=${_s}.gz fi + + if [ ! -e ./${_file} ]; then + echo $FTP_CMD ${FTP}/${_file} + $FTP_CMD ${FTP}/${_file} + fi done if [ ! -e MD5 ]; then @@ -187,7 +197,7 @@ return 1 fi - ls bsd* *.tgz | sed -e 's/\(.*\)/(\1)/' > index + ls bsd* *gz | sed -e 's/\(.*\)/(\1)/' > index grep -f index MD5 | md5 -c if [ $? -ne 0 ]; then @@ -216,8 +226,12 @@ done for _s in $INSTALLED_SETS; do - if [ ! -e ./${_s}${_v}.tgz ]; then - echo ${_s}${_v}.tgz does not exist + local _file=${_s}${_v}.tgz + if [ ${_s} == sendmail-smtp_auth ]; then + _file=${_s}.gz + fi + if [ ! -e ./${_file} ]; then + echo ${_file} does not exist _missing_sets=1 fi done @@ -346,6 +360,18 @@ done echo Extracted all sets. + + if [ -e ${RELEASEDIR}/sendmail-smtp_auth.gz ]; then + gzcat ${RELEASEDIR}/sendmail-smtp_auth.gz > \ + ${RELEASEDIR}/sendmail-smtp_auth + fi + if [ -e ${RELEASEDIR}/sendmail-smtp_auth ]; then + install -o root -g smmsp -m 2555 \ + ${RELEASEDIR}/sendmail-smtp_auth \ + /usr/local/libexec/sendmail/sendmail + + echo Installed sendmail with smtp_auth + fi } update_etc() {