diff --git a/kernel/drivers/module-bbswitch/pspec.xml b/kernel/drivers/module-bbswitch/pspec.xml index 7e77e64a..ee1dc8c4 100644 --- a/kernel/drivers/module-bbswitch/pspec.xml +++ b/kernel/drivers/module-bbswitch/pspec.xml @@ -11,7 +11,7 @@ Kernel module allowing to switch dedicated graphics card on Optimus laptops kernel module allowing to switch dedicated graphics card on Optimus laptops - kernel-module-headers + kernel-module-headers https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz @@ -20,7 +20,7 @@ module-bbswitch - kernel + kernel /lib/modules @@ -34,6 +34,13 @@ + + 2015-08-13 + 0.8 + Rebuild for kernel-4.1.5. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-07-23 0.8 diff --git a/kernel/drivers/module-broadcom-wl/pspec.xml b/kernel/drivers/module-broadcom-wl/pspec.xml index 7af47d1f..c1553d94 100644 --- a/kernel/drivers/module-broadcom-wl/pspec.xml +++ b/kernel/drivers/module-broadcom-wl/pspec.xml @@ -15,7 +15,7 @@ http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz - kernel-module-headers + kernel-module-headers patch/linux-40.patch @@ -30,7 +30,7 @@ module-broadcom-wl - kernel + kernel module-broadcom-wl-userspace @@ -62,6 +62,13 @@ + + 2015-08-13 + 6.30.223.248 + Rebuild for kernel 4.1.5. + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-07-23 6.30.223.248 diff --git a/kernel/drivers/module-virtualbox-guest/pspec.xml b/kernel/drivers/module-virtualbox-guest/pspec.xml index bf76b752..f0269ec3 100644 --- a/kernel/drivers/module-virtualbox-guest/pspec.xml +++ b/kernel/drivers/module-virtualbox-guest/pspec.xml @@ -14,14 +14,14 @@ This package provides the kernel modules needed for mouse integration and shared folder support between VirtualBox host and guest systems. http://source.pisilinux.org/1.0/module-virtualbox-guest-4.3.28.tar.xz - kernel-module-headers + kernel-module-headers module-virtualbox-guest - kernel + kernel baselayout module-virtualbox-guest-userspace @@ -51,22 +51,29 @@ - - + + + 2015-08-13 + 4.3.28 + Rebuild for kernel-4.1.5. + Ertuğrul Erata + ertugrulerata@gmail.com + + 2015-07-23 4.3.28 Rebuild for kernel-4.1.3. Ertuğrul Erata ertugrulerata@gmail.com - - + + 2015-07-20 4.3.28 Rebuild for kernel-4.1.2. Ertuğrul Erata ertugrulerata@gmail.com - - + + 2015-07-13 4.3.28 Rebuild for kernel-4.0.8. diff --git a/kernel/drivers/module-virtualbox/pspec.xml b/kernel/drivers/module-virtualbox/pspec.xml index e977f4bd..8ec83042 100644 --- a/kernel/drivers/module-virtualbox/pspec.xml +++ b/kernel/drivers/module-virtualbox/pspec.xml @@ -14,14 +14,14 @@ This package provides the kernel support for VirtualBox. http://source.pisilinux.org/1.0/module-virtualbox-4.3.28.tar.xz - kernel-module-headers + kernel-module-headers module-virtualbox - kernel + kernel module-virtualbox-userspace @@ -47,21 +47,28 @@ - + + 2015-08-13 + 4.3.28 + Rebuild for kernel-4.1.5. + Ertuğrul Erata + ertugrulerata@gmail.com + + 2015-07-23 4.3.28 Rebuild for kernel-4.1.3. Ertuğrul Erata ertugrulerata@gmail.com - - + + 2015-07-20 4.3.28 Rebuild for kernel-4.1.2. Ertuğrul Erata ertugrulerata@gmail.com - - + + 2015-07-13 4.3.28 Rebuild for kernel-4.0.8. diff --git a/kernel/drivers/ndiswrapper/actions.py b/kernel/drivers/ndiswrapper/actions.py index 4df9548a..df0ef400 100644 --- a/kernel/drivers/ndiswrapper/actions.py +++ b/kernel/drivers/ndiswrapper/actions.py @@ -20,8 +20,13 @@ def build(): autotools.make("-C utils") def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - + pisitools.insinto("/lib/modules/%s/extra" % KDIR, "*/*.ko") + pisitools.dosbin("utils/ndiswrapper*", "/usr/sbin") + pisitools.dosbin("utils/loadndisdriver", "/sbin") + + # add man + pisitools.doman("*.8") + pisitools.dodir("/etc/ndiswrapper") pisitools.dodoc("README", "AUTHORS", "ChangeLog") diff --git a/kernel/drivers/ndiswrapper/files/support_kernel-4.0.patch b/kernel/drivers/ndiswrapper/files/support_kernel-4.0.patch new file mode 100644 index 00000000..97ef75d3 --- /dev/null +++ b/kernel/drivers/ndiswrapper/files/support_kernel-4.0.patch @@ -0,0 +1,41 @@ +From: Julian Andres Klode +Date: Tue, 12 May 2015 17:11:11 +0200 +Subject: Support kernel 4.0 + +--- + driver/ndis.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/driver/ndis.c b/driver/ndis.c +index 9ace34b..fafd2e7 100644 +--- a/driver/ndis.c ++++ b/driver/ndis.c +@@ -25,6 +25,10 @@ + #define MAX_ALLOCATED_NDIS_PACKETS TX_RING_SIZE + #define MAX_ALLOCATED_NDIS_BUFFERS TX_RING_SIZE + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) ++#define strncasecmp strnicmp ++#endif ++ + static struct work_struct ndis_work; + static struct nt_list ndis_work_list; + static spinlock_t ndis_work_list_lock; +@@ -438,7 +442,7 @@ static int read_setting(struct nt_list *setting_list, char *keyname, int length, + struct wrap_device_setting *setting; + mutex_lock(&loader_mutex); + nt_list_for_each_entry(setting, setting_list, list) { +- if (strnicmp(keyname, setting->name, length) == 0) { ++ if (strncasecmp(keyname, setting->name, length) == 0) { + TRACE2("setting %s='%s'", keyname, setting->value); + mutex_unlock(&loader_mutex); + *param = ndis_encode_setting(setting, type); +@@ -502,7 +506,7 @@ wstdcall void WIN_FUNC(NdisWriteConfiguration,4) + + mutex_lock(&loader_mutex); + nt_list_for_each_entry(setting, &nmb->wnd->wd->settings, list) { +- if (strnicmp(keyname, setting->name, ansi.length) == 0) { ++ if (strncasecmp(keyname, setting->name, ansi.length) == 0) { + mutex_unlock(&loader_mutex); + if (ndis_decode_setting(setting, param)) + *status = NDIS_STATUS_FAILURE; diff --git a/kernel/drivers/ndiswrapper/pspec.xml b/kernel/drivers/ndiswrapper/pspec.xml index 4e516886..0b153648 100644 --- a/kernel/drivers/ndiswrapper/pspec.xml +++ b/kernel/drivers/ndiswrapper/pspec.xml @@ -15,8 +15,11 @@ module-ndiswrapper allows you to use Windows XP drivers for WLAN cards without proper Linux drivers. http://download.sourceforge.net/ndiswrapper/ndiswrapper-1.59.tar.gz - kernel-module-headers + kernel-module-headers + + support_kernel-4.0.patch + ndiswrapper-1.59.patch @@ -25,7 +28,7 @@ ndiswrapper - kernel + kernel /lib/modules @@ -35,11 +38,14 @@ /sbin /usr/share/doc + + noDelta + - 2014-04-28 + 2014-08-13 1.59 First release PisiLinux Community diff --git a/kernel/kernel/files/configs/kernel-x86_64-config b/kernel/kernel/files/configs/kernel-x86_64-config index 460a8991..2757db28 100644 --- a/kernel/kernel/files/configs/kernel-x86_64-config +++ b/kernel/kernel/files/configs/kernel-x86_64-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.1.3 Kernel Configuration +# Linux/x86_64 4.1.5 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/kernel/files/patches/linux/patch-4.1.5.xz b/kernel/kernel/files/patches/linux/patch-4.1.5.xz new file mode 100644 index 00000000..25a374ff Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-4.1.5.xz differ diff --git a/kernel/kernel/files/patches/mageia/media-Fix-regression-in-some-more-dib0700-based-devi.patch b/kernel/kernel/files/patches/mageia/media-Fix-regression-in-some-more-dib0700-based-devi.patch deleted file mode 100644 index 590b2258..00000000 --- a/kernel/kernel/files/patches/mageia/media-Fix-regression-in-some-more-dib0700-based-devi.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Thomas Reitmayr -Date: Fri, 1 May 2015 20:18:04 -0300 -Subject: [PATCH] media: Fix regression in some more dib0700 based devices - -Fix an oops during device initialization by correctly setting size_of_priv -instead of leaving it 0. -The regression was introduced by 8abe4a0a3f6d4217b16a ("[media] dib7000: -export just one symbol") and only fixed for one type of dib0700 based -devices in 9e334c75642b6e5bfb95 ("[media] Fix regression in some dib0700 -based devices"). - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=92301 - -Fixes: 8abe4a0a3f6d4217b16a ("[media] dib7000: export just one symbol") - -Cc: stable@vger.kernel.org # for version 3.17+ -Signed-off-by: Thomas Reitmayr -Signed-off-by: Mauro Carvalho Chehab ---- - drivers/media/usb/dvb-usb/dib0700_devices.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c -index d7d55a20e959..c170523226aa 100644 ---- a/drivers/media/usb/dvb-usb/dib0700_devices.c -+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c -@@ -3944,6 +3944,8 @@ struct dvb_usb_device_properties dib0700_devices[] = { - - DIB0700_DEFAULT_STREAMING_CONFIG(0x02), - }}, -+ .size_of_priv = sizeof(struct -+ dib0700_adapter_state), - }, { - .num_frontends = 1, - .fe = {{ -@@ -3956,6 +3958,8 @@ struct dvb_usb_device_properties dib0700_devices[] = { - - DIB0700_DEFAULT_STREAMING_CONFIG(0x03), - }}, -+ .size_of_priv = sizeof(struct -+ dib0700_adapter_state), - } - }, - -@@ -4009,6 +4013,8 @@ struct dvb_usb_device_properties dib0700_devices[] = { - - DIB0700_DEFAULT_STREAMING_CONFIG(0x02), - }}, -+ .size_of_priv = sizeof(struct -+ dib0700_adapter_state), - }, - }, - diff --git a/kernel/kernel/files/patches/mageia/series b/kernel/kernel/files/patches/mageia/series index 7fec8c3c..21fc891b 100644 --- a/kernel/kernel/files/patches/mageia/series +++ b/kernel/kernel/files/patches/mageia/series @@ -183,8 +183,6 @@ input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch ### Media ### -media-Fix-regression-in-some-more-dib0700-based-devi.patch - ### ### Misc ### diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml index 9e8b5f38..1d723976 100644 --- a/kernel/kernel/pspec.xml +++ b/kernel/kernel/pspec.xml @@ -28,8 +28,8 @@ i - patches/linux/patch-4.1.3.xz - + patches/linux/patch-4.1.5.xz + patches/mageia/x86-pci-toshiba-equium-a60-assign-busses.patch patches/mageia/x86-boot-video-80x25-if-break.patch patches/mageia/x86-default_poweroff_up_machines.patch @@ -78,7 +78,6 @@ i patches/mageia/gpu-drm-mach64-3.17-buildfix.patch patches/mageia/gpu-drm-mach64-3.18-buildfix.patch patches/mageia/input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch - patches/mageia/media-Fix-regression-in-some-more-dib0700-based-devi.patch patches/mageia/net-sis190-fix-list-usage.patch patches/mageia/net-netfilter-IFWLOG.patch patches/mageia/net-netfilter-IFWLOG-mdv.patch @@ -178,6 +177,14 @@ i + + 2015-08-13 + 4.1.5 + Version bump to 4.1.5 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5 + security + Ertuğrul Erata + ertugrulerata@gmail.com + 2015-07-23 4.1.3 diff --git a/kernel/tools/cpupowertools/files/patches/linux/patch-4.1.5.xz b/kernel/tools/cpupowertools/files/patches/linux/patch-4.1.5.xz new file mode 100644 index 00000000..25a374ff Binary files /dev/null and b/kernel/tools/cpupowertools/files/patches/linux/patch-4.1.5.xz differ diff --git a/kernel/tools/cpupowertools/pspec.xml b/kernel/tools/cpupowertools/pspec.xml index 5377a57c..8bd27411 100644 --- a/kernel/tools/cpupowertools/pspec.xml +++ b/kernel/tools/cpupowertools/pspec.xml @@ -18,7 +18,7 @@ - patches/linux/patch-4.1.3.xz + patches/linux/patch-4.1.5.xz @@ -44,14 +44,21 @@ --> - + + 2015-08-13 + 4.1.5 + Version bump. + Ertuğrul Erata + ertugrulerata@gmail.com + + 2015-07-23 4.1.3 Version bump. Ertuğrul Erata ertugrulerata@gmail.com - - + + 2015-07-20 4.1.2 Version bump.