Changeset 2448

Timestamp:

Jul 25, 2013, 10:46:47 PM (11 years ago)

Author:

achernya

Message:

Update OpenAFS to 1.6.4

Location:

trunk/server/fedora

Files:

• Makefile (modified) (1 diff)
• specs/openafs.spec.patch (modified) (14 diffs)

trunk/server/fedora/Makefile

@@ -40 +40 @@
 server_url      = "http://web.mit.edu/scripts/src"
 server_arch     = "fedora.stable"
-openafs_url     = "http://www.openafs.org/dl/openafs/1.6.2.1/openafs-1.6.2.1-1.src.rpm"
+openafs_url     = "http://www.openafs.org/dl/openafs/1.6.4/openafs-1.6.4-1.src.rpm"
 zephyr_url      = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
 

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

@@ -1 @@
---- openafs.spec.orig   2013-05-07 00:56:04.399167645 -0400
-+++ openafs.spec        2013-05-07 00:57:01.393033842 -0400
+--- openafs.spec.orig   2013-06-24 04:40:31.000000000 -0400
++++ openafs.spec        2013-07-18 22:43:10.631044261 -0400
 @@ -4,7 +4,7 @@
- %define pkgvers 1.6.2.1
+ %define pkgvers 1.6.4
  # for beta/rc releases make pkgrel 0.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
@@ -10 +10 @@
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -249,9 +249,16 @@
+@@ -249,9 +249,15 @@
  %if %{build_modules}
  BuildRequires: kernel-devel
@@ -21 +21 @@
 +Patch1002: openafs-systemd-crond.patch
 +Patch1003: openafs-systemd-csdb.patch
-+Patch1004: openafs-TryEvictVCache-crash.patch
 +%define _default_patch_fuzz 2
 +
@@ -27 +26 @@
  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
-@@ -331,6 +338,7 @@
+@@ -331,6 +337,7 @@
  %if %{build_userspace}
  
@@ -35 +34 @@
  %if 0%{?fedora} >= 15
  Requires: systemd-units
-@@ -382,6 +390,7 @@
+@@ -382,6 +389,7 @@
  %package -n dkms-%{name}
  Summary:        DKMS-ready kernel source for AFS distributed filesystem
@@ -43 +42 @@
  %if %{fedorakmod}
  Provides: %{name}-kmod = %{version}
-@@ -403,6 +412,7 @@
+@@ -403,6 +411,7 @@
  
  %if %{build_authlibs}
@@ -51 +50 @@
  Group: Networking/Filesystems
  
-@@ -419,6 +429,7 @@
+@@ -419,6 +428,7 @@
  %endif
  
@@ -59 +58 @@
  Requires: openafs-authlibs = %{version}-%{release}
  %endif
-@@ -437,6 +448,7 @@
+@@ -437,6 +447,7 @@
  libraries.
  
@@ -67 +66 @@
  Group: Development/Filesystems
  Requires: openafs = %{version}-%{release}
-@@ -466,6 +478,7 @@
+@@ -466,6 +477,7 @@
  administrators.
  
@@ -75 +74 @@
  Group: Networking/Filesystems
  Provides: openafs-kernel = %{version}
-@@ -515,6 +528,7 @@
+@@ -515,6 +527,7 @@
  
  %if %{krb5support}
@@ -83 +82 @@
  Requires: openafs = %{version}
  Group: Networking/Filesystems
-@@ -541,7 +555,7 @@
+@@ -541,7 +554,7 @@
  %if %{build_modules}
  
@@ -92 +91 @@
  %else
  
-@@ -698,6 +712,12 @@
+@@ -698,6 +711,11 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -100 +99 @@
 +%patch1002 -p1 -b .systemd-crond
 +%patch1003 -p1 -b .systemd-csdb
-+%patch1004 -p1 -b .vcache
 +
  ##############################################################################
  #
  # building
-@@ -869,6 +889,8 @@
+@@ -869,6 +887,8 @@
  %endif
  %endif
@@ -114 +112 @@
         --prefix=%{_prefix} \
         --libdir=%{_libdir} \
-@@ -1257,6 +1279,13 @@
+@@ -1257,6 +1277,13 @@
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
  rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*