Changeset 2671 for trunk

Timestamp:

Feb 20, 2015, 11:26:41 PM (10 years ago)

Author:

andersk

Message:

Update OpenAFS to 1.6.11pre2

Location:

trunk/server

Files:

• common/patches/openafs-afs_conn-overcounts.patch (deleted)
• common/patches/openafs-d_splice_alias-reference.patch (deleted)
• common/patches/openafs-d_u.d_alias.patch (deleted)
• common/patches/openafs-mvid-NULL-deref.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     = "http://www.openafs.org/dl/openafs/candidate/1.6.11pre1/openafs-1.6.11-0.pre1.src.rpm"
+openafs_url     = "http://www.openafs.org/dl/openafs/candidate/1.6.11pre2/openafs-1.6.11-0.pre2.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 0.pre2
++%define pkgrel 0.pre2.99.scripts.%{scriptsversion}
  
  %{!?fedorakmod: %define fedorakmod 1}
  %{!?build_dkmspkg: %define build_dkmspkg 1}
-@@ -249,9 +249,18 @@
+@@ -249,9 +249,14 @@
  %if %{build_modules}
  BuildRequires: kernel-devel
@@ -20 +20 @@
 +Patch1000: openafs-scripts.patch
 +Patch1003: openafs-systemd-csdb.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
 +
@@ -94 +90 @@
  %else
  
-@@ -698,6 +712,14 @@
+@@ -698,6 +712,10 @@
  #%setup -q -n %{srcdir}
  %setup -q -b 1 -n %{srcdir}
@@ -101 +97 @@
 +%patch1000 -p1 -b .scripts
 +%patch1003 -p1 -b .systemd-csdb
-+%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
 +
  ##############################################################################