rpms/xtables-addons-kmod/devel xtables-addons-kmod.spec,1.75,1.76
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv630
Modified Files:
xtables-addons-kmod.spec
Log Message:
Fixm xtables-kmod in f23
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/xtables-addons-kmod.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- xtables-addons-kmod.spec 24 Oct 2015 14:12:53 -0000 1.75
+++ xtables-addons-kmod.spec 24 Oct 2015 16:31:19 -0000 1.76
@@ -5,6 +5,9 @@
# a new akmod package will only get build when a new one is actually needed
#global buildforkernels newest
+#FIXME xtables-kmod doesn't use the appropriate cflags
+%global debug_package %{nil}
+
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 2.9
8 years, 6 months
rpms/xtables-addons-kmod/devel xtables-addons-kmod.spec, 1.74, 1.75 sources, 1.17, 1.18 .cvsignore, 1.16, 1.17
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27686
Modified Files:
xtables-addons-kmod.spec sources .cvsignore
Log Message:
Update to 2.9
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/xtables-addons-kmod.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- xtables-addons-kmod.spec 6 Oct 2015 09:20:20 -0000 1.74
+++ xtables-addons-kmod.spec 24 Oct 2015 14:12:53 -0000 1.75
@@ -3,12 +3,12 @@
# "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 newest
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
-Version: 2.7
-Release: 1%{?dist}.6
+Version: 2.9
+Release: 1%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -65,6 +65,9 @@
rm -rf %{buildroot}
%changelog
+* Sat Oct 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.9-1
+- Update to 2.9
+
* Tue Oct 06 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.7-1.6
- Rebuilt for kernel
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 30 Jul 2015 08:23:24 -0000 1.17
+++ sources 24 Oct 2015 14:12:53 -0000 1.18
@@ -1 +1 @@
-81bd7ba82e5f7bfd1458fc97ddf72e1d xtables-addons-2.7.tar.xz
+87df49f3804036eccd4619f566d26bb3 xtables-addons-2.9.tar.xz
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 30 Jul 2015 08:23:24 -0000 1.16
+++ .cvsignore 24 Oct 2015 14:12:53 -0000 1.17
@@ -1 +1 @@
-xtables-addons-2.7.tar.xz
+xtables-addons-2.9.tar.xz
8 years, 6 months
rpms/xtables-addons/devel sources, 1.17, 1.18 .cvsignore, 1.16, 1.17 xtables-addons.spec, 1.23, 1.24
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27540
Modified Files:
sources .cvsignore xtables-addons.spec
Log Message:
Update to 2.9
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 30 Jul 2015 08:21:49 -0000 1.17
+++ sources 24 Oct 2015 14:11:47 -0000 1.18
@@ -1 +1 @@
-81bd7ba82e5f7bfd1458fc97ddf72e1d xtables-addons-2.7.tar.xz
+87df49f3804036eccd4619f566d26bb3 xtables-addons-2.9.tar.xz
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 30 Jul 2015 08:21:49 -0000 1.16
+++ .cvsignore 24 Oct 2015 14:11:47 -0000 1.17
@@ -1 +1 @@
-xtables-addons-2.7.tar.xz
+xtables-addons-2.9.tar.xz
Index: xtables-addons.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons/devel/xtables-addons.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xtables-addons.spec 30 Jul 2015 08:21:49 -0000 1.23
+++ xtables-addons.spec 24 Oct 2015 14:11:47 -0000 1.24
@@ -1,6 +1,6 @@
Name: xtables-addons
Summary: Extensions targets and matches for iptables
-Version: 2.7
+Version: 2.9
Release: 1%{?dist}
# The entire source code is GPLv2 except ACCOUNT/libxt_ACCOUNT_cl.* which is LGPLv2
License: GPLv2 and LGPLv2
@@ -59,6 +59,9 @@
%{_mandir}/man?/*
%changelog
+* Sat Oct 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.9-1
+- Update to 2.9
+
* Thu Jul 30 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 2.7-1
- Update to 2.7
8 years, 6 months
rpms/libdvbpsi/devel libdvbpsi-calloc.patch, NONE, 1.1 libdvbpsi.spec, 1.16, 1.17
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libdvbpsi/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21578
Modified Files:
libdvbpsi.spec
Added Files:
libdvbpsi-calloc.patch
Log Message:
Backport patch
libdvbpsi-calloc.patch:
dr_50.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE libdvbpsi-calloc.patch ---
>From 5058ea22730a67f03dd253dce89d513bc430bfb6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman(a)videolan.org>
Date: Fri, 5 Sep 2014 12:11:49 +0200
Subject: [PATCH] dr_50: fix off-by-6
---
src/descriptors/dr_50.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/descriptors/dr_50.c b/src/descriptors/dr_50.c
index a2e491c..9933b08 100644
--- a/src/descriptors/dr_50.c
+++ b/src/descriptors/dr_50.c
@@ -70,7 +70,7 @@ dvbpsi_component_dr_t* dvbpsi_DecodeComponentDr(dvbpsi_descriptor_t * p_descript
if (p_descriptor->i_length > 6)
{
p_decoded->i_text_length = p_descriptor->i_length - 6;
- p_decoded->i_text = calloc(p_decoded->i_text_length - 6, sizeof(uint8_t));
+ p_decoded->i_text = calloc(1, p_decoded->i_text_length);
if (!p_decoded->i_text)
{
free(p_decoded);
--
1.7.10.4
Index: libdvbpsi.spec
===================================================================
RCS file: /cvs/free/rpms/libdvbpsi/devel/libdvbpsi.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- libdvbpsi.spec 26 Apr 2015 17:18:06 -0000 1.16
+++ libdvbpsi.spec 24 Oct 2015 11:07:43 -0000 1.17
@@ -4,12 +4,13 @@
Summary: Library for MPEG TS and DVB PSI tables decoding and generation
Name: libdvbpsi
Version: 1.2.0
-Release: 2%{?pre}%{?dist}
+Release: 3%{?pre}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.videolan.org/developers/libdvbpsi.html
Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{name}-%{version}%...
Patch0: libdvbpsi-backport-werror_on_debug.patch
+Patch1: libdvbpsi-calloc.patch
BuildRequires: graphviz doxygen
BuildRequires: libtool
@@ -32,6 +33,7 @@
%prep
%setup -q -n %{name}-%{version}%{?pre}
%patch0 -p1
+%patch1 -p1
autoreconf -vif
@@ -61,6 +63,9 @@
%changelog
+* Sat Oct 24 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.0-3
+- backport patch - rfbz#3729
+
* Sun Apr 26 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.0-2
- Backport patch to disable Werror - fix f22
8 years, 6 months
rpms/kodi/devel .cvsignore, 1.6, 1.7 kodi-generate-tarball-xz.sh, 1.5, 1.6 kodi.spec, 1.7, 1.8 sources, 1.6, 1.7
by Michael Cronenworth
Author: mooninite
Update of /cvs/free/rpms/kodi/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25883
Modified Files:
.cvsignore kodi-generate-tarball-xz.sh kodi.spec sources
Log Message:
* Thu Oct 22 2015 Michael Cronenworth <mike(a)cchtml.com> - 15.2-1
- Kodi 15.2 final
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kodi/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 17 Aug 2015 03:17:33 -0000 1.6
+++ .cvsignore 23 Oct 2015 04:30:48 -0000 1.7
@@ -1 +1 @@
-kodi-15.1-patched.tar.xz
+kodi-15.2-patched.tar.xz
Index: kodi-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/kodi/devel/kodi-generate-tarball-xz.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kodi-generate-tarball-xz.sh 17 Aug 2015 03:17:33 -0000 1.5
+++ kodi-generate-tarball-xz.sh 23 Oct 2015 04:30:48 -0000 1.6
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=15
-MINORVERSION=1
+MINORVERSION=2
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Isengard
Index: kodi.spec
===================================================================
RCS file: /cvs/free/rpms/kodi/devel/kodi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kodi.spec 17 Aug 2015 03:17:33 -0000 1.7
+++ kodi.spec 23 Oct 2015 04:30:48 -0000 1.8
@@ -6,7 +6,7 @@
%global _hardened_build 1
Name: kodi
-Version: 15.1
+Version: 15.2
Release: 1%{?dist}
Summary: Media center
@@ -41,9 +41,6 @@
# Remove call to internal ffmpeg function (misued anyway)
Patch5: kodi-14.0-dvddemux-ffmpeg.patch
-# The screensaver needs updating for GCC5
-Patch6: kodi-15.0-gcc5.patch
-
# Kodi is the renamed XBMC project
Obsoletes: xbmc < 14.0-1
Provides: xbmc = %{version}
@@ -264,7 +261,6 @@
%patch3 -p1
%patch4 -p1
%patch5 -p0
-%patch6 -p1
%if 0%{?_with_hdhomerun}
%else
@@ -439,6 +435,9 @@
%changelog
+* Thu Oct 22 2015 Michael Cronenworth <mike(a)cchtml.com> - 15.2-1
+- Kodi 15.2 final
+
* Sun Aug 16 2015 Michael Cronenworth <mike(a)cchtml.com> - 15.1-1
- Kodi 15.1 final
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kodi/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 17 Aug 2015 03:17:33 -0000 1.6
+++ sources 23 Oct 2015 04:30:48 -0000 1.7
@@ -1 +1 @@
-c196a1ebf2b76ea1b98b226398709ce7 kodi-15.1-patched.tar.xz
+461cdf6e3740af9c0fd973d82ff1eed3 kodi-15.2-patched.tar.xz
8 years, 6 months
rpms/VirtualBox-kmod/devel VirtualBox-kmod.spec,1.84,1.85
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24395
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Mon Oct 05 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.30-2
- Rebuild to fix missing akmod.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/devel/VirtualBox-kmod.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- VirtualBox-kmod.spec 6 Oct 2015 09:20:10 -0000 1.84
+++ VirtualBox-kmod.spec 20 Oct 2015 22:54:32 -0000 1.85
@@ -3,7 +3,7 @@
# "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 newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -20,8 +20,8 @@
%bcond_without hardening
Name: VirtualBox-kmod
-Version: 4.3.30
-Release: 2%{?prerel:.%{prerel}}%{?dist}.1
+Version: 4.3.32
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -99,6 +99,9 @@
%changelog
+* Tue Oct 20 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.32-1
+- New upstream release (4.3.32), build akmod.
+
* Tue Oct 06 2015 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.30-2.1
- Rebuilt for kernel
8 years, 6 months
rpms/VirtualBox/devel .cvsignore, 1.62, 1.63 VirtualBox-4.3.0-no-bundles.patch, 1.1, 1.2 VirtualBox.spec, 1.75, 1.76 sources, 1.62, 1.63 diff_smap_4.patch, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23958
Modified Files:
.cvsignore VirtualBox-4.3.0-no-bundles.patch VirtualBox.spec
sources
Removed Files:
diff_smap_4.patch
Log Message:
* Tue Oct 20 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.32-1
- Update to VirtualBox-4.3.32
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore 15 Jul 2015 22:39:46 -0000 1.62
+++ .cvsignore 20 Oct 2015 22:43:00 -0000 1.63
@@ -1 +1 @@
-VirtualBox-4.3.30.tar.bz2
+VirtualBox-4.3.32.tar.bz2
VirtualBox-4.3.0-no-bundles.patch:
Config.kmk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: VirtualBox-4.3.0-no-bundles.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.3.0-no-bundles.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.3.0-no-bundles.patch 28 Oct 2013 06:29:38 -0000 1.1
+++ VirtualBox-4.3.0-no-bundles.patch 20 Oct 2015 22:43:00 -0000 1.2
@@ -1,10 +1,10 @@
---- ./Config.kmk.nobundles 2013-10-27 21:01:59.094737459 +0000
-+++ ./Config.kmk 2013-10-27 21:09:07.046005624 +0000
-@@ -2742,19 +2742,19 @@ VBOXLNX32GUEST_SUFF_LIB = .so
+--- ./Config.kmk.orig 2015-10-20 22:50:18.402430454 +0100
++++ ./Config.kmk 2015-10-20 23:03:25.601054014 +0100
+@@ -2859,19 +2859,19 @@ VBOXLNX32GUEST_SUFF_LIB = .a
# SDKs for external libraries.
#
SDK_VBOX_LIBXML2 = .
--SDK_VBOX_LIBXML2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.6.31/include
+-SDK_VBOX_LIBXML2_INCS ?= $(PATH_ROOT)/src/libs/libxml2-2.9.2/include
+SDK_VBOX_LIBXML2_INCS ?= /usr/include/libxml2
SDK_VBOX_LIBXML2_DEFS ?= _REENTRANT
SDK_VBOX_LIBXML2_DEFS.win += WIN32 _WINDOWS _MBCS
@@ -12,13 +12,13 @@
# libxml against VBoxRT
SDK_VBOX_LIBPNG = .
--SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.8
+-SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.53
+SDK_VBOX_LIBPNG_INCS ?= /usr/include/libpng15
SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB)
SDK_VBOX_ZLIB = .
if1of ($(KBUILD_TARGET), os2 solaris win)
-- SDK_VBOX_ZLIB_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.2.6
+- SDK_VBOX_ZLIB_INCS ?= $(PATH_ROOT)/src/libs/zlib-1.2.8
+ SDK_VBOX_ZLIB_INCS ?= /usr/include/
SDK_VBOX_ZLIB_LIBS ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
else
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- VirtualBox.spec 15 Jul 2015 22:39:46 -0000 1.75
+++ VirtualBox.spec 20 Oct 2015 22:43:00 -0000 1.76
@@ -26,7 +26,7 @@
#endif
Name: VirtualBox
-Version: 4.3.30
+Version: 4.3.32
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -619,6 +619,9 @@
%changelog
+* Tue Oct 20 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.32-1
+- Update to VirtualBox-4.3.32
+
* Wed Jul 15 2015 Sérgio Basto <sergio(a)serjux.com> - 4.3.30-1
- Update to 4.3.30
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources 15 Jul 2015 22:39:46 -0000 1.62
+++ sources 20 Oct 2015 22:43:00 -0000 1.63
@@ -1 +1 @@
-cc053340f88922a11ad9d4fab56557bd VirtualBox-4.3.30.tar.bz2
+7f11558e9471f0477065b54fba45d4b2 VirtualBox-4.3.32.tar.bz2
--- diff_smap_4.patch DELETED ---
8 years, 6 months
rpms/yle-dl/devel yle-dl.spec,1.7,1.8
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/yle-dl/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10242
Modified Files:
yle-dl.spec
Log Message:
* Sun Oct 18 2015 Sérgio Basto <sergio(a)serjux.com> - 2.8.1-2
- Added to Requires php-mcrypt
Index: yle-dl.spec
===================================================================
RCS file: /cvs/free/rpms/yle-dl/devel/yle-dl.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- yle-dl.spec 22 Sep 2015 22:52:28 -0000 1.7
+++ yle-dl.spec 18 Oct 2015 20:21:40 -0000 1.8
@@ -1,6 +1,6 @@
Name: yle-dl
Version: 2.8.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
Summary: Command-line tool to download videos from Finnish broadcasting company
Group: Applications/Multimedia
@@ -10,7 +10,7 @@
Source1: https://raw.githubusercontent.com/K-S-V/Scripts/master/AdobeHDS.php
BuildRequires: sed
-Requires: rtmpdump, python-crypto, php-cli, php-bcmath, php-xml
+Requires: rtmpdump python-crypto php-cli php-bcmath php-xml php-mcrypt
BuildArch: noarch
#global commit 158c026271198696a7a329b3c2de3e2197de3e25
@@ -51,6 +51,9 @@
%changelog
+* Sun Oct 18 2015 Sérgio Basto <sergio(a)serjux.com> - 2.8.1-2
+- Added to Requires php-mcrypt
+
* Tue Sep 22 2015 Sérgio Basto <sergio(a)serjux.com> - 2.8.1-1
- Update to 2.8.1 and AdobeHDS.php also updated
8 years, 6 months
rpms/wl-kmod/devel wl-kmod-003_gcc_4.9_remove_TIME_DATE_macros.patch, NONE, 1.1 wl-kmod.spec, 1.134, 1.135
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25068
Modified Files:
wl-kmod.spec
Added Files:
wl-kmod-003_gcc_4.9_remove_TIME_DATE_macros.patch
Log Message:
* Sun Oct 18 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-3
- Re-add patch to remove __DATE__ and __TIME__ macros for gcc >= 4.9 in order to allow
reproducible builds - thanks to Tim Thomas
wl-kmod-003_gcc_4.9_remove_TIME_DATE_macros.patch:
wl_linux.c | 9 +++++++++
1 file changed, 9 insertions(+)
--- NEW FILE wl-kmod-003_gcc_4.9_remove_TIME_DATE_macros.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c 2015-10-17 18:26:48.174207806 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2015-10-18 13:28:13.013818788 +0200
@@ -724,7 +724,11 @@
WL_ALL_PASSIVE_ENAB(wl) ? ", Passive Mode" : "", EPI_VERSION_STR);
#ifdef BCMDBG
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)
printf(" (Compiled in " SRCBASE " at " __TIME__ " on " __DATE__ ")");
+#else
+ printf(" (Compiled in " SRCBASE ")");
+#endif
#endif
printf("\n");
@@ -2053,8 +2057,13 @@
void
wl_dump_ver(wl_info_t *wl, struct bcmstrbuf *b)
{
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9)
bcm_bprintf(b, "wl%d: %s %s version %s\n", wl->pub->unit,
__DATE__, __TIME__, EPI_VERSION_STR);
+#else
+ bcm_bprintf(b, "wl%d: version %s\n", wl->pub->unit,
+ EPI_VERSION_STR);
+#endif
}
#if defined(BCMDBG)
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- wl-kmod.spec 18 Oct 2015 00:31:54 -0000 1.134
+++ wl-kmod.spec 18 Oct 2015 11:44:45 -0000 1.135
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -17,6 +17,7 @@
Source11: wl-kmod-kmodtool-excludekernel-filterfile
Patch0: wl-kmod-001_wext_workaround.patch
Patch1: wl-kmod-002_kernel_3.18_null_pointer.patch
+Patch2: wl-kmod-003_gcc_4.9_remove_TIME_DATE_macros.patch
BuildRequires: %{_bindir}/kmodtool
@@ -57,6 +58,7 @@
%endif
%patch0 -p1 -b .wext_workaround.patch
%patch1 -p1 -b .kernel_3.18_null_pointer.patch
+%patch2 -p1 -b .gcc_4.9_remove_TIME_DATE_macros
popd
for kernel_version in %{?kernel_versions} ; do
@@ -86,6 +88,10 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Oct 18 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-3
+- Re-add patch to remove __DATE__ and __TIME__ macros for gcc >= 4.9 in order to allow
+ reproducible builds - thanks to Tim Thomas
+
* Sat Oct 17 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-2
- Re-add patch for kernel >= 3.18
8 years, 6 months
rpms/wl-kmod/devel wl-kmod-002_kernel_3.18_null_pointer.patch, NONE, 1.1 wl-kmod.spec, 1.133, 1.134
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14889
Modified Files:
wl-kmod.spec
Added Files:
wl-kmod-002_kernel_3.18_null_pointer.patch
Log Message:
* Sat Oct 17 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-2
- Re-add patch for kernel >= 3.18
wl-kmod-002_kernel_3.18_null_pointer.patch:
wl_linux.c | 5 +++++
1 file changed, 5 insertions(+)
--- NEW FILE wl-kmod-002_kernel_3.18_null_pointer.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c 2015-09-19 00:47:30.000000000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2015-10-17 18:26:48.174207806 +0200
@@ -2165,8 +2165,13 @@
wlif = WL_DEV_IF(dev);
wl = WL_INFO(dev);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
+ skb->prev = NULL;
+#endif
if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
skb->prev = NULL;
+#endif
TXQ_LOCK(wl);
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- wl-kmod.spec 14 Oct 2015 18:50:16 -0000 1.133
+++ wl-kmod.spec 18 Oct 2015 00:31:54 -0000 1.134
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -16,6 +16,7 @@
Source1: https://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_...
Source11: wl-kmod-kmodtool-excludekernel-filterfile
Patch0: wl-kmod-001_wext_workaround.patch
+Patch1: wl-kmod-002_kernel_3.18_null_pointer.patch
BuildRequires: %{_bindir}/kmodtool
@@ -55,6 +56,7 @@
tar xzf %{SOURCE1}
%endif
%patch0 -p1 -b .wext_workaround.patch
+%patch1 -p1 -b .kernel_3.18_null_pointer.patch
popd
for kernel_version in %{?kernel_versions} ; do
@@ -84,6 +86,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Oct 17 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-2
+- Re-add patch for kernel >= 3.18
+
* Wed Oct 14 2015 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.271-1
- Upstream update to 6.30.223.271
- Patches cleaned-up and removed
8 years, 6 months