Index: /branches/fc20-dev/server/common/oursrc/accountadm/Makefile.in
===================================================================
--- /branches/fc20-dev/server/common/oursrc/accountadm/Makefile.in	(revision 2524)
+++ /branches/fc20-dev/server/common/oursrc/accountadm/Makefile.in	(revision 2525)
@@ -10,5 +10,5 @@
 all-local: admof
 
-admof: LDLIBS = -lafsauthent_pic -lafsrpc_pic -lresolv -lkrb5 -lpthread
+admof: LDLIBS = -lafsauthent_pic -lafsrpc_pic -lresolv -lkrb5 -lpthread -lk5crypto
 admof: admof.o
 
Index: /branches/fc20-dev/server/common/patches/openafs-scripts.patch
===================================================================
--- /branches/fc20-dev/server/common/patches/openafs-scripts.patch	(revision 2524)
+++ /branches/fc20-dev/server/common/patches/openafs-scripts.patch	(revision 2525)
@@ -46,8 +46,8 @@
 #
 diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
-index 7c7705e..0d0e94f 100644
+index 03caf1c..699b2ce 100644
 --- a/src/afs/LINUX/osi_vnodeops.c
 +++ b/src/afs/LINUX/osi_vnodeops.c
-@@ -904,6 +904,28 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags)
+@@ -1207,6 +1207,28 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags)
  	/* should we always update the attributes at this point? */
  	/* unlikely--the vcache entry hasn't changed */
@@ -79,5 +79,5 @@
  #ifdef notyet
 diff --git a/src/afs/VNOPS/afs_vnop_access.c b/src/afs/VNOPS/afs_vnop_access.c
-index eabcfeb..6390850 100644
+index feb0ca7..ba818c7 100644
 --- a/src/afs/VNOPS/afs_vnop_access.c
 +++ b/src/afs/VNOPS/afs_vnop_access.c
@@ -119,5 +119,5 @@
  }
 diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c
-index b3931e5..71ef05c 100644
+index d01aff2..0a38c1c 100644
 --- a/src/afs/VNOPS/afs_vnop_attrs.c
 +++ b/src/afs/VNOPS/afs_vnop_attrs.c
@@ -134,8 +134,8 @@
  #elif defined(AFS_DARWIN80_ENV)
 diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c
-index 8e7af1c..7e984e9 100644
+index 5d96f75..7957eee 100644
 --- a/src/afs/VNOPS/afs_vnop_lookup.c
 +++ b/src/afs/VNOPS/afs_vnop_lookup.c
-@@ -1877,6 +1877,12 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr
+@@ -1915,6 +1915,12 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr
      }
  
@@ -151,5 +151,5 @@
  	osi_FreeLargeSpace(tname);
 diff --git a/src/afs/afs.h b/src/afs/afs.h
-index fcc4c70..0d53af6 100644
+index 88d5f77..61d3ee9 100644
 --- a/src/afs/afs.h
 +++ b/src/afs/afs.h
@@ -171,8 +171,8 @@
      afs_int32 flags;		/* things like O_SYNC, O_NONBLOCK go here */
      char initd;			/* if non-zero, Error fields meaningful */
-@@ -887,6 +895,7 @@ struct vcache {
- #ifdef AFS_SUN5_ENV
+@@ -896,6 +904,7 @@ struct vcache {
      struct afs_q multiPage;	/* list of multiPage_range structs */
  #endif
+     afs_uint32 lastBRLWarnTime; /* last time we warned about byte-range locks */
 +    int apache_access;		/* whether or not Apache has access to a file */
  };
@@ -180,8 +180,8 @@
  #define	DONT_CHECK_MODE_BITS	0
 diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c
-index 1834e6d..673a8e6 100644
+index 2ecd38e..95aafcd 100644
 --- a/src/afs/afs_analyze.c
 +++ b/src/afs/afs_analyze.c
-@@ -368,7 +368,7 @@ afs_Analyze(struct afs_conn *aconn, afs_int32 acode,
+@@ -478,7 +478,7 @@ afs_Analyze(struct afs_conn *aconn, struct rx_connection *rxconn,
  			 (afid ? afid->Fid.Volume : 0));
  	}
@@ -193,5 +193,5 @@
  	    areq->volumeError = VOLBUSY;
 diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c
-index c888605..ff5cf2d 100644
+index efce229..c1c1871 100644
 --- a/src/afs/afs_osi_pag.c
 +++ b/src/afs/afs_osi_pag.c
@@ -206,5 +206,5 @@
   * representation is '41XXXXXX' hex are used to represent the pags.
 @@ -484,6 +486,15 @@ afs_InitReq(struct vrequest *av, afs_ucred_t *acred)
- 	av->uid = afs_cr_uid(acred);	/* default when no pag is set */
+ 	av->uid = afs_cr_ruid(acred);	/* default when no pag is set */
  #endif
      }
@@ -222,8 +222,8 @@
  
 diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
-index f282510..00f1360 100644
+index e0a744d..c1c8c8c 100644
 --- a/src/afs/afs_pioctl.c
 +++ b/src/afs/afs_pioctl.c
-@@ -1406,6 +1406,10 @@ DECL_PIOCTL(PSetAcl)
+@@ -1420,6 +1420,10 @@ DECL_PIOCTL(PSetAcl)
      struct rx_connection *rxconn;
      XSTATS_DECLS;
@@ -236,5 +236,5 @@
      if (!avc)
  	return EINVAL;
-@@ -1790,6 +1794,10 @@ DECL_PIOCTL(PSetTokens)
+@@ -1806,6 +1810,10 @@ DECL_PIOCTL(PSetTokens)
      struct vrequest treq;
      afs_int32 flag, set_parent_pag = 0;
@@ -247,5 +247,5 @@
      if (!afs_resourceinit_flag) {
  	return EIO;
-@@ -2231,6 +2239,11 @@ DECL_PIOCTL(PGetTokens)
+@@ -2266,6 +2274,11 @@ DECL_PIOCTL(PGetTokens)
      int newStyle;
      int code = E2BIG;
@@ -259,5 +259,5 @@
      if (!afs_resourceinit_flag)	/* afs daemons haven't started yet */
  	return EIO;		/* Inappropriate ioctl for device */
-@@ -2341,6 +2354,10 @@ DECL_PIOCTL(PUnlog)
+@@ -2376,6 +2389,10 @@ DECL_PIOCTL(PUnlog)
      afs_int32 i;
      struct unixuser *tu;
Index: /branches/fc20-dev/server/fedora/Makefile
===================================================================
--- /branches/fc20-dev/server/fedora/Makefile	(revision 2524)
+++ /branches/fc20-dev/server/fedora/Makefile	(revision 2525)
@@ -20,5 +20,5 @@
 
 upstream_yum	= krb5 krb5.i686 httpd openssh
-hackage		= cgi-3001.1.8.2 unix-handle-0.0.0
+hackage		= cgi-3001.1.8.5 unix-handle-0.0.0
 upstream_hackage = ghc-cgi ghc-unix-handle
 gems		= pony:1.8
@@ -40,6 +40,6 @@
 
 dload		= ${PWD}/.dload
-openafs_url	= "https://www.openafs.org/dl/openafs/1.6.5.1/openafs-1.6.5.1-1.src.rpm"
-zephyr_url	= "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
+openafs_url	= "https://www.openafs.org/dl/openafs/1.6.8/openafs-1.6.8-1.src.rpm"
+#zephyr_url	= "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
 
 PKG		= $(patsubst %.i686,%,$@)
@@ -69,5 +69,5 @@
 	cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum)
 	wget -P $(dload) $(openafs_url)
-	wget -P $(dload) $(zephyr_url)
+	#wget -P $(dload) $(zephyr_url)
 	cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz https://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
 	cabal update
@@ -75,4 +75,5 @@
 	cp -a $(hackage:%=~/.cabal/packages/*/*/*/%.tar.gz) $(tmp_src)
 	$(foreach gem, $(gems), gem fetch $(firstword $(subst :, ,$(gem))) -v $(lastword $(subst :, ,$(gem)));)
+	spectool -g -R $(specs)/zephyr.spec
 	spectool -g -R $(specs)/python-zephyr.spec
 	spectool -g -R $(specs)/python-afs.spec
@@ -151,10 +152,10 @@
 	PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
 	rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
-	/usr/bin/mock -r scripts-fc19-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
+	/usr/bin/mock -r scripts-fc20-i386 --arch=i686 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
 
 $(filter-out %.i686,$(oursrc)): %: setup
 	PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
 	rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
-	/usr/bin/mock -r scripts-fc19-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
+	/usr/bin/mock -r scripts-fc20-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
 
 $(upstream) openafs-kernel: rpmbuild_args += --define 'scriptsversion $(shell svnversion ${patches} | tr ':' '_')'
@@ -164,14 +165,14 @@
 $(filter %.i686,$(upstream)): %.i686: setup patch-specs
 	rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
-	/usr/bin/mock -r scripts-fc19-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
+	/usr/bin/mock -r scripts-fc20-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
 
 $(filter-out %.i686,$(upstream)): %: setup patch-specs
 	rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
-	/usr/bin/mock -r scripts-fc19-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
+	/usr/bin/mock -r scripts-fc20-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
 
 openafs-kernel: setup
 	PATH="/usr/kerberos/sbin:/usr/kerberos/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin" \
 	rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/openafs*.spec
-	/usr/bin/mock -r scripts-fc19-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
+	/usr/bin/mock -r scripts-fc20-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
 
 #sort -n sorts "2.6.25-1" later than "2.6.25.1-1", so it's Wrong
Index: /branches/fc20-dev/server/fedora/specs/discuss.spec
===================================================================
--- /branches/fc20-dev/server/fedora/specs/discuss.spec	(revision 2524)
+++ /branches/fc20-dev/server/fedora/specs/discuss.spec	(revision 2525)
@@ -1,5 +1,5 @@
 # Make sure to update this to coincide with the most recent debathena-discuss
 # release from http://debathena.mit.edu/apt/pool/debathena/d/debathena-discuss/
-%define upstreamversion 10.0.15
+%define upstreamversion 10.0.17
 Name:		discuss
 Version:	%{upstreamversion}
@@ -21,5 +21,5 @@
 
 %prep
-%setup -q -n debathena-%{name}-%{upstreamversion}
+%setup -q -n %{name}-%{upstreamversion}
 
 %build
@@ -30,5 +30,6 @@
 automake --add-missing --foreign || :
 %configure --without-krb4 --with-krb5 --with-zephyr --with-pager=/usr/bin/less
-make %{?_smp_mflags}
+#make %{?_smp_mflags}
+make
 
 %install
@@ -56,5 +57,4 @@
 %{_bindir}/dspipe
 %{_bindir}/mkds
-%{_bindir}/pmtg
 %{_bindir}/rmds
 %{_libexecdir}/edsc
@@ -99,4 +99,7 @@
 %attr(755,discuss,discuss) %{_localstatedir}/spool/discuss
 %attr(644,root,root) %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
+%{_libexecdir}/disdebug
+%{_libexecdir}/expunge
+%{_libexecdir}/recover
 
 %pre server
@@ -108,4 +111,7 @@
 
 %changelog
+* Mon May 26 2014 Alexander Chernyakhovsky <achernya@mit.edu> - 10.0.17-1
+- Update to discuss 10.0.17
+
 * Tue Mar 19 2013 Alexander Chernyakhovsky <achernya@mit.edu> - 10.0.15-1
 - Update to discuss 10.0.15
Index: /branches/fc20-dev/server/fedora/specs/ghc-cgi.spec
===================================================================
--- /branches/fc20-dev/server/fedora/specs/ghc-cgi.spec	(revision 2524)
+++ /branches/fc20-dev/server/fedora/specs/ghc-cgi.spec	(revision 2525)
@@ -1,34 +1,43 @@
-# cabal2spec-0.25
+# Generated with cabal-rpm
 # https://fedoraproject.org/wiki/Packaging:Haskell
-# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name cgi
 
-%global common_summary Haskell %{pkg_name} library
+Name:           ghc-%{pkg_name}
+Version:        3001.1.8.5
+Release:        0.%{scriptsversion}%{?dist}
+Summary:        A library for writing CGI programs
 
-%global common_description A %{pkg_name} library for Haskell.
-
-Name:           ghc-%{pkg_name}
-Version:        3001.1.8.2
-Release:        0.%{scriptsversion}%{?dist}
-Summary:        %{common_summary}
-
-Group:          System Environment/Libraries
 License:        BSD
-# BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-ExclusiveArch:  %{ghc_arches}
+
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
-# END cabal2spec
-BuildRequires:  ghc-network-prof
-BuildRequires:  ghc-parsec-prof
-BuildRequires:  ghc-mtl-prof
-BuildRequires:  ghc-MonadCatchIO-mtl-prof
-BuildRequires:  ghc-xhtml-prof
+# Begin cabal-rpm deps:
+BuildRequires:  ghc-MonadCatchIO-mtl-devel
+BuildRequires:  ghc-containers-devel
+BuildRequires:  ghc-mtl-devel
+BuildRequires:  ghc-network-devel
+BuildRequires:  ghc-old-locale-devel
+BuildRequires:  ghc-old-time-devel
+BuildRequires:  ghc-parsec-devel
+BuildRequires:  ghc-xhtml-devel
+# End cabal-rpm deps
 
 %description
-%{common_description}
+This is a Haskell library for writing CGI programs.
+
+
+%package devel
+Summary:        Haskell %{pkg_name} library development files
+Provides:       %{name}-static = %{version}-%{release}
+Requires:       ghc-compiler = %{ghc_version}
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+This package provides the Haskell %{pkg_name} library development files.
 
 
@@ -45,17 +54,23 @@
 
 
-# devel subpackage
-%ghc_devel_package
-
-%ghc_devel_description
+%post devel
+%ghc_pkg_recache
 
 
-%ghc_devel_post_postun
+%postun devel
+%ghc_pkg_recache
 
 
-%ghc_files LICENSE
+%files -f %{name}.files
+%doc LICENSE
+
+
+%files devel -f %{name}-devel.files
 
 
 %changelog
+* Mon May 26 2014 Alexander Chernyakhovsky <achernya@mit.edu> - 3001.1.8.5-0
+- Updated packaging for F20, with cabal-rpm
+
 * Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 3001.1.8.2-0
 - regenerated packaging with cabal2spec-0.25.5
Index: /branches/fc20-dev/server/fedora/specs/ghc-unix-handle.spec
===================================================================
--- /branches/fc20-dev/server/fedora/specs/ghc-unix-handle.spec	(revision 2524)
+++ /branches/fc20-dev/server/fedora/specs/ghc-unix-handle.spec	(revision 2525)
@@ -1,29 +1,38 @@
-# cabal2spec-0.25
 # https://fedoraproject.org/wiki/Packaging:Haskell
-# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name unix-handle
-
-%global common_summary Haskell %{pkg_name} library
-
-%global common_description A %{pkg_name} library for Haskell.
 
 Name:           ghc-%{pkg_name}
 Version:        0.0.0
 Release:        0.%{scriptsversion}%{?dist}
-Summary:        %{common_summary}
+Summary:        POSIX operations on Handles
 
-Group:          System Environment/Libraries
 License:        BSD
-# BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-ExclusiveArch:  %{ghc_arches}
+
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
-# END cabal2spec
+# Begin cabal-rpm deps:
+BuildRequires:  ghc-unix-devel
+# End cabal-rpm deps
 
 %description
-%{common_description}
+This package provides versions of functions from "System.Posix.Files" that
+operate on 'System.IO.Handle' instead of 'System.IO.FilePath' or
+'System.Posix.Fd'. This is useful to prevent race conditions that may arise
+from looking up the same path twice.
+
+
+%package devel
+Summary:        Haskell %{pkg_name} library development files
+Provides:       %{name}-static = %{version}-%{release}
+Requires:       ghc-compiler = %{ghc_version}
+Requires(post): ghc-compiler = %{ghc_version}
+Requires(postun): ghc-compiler = %{ghc_version}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+%description devel
+This package provides the Haskell %{pkg_name} library development files.
 
 
@@ -40,17 +49,23 @@
 
 
-# devel subpackage
-%ghc_devel_package
-
-%ghc_devel_description
+%post devel
+%ghc_pkg_recache
 
 
-%ghc_devel_post_postun
+%postun devel
+%ghc_pkg_recache
 
 
-%ghc_files LICENSE
+%files -f %{name}.files
+%doc LICENSE
+
+
+%files devel -f %{name}-devel.files
 
 
 %changelog
+* Mon May 26 2014 Alex Chernyakhovsky <achernya@mit.edu> - 0.0.0-0
+- Updated packaging for F20 with cabal-rpm
+
 * Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 0.0.0-0
 - regenerated packaging with cabal2spec-0.25.5
Index: anches/fc20-dev/server/fedora/specs/gnutls.spec.patch
===================================================================
--- /branches/fc20-dev/server/fedora/specs/gnutls.spec.patch	(revision 2524)
+++ 	(revision )
@@ -1,28 +1,0 @@
---- gnutls.spec.orig	2014-03-08 16:13:24.922925743 -0500
-+++ gnutls.spec	2014-03-08 16:14:50.464231133 -0500
-@@ -1,7 +1,7 @@
- Summary: A TLS protocol implementation
- Name: gnutls
- Version: 2.12.23
--Release: 2%{?dist}
-+Release: 2%{?dist}.scripts.%{scriptsversion}
- # The libgnutls library is LGPLv2+, utilities and remaining libraries are GPLv3+
- License: GPLv3+ and LGPLv2+
- Group: System Environment/Libraries
-@@ -26,6 +26,8 @@
- # Use only FIPS approved ciphers in the FIPS mode
- Patch7: gnutls-2.12.21-fips-algorithms.patch
- Patch8: gnutls-2.12.23-cve-2013-2116.patch
-+# Patch GNUTLS-SA-2014-2
-+Patch9: gnutls-2.12.x-cve-2014-0092.patch
- 
- BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- Requires: libgcrypt >= 1.2.2
-@@ -99,6 +101,7 @@
- %patch6 -p1 -b .cli-debug
- %patch7 -p1 -b .fips
- %patch8 -p1 -b .overread
-+%patch9 -p1 -b .cve-2014-0092
- 
- for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
-     touch lib/$i
Index: /branches/fc20-dev/server/fedora/specs/httpd.spec.patch
===================================================================
--- /branches/fc20-dev/server/fedora/specs/httpd.spec.patch	(revision 2524)
+++ /branches/fc20-dev/server/fedora/specs/httpd.spec.patch	(revision 2525)
@@ -1,8 +1,8 @@
---- httpd.spec.orig	2013-08-22 16:53:46.414957922 -0400
-+++ httpd.spec	2013-08-22 16:53:54.456957922 -0400
-@@ -14,7 +14,7 @@
+--- httpd.spec.orig	2014-05-25 18:59:21.318657218 -0400
++++ httpd.spec	2014-05-25 19:00:15.324430542 -0400
+@@ -15,7 +15,7 @@
  Summary: Apache HTTP Server
  Name: httpd
- Version: 2.4.6
+ Version: 2.4.9
 -Release: 2%{?dist}
 +Release: 2%{?dist}.scripts.%{scriptsversion}
@@ -10,7 +10,7 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -83,6 +83,12 @@
- Requires(postun): systemd-units
+@@ -86,6 +86,12 @@
  Requires(post): systemd-units
+ Conflicts: apr < 1.5.0-1
  
 +Provides: scripts-httpd = %{version}-%{release}
@@ -23,5 +23,5 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -93,6 +99,7 @@
+@@ -96,6 +102,7 @@
  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
  Requires: apr-devel, apr-util-devel, pkgconfig
@@ -31,5 +31,5 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -131,6 +138,7 @@
+@@ -134,6 +141,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -39,5 +39,5 @@
  
  %description -n mod_ssl
-@@ -197,6 +205,11 @@
+@@ -200,6 +208,11 @@
  # Prevent use of setcap in "install-suexec-caps" target.
  sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
@@ -51,5 +51,5 @@
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -243,11 +256,13 @@
+@@ -246,11 +259,13 @@
  	--enable-suexec --with-suexec \
          --enable-suexec-capabilities \
Index: /branches/fc20-dev/server/fedora/specs/krb5.spec.patch
===================================================================
--- /branches/fc20-dev/server/fedora/specs/krb5.spec.patch	(revision 2524)
+++ /branches/fc20-dev/server/fedora/specs/krb5.spec.patch	(revision 2525)
@@ -1,16 +1,16 @@
---- krb5.spec.orig	2013-07-31 21:02:28.141225784 -0400
-+++ krb5.spec	2013-07-31 21:02:49.548225784 -0400
-@@ -30,7 +30,7 @@
+--- krb5.spec.orig	2014-05-25 19:01:13.701141912 -0400
++++ krb5.spec	2014-05-25 19:02:11.438816630 -0400
+@@ -41,7 +41,7 @@
  Summary: The Kerberos network authentication system
  Name: krb5
- Version: 1.11.3
--Release: 2%{?dist}
-+Release: 2%{?dist}.scripts.%{scriptsversion} 
+ Version: 1.11.5
+-Release: 5%{?dist}
++Release: 5%{?dist}.scripts.%{scriptsversion} 
  # Maybe we should explode from the now-available-to-everybody tarball instead?
- # http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.3-signed.tar
+ # http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.5-signed.tar
  Source0: krb5-%{version}.tar.gz
-@@ -90,6 +90,8 @@
- Patch201: krb5-1.11.2-keycheck.patch
- Patch202: krb5-1.11.2-otp.patch
+@@ -143,6 +143,8 @@
+ Patch405: 0005-Be-more-careful-of-target-ccache-collections.patch
+ Patch406: 0006-Copy-config-entries-to-the-target-ccache.patch
  
 +Patch1000: krb5-kuserok-scripts.patch
@@ -19,5 +19,5 @@
  URL: http://web.mit.edu/kerberos/www/
  Group: System Environment/Libraries
-@@ -176,6 +178,7 @@
+@@ -232,6 +234,7 @@
  %package libs
  Summary: The shared libraries used by Kerberos 5
@@ -27,10 +27,11 @@
  # Some of the older libsmbclient builds here incorrectly called
  # krb5_locate_kdc(), which was mistakenly exported in 1.9.
-@@ -315,6 +318,7 @@
+@@ -410,6 +413,8 @@
+ %patch203 -p1 -b .otp2
+ %patch204 -p1 -b .move-otp-sockets
  
- %patch201 -p1 -b .keycheck
- %patch202 -p1 -b .otp
-+%patch1000 -p1 -b .kuserok  
- 
++%patch1000 -p1 -b .kuserok
++
  # Take the execute bit off of documentation.
  chmod -x doc/krb5-protocol/*.txt
+ 
Index: /branches/fc20-dev/server/fedora/specs/openafs.spec.patch
===================================================================
--- /branches/fc20-dev/server/fedora/specs/openafs.spec.patch	(revision 2524)
+++ /branches/fc20-dev/server/fedora/specs/openafs.spec.patch	(revision 2525)
@@ -1,6 +1,6 @@
---- openafs.spec.orig	2013-10-12 19:05:58.632374808 -0400
-+++ openafs.spec	2013-10-12 19:04:29.539206726 -0400
+--- openafs.spec.orig	2014-05-25 21:15:54.539027644 -0400
++++ openafs.spec	2014-05-25 21:16:27.836268275 -0400
 @@ -4,7 +4,7 @@
- %define pkgvers 1.6.5.1
+ %define pkgvers 1.6.8
  # for beta/rc releases make pkgrel 0.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
@@ -10,5 +10,5 @@
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -249,9 +249,16 @@
+@@ -249,9 +249,15 @@
  %if %{build_modules}
  BuildRequires: kernel-devel
@@ -21,5 +21,4 @@
 +Patch1002: openafs-systemd-crond.patch
 +Patch1003: openafs-systemd-csdb.patch
-+Patch1004: openafs-d_drop.patch
 +%define _default_patch_fuzz 2
 +
@@ -33,5 +32,5 @@
 +Provides: scripts-openafs-client
  Requires: binutils, openafs = %{version}
- %if 0%{?fedora} >= 15
+ %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
  Requires: systemd-units
 @@ -382,6 +389,7 @@
@@ -92,5 +91,5 @@
  %else
  
-@@ -698,6 +711,12 @@
+@@ -698,6 +711,11 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -100,10 +99,9 @@
 +%patch1002 -p1 -b .systemd-crond
 +%patch1003 -p1 -b .systemd-csdb
-+%patch1004 -p1 -b .d_drop
 +
  ##############################################################################
  #
  # building
-@@ -869,6 +887,8 @@
+@@ -871,6 +889,8 @@
  %endif
  %endif
@@ -114,5 +112,5 @@
         --prefix=%{_prefix} \
         --libdir=%{_libdir} \
-@@ -1257,6 +1277,13 @@
+@@ -1267,6 +1287,13 @@
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
Index: /branches/fc20-dev/server/fedora/specs/openssh.spec.patch
===================================================================
--- /branches/fc20-dev/server/fedora/specs/openssh.spec.patch	(revision 2524)
+++ /branches/fc20-dev/server/fedora/specs/openssh.spec.patch	(revision 2525)
@@ -1,5 +1,5 @@
---- openssh.spec.orig	2013-05-01 19:02:52.961058569 -0400
-+++ openssh.spec	2013-05-01 19:15:58.952058569 -0400
-@@ -74,7 +74,7 @@
+--- openssh.spec.orig	2014-05-25 19:03:45.308703615 -0400
++++ openssh.spec	2014-05-25 19:05:57.593843283 -0400
+@@ -71,7 +71,7 @@
  Summary: An open source implementation of SSH protocol versions 1 and 2
  Name: openssh
@@ -10,7 +10,7 @@
  #URL1: http://pamsshagentauth.sourceforge.net
  Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
-@@ -187,6 +187,7 @@
- # add latest config.{sub,guess} to support aarch64 (#926284)
- Patch907: openssh-6.2p1-aarch64.patch
+@@ -196,6 +196,7 @@
+ # ignore environment variables with embedded '=' or '\0' characters (#1077843)
+ Patch909: openssh-6.4p1-ignore-bad-env-var.patch
  
 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
@@ -18,13 +18,13 @@
  License: BSD
  Group: Applications/Internet
-@@ -238,6 +239,7 @@
- Group: Applications/Internet
- Requires: openssh = %{version}-%{release}
+@@ -254,6 +255,7 @@
+ Requires(pre): /usr/sbin/useradd
+ Requires: pam >= 1.0.1-3
  Requires: fipscheck-lib%{_isa} >= 1.3.0
 +Provides: scripts-openssh-server
- 
- %package server
- Summary: An open source SSH server daemon
-@@ -407,10 +409,12 @@
+ Requires(post): systemd-units
+ Requires(preun): systemd-units
+ Requires(postun): systemd-units
+@@ -411,10 +413,12 @@
  %patch713 -p1 -b .ctr-cavs
  
@@ -36,10 +36,10 @@
  %patch900 -p1 -b .canohost
 -%patch901 -p1 -b .kuserok
-+# Remove the kuserok patch as it won't apply without patch800  
++# Remove the kuserok patch as it won't apply without patch800
 +# %patch901 -p1 -b .kuserok
- %patch905 -p1 -b .modpipe-cflags
- %patch906 -p1 -b .identityfile
- %patch907 -p1 -b .aarch64
-@@ -419,6 +423,8 @@
+ %patch902 -p1 -b .ccache_name
+ %patch903 -p1 -b .dh
+ %patch904 -p1 -b .SP800-131A
+@@ -428,6 +432,8 @@
  # Nothing here yet
  %endif
Index: /branches/fc20-dev/server/fedora/specs/rubygem-pony.spec
===================================================================
--- /branches/fc20-dev/server/fedora/specs/rubygem-pony.spec	(revision 2524)
+++ /branches/fc20-dev/server/fedora/specs/rubygem-pony.spec	(revision 2525)
@@ -1,9 +1,8 @@
 # Generated from pony-1.8.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name pony
-%global rubyabi 1.9.1
 
 Name: rubygem-%{gem_name}
 Version: 1.8
-Release: 1%{?dist}.scripts.%{scriptsversion}
+Release: 2%{?dist}.scripts.%{scriptsversion}
 Summary: Send email in one command: Pony.mail(:to => 'someone@example.com', :body => 'hello')
 Group: Development/Languages
@@ -11,8 +10,8 @@
 URL: http://github.com/benprew/pony
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-Requires: ruby(abi) = %{rubyabi}
+Requires: ruby(release)
 Requires: ruby(rubygems) 
 Requires: rubygem(mail) >= 2.0
-BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby(release)
 BuildRequires: rubygems-devel 
 BuildRequires: ruby 
@@ -72,4 +71,7 @@
 
 %changelog
+* Mon May 26 2014 Alexander Chernyakhovsky <achernya@mit.edu> - 1.8-2
+- Update for Fedora 20
+
 * Sun Mar 09 2014 Benjamin Tidor <btidor@mit.edu> - 1.8-1
 - Initial package
Index: /branches/fc20-dev/server/fedora/specs/scripts-static-cat.spec
===================================================================
--- /branches/fc20-dev/server/fedora/specs/scripts-static-cat.spec	(revision 2524)
+++ /branches/fc20-dev/server/fedora/specs/scripts-static-cat.spec	(revision 2525)
@@ -1,5 +1,3 @@
-# cabal2spec-0.25
 # https://fedoraproject.org/wiki/Packaging:Haskell
-# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 # Link Haskell libs statically for 3x faster startup speed.
@@ -11,22 +9,21 @@
 Summary:        static-cat for scripts.mit.edu
 
-Group:          Applications/System
-License:        GPL
-# BEGIN cabal2spec
+License:        GPL+
 URL:            http://scripts.mit.edu/
 Source0:        %{name}.tar.gz
-ExclusiveArch:  %{ghc_arches}
+
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
-# END cabal2spec
+# Begin cabal-rpm deps:
+BuildRequires:  ghc-MonadCatchIO-mtl-devel
 BuildRequires:  ghc-bytestring-devel
-BuildRequires:  ghc-cgi-devel >= 3001.1.8
+BuildRequires:  ghc-cgi-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-filepath-devel
-BuildRequires:  ghc-MonadCatchIO-mtl-devel
 BuildRequires:  ghc-old-locale-devel
 BuildRequires:  ghc-time-devel
 BuildRequires:  ghc-unix-devel
 BuildRequires:  ghc-unix-handle-devel
+# End cabal-rpm deps
 
 %description
@@ -51,4 +48,7 @@
 
 %changelog
+* Mon May 26 2014 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0-0
+- Updated for F20 with cabal-rpm
+
 * Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 0.0-0
 - regenerated packaging with cabal2spec-0.25.5
Index: /branches/fc20-dev/server/fedora/specs/zephyr.spec
===================================================================
--- /branches/fc20-dev/server/fedora/specs/zephyr.spec	(revision 2524)
+++ /branches/fc20-dev/server/fedora/specs/zephyr.spec	(revision 2525)
@@ -1,4 +1,6 @@
 Name:           zephyr
-Version:        3.0.2
+Version:        3.1.2
+%define commit 54c6b84a81301a1691f9bec10c63c1e36166df9d
+%define shortcommit %(c=%{commit}; echo ${c:0:7})
 Release:        0.%{scriptsversion}%{?dist}
 Summary:        Client programs for the Zephyr real-time messaging system
@@ -7,5 +9,5 @@
 License:        MIT
 URL:            http://zephyr.1ts.org/
-Source0:        http://zephyr.1ts.org/export/HEAD/distribution/%{name}-%{version}.tar.gz
+Source0:        https://github.com/zephyr-im/zephyr/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 Source1:        zhm.init
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,5 +61,5 @@
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{commit}
 cp -p %{SOURCE1} .
 
@@ -142,7 +144,10 @@
 %{_libdir}/*.so
 %{_includedir}/*
-
+%{_libdir}/pkgconfig/zephyr.pc
 
 %changelog
+* Mon May 26 2014 Alexander Chernyakhovsky <achernya@mit.edu> - 3.1.2-0
+- Update to Zephyr 3.1.2, fix packaging for F20
+
 * Sat Apr 16 2011 Alexander Chernyakhovsky <achernya@mit.edu> 3.0.1-0
 - Zephyr 3.0.1