rpms/openafs-kmod/F-17 openafs-kmod.spec,1.85,1.86
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openafs-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23992
Modified Files:
openafs-kmod.spec
Log Message:
* Wed May 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-4.11
- Rebuilt for kernel
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-17/openafs-kmod.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- openafs-kmod.spec 18 Apr 2013 09:28:54 -0000 1.85
+++ openafs-kmod.spec 1 May 2013 08:05:36 -0000 1.86
@@ -21,7 +21,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.2
-Release: 4%{?dist}.10
+Release: 4%{?dist}.11
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -118,6 +118,9 @@
%changelog
+* Wed May 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-4.11
+- Rebuilt for kernel
+
* Thu Apr 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.2-4.10
- Rebuilt for kernel
10 years, 11 months
rpms/ndiswrapper-kmod/F-17 ndiswrapper-kmod.spec,1.122,1.123
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23857
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Wed May 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.58-1.14
- Rebuilt for kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-17/ndiswrapper-kmod.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- ndiswrapper-kmod.spec 18 Apr 2013 09:28:46 -0000 1.122
+++ ndiswrapper-kmod.spec 1 May 2013 08:05:27 -0000 1.123
@@ -10,7 +10,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.58
-Release: 1%{?pre}%{?dist}.13
+Release: 1%{?pre}%{?dist}.14
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -75,6 +75,9 @@
%changelog
+* Wed May 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.58-1.14
+- Rebuilt for kernel
+
* Thu Apr 18 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.58-1.13
- Rebuilt for kernel
10 years, 11 months
rpms/xorg-x11-drv-nvidia/devel xorg-x11-drv-nvidia.spec,1.97,1.98
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23063
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Add nvidia-modprobe (shoudn't be used for us)
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- xorg-x11-drv-nvidia.spec 1 May 2013 07:27:19 -0000 1.97
+++ xorg-x11-drv-nvidia.spec 1 May 2013 07:51:32 -0000 1.98
@@ -333,6 +333,7 @@
%{_bindir}/nvidia-smi
%{_bindir}/nvidia-cuda-proxy-control
%{_bindir}/nvidia-cuda-proxy-server
+%{_bindir}/nvidia-modprobe
#{_sbindir}/nvidia-config-display
# Xorg libs that do not need to be multilib
%dir %{nvidiaxorgdir}
@@ -342,6 +343,7 @@
%{_datadir}/pixmaps/*.png
%{_mandir}/man1/nvidia-smi.*
%{_mandir}/man1/nvidia-cuda-proxy-control.1.*
+%{_mandir}/man1/nvidia-modprobe.1.*
%files libs
%defattr(-,root,root,-)
10 years, 11 months
rpms/nvidia-kmod/devel .cvsignore, 1.54, 1.55 nvidia-kmod.spec, 1.115, 1.116 sources, 1.55, 1.56
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22208/devel
Modified Files:
.cvsignore nvidia-kmod.spec sources
Log Message:
Update to lastest beta
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore 4 Apr 2013 20:33:08 -0000 1.54
+++ .cvsignore 1 May 2013 07:35:12 -0000 1.55
@@ -1 +1 @@
-nvidia-kmod-data-313.30.tar.xz
+nvidia-kmod-data-319.12.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- nvidia-kmod.spec 15 Apr 2013 21:21:24 -0000 1.115
+++ nvidia-kmod.spec 1 May 2013 07:35:12 -0000 1.116
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels akmod
+%global buildforkernels current
Name: nvidia-kmod
Epoch: 1
-Version: 313.30
+Version: 319.12
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,10 +18,7 @@
#ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
#ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
-# <switch me> when sources are on kwizart's repo
-Source0: http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.xz
-#Source0: http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{vers...
-# </switch me>
+Source0: nvidia-kmod-data-%{version}.tar.xz
Source11: nvidia-kmodtool-excludekernel-filterfile
@@ -84,8 +81,11 @@
%changelog
+* Wed May 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.12-1
+- Update to 319.12
+
* Mon Apr 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:313.30-2
-- Build for akmod
+- Build for kernel akmods
* Thu Apr 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:313.30-1
- Update to 313.30
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources 4 Apr 2013 20:33:08 -0000 1.55
+++ sources 1 May 2013 07:35:12 -0000 1.56
@@ -1 +1 @@
-beeea3e11137fd7e0ec598c1946c53b5 nvidia-kmod-data-313.30.tar.xz
+1ded7de108b0cea0c52cebd7b6d9494b nvidia-kmod-data-319.12.tar.xz
10 years, 11 months
rpms/xorg-x11-drv-nvidia/F-18 xorg-x11-drv-nvidia.spec,1.95,1.96
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21892/F-18
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Add support for cuda
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- xorg-x11-drv-nvidia.spec 4 Apr 2013 21:17:06 -0000 1.95
+++ xorg-x11-drv-nvidia.spec 1 May 2013 07:30:40 -0000 1.96
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 304.88
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -74,6 +74,10 @@
Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100
Provides: xorg-x11-drv-nvidia-newest = %{version}-101
+#Support for cuda
+#Don't put an epoch here
+Provides: cuda-driver = %{version}
+
%{?filter_setup:
%filter_from_provides /^libnvidia/d;
%filter_from_provides /^libGLCore\.so/d;
@@ -378,6 +382,9 @@
%changelog
+* Wed May 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.88-2
+- Add support for cuda
+
* Thu Apr 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.88-1
- Update to 304.88
10 years, 11 months
rpms/xorg-x11-drv-nvidia/F-17 xorg-x11-drv-nvidia.spec,1.90,1.91
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21892/F-17
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Add support for cuda
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- xorg-x11-drv-nvidia.spec 4 Apr 2013 21:17:05 -0000 1.90
+++ xorg-x11-drv-nvidia.spec 1 May 2013 07:30:40 -0000 1.91
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 304.88
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -74,6 +74,10 @@
Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100
Provides: xorg-x11-drv-nvidia-newest = %{version}-101
+#Support for cuda
+#Don't put an epoch here
+Provides: cuda-driver = %{version}
+
%{?filter_setup:
%filter_from_provides /^libnvidia/d;
%filter_from_provides /^libGLCore\.so/d;
@@ -378,6 +382,9 @@
%changelog
+* Wed May 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.88-2
+- Add support for cuda
+
* Thu Apr 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:304.88-1
- Update to 304.88
10 years, 11 months
rpms/xorg-x11-drv-nvidia/F-19 xorg-x11-drv-nvidia.spec,1.96,1.97
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21718/F-19
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Add support for cuda
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-19/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- xorg-x11-drv-nvidia.spec 4 Apr 2013 20:16:56 -0000 1.96
+++ xorg-x11-drv-nvidia.spec 1 May 2013 07:28:46 -0000 1.97
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 313.30
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -74,6 +74,10 @@
Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100
Provides: xorg-x11-drv-nvidia-newest = %{version}-101
+#Support for cuda
+#Don't put an epoch here
+Provides: cuda-driver = %{version}
+
%{?filter_setup:
%filter_from_provides /^libnvidia/d;
%filter_from_provides /^libGLCore\.so/d;
@@ -366,6 +370,9 @@
%changelog
+* Wed May 01 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:313.30-2
+- Add support for cuda
+
* Thu Apr 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:313.30-1
- Update to 313.30
10 years, 11 months
rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.54, 1.55 sources, 1.55, 1.56 xorg-x11-drv-nvidia.spec, 1.96, 1.97
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21549/devel
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
Add latest beta
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore 4 Apr 2013 20:16:56 -0000 1.54
+++ .cvsignore 1 May 2013 07:27:19 -0000 1.55
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-313.30.run
-NVIDIA-Linux-x86-313.30.run
+NVIDIA-Linux-x86_64-319.12.run
+NVIDIA-Linux-x86-319.12.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources 4 Apr 2013 20:16:56 -0000 1.55
+++ sources 1 May 2013 07:27:19 -0000 1.56
@@ -1,2 +1,2 @@
-808d28e550785f648b2b23171750b8ad NVIDIA-Linux-x86_64-313.30.run
-69c0f66c9246217a4fe4d28e95bb7bb6 NVIDIA-Linux-x86-313.30.run
+403355ffc74d5c94a5d675b3cc261b37 NVIDIA-Linux-x86_64-319.12.run
+6f8d7de1db4f0fc4675a566470c69274 NVIDIA-Linux-x86-319.12.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- xorg-x11-drv-nvidia.spec 4 Apr 2013 20:16:56 -0000 1.96
+++ xorg-x11-drv-nvidia.spec 1 May 2013 07:27:19 -0000 1.97
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 313.30
+Version: 319.12
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -74,6 +74,10 @@
Obsoletes: xorg-x11-drv-nvidia-newest < %{version}-100
Provides: xorg-x11-drv-nvidia-newest = %{version}-101
+#Support for cuda
+#Don't put an epoch here
+Provides: cuda-driver = %{version}
+
%{?filter_setup:
%filter_from_provides /^libnvidia/d;
%filter_from_provides /^libGLCore\.so/d;
@@ -366,6 +370,9 @@
%changelog
+* Wed Apr 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.12-1
+- Update to 319.12
+
* Thu Apr 04 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:313.30-1
- Update to 313.30
10 years, 11 months
rpms/openafs/F-19 .cvsignore, 1.12, 1.13 openafs.spec, 1.37, 1.38 sources, 1.16, 1.17
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10405
Modified Files:
.cvsignore openafs.spec sources
Log Message:
* Tue Apr 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2.1-1
- Update to OpenAFS 1.6.2.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/F-19/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 14 Feb 2013 22:34:12 -0000 1.12
+++ .cvsignore 1 May 2013 03:37:22 -0000 1.13
@@ -1,2 +1,2 @@
-openafs-1.6.2-src.tar.bz2
-openafs-1.6.2-doc.tar.bz2
+openafs-1.6.2.1-src.tar.bz2
+openafs-1.6.2.1-doc.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-19/openafs.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- openafs.spec 21 Feb 2013 19:49:23 -0000 1.37
+++ openafs.spec 1 May 2013 03:37:22 -0000 1.38
@@ -12,8 +12,8 @@
Summary: Enterprise Network File System
Name: openafs
-Version: 1.6.2
-Release: 2%{?dist}
+Version: 1.6.2.1
+Release: 1%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -453,9 +453,12 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Tue Apr 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2.1-1
+- Update to OpenAFS 1.6.2.1
+
* Thu Feb 21 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-2
- Use newer tarball for 1.6.2 final
-- Fix conditional for %systemd_post on Fedora 17 (RPM Fusion bug #2687)
+- Fix conditional for %%systemd_post on Fedora 17 (RPM Fusion bug #2687)
* Thu Feb 14 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-1
- Update to OpenAFS 1.6.2 final
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-19/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 21 Feb 2013 19:49:24 -0000 1.16
+++ sources 1 May 2013 03:37:22 -0000 1.17
@@ -1,2 +1,2 @@
-ab1335f74214487aa363b614fbfa3a00 openafs-1.6.2-src.tar.bz2
-9b0371dc1451c59c47e9519f697a2826 openafs-1.6.2-doc.tar.bz2
+465092bf21ca7704ed9d175506ba6cef openafs-1.6.2.1-src.tar.bz2
+1cbba36d87490cd4cb7294156abc0672 openafs-1.6.2.1-doc.tar.bz2
10 years, 11 months
rpms/openafs-kmod/F-19 openafs-1.6.2.1-hlist-iterator-change.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 openafs-kmod.spec, 1.29, 1.30 sources, 1.16, 1.17 openafs-1.6.2-Linux-3.8-session_keyring-changes.patch, 1.1, NONE openafs-1.6.2-Linux-3.8-vmtruncate-removal.patch, 1.1, NONE openafs-1.6.2-Linux-Detect-undefined-symbols-in-kernel-modules.patch, 1.1, NONE openafs-1.6.2-Linux-setpag-may-replace-credentials.patch, 1.1, NONE
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1141
Modified Files:
.cvsignore openafs-kmod.spec sources
Added Files:
openafs-1.6.2.1-hlist-iterator-change.patch
Removed Files:
openafs-1.6.2-Linux-3.8-session_keyring-changes.patch
openafs-1.6.2-Linux-3.8-vmtruncate-removal.patch
openafs-1.6.2-Linux-Detect-undefined-symbols-in-kernel-modules.patch
openafs-1.6.2-Linux-setpag-may-replace-credentials.patch
Log Message:
* Tue Apr 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2.1-1
- Update to OpenAFS 1.6.2.1
- Add patches to support kernel 3.9
openafs-1.6.2.1-hlist-iterator-change.patch:
acinclude.m4 | 1 +
src/afs/LINUX/osi_vnodeops.c | 6 +++++-
src/cf/linux-test4.m4 | 15 +++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
--- NEW FILE openafs-1.6.2.1-hlist-iterator-change.patch ---
commit 0671e93abcf927d48f935283682e6761a933d558
Author: Marc Dionne <marc.c.dionne(a)gmail.com>
Date: Tue Mar 5 20:54:50 2013 -0500
Linux 3.9: hlist iterator change
hlist iterators have been reworked to not require a temporary
node parameter.
Reviewed-on: http://gerrit.openafs.org/9403
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman(a)your-file-system.com>
Reviewed-by: Derrick Brashear <shadow(a)your-file-system.com>
(cherry picked from commit 9cfd7f768ca350d3b750e89e7ddb186bdad6f726)
Change-Id: I47df8894467f4bb1c60cf239ec0ce0a4d6ca29aa
Reviewed-on: http://gerrit.openafs.org/9639
Tested-by: BuildBot <buildbot(a)rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow(a)your-file-system.com>
Reviewed-by: Benjamin Kaduk <kaduk(a)mit.edu>
Reviewed-by: Michael Meffie <mmeffie(a)sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand(a)desy.de>
diff --git a/acinclude.m4 b/acinclude.m4
index 4223bb1..6f5bc8d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -991,6 +991,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
LINUX_KMAP_ATOMIC_TAKES_NO_KM_TYPE
LINUX_DENTRY_OPEN_TAKES_PATH
LINUX_D_ALIAS_IS_HLIST
+ LINUX_HLIST_ITERATOR_NO_NODE
LINUX_IOP_I_CREATE_TAKES_BOOL
LINUX_DOP_D_REVALIDATE_TAKES_UNSIGNED
LINUX_IOP_LOOKUP_TAKES_UNSIGNED
diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
index 1366b96..8e7dfe2 100644
--- a/src/afs/LINUX/osi_vnodeops.c
+++ b/src/afs/LINUX/osi_vnodeops.c
@@ -701,7 +701,7 @@ canonical_dentry(struct inode *ip)
{
struct vcache *vcp = VTOAFS(ip);
struct dentry *first = NULL, *ret = NULL, *cur;
-#if defined(D_ALIAS_IS_HLIST)
+#if defined(D_ALIAS_IS_HLIST) && !defined(HLIST_ITERATOR_NO_NODE)
struct hlist_node *p;
#endif
@@ -724,7 +724,11 @@ canonical_dentry(struct inode *ip)
# endif
#if defined(D_ALIAS_IS_HLIST)
+# if defined(HLIST_ITERATOR_NO_NODE)
+ hlist_for_each_entry(cur, &ip->i_dentry, d_alias) {
+# else
hlist_for_each_entry(cur, p, &ip->i_dentry, d_alias) {
+# endif
#else
list_for_each_entry_reverse(cur, &ip->i_dentry, d_alias) {
#endif
diff --git a/src/cf/linux-test4.m4 b/src/cf/linux-test4.m4
index fc0149f..7c0a181 100644
--- a/src/cf/linux-test4.m4
+++ b/src/cf/linux-test4.m4
@@ -714,6 +714,21 @@ AC_DEFUN([LINUX_D_ALIAS_IS_HLIST], [
])
+AC_DEFUN([LINUX_HLIST_ITERATOR_NO_NODE], [
+ AC_CHECK_LINUX_BUILD([whether hlist iterators don't need a node parameter],
+ [ac_cv_linux_hlist_takes_no_node],
+ [#include <linux/list.h>
+ #include <linux/fs.h>],
+ [struct dentry *d = NULL, *cur;
+ struct inode *ip;
+ hlist_for_each_entry(cur, &ip->i_dentry, d_alias) { }
+ ],
+ [HLIST_ITERATOR_NO_NODE],
+ [define if hlist iterators don't need a node parameter],
+ [])
+])
+
+
AC_DEFUN([LINUX_IOP_I_CREATE_TAKES_BOOL], [
AC_CHECK_LINUX_BUILD([whether inode_operations.create takes a bool],
[ac_cv_linux_func_i_create_takes_bool],
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-19/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 14 Feb 2013 23:10:29 -0000 1.13
+++ .cvsignore 1 May 2013 02:32:59 -0000 1.14
@@ -1 +1 @@
-openafs-1.6.2-src.tar.bz2
+openafs-1.6.2.1-src.tar.bz2
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-19/openafs-kmod.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- openafs-kmod.spec 4 Mar 2013 01:16:11 -0000 1.29
+++ openafs-kmod.spec 1 May 2013 02:33:00 -0000 1.30
@@ -20,8 +20,8 @@
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.2
-Release: 3%{?dist}
+Version: 1.6.2.1
+Release: 1%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -32,19 +32,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Upstream patches to support kernel 3.8.
-# http://gerrit.openafs.org/8941
-Patch0: openafs-1.6.2-Linux-3.8-session_keyring-changes.patch
-# http://gerrit.openafs.org/8942
-Patch1: openafs-1.6.2-Linux-3.8-vmtruncate-removal.patch
-
-# Fix "aklog -setpag" on Linux 3.8
-# http://gerrit.openafs.org/8948
-Patch2: openafs-1.6.2-Linux-setpag-may-replace-credentials.patch
-
-# Make broken builds a little easier to debug
-# http://gerrit.openafs.org/9334
-Patch3: openafs-1.6.2-Linux-Detect-undefined-symbols-in-kernel-modules.patch
+# Upstream patch to support kernel 3.9.
+# http://gerrit.openafs.org/9639
+Patch0: openafs-1.6.2.1-hlist-iterator-change.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc, bison, automake
@@ -73,13 +63,8 @@
# apply patches and do other stuff here
pushd %{kmod_name}-%{version}
-# Kernel 3.8 patches
+# Kernel 3.9 patch
%patch0 -p1
-%patch1 -p1
-# Fix "aklog -setpag" on Linux 3.8
-%patch2 -p1
-# Detect undefined symbols in kmods
-%patch3 -p1
./regen.sh
popd
@@ -118,6 +103,10 @@
%changelog
+* Tue Apr 30 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2.1-1
+- Update to OpenAFS 1.6.2.1
+- Add patches to support kernel 3.9
+
* Sat Mar 02 2013 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.2-3
- Add patches to support kernel 3.8
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-19/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 21 Feb 2013 19:48:47 -0000 1.16
+++ sources 1 May 2013 02:33:00 -0000 1.17
@@ -1 +1 @@
-ab1335f74214487aa363b614fbfa3a00 openafs-1.6.2-src.tar.bz2
+465092bf21ca7704ed9d175506ba6cef openafs-1.6.2.1-src.tar.bz2
--- openafs-1.6.2-Linux-3.8-session_keyring-changes.patch DELETED ---
--- openafs-1.6.2-Linux-3.8-vmtruncate-removal.patch DELETED ---
--- openafs-1.6.2-Linux-Detect-undefined-symbols-in-kernel-modules.patch DELETED ---
--- openafs-1.6.2-Linux-setpag-may-replace-credentials.patch DELETED ---
10 years, 11 months