Changeset 1274


Ignore:
Timestamp:
Jul 15, 2009, 10:50:26 PM (13 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:
4 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/common/patches/openafs-scripts.patch

    r1259 r1274  
    5858--- openafs-1.4/src/afs/LINUX/osi_vnodeops.c
    5959+++ openafs-1.4+scripts/src/afs/LINUX/osi_vnodeops.c
    60 @@ -875,6 +875,28 @@
     60@@ -896,6 +896,28 @@
    6161        /* should we always update the attributes at this point? */
    6262        /* unlikely--the vcache entry hasn't changed */
     
    162162--- openafs-1.4/src/afs/afs_pioctl.c
    163163+++ openafs-1.4+scripts/src/afs/afs_pioctl.c
    164 @@ -1217,6 +1217,10 @@
     164@@ -1221,6 +1221,10 @@
    165165     struct AFSFetchStatus OutStatus;
    166166     XSTATS_DECLS;
     
    173173     if (!avc)
    174174        return EINVAL;
    175 @@ -1437,6 +1441,10 @@
     175@@ -1441,6 +1445,10 @@
    176176     struct vrequest treq;
    177177     afs_int32 flag, set_parent_pag = 0;
     
    184184     if (!afs_resourceinit_flag) {
    185185        return EIO;
    186 @@ -1796,6 +1804,10 @@
     186@@ -1800,6 +1808,10 @@
    187187     afs_int32 iterator;
    188188     int newStyle;
     
    195195     if (!afs_resourceinit_flag)        /* afs daemons haven't started yet */
    196196        return EIO;             /* Inappropriate ioctl for device */
    197 @@ -1879,6 +1891,10 @@
     197@@ -1883,6 +1895,10 @@
    198198     register afs_int32 i;
    199199     register struct unixuser *tu;
  • trunk/server/fedora/Makefile

    r1259 r1274  
    3838server_url      = "http://web.mit.edu/scripts/src"
    3939server_arch     = "fedora.stable"
    40 openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.10/openafs-1.4.10-1.1.1.src.rpm"
    41 nss_ldapd_url   = "http://download.opensuse.org/repositories/network:/ldap/openSUSE_Factory/src/nss-ldapd-0.6.8-2.1.src.rpm"
     40openafs_url     = "http://dl.openafs.org/dl/openafs/1.4.11/openafs-1.4.11-1.1.1.src.rpm"
     41nss_ldapd_url   = "http://download.opensuse.org/repositories/network:/ldap/openSUSE_Factory/src/nss-ldapd-0.6.10-6.2.src.rpm"
    4242
    4343.PHONY: minimal-clean
  • trunk/server/fedora/specs/openafs.spec.patch

    r1259 r1274  
    1 --- openafs.spec.orig   2009-06-03 04:16:03.000000000 -0400
    2 +++ openafs.spec        2009-06-12 02:05:57.000000000 -0400
     1--- openafs.spec.orig
     2+++ openafs.spec
    33@@ -8,7 +8,7 @@
    44 # for beta/rc releases make pkgrel 0.X.<tag>
     
    1010 %if %{?osvers:0}%{!?osvers:1}
    1111 %define osvers 1
    12 @@ -261,6 +261,14 @@
     12@@ -261,6 +261,10 @@
    1313 %endif
    1414 ExclusiveArch: %{ix86} x86_64 ia64 s390 s390x sparc64 ppc ppc64
    1515 
    1616+Patch1000: openafs-scripts.patch
    17 +Patch1001: openafs-postinit.patch
    18 +Patch1002: openafs-pts-encrypt.patch
    1917+Patch1003: openafs-localcsdb.patch
    20 +Patch1004: openafs-delta-dprintf-rename-20090427.patch
    2118+Patch1005: openafs-numsysnames.patch
    22 +Patch1006: openafs-delta-linux26-defer-cred-changing-20090511.patch
    2319+
    2420 #    http://dl.openafs.org/dl/openafs/candidate/%{afsvers}/...
    2521 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    2622 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    27 @@ -343,6 +351,7 @@
     23@@ -343,6 +347,7 @@
    2824 %if %{build_userspace}
    2925 
     
    3329 
    3430 %if %{fedorakmod}
    35 @@ -403,6 +412,7 @@
     31@@ -403,6 +408,7 @@
    3632 
    3733 %if %{build_authlibs}
     
    4137 Group: Networking/Filesystems
    4238 
    43 @@ -419,6 +429,7 @@
     39@@ -419,6 +425,7 @@
    4440 %endif
    4541 
     
    4945 Requires: openafs-authlibs = %{PACKAGE_VERSION}
    5046 %endif
    51 @@ -437,6 +448,7 @@
     47@@ -437,6 +444,7 @@
    5248 libraries.
    5349 
     
    5753 Group: Development/Filesystems
    5854 
    59 @@ -465,6 +477,7 @@
     55@@ -465,6 +473,7 @@
    6056 administrators.
    6157 
     
    6561 Group: Networking/Filesystems
    6662 Provides: openafs-kernel = %{PACKAGE_VERSION}
    67 @@ -514,6 +527,7 @@
     63@@ -514,6 +523,7 @@
    6864 
    6965 %if %{krb5support}
     
    7369 Requires: openafs = %{PACKAGE_VERSION}
    7470 Group: Networking/Filesystems
    75 @@ -540,7 +554,7 @@
     71@@ -540,7 +550,7 @@
    7672 %if %{build_modules}
    7773 
     
    8278 %else
    8379 
    84 @@ -699,6 +713,13 @@
     80@@ -699,6 +709,9 @@
    8581 
    8682 # Patch openafs to build a kernel module named "openafs" instead of "libafs"
    8783 %patch0 -p1 -b .kmod26
    8884+%patch1000 -p1 -b .scripts
    89 +%patch1001 -p1 -b .postinit
    90 +%patch1002 -p1 -b .pts-encrypt
    9185+%patch1003 -p1 -b .localcsdb
    92 +%patch1004 -p1 -b .dprintf
    9386+%patch1005 -p1 -b .numsysnames
    94 +%patch1006 -p1 -b .defercredchanging
    9587 
    9688 ##############################################################################
    9789 #
     90@@ -1209,7 +1222,7 @@
     91 rm -rf $RPM_BUILD_ROOT%{_sbindir}/kdump*
     92 
     93 # remove man pages from programs deleted above
     94-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
     95+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
     96   rm -f $RPM_BUILD_ROOT%{_mandir}/man$f.*
     97 done
     98 
     99@@ -1569,7 +1582,6 @@
     100 %{_libdir}/librxstat.a
     101 %{_libdir}/libubik.a
     102 %{_mandir}/man1/rxgen.*
     103-%{_mandir}/man1/compile_et.*
     104 
     105 %if %{build_dkmspkg}
     106 %files -n dkms-%{name}
Note: See TracChangeset for help on using the changeset viewer.