rpms/wl-kmod/F-19 wl-kmod-001_license.patch, NONE, 1.1 wl-kmod-002_wext_workaround.patch, NONE, 1.1 wl-kmod-003_kernel_3.8.patch, NONE, 1.1 wl-kmod-004_kernel_3.10.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 wl-kmod.spec, 1.91, 1.92 broadcom-wl-5.100.82.112-cfg80211.patch, 1.1, NONE broadcom-wl-5.100.82.112-kernel-3.10.patch, 1.1, NONE broadcom-wl-5.100.82.112-kernel-3.2.patch, 1.2, NONE broadcom-wl-5.100.82.112-kernel-3.4.patch, 1.1, NONE broadcom-wl-5.100.82.112-kernel-3.6.patch, 1.3, NONE
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26442
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
wl-kmod-001_license.patch wl-kmod-002_wext_workaround.patch
wl-kmod-003_kernel_3.8.patch wl-kmod-004_kernel_3.10.patch
Removed Files:
broadcom-wl-5.100.82.112-cfg80211.patch
broadcom-wl-5.100.82.112-kernel-3.10.patch
broadcom-wl-5.100.82.112-kernel-3.2.patch
broadcom-wl-5.100.82.112-kernel-3.4.patch
broadcom-wl-5.100.82.112-kernel-3.6.patch
broadcom-wl-5.100.82.112-kernel-3.8.patch
broadcom-wl-5.100.82.112-kernel-3.9.patch
broadcom-wl-5.100.82.112-license.patch
broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch
broadcom-wl-5.100.82.112-wext_workaround.patch
Log Message:
* Sat Sep 14 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-1
- Upstream update to 6.30.223.141
wl-kmod-001_license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE wl-kmod-001_license.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c 2013-08-01 08:52:22.000000000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c 2013-09-14 16:06:43.404896532 +0200
@@ -179,6 +179,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] =
{
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
wl-kmod-002_wext_workaround.patch:
Makefile | 14 ++++++++++++++
1 file changed, 14 insertions(+)
--- NEW FILE wl-kmod-002_wext_workaround.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/Makefile hybrid-v35_64-nodebug-pcoem-6_30_223_141/Makefile
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/Makefile 2013-08-01 08:52:22.000000000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/Makefile 2013-09-14 17:56:21.206749114 +0200
@@ -18,6 +18,8 @@
#
# $Id: Makefile_kbuild_portsrc 384222 2013-02-10 01:56:57Z $
+API_ETC_FILE := /etc/akmods/akmod-wl-6xx/api
+
ifneq ($(KERNELRELEASE),)
LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \
@@ -36,6 +38,18 @@
fi \
))
+ API_FILE:=$(strip $(shell \
+ if [ -r "$(API_ETC_FILE)" ]; then \
+ echo TRUE; \
+ else \
+ echo FALSE; \
+ fi \
+ ))
+
+ ifeq ($(API_FILE), TRUE)
+ include $(API_ETC_FILE)
+ endif
+
ifneq ($(API),)
ifeq ($(API), CFG80211)
APICHOICE := FORCE_CFG80211
wl-kmod-003_kernel_3.8.patch:
wl_linux.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE wl-kmod-003_kernel_3.8.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c 2013-09-14 16:06:43.404896000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c 2013-09-14 18:22:15.929527944 +0200
@@ -912,7 +912,11 @@
pci_set_drvdata(pdev, NULL);
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
static struct pci_driver wl_pci_driver = {
+#else
+static struct pci_driver wl_pci_driver __refdata = {
+#endif
name: "wl",
probe: wl_pci_probe,
suspend: wl_suspend,
wl-kmod-004_kernel_3.10.patch:
wl_linux.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
--- NEW FILE wl-kmod-004_kernel_3.10.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c 2013-09-14 18:22:15.929527944 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c 2013-09-14 19:48:07.624004896 +0200
@@ -3242,7 +3242,12 @@
wl_tkip_printstats(wl_info_t *wl, bool group_key)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+ struct seq_file sfile;
+ struct seq_file *debug_buf = &sfile;
+#else
char debug_buf[512];
+#endif
int idx;
if (wl->tkipmodops) {
if (group_key) {
@@ -3255,7 +3260,11 @@
wl->tkipmodops->print_stats(debug_buf, wl->tkip_ucast_data);
else
return;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+ printk("%s: TKIP stats from module: %s\n", debug_buf->buf, group_key?"Bcast":"Ucast");
+#else
printk("%s: TKIP stats from module: %s\n", debug_buf, group_key?"Bcast":"Ucast");
+#endif
}
#endif
}
@@ -3414,11 +3423,19 @@
return 0;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
static int
wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
{
wl_info_t * wl = (wl_info_t *)data;
+#else
+static int
+wl_proc_read(struct seq_file *seq, void *offset)
+{
+ wl_info_t * wl = (wl_info_t *)seq->private;
+#endif
int bcmerror, to_user;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
int len;
if (offset > 0) {
@@ -3430,17 +3447,33 @@
WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__));
return 0;
}
+#endif
WL_LOCK(wl);
bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
len = sprintf(buffer, "%d\n", to_user);
+#endif
WL_UNLOCK(wl);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
return len;
+#else
+ seq_printf(seq, "%d\n", to_user);
+ return bcmerror;
+#endif
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
static int
wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *data)
{
wl_info_t * wl = (wl_info_t *)data;
+#else
+static ssize_t
+wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *ppos)
+{
+ struct seq_file *seq = filp->private_data;
+ wl_info_t * wl = (wl_info_t *)seq->private;
+#endif
int from_user = 0;
int bcmerror;
@@ -3451,7 +3484,11 @@
}
if (copy_from_user(&from_user, buff, 1)) {
WL_ERROR(("%s: copy from user failed\n", __FUNCTION__));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
return -EIO;
+#else
+ return -EFAULT;
+#endif
}
if (from_user >= 0x30)
@@ -3465,22 +3502,48 @@
WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror));
return -EIO;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+ *ppos += length;
+#endif
return length;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+static int wl_proc_open(struct inode *inode, struct file *file)
+{
+ return single_open(file, wl_proc_read, PDE_DATA(inode));
+}
+
+static const struct file_operations wl_fops = {
+ .owner = THIS_MODULE,
+ .open = wl_proc_open,
+ .read = seq_read,
+ .write = wl_proc_write,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+#endif
+
static int
wl_reg_proc_entry(wl_info_t *wl)
{
char tmp[32];
sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
+#else
+ if ((wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_fops, wl)) == NULL) {
+ WL_ERROR(("%s: proc_create_data %s failed\n", __FUNCTION__, tmp));
+#endif
ASSERT(0);
return -1;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
wl->proc_entry->read_proc = wl_proc_read;
wl->proc_entry->write_proc = wl_proc_write;
wl->proc_entry->data = wl;
+#endif
return 0;
}
#ifdef WLOFFLD
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 6 Nov 2011 23:40:23 -0000 1.11
+++ .cvsignore 15 Sep 2013 15:06:25 -0000 1.12
@@ -1,3 +1,3 @@
-hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
-hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
-broadcom-wl-kmodtool-excludekernel-filterfile
+hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz
+hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz
+wl-kmod-kmodtool-excludekernel-filterfile
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 6 Nov 2011 23:40:24 -0000 1.12
+++ sources 15 Sep 2013 15:06:25 -0000 1.13
@@ -1,3 +1,3 @@
-310d7ce233a9a352fbe62c451b2ea309 hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
-62d04d148b99f993ef575a71332593a9 hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
-5df50b59ac8a311c81c9ad569ffc2225 broadcom-wl-kmodtool-excludekernel-filterfile
+039f33d2a3ff2890e42717092d1eb0c4 hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz
+f4809d9149e8e60ef95021ae93a4bf21 hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz
+5df50b59ac8a311c81c9ad569ffc2225 wl-kmod-kmodtool-excludekernel-filterfile
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/wl-kmod.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- wl-kmod.spec 30 Aug 2013 06:14:38 -0000 1.91
+++ wl-kmod.spec 15 Sep 2013 15:06:25 -0000 1.92
@@ -3,29 +3,22 @@
# "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
Name: wl-kmod
-Version: 5.100.82.112
-Release: 11%{?dist}.8
+Version: 6.30.223.141
+Release: 1%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v5_100_82_11...
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
-Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.100.82.112-license.patch
-Patch1: broadcom-wl-5.100.82.112-kernel-3.2.patch
-Patch2: broadcom-wl-5.100.82.112-kernel-3.4.patch
-Patch3: broadcom-wl-5.100.82.112-cfg80211.patch
-Patch4: broadcom-wl-5.100.82.112-kernel-3.6.patch
-Patch5: broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch
-Patch6: broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
-Patch7: broadcom-wl-5.100.82.112-wext_workaround.patch
-Patch8: broadcom-wl-5.100.82.112-kernel-3.8.patch
-Patch9: broadcom-wl-5.100.82.112-kernel-3.9.patch
-Patch10: broadcom-wl-5.100.82.112-kernel-3.10.patch
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_2...
+Source11: wl-kmod-kmodtool-excludekernel-filterfile
+Patch0: wl-kmod-001_license.patch
+Patch1: wl-kmod-002_wext_workaround.patch
+Patch2: wl-kmod-003_kernel_3.8.patch
+Patch3: wl-kmod-004_kernel_3.10.patch
BuildRequires: %{_bindir}/kmodtool
@@ -41,7 +34,8 @@
%description
These packages contain Broadcom's IEEE 802.11a/b/g/n hybrid Linux device
driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-,
-BCM4322-, BCM43224-, and BCM43225-, BCM43227- and BCM43228-based hardware.
+BCM4322-, BCM43142-, BCM43224-, BCM43225-, BCM43227-, BCM43228-,
+BCM4331-, BCM4360 and -BCM4352- based hardware.
NOTE: You must read the LICENSE.txt file in the docs directory before using
this software. You should read the fedora.readme file in the docs directory
@@ -64,16 +58,9 @@
tar xzf %{SOURCE1}
%endif
%patch0 -p1 -b .license
-%patch1 -p1 -b .kernel-3.2
-%patch2 -p1 -b .kernel-3.4
-%patch3 -p1 -b .cfg80211
-%patch4 -p1 -b .kernel-3.6
-%patch5 -p1 -b .recent_kernel_semaphore
-%patch6 -p1 -b .recent_kernel_ioctl
-%patch7 -p1 -b .wext_workaround.patch
-%patch8 -p1 -b .kernel-3.8
-%patch9 -p1 -b .kernel-3.9
-%patch10 -p1 -b .kernel-3.10
+%patch1 -p1 -b .wext_workaround.patch
+%patch2 -p1 -b .kernel-3.8
+%patch3 -p1 -b .kernel-3.10
popd
for kernel_version in %{?kernel_versions} ; do
@@ -103,6 +90,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Sep 14 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-1
+- Upstream update to 6.30.223.141
+
* Fri Aug 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-11.8
- Rebuilt for kernel
@@ -124,7 +114,7 @@
* Fri Jul 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-11.1
- Rebuilt for kernel
-* Tue Jul 23 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-11
+* Tue Jul 23 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-11
- Added patch to build for kernel >= 3.10
* Sat Jul 13 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.8
@@ -151,38 +141,38 @@
* Tue May 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-10.1
- Rebuilt for kernel
-* Fri Mar 08 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-10
+* Fri Mar 08 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-10
- Modified patch to build for kernel >= 3.8 rfbz#2715
- Modified patch to build for kernel >= 3.9
-* Mon Mar 04 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-9
+* Mon Mar 04 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-9
- Added patch to build for kernel >= 3.9
-* Fri Mar 01 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-8
+* Fri Mar 01 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-8
- Added patch to build for kernel >= 3.8
* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-7
- Added patch to choose API at build time (WEXT or CFG80211) to workaround #2548 #2562
- Others patches cleaned-up
-* Sat Oct 20 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-6
+* Sat Oct 20 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-6
- Added patch to include semaphore.h in wl_iw.h
- Added patch from Archlinux to disable too many "ERROR @wl_cfg80211_get_station..." messages
in /var/log/messages since activation of CFG80211 API
-* Wed Oct 17 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5.1
+* Wed Oct 17 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5.1
- Cleaned up patch for kernel >= 3.6
-* Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5
+* Tue Oct 16 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5
- Added patch to build for kernel >= 3.6
-* Wed Oct 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-4.1
+* Wed Oct 10 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-4.1
- Added patch to build with CFG80211 API as default for F-17
-* Sun Jun 24 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3.1
+* Sun Jun 24 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3.1
- spec file cleanup
-* Fri Jun 08 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
+* Fri Jun 08 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
- Added patch to build for kernel >= 3.4
* Thu Apr 19 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2.1
@@ -191,16 +181,16 @@
* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-2.1
- Rebuild for UsrMove
-* Mon Jan 09 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2
+* Mon Jan 09 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2
- Added patch to build for kernel >= 3.2
-* Mon Nov 07 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1
+* Mon Nov 07 2011 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1
- Updated version to 5.100.82.112
* Sat Nov 05 2011 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1.1
- Rebuilt for F-16
-* Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1
+* Fri Nov 04 2011 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1
- Updated version to 5.100.82.38
* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 5.60.48.36-2.12
--- broadcom-wl-5.100.82.112-cfg80211.patch DELETED ---
--- broadcom-wl-5.100.82.112-kernel-3.10.patch DELETED ---
--- broadcom-wl-5.100.82.112-kernel-3.2.patch DELETED ---
--- broadcom-wl-5.100.82.112-kernel-3.4.patch DELETED ---
--- broadcom-wl-5.100.82.112-kernel-3.6.patch DELETED ---
--- broadcom-wl-5.100.82.112-kernel-3.8.patch DELETED ---
--- broadcom-wl-5.100.82.112-kernel-3.9.patch DELETED ---
--- broadcom-wl-5.100.82.112-license.patch DELETED ---
--- broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch DELETED ---
--- broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch DELETED ---
--- broadcom-wl-5.100.82.112-wext_workaround.patch DELETED ---
10 years, 7 months
rpms/broadcom-wl/F-19 broadcom-wl-001_license.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 broadcom-wl.spec, 1.20, 1.21 sources, 1.13, 1.14 broadcom-wl-5.100.82.112-license.patch, 1.1, NONE
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/broadcom-wl/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25083
Modified Files:
.cvsignore broadcom-wl.spec sources
Added Files:
broadcom-wl-001_license.patch
Removed Files:
broadcom-wl-5.100.82.112-license.patch
Log Message:
* Sat Sep 14 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-1
- Upstream update to 6.30.223.141
broadcom-wl-001_license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-001_license.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c 2013-08-01 08:52:22.000000000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c 2013-09-14 16:06:43.404896532 +0200
@@ -179,6 +179,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] =
{
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-19/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 19 Apr 2012 06:41:00 -0000 1.12
+++ .cvsignore 15 Sep 2013 14:52:47 -0000 1.13
@@ -1,4 +1,4 @@
-hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
-hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz
+hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz
broadcom-wl-blacklist.conf
README.txt
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-19/broadcom-wl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- broadcom-wl.spec 20 Jan 2013 23:47:16 -0000 1.20
+++ broadcom-wl.spec 15 Sep 2013 14:52:47 -0000 1.21
@@ -1,18 +1,18 @@
Name: broadcom-wl
-Version: 5.100.82.112
-Release: 4%{?dist}
+Version: 6.30.223.141
+Release: 1%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v5_100_82_11...
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_2...
Source2: http://www.broadcom.com/docs/linux_sta/README.txt
Source3: broadcom-wl-blacklist.conf
Source4: 20-wl.conf
Source5: api
Source6: fedora.readme
-Patch0: broadcom-wl-5.100.82.112-license.patch
+Patch0: broadcom-wl-001_license.patch
BuildArch: noarch
Provides: wl-kmod-common = %{version}
@@ -24,8 +24,8 @@
This package contains the license, README.txt and configuration
files for the Broadcom 802.11 Linux STA Driver for WiFi, a Linux
device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-,
-BCM4321-, BCM4322-, BCM43224-, and BCM43225-, BCM43227- and
-BCM43228-based hardware.
+BCM4321-, BCM4322-, BCM43142-, BCM43224-, BCM43225-, BCM43227-,
+BCM43228-, BCM4331-, BCM4360 and -BCM4352- based hardware.
%prep
%setup -q -c
@@ -59,6 +59,9 @@
%config(noreplace) %{_sysconfdir}/akmods/akmod-wl/api
%changelog
+* Sat Sep 14 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-1
+- Upstream update to 6.30.223.141
+
* Mon Jan 21 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-4
- move broadcom-wl-blacklist.conf to %%{_prefix}/lib/modprobe.d/ since new dracut in F-18
- install section cleaned-up
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-19/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 19 Apr 2012 06:41:00 -0000 1.13
+++ sources 15 Sep 2013 14:52:47 -0000 1.14
@@ -1,4 +1,4 @@
-310d7ce233a9a352fbe62c451b2ea309 hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
-62d04d148b99f993ef575a71332593a9 hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
-24e1e33923375ce9ad4c049f27286fd9 broadcom-wl-blacklist.conf
-6fd54aac59a53559d01520f35500693b README.txt
+039f33d2a3ff2890e42717092d1eb0c4 hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz
+f4809d9149e8e60ef95021ae93a4bf21 hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz
+3f3fd4d541bb11f12aaf7b3e1dd7ec71 broadcom-wl-blacklist.conf
+8a6e8708a5e00ab6d841cde51d70eb1b README.txt
--- broadcom-wl-5.100.82.112-license.patch DELETED ---
10 years, 7 months
rpms/broadcom-wl/devel broadcom-wl-001_license.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 broadcom-wl.spec, 1.20, 1.21 sources, 1.13, 1.14 broadcom-wl-5.100.82.112-license.patch, 1.1, NONE
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/broadcom-wl/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23863
Modified Files:
.cvsignore broadcom-wl.spec sources
Added Files:
broadcom-wl-001_license.patch
Removed Files:
broadcom-wl-5.100.82.112-license.patch
Log Message:
* Sat Sep 14 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-1
- Upstream update to 6.30.223.141
broadcom-wl-001_license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-001_license.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c 2013-08-01 08:52:22.000000000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c 2013-09-14 16:06:43.404896532 +0200
@@ -179,6 +179,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] =
{
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 19 Apr 2012 06:41:00 -0000 1.12
+++ .cvsignore 15 Sep 2013 14:39:56 -0000 1.13
@@ -1,4 +1,4 @@
-hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
-hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
+hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz
+hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz
broadcom-wl-blacklist.conf
README.txt
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/broadcom-wl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- broadcom-wl.spec 20 Jan 2013 23:47:16 -0000 1.20
+++ broadcom-wl.spec 15 Sep 2013 14:39:56 -0000 1.21
@@ -1,18 +1,18 @@
Name: broadcom-wl
-Version: 5.100.82.112
-Release: 4%{?dist}
+Version: 6.30.223.141
+Release: 1%{?dist}
Summary: Common files for Broadcom 802.11 STA driver
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v5_100_82_11...
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_2...
Source2: http://www.broadcom.com/docs/linux_sta/README.txt
Source3: broadcom-wl-blacklist.conf
Source4: 20-wl.conf
Source5: api
Source6: fedora.readme
-Patch0: broadcom-wl-5.100.82.112-license.patch
+Patch0: broadcom-wl-001_license.patch
BuildArch: noarch
Provides: wl-kmod-common = %{version}
@@ -24,8 +24,8 @@
This package contains the license, README.txt and configuration
files for the Broadcom 802.11 Linux STA Driver for WiFi, a Linux
device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-,
-BCM4321-, BCM4322-, BCM43224-, and BCM43225-, BCM43227- and
-BCM43228-based hardware.
+BCM4321-, BCM4322-, BCM43142-, BCM43224-, BCM43225-, BCM43227-,
+BCM43228-, BCM4331-, BCM4360 and -BCM4352- based hardware.
%prep
%setup -q -c
@@ -59,6 +59,9 @@
%config(noreplace) %{_sysconfdir}/akmods/akmod-wl/api
%changelog
+* Sat Sep 14 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-1
+- Upstream update to 6.30.223.141
+
* Mon Jan 21 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-4
- move broadcom-wl-blacklist.conf to %%{_prefix}/lib/modprobe.d/ since new dracut in F-18
- install section cleaned-up
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 19 Apr 2012 06:41:00 -0000 1.13
+++ sources 15 Sep 2013 14:39:57 -0000 1.14
@@ -1,4 +1,4 @@
-310d7ce233a9a352fbe62c451b2ea309 hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
-62d04d148b99f993ef575a71332593a9 hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
-24e1e33923375ce9ad4c049f27286fd9 broadcom-wl-blacklist.conf
-6fd54aac59a53559d01520f35500693b README.txt
+039f33d2a3ff2890e42717092d1eb0c4 hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz
+f4809d9149e8e60ef95021ae93a4bf21 hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz
+3f3fd4d541bb11f12aaf7b3e1dd7ec71 broadcom-wl-blacklist.conf
+8a6e8708a5e00ab6d841cde51d70eb1b README.txt
--- broadcom-wl-5.100.82.112-license.patch DELETED ---
10 years, 7 months
rpms/wl-kmod/devel wl-kmod-001_license.patch, NONE, 1.1 wl-kmod-002_wext_workaround.patch, NONE, 1.1 wl-kmod-003_kernel_3.8.patch, NONE, 1.1 wl-kmod-004_kernel_3.10.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 wl-kmod.spec, 1.75, 1.76 broadcom-wl-5.100.82.112-cfg80211.patch, 1.1, NONE broadcom-wl-5.100.82.112-kernel-3.10.patch, 1.1, NONE broadcom-wl-5.100.82.112-kernel-3.2.patch, 1.2, NONE broadcom-wl-5.100.82.112-kernel-3.4.patch, 1.1, NONE broadcom-wl-5.100.82.112-kernel-3.6.patch, 1.3, NON
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22257
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
wl-kmod-001_license.patch wl-kmod-002_wext_workaround.patch
wl-kmod-003_kernel_3.8.patch wl-kmod-004_kernel_3.10.patch
Removed Files:
broadcom-wl-5.100.82.112-cfg80211.patch
broadcom-wl-5.100.82.112-kernel-3.10.patch
broadcom-wl-5.100.82.112-kernel-3.2.patch
broadcom-wl-5.100.82.112-kernel-3.4.patch
broadcom-wl-5.100.82.112-kernel-3.6.patch
broadcom-wl-5.100.82.112-kernel-3.8.patch
broadcom-wl-5.100.82.112-kernel-3.9.patch
broadcom-wl-5.100.82.112-license.patch
broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch
broadcom-wl-5.100.82.112-wext_workaround.patch
Log Message:
* Sat Sep 14 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-1
- Upstream update to 6.30.223.141
wl-kmod-001_license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE wl-kmod-001_license.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c 2013-08-01 08:52:22.000000000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c 2013-09-14 16:06:43.404896532 +0200
@@ -179,6 +179,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] =
{
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
wl-kmod-002_wext_workaround.patch:
Makefile | 14 ++++++++++++++
1 file changed, 14 insertions(+)
--- NEW FILE wl-kmod-002_wext_workaround.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/Makefile hybrid-v35_64-nodebug-pcoem-6_30_223_141/Makefile
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/Makefile 2013-08-01 08:52:22.000000000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/Makefile 2013-09-14 17:56:21.206749114 +0200
@@ -18,6 +18,8 @@
#
# $Id: Makefile_kbuild_portsrc 384222 2013-02-10 01:56:57Z $
+API_ETC_FILE := /etc/akmods/akmod-wl-6xx/api
+
ifneq ($(KERNELRELEASE),)
LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \
@@ -36,6 +38,18 @@
fi \
))
+ API_FILE:=$(strip $(shell \
+ if [ -r "$(API_ETC_FILE)" ]; then \
+ echo TRUE; \
+ else \
+ echo FALSE; \
+ fi \
+ ))
+
+ ifeq ($(API_FILE), TRUE)
+ include $(API_ETC_FILE)
+ endif
+
ifneq ($(API),)
ifeq ($(API), CFG80211)
APICHOICE := FORCE_CFG80211
wl-kmod-003_kernel_3.8.patch:
wl_linux.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE wl-kmod-003_kernel_3.8.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c 2013-09-14 16:06:43.404896000 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c 2013-09-14 18:22:15.929527944 +0200
@@ -912,7 +912,11 @@
pci_set_drvdata(pdev, NULL);
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
static struct pci_driver wl_pci_driver = {
+#else
+static struct pci_driver wl_pci_driver __refdata = {
+#endif
name: "wl",
probe: wl_pci_probe,
suspend: wl_suspend,
wl-kmod-004_kernel_3.10.patch:
wl_linux.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
--- NEW FILE wl-kmod-004_kernel_3.10.patch ---
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c
--- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/wl/sys/wl_linux.c 2013-09-14 18:22:15.929527944 +0200
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/wl/sys/wl_linux.c 2013-09-14 19:48:07.624004896 +0200
@@ -3242,7 +3242,12 @@
wl_tkip_printstats(wl_info_t *wl, bool group_key)
{
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+ struct seq_file sfile;
+ struct seq_file *debug_buf = &sfile;
+#else
char debug_buf[512];
+#endif
int idx;
if (wl->tkipmodops) {
if (group_key) {
@@ -3255,7 +3260,11 @@
wl->tkipmodops->print_stats(debug_buf, wl->tkip_ucast_data);
else
return;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+ printk("%s: TKIP stats from module: %s\n", debug_buf->buf, group_key?"Bcast":"Ucast");
+#else
printk("%s: TKIP stats from module: %s\n", debug_buf, group_key?"Bcast":"Ucast");
+#endif
}
#endif
}
@@ -3414,11 +3423,19 @@
return 0;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
static int
wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
{
wl_info_t * wl = (wl_info_t *)data;
+#else
+static int
+wl_proc_read(struct seq_file *seq, void *offset)
+{
+ wl_info_t * wl = (wl_info_t *)seq->private;
+#endif
int bcmerror, to_user;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
int len;
if (offset > 0) {
@@ -3430,17 +3447,33 @@
WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__));
return 0;
}
+#endif
WL_LOCK(wl);
bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
len = sprintf(buffer, "%d\n", to_user);
+#endif
WL_UNLOCK(wl);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
return len;
+#else
+ seq_printf(seq, "%d\n", to_user);
+ return bcmerror;
+#endif
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
static int
wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *data)
{
wl_info_t * wl = (wl_info_t *)data;
+#else
+static ssize_t
+wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *ppos)
+{
+ struct seq_file *seq = filp->private_data;
+ wl_info_t * wl = (wl_info_t *)seq->private;
+#endif
int from_user = 0;
int bcmerror;
@@ -3451,7 +3484,11 @@
}
if (copy_from_user(&from_user, buff, 1)) {
WL_ERROR(("%s: copy from user failed\n", __FUNCTION__));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
return -EIO;
+#else
+ return -EFAULT;
+#endif
}
if (from_user >= 0x30)
@@ -3465,22 +3502,48 @@
WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror));
return -EIO;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+ *ppos += length;
+#endif
return length;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
+static int wl_proc_open(struct inode *inode, struct file *file)
+{
+ return single_open(file, wl_proc_read, PDE_DATA(inode));
+}
+
+static const struct file_operations wl_fops = {
+ .owner = THIS_MODULE,
+ .open = wl_proc_open,
+ .read = seq_read,
+ .write = wl_proc_write,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+#endif
+
static int
wl_reg_proc_entry(wl_info_t *wl)
{
char tmp[32];
sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
+#else
+ if ((wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_fops, wl)) == NULL) {
+ WL_ERROR(("%s: proc_create_data %s failed\n", __FUNCTION__, tmp));
+#endif
ASSERT(0);
return -1;
}
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
wl->proc_entry->read_proc = wl_proc_read;
wl->proc_entry->write_proc = wl_proc_write;
wl->proc_entry->data = wl;
+#endif
return 0;
}
#ifdef WLOFFLD
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 6 Nov 2011 23:40:23 -0000 1.11
+++ .cvsignore 15 Sep 2013 14:24:22 -0000 1.12
@@ -1,3 +1,3 @@
-hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
-hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
-broadcom-wl-kmodtool-excludekernel-filterfile
+hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz
+hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz
+wl-kmod-kmodtool-excludekernel-filterfile
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 6 Nov 2011 23:40:24 -0000 1.12
+++ sources 15 Sep 2013 14:24:22 -0000 1.13
@@ -1,3 +1,3 @@
-310d7ce233a9a352fbe62c451b2ea309 hybrid-portsrc_x86_64-v5_100_82_112.tar.gz
-62d04d148b99f993ef575a71332593a9 hybrid-portsrc_x86_32-v5_100_82_112.tar.gz
-5df50b59ac8a311c81c9ad569ffc2225 broadcom-wl-kmodtool-excludekernel-filterfile
+039f33d2a3ff2890e42717092d1eb0c4 hybrid-v35_64-nodebug-pcoem-6_30_223_141.tar.gz
+f4809d9149e8e60ef95021ae93a4bf21 hybrid-v35-nodebug-pcoem-6_30_223_141.tar.gz
+5df50b59ac8a311c81c9ad569ffc2225 wl-kmod-kmodtool-excludekernel-filterfile
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- wl-kmod.spec 3 Jul 2013 15:38:12 -0000 1.75
+++ wl-kmod.spec 15 Sep 2013 14:24:22 -0000 1.76
@@ -3,29 +3,22 @@
# "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 current
+%global buildforkernels akmod
Name: wl-kmod
-Version: 5.100.82.112
-Release: 11%{?dist}
+Version: 6.30.223.141
+Release: 1%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
URL: http://www.broadcom.com/support/802.11/linux_sta.php
-Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v5_100_82_11...
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11...
-Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.100.82.112-license.patch
-Patch1: broadcom-wl-5.100.82.112-kernel-3.2.patch
-Patch2: broadcom-wl-5.100.82.112-kernel-3.4.patch
-Patch3: broadcom-wl-5.100.82.112-cfg80211.patch
-Patch4: broadcom-wl-5.100.82.112-kernel-3.6.patch
-Patch5: broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch
-Patch6: broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch
-Patch7: broadcom-wl-5.100.82.112-wext_workaround.patch
-Patch8: broadcom-wl-5.100.82.112-kernel-3.8.patch
-Patch9: broadcom-wl-5.100.82.112-kernel-3.9.patch
-Patch10: broadcom-wl-5.100.82.112-kernel-3.10.patch
+Source0: http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_...
+Source1: http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_2...
+Source11: wl-kmod-kmodtool-excludekernel-filterfile
+Patch0: wl-kmod-001_license.patch
+Patch1: wl-kmod-002_wext_workaround.patch
+Patch2: wl-kmod-003_kernel_3.8.patch
+Patch3: wl-kmod-004_kernel_3.10.patch
BuildRequires: %{_bindir}/kmodtool
@@ -41,7 +34,8 @@
%description
These packages contain Broadcom's IEEE 802.11a/b/g/n hybrid Linux device
driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-,
-BCM4322-, BCM43224-, and BCM43225-, BCM43227- and BCM43228-based hardware.
+BCM4322-, BCM43142-, BCM43224-, BCM43225-, BCM43227-, BCM43228-,
+BCM4331-, BCM4360 and -BCM4352- based hardware.
NOTE: You must read the LICENSE.txt file in the docs directory before using
this software. You should read the fedora.readme file in the docs directory
@@ -64,16 +58,9 @@
tar xzf %{SOURCE1}
%endif
%patch0 -p1 -b .license
-%patch1 -p1 -b .kernel-3.2
-%patch2 -p1 -b .kernel-3.4
-%patch3 -p1 -b .cfg80211
-%patch4 -p1 -b .kernel-3.6
-%patch5 -p1 -b .recent_kernel_semaphore
-%patch6 -p1 -b .recent_kernel_ioctl
-%patch7 -p1 -b .wext_workaround.patch
-%patch8 -p1 -b .kernel-3.8
-%patch9 -p1 -b .kernel-3.9
-%patch10 -p1 -b .kernel-3.10
+%patch1 -p1 -b .wext_workaround.patch
+%patch2 -p1 -b .kernel-3.8
+%patch3 -p1 -b .kernel-3.10
popd
for kernel_version in %{?kernel_versions} ; do
@@ -103,41 +90,44 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Wed Jul 03 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-11
+* Sat Sep 14 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 6.30.223.141-1
+- Upstream update to 6.30.223.141
+
+* Wed Jul 03 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-11
- Modified patch to build for kernel >= 3.10
-* Fri Mar 08 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-10
+* Fri Mar 08 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-10
- Modified patch to build for kernel >= 3.8 rfbz#2715
- Modified patch to build for kernel >= 3.9
-* Mon Mar 04 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-9
+* Mon Mar 04 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-9
- Added patch to build for kernel >= 3.9
-* Fri Mar 01 2013 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-8
+* Fri Mar 01 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-8
- Added patch to build for kernel >= 3.8
* Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-7
- Added patch to choose API at build time (WEXT or CFG80211) to workaround #2548 #2562
- Others patches cleaned-up
-* Sat Oct 20 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-6
+* Sat Oct 20 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-6
- Added patch to include semaphore.h in wl_iw.h
- Added patch from Archlinux to disable too many "ERROR @wl_cfg80211_get_station..." messages
in /var/log/messages since activation of CFG80211 API
-* Wed Oct 17 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5.1
+* Wed Oct 17 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5.1
- Cleaned up patch for kernel >= 3.6
-* Tue Oct 16 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5
+* Tue Oct 16 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-5
- Added patch to build for kernel >= 3.6
-* Wed Oct 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-4.1
+* Wed Oct 10 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-4.1
- Added patch to build with CFG80211 API as default for F-17
-* Sun Jun 24 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3.1
+* Sun Jun 24 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3.1
- spec file cleanup
-* Fri Jun 08 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
+* Fri Jun 08 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-3
- Added patch to build for kernel >= 3.4
* Thu Apr 19 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2.1
@@ -146,16 +136,16 @@
* Tue Feb 07 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-2.1
- Rebuild for UsrMove
-* Mon Jan 09 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2
+* Mon Jan 09 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-2
- Added patch to build for kernel >= 3.2
-* Mon Nov 07 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1
+* Mon Nov 07 2011 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.112-1
- Updated version to 5.100.82.112
* Sat Nov 05 2011 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1.1
- Rebuilt for F-16
-* Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1
+* Fri Nov 04 2011 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1
- Updated version to 5.100.82.38
* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 5.60.48.36-2.12
--- broadcom-wl-5.100.82.112-cfg80211.patch DELETED ---
--- broadcom-wl-5.100.82.112-kernel-3.10.patch DELETED ---
--- broadcom-wl-5.100.82.112-kernel-3.2.patch DELETED ---
--- broadcom-wl-5.100.82.112-kernel-3.4.patch DELETED ---
--- broadcom-wl-5.100.82.112-kernel-3.6.patch DELETED ---
--- broadcom-wl-5.100.82.112-kernel-3.8.patch DELETED ---
--- broadcom-wl-5.100.82.112-kernel-3.9.patch DELETED ---
--- broadcom-wl-5.100.82.112-license.patch DELETED ---
--- broadcom-wl-5.100.82.112-recent_kernel_ioctl.patch DELETED ---
--- broadcom-wl-5.100.82.112-recent_kernel_semaphore.patch DELETED ---
--- broadcom-wl-5.100.82.112-wext_workaround.patch DELETED ---
10 years, 7 months
rpms/minidlna/F-19 .cvsignore, 1.7, 1.8 minidlna-tmpfiles.conf, 1.1, 1.2 minidlna.service, 1.2, 1.3 minidlna.spec, 1.11, 1.12 sources, 1.7, 1.8
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/minidlna/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6275
Modified Files:
.cvsignore minidlna-tmpfiles.conf minidlna.service
minidlna.spec sources
Log Message:
* Sun Sep 15 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.1.0-1
- Updated to upstream 1.1.0
- Better systemd integration
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-19/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 19 May 2013 11:15:24 -0000 1.7
+++ .cvsignore 15 Sep 2013 12:05:48 -0000 1.8
@@ -1,2 +1 @@
-minidlna-1.0.26.tar.gz
-minidlna-1.0.24-debian-manpages.tar.gz
+minidlna-1.1.0.tar.gz
Index: minidlna-tmpfiles.conf
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-19/minidlna-tmpfiles.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- minidlna-tmpfiles.conf 1 May 2012 10:39:24 -0000 1.1
+++ minidlna-tmpfiles.conf 15 Sep 2013 12:05:48 -0000 1.2
@@ -1 +1,2 @@
-d /var/run/minidlna 755 minidlna minidlna
\ No newline at end of file
+d /run/minidlna 0755 minidlna minidlna -
+
Index: minidlna.service
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-19/minidlna.service,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- minidlna.service 3 Nov 2012 18:33:06 -0000 1.2
+++ minidlna.service 15 Sep 2013 12:05:48 -0000 1.3
@@ -5,9 +5,8 @@
[Service]
User=minidlna
Group=minidlna
-Type=forking
-PIDFile=/var/run/minidlna/minidlna.pid
-ExecStart=/usr/sbin/minidlna -f /etc/minidlna.conf -P /var/run/minidlna/minidlna.pid
+Type=simple
+ExecStart=/usr/sbin/minidlnad -S
[Install]
WantedBy=multi-user.target
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-19/minidlna.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- minidlna.spec 26 May 2013 21:50:00 -0000 1.11
+++ minidlna.spec 15 Sep 2013 12:05:48 -0000 1.12
@@ -1,18 +1,16 @@
Name: minidlna
-Version: 1.0.26
-Release: 2%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
Group: System Environment/Daemons
License: GPLv2
URL: http://sourceforge.net/projects/minidlna/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{version}/%{name}-%{version}.ta...
# Systemd unit file
Source1: %{name}.service
-# Debian man pages
-Source2: %{name}-1.0.24-debian-manpages.tar.gz
-# tmpfiles.d configuration for the /var/run directory
-Source3: %{name}-tmpfiles.conf
+# tmpfiles configuration for the /run directory
+Source2: %{name}-tmpfiles.conf
BuildRequires: libuuid-devel
BuildRequires: ffmpeg-devel
@@ -41,62 +39,44 @@
%prep
%setup -q
-%setup -D -T -q -a 2
-# Honor RPM_OPT_FLAGS and include ffmpeg headers
-sed -i 's!CFLAGS = -Wall -g -O3!CFLAGS += -I/usr/include/ffmpeg/!' Makefile
-
-# Verbose Makefile
-sed -i 's/@$(CC)/$(CC)/;s/&& exit 0\; \\//;/echo "The following command failed:/d' Makefile
-
-# Edit the default config file to run the daemon with the minidlna user
-sed -i 's/#db_dir=\/var\/cache\/minidlna/db_dir=\/var\/cache\/minidlna/' \
- %{name}.conf
-sed -i 's/#log_dir=\/var\/log/log_dir=\/var\/log\/minidlna/' \
+# Edit the default config file
+sed -i 's/#log_dir=\/var\/log/#log_dir=\/var\/log\/minidlna/' \
%{name}.conf
%build
-export CFLAGS="%{optflags}"
-make %{?_smp_mflags}
+%configure \
+ --disable-silent-rules \
+ --with-db-path=%{_localstatedir}/cache/%{name} \
+ --with-log-path=%{_localstatedir}/log/%{name} \
+ --enable-tivo
-# Build language catalogs
-pushd po
-for catsrc in *.po; do
- lang="${catsrc%.po}"
- msgfmt -o "$lang.mo" "$catsrc"
-done
-popd
+make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
-make install-conf DESTDIR=%{buildroot}
+
+# Install config file
+mkdir -p %{buildroot}%{_sysconfdir}
+install -m 644 minidlna.conf %{buildroot}%{_sysconfdir}
# Install systemd unit file
mkdir -p %{buildroot}%{_unitdir}
install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
# Install man pages
-mkdir -p %{buildroot}%{_mandir}/man1
-install -m 644 debian-manpages/*.1 %{buildroot}%{_mandir}/man1/
mkdir -p %{buildroot}%{_mandir}/man5
-install -m 644 debian-manpages/*.5 %{buildroot}%{_mandir}/man5/
-
-# Install language catalogs
-pushd po
-for catalog in *.mo; do
- lang="${catalog%.mo}"
- install -d -m 0755 "%{buildroot}%{_datadir}/locale/${lang}/LC_MESSAGES"
- install -m 0644 "$catalog" "%{buildroot}%{_datadir}/locale/${lang}/LC_MESSAGES/minidlna.mo"
-done
-popd
-
-# Install tmpfiles.d
-mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
-install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
-mkdir -p %{buildroot}%{_localstatedir}/run/
-install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/
+install -m 644 minidlna.conf.5 %{buildroot}%{_mandir}/man5/
+mkdir -p %{buildroot}%{_mandir}/man8
+install -m 644 minidlnad.8 %{buildroot}%{_mandir}/man8/
+
+# Install tmpfiles configuration
+mkdir -p %{buildroot}%{_tmpfilesdir}
+install -m 0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+mkdir -p %{buildroot}/run/
+install -d -m 0755 %{buildroot}/run/%{name}/
# Create cache and log directories
mkdir -p %{buildroot}%{_localstatedir}/cache
@@ -140,18 +120,25 @@
%files -f %{name}.lang
%attr(-,minidlna,minidlna) %config(noreplace) %{_sysconfdir}/minidlna.conf
-%{_sbindir}/minidlna
+%{_sbindir}/minidlnad
%{_unitdir}/minidlna.service
-%{_mandir}/man1/%{name}.1*
%{_mandir}/man5/%{name}.conf.5*
-%dir %attr(-,minidlna,minidlna) %{_localstatedir}/run/%{name}
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+%{_mandir}/man8/minidlnad.8*
+%dir %attr(-,minidlna,minidlna) /run/%{name}
+%{_tmpfilesdir}/%{name}.conf
%dir %attr(-,minidlna,minidlna) %{_localstatedir}/cache/%{name}/
%dir %attr(-,minidlna,minidlna) %{_localstatedir}/log/%{name}/
-%doc LICENCE LICENCE.miniupnpd NEWS README TODO
+%doc AUTHORS COPYING LICENCE.miniupnpd NEWS README TODO
%changelog
+* Sun Sep 15 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.1.0-1
+- Updated to upstream 1.1.0
+- Better systemd integration
+
+* Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.26-3
+- Rebuilt for FFmpeg 2.0.x
+
* Sun May 26 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.26-2
- Rebuilt for x264/FFmpeg
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minidlna/F-19/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 19 May 2013 11:15:24 -0000 1.7
+++ sources 15 Sep 2013 12:05:48 -0000 1.8
@@ -1,2 +1 @@
-c8347c0ce44579f9ff2ca24676dcc5f7 minidlna-1.0.26.tar.gz
-2b0eae77aa45ef7f72d7ead1b45e857f minidlna-1.0.24-debian-manpages.tar.gz
+26484a84af3fceafdee26595aae097f7 minidlna-1.1.0.tar.gz
10 years, 7 months
rpms/minidlna/devel .cvsignore, 1.7, 1.8 minidlna-tmpfiles.conf, 1.1, 1.2 minidlna.service, 1.2, 1.3 minidlna.spec, 1.12, 1.13 sources, 1.7, 1.8
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/minidlna/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5536
Modified Files:
.cvsignore minidlna-tmpfiles.conf minidlna.service
minidlna.spec sources
Log Message:
* Sun Sep 15 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.1.0-1
- Updated to upstream 1.1.0
- Better systemd integration
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 19 May 2013 10:57:37 -0000 1.7
+++ .cvsignore 15 Sep 2013 11:57:41 -0000 1.8
@@ -1,2 +1 @@
-minidlna-1.0.26.tar.gz
-minidlna-1.0.24-debian-manpages.tar.gz
+minidlna-1.1.0.tar.gz
Index: minidlna-tmpfiles.conf
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/minidlna-tmpfiles.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- minidlna-tmpfiles.conf 1 May 2012 10:39:24 -0000 1.1
+++ minidlna-tmpfiles.conf 15 Sep 2013 11:57:41 -0000 1.2
@@ -1 +1,2 @@
-d /var/run/minidlna 755 minidlna minidlna
\ No newline at end of file
+d /run/minidlna 0755 minidlna minidlna -
+
Index: minidlna.service
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/minidlna.service,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- minidlna.service 3 Nov 2012 18:33:06 -0000 1.2
+++ minidlna.service 15 Sep 2013 11:57:41 -0000 1.3
@@ -5,9 +5,8 @@
[Service]
User=minidlna
Group=minidlna
-Type=forking
-PIDFile=/var/run/minidlna/minidlna.pid
-ExecStart=/usr/sbin/minidlna -f /etc/minidlna.conf -P /var/run/minidlna/minidlna.pid
+Type=simple
+ExecStart=/usr/sbin/minidlnad -S
[Install]
WantedBy=multi-user.target
Index: minidlna.spec
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/minidlna.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- minidlna.spec 15 Aug 2013 10:17:35 -0000 1.12
+++ minidlna.spec 15 Sep 2013 11:57:41 -0000 1.13
@@ -1,18 +1,16 @@
Name: minidlna
-Version: 1.0.26
-Release: 3%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
Summary: Lightweight DLNA/UPnP-AV server targeted at embedded systems
Group: System Environment/Daemons
License: GPLv2
URL: http://sourceforge.net/projects/minidlna/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{version}/%{name}-%{version}.ta...
# Systemd unit file
Source1: %{name}.service
-# Debian man pages
-Source2: %{name}-1.0.24-debian-manpages.tar.gz
-# tmpfiles.d configuration for the /var/run directory
-Source3: %{name}-tmpfiles.conf
+# tmpfiles configuration for the /run directory
+Source2: %{name}-tmpfiles.conf
BuildRequires: libuuid-devel
BuildRequires: ffmpeg-devel
@@ -41,62 +39,44 @@
%prep
%setup -q
-%setup -D -T -q -a 2
-# Honor RPM_OPT_FLAGS and include ffmpeg headers
-sed -i 's!CFLAGS = -Wall -g -O3!CFLAGS += -I/usr/include/ffmpeg/!' Makefile
-
-# Verbose Makefile
-sed -i 's/@$(CC)/$(CC)/;s/&& exit 0\; \\//;/echo "The following command failed:/d' Makefile
-
-# Edit the default config file to run the daemon with the minidlna user
-sed -i 's/#db_dir=\/var\/cache\/minidlna/db_dir=\/var\/cache\/minidlna/' \
- %{name}.conf
-sed -i 's/#log_dir=\/var\/log/log_dir=\/var\/log\/minidlna/' \
+# Edit the default config file
+sed -i 's/#log_dir=\/var\/log/#log_dir=\/var\/log\/minidlna/' \
%{name}.conf
%build
-export CFLAGS="%{optflags}"
-make %{?_smp_mflags}
+%configure \
+ --disable-silent-rules \
+ --with-db-path=%{_localstatedir}/cache/%{name} \
+ --with-log-path=%{_localstatedir}/log/%{name} \
+ --enable-tivo
-# Build language catalogs
-pushd po
-for catsrc in *.po; do
- lang="${catsrc%.po}"
- msgfmt -o "$lang.mo" "$catsrc"
-done
-popd
+make %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
-make install-conf DESTDIR=%{buildroot}
+
+# Install config file
+mkdir -p %{buildroot}%{_sysconfdir}
+install -m 644 minidlna.conf %{buildroot}%{_sysconfdir}
# Install systemd unit file
mkdir -p %{buildroot}%{_unitdir}
install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
# Install man pages
-mkdir -p %{buildroot}%{_mandir}/man1
-install -m 644 debian-manpages/*.1 %{buildroot}%{_mandir}/man1/
mkdir -p %{buildroot}%{_mandir}/man5
-install -m 644 debian-manpages/*.5 %{buildroot}%{_mandir}/man5/
-
-# Install language catalogs
-pushd po
-for catalog in *.mo; do
- lang="${catalog%.mo}"
- install -d -m 0755 "%{buildroot}%{_datadir}/locale/${lang}/LC_MESSAGES"
- install -m 0644 "$catalog" "%{buildroot}%{_datadir}/locale/${lang}/LC_MESSAGES/minidlna.mo"
-done
-popd
-
-# Install tmpfiles.d
-mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
-install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf
-mkdir -p %{buildroot}%{_localstatedir}/run/
-install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}/
+install -m 644 minidlna.conf.5 %{buildroot}%{_mandir}/man5/
+mkdir -p %{buildroot}%{_mandir}/man8
+install -m 644 minidlnad.8 %{buildroot}%{_mandir}/man8/
+
+# Install tmpfiles configuration
+mkdir -p %{buildroot}%{_tmpfilesdir}
+install -m 0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+mkdir -p %{buildroot}/run/
+install -d -m 0755 %{buildroot}/run/%{name}/
# Create cache and log directories
mkdir -p %{buildroot}%{_localstatedir}/cache
@@ -140,18 +120,22 @@
%files -f %{name}.lang
%attr(-,minidlna,minidlna) %config(noreplace) %{_sysconfdir}/minidlna.conf
-%{_sbindir}/minidlna
+%{_sbindir}/minidlnad
%{_unitdir}/minidlna.service
-%{_mandir}/man1/%{name}.1*
%{_mandir}/man5/%{name}.conf.5*
-%dir %attr(-,minidlna,minidlna) %{_localstatedir}/run/%{name}
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
+%{_mandir}/man8/minidlnad.8*
+%dir %attr(-,minidlna,minidlna) /run/%{name}
+%{_tmpfilesdir}/%{name}.conf
%dir %attr(-,minidlna,minidlna) %{_localstatedir}/cache/%{name}/
%dir %attr(-,minidlna,minidlna) %{_localstatedir}/log/%{name}/
-%doc LICENCE LICENCE.miniupnpd NEWS README TODO
+%doc AUTHORS COPYING LICENCE.miniupnpd NEWS README TODO
%changelog
+* Sun Sep 15 2013 Andrea Musuruane <musuruan(a)gmail.com> - 1.1.0-1
+- Updated to upstream 1.1.0
+- Better systemd integration
+
* Thu Aug 15 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.26-3
- Rebuilt for FFmpeg 2.0.x
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minidlna/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 19 May 2013 10:57:37 -0000 1.7
+++ sources 15 Sep 2013 11:57:41 -0000 1.8
@@ -1,2 +1 @@
-c8347c0ce44579f9ff2ca24676dcc5f7 minidlna-1.0.26.tar.gz
-2b0eae77aa45ef7f72d7ead1b45e857f minidlna-1.0.24-debian-manpages.tar.gz
+26484a84af3fceafdee26595aae097f7 minidlna-1.1.0.tar.gz
10 years, 7 months
rpms/ndiswrapper-kmod/F-19 ndiswrapper-kmod.spec,1.80,1.81
by Arun Babu Neelicattu
Author: abn
Update of /cvs/free/rpms/ndiswrapper-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31535
Modified Files:
ndiswrapper-kmod.spec
Log Message:
Rebuilt for current f19 kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-19/ndiswrapper-kmod.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- ndiswrapper-kmod.spec 15 Sep 2013 05:32:43 -0000 1.80
+++ ndiswrapper-kmod.spec 15 Sep 2013 05:35:05 -0000 1.81
@@ -10,7 +10,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.58
-Release: 4%{?pre}%{?dist}.16
+Release: 4%{?pre}%{?dist}.17
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
10 years, 7 months
rpms/ndiswrapper-kmod/F-19 ndiswrapper-kmod.spec,1.79,1.80
by Arun Babu Neelicattu
Author: abn
Update of /cvs/free/rpms/ndiswrapper-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31339
Modified Files:
ndiswrapper-kmod.spec
Log Message:
Update spec
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-19/ndiswrapper-kmod.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ndiswrapper-kmod.spec 15 Sep 2013 05:17:30 -0000 1.79
+++ ndiswrapper-kmod.spec 15 Sep 2013 05:32:43 -0000 1.80
@@ -18,7 +18,7 @@
Source11: ndiswrapper-kmodtool-excludekernel-filterfile
Patch0: ndiswrapper-kmod-nomodinfo.patch
Patch1: ndiswrapper-1.58-add_taint.patch
-Patch2: ndiswrapper-procfs-api.patch
+Patch2: ndiswrapper-procfs-api.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -51,6 +51,7 @@
(cd ndiswrapper-%{version}%{?pre} ;
%patch0 -p1 -b .orig
%patch1 -p1 -b .orig
+%patch2 -p1 -b .orig
)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
10 years, 7 months
rpms/ndiswrapper-kmod/F-19 ndiswrapper-kmod.spec,1.78,1.79
by Arun Babu Neelicattu
Author: abn
Update of /cvs/free/rpms/ndiswrapper-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30210
Modified Files:
ndiswrapper-kmod.spec
Log Message:
Rebuit for current f19 kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-19/ndiswrapper-kmod.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ndiswrapper-kmod.spec 15 Sep 2013 05:02:42 -0000 1.78
+++ ndiswrapper-kmod.spec 15 Sep 2013 05:17:30 -0000 1.79
@@ -10,7 +10,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.58
-Release: 4%{?pre}%{?dist}.15
+Release: 4%{?pre}%{?dist}.16
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
10 years, 7 months
rpms/ndiswrapper-kmod/F-19 ndiswrapper-kmod.spec,1.77,1.78
by Arun Babu Neelicattu
Author: abn
Update of /cvs/free/rpms/ndiswrapper-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28606
Modified Files:
ndiswrapper-kmod.spec
Log Message:
Rebuit for current f19 kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-19/ndiswrapper-kmod.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ndiswrapper-kmod.spec 15 Sep 2013 04:48:58 -0000 1.77
+++ ndiswrapper-kmod.spec 15 Sep 2013 05:02:42 -0000 1.78
@@ -3,14 +3,14 @@
# "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.58
-Release: 4%{?pre}%{?dist}.14
+Release: 4%{?pre}%{?dist}.15
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
10 years, 7 months