Changeset 2659 for trunk/server/fedora

Timestamp:

Dec 22, 2014, 12:07:50 AM (10 years ago)

Author:

andersk

Message:

OpenAFS: upgrade to 1.6.11pre1, plus patch for d_alias change

Location:

trunk/server/fedora

Files:

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

trunk/server/fedora/Makefile

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

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

@@ -2 +2 @@
 +++ openafs.spec        2014-05-25 21:16:27.836268275 -0400
 @@ -4,7 +4,7 @@
- %define pkgvers 1.6.10
+ %define pkgvers 1.6.11
  # for beta/rc releases make pkgrel 0.<tag>
  # for real releases make pkgrel 1 (or more for extra releases)
--%define pkgrel 2
-+%define pkgrel 2.99.scripts.%{scriptsversion}
+-%define pkgrel 0.pre1
++%define pkgrel 0.pre1.99.scripts.%{scriptsversion}
  
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -249,9 +249,21 @@
+@@ -249,9 +249,18 @@
  %if %{build_modules}
  BuildRequires: kernel-devel
@@ -19 +19 @@
  
 +Patch1000: openafs-scripts.patch
-+Patch1002: openafs-systemd-crond.patch
 +Patch1003: openafs-systemd-csdb.patch
-+Patch1004: openafs-afs_lookup-return.patch
-+Patch1005: openafs-d_revalidate-mtpt.patch
-+Patch1006: openafs-linux-3.17.patch
 +Patch1007: openafs-mvid-NULL-deref.patch
 +Patch1008: openafs-afs_conn-overcounts.patch
 +Patch1009: openafs-d_splice_alias-reference.patch
++Patch1010: openafs-d_u.d_alias.patch
 +%define _default_patch_fuzz 2
 +
@@ -97 +94 @@
  %else
  
-@@ -698,6 +712,17 @@
+@@ -698,6 +712,14 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -103 +100 @@
 +# Apply the Scripts patch
 +%patch1000 -p1 -b .scripts
-+%patch1002 -p1 -b .systemd-crond
 +%patch1003 -p1 -b .systemd-csdb
-+%patch1004 -p1 -b .afs_lookup-return
-+%patch1005 -p1 -b .d_revalidate-mtpt
-+%patch1006 -p1 -b .linux-3.17
 +%patch1007 -p1 -b .mvid-NULL-deref.patch
 +%patch1008 -p1 -b .afs_conn-overcounts.patch
 +%patch1009 -p1 -b .d_splice_alias-reference
++%patch1010 -p1 -b .d_u.d_alias
 +
  ##############################################################################