Changeset 1274 for trunk

Timestamp:

Jul 15, 2009, 10:50:26 PM (15 years ago)

Author:

mitchb

Message:

Upgrade OpenAFS to 1.4.11
o Two of our patches (postinit and pts-encrypt) have been upstreamed
o Two deltas we applied (dprintf-rename-20090427 and
  linux26-defer-cred-changing-20090511) are now included in this version
o The scripts patch has some context adjustments
o Our spec file patch corrects an upstream bug which tries to install
  a compile_et manpage, which conflicts with e2fsprogs-devel

Location:

trunk/server

Files:

• common/patches/openafs-delta-dprintf-rename-20090427.patch (deleted)
• common/patches/openafs-delta-linux26-defer-cred-changing-20090511.patch (deleted)
• common/patches/openafs-postinit.patch (deleted)
• common/patches/openafs-pts-encrypt.patch (deleted)
• common/patches/openafs-scripts.patch (modified) (5 diffs)
• fedora/Makefile (modified) (1 diff)
• fedora/specs/openafs.spec.patch (modified) (9 diffs)

trunk/server/common/patches/openafs-scripts.patch

@@ -58 +58 @@
 --- openafs-1.4/src/afs/LINUX/osi_vnodeops.c
 +++ openafs-1.4+scripts/src/afs/LINUX/osi_vnodeops.c
-@@ -875,6 +875,28 @@
+@@ -896,6 +896,28 @@
         /* should we always update the attributes at this point? */
         /* unlikely--the vcache entry hasn't changed */
@@ -162 +162 @@
 --- openafs-1.4/src/afs/afs_pioctl.c
 +++ openafs-1.4+scripts/src/afs/afs_pioctl.c
-@@ -1217,6 +1217,10 @@
+@@ -1221,6 +1221,10 @@
      struct AFSFetchStatus OutStatus;
      XSTATS_DECLS;
@@ -173 +173 @@
      if (!avc)
         return EINVAL;
-@@ -1437,6 +1441,10 @@
+@@ -1441,6 +1445,10 @@
      struct vrequest treq;
      afs_int32 flag, set_parent_pag = 0;
@@ -184 +184 @@
      if (!afs_resourceinit_flag) {
         return EIO;
-@@ -1796,6 +1804,10 @@
+@@ -1800,6 +1808,10 @@
      afs_int32 iterator;
      int newStyle;
@@ -195 +195 @@
      if (!afs_resourceinit_flag)        /* afs daemons haven't started yet */
         return EIO;             /* Inappropriate ioctl for device */
-@@ -1879,6 +1891,10 @@
+@@ -1883,6 +1895,10 @@
      register afs_int32 i;
      register struct unixuser *tu;

trunk/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.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"
+openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.11/openafs-1.4.11-1.1.1.src.rpm"
+nss_ldapd_url   = "http://download.opensuse.org/repositories/network:/ldap/openSUSE_Factory/src/nss-ldapd-0.6.10-6.2.src.rpm"
 
 .PHONY: minimal-clean

trunk/server/fedora/specs/openafs.spec.patch

@@ -1 @@
---- openafs.spec.orig   2009-06-03 04:16:03.000000000 -0400
-+++ openafs.spec        2009-06-12 02:05:57.000000000 -0400
+--- openafs.spec.orig
++++ openafs.spec
 @@ -8,7 +8,7 @@
  # for beta/rc releases make pkgrel 0.X.<tag>
@@ -10 +10 @@
  %if %{?osvers:0}%{!?osvers:1}
  %define osvers 1
-@@ -261,6 +261,14 @@
+@@ -261,6 +261,10 @@
  %endif
  ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
  
 +Patch1000: openafs-scripts.patch
-+Patch1001: openafs-postinit.patch
-+Patch1002: openafs-pts-encrypt.patch
 +Patch1003: openafs-localcsdb.patch
-+Patch1004: openafs-delta-dprintf-rename-20090427.patch
 +Patch1005: openafs-numsysnames.patch
-+Patch1006: openafs-delta-linux26-defer-cred-changing-20090511.patch
 +
  #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
  Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
  Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
-@@ -343,6 +351,7 @@
+@@ -343,6 +347,7 @@
  %if %{build_userspace}
  
@@ -33 +29 @@
  
  %if %{fedorakmod}
-@@ -403,6 +412,7 @@
+@@ -403,6 +408,7 @@
  
  %if %{build_authlibs}
@@ -41 +37 @@
  Group: Networking/Filesystems
  
-@@ -419,6 +429,7 @@
+@@ -419,6 +425,7 @@
  %endif
  
@@ -49 +45 @@
  Requires: openafs-authlibs = %{PACKAGE_VERSION}
  %endif
-@@ -437,6 +448,7 @@
+@@ -437,6 +444,7 @@
  libraries.
  
@@ -57 +53 @@
  Group: Development/Filesystems
  
-@@ -465,6 +477,7 @@
+@@ -465,6 +473,7 @@
  administrators.
  
@@ -65 +61 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{PACKAGE_VERSION}
-@@ -514,6 +527,7 @@
+@@ -514,6 +523,7 @@
  
  %if %{krb5support}
@@ -73 +69 @@
  Requires: openafs = %{PACKAGE_VERSION}
  Group: Networking/Filesystems
-@@ -540,7 +554,7 @@
+@@ -540,7 +550,7 @@
  %if %{build_modules}
  
@@ -82 +78 @@
  %else
  
-@@ -699,6 +713,13 @@
+@@ -699,6 +709,9 @@
  
  # Patch openafs to build a kernel module named "openafs" instead of "libafs"
  %patch0 -p1 -b .kmod26
 +%patch1000 -p1 -b .scripts
-+%patch1001 -p1 -b .postinit
-+%patch1002 -p1 -b .pts-encrypt
 +%patch1003 -p1 -b .localcsdb
-+%patch1004 -p1 -b .dprintf
 +%patch1005 -p1 -b .numsysnames
-+%patch1006 -p1 -b .defercredchanging
  
  ##############################################################################
  #
+@@ -1209,7 +1222,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 +1582,6 @@
+ %{_libdir}/librxstat.a
+ %{_libdir}/libubik.a
+ %{_mandir}/man1/rxgen.*
+-%{_mandir}/man1/compile_et.*
+ 
+ %if %{build_dkmspkg}
+ %files -n dkms-%{name}