Index: trunk/server/common/oursrc/php_scripts/php_scripts.h
===================================================================
--- trunk/server/common/oursrc/php_scripts/php_scripts.h	(revision 2203)
+++ 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 2203)
+++ 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 2203)
+++ 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 2203)
+++ 	(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