Index: server/fedora/Makefile
===================================================================
--- server/fedora/Makefile	(revision 759)
+++ server/fedora/Makefile	(revision 760)
@@ -58,5 +58,9 @@
 
 download:
-	-@wget -O- -nv $(server_url)/$(server_arch) | wget -i- -nv -N -B $(server_url)/ -nd -nH -P $(dload);
+	@mkdir -p $(dload); \
+	wget -qO- -nv $(server_url)/$(server_arch) | xargs make
+
+%.src.rpm:
+	wget -q -nv -N -B $(server_url) -nd -nH -P $(dload) $(server_url)/$*.src.rpm
 
 copy-patches: mkdir-tree
@@ -96,12 +100,6 @@
 	done;
 
-setup: install-srpms copy-patches copy-specs patch-specs create-tarballs
-
-# Do not work:
-#rpms: setup
-#	rpmbuild $(rpm_args) -bb ${tmp_specs}/$(allsrc);
-#
-#srpms: setup
-#	rpmbuild $(rpm_args) -bs ${tmp_specs}/$(allsrc);
+#setup: install-srpms copy-patches copy-specs patch-specs create-tarballs
+setup: create-tarballs
 
 oursrc:
@@ -114,11 +112,14 @@
 	make $(allsrc)
 
-$(filter %.i386,$(allsrc)): %.i386: setup
+$(filter %.i386,$(oursrc)): %.i386: setup
 	PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
 	setarch i386 rpmbuild $(rpmbuild_args) --target=i386 --define="_lib lib" -bb ${tmp_specs}/$**.spec
 
-$(filter-out %.i386,$(allsrc)): %: setup
+$(filter-out %.i386,$(oursrc)): %: setup
 	PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
-	rpmbuild $(rpmbuild_args) -ba ${tmp_specs}/$**.spec
+	rpmbuild $(rpmbuild_args) -bb ${tmp_specs}/$**.spec
+
+$(upstream):
+	rpmbuild $(rpmbuild_args) --rebuild $(dload)/$@*.src.rpm
 
 openafs-kernel: setup
@@ -128,5 +129,5 @@
 kernvers = $(shell rpm -q --qf "%{Version}-%{Release}\n" --whatprovides kernel | sort -n | tail -n1)
 kvariants = ''
-openafs_rpmbuild_args = --define "fedorakmod 1" --define "kvariants $(kvariants)" --define "kernvers $(kernvers)"
+openafs_rpmbuild_args = --define "fedorakmod 1" --define "kvariants $(kvariants)" --define "kernvers $(kernvers)" --nodeps
 openafs: rpmbuild_args += $(openafs_rpmbuild_args)
 openafs-kernel: rpmbuild_args += $(openafs_rpmbuild_args) --define "build_userspace 0" --define "build_modules 1"
@@ -165,6 +166,12 @@
 openafs-deps	= pam-devel automake
 mit-zephyr-deps	= readline-devel hesiod.i386 libXt.i386 #compat-readline43
-openssh-deps	= gtk2-devel libX11-devel autoconf automake openssl-devel perl zlib-devel audit-libs-devel util-linux groff man pam-devel tcp_wrappers-devel krb5-devel libselinux-devel audit-libs xauth gobject-devel pango-devel cairo-devel
+openssh-deps	= gtk2-devel libX11-devel autoconf automake openssl-devel perl zlib-devel audit-libs-devel util-linux groff man pam-devel tcp_wrappers-devel krb5-devel libselinux-devel audit-libs xauth gobject-devel pango-devel cairo-devel libedit-devel
 install-deps:
 	yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(mit-zephyr-deps) $(openssh-deps)
 	rpm -ivh http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/Fedora/RPMS/compat-readline43-4.3-3.i386.rpm
+
+fedora:
+	make install-deps
+	make upstream
+	rpm -ivh $(out_rpms)/`uname -m`/openafs-devel*.rpm
+	make oursrc
Index: server/fedora/specs/accountadm.spec
===================================================================
--- server/fedora/specs/accountadm.spec	(revision 759)
+++ server/fedora/specs/accountadm.spec	(revision 760)
@@ -9,4 +9,5 @@
 Source: %{name}.tar.gz 
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
+BuildRequires: openafs-devel
 %define debug_package %{nil}
 Prereq: /usr/bin/fs, /usr/bin/pts
Index: server/fedora/specs/httpd.spec.patch
===================================================================
--- server/fedora/specs/httpd.spec.patch	(revision 759)
+++ server/fedora/specs/httpd.spec.patch	(revision 760)
@@ -1,7 +1,7 @@
---- httpd.spec.old	2006-09-08 15:04:31.000000000 -0400
-+++ httpd.spec	2006-09-16 21:32:05.000000000 -0400
-@@ -59,6 +59,10 @@
- Obsoletes: mod_put, mod_roaming, mod_jk
+--- httpd.spec.orig	2008-02-19 02:05:36.000000000 -0500
++++ httpd.spec	2008-05-20 19:39:59.000000000 -0400
+@@ -54,6 +54,10 @@
  Conflicts: pcre < 4.0
+ Requires: httpd-tools = %{version}-%{release}
  
 +Patch1000: httpd-suexec-scripts.patch
@@ -12,5 +12,5 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -127,6 +129,10 @@
+@@ -127,6 +131,10 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -23,5 +23,5 @@
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -166,10 +166,11 @@
+@@ -175,10 +183,11 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
  	--enable-suexec --with-suexec \
Index: server/fedora/specs/krb5.spec.patch
===================================================================
--- server/fedora/specs/krb5.spec.patch	(revision 759)
+++ server/fedora/specs/krb5.spec.patch	(revision 760)
@@ -1,19 +1,19 @@
---- krb5.spec.old	2006-09-09 22:30:43.000000000 -0400
-+++ krb5.spec	2006-09-16 21:39:55.000000000 -0400
-@@ -85,6 +85,8 @@
- BuildPrereq: bison, e2fsprogs-devel >= 1.33, flex
- BuildPrereq: gzip, ncurses-devel, rsh, texinfo, tar
+--- krb5.spec.orig	2008-03-18 14:13:22.000000000 -0400
++++ krb5.spec	2008-05-20 23:53:40.000000000 -0400
+@@ -101,6 +101,8 @@
+ Patch76: krb5-CVE-2007-5901.patch
+ Patch77: krb5-CVE-2007-5971.patch
  
 +Patch1000: krb5-kuserok-scripts.patch
 +
- %description
- Kerberos V5 is a trusted-third-party network authentication system,
- which can improve your network's security by eliminating the insecure
-@@ -926,4 +928,7 @@
-
- cd src
-+cd ..
-+%patch1000 -p1 -b .scripts
-+cd src
- top=`pwd`
- for configurein in `find -name configure.in -type f` ; do
+ License: MIT, freely distributable.
+ URL: http://web.mit.edu/kerberos/www/
+ Group: System Environment/Libraries
+@@ -1349,6 +1351,7 @@
+ %patch75 -p0 -b .2008-0947
+ %patch76 -p0 -b .2007-5901
+ %patch77 -p0 -b .2007-5971
++%patch1000 -p1 -b .kuserok
+ cp src/krb524/README README.krb524
+ gzip doc/*.ps
+ 
Index: server/fedora/specs/openafs.spec.patch
===================================================================
--- server/fedora/specs/openafs.spec.patch	(revision 759)
+++ server/fedora/specs/openafs.spec.patch	(revision 760)
@@ -1,23 +1,28 @@
---- openafs.spec.old	2006-09-08 15:18:45.000000000 -0400
-+++ openafs.spec	2006-09-16 21:45:20.000000000 -0400
-@@ -182,6 +182,9 @@
- BuildRequires: %{?kdepend:%{kdepend}, } pam-devel
- ExclusiveArch: %{ix86} x86_64 ia64
+--- openafs.spec.orig	2008-04-28 18:13:44.000000000 -0400
++++ openafs.spec	2008-06-03 12:36:29.000000000 -0400
+@@ -210,6 +210,8 @@
+ %define build_authlibs 1
+ %endif
+ 
++%else
++%define build_authlibs 0
+ %endif
+ 
+ # deal with cmdline specification
+@@ -240,6 +242,8 @@
+ %endif
+ ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
  
 +Patch1000: openafs-scripts.patch
-+Patch1001: openafs-splice.patch
 +
  #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
  Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
  Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
-@@ -556,6 +558,10 @@
- #%setup -q -n %{srcdir}
- %setup -q -b 1 -n %{srcdir}
+@@ -678,6 +682,7 @@
  
-+%patch1000 -p1 -b .scripts
-+%patch1001 -p1 -b .splice
-+sh regen.sh
-+
  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
  %patch0 -p1 -b .kmod26
++%patch1000 -p1 -b .scripts
  
+ ##############################################################################
+ #
Index: server/fedora/specs/openssh.spec.patch
===================================================================
--- server/fedora/specs/openssh.spec.patch	(revision 759)
+++ server/fedora/specs/openssh.spec.patch	(revision 760)
@@ -1,18 +1,19 @@
---- openssh.spec.orig	2007-03-20 05:13:40.000000000 -0400
-+++ openssh.spec	2007-10-01 21:16:51.000000000 -0400
-@@ -90,6 +90,7 @@
- Patch48: openssh-4.3p2-pam-session.patch
- Patch49: openssh-4.3p2-gssapi-canohost.patch
- Patch50: openssh-4.5p1-mls.patch
-+Patch1000: openssh-4.5p1-multihomed.patch
- License: BSD
- Group: Applications/Internet
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-@@ -217,6 +218,7 @@
- %patch48 -p1 -b .pam-sesssion
- %patch49 -p1 -b .canohost
- %patch50 -p1 -b .mls
+--- openssh.spec.orig	2008-04-07 16:14:31.000000000 -0400
++++ openssh.spec	2008-05-20 23:14:52.000000000 -0400
+@@ -74,6 +74,7 @@
+ Source1: openssh-nukeacss.sh
+ Source2: sshd.pam
+ Source3: sshd.init
++Patch1000: openssh-5.0p1-multihomed.patch
+ Patch0: openssh-4.7p1-redhat.patch
+ Patch2: openssh-3.8.1p1-skip-initial.patch
+ Patch3: openssh-3.8.1p1-krb5-config.patch
+@@ -229,6 +230,8 @@
+ %patch58 -p1 -b .controlcleanup
+ %patch59 -p1 -b .master-race
+ 
 +%patch1000 -p1 -b .multihomed
- 
++
  autoreconf
  
+ %build