Merge branch 'distorted' into vampire

* distorted:
  etc/mirrors.d/50-rfc: Fetch RFCs from IETF; fetch IDs separately.
  etc/mirrors.d/50-debian: Actually mirror security updates.
  etc/ftpsync-common.conf: Adjust the mirror root directory.
  Move the mirror home directory to /var/lib/mirror-admin.
  Move the mirror home directory to /var/lib/mirror-admin.
  bin/run-mirrors: If we have a keytab file, log in with it.
  bin/ftpsync: New version from upstream.

Conflicts:
	etc/mirrors.d/50-rfc

diff --combined bin/run-mirrors
index 1dffeec,ef7f92c..fcc345b
--- 1/bin/run-mirrors
--- 2/bin/run-mirrors
+++ b/bin/run-mirrors
@@@ -5,7 -5,7 +5,7 @@@ set -
  ## Make sure we're running as the right user.
  case $(id -un) in
    mirror) ;;
 -  *) exec userv -fstdin=/dev/null mirror run ;;
 +  *) exec sudo -umirror "$0" "$@" ;;
  esac
  
  ## Set up a plausible environment.
@@@ -19,6 -19,11 +19,11 @@@ case "${MIRROR_LOCKED-nil}" i
    nil) exec env MIRROR_LOCKED=t locking -f var/mirror.lock "$0" "$@" ;;
  esac
  
+ ## Hack for mad Kerberized NFS.
+ if [ -r etc/krb5.keytab ]; then
+   kinit -k -t etc/krb5.keytab mirror
+ fi
+ 
  ## Before we start, rotate the logs.  (Doing things this way means that we
  ## can be sure we don't lose new logs, even if the log rotation goes
  ## completely mental.