Index: branches/fc17-dev/server/common/patches/httpd-suexec-scripts.patch =================================================================== --- branches/fc17-dev/server/common/patches/httpd-suexec-scripts.patch (revision 2081) +++ branches/fc17-dev/server/common/patches/httpd-suexec-scripts.patch (revision 2195) @@ -314,5 +314,5 @@ exit(121); } -@@ -614,6 +767,23 @@ +@@ -614,6 +767,30 @@ /* * Execute the command, replacing our image with its own. @@ -331,4 +331,11 @@ + argv[1] = PHP_PATH; + argv[2] = "-f"; ++ /* ++ * argv[3] is the command to run. argv[4] is either an argument or ++ * already null. We don't want to pass any arguments through from ++ * Apache (since they're untrusted), so we chop off the remainder ++ * of argv here. ++ */ ++ argv[4] = 0; + execv(PHP_PATH, &argv[1]); + log_err("(%d)%s: php exec failed (%s)\n", errno, strerror(errno), argv[1]); Index: branches/fc17-dev/server/common/patches/openafs-linux-3.2-nlink.patch =================================================================== --- branches/fc17-dev/server/common/patches/openafs-linux-3.2-nlink.patch (revision 2195) +++ branches/fc17-dev/server/common/patches/openafs-linux-3.2-nlink.patch (revision 2195) @@ -0,0 +1,28 @@ +As of v3.2-rc1~84^2~1, struct inode.i_nlink is now const to prevent +direct modification. + +Original patch was: + +From c4442772286c0a1fdb99500d65e7d6f295388feb Mon Sep 17 00:00:00 2001 +From: Anders Kaseorg +Date: Sun, 20 Nov 2011 19:00:00 -0500 +Subject: [PATCH] Linux: 3.2: Use set_nlink to update i_nlink +Change-Id: I685aa6e8638e8fe864f1a6a7e428dfb6839ebcea + +Since handling m4 changes is annoying with spec files, we assume +that set_nlink is available. This patch will break on old versions +of Linux, specifically prior to v3.1-8781-gd211858. + +diff --git a/src/afs/LINUX/osi_vfsops.c b/src/afs/LINUX/osi_vfsops.c +index 596d064..d32720f 100644 +--- a/src/afs/LINUX/osi_vfsops.c ++++ b/src/afs/LINUX/osi_vfsops.c +@@ -439,7 +439,7 @@ void + vattr2inode(struct inode *ip, struct vattr *vp) + { + ip->i_ino = vp->va_nodeid; +- ip->i_nlink = vp->va_nlink; ++ set_nlink(ip, vp->va_nlink); + ip->i_blocks = vp->va_blocks; + #ifdef STRUCT_INODE_HAS_I_BLKBITS + ip->i_blkbits = AFS_BLKBITS; Index: branches/fc17-dev/server/common/patches/openafs-localcsdb.patch =================================================================== --- branches/fc17-dev/server/common/patches/openafs-localcsdb.patch (revision 2081) +++ (revision ) @@ -1,11 +1,0 @@ ---- openafs-1.4/src/packaging/RedHat/openafs-client.init.orig 2009-04-14 04:28:32.000000000 -0400 -+++ openafs-1.4/src/packaging/RedHat/openafs-client.init 2009-04-14 04:27:08.000000000 -0400 -@@ -14,7 +14,7 @@ - - start() { - echo -n $"Updating CellServDB: " -- cat /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.dist > \ -+ cat /usr/vice/etc/CellServDB.local > \ - /usr/vice/etc/CellServDB - chmod 644 /usr/vice/etc/CellServDB - echo Index: branches/fc17-dev/server/common/patches/openafs-systemd-crond.patch =================================================================== --- branches/fc17-dev/server/common/patches/openafs-systemd-crond.patch (revision 2081) +++ branches/fc17-dev/server/common/patches/openafs-systemd-crond.patch (revision 2195) @@ -14,4 +14,4 @@ [Install] --WantedBy=multi-user.target -+WantedBy=multi-user.target crond.service +-WantedBy=multi-user.target remote-fs.target ++WantedBy=multi-user.target remote-fs.target crond.service Index: branches/fc17-dev/server/common/patches/openafs-systemd-csdb.patch =================================================================== --- branches/fc17-dev/server/common/patches/openafs-systemd-csdb.patch (revision 2195) +++ branches/fc17-dev/server/common/patches/openafs-systemd-csdb.patch (revision 2195) @@ -0,0 +1,11 @@ +--- a/src/packaging/RedHat/openafs-client.service 2012-03-26 17:04:18.177919348 -0400 ++++ b/src/packaging/RedHat/openafs-client.service 2012-03-26 17:15:17.206630779 -0400 +@@ -6,7 +6,7 @@ + [Service] + Type=forking + EnvironmentFile=/etc/sysconfig/openafs +-ExecStartPre=/bin/sed -n 'w/usr/vice/etc/CellServDB' /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.dist ++ExecStartPre=-/bin/sed -n 'w/usr/vice/etc/CellServDB' /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.mousetrap + ExecStartPre=/bin/chmod 0644 /usr/vice/etc/CellServDB + ExecStartPre=/sbin/modprobe openafs + ExecStart=/usr/vice/etc/afsd $AFSD_ARGS Index: branches/fc17-dev/server/common/patches/openafs-systemd.patch =================================================================== --- branches/fc17-dev/server/common/patches/openafs-systemd.patch (revision 2081) +++ branches/fc17-dev/server/common/patches/openafs-systemd.patch (revision 2195) @@ -32,5 +32,5 @@ + +[Install] -+WantedBy=multi-user.target ++WantedBy=multi-user.target remote-fs.target diff --git a/src/packaging/RedHat/openafs-server.service b/src/packaging/RedHat/openafs-server.service new file mode 100644 Index: branches/fc17-dev/server/common/patches/php-cve-2012-1823.patch =================================================================== --- branches/fc17-dev/server/common/patches/php-cve-2012-1823.patch (revision 2195) +++ branches/fc17-dev/server/common/patches/php-cve-2012-1823.patch (revision 2195) @@ -0,0 +1,20 @@ +--- sapi/cgi/cgi_main.c.orig 2012-05-03 14:33:04.243763906 -0400 ++++ sapi/cgi/cgi_main.c 2012-05-03 14:34:03.294241200 -0400 +@@ -1552,7 +1552,7 @@ + } + } + +- while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) { ++ if (!cgi) while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0, 2)) != -1) { + switch (c) { + case 'c': + if (cgi_sapi_module.php_ini_path_override) { +@@ -1801,7 +1801,7 @@ + } + + zend_first_try { +- while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1, 2)) != -1) { ++ if (!cgi) while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 1, 2)) != -1) { + switch (c) { + case 'T': + benchmark = 1;