Changeset 2448


Ignore:
Timestamp:
Jul 25, 2013, 10:46:47 PM (9 years ago)
Author:
achernya
Message:
Update OpenAFS to 1.6.4
Location:
trunk/server/fedora
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/Makefile

    r2415 r2448  
    4040server_url      = "http://web.mit.edu/scripts/src"
    4141server_arch     = "fedora.stable"
    42 openafs_url     = "http://www.openafs.org/dl/openafs/1.6.2.1/openafs-1.6.2.1-1.src.rpm"
     42openafs_url     = "http://www.openafs.org/dl/openafs/1.6.4/openafs-1.6.4-1.src.rpm"
    4343zephyr_url      = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz"
    4444
  • trunk/server/fedora/specs/openafs.spec.patch

    r2414 r2448  
    1 --- openafs.spec.orig   2013-05-07 00:56:04.399167645 -0400
    2 +++ openafs.spec        2013-05-07 00:57:01.393033842 -0400
     1--- openafs.spec.orig   2013-06-24 04:40:31.000000000 -0400
     2+++ openafs.spec        2013-07-18 22:43:10.631044261 -0400
    33@@ -4,7 +4,7 @@
    4  %define pkgvers 1.6.2.1
     4 %define pkgvers 1.6.4
    55 # for beta/rc releases make pkgrel 0.<tag>
    66 # for real releases make pkgrel 1 (or more for extra releases)
     
    1010 %{!?fedorakmod: %define fedorakmod 1}
    1111 %{!?build_dkmspkg: %define build_dkmspkg 1}
    12 @@ -249,9 +249,16 @@
     12@@ -249,9 +249,15 @@
    1313 %if %{build_modules}
    1414 BuildRequires: kernel-devel
     
    2121+Patch1002: openafs-systemd-crond.patch
    2222+Patch1003: openafs-systemd-csdb.patch
    23 +Patch1004: openafs-TryEvictVCache-crash.patch
    2423+%define _default_patch_fuzz 2
    2524+
     
    2726 Source0: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-src.tar.bz2
    2827 Source1: http://www.openafs.org/dl/openafs/%{afsvers}/openafs-%{afsvers}-doc.tar.bz2
    29 @@ -331,6 +338,7 @@
     28@@ -331,6 +337,7 @@
    3029 %if %{build_userspace}
    3130 
     
    3534 %if 0%{?fedora} >= 15
    3635 Requires: systemd-units
    37 @@ -382,6 +390,7 @@
     36@@ -382,6 +389,7 @@
    3837 %package -n dkms-%{name}
    3938 Summary:        DKMS-ready kernel source for AFS distributed filesystem
     
    4342 %if %{fedorakmod}
    4443 Provides: %{name}-kmod = %{version}
    45 @@ -403,6 +412,7 @@
     44@@ -403,6 +411,7 @@
    4645 
    4746 %if %{build_authlibs}
     
    5150 Group: Networking/Filesystems
    5251 
    53 @@ -419,6 +429,7 @@
     52@@ -419,6 +428,7 @@
    5453 %endif
    5554 
     
    5958 Requires: openafs-authlibs = %{version}-%{release}
    6059 %endif
    61 @@ -437,6 +448,7 @@
     60@@ -437,6 +447,7 @@
    6261 libraries.
    6362 
     
    6766 Group: Development/Filesystems
    6867 Requires: openafs = %{version}-%{release}
    69 @@ -466,6 +478,7 @@
     68@@ -466,6 +477,7 @@
    7069 administrators.
    7170 
     
    7574 Group: Networking/Filesystems
    7675 Provides: openafs-kernel = %{version}
    77 @@ -515,6 +528,7 @@
     76@@ -515,6 +527,7 @@
    7877 
    7978 %if %{krb5support}
     
    8382 Requires: openafs = %{version}
    8483 Group: Networking/Filesystems
    85 @@ -541,7 +555,7 @@
     84@@ -541,7 +554,7 @@
    8685 %if %{build_modules}
    8786 
     
    9291 %else
    9392 
    94 @@ -698,6 +712,12 @@
     93@@ -698,6 +711,11 @@
    9594 #%setup -q -n %{srcdir}
    9695 %setup -q -b 1 -n %{srcdir}
     
    10099+%patch1002 -p1 -b .systemd-crond
    101100+%patch1003 -p1 -b .systemd-csdb
    102 +%patch1004 -p1 -b .vcache
    103101+
    104102 ##############################################################################
    105103 #
    106104 # building
    107 @@ -869,6 +889,8 @@
     105@@ -869,6 +887,8 @@
    108106 %endif
    109107 %endif
     
    114112        --prefix=%{_prefix} \
    115113        --libdir=%{_libdir} \
    116 @@ -1257,6 +1279,13 @@
     114@@ -1257,6 +1277,13 @@
    117115 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsrpc.so
    118116 rm -f $RPM_BUILD_ROOT%{_libdir}/libafsauthent.so.*
Note: See TracChangeset for help on using the changeset viewer.