Index: trunk/server/fedora/Makefile
===================================================================
--- trunk/server/fedora/Makefile	(revision 1689)
+++ trunk/server/fedora/Makefile	(revision 1693)
@@ -19,9 +19,9 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum	= krb5 krb5.i586 httpd openssh shadow-utils libpng ghostscript
+upstream_yum	= krb5 krb5.i686 httpd openssh
 hackage		= MonadCatchIO-mtl-0.3.0.1 cgi-3001.1.8.1 unix-handle-0.0.0
 upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
-upstream	= openafs $(upstream_yum) $(upstream_hackage) moira cluster-glue heartbeat pacemaker
-oursrc		= execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i586 whoisd mit-zephyr athrun php_scripts scripts-wizard scripts-base scripts-static-cat
+upstream	= openafs $(upstream_yum) $(upstream_hackage) moira cluster-glue heartbeat pacemaker zephyr zephyr.i686 python-zephyr
+oursrc		= execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat
 allsrc		= $(upstream) $(oursrc)
 oursrcdir	= ${PWD}/../common/oursrc
@@ -40,10 +40,12 @@
 server_url	= "http://web.mit.edu/scripts/src"
 server_arch	= "fedora.stable"
-openafs_url	= "http://dl.openafs.org/dl/openafs/1.4.11/openafs-1.4.11-1.1.1.src.rpm"
+#openafs_url	= "http://dl.openafs.org/dl/openafs/1.4.12/openafs-1.4.12-1.1.2.src.rpm"
+openafs_url	= "file:///home/scripts-build/mock-local/openafs-1.4.12-1.0.pre3.src.rpm"
 clusterglue_url	= "http://kojipkgs.fedoraproject.org/packages/cluster-glue/1.0/0.11.b79635605337.hg.fc12/src/cluster-glue-1.0-0.11.b79635605337.hg.fc12.src.rpm"
 heartbeat_url	= "http://kojipkgs.fedoraproject.org/packages/heartbeat/3.0.0/0.5.0daab7da36a8.hg.fc12/src/heartbeat-3.0.0-0.5.0daab7da36a8.hg.fc12.src.rpm"
 pacemaker_url	= "http://kojipkgs.fedoraproject.org/packages/pacemaker/1.0.5/5.fc12/src/pacemaker-1.0.5-5.fc12.src.rpm"
-
-PKG		= $(patsubst %.i586,%,$@)
+zephyr_url	= "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.tar.gz"
+
+PKG		= $(patsubst %.i686,%,$@)
 
 .PHONY: minimal-clean
@@ -59,4 +61,5 @@
 clean: minimal-clean
 	rm -rf $(out_rpms) $(out_srpms) $(out_sbin)
+	rm -f download_stamp
 
 mkdir-tree:
@@ -66,5 +69,5 @@
 
 download: download_stamp
-download_stamp: | SRPMS/mit-zephyr-2.1-6.src.rpm
+download_stamp:
 	@mkdir -p $(dload); \
 	#wget -qO- -nv $(server_url)/$(server_arch) | xargs make
@@ -74,8 +77,10 @@
 	wget -P $(dload) $(heartbeat_url)
 	wget -P $(dload) $(pacemaker_url)
+	wget -P $(dload) $(zephyr_url)
 	cd $(tmp_src) && wget -nd -r -l1 -np -A.orig.tar.gz http://debathena.mit.edu/apt/pool/debathena/d/debathena-moira/
 	cabal update
 	cabal fetch $(hackage)
 	cp -a $(hackage:%=~/.cabal/packages/*/*/*/%.tar.gz) $(tmp_src)
+	spectool -g -R $(specs)/python-zephyr.spec
 	touch download_stamp
 
@@ -139,28 +144,28 @@
 $(oursrc): rpmbuild_args += --define 'scriptsversion $(shell svnversion ${oursrcdir}/$** | tr ':' '_' | sed -e 's/-.*/0.uncommitted/')'
 
-$(filter %.i586,$(oursrc)): %.i586: setup
+$(filter %.i686,$(oursrc)): %.i686: 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-fc11-i386 --arch=i586 ${rpmbuild_args} --define="_lib lib" -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
-
-$(filter-out %.i586,$(oursrc)): %: setup
+	/usr/bin/mock -r scripts-fc13-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-fc11-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
+	/usr/bin/mock -r scripts-fc13-`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 ':' '_')'
 
-$(filter %.i586,$(upstream)): %.i586: setup patch-specs
-	rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
-	/usr/bin/mock -r scripts-fc11-i386 --arch=i586 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
-
-$(filter-out %.i586,$(upstream)): %: setup patch-specs
-	rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
-	/usr/bin/mock -r scripts-fc11-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
+$(filter %.i686,$(upstream)): %.i686: setup patch-specs
+	rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
+	/usr/bin/mock -r scripts-fc13-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-fc13-`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-fc11-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
+	/usr/bin/mock -r scripts-fc13-`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
@@ -172,22 +177,4 @@
 openafs-kernel: rpmbuild_args += $(openafs_rpmbuild_args) --define "build_userspace 0" --define "build_modules 1"
 
-suexec: #install-srpms
-	@rm -rf ${tmp_src}/httpd-2*/; \
-	tar zxvf ${tmp_src}/httpd-2*.tar.gz; \
-	cd httpd-2*; \
-	patch -p1 < ${patches}/httpd-suexec-scripts.patch; \
-	autoreconf; \
-	./configure --prefix=/etc/httpd --with-suexec-userdir=web_scripts --with-suexec-caller=apache --with-suexec-uidmin=50 --with-suexec-gidmin=50 --with-suexec-docroot=/ --with-suexec-trusteddir=/usr/libexec/scripts-trusted; \
-	pushd support; \
-	mkdir -p ${out_sbin}; make suexec && cp suexec ${out_sbin}; \
-	popd; \
-	rm -rf httpd-2*; \
-	echo; \
-	echo "suexec binary written to ${out_sbin}."; \
-	echo "Run 'make install-suexec' as root to install it.";
-
-install-suexec:
-	install -m 4510 -o 0 -g apache ${out_sbin}/suexec /usr/sbin/;
-
 frob-openafs:
 	@if [ ! -d "/etc/openafs/" ]; then \
@@ -199,17 +186,19 @@
 
 # The following packages are needed for our packages
-basic-deps	= kernel-devel rpm-build rpmdevtools mock gcc autoconf patch krb5-workstation glibc-devel.i586 glibc-devel libtool libgcc.i586
-oursrc-deps	= hesinfo openldap-clients openldap-devel.i586 php-devel
+basic-deps	= kernel-devel rpm-build rpmdevtools mock gcc autoconf patch krb5-workstation glibc-devel.i686 glibc-devel libtool libgcc.i686
+oursrc-deps	= hesinfo openldap-clients openldap-devel.i686 php-devel
 httpdmods-deps	= httpd-devel
 httpd-deps	= xmlto db4-devel expat-devel zlib-devel libselinux-devel apr-devel apr-util-devel pcre-devel openssl-devel distcache-devel
-krb5-deps	= bison ncurses-devel texinfo keyutils-libs-devel texinfo-tex texlive-latex
+krb5-deps	= bison ncurses-devel texinfo keyutils-libs-devel texinfo-tex texlive-latex libss-devel rsh
 openafs-deps	= pam-devel automake
-mit-zephyr-deps	= readline-devel hesiod-devel hesiod-devel.i586 hesiod.i586 libXt.i586 #compat-readline43
+moira-deps      = e2fsprogs-devel
+zephyr-deps	= hesiod-devel libss-devel krb5-devel readline-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 pango-devel cairo-devel libedit-devel nss-devel fipscheck-devel
 php-deps	= bzip2-devel curl-devel gmp-devel libstdc++-devel sqlite-devel gcc-c++ libc-client-devel mysql-devel postgresql-devel unixODBC-devel libxml2-devel net-snmp-devel libxslt-devel libxml2-devel libXpm-devel libjpeg-devel t1lib-devel libmcrypt-devel mhash-devel libtidy-devel freetds-devel aspell-devel recode-devel
 haskell-deps	= cabal-install
 install-deps:
-	yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(mit-zephyr-deps) $(openssh-deps) $(php-deps) $(haskell-deps)
-	rpm -ivh http://kojipkgs.fedoraproject.org/packages/compat-readline43/4.3/3/i386/compat-readline43-4.3-3.i386.rpm
+	yum -y install $(basic-deps) $(oursrc-deps) $(httpdmods-deps) $(httpd-deps) $(krb5-deps) $(openafs-deps) $(moira-deps) $(zephyr-deps) $(openssh-deps) $(php-deps) $(haskell-deps)
+# XXX: We need to figure out what's going on with compat-readline43
+#	rpm -ivh http://kojipkgs.fedoraproject.org/packages/compat-readline43/4.3/3/i386/compat-readline43-4.3-3.i386.rpm
 #	rpm -ivh http://download.fedora.redhat.com/pub/fedora/linux/core/6/i386/os/Fedora/RPMS/compat-readline43-4.3-3.i386.rpm
 
Index: trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf
===================================================================
--- trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf	(revision 1689)
+++ trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf	(revision 1693)
@@ -1,2 +1,2 @@
 ServerName scripts.mit.edu
-ServerAlias scripts 18.181.0.43 scripts-vhosts.mit.edu scripts-vhosts 18.181.0.46 scripts-test.mit.edu scripts-test 18.181.0.229 better-mousetrap.mit.edu better-mousetrap b-m.mit.edu b-m scripts1.mit.edu scripts1 18.181.0.57 old-faithful.mit.edu old-faithful o-f.mit.edu o-f scripts2.mit.edu scripts2 18.181.0.53 bees-knees.mit.edu bees-knees b-k.mit.edu b-k sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3 18.181.0.167 cats-whiskers.mit.edu cats-whiskers c-w.mit.edu c-w scripts4.mit.edu scripts4 18.181.0.228 pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 busy-beaver.mit.edu busy-beaver b-b.mit.edu b-b scripts7.mit.edu scripts7 18.181.0.234 real-mccoy.mit.edu real-mccoy r-m.mit.edu r-m scripts8.mit.edu scripts8 18.181.0.235 localhost 127.0.0.1 ::1
+ServerAlias scripts 18.181.0.43 scripts-vhosts.mit.edu scripts-vhosts 18.181.0.46 scripts-test.mit.edu scripts-test 18.181.0.229 better-mousetrap.mit.edu better-mousetrap b-m.mit.edu b-m scripts1.mit.edu scripts1 18.181.0.57 old-faithful.mit.edu old-faithful o-f.mit.edu o-f scripts2.mit.edu scripts2 18.181.0.53 bees-knees.mit.edu bees-knees b-k.mit.edu b-k sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3 18.181.0.167 cats-whiskers.mit.edu cats-whiskers c-w.mit.edu c-w scripts4.mit.edu scripts4 18.181.0.228 pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 busy-beaver.mit.edu busy-beaver b-b.mit.edu b-b scripts7.mit.edu scripts7 18.181.0.234 real-mccoy.mit.edu real-mccoy r-m.mit.edu r-m scripts8.mit.edu scripts8 18.181.0.235 w-e whole-enchilada w-e.mit.edu whole-enchilada.mit.edu 18.181.0.236 localhost 127.0.0.1 ::1
Index: trunk/server/fedora/config/etc/postfix/main.cf
===================================================================
--- trunk/server/fedora/config/etc/postfix/main.cf	(revision 1689)
+++ trunk/server/fedora/config/etc/postfix/main.cf	(revision 1693)
@@ -17,6 +17,6 @@
 recipient_delimiter = +
 inet_interfaces = all
-readme_directory = /usr/share/doc/postfix-2.5.6/README_FILES
-sample_directory = /usr/share/doc/postfix-2.5.6/samples
+readme_directory = /usr/share/doc/postfix-2.7.0/README_FILES
+sample_directory = /usr/share/doc/postfix-2.7.0/samples
 sendmail_path = /usr/sbin/sendmail
 html_directory = no
Index: trunk/server/fedora/config/etc/ssh/sshd_config
===================================================================
--- trunk/server/fedora/config/etc/ssh/sshd_config	(revision 1689)
+++ trunk/server/fedora/config/etc/ssh/sshd_config	(revision 1693)
@@ -5,4 +5,5 @@
 GSSAPIAuthentication yes
 GSSAPICleanupCredentials yes
+GSSAPIStrictAcceptorCheck no
 UsePAM yes
 AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES
Index: trunk/server/fedora/config/etc/sysconfig/openafs
===================================================================
--- trunk/server/fedora/config/etc/sysconfig/openafs	(revision 1689)
+++ trunk/server/fedora/config/etc/sysconfig/openafs	(revision 1693)
@@ -12,4 +12,6 @@
 	  Leonidas)
 	    /usr/bin/fs sysname 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
+	  Goddard)
+	    /usr/bin/fs sysname 'amd64_fedora13_scripts' 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora13' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2' ;;
 	  *)
 	    echo "Warning: unknown platform. AFS sysname not set."
Index: trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl
===================================================================
--- trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl	(revision 1689)
+++ trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl	(revision 1693)
@@ -115,4 +115,5 @@
 	} elsif ($message =~ m|^ *nrpe .* COMMAND=/etc/nagios/check_ldap_mmr.real$|) {
 	} elsif ($message =~ m|^ *root : TTY=|) {
+	} elsif ($message =~ m|^Set /proc/self/oom_adj to 0|) {
 	} else {
 	    sendmsg($message, "scripts-spew");
Index: trunk/server/fedora/config/etc/yum.repos.d/scripts.repo
===================================================================
--- trunk/server/fedora/config/etc/yum.repos.d/scripts.repo	(revision 1689)
+++ trunk/server/fedora/config/etc/yum.repos.d/scripts.repo	(revision 1693)
@@ -1,5 +1,5 @@
 [scripts]
 name=Scripts
-baseurl=http://web.mit.edu/scripts/rpm-fc11/
+baseurl=http://web.mit.edu/scripts/rpm-fc13/
 enabled=1
 gpgcheck=0
@@ -7,5 +7,5 @@
 [scripts-testing]
 name=Scripts Testing
-baseurl=http://web.mit.edu/scripts/rpm-fc11-testing/
+baseurl=http://web.mit.edu/scripts/rpm-fc13-testing/
 enabled=0
 gpgcheck=0
Index: trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec
===================================================================
--- trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec	(revision 1689)
+++ trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec	(revision 1693)
@@ -1,8 +1,17 @@
 %global pkg_name MonadCatchIO-mtl
 
-%bcond_without doc
-%bcond_without prof
+%global common_summary Haskell %{pkg_name} library
 
-# ghc does not emit debug information
+%global common_description A %{pkg_name} library for Haskell.
+
+# add any Haskell library dependencies here:
+%global ghc_pkg_deps ghc-mtl-devel
+
+# add any foreign library dependencies here:
+#%%global ghc_pkg_c_deps @CDEP1@-devel
+
+%bcond_without shared
+
+# debuginfo is not useful for ghc
 %global debug_package %{nil}
 
@@ -10,7 +19,7 @@
 Version:        0.3.0.1
 Release:        0.%{scriptsversion}%{?dist}
-Summary:        Haskell %{pkg_name} library
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
@@ -19,53 +28,17 @@
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
-%if %{with doc}
-BuildRequires:  ghc-doc
-%endif
-%if %{with prof}
-BuildRequires:  ghc-prof
-%endif
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.7.0
+%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
+%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 
 %description
-This package provides the Haskell %{pkg_name} library for ghc.
-
-
-%package devel
-Summary:        Haskell %{pkg_name} library
-Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
-
-%description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
-
-
-%if %{with doc}
-%package doc
-Summary:        Documentation for %{name}
-Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
-
-%description doc
-This package contains development documentation files for
-the %{name} library.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
 %endif
 
 
-%if %{with prof}
-%package prof
-Summary:        Profiling libraries for %{name}
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}
-
-%description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
-%endif
+%{?ghc_lib_package}
 
 
@@ -75,17 +48,10 @@
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
-%cabal build
-%if %{with doc}
-%cabal haddock
-%endif
-%ghc_gen_scripts
+%ghc_lib_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%ghc_install_scripts
-%ghc_gen_filelists %{name}
+%ghc_lib_install
 
 
@@ -94,46 +60,5 @@
 
 
-%post devel
-%ghc_register_pkg
-
-
-%if %{with doc}
-%post doc
-%ghc_reindex_haddock
-%endif
-
-
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
-
-
-%if %{with doc}
-%postun doc
-if [ "$1" -eq 0 ] ; then
-  %ghc_reindex_haddock
-fi
-%endif
-
-
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-#%{_docdir}/%{name}-%{version}
-
-
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
-
-
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
-
-
 %changelog
-* Mon Mar 15 2010 Anders Kaseorg <andersk@mit.edu> - 0.3.0.1-0
-- initial packaging for Fedora automatically generated by cabal2spec
+* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 0.3.0.1-0
+- initial packaging for Fedora automatically generated by cabal2spec-0.22.1
Index: trunk/server/fedora/specs/ghc-cgi.spec
===================================================================
--- trunk/server/fedora/specs/ghc-cgi.spec	(revision 1689)
+++ trunk/server/fedora/specs/ghc-cgi.spec	(revision 1693)
@@ -1,8 +1,17 @@
 %global pkg_name cgi
 
-%bcond_without doc
-%bcond_without prof
+%global common_summary Haskell %{pkg_name} library
 
-# ghc does not emit debug information
+%global common_description A %{pkg_name} library for Haskell.
+
+# add any Haskell library dependencies here:
+%global ghc_pkg_deps ghc-network-devel, ghc-parsec-devel, ghc-mtl-devel, ghc-MonadCatchIO-mtl-devel, ghc-xhtml-devel
+
+# add any foreign library dependencies here:
+#%%global ghc_pkg_c_deps @CDEP1@-devel
+
+%bcond_without shared
+
+# debuginfo is not useful for ghc
 %global debug_package %{nil}
 
@@ -10,7 +19,7 @@
 Version:        3001.1.8.1
 Release:        0.%{scriptsversion}%{?dist}
-Summary:        Haskell %{pkg_name} library
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
@@ -19,53 +28,17 @@
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros, ghc-MonadCatchIO-mtl-devel
-%if %{with doc}
-BuildRequires:  ghc-doc, ghc-MonadCatchIO-mtl-doc
-%endif
-%if %{with prof}
-BuildRequires:  ghc-prof, ghc-MonadCatchIO-mtl-prof
-%endif
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.7.0
+%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
+%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 
 %description
-This package provides the Haskell %{pkg_name} library for ghc.
-
-
-%package devel
-Summary:        Haskell %{pkg_name} library
-Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}, ghc-MonadCatchIO-mtl-devel
-Requires(post): ghc = %{ghc_version}, ghc-MonadCatchIO-mtl-devel
-Requires(preun): ghc = %{ghc_version}, ghc-MonadCatchIO-mtl-devel
-
-%description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
-
-
-%if %{with doc}
-%package doc
-Summary:        Documentation for %{name}
-Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}, ghc-MonadCatchIO-mtl-doc
-Requires(post): ghc-doc = %{ghc_version}, ghc-MonadCatchIO-mtl-doc
-Requires(postun): ghc-doc = %{ghc_version}, ghc-MonadCatchIO-mtl-doc
-
-%description doc
-This package contains development documentation files for
-the %{name} library.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
 %endif
 
 
-%if %{with prof}
-%package prof
-Summary:        Profiling libraries for %{name}
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}, ghc-MonadCatchIO-mtl-prof
-
-%description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
-%endif
+%{?ghc_lib_package}
 
 
@@ -75,17 +48,10 @@
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
-%cabal build
-%if %{with doc}
-%cabal haddock
-%endif
-%ghc_gen_scripts
+%ghc_lib_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%ghc_install_scripts
-%ghc_gen_filelists %{name}
+%ghc_lib_install
 
 
@@ -94,46 +60,5 @@
 
 
-%post devel
-%ghc_register_pkg
-
-
-%if %{with doc}
-%post doc
-%ghc_reindex_haddock
-%endif
-
-
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
-
-
-%if %{with doc}
-%postun doc
-if [ "$1" -eq 0 ] ; then
-  %ghc_reindex_haddock
-fi
-%endif
-
-
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
-
-
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
-
-
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
-
-
 %changelog
-* Mon Mar 15 2010 Anders Kaseorg <andersk@mit.edu> - 3001.1.8.1-0
-- initial packaging for Fedora automatically generated by cabal2spec
+* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 3001.1.8.1-0
+- initial packaging for Fedora automatically generated by cabal2spec-0.22.1
Index: trunk/server/fedora/specs/ghc-unix-handle.spec
===================================================================
--- trunk/server/fedora/specs/ghc-unix-handle.spec	(revision 1689)
+++ trunk/server/fedora/specs/ghc-unix-handle.spec	(revision 1693)
@@ -1,8 +1,17 @@
 %global pkg_name unix-handle
 
-%bcond_without doc
-%bcond_without prof
+%global common_summary Haskell %{pkg_name} library
 
-# ghc does not emit debug information
+%global common_description A %{pkg_name} library for Haskell.
+
+# add any Haskell library dependencies here:
+#%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel
+
+# add any foreign library dependencies here:
+#%%global ghc_pkg_c_deps @CDEP1@-devel
+
+%bcond_without shared
+
+# debuginfo is not useful for ghc
 %global debug_package %{nil}
 
@@ -10,7 +19,7 @@
 Version:        0.0.0
 Release:        0.%{scriptsversion}%{?dist}
-Summary:        Haskell %{pkg_name} library
+Summary:        %{common_summary}
 
-Group:          Development/Libraries
+Group:          System Environment/Libraries
 License:        BSD
 URL:            http://hackage.haskell.org/cgi-bin/hackage-scripts/package/%{pkg_name}
@@ -19,53 +28,17 @@
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
-%if %{with doc}
-BuildRequires:  ghc-doc
-%endif
-%if %{with prof}
-BuildRequires:  ghc-prof
-%endif
+BuildRequires:  ghc, ghc-doc, ghc-prof
+BuildRequires:  ghc-rpm-macros >= 0.7.0
+%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
+%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
 
 %description
-This package provides the Haskell %{pkg_name} library for ghc.
-
-
-%package devel
-Summary:        Haskell %{pkg_name} library
-Group:          Development/Libraries
-Requires:       ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
-
-%description devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
-
-
-%if %{with doc}
-%package doc
-Summary:        Documentation for %{name}
-Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
-
-%description doc
-This package contains development documentation files for
-the %{name} library.
+%{common_description}
+%if %{with shared}
+This package provides the shared library.
 %endif
 
 
-%if %{with prof}
-%package prof
-Summary:        Profiling libraries for %{name}
-Group:          Development/Libraries
-Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}
-
-%description prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
-%endif
+%{?ghc_lib_package}
 
 
@@ -75,17 +48,10 @@
 
 %build
-%cabal_configure --ghc %{?with_prof:-p}
-%cabal build
-%if %{with doc}
-%cabal haddock
-%endif
-%ghc_gen_scripts
+%ghc_lib_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
-%ghc_install_scripts
-%ghc_gen_filelists %{name}
+%ghc_lib_install
 
 
@@ -94,46 +60,5 @@
 
 
-%post devel
-%ghc_register_pkg
-
-
-%if %{with doc}
-%post doc
-%ghc_reindex_haddock
-%endif
-
-
-%preun devel
-if [ "$1" -eq 0 ] ; then
-  %ghc_unregister_pkg
-fi
-
-
-%if %{with doc}
-%postun doc
-if [ "$1" -eq 0 ] ; then
-  %ghc_reindex_haddock
-fi
-%endif
-
-
-%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}
-
-
-%if %{with doc}
-%files doc -f %{name}-doc.files
-%defattr(-,root,root,-)
-%endif
-
-
-%if %{with prof}
-%files prof -f %{name}-prof.files
-%defattr(-,root,root,-)
-%endif
-
-
 %changelog
-* Mon Mar 15 2010 Anders Kaseorg <andersk@mit.edu> - 0.0.0-0
-- initial packaging for Fedora automatically generated by cabal2spec
+* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 0.0.0-0
+- initial packaging for Fedora automatically generated by cabal2spec-0.22.1
Index: trunk/server/fedora/specs/ghostscript.spec.patch
===================================================================
--- trunk/server/fedora/specs/ghostscript.spec.patch	(revision 1689)
+++ 	(revision )
@@ -1,44 +1,0 @@
---- ghostscript.spec	2010-07-16 01:35:28.000000000 -0400
-+++ ghostscript.spec	2010-07-16 01:55:49.000000000 -0400
-@@ -5,7 +5,7 @@
- Name: ghostscript
- Version: %{gs_ver}
- 
--Release: 6%{?dist}
-+Release: 6.scripts%{scriptsversion}%{?dist}
- 
- # Included CMap data is Redistributable, no modification permitted,
- # see http://bugzilla.redhat.com/487510
-@@ -35,6 +35,8 @@
- Patch17: ghostscript-tiff-default-strip-size.patch
- Patch18: ghostscript-tiff-fixes.patch
- 
-+Patch100: ghostscript-CVE-2010-1628.patch
-+
- Requires: urw-fonts >= 1.1, ghostscript-fonts
- BuildRequires: xz
- BuildRequires: libjpeg-devel, libXt-devel
-@@ -151,6 +153,9 @@
- # Backported some more TIFF fixes (bug #573970).
- %patch18 -p1 -b .tiff-fixes
- 
-+# Avoid an exploitable overflow (scripts.mit.edu local patch).
-+%patch100 -p1 -b .CVE-2010-1628
-+
- # Convert manual pages to UTF-8
- from8859_1() {
- 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
-@@ -332,6 +337,13 @@
- %{_libdir}/libgs.so
- 
- %changelog
-+* Fri Jul 16 2010 Geoffrey Thomas <geofft@mit.edu> 8.71-6.scripts
-+- Include the patch
-+  http://bugs.ghostscript.com/attachment.cgi?id=6350
-+  to fix CVE-2010-1628 (potential arbitrary code execution via
-+  an overflow), from the upstream bug report:
-+  http://bugs.ghostscript.com/show_bug.cgi?id=691295
-+
- * Tue Mar 16 2010 Tim Waugh <twaugh@redhat.com> 8.71-6
- - Backported some more TIFF fixes (bug #573970).
- - Use upstream fix for TIFF default strip size (bug #571520).
Index: trunk/server/fedora/specs/httpd.spec.patch
===================================================================
--- trunk/server/fedora/specs/httpd.spec.patch	(revision 1689)
+++ trunk/server/fedora/specs/httpd.spec.patch	(revision 1693)
@@ -1,10 +1,10 @@
---- httpd.spec.orig	2010-08-26 21:00:40.771666965 -0400
-+++ httpd.spec	2010-08-26 21:01:56.601668199 -0400
+--- httpd.spec.orig	2010-07-27 11:55:33.000000000 -0400
++++ httpd.spec	2010-09-06 20:45:28.000000000 -0400
 @@ -7,7 +7,7 @@
  Summary: Apache HTTP Server
  Name: httpd
- Version: 2.2.15
--Release: 1%{?dist}.1
-+Release: 1%{?dist}.1.scripts.%{scriptsversion}
+ Version: 2.2.16
+-Release: 1%{?dist}
++Release: 1%{?dist}.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -33,5 +33,5 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -102,6 +111,7 @@
+@@ -103,6 +112,7 @@
  Requires(post): openssl >= 0.9.7f-4, /bin/cat
  Requires(pre): httpd
@@ -41,5 +41,5 @@
  
  %description -n mod_ssl
-@@ -129,6 +139,13 @@
+@@ -130,6 +140,13 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -55,5 +55,5 @@
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -177,10 +194,12 @@
+@@ -178,10 +195,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
  	--enable-suexec --with-suexec \
Index: trunk/server/fedora/specs/krb5.spec.patch
===================================================================
--- trunk/server/fedora/specs/krb5.spec.patch	(revision 1689)
+++ trunk/server/fedora/specs/krb5.spec.patch	(revision 1693)
@@ -1,16 +1,16 @@
---- krb5.spec.orig	2010-05-18 14:16:44.000000000 -0400
-+++ krb5.spec	2010-05-20 10:20:32.000000000 -0400
-@@ -16,7 +16,7 @@
- Summary: The Kerberos network authentication system.
+--- rpmbuild/SPECS/krb5.spec.orig	2010-08-25 11:36:57.000000000 -0400
++++ rpmbuild/SPECS/krb5.spec	2010-09-12 20:47:47.000000000 -0400
+@@ -10,7 +10,7 @@
+ Summary: The Kerberos network authentication system
  Name: krb5
- Version: 1.6.3
--Release: 31%{?dist}
-+Release: 31%{?dist}.scripts.%{scriptsversion}
+ Version: 1.7.1
+-Release: 13%{?dist}
++Release: 13%{?dist}.scripts.%{scriptsversion}
  # Maybe we should explode from the now-available-to-everybody tarball instead?
- # http://web.mit.edu/kerberos/dist/krb5/1.6/krb5-1.6.2-signed.tar
+ # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7.1-signed.tar
  Source0: krb5-%{version}.tar.gz
-@@ -114,6 +114,8 @@
- Patch88: krb5-1.6.1-cs22427.patch
- Patch89: krb5-CVE-2010-1321-1.6.1.patch
+@@ -92,6 +92,8 @@
+ Patch103: krb5-1.7.1-24139.patch
+ Patch104: krb5-1.7.1-explife.patch
  
 +Patch1000: krb5-kuserok-scripts.patch
@@ -19,18 +19,18 @@
  URL: http://web.mit.edu/kerberos/www/
  Group: System Environment/Libraries
-@@ -155,6 +157,7 @@
+@@ -136,6 +138,7 @@
+ %package libs
+ Summary: The shared libraries used by Kerberos 5
  Group: System Environment/Libraries
- Prereq: grep, /sbin/ldconfig, sh-utils
- Obsoletes: krb5-configs
 +Provides: scripts-krb5-libs
  
  %description libs
  Kerberos is a network authentication system. The krb5-libs package
-@@ -1478,6 +1481,7 @@
- %patch87 -p0 -b .kpasswd_ipv6
- %patch88 -p0 -b .cs22427
- %patch89 -p1 -b .CVE-2010-1321
+@@ -1654,6 +1657,7 @@
+ %patch102 -p1 -b .CVE-2010-1321
+ %patch103 -p1 -b .24139
+ %patch104 -p0 -b .explife
 +%patch1000 -p1 -b .kuserok
- cp src/krb524/README README.krb524
  gzip doc/*.ps
  
+ sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
Index: trunk/server/fedora/specs/libpng.spec.patch
===================================================================
--- trunk/server/fedora/specs/libpng.spec.patch	(revision 1689)
+++ 	(revision )
@@ -1,24 +1,0 @@
---- libpng.spec	2010-03-15 13:26:15.000000000 -0400
-+++ libpng.spec	2010-07-14 00:07:10.000000000 -0400
-@@ -1,8 +1,8 @@
- Summary: A library of functions for manipulating PNG image format files
- Name: libpng
- Epoch: 2
--Version: 1.2.43
--Release: 1%{?dist}
-+Version: 1.2.44
-+Release: 1.scripts.%{scriptsversion}%{?dist}
- License: zlib
- Group: System Environment/Libraries
- URL: http://www.libpng.org/pub/png/
-@@ -94,6 +94,10 @@
- rm -rf $RPM_BUILD_ROOT
- 
- %changelog
-+* Tue Jul 13 2010 Geoffrey Thomas <geofft@mit.edu> 2:1.2.44-1
-+- Update to libpng 1.2.44, includes fixes for CVE-2010-1205 and CVE-2010-2249
-+  (This is equivalent to Tom Lane's 2:1.2.44-1 change from non-EOL'd distros)
-+
- * Mon Mar 15 2010 Tom Lane <tgl@redhat.com> 2:1.2.43-1
- - Update to libpng 1.2.43, includes fix for CVE-2010-0205
- Related: #566234
Index: trunk/server/fedora/specs/mit-zephyr.spec.patch
===================================================================
--- trunk/server/fedora/specs/mit-zephyr.spec.patch	(revision 1689)
+++ 	(revision )
@@ -1,10 +1,0 @@
---- mit-zephyr.spec	2006-08-10 10:32:01.000000000 -0400
-+++ mit-zephyr.spec.new	2007-01-14 15:43:04.000000000 -0500
-@@ -67,7 +67,6 @@
- Source1: zhm.init
- URL: http://web.mit.edu/afs/dev.mit.edu/source/src-current/athena/lib/zephyr/
- Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
--Requires: mit-krb-config
- BuildPreReq: readline-devel, ncurses-devel
- %if %{redhat}=="yes"
- Requires: hesiod, krb5-libs
Index: trunk/server/fedora/specs/openafs.spec.patch
===================================================================
--- trunk/server/fedora/specs/openafs.spec.patch	(revision 1689)
+++ trunk/server/fedora/specs/openafs.spec.patch	(revision 1693)
@@ -1,14 +1,14 @@
---- openafs.spec.orig
-+++ openafs.spec
+--- openafs.spec.orig	2010-09-10 18:21:53.000000000 -0400
++++ openafs.spec	2010-09-10 18:34:30.000000000 -0400
 @@ -8,7 +8,7 @@
  # for beta/rc releases make pkgrel 0.X.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
  #%define pkgrel 0.1.rc1
--%define pkgrel 1.1
-+%define pkgrel 1.1.99scripts.%{scriptsversion}
+-%define pkgrel 0.pre3
++%define pkgrel 0.pre3.99scripts.%{scriptsversion}
  
  %if %{?osvers:0}%{!?osvers:1}
  %define osvers 1
-@@ -261,6 +261,11 @@
+@@ -261,6 +261,10 @@
  %endif
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
@@ -17,18 +17,17 @@
 +Patch1003: openafs-localcsdb.patch
 +Patch1005: openafs-numsysnames.patch
-+Patch1006: openafs-release-glock.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
-@@ -343,6 +348,7 @@
+@@ -343,6 +347,7 @@
  %if %{build_userspace}
  
  %package client
 +Provides: scripts-openafs-client
- Requires: binutils, openafs = %{PACKAGE_VERSION}
+ Requires: binutils, openafs = %{version}
  
  %if %{fedorakmod}
-@@ -403,6 +409,7 @@
+@@ -403,6 +408,7 @@
  
  %if %{build_authlibs}
@@ -38,5 +37,5 @@
  Group: Networking/Filesystems
  
-@@ -419,6 +426,7 @@
+@@ -419,6 +425,7 @@
  %endif
  
@@ -44,7 +43,7 @@
 +Provides: scripts-openafs-authlibs-devel
  %if %{build_authlibs}
- Requires: openafs-authlibs = %{PACKAGE_VERSION}
+ Requires: openafs-authlibs = %{version}
  %endif
-@@ -437,6 +445,7 @@
+@@ -437,6 +444,7 @@
  libraries.
  
@@ -54,5 +53,5 @@
  Group: Development/Filesystems
  
-@@ -465,6 +474,7 @@
+@@ -465,6 +473,7 @@
  administrators.
  
@@ -61,6 +60,6 @@
  Summary: OpenAFS Kernel Module source tree
  Group: Networking/Filesystems
- Provides: openafs-kernel = %{PACKAGE_VERSION}
-@@ -514,6 +524,7 @@
+ Provides: openafs-kernel = %{version}
+@@ -514,6 +523,7 @@
  
  %if %{krb5support}
@@ -68,7 +67,7 @@
 +Provides: scripts-openafs-krb5
  Summary: OpenAFS programs to use with krb5
- Requires: openafs = %{PACKAGE_VERSION}
+ Requires: openafs = %{version}
  Group: Networking/Filesystems
-@@ -540,7 +551,7 @@
+@@ -540,7 +550,7 @@
  %if %{build_modules}
  
@@ -79,5 +78,5 @@
  %else
  
-@@ -699,6 +710,10 @@
+@@ -699,6 +709,9 @@
  
  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
@@ -86,23 +85,5 @@
 +%patch1003 -p1 -b .localcsdb
 +%patch1005 -p1 -b .numsysnames
-+%patch1006 -p1 -b .release-glock
  
  ##############################################################################
  #
-@@ -1209,7 +1224,7 @@
- rm -rf $RPM_BUILD_ROOT%{_sbindir}/kdump*
- 
- # remove man pages from programs deleted above
--for f in 1/dlog 1/dpass 1/livesys 1/xstat_cm_test 1/xstat_fs_test 8/kdb 8/kpwvalid 8/xfs_size_check 1/package_test 5/package 8/package ; do
-+for f in 1/compile_et 1/dlog 1/dpass 1/livesys 1/xstat_cm_test 1/xstat_fs_test 8/kdb 8/kpwvalid 8/xfs_size_check 1/package_test 5/package 8/package ; do
-   rm -f $RPM_BUILD_ROOT%{_mandir}/man$f.*
- done
- 
-@@ -1569,7 +1584,6 @@
- %{_libdir}/librxstat.a
- %{_libdir}/libubik.a
- %{_mandir}/man1/rxgen.*
--%{_mandir}/man1/compile_et.*
- 
- %if %{build_dkmspkg}
- %files -n dkms-%{name}
Index: trunk/server/fedora/specs/openssh.spec.patch
===================================================================
--- trunk/server/fedora/specs/openssh.spec.patch	(revision 1689)
+++ trunk/server/fedora/specs/openssh.spec.patch	(revision 1693)
@@ -1,23 +1,22 @@
---- openssh.spec.orig	2010-03-30 02:27:53.000000000 -0400
-+++ openssh.spec	2010-03-30 02:30:09.000000000 -0400
-@@ -63,7 +63,7 @@
+--- openssh.spec.orig	2010-05-31 06:20:02.000000000 -0400
++++ openssh.spec	2010-09-06 21:53:21.000000000 -0400
+@@ -74,7 +74,7 @@
  Summary: An open source implementation of SSH protocol versions 1 and 2
  Name: openssh
- Version: 5.2p1
--Release: 6%{?dist}%{?rescue_rel}
-+Release: 6%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
+ Version: 5.4p1
+-Release: %{openssh_rel}%{?dist}%{?rescue_rel}
++Release: %{openssh_rel}%{?dist}%{?rescue_rel}.scripts.%{scriptsversion}
  URL: http://www.openssh.com/portable.html
+ #URL1: http://pamsshagentauth.sourceforge.net
  #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
- #Source1: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz.asc
-@@ -74,6 +74,8 @@
- Source1: openssh-nukeacss.sh
- Source2: sshd.pam
+@@ -88,6 +88,7 @@
  Source3: sshd.init
-+Patch1000: openssh-5.0p1-multihomed.patch
+ Source4: http://prdownloads.sourceforge.net/pamsshagentauth/pam_ssh_agent_auth/pam_ssh_agent_auth-%{pam_ssh_agent_ver}.tar.bz2
+ Source5: pam_ssh_agent-rmheaders
 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
- Patch0: openssh-5.2p1-redhat.patch
- Patch2: openssh-5.1p1-skip-initial.patch
- Patch3: openssh-3.8.1p1-krb5-config.patch
-@@ -161,6 +163,7 @@
+ Patch0: openssh-5.4p1-redhat.patch
+ Patch2: openssh-5.3p1-skip-initial.patch
+ Patch4: openssh-5.2p1-vendor.patch
+@@ -175,6 +177,7 @@
  Requires(post): chkconfig >= 0.9, /sbin/service
  Requires(pre): /usr/sbin/useradd
@@ -27,9 +26,8 @@
  %package askpass
  Summary: A passphrase dialog for OpenSSH and X
-@@ -231,6 +234,9 @@
- %patch65 -p1 -b .fips
- %patch67 -p1 -b .selabel
+@@ -267,6 +270,8 @@
+ %patch75 -p1 -b .dso
+ %patch76 -p1 -b .bz595935
  
-+%patch1000 -p1 -b .multihomed
 +%patch1001 -p1 -b .gssapi-env
 +
Index: trunk/server/fedora/specs/python-zephyr.spec
===================================================================
--- trunk/server/fedora/specs/python-zephyr.spec	(revision 1693)
+++ trunk/server/fedora/specs/python-zephyr.spec	(revision 1693)
@@ -0,0 +1,50 @@
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+
+Name:           python-zephyr
+Version:        0.2.0
+%define commit_hash c9a7f05
+%define tag_hash ed65206
+Release:        0.%{scriptsversion}%{?dist}
+Summary:        Python access to zephyr library
+
+Group:          Development/Languages
+License:        MIT
+URL:            http://github.com/ebroder/python-zephyr
+Source0:        http://github.com/ebroder/python-zephyr/tarball/%{version}/ebroder-%{name}-%{version}-0-g%{commit_hash}.tar.gz
+Patch1:         http://github.com/ebroder/python-zephyr/commit/944b3c3a2a2476758268d4b75b65c2ec38fa46e7.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  python-devel, python-setuptools, Pyrex, zephyr-devel, libcom_err-devel
+
+%description
+Get at the zephyr library from Python.  Woo.
+
+
+%prep
+%setup -q -n ebroder-%{name}-%{tag_hash}
+%patch1 -p1
+
+
+%build
+CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="-I%{_includedir}/et" %{__python} setup.py build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
+ 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc
+%{python_sitearch}/*
+
+
+%changelog
+* Sun Sep 19 2010 Anders Kaseorg <andersk@mit.edu> - 0.2.0-0
+- Initial RPM release
+
Index: trunk/server/fedora/specs/scripts-base.spec
===================================================================
--- trunk/server/fedora/specs/scripts-base.spec	(revision 1689)
+++ trunk/server/fedora/specs/scripts-base.spec	(revision 1693)
@@ -9,5 +9,5 @@
 Source: %{name}.tar.gz 
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
-Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, php_scripts, scripts-shadow-utils
+Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, php_scripts, zephyr, httpdmods, nss_nonlocal, nss_nonlocal.i686
 %define debug_package %{nil}
 
Index: trunk/server/fedora/specs/scripts-static-cat.spec
===================================================================
--- trunk/server/fedora/specs/scripts-static-cat.spec	(revision 1689)
+++ trunk/server/fedora/specs/scripts-static-cat.spec	(revision 1693)
@@ -1,2 +1,6 @@
+# link with shared libs
+# andersk: Disabled for 3x faster startup speed.
+#%%bcond_without dynamic
+
 # ghc does not emit debug information
 %global debug_package %{nil}
@@ -14,5 +18,7 @@
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros, ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel
+BuildRequires:  ghc
+BuildRequires:  ghc-rpm-macros >= 0.7.0
+BuildRequires:  ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel
 
 %description
@@ -25,11 +31,10 @@
 
 %build
-%cabal_configure --ghc
-%cabal build
+%ghc_bin_build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
+%ghc_bin_install
 
 
@@ -44,4 +49,4 @@
 
 %changelog
-* Sun Mar 14 2010 Anders Kaseorg <andersk@mit.edu> - 0.0-0
-- initial packaging for Fedora automatically generated by cabal2spec
+* Thu Sep  9 2010 Anders Kaseorg <andersk@mit.edu> - 0.0-0
+- initial packaging for Fedora automatically generated by cabal2spec-0.22.1
Index: trunk/server/fedora/specs/shadow-utils.spec.patch
===================================================================
--- trunk/server/fedora/specs/shadow-utils.spec.patch	(revision 1689)
+++ 	(revision )
@@ -1,39 +1,0 @@
---- shadow-utils.spec.orig	2010-03-12 00:48:00.000000000 -0500
-+++ shadow-utils.spec	2010-03-12 00:55:36.000000000 -0500
-@@ -1,7 +1,7 @@
- Summary: Utilities for managing accounts and shadow password files
- Name: shadow-utils
- Version: 4.1.4.1
--Release: 5%{?dist}
-+Release: 5.scripts.%{scriptsversion}%{?dist}
- Epoch: 2
- URL: http://pkg-shadow.alioth.debian.org/
- Source0: ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-%{version}.tar.bz2
-@@ -21,6 +21,7 @@
- Requires: audit-libs >= 1.6.5
- Requires: setup
- Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-+Provides: scripts-shadow-utils
- 
- %description
- The shadow-utils package includes the necessary programs for
-@@ -60,7 +61,8 @@
-         --with-selinux \
-         --without-libcrack \
-         --without-libpam \
--        --disable-shared
-+        --disable-shared \
-+        --with-group-name-max-length=32
- make
- 
- %install
-@@ -182,6 +184,9 @@
- %{_mandir}/man8/vigr.8*
- 
- %changelog
-+* Fri Mar 12 2010 Mitchell Berger <mitchb@mit.edu> 2:4.1.4.1-5.scripts
-+- change max group name length back to 32
-+
- * Wed Aug 05 2009 Peter Vrabec <pvrabec@redhat.com> 2:4.1.4.1-5
- - increase threshold for uid/gid reservations to 200 (#515667)
- 
Index: trunk/server/fedora/specs/zephyr.spec
===================================================================
--- trunk/server/fedora/specs/zephyr.spec	(revision 1693)
+++ trunk/server/fedora/specs/zephyr.spec	(revision 1693)
@@ -0,0 +1,147 @@
+Name:           zephyr
+Version:        3.0
+Release:        0.%{scriptsversion}%{?dist}
+Summary:        Client programs for the Zephyr real-time messaging system
+
+Group:          Applications/Communications
+License:        MIT
+URL:            http://zephyr.1ts.org/
+Source0:        http://zephyr.1ts.org/export/HEAD/distribution/%{name}-%{version}.tar.gz
+Source1:        zhm.init
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  krb5-devel hesiod-devel libss-devel libcom_err-devel readline-devel bison
+Requires:       %{name}-libs = %{version}-%{release}
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
+
+%description
+Zephyr is an institutional/enterprise-scale distributed real-time messaging and
+notification system.  Zephyr's design choices seem to imbue it with a specific
+culture.  It is impossible to explain what Zephyr is, you must experience it
+for yourself.
+
+
+%package        server
+Summary:        Server for the Zephyr real-time messaging system
+Group:          System Environment/Daemons
+
+Requires:       %{name}-libs = %{version}-%{release}
+
+%description    server
+The %{name}-server package contains the server daemon for the Zephyr
+messaging service.  It maintains a location and subscription database
+for all the receiving clients, and routes all zephyrgrams to the
+intended recipients.
+
+
+%package        libs
+Summary:        Shared libraries for Zephyr real-time messaging system
+Group:          System Environment/Libraries
+
+%description    libs
+The %{name}-libs package contains shared libraries for applications
+that use %{name}.
+
+
+%package        devel
+Summary:        Development files for Zephyr real-time messaging system
+Group:          Development/Libraries
+
+Requires:       %{name}-libs = %{version}-%{release}, libcom_err-devel
+
+%description    devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q
+cp -p %{SOURCE1} .
+
+
+%build
+# Mitch wants to make an awesome specfile which makes hesiod/krb5 and friends
+# all fully configurable.  This configure line will have to do for now.
+%configure --with-hesiod --with-krb5 --disable-static
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir}
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+mkdir -p $RPM_BUILD_ROOT%{_initddir}
+install -m755 zhm.init \
+        $RPM_BUILD_ROOT%{_initddir}/zhm
+
+
+%post
+/sbin/chkconfig --add zhm
+
+
+%preun
+if [ $1 = 0 ] ; then
+    /sbin/service zhm stop >/dev/null 2>&1
+    /sbin/chkconfig --del zhm
+fi
+
+
+%postun
+if [ "$1" -ge "1" ] ; then
+    /sbin/service zhm condrestart >/dev/null 2>&1 || :
+fi
+
+
+%post           libs -p /sbin/ldconfig
+
+%postun         libs -p /sbin/ldconfig
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc README USING
+%{_bindir}/*
+%{_sbindir}/zhm
+%{_sbindir}/zshutdown_notify
+%{_mandir}/man1/*
+%{_mandir}/man8/zhm.8*
+%{_mandir}/man8/zstat.8*
+%{_mandir}/man8/zshutdown_notify.8*
+%{_datadir}/zephyr
+%{_initddir}/zhm
+
+
+%files          server
+%doc OPERATING
+%{_sysconfdir}/zephyr
+%{_sbindir}/zephyrd
+%{_mandir}/man8/zephyrd.8*
+
+
+%files          libs
+%{_libdir}/*.so.*
+
+
+%files          devel
+%{_libdir}/*.so
+%{_includedir}/*
+
+
+%changelog
+* Sun Sep 19 2010 Anders Kaseorg <andersk@mit.edu> - 3.0-0
+- Decrease version below a hypothetical Fedora package.
+- Split out -server, -libs, and -devel into subpackages.
+- Disable the static library and remove the libtool archive.
+
+* Thu Sep 09 2010 Edward Z. Yang <ezyang@mit.edu> 3.0-1
+- Initial packaging release, superseding mit-zephyr.
Index: trunk/server/fedora/specs/zhm.init
===================================================================
--- trunk/server/fedora/specs/zhm.init	(revision 1693)
+++ trunk/server/fedora/specs/zhm.init	(revision 1693)
@@ -0,0 +1,107 @@
+#!/bin/sh
+#
+# zhm          Startup script for Zephyr Host Manager
+#
+# chkconfig:   - 20 80
+# description: The Zephyr Host Manager coordinates all incoming
+#              and outgoing messages for a given host.  If it
+#              is not running, you will not be able to send or
+#              receive Zephyr messages.
+
+# XXX needs configuration file support
+
+# XXX this needs to be audited
+### BEGIN INIT INFO
+# Provides: zhm
+# Required-Start: $local_fs $remote_fs $network $named
+# Required-Stop: $local_fs $remote_fs $network
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop Zephyr Host Manager
+# Description: The Zephyr Host Manager coordinates all incoming
+#              and outgoing messages for a given host.
+### END INIT INFO
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+exec="/usr/sbin/zhm"
+prog="zhm"
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+start() {
+    [ -x $exec ] || exit 5
+    echo -n $"Starting $prog: "
+    daemon $exec
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
+}
+
+stop() {
+    echo -n $"Stopping $prog: "
+    killproc $prog
+    retval=$?
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+    restart
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    # run checks to determine if the service is running or use generic status
+    status $prog
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
+}
+
+
+case "$1" in
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+        ;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    status)
+        rh_status
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
+esac
+exit $?