=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.8 retrieving revision 1.34 diff -u -r1.8 -r1.34 --- openbsd/update_openbsd/update_openbsd 2008/10/13 19:31:49 1.8 +++ openbsd/update_openbsd/update_openbsd 2009/12/31 16:50:20 1.34 @@ -1,24 +1,6 @@ #!/bin/sh -# $RedRiver: update_openbsd,v 1.7 2008/10/11 22:19:52 andrew Exp $ +# $RedRiver: update_openbsd,v 1.33 2009/12/31 16:48:19 andrew Exp $ -if [ -e /etc/update_openbsd.conf ]; then - . /etc/update_openbsd.conf -fi - -if [ -e ${HOME}/.update_openbsdrc ]; then - . ${HOME}/.update_openbsdrc -fi - -MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD} -FTP_CMD=${FTP_CMD:=ftp -V} -PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/} - -DESTDIR=${DESTDIR:=/} -SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge} -if [ ! -e $SYSMERGE ]; then - SYSMERGE= -fi - installed_sets() { local misc=/usr/share/doc/README local man=/usr/share/man/cat1/intro.0 @@ -41,10 +23,44 @@ echo -n " $_d" fi done + + sendmail -d0.1 --badoption /dev/null | grep -q SASL + if [ $? == 0 ]; then + echo -n ' sendmail-smtp_auth' + fi } -INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`} +version_in() { + local _proto=${FTP%%://*} + local _file + if [ X"ftp" == X"${_proto}" ]; then + local _list=`echo "ls base*.tgz" | ${FTP_CMD} ${FTP}/` + _file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'` + + elif [ X"http" == X"${_proto}" ]; then + local _list=`${FTP_CMD} -V -o - ${FTP}/` + _file=`echo ${_list} | awk '/[^x]base[0-9][0-9]*\.tgz/ { + sub("^.*base","base"); + sub("\.tgz.*",".tgz"); + print $0; + }'` + + elif [ X"scp" == X"${_proto}" ]; then + echo SCP is not yet supported >&2 + return 2 + + else + echo Unsupported FTP ${FTP} >&2 + return 2 + + fi + + local _v=${_file##*base} + _v=${_v%.tgz*} + echo $_v +} + set_version() { CUR_VER=`uname -r` NEW_VER=`dc -e "$CUR_VER 0.1 + p"` @@ -53,9 +69,9 @@ local _cv=`echo $CUR_VER | sed -e 's/\.//'` local _nv=`echo $NEW_VER | sed -e 's/\.//'` - local _v="" + local _v - if [ X"" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then + if [ X"No" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then _dir=$FORCE_DIR if [ -e ${_dir}/base${_nv}.tgz ]; then _v=$_nv @@ -79,24 +95,42 @@ fi - if [ X"" == X"${_v}" ]; then - if [ X"" == X"${FORCE_DIR}" ]; then + if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then + if [ X"No" == X"${FORCE_DIR}" ]; then _dir=${NEW_VER} else _dir=${FORCE_DIR} fi FTP=${MIRROR}/${_dir}/`machine` - local _file=`echo "ls base${_cv}.tgz" | ${FTP_CMD} ${FTP}/ | awk '{ print $9 }'` + _v=`version_in` - if [ X"base${_cv}.tgz" == X"${_file}" ]; then + if [ X"" == X"${_v}" ]; then + if [ X"No" != X"$FORCE_DIR" ]; then + echo No sets in forced [${FTP}] >&2 + return 2 + fi + NEW_VER=$CUR_VER - _v=$_cv + _dir=${NEW_VER} + FTP=${MIRROR}/${_dir}/`machine` + + _v=`version_in` + fi + + if [ X"" == X"${_v}" ]; then + echo No sets in [${FTP}] >&2 + return 2 + elif [ X"${_cv}" == X"${_v}" ]; then + NEW_VER=$CUR_VER + elif [ X"${_nv}" == X"${_v}" ]; then + NEW_VER=$NEW_VER else - _v=$_nv + echo Invalid version [$_v] >&2 + return 2 fi - if [ X"" == X"$FORCE_DIR" ]; then + if [ X"No" == X"$FORCE_DIR" ]; then _dir=$NEW_VER fi @@ -104,21 +138,24 @@ if [ X"" == X"${_v}" ]; then echo ERROR: Unable to determine file version! >&2 - exit 1 + return 1 fi if [ X"" == X"$RELEASEDIR" ]; then RELEASEDIR=`pwd`/$_dir fi + FILE_VER=$_v - FTP=${MIRROR}/${_dir}/`machine` + if [ X"" != X"${MIRROR}" ]; then + FTP=${MIRROR}/${_dir}/`machine` + fi } get_sets() { echo '### GETTING SETS ###' if [ X"" == X"$FTP" ]; then echo ERROR: No FTP site set! >&2 - exit 1 + return 1 fi mkdir -p ${RELEASEDIR} @@ -134,27 +171,101 @@ 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 - echo $FTP_CMD ${FTP}/MD5 - $FTP_CMD ${FTP}/MD5 + local _type + for _type in $CHECKSUM_TYPES; do + if [ ! -e $_type ]; then + echo $FTP_CMD ${FTP}/$_type + $FTP_CMD ${FTP}/$_type + fi + done +} + +follow_symlink () { + local _file=$1 + # This could go circular, but I dunno how to fix that. + if [ -h $_file ]; then + follow_symlink $( file $_file | + grep 'symbolic link' | + sed -e s/^.*\\\`// -e s/\\\'\$// ) + else + echo $_file fi +} - ls bsd* *.tgz > index - grep -f index MD5 | md5 -c +check_sum () { + local _type=$1 + echo "### CHECKING $_type SUMS ###" + cd $RELEASEDIR + if [ ! -e $_type ]; then + echo $_type File does not exist! + return 1 + fi + + ls bsd* *gz | sed -e 's/\(.*\)/(\1)/' > index + grep -f index $_type | sum -c + if [ $? -ne 0 ]; then - echo ERROR: MD5 does not match! >&2 - exit 1 + echo ERROR: $_type does not match! >&2 + return 1 fi } -install_kernel() { +check_sets() { + echo '### CHECKING SETS ###' + cd $RELEASEDIR + + local _missing_sets + local _v=$FILE_VER + + for _b in `echo /bsd* bsd bsd.mp bsd.rd | sort -u`; do + _b=${_b#/} + local _n=$_b + if [ X"bsd.sp" == X"${_n}" ]; then + _n=bsd + fi + if [ -e /${_b} -a ! -e ./${_n} ]; then + echo ${_n} does not exist + _missing_sets=1 + fi + done + + for _s in $INSTALLED_SETS; do + 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 + + if [ X"" == X"${_missing_sets}" ]; then + echo All OK + fi + + local _type + for _type in $CHECKSUM_TYPES; do + if [ -e $_type ]; then + check_sum $_type + fi + done +} + + +install_kernels() { echo '### INSTALLING KERNEL ###' if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then echo ${0##*/} must be run as root or SUDO must be set! >&2 @@ -184,21 +295,20 @@ fi local _v=$FILE_VER - if [ -e base${_v}.tgz ]; then - echo Extracting new firmware from base${_v}.tgz - $SUDO tar -C $DESTDIR -xzphf base${_v}.tgz "*etc/firmware/*" - fi $SUDO rm -f /obsd $SUDO ln /bsd /obsd if [ $? -ne 0 ]; then - echo "Error copying old kernel!" + echo "Error copying old kernel!" >&2 exit 1 fi + local _true_bsd=`follow_symlink /bsd` + _true_bsd=${_true_bsd#/} + local _installed_new_bsd + for _b in bsd*; do $SUDO rm -f /nbsd - if [ X"${_b}" == X"bsd" ]; then echo Copying bsd to /bsd.sp $SUDO cp bsd /nbsd && $SUDO mv /nbsd /bsd.sp @@ -206,14 +316,20 @@ echo ERROR: Could not copy new SP kernel! >&2 exit 1 fi + if [ X"${_true_bsd}" == X"bsd.sp" ]; then + _installed_new_bsd=1 + fi else - if [ -e /$_b ]; then + if [ -e "/${_b}" ]; then echo Copying $_b to / $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_b} if [ $? -ne 0 ]; then echo ERROR: Could not copy new $_b kernel! >&2 exit 1 fi + if [ X"${_true_bsd}" == X"${_b}" ]; then + _installed_new_bsd=1 + fi fi fi done @@ -231,6 +347,10 @@ exit 1 fi fi + + if [ -z $_installed_new_bsd ]; then + echo WARNING: Did not replace $_true_bsd kernel >&2 + fi } install_sets() { @@ -249,13 +369,21 @@ local _v=$FILE_VER - for _f in *${_v}.tgz; do + if [ $CUR_VER != $NEW_VER -a ! -e /sbin/oreboot ]; then + $SUDO cp /sbin/reboot /sbin/oreboot + if [ $? -ne 0 ]; then + echo "Error copying old reboot command!" >&2 + exit 1 + fi + echo "/sbin/reboot copied to /sbin/oreboot" + fi + + local _sets=`ls *${_v}.tgz | grep -v ^base ` + for _f in ${_sets} base${_v}.tgz; do _path=$DESTDIR if [ X"etc${_v}.tgz" == X"$_f" \ -o X"xetc${_v}.tgz" == X"$_f" ]; then - if [ X"" != X"$SYSMERGE" ]; then - continue - fi + [ X"" != X"$SYSMERGE" ] && continue _path=/var/tmp/temproot fi @@ -269,10 +397,30 @@ 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 + if ! pkg_info -qe 'cyrus-sasl-*'; then + $SUDO pkg_add -i cyrus-sasl + fi + + $SUDO install -o root -g smmsp -m 2555 \ + ${RELEASEDIR}/sendmail-smtp_auth \ + /usr/libexec/sendmail/sendmail + + echo Installed sendmail with smtp_auth + fi } update_etc() { echo '### UPDATING ETC ###' + if [ ! -e $SYSMERGE ]; then + SYSMERGE= + fi + if [ X"" == X"$SYSMERGE" ]; then if [ -e /var/tmp/temproot ]; then MERGEMASTER=`which mergemaster` @@ -302,6 +450,7 @@ fi local _v=$FILE_VER + local _args="" if [ -e etc${_v}.tgz ]; then _args="$_args -s etc${_v}.tgz" fi @@ -312,13 +461,37 @@ echo ERROR: No upgrade sets found! >&2 else echo '### RUNNING SYSMERGE ###' - _args="-a $_args" + if sysmerge 2>&1 | grep -- -a >/dev/null; then + _args="-a $_args" + fi $SUDO $SYSMERGE $_args fi fi } + +if [ -e /etc/update_openbsd.conf ]; then + . /etc/update_openbsd.conf +fi + +if [ -e ${HOME}/.update_openbsdrc ]; then + . ${HOME}/.update_openbsdrc +fi + +#MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD} +FTP_CMD=${FTP_CMD:=ftp -V} +PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/} + +DESTDIR=${DESTDIR:=/} +SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge} +FORCE_DIR=${FORCE_DIR:=No} + +INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`} + +CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256 MD5} + set_version +local _error=$? echo echo "-= update_openbsd - helper script to update OpenBSD =-" @@ -336,18 +509,30 @@ #echo " FILE_VER: $FILE_VER" echo -get_sets +if [ ${_error} -ne 0 ]; then + exit ${_error} +fi +if [ X"" != X"${FTP}" ]; then + get_sets +fi + +check_sets || exit + if [ X"" != X"$SUDO" ]; then echo Please enter your sudo password if prompted. echo You may be asked for it again later in the process. $SUDO -v fi -install_kernel +install_kernels +install_sets if [ $CUR_VER == $NEW_VER ]; then - install_sets + if [ -e /sbin/oreboot ]; then + echo Removing /sbin/oreboot + $SUDO rm -f /sbin/oreboot + fi update_etc echo '### UPDATING PACKAGES ###' @@ -355,7 +540,24 @@ else echo Instructions for updating to the new version available from - echo " http://www.openbsd.org/faq/upgrade${_v}.html" + if [ X"snapshots" != X"$FORCE_DIR" ]; then + echo " http://www.openbsd.org/faq/current.html" + else + echo " http://www.openbsd.org/faq/upgrade${FILE_VER}.html" + fi fi echo New kernel installed. Please reboot! +if [ -e /sbin/oreboot ]; then + echo Possibly using /sbin/oreboot +fi + +local _send_dmesg=`dirname $0`/send_dmesg +if [ -e "$_send_dmesg" ]; then + if [ -e $RELEASEDIR/.send_dmesg ]; then + $_send_dmesg + rm -f $RELEASEDIR/.send_dmesg + elif [ X"$CUR_VER" != X"$NEW_VER" ]; then + touch $RELEASEDIR/.send_dmesg + fi +fi