Changeset 1625 for branches/fc13-dev/server

Timestamp:

Sep 8, 2010, 9:32:29 PM (14 years ago)

Author:

ezyang

Message:

Upgrade OpenAFS to 1.4.12 for newest Fedora 13 kernel (could
not use old version because it did not support the new kernel;
some header files were moved around.)

Location:

branches/fc13-dev/server

Files:

• common/patches/openafs-release-glock.patch (deleted)
• common/patches/openafs-scripts.patch (modified) (3 diffs)
• fedora/Makefile (modified) (1 diff)
• fedora/specs/openafs.spec.patch (modified) (8 diffs)

branches/fc13-dev/server/common/patches/openafs-scripts.patch

@@ -134 +134 @@
 --- openafs-1.4/src/afs/afs_osi_pag.c
 +++ openafs-1.4+scripts/src/afs/afs_osi_pag.c
-@@ -51,6 +51,8 @@
+@@ -49,6 +49,8 @@
  #endif
  /* Local variables */
@@ -143 +143 @@
   * Pags are implemented as follows: the set of groups whose long
   * representation is '41XXXXXX' hex are used to represent the pags.
-@@ -458,6 +460,15 @@
+@@ -449,6 +451,15 @@
         av->uid = acred->cr_ruid;       /* default when no pag is set */
  #endif
@@ -156 +156 @@
 +    }
 +
-     av->initd = 0;
      return 0;
  }
+ 
 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

branches/fc13-dev/server/fedora/Makefile

@@ -40 +40 @@
 server_url      = "http://web.mit.edu/scripts/src"
 server_arch     = "fedora.stable"
-openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.11/openafs-1.4.11-1.1.1.src.rpm"
+openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.12/openafs-1.4.12-1.1.2.src.rpm"
 clusterglue_url = "http://kojipkgs.fedoraproject.org/packages/cluster-glue/1.0/0.11.b79635605337.hg.fc12/src/cluster-glue-1.0-0.11.b79635605337.hg.fc12.src.rpm"
 heartbeat_url   = "http://kojipkgs.fedoraproject.org/packages/heartbeat/3.0.0/0.5.0daab7da36a8.hg.fc12/src/heartbeat-3.0.0-0.5.0daab7da36a8.hg.fc12.src.rpm"

branches/fc13-dev/server/fedora/specs/openafs.spec.patch

@@ -1 @@
---- openafs.spec.orig
-+++ openafs.spec
+--- openafs.spec.orig   2010-06-01 08:47:21.000000000 -0400
++++ openafs.spec        2010-09-08 20:46:41.000000000 -0400
 @@ -8,7 +8,7 @@
  # for beta/rc releases make pkgrel 0.X.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
  #%define pkgrel 0.1.rc1
--%define pkgrel 1.1
-+%define pkgrel 1.1.99scripts.%{scriptsversion}
+-%define pkgrel 1.2
++%define pkgrel 1.2.99scripts.%{scriptsversion}
  
  %if %{?osvers:0}%{!?osvers:1}
  %define osvers 1
-@@ -261,6 +261,11 @@
+@@ -261,6 +261,10 @@
  %endif
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
@@ -17 +17 @@
 +Patch1003: openafs-localcsdb.patch
 +Patch1005: openafs-numsysnames.patch
-+Patch1006: openafs-release-glock.patch
 +
  #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
@@ -27 +26 @@
  %package client
 +Provides: scripts-openafs-client
- Requires: binutils, openafs = %{PACKAGE_VERSION}
+ Requires: binutils, openafs = %{version}
  
  %if %{fedorakmod}
@@ -44 +43 @@
 +Provides: scripts-openafs-authlibs-devel
  %if %{build_authlibs}
- Requires: openafs-authlibs = %{PACKAGE_VERSION}
+ Requires: openafs-authlibs = %{version}
  %endif
 @@ -437,6 +445,7 @@
@@ -61 +60 @@
  Summary: OpenAFS Kernel Module source tree
  Group: Networking/Filesystems
- Provides: openafs-kernel = %{PACKAGE_VERSION}
+ Provides: openafs-kernel = %{version}
 @@ -514,6 +524,7 @@
  
@@ -68 +67 @@
 +Provides: scripts-openafs-krb5
  Summary: OpenAFS programs to use with krb5
- Requires: openafs = %{PACKAGE_VERSION}
+ Requires: openafs = %{version}
  Group: Networking/Filesystems
 @@ -540,7 +551,7 @@
@@ -79 +78 @@
  %else
  
-@@ -699,6 +710,10 @@
+@@ -699,6 +710,9 @@
  
  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
@@ -86 +85 @@
 +%patch1003 -p1 -b .localcsdb
 +%patch1005 -p1 -b .numsysnames
-+%patch1006 -p1 -b .release-glock
  
  ##############################################################################
  #
-@@ -1209,7 +1224,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/compile_et 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
-   rm -f $RPM_BUILD_ROOT%{_mandir}/man$f.*
- done
- 
-@@ -1569,7 +1584,6 @@
- %{_libdir}/librxstat.a
- %{_libdir}/libubik.a
- %{_mandir}/man1/rxgen.*
--%{_mandir}/man1/compile_et.*
- 
- %if %{build_dkmspkg}
- %files -n dkms-%{name}