Index: branches/fc17-dev/server/fedora/Makefile
===================================================================
--- branches/fc17-dev/server/fedora/Makefile	(revision 2198)
+++ branches/fc17-dev/server/fedora/Makefile	(revision 2202)
@@ -40,5 +40,5 @@
 server_url	= "http://web.mit.edu/scripts/src"
 server_arch	= "fedora.stable"
-openafs_url	= "http://dl.openafs.org/dl/openafs/1.6.0/openafs-1.6.0-1.src.rpm"
+openafs_url	= "http://dl.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-1.src.rpm"
 zephyr_url	= "http://zephyr.1ts.org/export/HEAD/distribution/zephyr-3.0.1.tar.gz"
 
@@ -73,5 +73,5 @@
 	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)
+	cabal fetch --no-dependencies $(hackage)
 	cp -a $(hackage:%=~/.cabal/packages/*/*/*/%.tar.gz) $(tmp_src)
 	spectool -g -R $(specs)/python-zephyr.spec
Index: branches/fc17-dev/server/fedora/specs/openafs-include-xstat.spec.patch
===================================================================
--- branches/fc17-dev/server/fedora/specs/openafs-include-xstat.spec.patch	(revision 2198)
+++ 	(revision )
@@ -1,38 +1,0 @@
---- openafs.spec.orig	2011-11-04 23:50:34.842221577 -0400
-+++ openafs.spec	2011-11-04 23:52:00.538590290 -0400
-@@ -1103,7 +1103,7 @@
- 
- # create list of man pages that go in the 'openafs' package
- /bin/ls $RPM_BUILD_ROOT%{_mandir}/man1 \
--	|egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^restorevol|^rxdebug|scout|^sys|tokens|translate|udebug|unlog|^uss|^vos' \
-+	|egrep '^afs|^fs|^kas|^klog|kapasswd|pagsh|^pts|^restorevol|^rxdebug|scout|^sys|tokens|translate|^xstat|udebug|unlog|^uss|^vos' \
- 	|egrep -v '^afs_compile_et' \
- 	>openafs-man1files
- 
-@@ -1134,6 +1134,8 @@
- %{_bindir}/tokens
- %{_bindir}/tokens.krb
- %{_bindir}/translate_et
-+%{_bindir}/xstat_cm_test
-+%{_bindir}/xstat_fs_test
- %{_bindir}/udebug
- %{_bindir}/unlog
- %{_sbindir}/backup
-@@ -1184,7 +1186,7 @@
- done
- 
- # the rest are not needed.
--for f in dlog dpass install knfs livesys xstat_cm_test xstat_fs_test ; do
-+for f in dlog dpass install knfs livesys ; do
-   rm -f $RPM_BUILD_ROOT%{_bindir}/$f
- done
- 
-@@ -1196,7 +1198,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/dlog 1/dpass 1/livesys 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
- 
Index: branches/fc17-dev/server/fedora/specs/openafs-systemd.spec.patch
===================================================================
--- branches/fc17-dev/server/fedora/specs/openafs-systemd.spec.patch	(revision 2198)
+++ 	(revision )
@@ -1,191 +1,0 @@
---- openafs.spec.orig	2011-12-11 04:48:08.257676312 -0500
-+++ openafs.spec	2011-12-11 04:49:43.101175888 -0500
-@@ -225,6 +225,9 @@
- Packager: OpenAFS Gatekeepers <openafs-gatekeepers@openafs.org>
- Group: Networking/Filesystems
- BuildRequires: %{?kdepend:%{kdepend}, } pam-devel, ncurses-devel, flex, bison
-+%if 0%{?fedora} >= 15
-+BuildRequires: systemd-units
-+%endif
- %if 0%{?fedora}
- BuildRequires: perl-devel perl-ExtUtils-Embed
- %endif
-@@ -326,6 +329,12 @@
- %package client
- Provides: scripts-openafs-client
- Requires: binutils, openafs = %{version}
-+%if 0%{?fedora} >= 15
-+Requires: systemd-units
-+Requires(post): systemd-units, systemd-sysv
-+Requires(preun): systemd-units
-+Requires(postun): systemd-units
-+%endif
- 
- %if %{fedorakmod}
- Requires: %{name}-kmod >= %{version}
-@@ -350,6 +359,12 @@
- Requires: openafs = %{version}
- Summary: OpenAFS Filesystem Server
- Group: Networking/Filesystems
-+%if 0%{?fedora} >= 15
-+Requires: systemd-units
-+Requires(post): systemd-units, systemd-sysv
-+Requires(preun): systemd-units
-+Requires(postun): systemd-units
-+%endif
- 
- %description server
- The AFS distributed filesystem.  AFS is a distributed filesystem
-@@ -1005,7 +1020,12 @@
- mkdir -p $RPM_BUILD_ROOT%{_sbindir}
- mkdir -p $RPM_BUILD_ROOT%{_libdir}
- mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-+%if 0%{?fedora} < 15
- mkdir -p $RPM_BUILD_ROOT%{initdir}
-+%else
-+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules
-+%endif
- mkdir -p $RPM_BUILD_ROOT/etc/openafs
- mkdir -p $RPM_BUILD_ROOT%{pamdir}
- mkdir -p $RPM_BUILD_ROOT%{_prefix}/afs/etc
-@@ -1035,8 +1055,14 @@
- 
- # Copy root.client config files
- install -m 755 src/packaging/RedHat/openafs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/openafs
-+%if 0%{?fedora} < 15
- install -m 755 src/packaging/RedHat/openafs-client.init $RPM_BUILD_ROOT%{initdir}/openafs-client
- install -m 755 src/packaging/RedHat/openafs-server.init $RPM_BUILD_ROOT%{initdir}/openafs-server
-+%else
-+install -m 755 src/packaging/RedHat/openafs-client.service $RPM_BUILD_ROOT%{_unitdir}/openafs-client.service
-+install -m 755 src/packaging/RedHat/openafs-client.modules $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/openafs-client.modules
-+install -m 755 src/packaging/RedHat/openafs-server.service $RPM_BUILD_ROOT%{_unitdir}/openafs-server.service
-+%endif
- 
- # Copy PAM modules
- install -m 755 ${sysname}/dest/lib/pam* $RPM_BUILD_ROOT%{pamdir}
-@@ -1318,7 +1344,14 @@
- fi
- 
- %post client
-+%if 0%{?fedora} < 15
- chkconfig --add openafs-client
-+%else
-+if [ $1 -eq 1 ] ; then 
-+    # Initial installation 
-+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-+fi
-+%endif
- if [ ! -d /afs ]; then
- 	mkdir /afs
- 	chown root.root /afs
-@@ -1335,10 +1368,17 @@
- 
- %post server
- #on an upgrade, don't enable if we were disabled
-+%if 0%{?fedora} < 15
- if [ $1 = 1 ] ; then
-   chkconfig --add openafs-server
- fi
- %{initdir}/openafs-server condrestart
-+%else
-+if [ $1 -eq 1 ] ; then 
-+    # Initial installation 
-+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-+fi
-+%endif
- 
- %if %{build_authlibs}
- %post authlibs
-@@ -1354,16 +1394,39 @@
- fi
- 
- %preun client
-+%if 0%{?fedora} < 15
- if [ $1 = 0 ] ; then
-         %{initdir}/openafs-client stop
-         chkconfig --del openafs-client
- fi
-+%else
-+if [ $1 -eq 0 ] ; then
-+    	# Package removal, not upgrade
-+    	/bin/systemctl --no-reload disable openafs-client.service > /dev/null 2>&1 || :
-+    	/bin/systemctl stop openafs-client.service > /dev/null 2>&1 || :
-+fi
-+%endif
- 
- %preun server
-+%if 0%{?fedora} < 15
- if [ $1 = 0 ] ; then
-         %{initdir}/openafs-server stop
-         chkconfig --del openafs-server
- fi
-+%else
-+if [ $1 -eq 0 ] ; then
-+    	/bin/systemctl --no-reload disable openafs-server.service > /dev/null 2>&1 || :
-+    	/bin/systemctl stop openafs-server.service > /dev/null 2>&1 || :
-+fi
-+%endif
-+
-+%if 0%{?fedora} >= 15
-+%postun client
-+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-+
-+%postun server
-+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-+%endif
- 
- %if %{build_dkmspkg}
- %post -n dkms-%{name}
-@@ -1421,6 +1484,26 @@
- %endif
- %endif
- 
-+%if 0%{?fedora} >= 15
-+%triggerun -- openafs-client < 1.6.0-1
-+# Save the current service runlevel info
-+# User must manually run systemd-sysv-convert --apply httpd
-+# to migrate them to systemd targets
-+/usr/bin/systemd-sysv-convert --save openafs-client >/dev/null 2>&1 ||:
-+
-+# Run this because the SysV package being removed won't do it
-+/sbin/chkconfig --del openafs-client >/dev/null 2>&1 || :
-+
-+%triggerun -- openafs-server < 1.6.0-1
-+# Save the current service runlevel info
-+# User must manually run systemd-sysv-convert --apply httpd
-+# to migrate them to systemd targets
-+/usr/bin/systemd-sysv-convert --save openafs-server >/dev/null 2>&1 ||:
-+
-+# Run this because the SysV package being removed won't do it
-+/sbin/chkconfig --del openafs-server >/dev/null 2>&1 || :
-+%endif
-+
- ##############################################################################
- ###
- ### file lists
-@@ -1458,7 +1541,12 @@
- %{pamdir}/pam_afs.krb.so
- %{pamdir}/pam_afs.so.1
- %{pamdir}/pam_afs.so
-+%if 0%{?fedora} < 15
- %{initdir}/openafs-client
-+%else
-+%{_unitdir}/openafs-client.service
-+%{_sysconfdir}/sysconfig/modules/openafs-client.modules
-+%endif
- %{_mandir}/man1/cmdebug.*
- %{_mandir}/man1/copyauth.*
- %{_mandir}/man1/up.*
-@@ -1506,7 +1594,11 @@
- %{_sbindir}/vldb_check
- %{_sbindir}/vldb_convert
- %{_sbindir}/voldump
-+%if 0%{?fedora} < 15
- %{initdir}/openafs-server
-+%else
-+%{_unitdir}/openafs-server.service
-+%endif
- %{_mandir}/man5/AuthLog.*
- %{_mandir}/man5/BackupLog.*
- %{_mandir}/man5/BosConfig.*
Index: branches/fc17-dev/server/fedora/specs/openafs.spec.patch
===================================================================
--- branches/fc17-dev/server/fedora/specs/openafs.spec.patch	(revision 2198)
+++ branches/fc17-dev/server/fedora/specs/openafs.spec.patch	(revision 2202)
@@ -10,16 +10,12 @@
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -237,6 +237,15 @@
+@@ -237,6 +237,11 @@
  
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
  
 +Patch1000: openafs-scripts.patch
-+Patch1001: openafs-systemd.patch
++Patch1001: openafs-systemd-remote-fs.patch
 +Patch1002: openafs-systemd-crond.patch
 +Patch1003: openafs-systemd-csdb.patch
-+Patch1004: openafs-linux-3.1-rcu.patch
-+Patch1005: openafs-linux-3.1-fsync.patch
-+Patch1006: openafs-linux-3.1-zalloc.patch
-+Patch1007: openafs-linux-3.2-nlink.patch
 +
  #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
@@ -83,5 +79,5 @@
  %else
  
-@@ -671,6 +686,16 @@
+@@ -671,6 +686,12 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -89,11 +85,7 @@
 +# Apply the Scripts patch
 +%patch1000 -p1 -b .scripts
-+%patch1001 -p1 -b .systemd
++%patch1001 -p1 -b .systemd-remote-fs
 +%patch1002 -p1 -b .systemd-crond
 +%patch1003 -p1 -b .systemd-csdb
-+%patch1004 -p1 -b .rcu
-+%patch1005 -p1 -b .fsync
-+%patch1006 -p1 -b .zalloc
-+%patch1007 -p1 -b .nlink
 +
  ##############################################################################
Index: branches/fc17-dev/server/fedora/specs/php.spec.patch
===================================================================
--- branches/fc17-dev/server/fedora/specs/php.spec.patch	(revision 2198)
+++ 	(revision )
@@ -1,30 +1,0 @@
---- php.spec.~1~	2012-04-27 13:42:25.000000000 -0400
-+++ php.spec	2012-05-22 23:38:56.360148746 -0400
-@@ -56,7 +56,7 @@
- Summary: PHP scripting language for creating dynamic web sites
- Name: php
- Version: 5.4.1
--Release: 1%{?dist}
-+Release: 1%{?dist}.scripts.%{scriptsversion}
- License: PHP
- Group: Development/Languages
- URL: http://www.php.net/
-@@ -91,6 +91,9 @@
- # Fixes for tests
- 
- 
-+Provides: scripts-php
-+Patch100: php-cve-2012-1823.patch
-+
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
- BuildRequires: bzip2-devel, curl-devel >= 7.9, %{db_devel}, gmp-devel
-@@ -584,6 +587,8 @@
- %patch44 -p1 -b .systzip
- %endif
- 
-+%patch100 -p0 -b .cve-2012-1823
-+
- # Prevent %%doc confusion over LICENSE files
- cp Zend/LICENSE Zend/ZEND_LICENSE
- cp TSRM/LICENSE TSRM_LICENSE