Changeset 2671
- Timestamp:
- Feb 20, 2015, 11:26:41 PM (10 years ago)
- Location:
- trunk/server
- Files:
-
- 4 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/server/fedora/Makefile
r2659 r2671 41 41 42 42 dload = ${PWD}/.dload 43 openafs_url = "http://www.openafs.org/dl/openafs/candidate/1.6.11pre 1/openafs-1.6.11-0.pre1.src.rpm"43 openafs_url = "http://www.openafs.org/dl/openafs/candidate/1.6.11pre2/openafs-1.6.11-0.pre2.src.rpm" 44 44 #zephyr_url = "http://zephyr.1ts.org/files/zephyr-3.0.2.tar.gz" 45 45 -
trunk/server/fedora/specs/openafs.spec.patch
r2659 r2671 5 5 # for beta/rc releases make pkgrel 0.<tag> 6 6 # for real releases make pkgrel 1 (or more for extra releases) 7 -%define pkgrel 0.pre 18 +%define pkgrel 0.pre 1.99.scripts.%{scriptsversion}7 -%define pkgrel 0.pre2 8 +%define pkgrel 0.pre2.99.scripts.%{scriptsversion} 9 9 10 10 %{!?fedorakmod: %define fedorakmod 1} 11 11 %{!?build_dkmspkg: %define build_dkmspkg 1} 12 @@ -249,9 +249,1 8@@12 @@ -249,9 +249,14 @@ 13 13 %if %{build_modules} 14 14 BuildRequires: kernel-devel … … 20 20 +Patch1000: openafs-scripts.patch 21 21 +Patch1003: openafs-systemd-csdb.patch 22 +Patch1007: openafs-mvid-NULL-deref.patch23 +Patch1008: openafs-afs_conn-overcounts.patch24 +Patch1009: openafs-d_splice_alias-reference.patch25 +Patch1010: openafs-d_u.d_alias.patch26 22 +%define _default_patch_fuzz 2 27 23 + … … 94 90 %else 95 91 96 @@ -698,6 +712,1 4@@92 @@ -698,6 +712,10 @@ 97 93 #%setup -q -n %{srcdir} 98 94 %setup -q -b 1 -n %{srcdir} … … 101 97 +%patch1000 -p1 -b .scripts 102 98 +%patch1003 -p1 -b .systemd-csdb 103 +%patch1007 -p1 -b .mvid-NULL-deref.patch104 +%patch1008 -p1 -b .afs_conn-overcounts.patch105 +%patch1009 -p1 -b .d_splice_alias-reference106 +%patch1010 -p1 -b .d_u.d_alias107 99 + 108 100 ##############################################################################
Note: See TracChangeset
for help on using the changeset viewer.