rpms/libbdplus/devel sources, 1.2, 1.3 libbdplus.spec, 1.3, 1.4 .cvsignore, 1.2, 1.3 libbdplus-0.1.0-libgcrypt_1.6_support.patch, 1.1, NONE
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/libbdplus/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29719
Modified Files:
sources libbdplus.spec .cvsignore
Removed Files:
libbdplus-0.1.0-libgcrypt_1.6_support.patch
Log Message:
Update to 0.1.1
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libbdplus/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 11 Jan 2014 14:56:26 -0000 1.2
+++ sources 6 Jun 2014 21:20:03 -0000 1.3
@@ -1 +1 @@
-4cf74020b91aafa33075e8ceef4d0e40 libbdplus-0.1.0.tar.bz2
+1c7135d9a58372f15a28a5437e7e7bb8 libbdplus-0.1.1.tar.bz2
Index: libbdplus.spec
===================================================================
RCS file: /cvs/free/rpms/libbdplus/devel/libbdplus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libbdplus.spec 26 Apr 2014 15:02:00 -0000 1.3
+++ libbdplus.spec 6 Jun 2014 21:20:03 -0000 1.4
@@ -1,12 +1,10 @@
Name: libbdplus
-Version: 0.1.0
-Release: 4%{?dist}
+Version: 0.1.1
+Release: 1%{?dist}
Summary: Open implementation of BD+ protocol
License: LGPLv2+
URL: http://www.videolan.org/developers/libbdplus.html
Source0: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}...
-# http://git.videolan.org/gitweb.cgi/libbdplus.git/?p=libbdplus.git;a=patch...
-Patch0: libbdplus-0.1.0-libgcrypt_1.6_support.patch
BuildRequires: libgcrypt-devel
BuildRequires: libaacs-devel >= 0.7.0
@@ -29,7 +27,6 @@
%prep
%setup -q
-%patch0 -p1 -b .libgcrypt-1.6
%build
@@ -58,6 +55,9 @@
%changelog
+* Wed Jun 04 2014 Xavier Bachelot <xavier(a)bachelot.org> - 0.1.1-1
+- Update to 0.1.1.
+
* Sat Apr 26 2014 Xavier Bachelot <xavier(a)bachelot.org> - 0.1.0-4
- Add patch for libgcrypt 1.6 support.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libbdplus/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 11 Jan 2014 14:56:26 -0000 1.2
+++ .cvsignore 6 Jun 2014 21:20:03 -0000 1.3
@@ -1 +1 @@
-libbdplus-0.1.0.tar.bz2
+libbdplus-0.1.1.tar.bz2
--- libbdplus-0.1.0-libgcrypt_1.6_support.patch DELETED ---
10 years, 5 months
rpms/libaacs/devel libaacs.spec, 1.14, 1.15 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9
by Xavier Bachelot
Author: xavierb
Update of /cvs/free/rpms/libaacs/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28949
Modified Files:
libaacs.spec .cvsignore sources
Log Message:
Update to 0.7.1
Index: libaacs.spec
===================================================================
RCS file: /cvs/free/rpms/libaacs/devel/libaacs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libaacs.spec 26 Apr 2014 14:52:49 -0000 1.14
+++ libaacs.spec 6 Jun 2014 21:13:19 -0000 1.15
@@ -4,8 +4,8 @@
%global git_short %(echo '%{git_hash}' | cut -c -13)
Name: libaacs
-Version: 0.7.0
-Release: 4%{?snapshot:.%{tarball_date}git%{git_short}}%{?dist}
+Version: 0.7.1
+Release: 1%{?snapshot:.%{tarball_date}git%{git_short}}%{?dist}
Summary: Open implementation of AACS specification
Group: System Environment/Libraries
License: LGPLv2+
@@ -19,8 +19,6 @@
%else
Source0: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}...
%endif
-# http://git.videolan.org/gitweb.cgi/libaacs.git/?p=libaacs.git;a=patch;h=c...
-Patch0: libaacs-0.7.0-libgcrypt_1.6_support.patch
%if 0%{?snapshot}
BuildRequires: autoconf
@@ -62,7 +60,6 @@
%else
%setup -q
%endif
-%patch0 -p1 -b .libgcrypt-1.6
sed -i -e 's/\r//' KEYDB.cfg
@@ -100,6 +97,9 @@
%changelog
+* Wed Jun 04 2014 Xavier Bachelot <xavier(a)bachelot.org> 0.7.1-1
+- Update to 0.7.1.
+
* Sat Apr 26 2014 Xavier Bachelot <xavier(a)bachelot.org> 0.7.0-4
- Add patch for libgcrypt 1.6 support.
- Tweak the Release: tag to accomodate rpmdev-bumpspec.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/libaacs/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 19 Dec 2013 17:52:26 -0000 1.8
+++ .cvsignore 6 Jun 2014 21:13:19 -0000 1.9
@@ -1 +1 @@
-libaacs-0.7.0.tar.bz2
+libaacs-0.7.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/libaacs/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 19 Dec 2013 17:52:26 -0000 1.8
+++ sources 6 Jun 2014 21:13:19 -0000 1.9
@@ -1 +1 @@
-8da0da893d1f266b31bf8a8fc7c84a84 libaacs-0.7.0.tar.bz2
+3f475fa71352b454a62bcde860e8681c libaacs-0.7.1.tar.bz2
10 years, 5 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.160,1.161
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20153
Modified Files:
nvidia-kmod.spec
Log Message:
* Thu Jun 05 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:337.25-2
- add missing requires to akmod-nvidia package
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- nvidia-kmod.spec 31 May 2014 08:08:33 -0000 1.160
+++ nvidia-kmod.spec 5 Jun 2014 14:19:07 -0000 1.161
@@ -9,7 +9,7 @@
Epoch: 1
Version: 337.25
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -23,10 +23,10 @@
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64 armv7hl
-BuildRequires: xorg-x11-drv-nvidia-kmodsrc >= %{version}
-
# get the needed BuildRequires (in parts depending on what we build for)
-BuildRequires: %{_bindir}/kmodtool
+%global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-kmodsrc >= %{version}
+BuildRequires: %{AkmodsBuildRequires}
+
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
# kmodtool does its magic here
%{expand:%(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) }
@@ -84,6 +84,9 @@
%changelog
+* Thu Jun 05 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:337.25-2
+- add missing requires to akmod-nvidia package
+
* Sat May 31 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:337.25-1
- Update to 337.25
10 years, 5 months
rpms/xorg-x11-drv-nvidia/devel sources,1.70,1.71
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14506
Modified Files:
sources
Log Message:
fix sources
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources 31 May 2014 08:49:43 -0000 1.70
+++ sources 4 Jun 2014 23:51:51 -0000 1.71
@@ -1 +1,3 @@
+37ac863b8cd5fb902f4252704e3b210d NVIDIA-Linux-armv7l-gnueabihf-337.25.run
+2a217632ced8952e21000a51065f85b8 NVIDIA-Linux-x86-337.25.run
25a93e4f9e1888142082f4e1046eaa11 NVIDIA-Linux-x86_64-337.25.run
10 years, 5 months
rpms/xorg-x11-drv-nvidia/devel 00-ignoreabi.conf, 1.2, 1.3 xorg-x11-drv-nvidia.spec, 1.135, 1.136
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14219
Modified Files:
xorg-x11-drv-nvidia.spec
Added Files:
00-ignoreabi.conf
Log Message:
* Wed Jun 04 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:337.25-2
- Add support for IgnoreABI xorg option
Index: 00-ignoreabi.conf
===================================================================
RCS file: 00-ignoreabi.conf
diff -N 00-ignoreabi.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 00-ignoreabi.conf 4 Jun 2014 23:43:40 -0000 1.3
@@ -0,0 +1,3 @@
+Section "ServerFlags"
+ Option "IgnoreABI" "True"
+EndSection
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.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- xorg-x11-drv-nvidia.spec 31 May 2014 08:07:54 -0000 1.135
+++ xorg-x11-drv-nvidia.spec 4 Jun 2014 23:43:40 -0000 1.136
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 337.25
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -22,6 +22,7 @@
Source5: 00-avoid-glamor.conf
Source6: blacklist-nouveau.conf
Source7: alternate-install-present
+Source8: 00-ignoreabi.conf
BuildRequires: desktop-file-utils
%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
@@ -234,6 +235,7 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
@@ -400,6 +402,7 @@
%dir %{_sysconfdir}/nvidia
%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
+%config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
@@ -477,6 +480,9 @@
%{_nvidia_libdir}/libnvidia-ml.so
%changelog
+* Wed Jun 04 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:337.25-2
+- Add support for IgnoreABI xorg option
+
* Sat May 31 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1:337.25-1
- Update to 337.25
- adds support for X.org xserver ABI 18 (xorg-server 1.16)
10 years, 5 months
rpms/vdr-softhddevice/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 vdr-softhddevice.spec, 1.8, 1.9
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-softhddevice/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24541/devel
Modified Files:
.cvsignore sources vdr-softhddevice.spec
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 20 Apr 2014 16:16:36 -0000 1.8
+++ .cvsignore 4 Jun 2014 17:52:02 -0000 1.9
@@ -1 +1 @@
-vdr-plugin-softhddevice-0cdedb88acfc7c77fafefe2d93598db04a01f1ac.tar.bz2
+vdr-plugin-softhddevice-5207af6b2da0df19a58db4932811d38526fde51b.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 20 Apr 2014 16:16:36 -0000 1.8
+++ sources 4 Jun 2014 17:52:02 -0000 1.9
@@ -1 +1 @@
-3eacfc735a767e2d8a48261a0aae43a0 vdr-plugin-softhddevice-0cdedb88acfc7c77fafefe2d93598db04a01f1ac.tar.bz2
+b2545596569e278470f7af25400be6ba vdr-plugin-softhddevice-5207af6b2da0df19a58db4932811d38526fde51b.tar.bz2
Index: vdr-softhddevice.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/devel/vdr-softhddevice.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vdr-softhddevice.spec 20 Apr 2014 16:16:36 -0000 1.8
+++ vdr-softhddevice.spec 4 Jun 2014 17:52:02 -0000 1.9
@@ -1,10 +1,10 @@
-%global commit 0cdedb88acfc7c77fafefe2d93598db04a01f1ac
+%global commit 5207af6b2da0df19a58db4932811d38526fde51b
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20140420
+%global gitdate 20140604
Name: vdr-softhddevice
Version: 0.6.0
-Release: 13.%{gitdate}git%{shortcommit}%{?dist}
+Release: 14.%{gitdate}git%{shortcommit}%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
License: AGPLv3
@@ -74,6 +74,9 @@
%doc ChangeLog README.txt AGPL-3.0.txt
%changelog
+* Wed Jun 04 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.0-14.20140604git5207af6
+- update for new git snapshot
+
* Sun Apr 20 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.0-13.20140420git0cdedb8
- changed Summary
- update for new git snapshot
10 years, 5 months
rpms/vdr-softhddevice/F-20 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 vdr-softhddevice.spec, 1.7, 1.8
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-softhddevice/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24368/F-20
Modified Files:
.cvsignore sources vdr-softhddevice.spec
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/F-20/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 20 Apr 2014 16:16:13 -0000 1.8
+++ .cvsignore 4 Jun 2014 17:51:15 -0000 1.9
@@ -1 +1 @@
-vdr-plugin-softhddevice-0cdedb88acfc7c77fafefe2d93598db04a01f1ac.tar.bz2
+vdr-plugin-softhddevice-5207af6b2da0df19a58db4932811d38526fde51b.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/F-20/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 20 Apr 2014 16:16:13 -0000 1.8
+++ sources 4 Jun 2014 17:51:15 -0000 1.9
@@ -1 +1 @@
-3eacfc735a767e2d8a48261a0aae43a0 vdr-plugin-softhddevice-0cdedb88acfc7c77fafefe2d93598db04a01f1ac.tar.bz2
+b2545596569e278470f7af25400be6ba vdr-plugin-softhddevice-5207af6b2da0df19a58db4932811d38526fde51b.tar.bz2
Index: vdr-softhddevice.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/F-20/vdr-softhddevice.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vdr-softhddevice.spec 20 Apr 2014 16:16:13 -0000 1.7
+++ vdr-softhddevice.spec 4 Jun 2014 17:51:15 -0000 1.8
@@ -1,10 +1,10 @@
-%global commit 0cdedb88acfc7c77fafefe2d93598db04a01f1ac
+%global commit 5207af6b2da0df19a58db4932811d38526fde51b
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20140420
+%global gitdate 20140604
Name: vdr-softhddevice
Version: 0.6.0
-Release: 13.%{gitdate}git%{shortcommit}%{?dist}
+Release: 14.%{gitdate}git%{shortcommit}%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
License: AGPLv3
@@ -74,6 +74,9 @@
%doc ChangeLog README.txt AGPL-3.0.txt
%changelog
+* Wed Jun 04 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.0-14.20140604git5207af6
+- update for new git snapshot
+
* Sun Apr 20 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.0-13.20140420git0cdedb8
- changed Summary
- update for new git snapshot
10 years, 5 months
rpms/ffmpeg/devel .cvsignore, 1.55, 1.56 ffmpeg.spec, 1.108, 1.109 sources, 1.55, 1.56
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24521
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* Wed Jun 04 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.2.3-1
- Updated to 2.2.3
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- .cvsignore 5 May 2014 05:45:41 -0000 1.55
+++ .cvsignore 4 Jun 2014 05:33:13 -0000 1.56
@@ -1 +1 @@
-ffmpeg-2.2.2.tar.bz2
+ffmpeg-2.2.3.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- ffmpeg.spec 5 May 2014 05:45:41 -0000 1.108
+++ ffmpeg.spec 4 Jun 2014 05:33:13 -0000 1.109
@@ -13,7 +13,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 2.2.2
+Version: 2.2.3
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
@@ -282,6 +282,9 @@
%changelog
+* Wed Jun 04 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.2.3-1
+- Updated to 2.2.3
+
* Mon May 05 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.2.2-1
- Updated to 2.2.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources 5 May 2014 05:45:41 -0000 1.55
+++ sources 4 Jun 2014 05:33:13 -0000 1.56
@@ -1 +1 @@
-581affe5d820d89ce21fe3f0316ef2c3 ffmpeg-2.2.2.tar.bz2
+dbb5b6b69bd010916f17df0ae596e0b1 ffmpeg-2.2.3.tar.bz2
10 years, 5 months
rpms/ndiswrapper-kmod/F-19 kernel-3.14.patch, NONE, 1.1 ndiswrapper-kmod.spec, 1.116, 1.117
by Leigh Scott
Author: leigh123linux
Update of /cvs/free/rpms/ndiswrapper-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1227
Modified Files:
ndiswrapper-kmod.spec
Added Files:
kernel-3.14.patch
Log Message:
* Tue Jun 03 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1.59-6
- patch for 3.14 kernel
kernel-3.14.patch:
crt.c | 2 +-
ntoskernel.h | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE kernel-3.14.patch ---
Description: Kernel 3.14 changes
This is a diff consisting of upstream revisions 3199, 3201, 3203.
* Use prandom_seed() instead of net_srandom() on Linux 3.8+
net_srandom() is going away.
* Avoid preempt_enable_no_resched(), it's no longer available for modules
Use preempt_enable() instead. This makes nt_spin_unlock_irqrestore()
fully complementary to nt_spin_lock_irqsave().
* Define reinit_completion() based on the kernel version
Checking for INIT_COMPLETION was a temporary hack needed before Linux
3.13-rc1 was released.
The last patch might not be really related to kernel 3.14, but is included
as well.
Origin: upstream, http://sourceforge.net/p/ndiswrapper/code/
--- a/driver/crt.c
+++ b/driver/crt.c
@@ -467,7 +467,7 @@ noregparm int WIN_FUNC(_win_memcmp,3)
noregparm void WIN_FUNC(_win_srand,1)
(UINT seed)
{
- net_srandom(seed);
+ prandom_seed((__force u32)(seed));
}
noregparm int WIN_FUNC(rand,0)
--- a/driver/ntoskernel.h
+++ b/driver/ntoskernel.h
@@ -347,7 +347,7 @@ static inline void netif_poll_disable(st
#define netdev_notifier_info_to_dev(x) ((struct net_device *)(x))
#endif
-#ifdef INIT_COMPLETION
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0)
static inline void reinit_completion(struct completion *x)
{
INIT_COMPLETION(*x);
@@ -797,9 +797,8 @@ do { \
#define nt_spin_unlock_irqrestore(lock, flags) \
do { \
nt_spin_unlock(lock); \
- preempt_enable_no_resched(); \
+ preempt_enable(); \
local_irq_restore(flags); \
- preempt_check_resched(); \
} while (0)
static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length)
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-19/ndiswrapper-kmod.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- ndiswrapper-kmod.spec 3 Jun 2014 09:39:10 -0000 1.116
+++ ndiswrapper-kmod.spec 3 Jun 2014 22:21:59 -0000 1.117
@@ -3,20 +3,21 @@
# "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 newest
+%global buildforkernels current
#global pre rc1
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.59
-Release: 5%{?pre}%{?dist}.21
+Release: 6%{?pre}%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?pre}.tar.gz
Source11: ndiswrapper-kmodtool-excludekernel-filterfile
Patch0: ndiswrapper-kmod-nomodinfo.patch
+Patch1: kernel-3.14.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -48,6 +49,7 @@
%setup -q -c -T -a 0 -n %{name}-%{version}%{?pre}
(cd ndiswrapper-%{version}%{?pre} ;
%patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
@@ -75,6 +77,9 @@
%changelog
+* Tue Jun 03 2014 Leigh Scott <leigh123linux(a)googlemail.com> - 1.59-6
+- patch for 3.14 kernel
+
* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 1.59-5.21
- Rebuilt for kernel
10 years, 5 months