Changeset 2637

Timestamp:

Oct 28, 2014, 8:53:04 AM (10 years ago)

Author:

andersk

Message:

Upgrade to OpenAFS 1.6.10; new patch for Scripts #387?

Location:

trunk/server

Files:

• common/patches/openafs-TryEvictVCache-crash.patch (deleted)
• common/patches/openafs-afs_lookup-return.patch (added)
• common/patches/openafs-d_revalidate-mtpt.patch (added)
• common/patches/openafs-revert-d_drop-new-file.patch (deleted)
• fedora/Makefile (modified) (1 diff)
• fedora/specs/openafs.spec.patch (modified) (4 diffs)

trunk/server/fedora/Makefile

@@ -41 +41 @@
 
 dload           = ${PWD}/.dload
-openafs_url     = "https://www.openafs.org/dl/openafs/candidate/1.6.10pre1/openafs-1.6.10-0.pre1.src.rpm"
+openafs_url     = "https://www.openafs.org/dl/openafs/1.6.10/openafs-1.6.10-2.src.rpm"
 #zephyr_url     = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
 

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

@@ -5 +5 @@
  # for beta/rc releases make pkgrel 0.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
--%define pkgrel 0.pre1
-+%define pkgrel 0.pre1.99.scripts.%{scriptsversion}
+-%define pkgrel 2
++%define pkgrel 2.99.scripts.%{scriptsversion}
  
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -249,9 +249,16 @@
+@@ -249,9 +249,17 @@
  %if %{build_modules}
  BuildRequires: kernel-devel
@@ -21 +21 @@
 +Patch1002: openafs-systemd-crond.patch
 +Patch1003: openafs-systemd-csdb.patch
-+Patch1004: openafs-revert-d_drop-new-file.patch
++Patch1004: openafs-afs_lookup-return.patch
++Patch1005: openafs-d_revalidate-mtpt.patch
 +%define _default_patch_fuzz 2
 +
@@ -92 +93 @@
  %else
  
-@@ -698,6 +712,12 @@
+@@ -698,6 +712,13 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -100 +101 @@
 +%patch1002 -p1 -b .systemd-crond
 +%patch1003 -p1 -b .systemd-csdb
-+%patch1004 -p1 -b .revert-d_drop-new-file
++%patch1004 -p1 -b .afs_lookup-return
++%patch1005 -p1 -b ._revalidate-mtpt
 +
  ##############################################################################