- Timestamp:
- Jul 13, 2015, 10:13:40 PM (9 years ago)
- Location:
- trunk/server
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/server/common/patches/openafs-scripts.patch
r2591 r2712 46 46 # 47 47 diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c 48 index 03caf1c..699b2ce10064448 index 91c09ed..86e2f26 100644 49 49 --- a/src/afs/LINUX/osi_vnodeops.c 50 50 +++ b/src/afs/LINUX/osi_vnodeops.c 51 @@ -12 07,6 +1207,28 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags)51 @@ -1296,6 +1296,28 @@ afs_linux_dentry_revalidate(struct dentry *dp, int flags) 52 52 /* should we always update the attributes at this point? */ 53 53 /* unlikely--the vcache entry hasn't changed */ … … 79 79 #ifdef notyet 80 80 diff --git a/src/afs/VNOPS/afs_vnop_access.c b/src/afs/VNOPS/afs_vnop_access.c 81 index feb0ca7..ba818c710064481 index 0087073..df3e4ef 100644 82 82 --- a/src/afs/VNOPS/afs_vnop_access.c 83 83 +++ b/src/afs/VNOPS/afs_vnop_access.c … … 119 119 } 120 120 diff --git a/src/afs/VNOPS/afs_vnop_attrs.c b/src/afs/VNOPS/afs_vnop_attrs.c 121 index d01aff2..0a38c1c100644121 index 2eb228f..d5d6e4a 100644 122 122 --- a/src/afs/VNOPS/afs_vnop_attrs.c 123 123 +++ b/src/afs/VNOPS/afs_vnop_attrs.c 124 @@ - 88,8 +88,8 @@ afs_CopyOutAttrs(struct vcache *avc, struct vattr *attrs)124 @@ -90,8 +90,8 @@ afs_CopyOutAttrs(struct vcache *avc, struct vattr *attrs) 125 125 } 126 126 } … … 134 134 #elif defined(AFS_DARWIN80_ENV) 135 135 diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c 136 index 5d96f75..7957eee100644136 index d8205b6..5010486 100644 137 137 --- a/src/afs/VNOPS/afs_vnop_lookup.c 138 138 +++ b/src/afs/VNOPS/afs_vnop_lookup.c … … 151 151 osi_FreeLargeSpace(tname); 152 152 diff --git a/src/afs/afs.h b/src/afs/afs.h 153 index 88d5f77..61d3ee9 100644153 index 0dbc11b..ab6c0d9 100644 154 154 --- a/src/afs/afs.h 155 155 +++ b/src/afs/afs.h 156 @@ -23 3,8 +233,16 @@ struct afs_slotlist {156 @@ -237,8 +237,16 @@ struct afs_slotlist { 157 157 struct afs_slotlist *next; 158 158 }; … … 171 171 afs_int32 flags; /* things like O_SYNC, O_NONBLOCK go here */ 172 172 char initd; /* if non-zero, Error fields meaningful */ 173 @@ -896,6 +904,7 @@ struct vcache { 174 struct afs_q multiPage; /* list of multiPage_range structs */ 173 @@ -902,6 +910,7 @@ struct vcache { 174 spinlock_t pagewriter_lock; 175 struct list_head pagewriters; /* threads that are writing vm pages */ 175 176 #endif 176 afs_uint32 lastBRLWarnTime; /* last time we warned about byte-range locks */177 177 + int apache_access; /* whether or not Apache has access to a file */ 178 178 }; 179 179 180 # define DONT_CHECK_MODE_BITS 0180 #ifdef AFS_LINUX26_ENV 181 181 diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c 182 index 2ecd38e..95aafcd100644182 index dea580b..6021cc2 100644 183 183 --- a/src/afs/afs_analyze.c 184 184 +++ b/src/afs/afs_analyze.c 185 @@ -4 78,7 +478,7 @@ afs_Analyze(struct afs_conn *aconn, struct rx_connection *rxconn,185 @@ -482,7 +482,7 @@ afs_Analyze(struct afs_conn *aconn, struct rx_connection *rxconn, 186 186 (afid ? afid->Fid.Volume : 0)); 187 187 } … … 193 193 areq->volumeError = VOLBUSY; 194 194 diff --git a/src/afs/afs_osi_pag.c b/src/afs/afs_osi_pag.c 195 index efce229..c1c1871100644195 index afbb1cf..43ffdfd 100644 196 196 --- a/src/afs/afs_osi_pag.c 197 197 +++ b/src/afs/afs_osi_pag.c … … 222 222 223 223 diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c 224 index e 0a744d..c1c8c8c100644224 index e9a84e3..047b3b5 100644 225 225 --- a/src/afs/afs_pioctl.c 226 226 +++ b/src/afs/afs_pioctl.c 227 @@ -142 0,6 +1420,10 @@ DECL_PIOCTL(PSetAcl)227 @@ -1422,6 +1422,10 @@ DECL_PIOCTL(PSetAcl) 228 228 struct rx_connection *rxconn; 229 229 XSTATS_DECLS; … … 236 236 if (!avc) 237 237 return EINVAL; 238 @@ -1806,6 +1810,10 @@ DECL_PIOCTL(PSetTokens) 239 struct vrequest treq; 238 @@ -1809,6 +1813,10 @@ DECL_PIOCTL(PSetTokens) 240 239 afs_int32 flag, set_parent_pag = 0; 240 int code; 241 241 242 242 + if (areq->uid == globalpag && areq->realuid != AFSAGENT_UID) { … … 247 247 if (!afs_resourceinit_flag) { 248 248 return EIO; 249 @@ -22 66,6 +2274,11 @@ DECL_PIOCTL(PGetTokens)249 @@ -2273,6 +2281,11 @@ DECL_PIOCTL(PGetTokens) 250 250 int newStyle; 251 251 int code = E2BIG; … … 259 259 if (!afs_resourceinit_flag) /* afs daemons haven't started yet */ 260 260 return EIO; /* Inappropriate ioctl for device */ 261 @@ -23 76,6 +2389,10 @@ DECL_PIOCTL(PUnlog)261 @@ -2383,6 +2396,10 @@ DECL_PIOCTL(PUnlog) 262 262 afs_int32 i; 263 263 struct unixuser *tu; -
trunk/server/fedora/Makefile
r2671 r2712 41 41 42 42 dload = ${PWD}/.dload 43 openafs_url = "http://www.openafs.org/dl/openafs/ candidate/1.6.11pre2/openafs-1.6.11-0.pre2.src.rpm"43 openafs_url = "http://www.openafs.org/dl/openafs/1.6.12/openafs-1.6.12-1.src.rpm" 44 44 #zephyr_url = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz" 45 45 -
trunk/server/fedora/specs/openafs.spec.patch
r2671 r2712 1 --- openafs.spec.orig 201 4-05-25 21:15:54.539027644-04002 +++ openafs.spec 201 4-05-25 21:16:27.836268275-04001 --- openafs.spec.orig 2015-06-25 05:18:38.000000000 -0400 2 +++ openafs.spec 2015-07-13 21:41:31.196173273 -0400 3 3 @@ -4,7 +4,7 @@ 4 %define pkgvers 1.6.1 14 %define pkgvers 1.6.12 5 5 # for beta/rc releases make pkgrel 0.<tag> 6 6 # for real releases make pkgrel 1 (or more for extra releases) 7 -%define pkgrel 0.pre28 +%define pkgrel 0.pre2.99.scripts.%{scriptsversion}7 -%define pkgrel 1 8 +%define pkgrel 1.99.scripts.%{scriptsversion} 9 9 10 10 %{!?fedorakmod: %define fedorakmod 1} 11 11 %{!?build_dkmspkg: %define build_dkmspkg 1} 12 @@ -2 49,9 +249,14 @@12 @@ -255,9 +255,14 @@ 13 13 %if %{build_modules} 14 14 BuildRequires: kernel-devel … … 25 25 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2 26 26 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2 27 @@ -33 1,6 +338,7 @@27 @@ -337,6 +342,7 @@ 28 28 %if %{build_userspace} 29 29 … … 33 33 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7 34 34 Requires: systemd-units 35 @@ -38 2,6 +390,7 @@35 @@ -388,6 +394,7 @@ 36 36 %package -n dkms-%{name} 37 37 Summary: DKMS-ready kernel source for AFS distributed filesystem … … 41 41 %if %{fedorakmod} 42 42 Provides: %{name}-kmod = %{version} 43 @@ -40 3,6 +412,7 @@43 @@ -409,6 +416,7 @@ 44 44 45 45 %if %{build_authlibs} … … 49 49 Group: Networking/Filesystems 50 50 51 @@ -4 19,6 +429,7 @@51 @@ -425,6 +433,7 @@ 52 52 %endif 53 53 … … 57 57 Requires: openafs-authlibs = %{version}-%{release} 58 58 %endif 59 @@ -4 37,6 +448,7 @@59 @@ -443,6 +452,7 @@ 60 60 libraries. 61 61 … … 65 65 Group: Development/Filesystems 66 66 Requires: openafs = %{version}-%{release} 67 @@ -4 66,6 +478,7 @@67 @@ -472,6 +482,7 @@ 68 68 administrators. 69 69 … … 73 73 Group: Networking/Filesystems 74 74 Provides: openafs-kernel = %{version} 75 @@ -5 15,6 +528,7 @@75 @@ -521,6 +532,7 @@ 76 76 77 77 %if %{krb5support} … … 81 81 Requires: openafs = %{version} 82 82 Group: Networking/Filesystems 83 @@ -54 1,7 +555,7 @@83 @@ -547,7 +559,7 @@ 84 84 %if %{build_modules} 85 85 … … 90 90 %else 91 91 92 @@ - 698,6 +712,10 @@92 @@ -704,6 +716,10 @@ 93 93 #%setup -q -n %{srcdir} 94 94 %setup -q -b 1 -n %{srcdir} … … 101 101 # 102 102 # building 103 @@ -87 1,6 +891,8 @@103 @@ -877,6 +893,8 @@ 104 104 %endif 105 105 %endif … … 110 110 --prefix=%{_prefix} \ 111 111 --libdir=%{_libdir} \ 112 @@ -12 67,6 +1289,13 @@112 @@ -1273,6 +1291,13 @@ 113 113 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so 114 114 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
Note: See TracChangeset
for help on using the changeset viewer.