Changeset 1070

Timestamp:

Apr 8, 2009, 9:23:50 AM (16 years ago)

Author:

mitchb

Message:

Build system fixes to upgrade to OpenAFS 1.4.10
Pulls in fixes for CVE-2009-1250 and CVE-2009-1251, among other
enhancements and bugfixes.

Location:

server

Files:

• common/patches/openafs-scripts.patch (modified) (10 diffs)
• fedora/Makefile (modified) (1 diff)
• fedora/specs/openafs.spec.patch (modified) (2 diffs)

server/common/patches/openafs-scripts.patch

@@ -43 +43 @@
 #
 diff -ur openafs-1.4/src/afs/afs_analyze.c openafs-1.4+scripts/src/afs/afs_analyze.c
---- openafs-1.4/src/afs/afs_analyze.c   2007-11-05 23:08:45.000000000 -0500
-+++ openafs-1.4+scripts/src/afs/afs_analyze.c   2007-12-18 19:22:59.000000000 -0500
-@@ -505,7 +505,7 @@
+--- openafs-1.4/src/afs/afs_analyze.c   2008-10-27 19:54:06.000000000 -0400
++++ openafs-1.4+scripts/src/afs/afs_analyze.c   2009-04-08 08:07:22.000000000 -0400
+@@ -585,7 +585,7 @@
                          (afid ? afid->Fid.Volume : 0));
         }
@@ -55 +55 @@
             areq->volumeError = VOLBUSY;
 diff -ur openafs-1.4/src/afs/afs.h openafs-1.4+scripts/src/afs/afs.h
---- openafs-1.4/src/afs/afs.h   2007-12-05 03:57:36.000000000 -0500
-+++ openafs-1.4+scripts/src/afs/afs.h   2007-12-18 20:12:31.000000000 -0500
-@@ -177,8 +177,16 @@
-     struct afs_q *prev;
- };
+--- openafs-1.4/src/afs/afs.h   2009-01-19 14:27:19.000000000 -0500
++++ openafs-1.4+scripts/src/afs/afs.h   2009-04-08 08:07:22.000000000 -0400
+@@ -208,8 +208,16 @@
+ #define QTOC(e)            QEntry(e, struct cell, lruq)
+ #define QTOVH(e)    QEntry(e, struct vcache, vhashq)
  
 +#define AFSAGENT_UID (101)
@@ -73 +73 @@
      afs_int32 busyCount;       /* how many busies we've seen so far */
      afs_int32 flags;           /* things like O_SYNC, O_NONBLOCK go here */
-     char initd;                        /* if non-zero, non-uid fields meaningful */
+     char initd;                        /* if non-zero, Error fields meaningful */
 diff -ur openafs-1.4/src/afs/afs_osi_pag.c openafs-1.4+scripts/src/afs/afs_osi_pag.c
---- openafs-1.4/src/afs/afs_osi_pag.c   2007-11-05 23:08:45.000000000 -0500
-+++ openafs-1.4+scripts/src/afs/afs_osi_pag.c   2007-12-18 20:26:57.000000000 -0500
+--- openafs-1.4/src/afs/afs_osi_pag.c   2008-10-20 15:29:46.000000000 -0400
++++ openafs-1.4+scripts/src/afs/afs_osi_pag.c   2009-04-08 08:07:22.000000000 -0400
 @@ -51,6 +51,8 @@
  #endif
@@ -86 +86 @@
   * Pags are implemented as follows: the set of groups whose long
   * representation is '41XXXXXX' hex are used to represent the pags.
-@@ -442,6 +444,15 @@
+@@ -458,6 +460,15 @@
         av->uid = acred->cr_ruid;       /* default when no pag is set */
  #endif
@@ -103 +103 @@
  }
 diff -ur openafs-1.4/src/afs/afs_pioctl.c openafs-1.4+scripts/src/afs/afs_pioctl.c
---- openafs-1.4/src/afs/afs_pioctl.c    2007-12-05 03:57:37.000000000 -0500
-+++ openafs-1.4+scripts/src/afs/afs_pioctl.c    2007-12-18 21:05:10.000000000 -0500
-@@ -1208,6 +1208,10 @@
+--- openafs-1.4/src/afs/afs_pioctl.c    2009-01-19 13:09:34.000000000 -0500
++++ openafs-1.4+scripts/src/afs/afs_pioctl.c    2009-04-08 08:07:22.000000000 -0400
+@@ -1217,6 +1217,10 @@
      struct AFSFetchStatus OutStatus;
      XSTATS_DECLS;
@@ -116 +116 @@
      if (!avc)
         return EINVAL;
-@@ -1428,6 +1432,10 @@
+@@ -1437,6 +1441,10 @@
      struct vrequest treq;
      afs_int32 flag, set_parent_pag = 0;
@@ -127 +127 @@
      if (!afs_resourceinit_flag) {
         return EIO;
-@@ -1804,6 +1804,10 @@
+@@ -1796,6 +1804,10 @@
      afs_int32 iterator;
      int newStyle;
@@ -136 +136 @@
 +
      AFS_STATCNT(PGetTokens);
-     if (!afs_resourceinit_flag)        /* afs daemons haven't started yet */
-        return EIO;             /* Inappropriate ioctl for device */
-@@ -1870,6 +1878,10 @@
+     if (!afs_resourceinit_flag)        /* afs daemons haven't started yet */
+        return EIO;             /* Inappropriate ioctl for device */
+@@ -1879,6 +1891,10 @@
      register afs_int32 i;
      register struct unixuser *tu;
@@ -150 +150 @@
         return EIO;             /* Inappropriate ioctl for device */
 diff -ur openafs-1.4/src/afs/VNOPS/afs_vnop_access.c openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_access.c
---- openafs-1.4/src/afs/VNOPS/afs_vnop_access.c 2007-11-05 23:08:46.000000000 -0500
-+++ openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_access.c 2007-12-18 21:06:20.000000000 -0500
+--- openafs-1.4/src/afs/VNOPS/afs_vnop_access.c 2008-03-07 12:34:08.000000000 -0500
++++ openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_access.c 2009-04-08 08:07:22.000000000 -0400
 @@ -118,6 +118,17 @@
  
@@ -190 +190 @@
  }
 diff -ur openafs-1.4/src/afs/VNOPS/afs_vnop_attrs.c openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_attrs.c
---- openafs-1.4/src/afs/VNOPS/afs_vnop_attrs.c  2007-11-05 23:08:46.000000000 -0500
-+++ openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_attrs.c  2007-12-18 19:22:59.000000000 -0500
+--- openafs-1.4/src/afs/VNOPS/afs_vnop_attrs.c  2009-01-13 14:37:28.000000000 -0500
++++ openafs-1.4+scripts/src/afs/VNOPS/afs_vnop_attrs.c  2009-04-08 08:07:22.000000000 -0400
 @@ -87,8 +87,8 @@
         }

server/fedora/Makefile

@@ -38 +38 @@
 server_url      = "http://web.mit.edu/scripts/src"
 server_arch     = "fedora.stable"
-openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.8/openafs-1.4.8-1.1.1.src.rpm"
+openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.10/openafs-1.4.10-1.1.1.src.rpm"
 nss_ldapd_url   = "http://download.opensuse.org/repositories/network:/ldap/openSUSE_Factory/src/nss-ldapd-0.6.8-2.1.src.rpm"
 

server/fedora/specs/openafs.spec.patch

@@ -1 @@
---- openafs.spec.orig   2009-01-01 13:46:41.000000000 -0500
-+++ openafs.spec        2009-01-01 22:52:30.000000000 -0500
+--- openafs.spec.orig   2009-04-08 08:17:00.000000000 -0400
++++ openafs.spec        2009-04-08 08:17:21.000000000 -0400
 @@ -8,7 +8,7 @@
  # for beta/rc releases make pkgrel 0.X.<tag>
@@ -69 +69 @@
  Requires: openafs = %{PACKAGE_VERSION}
  Group: Networking/Filesystems
-@@ -550,7 +550,7 @@
+@@ -540,7 +550,7 @@
  %if %{build_modules}