rpms/nvidia-xconfig/F-17 .cvsignore, 1.14, 1.15 nvidia-xconfig.spec, 1.14, 1.15 sources, 1.14, 1.15
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-xconfig/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20563
Modified Files:
.cvsignore nvidia-xconfig.spec sources
Log Message:
* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1.0-14
- Update to 295.40
- Fix source url
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/F-17/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 22 Mar 2012 19:04:34 -0000 1.14
+++ .cvsignore 11 Apr 2012 15:47:38 -0000 1.15
@@ -1 +1 @@
-nvidia-xconfig-295.33.tar.bz2
+nvidia-xconfig-295.40.tar.bz2
Index: nvidia-xconfig.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/F-17/nvidia-xconfig.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nvidia-xconfig.spec 22 Mar 2012 19:04:34 -0000 1.14
+++ nvidia-xconfig.spec 11 Apr 2012 15:47:38 -0000 1.15
@@ -1,14 +1,14 @@
-%global nversion 295.33
+%global nversion 295.40
Name: nvidia-xconfig
Version: 1.0
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: NVIDIA X configuration file editor
Group: Applications/System
License: GPLv2+
URL: http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/
-Source0: http://cgit.freedesktop.org/~aplattner/nvidia-xconfig/snapshot/nvidia-xco...
+Source0: ftp://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-%{nversio...
Patch0: nvidia-xconfig-1.0-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,6 +66,10 @@
%{_mandir}/man1/nvidia-xconfig.1.*
%changelog
+* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1.0-14
+- Update to 295.40
+- Fix source url
+
* Thu Mar 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1.0-13
- Update to 295.33
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-xconfig/F-17/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 22 Mar 2012 19:04:34 -0000 1.14
+++ sources 11 Apr 2012 15:47:38 -0000 1.15
@@ -1 +1 @@
-669f16257f11422834ef9e2dca622d43 nvidia-xconfig-295.33.tar.bz2
+b72c1f19b88ffe88017c07d146d179d4 nvidia-xconfig-295.40.tar.bz2
12 years, 7 months
rpms/nvidia-kmod/F-17 nvidia-kmod.spec, 1.99, 1.100 sources, 1.43, 1.44 kernel-3.3.patch, 1.1, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18806
Modified Files:
nvidia-kmod.spec sources
Removed Files:
kernel-3.3.patch
Log Message:
* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.40-1
- Update to 295.40
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-17/nvidia-kmod.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- nvidia-kmod.spec 22 Mar 2012 19:13:43 -0000 1.99
+++ nvidia-kmod.spec 11 Apr 2012 15:33:11 -0000 1.100
@@ -7,7 +7,7 @@
Name: nvidia-kmod
Epoch: 1
-Version: 295.33
+Version: 295.40
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -56,7 +56,6 @@
%endif
done
-
%build
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}/kernel/
@@ -78,6 +77,9 @@
%changelog
+* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.40-1
+- Update to 295.40
+
* Thu Mar 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.33-1
- Update to 295.33
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-17/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources 22 Mar 2012 19:13:43 -0000 1.43
+++ sources 11 Apr 2012 15:33:11 -0000 1.44
@@ -1 +1 @@
-92fc6aab7e1fb41ea63b54bcb688182d nvidia-kmod-data-295.33.tar.xz
+a4cd81835ab8506bf84e4498c679de14 nvidia-kmod-data-295.40.tar.xz
--- kernel-3.3.patch DELETED ---
12 years, 7 months
rpms/nvidia-kmod/F-16 .cvsignore, 1.40, 1.41 nvidia-kmod.spec, 1.124, 1.125 sources, 1.42, 1.43 kernel-3.3.patch, 1.1, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18771
Modified Files:
.cvsignore nvidia-kmod.spec sources
Removed Files:
kernel-3.3.patch
Log Message:
* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.40-1
- Update to 295.40
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-16/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore 25 Mar 2012 12:31:38 -0000 1.40
+++ .cvsignore 11 Apr 2012 15:33:09 -0000 1.41
@@ -1 +1 @@
-nvidia-kmod-data-295.33.tar.bz2
+nvidia-kmod-data-295.40.tar.xz
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-16/nvidia-kmod.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- nvidia-kmod.spec 7 Apr 2012 13:22:31 -0000 1.124
+++ nvidia-kmod.spec 11 Apr 2012 15:33:10 -0000 1.125
@@ -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
-%define buildforkernels newest
+%define buildforkernels current
Name: nvidia-kmod
Epoch: 1
-Version: 295.33
+Version: 295.40
# Taken over by kmodtool
-Release: 2%{?dist}.3
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -46,7 +46,7 @@
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{version}" %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
-
+
for kernel_version in %{?kernel_versions} ; do
%ifarch %{ix86}
@@ -77,6 +77,9 @@
%changelog
+* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.40-1
+- Update to 295.40
+
* Sat Apr 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.33-2.3
- rebuild for updated kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-16/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources 25 Mar 2012 13:31:43 -0000 1.42
+++ sources 11 Apr 2012 15:33:10 -0000 1.43
@@ -1 +1 @@
-92fc6aab7e1fb41ea63b54bcb688182d nvidia-kmod-data-295.33.tar.xz
+a4cd81835ab8506bf84e4498c679de14 nvidia-kmod-data-295.40.tar.xz
--- kernel-3.3.patch DELETED ---
12 years, 7 months
rpms/xorg-x11-drv-nvidia/F-17 sources, 1.43, 1.44 xorg-x11-drv-nvidia.spec, 1.75, 1.76
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17887
Modified Files:
sources xorg-x11-drv-nvidia.spec
Log Message:
* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.40-1
- Update to 295.40
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-17/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources 22 Mar 2012 19:06:38 -0000 1.43
+++ sources 11 Apr 2012 15:26:53 -0000 1.44
@@ -1,2 +1,2 @@
-1634fb3115526caeae5eb8227282bf17 NVIDIA-Linux-x86-295.33.run
-9e172ac5bd8f722d5f4931b5c687942e NVIDIA-Linux-x86_64-295.33.run
+9feabb6e12d1f2ec9ac82573e1088fff NVIDIA-Linux-x86_64-295.40.run
+0bc1561b405443c6d1331934093137fd NVIDIA-Linux-x86-295.40.run
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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xorg-x11-drv-nvidia.spec 22 Mar 2012 19:06:38 -0000 1.75
+++ xorg-x11-drv-nvidia.spec 11 Apr 2012 15:26:53 -0000 1.76
@@ -6,7 +6,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 295.33
+Version: 295.40
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -349,6 +349,9 @@
%changelog
+* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.40-1
+- Update to 295.40
+
* Thu Mar 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.33-1
- Update to 295.33
12 years, 7 months
rpms/xorg-x11-drv-nvidia/F-16 .cvsignore, 1.39, 1.40 sources, 1.40, 1.41 xorg-x11-drv-nvidia.spec, 1.73, 1.74
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17845
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Log Message:
* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.40-1
- Update to 295.40
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- .cvsignore 22 Nov 2011 09:57:32 -0000 1.39
+++ .cvsignore 11 Apr 2012 15:26:48 -0000 1.40
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-290.10.run
-NVIDIA-Linux-x86_64-290.10.run
+NVIDIA-Linux-x86_64-295.40.run
+NVIDIA-Linux-x86-295.40.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources 25 Mar 2012 12:07:11 -0000 1.40
+++ sources 11 Apr 2012 15:26:48 -0000 1.41
@@ -1,2 +1,2 @@
-1634fb3115526caeae5eb8227282bf17 NVIDIA-Linux-x86-295.33.run
-9e172ac5bd8f722d5f4931b5c687942e NVIDIA-Linux-x86_64-295.33.run
+9feabb6e12d1f2ec9ac82573e1088fff NVIDIA-Linux-x86_64-295.40.run
+0bc1561b405443c6d1331934093137fd NVIDIA-Linux-x86-295.40.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-16/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xorg-x11-drv-nvidia.spec 25 Mar 2012 20:53:26 -0000 1.73
+++ xorg-x11-drv-nvidia.spec 11 Apr 2012 15:26:48 -0000 1.74
@@ -6,8 +6,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 295.33
-Release: 3%{?dist}
+Version: 295.40
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -349,6 +349,9 @@
%changelog
+* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.40-1
+- Update to 295.40
+
* Thu Mar 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.33-3
- Update to 295.33
12 years, 7 months
rpms/nvidia-kmod/F-15 nvidia-blacklist-register-mapping-256-285.diff, NONE, 1.1 nvidia-kmod.spec, 1.120, 1.121
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13771
Modified Files:
nvidia-kmod.spec
Added Files:
nvidia-blacklist-register-mapping-256-285.diff
Log Message:
* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:280.13-4
- patch for CVE-2012-0946
nvidia-blacklist-register-mapping-256-285.diff:
nv.c | 6 ++++++
nv.h | 8 ++++++++
2 files changed, 14 insertions(+)
--- NEW FILE nvidia-blacklist-register-mapping-256-285.diff ---
diff -ur kernel/nv.c kernel/nv.c
--- kernel/nv.c 2012-04-05 14:45:07.000000000 -0500
+++ kernel/nv.c 2012-04-05 14:45:07.000000000 -0500
@@ -2279,6 +2279,12 @@
/* NV reg space */
if (IS_REG_OFFSET(nv, NV_VMA_OFFSET(vma), NV_VMA_SIZE(vma)))
{
+ if (IS_BLACKLISTED_REG_OFFSET(nv, NV_VMA_OFFSET(vma), NV_VMA_SIZE(vma)))
+ {
+ status = -EINVAL;
+ goto done;
+ }
+
if (nv_encode_caching(&vma->vm_page_prot,
NV_MEMORY_UNCACHED,
NV_MEMORY_TYPE_REGISTERS))
diff -ur kernel/nv.h kernel/nv.h
--- kernel/nv.h 2012-04-05 14:45:07.000000000 -0500
+++ kernel/nv.h 2012-04-05 14:45:07.000000000 -0500
@@ -435,6 +435,14 @@
((offset) >= (nv)->agp.address) && \
(((offset) + ((length)-1)) <= (nv)->agp.address + ((nv)->agp.size-1)))
+#define IS_REG_RANGE_WITHIN_MAPPING(nv, roffset, rlength, moffset, mlength) \
+ (((moffset) <= ((nv)->regs->address + ((roffset) + (rlength)-1))) &&\
+ (((moffset) + (mlength)-1) >= ((nv)->regs->address + (roffset))))
+
+#define IS_BLACKLISTED_REG_OFFSET(nv, offset, length) \
+ ((IS_REG_RANGE_WITHIN_MAPPING(nv, 0x1000, 0x1000, offset, length)) ||\
+ (IS_REG_RANGE_WITHIN_MAPPING(nv, 0x700000, 0x100000, offset, length)))
+
/* duplicated from nvos.h for external builds */
#ifndef NVOS_AGP_CONFIG_DISABLE_AGP
# define NVOS_AGP_CONFIG_DISABLE_AGP (0x00000000)
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-15/nvidia-kmod.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- nvidia-kmod.spec 3 Apr 2012 18:28:17 -0000 1.120
+++ nvidia-kmod.spec 11 Apr 2012 14:50:11 -0000 1.121
@@ -9,7 +9,7 @@
Epoch: 1
Version: 280.13
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -26,6 +26,8 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: kernel-3.3.patch
+#http://nvidia.custhelp.com/app/answers/detail/a_id/3109
+Patch1: nvidia-blacklist-register-mapping-256-285.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +55,7 @@
do
pushd nvidiapkg-${arch}
%patch0 -p1
+%patch1 -p0
popd
done
@@ -95,6 +98,9 @@
%changelog
+* Wed Apr 11 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:280.13-4
+- patch for CVE-2012-0946
+
* Tue Apr 03 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:280.13-3
- patched to build with 3.3.0 kernel
12 years, 7 months
rpms/ffmpeg/devel ffmpeg.spec,1.59,1.60
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29363/devel
Modified Files:
ffmpeg.spec
Log Message:
My bad, it's now the default - only existed around 0.6x
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ffmpeg.spec 10 Apr 2012 22:33:31 -0000 1.59
+++ ffmpeg.spec 11 Apr 2012 12:05:49 -0000 1.60
@@ -134,7 +134,6 @@
--enable-libxvid \\\
--enable-x11grab \\\
--enable-avfilter \\\
- --enable-avfilter-lavf \\\
--enable-postproc \\\
--enable-pthreads \\\
--disable-static \\\
@@ -273,7 +272,6 @@
%changelog
* Tue Apr 10 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.2-2
-- Enable avfilter-lavf
- Explicitely disable neon unless armv7hnl
* Sun Mar 18 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.10.2-1
12 years, 7 months
rpms/ffmpeg/F-17 ffmpeg.spec,1.59,1.60
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29363/F-17
Modified Files:
ffmpeg.spec
Log Message:
My bad, it's now the default - only existed around 0.6x
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-17/ffmpeg.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ffmpeg.spec 10 Apr 2012 22:33:31 -0000 1.59
+++ ffmpeg.spec 11 Apr 2012 12:05:49 -0000 1.60
@@ -134,7 +134,6 @@
--enable-libxvid \\\
--enable-x11grab \\\
--enable-avfilter \\\
- --enable-avfilter-lavf \\\
--enable-postproc \\\
--enable-pthreads \\\
--disable-static \\\
@@ -273,7 +272,6 @@
%changelog
* Tue Apr 10 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.2-2
-- Enable avfilter-lavf
- Explicitely disable neon unless armv7hnl
* Sun Mar 18 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.10.2-1
12 years, 7 months
rpms/ffmpeg/devel ffmpeg.spec,1.58,1.59
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25597/devel
Modified Files:
ffmpeg.spec
Log Message:
Fix missing endif
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ffmpeg.spec 10 Apr 2012 22:31:24 -0000 1.58
+++ ffmpeg.spec 10 Apr 2012 22:33:31 -0000 1.59
@@ -187,6 +187,7 @@
--disable-neon \
%endif
%endif
+%endif
make %{?_smp_mflags}
make documentation
12 years, 7 months
rpms/ffmpeg/F-17 ffmpeg.spec,1.58,1.59
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25597/F-17
Modified Files:
ffmpeg.spec
Log Message:
Fix missing endif
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-17/ffmpeg.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ffmpeg.spec 10 Apr 2012 22:31:25 -0000 1.58
+++ ffmpeg.spec 10 Apr 2012 22:33:31 -0000 1.59
@@ -187,6 +187,7 @@
--disable-neon \
%endif
%endif
+%endif
make %{?_smp_mflags}
make documentation
12 years, 7 months
