Index: trunk/host/credit-card/host.py
===================================================================
--- trunk/host/credit-card/host.py	(revision 2237)
+++ trunk/host/credit-card/host.py	(revision 2246)
@@ -70,4 +70,8 @@
     ]
 
+def drop_caches():
+    with open("/proc/sys/vm/drop_caches", 'w') as f:
+        f.write("1")
+
 def mkdir_p(path): # it's like mkdir -p
     try:
@@ -98,4 +102,5 @@
         self.types = types
     def __enter__(self):
+        drop_caches()
         self.dev = "/dev/%s/%s-root" % (HOST, self.guest)
 
@@ -121,4 +126,5 @@
         os.rmdir(self.mount)
         shell.call("kpartx", "-d", self.dev)
+        drop_caches()
 
 def main():
Index: trunk/server/common/oursrc/php_scripts/php_scripts.h
===================================================================
--- trunk/server/common/oursrc/php_scripts/php_scripts.h	(revision 2237)
+++ trunk/server/common/oursrc/php_scripts/php_scripts.h	(revision 2246)
@@ -28,5 +28,5 @@
 void scripts_error_cb(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args);
 
-static function_entry scripts_functions[] = {
+static zend_function_entry scripts_functions[] = {
     {NULL, NULL, NULL}
 };
Index: trunk/server/common/oursrc/sql-signup/sql-signup-pam
===================================================================
--- trunk/server/common/oursrc/sql-signup/sql-signup-pam	(revision 2237)
+++ trunk/server/common/oursrc/sql-signup/sql-signup-pam	(revision 2246)
@@ -1,4 +1,4 @@
 #%PAM-1.0
-auth		sufficient	pam_succeed_if.so uid >= 500 quiet
+auth		sufficient	pam_succeed_if.so uid >= 1000 quiet
 auth		include		config-util
 account		include		config-util
Index: trunk/server/common/oursrc/tokensys/scripts-afsagent-startup.in
===================================================================
--- trunk/server/common/oursrc/tokensys/scripts-afsagent-startup.in	(revision 2237)
+++ trunk/server/common/oursrc/tokensys/scripts-afsagent-startup.in	(revision 2246)
@@ -3,5 +3,5 @@
 /sbin/sysctl -q afs.GCPAGs=0
 @fs_path@ setcrypt on
-@fs_path@ sysname 'amd64_fedora15_scripts' 'amd64_fedora13_scripts' 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora15' 'amd64_fedora13' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb60' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2'
+@fs_path@ sysname 'amd64_fedora17_scripts' 'amd64_fedora15_scripts' 'amd64_fedora13_scripts' 'amd64_fedora11_scripts' 'amd64_fedora9_scripts' 'amd64_fedora7_scripts' 'scripts' 'amd64_fedora17' 'amd64_fedora15' 'amd64_fedora13' 'amd64_fedora11' 'amd64_fedora9' 'amd64_fedora7' 'amd64_linux26' 'i386_deb60' 'i386_deb50' 'i386_deb40' 'i386_rhel4' 'i386_rhel3' 'i386_rh9' 'i386_linux26' 'i386_linux24' 'i386_linux22' 'i386_linux3' 'i386_linux2'
 
 @fs_path@ setcell -nosuid -c athena
Index: trunk/server/common/patches/httpd-sysv-deps.patch
===================================================================
--- trunk/server/common/patches/httpd-sysv-deps.patch	(revision 2237)
+++ 	(revision )
@@ -1,11 +1,0 @@
---- a/httpd.init.orig	2011-11-05 19:10:18.897425517 -0400
-+++ b/httpd.init	2011-11-05 19:11:22.523201035 -0400
-@@ -12,7 +12,7 @@
- #
- ### BEGIN INIT INFO
- # Provides: httpd
--# Required-Start: $local_fs $remote_fs $network $named
-+# Required-Start: $local_fs $remote_fs $network $named openafs-client crond
- # Required-Stop: $local_fs $remote_fs $network
- # Should-Start: distcache
- # Short-Description: start and stop Apache HTTP Server
Index: trunk/server/doc/install-howto.sh
===================================================================
--- trunk/server/doc/install-howto.sh	(revision 2237)
+++ trunk/server/doc/install-howto.sh	(revision 2246)
@@ -77,4 +77,7 @@
 #   XXX We should make Kickstart work for test servers too
 
+# Make sure selinux is disabled
+    selinuxenabled || echo "selinux not enabled"
+
 # Take updates, reboot if there's a kernel update.
     yum update -y
@@ -96,6 +99,12 @@
     \cp -a etc /
     chmod 0440 /etc/sudoers
+    grub2-mkconfig -o /boot/grub2/grub.cfg
 
 # [TEST] You'll need to fix some config now.  See bottom of document.
+
+# Stop /etc/resolv.conf from getting repeatedly overwritten by
+# purging DNS servers from ifcfg-eth0 and ifcfg-eth1
+    vim /etc/sysconfig/network-scripts/ifcfg-eth0
+    vim /etc/sysconfig/network-scripts/ifcfg-eth1
 
 # Make sure network is working.  Kickstart should have
@@ -246,5 +255,5 @@
     gem install $(gem list --no-version | grep -Fxvf - gem.txt)
     # Also, we need to install the old rails version
-    gem install -v=2.3.5 rails
+    gem install -v=2.3.14 rails
 # These are in /usr
 
@@ -340,15 +349,15 @@
     cat install-ldap
 
-# Enable lots of services
+# Enable lots of services (currently in /etc checkout)
     systemctl enable openafs-client.service
-    systemctl enable dirsrv.service
+    systemctl enable dirsrv.target
     systemctl enable nslcd.service
     systemctl enable nscd.service
     systemctl enable postfix.service
-    systemctl enable nrpe.service
+    systemctl enable nrpe.service # chkconfig'd
     systemctl enable httpd.service # not for [WIZARD]
 
     systemctl start openafs-client.service
-    systemctl start dirsrv.service
+    systemctl start dirsrv.target
     systemctl start nslcd.service
     systemctl start nscd.service
@@ -360,6 +369,5 @@
 # among others, 'amd64_fedoraX_scripts' (vary X) and 'scripts'. If it's
 # not, you probably did a distro upgrade and should update
-# /etc/sysconfig/openafs (XXX this is wrong: figuring out new
-# systemd world order).
+# tokensys (server/common/oursrc/tokensys/scripts-afsagent-startup.in)
     fs sysname
 
@@ -374,4 +382,7 @@
 # (Note: this errors on XeTeX which is ok.)
     fmtutil-sys --all
+
+# Check for unwanted setuid/setgid binaries
+    find / -xdev -not -perm -o=x -prune -o -type f -perm /ug=s -print | grep -Fxvf /etc/scripts/allowed-setugid.list 
 
 # Fix etc by making sure none of our config files got overwritten
Index: trunk/server/doc/install-ldap
===================================================================
--- trunk/server/doc/install-ldap	(revision 2237)
+++ trunk/server/doc/install-ldap	(revision 2246)
@@ -1,2 +1,3 @@
+# b
 # To set up a new LDAP server:
 
@@ -14,9 +15,12 @@
 
 # Move the schema back
-cp -R /etc/dirsrv/slapd-scripts.bak/{.svn,*} /etc/dirsrv/slapd-scripts
+cp -R /etc/dirsrv/slapd-scripts.bak/* /etc/dirsrv/slapd-scripts
 rm -Rf /etc/dirsrv/slapd-scripts.bak
 
+# Check and make sure the sysconfig references the correct keytab
+svn revert /etc/sysconfig/dirsrv-scripts
+
 # Turn dirsrv off:
-systemctl stop dirsrv.service
+systemctl stop dirsrv@scripts.service
 
 # Apply the following configuration changes.  If you're editing
@@ -52,5 +56,5 @@
 EOF;
 
-systemctl start dirsrv.service
+systemctl start dirsrv@scripts.service
 
 ldapvi -b cn=config
@@ -221,4 +225,6 @@
 nsDS5ReplicaBindDN: uid=ldap/shining-armor.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu
 nsDS5ReplicaBindDN: uid=ldap/golden-egg.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu
+nsDS5ReplicaBindDN: uid=ldap/miracle-cure.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu
+nsDS5ReplicaBindDN: uid=ldap/lucky-star.mit.edu,ou=People,dc=scripts,dc=mit,dc=edu
 nsds5ReplicaPurgeDelay: 604800
 nsds5ReplicaLegacyConsumer: off
Index: trunk/server/doc/upgrade-tips
===================================================================
--- trunk/server/doc/upgrade-tips	(revision 2237)
+++ trunk/server/doc/upgrade-tips	(revision 2246)
@@ -172,9 +172,18 @@
 --------------------
 
+XXX out of date
 Update /etc/sysconfig/openafs with an extra amd64_fedoraX_scripts and
 amd64_fedoraX sysname.  The format should be evident from the existing
 entries.  [XXX There might be other things you want]
 
-6. Testing critical infrastructure
+6. Bind to scripts-test
+-----------------------
+
+First, make sure no other servers are bound to scripts-test (try ping).
+Then, create /etc/sysconfig/network-scripts/ifcfg-eth0:0 based off of
+/etc/sysconfig/network-scripts/ifcfg-eth0 but with the scripts-test
+IP address 18.181.0.229.  Run `ifup eth0:0` to complete the change.
+
+7. Testing critical infrastructure
 ----------------------------------
 
@@ -188,5 +197,5 @@
     - http://pony.scripts.mit.edu
 
-7. Extra stuff
+8. Extra stuff
 --------------
 
@@ -202,5 +211,5 @@
 emptying their .ini files in /etc/php.d.
 
-8. Sending announcements
+9. Sending announcements
 ------------------------
 
Index: trunk/server/fedora/Makefile
===================================================================
--- trunk/server/fedora/Makefile	(revision 2237)
+++ trunk/server/fedora/Makefile	(revision 2246)
@@ -19,7 +19,7 @@
 # See /COPYRIGHT in this repository for more information.
 
-upstream_yum	= krb5 krb5.i686 httpd openssh redland-bindings rubygems
-hackage		= MonadCatchIO-mtl-0.3.0.2 cgi-3001.1.8.2 unix-handle-0.0.0
-upstream_hackage = ghc-MonadCatchIO-mtl ghc-cgi ghc-unix-handle
+upstream_yum	= krb5 krb5.i686 httpd openssh rubygems
+hackage		= cgi-3001.1.8.2 unix-handle-0.0.0
+upstream_hackage = ghc-cgi ghc-unix-handle
 upstream	= openafs $(upstream_yum) $(upstream_hackage) moira zephyr zephyr.i686 python-zephyr python-afs athena-aclocal discuss
 oursrc		= execsys tokensys accountadm httpdmods logview sql-signup nss_nonlocal nss_nonlocal.i686 whoisd athrun php_scripts scripts-wizard scripts-base scripts-static-cat fuse-better-mousetrapfs
@@ -151,10 +151,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-fc15-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-fc17-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-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
+	/usr/bin/mock -r scripts-fc17-`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 ':' '_')'
@@ -162,14 +162,14 @@
 $(filter %.i686,$(upstream)): %.i686: setup patch-specs
 	rpmbuild ${rpmbuild_args} -bs ${tmp_specs}/${PKG}.spec
-	/usr/bin/mock -r scripts-fc15-i386 --arch=i686 ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
+	/usr/bin/mock -r scripts-fc17-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-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/${PKG}-[0-9]*.src.rpm | head -1`
+	/usr/bin/mock -r scripts-fc17-`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-fc15-`uname -m` ${rpmbuild_args} -v --rebuild `ls -t ${out_srpms}/openafs*.src.rpm | head -1`
+	/usr/bin/mock -r scripts-fc17-`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: trunk/server/fedora/config/etc/default/grub
===================================================================
--- trunk/server/fedora/config/etc/default/grub	(revision 2246)
+++ trunk/server/fedora/config/etc/default/grub	(revision 2246)
@@ -0,0 +1,6 @@
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR="Fedora"
+GRUB_DEFAULT=saved
+GRUB_TERMINAL="serial console"
+GRUB_SERIAL_COMMAND="serial"
+GRUB_CMDLINE_LINUX="rd.md=0 rd.lvm=0 rd.dm=0 console=hvc0 KEYTABLE=us rd.luks=0 SYSFONT=True LANG=en_US.UTF-8"
Index: trunk/server/fedora/config/etc/hosts
===================================================================
--- trunk/server/fedora/config/etc/hosts	(revision 2237)
+++ trunk/server/fedora/config/etc/hosts	(revision 2246)
@@ -20,4 +20,6 @@
 18.181.0.135	shining-armor.mit.edu shining-armor scripts9.mit.edu scripts9
 18.181.0.141	golden-egg.mit.edu golden-egg scripts10.mit.edu scripts10
+18.181.0.203	miracle-cure.mit.edu miracle-cure scripts11.mit.edu scripts11
+18.181.0.204	lucky-star.mit.edu lucky-star scripts12.mit.edu scripts12
 
 172.21.0.57	better-mousetrap.mit.edu
@@ -31,2 +33,4 @@
 172.21.0.135	shining-armor.mit.edu
 172.21.0.141	golden-egg.mit.edu
+172.21.0.203	miracle-cure.mit.edu
+172.21.0.204	lucky-star.mit.edu
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 2237)
+++ trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf	(revision 2246)
@@ -14,3 +14,5 @@
     shining-armor.mit.edu shining-armor s-a.mit.edu s-a scripts9.mit.edu scripts9 18.181.0.135 \
     golden-egg.mit.edu golden-egg g-e.mit.edu g-e scripts10.mit.edu scripts10 18.181.0.141 \
+    miracle-cure.mit.edu miracle-cure m-c.mit.edu m-c scripts11.mit.edu scripts11 18.181.0.203 \
+    lucky-star.mit.edu lucky-star l-s.mit.edu l-s scripts12.mit.edu scripts12 18.181.0.204 \
     localhost 127.0.0.1 ::1
Index: trunk/server/fedora/config/etc/mock/scripts-fc17-i386.cfg
===================================================================
--- trunk/server/fedora/config/etc/mock/scripts-fc17-i386.cfg	(revision 2246)
+++ trunk/server/fedora/config/etc/mock/scripts-fc17-i386.cfg	(revision 2246)
@@ -0,0 +1,44 @@
+config_opts['root'] = 'fedora-17-i386'
+config_opts['target_arch'] = 'i686'
+config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64')
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc17'  # only useful for --resultdir variable subst
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+
+# repos
+
+[fedora]
+name=fedora
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-17&arch=i386
+failovermethod=priority
+
+[updates-released]
+name=updates
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f17&arch=i386
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/17/i386/
+failovermethod=priority
+
+[local]
+name=local
+baseurl=file:///home/scripts-build/mock-local/
+cost=2000
+enabled=1
+
+[scripts]
+name=Scripts
+baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17/
+enabled=1
+gpgcheck=0
+"""
Index: trunk/server/fedora/config/etc/mock/scripts-fc17-x86_64.cfg
===================================================================
--- trunk/server/fedora/config/etc/mock/scripts-fc17-x86_64.cfg	(revision 2246)
+++ trunk/server/fedora/config/etc/mock/scripts-fc17-x86_64.cfg	(revision 2246)
@@ -0,0 +1,48 @@
+config_opts['root'] = 'fedora-17-x86_64'
+config_opts['target_arch'] = 'x86_64'
+config_opts['legal_host_arches'] = ('x86_64')
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
+config_opts['dist'] = 'fc17'  # only useful for --resultdir variable subst
+
+config_opts['yum.conf'] = """
+[main]
+cachedir=/var/cache/yum
+debuglevel=1
+reposdir=/dev/null
+logfile=/var/log/yum.log
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+syslog_ident=mock
+syslog_device=
+# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all
+# .i?86 packages except these.
+#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86
+# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora.
+
+# repos
+
+[fedora]
+name=fedora
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-17&arch=x86_64
+failovermethod=priority
+
+[updates-released]
+name=updates
+#mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f17&arch=x86_64
+baseurl=http://dl.fedoraproject.org/pub/fedora/linux/updates/17/x86_64/
+failovermethod=priority
+
+[local]
+name=local
+baseurl=file:///home/scripts-build/mock-local/ 
+cost=2000
+enabled=1
+
+[scripts]
+name=Scripts
+baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17/
+enabled=1
+gpgcheck=0
+"""
Index: trunk/server/fedora/config/etc/modules-load.d/binfmt_misc.conf
===================================================================
--- trunk/server/fedora/config/etc/modules-load.d/binfmt_misc.conf	(revision 2246)
+++ trunk/server/fedora/config/etc/modules-load.d/binfmt_misc.conf	(revision 2246)
@@ -0,0 +1,1 @@
+binfmt_misc
Index: trunk/server/fedora/config/etc/scripts/allowed-filecaps.list
===================================================================
--- trunk/server/fedora/config/etc/scripts/allowed-filecaps.list	(revision 2237)
+++ trunk/server/fedora/config/etc/scripts/allowed-filecaps.list	(revision 2246)
@@ -1,4 +1,4 @@
-/bin/ping
-/bin/ping6
+/usr/bin/ping
+/usr/bin/ping6
 /usr/sbin/fping
 /usr/sbin/fping6
Index: trunk/server/fedora/config/etc/scripts/allowed-setugid.list
===================================================================
--- trunk/server/fedora/config/etc/scripts/allowed-setugid.list	(revision 2237)
+++ trunk/server/fedora/config/etc/scripts/allowed-setugid.list	(revision 2246)
@@ -1,4 +1,4 @@
-/sbin/pam_timestamp_check
-/sbin/unix_chkpwd
+/usr/sbin/pam_timestamp_check
+/usr/sbin/unix_chkpwd
 /usr/bin/at
 /usr/bin/crontab
Index: trunk/server/fedora/config/etc/sysconfig/dirsrv
===================================================================
--- trunk/server/fedora/config/etc/sysconfig/dirsrv	(revision 2237)
+++ trunk/server/fedora/config/etc/sysconfig/dirsrv	(revision 2246)
@@ -6,4 +6,6 @@
 # dirsrv-localhost for the slapd-localhost instance.
 
+# This file is in systemd EnvironmentFile format - see man systemd.exec
+
 # In order to make more file descriptors available
 # to the directory server, first make sure the system
@@ -12,4 +14,7 @@
 # desired value
 # ulimit -n 8192
+# note - if using systemd, ulimit won't work -  you must edit
+# the systemd unit file for directory server to add the 
+# LimitNOFILE option - see man systemd.exec for more info
 
 # A per instance keytab does not make much sense for servers.
@@ -27,23 +32,13 @@
 # file - uncomment the following line and set
 # the path and filename appropriately
-KRB5_KTNAME=/etc/dirsrv/keytab ; export KRB5_KTNAME
-
-# other environment settings can be added here too
-OS=`uname -s`
-# use the new mt slab memory allocator on Solaris
-# this requires Solaris 9 update 3 or later
-if [ "$OS" = "SunOS" -a -f /usr/lib/libumem.so ] ; then
-    LD_PRELOAD=/usr/lib/libumem.so
-    export LD_PRELOAD
-fi
-if [ "$OS" = "SunOS" -a -f /usr/lib/64/libumem.so ] ; then
-    LD_PRELOAD_64=/usr/lib/64/libumem.so
-    export LD_PRELOAD_64
-fi
+# if using systemd, omit the "; export VARNAME" at the end
+# KRB5_KTNAME=/etc/dirsrv/myname.keytab ; export KRB5_KTNAME
 
 # how many seconds to wait for the startpid file to show
 # up before we assume there is a problem and fail to start
+# if using systemd, omit the "; export VARNAME" at the end
 #STARTPID_TIME=10 ; export STARTPID_TIME
 # how many seconds to wait for the pid file to show
 # up before we assume there is a problem and fail to start
+# if using systemd, omit the "; export VARNAME" at the end
 #PID_TIME=600 ; export PID_TIME
Index: trunk/server/fedora/config/etc/sysconfig/dirsrv-scripts
===================================================================
--- trunk/server/fedora/config/etc/sysconfig/dirsrv-scripts	(revision 2246)
+++ trunk/server/fedora/config/etc/sysconfig/dirsrv-scripts	(revision 2246)
@@ -0,0 +1,24 @@
+# This file is sourced by dirsrv upon startup to set
+# the default environment for a single specific  directory
+# server instances.  To set defaults for all instances, edit
+# the file in the same directory called dirsrv.
+
+# These settings are used by the start-dirsrv and
+# start-slapd scripts (as well as their associates stop
+# and restart scripts).  Do not edit them unless you know
+# what you are doing.
+
+# This file is in systemd EnvironmentFile format - see man systemd.exec
+
+SERVER_DIR=/usr/lib64/dirsrv
+SERVERBIN_DIR=/usr/sbin
+CONFIG_DIR=/etc/dirsrv/slapd-scripts
+INST_DIR=/usr/lib64/dirsrv/slapd-scripts
+RUN_DIR=/var/run/dirsrv
+DS_ROOT=
+PRODUCT_NAME=slapd
+
+# Put custom instance specific settings below here.
+# if using systemd, omit the "; export VARNAME" at the end
+
+KRB5_KTNAME=/etc/dirsrv/keytab
Index: trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1
===================================================================
--- trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1	(revision 2237)
+++ trunk/server/fedora/config/etc/sysconfig/network-scripts/route-eth1	(revision 2246)
@@ -14,2 +14,4 @@
 18.181.0.141 via 172.21.0.141
 18.181.0.199 via 172.21.0.199
+18.181.0.203 via 172.21.0.203
+18.181.0.204 via 172.21.0.204
Index: trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl
===================================================================
--- trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl	(revision 2237)
+++ trunk/server/fedora/config/etc/syslog-ng/d_zroot.pl	(revision 2246)
@@ -136,4 +136,5 @@
 	} elsif ($message =~ m|^Set /proc/self/oom_score_adj to |) {
 	} elsif ($message =~ m|^fatal: mm_request_receive: read: Connection reset by peer$|) {
+	} elsif ($message =~ m|^selinux sandbox not useful \[preauth\]$|) {
 	} 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 2237)
+++ trunk/server/fedora/config/etc/yum.repos.d/scripts.repo	(revision 2246)
@@ -1,5 +1,5 @@
 [scripts]
 name=Scripts
-baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15/
+baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17/
 enabled=1
 gpgcheck=0
@@ -7,5 +7,5 @@
 [scripts-testing]
 name=Scripts Testing
-baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc15-testing/
+baseurl=http://web.mit.edu/scripts/yum-repos/rpm-fc17-testing/
 enabled=0
 gpgcheck=0
Index: trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec
===================================================================
--- trunk/server/fedora/specs/ghc-MonadCatchIO-mtl.spec	(revision 2237)
+++ 	(revision )
@@ -1,63 +1,0 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
-
-%global pkg_name MonadCatchIO-mtl
-
-# common part of summary for all the subpackages
-%global common_summary Haskell %{pkg_name} library
-
-# main description used for all the subpackages
-%global common_description A %{pkg_name} library for Haskell.
-
-# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
-%global ghc_pkg_deps ghc-mtl-devel
-
-# foreign library dependencies (used for buildrequires and devel subpkg requires)
-#%%global ghc_pkg_c_deps @CDEP1@-devel
-
-Name:           ghc-%{pkg_name}
-Version:        0.3.0.2
-Release:        0.%{scriptsversion}%{?dist}
-Summary:        %{common_summary}
-
-Group:          System Environment/Libraries
-License:        BSD
-URL:            http://hackage.haskell.org/package/%{pkg_name}
-Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
-# fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
-BuildRequires:  ghc, ghc-doc, ghc-prof
-# macros for building haskell packages
-BuildRequires:  ghc-rpm-macros >= 0.7.3
-BuildRequires:  hscolour
-%{?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
-%{common_description}
-
-
-%prep
-%setup -q -n %{pkg_name}-%{version}
-
-
-%build
-%ghc_lib_build
-
-
-%install
-%ghc_lib_install
-
-
-# define the devel and prof subpkgs, devel post[un] scripts, and filelists:
-# ghc-%pkg_name{,devel,prof}.files
-%ghc_lib_package
-
-
-%changelog
-* Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.3.0.2-0
-- regenerated packaging with cabal2spec-0.22.5
-
-* 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 2237)
+++ trunk/server/fedora/specs/ghc-cgi.spec	(revision 2246)
@@ -1,19 +1,11 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name cgi
 
-# common part of summary for all the subpackages
 %global common_summary Haskell %{pkg_name} library
 
-# main description used for all the subpackages
 %global common_description A %{pkg_name} library for Haskell.
-
-# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
-%global ghc_pkg_deps ghc-network-devel, ghc-parsec-devel, ghc-mtl-devel, ghc-MonadCatchIO-mtl-devel, ghc-xhtml-devel
-
-# foreign library dependencies (used for buildrequires and devel subpkg requires)
-#%%global ghc_pkg_c_deps @CDEP1@-devel
 
 Name:           ghc-%{pkg_name}
@@ -24,14 +16,16 @@
 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
-# fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
-BuildRequires:  ghc, ghc-doc, ghc-prof
-# macros for building haskell packages
-BuildRequires:  ghc-rpm-macros >= 0.7.3
-BuildRequires:  hscolour
-%{?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}}
+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
 
 %description
@@ -51,10 +45,20 @@
 
 
-# define the devel and prof subpkgs, devel post[un] scripts, and filelists:
-# ghc-%pkg_name{,devel,prof}.files
-%ghc_lib_package
+# devel subpackage
+%ghc_devel_package
+
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
+
+
+%ghc_files LICENSE
 
 
 %changelog
+* Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 3001.1.8.2-0
+- regenerated packaging with cabal2spec-0.25.5
+
 * Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 3001.1.8.2-0
 - regenerated packaging with cabal2spec-0.22.5
Index: trunk/server/fedora/specs/ghc-unix-handle.spec
===================================================================
--- trunk/server/fedora/specs/ghc-unix-handle.spec	(revision 2237)
+++ trunk/server/fedora/specs/ghc-unix-handle.spec	(revision 2246)
@@ -1,19 +1,11 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 %global pkg_name unix-handle
 
-# common part of summary for all the subpackages
 %global common_summary Haskell %{pkg_name} library
 
-# main description used for all the subpackages
 %global common_description A %{pkg_name} library for Haskell.
-
-# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
-#%%global ghc_pkg_deps ghc-@DEP1@-devel, ghc-@DEP2@-devel
-
-# foreign library dependencies (used for buildrequires and devel subpkg requires)
-#%%global ghc_pkg_c_deps @CDEP1@-devel
 
 Name:           ghc-%{pkg_name}
@@ -24,14 +16,11 @@
 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
-# fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
-BuildRequires:  ghc, ghc-doc, ghc-prof
-# macros for building haskell packages
-BuildRequires:  ghc-rpm-macros >= 0.7.3
-BuildRequires:  hscolour
-%{?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}}
+ExclusiveArch:  %{ghc_arches}
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
+# END cabal2spec
 
 %description
@@ -51,10 +40,20 @@
 
 
-# define the devel and prof subpkgs, devel post[un] scripts, and filelists:
-# ghc-%pkg_name{,devel,prof}.files
-%ghc_lib_package
+# devel subpackage
+%ghc_devel_package
+
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
+
+
+%ghc_files LICENSE
 
 
 %changelog
+* Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 0.0.0-0
+- regenerated packaging with cabal2spec-0.25.5
+
 * Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0.0-0
 - regenerated packaging with cabal2spec-0.22.5
Index: trunk/server/fedora/specs/httpd.spec.patch
===================================================================
--- trunk/server/fedora/specs/httpd.spec.patch	(revision 2237)
+++ trunk/server/fedora/specs/httpd.spec.patch	(revision 2246)
@@ -1,16 +1,16 @@
---- httpd.spec.~1~	2012-02-13 09:46:36.000000000 -0500
-+++ httpd.spec	2012-03-26 01:33:53.247271289 -0400
-@@ -8,7 +8,7 @@
+--- httpd.spec.~1~	2012-04-30 05:52:31.000000000 -0400
++++ httpd.spec	2012-05-22 23:31:12.397142763 -0400
+@@ -9,7 +9,7 @@
  Summary: Apache HTTP Server
  Name: httpd
  Version: 2.2.22
--Release: 1%{?dist}
-+Release: 1%{?dist}.scripts.%{scriptsversion}
+-Release: 4%{?dist}
++Release: 4%{?dist}.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -54,6 +54,15 @@
- Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
- Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
+@@ -58,6 +58,14 @@
+ Requires(postun): systemd-units
+ Requires(post): systemd-units
  
 +Provides: scripts-httpd = %{version}-%{release}
@@ -21,10 +21,9 @@
 +Patch1006: httpd-suexec-cloexec.patch
 +Patch1007: httpd-fixup-vhost.patch
-+Patch1008: httpd-sysv-deps.patch
 +
  %description
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -64,6 +76,7 @@
+@@ -68,6 +77,7 @@
  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
  Requires: apr-devel, apr-util-devel, pkgconfig
@@ -34,5 +33,5 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -102,6 +115,7 @@
+@@ -106,6 +116,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -42,17 +41,5 @@
  
  %description -n mod_ssl
-@@ -110,6 +124,11 @@
- Security (TLS) protocols.
- 
- %prep
-+
-+# Horrible hack to patch the httpd.init file
-+cd $RPM_SOURCE_DIR
-+%patch1008 -p1 -b .sysv-deps
-+
- %setup -q
- %patch1 -p1 -b .apctl
- %patch2 -p1 -b .apxs
-@@ -128,6 +147,14 @@
+@@ -133,6 +149,13 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -64,10 +51,9 @@
 +%patch1006 -p1 -b .cloexec
 +%patch1007 -p1 -b .fixup-vhost
-+# Note that patch1008 is not here, as it patches the initscript elsewhere in this .spec
 +
  # Safety check: prevent build if defined MMN does not equal upstream MMN.
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -175,10 +205,12 @@
+@@ -193,10 +217,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 2237)
+++ trunk/server/fedora/specs/krb5.spec.patch	(revision 2246)
@@ -1,16 +1,16 @@
---- krb5.spec.~1~	2012-03-08 16:20:41.000000000 -0500
-+++ krb5.spec	2012-04-01 22:07:14.834013302 -0400
-@@ -6,7 +6,7 @@
+--- krb5.spec.orig	2012-06-17 19:29:24.140005717 -0400
++++ krb5.spec	2012-06-17 19:30:47.834405053 -0400
+@@ -20,7 +20,7 @@
  Summary: The Kerberos network authentication system
  Name: krb5
- Version: 1.9.3
--Release: 1%{?dist}
-+Release: 1%{?dist}.scripts.%{scriptsversion}
+ Version: 1.10.2
+-Release: 2%{?dist}
++Release: 2%{?dist}.scripts.%{scriptsversion}
  # Maybe we should explode from the now-available-to-everybody tarball instead?
- # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.3-signed.tar
+ # http://web.mit.edu/kerberos/dist/krb5/1.10/krb5-1.10.2-signed.tar
  Source0: krb5-%{version}.tar.gz
-@@ -64,6 +64,8 @@
- Patch102: krb5-1.9-7048.patch
- Patch103: krb5-kvno-230379.patch
+@@ -69,6 +69,8 @@
+ Patch105: krb5-kvno-230379.patch
+ Patch106: krb5-1.10.2-keytab-etype.patch
  
 +Patch1000: krb5-kuserok-scripts.patch
@@ -19,5 +19,5 @@
  URL: http://web.mit.edu/kerberos/www/
  Group: System Environment/Libraries
-@@ -113,6 +115,7 @@
+@@ -126,6 +128,7 @@
  %package libs
  Summary: The shared libraries used by Kerberos 5
@@ -27,10 +27,10 @@
  %description libs
  Kerberos is a network authentication system. The krb5-libs package
-@@ -219,6 +222,7 @@
- %patch101 -p1 -b .7047
- %patch102 -p1 -b .7048
- %patch103 -p1 -b .kvno
+@@ -245,6 +248,7 @@
+ %patch103 -p0 -b .gcc47
+ %patch105 -p1 -b .kvno
+ %patch106 -p1 -b .keytab-etype
 +%patch1000 -p1 -b .kuserok
+ rm src/lib/krb5/krb/deltat.c
+ 
  gzip doc/*.ps
- 
- sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex
Index: trunk/server/fedora/specs/openssh.spec.patch
===================================================================
--- trunk/server/fedora/specs/openssh.spec.patch	(revision 2237)
+++ trunk/server/fedora/specs/openssh.spec.patch	(revision 2246)
@@ -1,5 +1,5 @@
---- openssh.spec.~1~	2012-02-14 11:06:13.000000000 -0500
-+++ openssh.spec	2012-02-25 13:02:28.660616538 -0500
-@@ -78,7 +78,7 @@
+--- openssh.spec.orig	2012-06-18 18:16:43.764813595 -0400
++++ openssh.spec	2012-06-18 18:24:40.478720527 -0400
+@@ -82,7 +82,7 @@
  Summary: An open source implementation of SSH protocol versions 1 and 2
  Name: openssh
@@ -10,23 +10,36 @@
  #URL1: http://pamsshagentauth.sourceforge.net
  #Source0: ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-%{version}.tar.gz
-@@ -92,6 +92,7 @@
- Source3: sshd.init
- 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
+@@ -218,6 +218,7 @@
+ #https://bugzilla.mindrot.org/show_bug.cgi?id=1604
+ # sctp
+ #https://bugzilla.mindrot.org/show_bug.cgi?id=1873 => https://bugzilla.redhat.com/show_bug.cgi?id=668993
 +Patch1001: openssh-4.7p1-gssapi-name-in-env.patch
  
- Patch100: openssh-5.6p1-wIm.patch
- Patch0: openssh-5.6p1-redhat.patch
-@@ -214,6 +215,7 @@
- Requires(pre): /usr/sbin/useradd
- Requires: pam >= 1.0.1-3
+ License: BSD
+ Group: Applications/Internet
+@@ -271,6 +272,7 @@
+ Group: Applications/Internet
+ Requires: openssh = %{version}-%{release}
  Requires: fipscheck-lib%{_isa} >= 1.3.0
 +Provides: scripts-openssh-server
  
- %if %{ldap}
- %package ldap
-@@ -333,6 +335,8 @@
- %patch83 -p0 -b .oomkiller
- %patch84 -p1 -b .legacy
+ %package server
+ Summary: An open source SSH server daemon
+@@ -456,15 +458,19 @@
+ %patch713 -p1 -b .ctr-cavs
+ 
+ %patch800 -p1 -b .gsskex
+-%patch801 -p1 -b .force_krb
++# Remove force_krb as it conflicts with admof
++# %patch801 -p1 -b .force_krb
+ 
+ %patch900 -p1 -b .canohost
+-%patch901 -p1 -b .kuserok
++# Remove the kuserok patch as it won't apply without patch800
++# %patch901 -p1 -b .kuserok
+ 
+ %if 0
+ # Nothing here yet
+ %endif
  
 +%patch1001 -p1 -b .gssapi-env
Index: trunk/server/fedora/specs/redland-bindings.spec.patch
===================================================================
--- trunk/server/fedora/specs/redland-bindings.spec.patch	(revision 2237)
+++ 	(revision )
@@ -1,20 +1,0 @@
---- redland-bindings.spec.old	2011-10-12 14:51:58.000000000 -0400
-+++ redland-bindings.spec	2011-10-13 10:15:24.000000000 -0400
-@@ -1,6 +1,6 @@
- Name:           redland-bindings
- Version:        1.0.11.1
--Release:        6%{?dist}
-+Release:        6%{?dist}.scripts.%{scriptsversion}
- Summary:        Redland RDF Application Framework API Bindings
- 
- Group:          System Environment/Libraries
-@@ -137,6 +137,9 @@
- autoconf
- automake
- 
-+# Horrible hack to make PHP work
-+sed -i -e 's/zend_error_noreturn/zend_error/' php/*
-+
- # when specifying system redland, the configure check for the version
- # allows newer redland libraries; without it it doesn't.
- # authors says that older bindings work with newer redlands.
Index: trunk/server/fedora/specs/rubygems.spec.patch
===================================================================
--- trunk/server/fedora/specs/rubygems.spec.patch	(revision 2237)
+++ trunk/server/fedora/specs/rubygems.spec.patch	(revision 2246)
@@ -1,26 +1,25 @@
---- rubygems.spec.~1~	2012-04-20 14:46:27.000000000 -0400
-+++ rubygems.spec	2012-05-03 14:12:52.421863447 -0400
-@@ -15,7 +15,7 @@
+--- rubygems.spec.~1~	2012-04-28 04:01:50.000000000 -0400
++++ rubygems.spec	2012-05-22 23:47:16.001145101 -0400
+@@ -18,7 +18,7 @@
  Summary:	The Ruby standard for packaging ruby libraries
  Name:		rubygems
- Version:	1.7.2
--Release:	5%{?dist}
-+Release:	5%{?dist}.scripts.%{scriptsversion}
+ Version:	1.8.24
+-Release:	1%{?dist}
++Release:	1%{?dist}.scripts.%{scriptsversion}
  Group:		Development/Libraries
- # No GPL version is specified.
- License:	Ruby or GPL+
-@@ -42,6 +42,9 @@
- # Insecure connection to SSL repository fix
- Patch10:	rubygems-1.x.x-ssl-connection-don_t-revert.patch
+ License:	Ruby or MIT
+ 
+@@ -52,6 +52,8 @@
+ # https://github.com/rubygems/rubygems/issues/210
+ Patch109:	rubygems-1.8.11-binary-extensions.patch
  
 +Provides: scripts-rubygems = %{version}-%{release}
 +Patch1000: rubygems-rails-require-thread.patch
-+
- Requires:	ruby(abi) = 1.8
- Requires:	ruby >= 1.8.7
- Requires:	ruby-rdoc
-@@ -83,6 +86,8 @@
- %patch7 -p1 -b .esc.skip
- %patch10 -p1 -b .ssl
+ 
+ Requires:	ruby(abi) = 1.9.1
+ Requires:	rubygem(rdoc) >= 3.9.4
+@@ -97,6 +99,8 @@
+ %patch105 -p1 -b .uninst
+ %patch109 -p1 -b .bindir
  
 +%patch1000 -p1 -b .thread
Index: trunk/server/fedora/specs/scripts-static-cat.spec
===================================================================
--- trunk/server/fedora/specs/scripts-static-cat.spec	(revision 2237)
+++ trunk/server/fedora/specs/scripts-static-cat.spec	(revision 2246)
@@ -1,5 +1,5 @@
-# For Haskell Packaging Guidelines see:
-# - https://fedoraproject.org/wiki/Packaging:Haskell
-# - https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+# cabal2spec-0.25
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
 # Link Haskell libs statically for 3x faster startup speed.
@@ -13,12 +13,20 @@
 Group:          Applications/System
 License:        GPL
+# BEGIN cabal2spec
 URL:            http://scripts.mit.edu/
 Source0:        %{name}.tar.gz
-# fedora ghc archs:
-ExclusiveArch:  %{ix86} x86_64 ppc alpha sparcv9
-BuildRequires:  ghc-devel
-# macros for building haskell packages
-BuildRequires:  ghc-rpm-macros >= 0.7.0
-BuildRequires:  ghc-cgi-devel >= 3001.1.8, ghc-MonadCatchIO-mtl-devel, ghc-unix-handle-devel
+ExclusiveArch:  %{ghc_arches}
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-rpm-macros
+# END cabal2spec
+BuildRequires:  ghc-bytestring-devel
+BuildRequires:  ghc-cgi-devel >= 3001.1.8
+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
 
 %description
@@ -39,9 +47,11 @@
 
 %files
-%defattr(-,root,root,-)
 %attr(755,root,root) %{_bindir}/static-cat
 
 
 %changelog
+* Fri May 25 2012 Anders Kaseorg <andersk@mit.edu> - 0.0-0
+- regenerated packaging with cabal2spec-0.25.5
+
 * Mon May  2 2011 Alexander Chernyakhovsky <achernya@mit.edu> - 0.0-0
 - regenerated packaging with cabal2spec-0.22.5