Update for v4.2 Build 2020 12-Jan-2021

7 files changed, 7 insertions, 214 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9a1de3471d3..0a55f4e5853a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,22 @@
 pkgbase = oss
-	pkgver = 4.2_2017
-	pkgrel = 2
+	pkgver = 4.2_2020
+	pkgrel = 1
 	url = http://developer.opensound.com/
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	makedepends = gtk2
-	source = http://www.4front-tech.com/developer/sources/stable/gpl/oss-v4.2-build2017-src-gpl.tar.bz2
+	source = http://www.4front-tech.com/developer/sources/stable/gpl/oss-v4.2-build2020-src-gpl.tar.bz2
 	source = oss.service
 	source = remove-hal.patch
 	source = rm-init-scripts.patch
 	source = soundon.patch
-	source = kmod-link.patch
 	source = ossvermagic.patch
-	sha512sums = c915f708fb94fc29ecb3726b44bbeed5f3c6be67f4dc9deabf83f4191084b71ffa8d693697ef9860050142cfaaf23c74c74a983fe1616662ca14c1086e3001f6
+	sha512sums = 6b0c5390e92f9c9466669600321140b54d1fde5eeaef2f9938d6bdbc7ae686f4a1ad0fa9669a1505962eb515d61d29d8a677911557a9b245ce039e1ab3b77d69
 	sha512sums = 355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e
 	sha512sums = 6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be
 	sha512sums = 64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690
 	sha512sums = a8196aeea43499f4822bad6adc8c7f8721eb122045732ab34bb675182a1c4403c3f4a30ead85188fdaec77ee79a5097dd8de84782f8915db4061157474b5c7c6
-	sha512sums = f73b837643c7b86c5ce3a2ff18a66b99166d16ac7d1ac3d419b203efd8d398d8c4b21c304d6fa1c038ebf180ca0620d6517be384b307bb66e84a15b0339800df
 	sha512sums = eec0608d82d5bec305b374d9cb62d70860d7be833f87f563a828c44b2dd67754cb27716194d2ea2707391d1257ba1b4b7b5cdf513d618dfd877a065999baa4ad
 
 pkgname = oss
diff --git a/PKGBUILD b/PKGBUILD
index 8c91a4307321..3616d90e4f6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
 pkgbase=oss
 pkgname=oss
 true && pkgname=(oss libflashsupport-oss)
-pkgver=4.2_2017
-pkgrel=2
+pkgver=4.2_2020
+pkgrel=1
 arch=(i686 x86_64)
 url="http://developer.opensound.com/"
 license=(GPL2)
@@ -21,14 +21,12 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_
         remove-hal.patch
         rm-init-scripts.patch
         soundon.patch
-        kmod-link.patch
         ossvermagic.patch)
-sha512sums=('c915f708fb94fc29ecb3726b44bbeed5f3c6be67f4dc9deabf83f4191084b71ffa8d693697ef9860050142cfaaf23c74c74a983fe1616662ca14c1086e3001f6'
+sha512sums=('6b0c5390e92f9c9466669600321140b54d1fde5eeaef2f9938d6bdbc7ae686f4a1ad0fa9669a1505962eb515d61d29d8a677911557a9b245ce039e1ab3b77d69'
             '355e1380432947c0e9caa21114b2c3debeb162fb5abcf845125ec281ce52b437ad1ee1db04d37e9b7a5ac79816c4dcbc21b4ed4cf8191f71218d99acd7bab70e'
             '6956e5e2e9323b568bb18e80bbee591b0e5ffd3d4612a50df09879941b2733c31d6b3178dc9a46c283bd1629f76b7ff5e2b54893a42a47f6379eaee4731fd9be'
             '64e6d9d8eb5320f737d3a0698a245da2b2d141b68cfb2f02e448144d1c610aa8b8a6c38b56fcca364d63171a49afe93161a00545cdb90086b5328997b3096690'
             'a8196aeea43499f4822bad6adc8c7f8721eb122045732ab34bb675182a1c4403c3f4a30ead85188fdaec77ee79a5097dd8de84782f8915db4061157474b5c7c6'
-            'f73b837643c7b86c5ce3a2ff18a66b99166d16ac7d1ac3d419b203efd8d398d8c4b21c304d6fa1c038ebf180ca0620d6517be384b307bb66e84a15b0339800df'
             'eec0608d82d5bec305b374d9cb62d70860d7be833f87f563a828c44b2dd67754cb27716194d2ea2707391d1257ba1b4b7b5cdf513d618dfd877a065999baa4ad')
 _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
 
@@ -48,11 +46,6 @@ prepare() {
   patch -p2 < "$srcdir/remove-hal.patch"
   rm oss/scripts/*oss_usb-create-device*
   patch -p1 < "$srcdir/soundon.patch"
-
-  # FS#35672
-  mv oss/build/{osscore.c,osscore_wrapper.c}
-  patch -p2 < "$srcdir/kmod-link.patch"
-  cd ../..
 }
 
 build() {
diff --git a/gcc-5.patch b/gcc-5.patch
deleted file mode 100644
index 5b303b497596..000000000000
--- a/gcc-5.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- kernel/OS/Linux/os_linux.h	2015-01-28 08:07:23.000000000 +0000
-+++ kernel/OS/Linux/os_linux.h	2015-06-01 23:12:46.044784820 +0100
-@@ -119,7 +119,7 @@
- /* System wall timer access */
- #define GET_JIFFIES()	oss_get_jiffies()
- 
--extern inline unsigned int
-+__attribute__ ((gnu_inline)) extern inline unsigned int
- __inb (unsigned short port)
- {
-   unsigned int _v;
-@@ -127,7 +127,7 @@
- 			"0" (0));
-   return _v;
- }
--extern inline unsigned int
-+__attribute__ ((gnu_inline)) extern inline unsigned int
- __inw (unsigned short port)
- {
-   unsigned int _v;
-@@ -135,7 +135,7 @@
- 			"0" (0));
-   return _v;
- }
--extern inline unsigned int
-+__attribute__ ((gnu_inline)) extern inline unsigned int
- __inl (unsigned short port)
- {
-   unsigned int _v;
-@@ -143,19 +143,19 @@
-   return _v;
- }
- 
--extern inline void
-+__attribute__ ((gnu_inline)) extern inline unsigned int
- __outb (unsigned char value, unsigned short port)
- {
-   __asm__ __volatile__ ("out" "b" " %" "b" "0,%" "w" "1"::"a" (value),
- 			"d" (port));
- }
--extern inline void
-+__attribute__ ((gnu_inline)) extern inline unsigned int
- __outw (unsigned short value, unsigned short port)
- {
-   __asm__ __volatile__ ("out" "w" " %" "w" "0,%" "w" "1"::"a" (value),
- 			"d" (port));
- }
--extern inline void
-+__attribute__ ((gnu_inline)) extern inline unsigned int
- __outl (unsigned int value, unsigned short port)
- {
-   __asm__ __volatile__ ("out" "l" " %" "0,%" "w" "1"::"a" (value),
diff --git a/kmod-link.patch b/kmod-link.patch
deleted file mode 100644
index 8ee9ab5539cf..000000000000
--- a/kmod-link.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- setup/Linux/oss/build/install.sh	2012-05-22 00:23:41.000000000 +0200
-+++ setup/Linux/oss/build/install.sh	2013-11-10 21:00:08.858276861 +0100
-@@ -203,11 +203,8 @@
- 	exit 3
- fi
- 
--if ! $LD -r osscore.ko osscore_mainline.o -o /lib/modules/$UNAME/kernel/oss/osscore.ko
--then
--	echo Linking the osscore module failed
--	exit 5
--fi
-+
-+cp -f osscore.ko /lib/modules/$UNAME/kernel/oss/osscore.ko
- 
- if test -f Module.symvers
- then
---- setup/Linux/oss/build/Makefile.osscore	2012-05-22 00:23:41.000000000 +0200
-+++ setup/Linux/oss/build/Makefile.osscore	2013-11-14 18:57:44.270163268 +0100
-@@ -5,6 +5,7 @@
- ifneq ($(KERNELRELEASE),)
- 
- 	obj-m := osscore.o
-+	osscore-y := osscore_wrapper.o osscore_mainline.o
- 
- else
- 
-
diff --git a/linux-4.0.patch b/linux-4.0.patch
deleted file mode 100644
index 7bc4ea36d760..000000000000
--- a/linux-4.0.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -durN oss-v4.2-build2011-src-gpl/setup/Linux/oss/build/osscore.c oss-v4.2-build2011-src-gpl-patched/setup/Linux/oss/build/osscore.c
---- oss-v4.2-build2011-src-gpl/setup/Linux/oss/build/osscore.c	2014-09-04 00:15:31.000000000 +0200
-+++ oss-v4.2-build2011-src-gpl-patched/setup/Linux/oss/build/osscore.c	2015-04-25 23:16:19.502116503 +0200
-@@ -1950,8 +1950,13 @@
-     }
-   else
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
-       flags[1] = read_cr4 ();
-       write_cr4 (flags[1] | 0x600);	/* Set OSFXSR & OSXMMEXCEPT */
-+#else
-+      flags[1] = __read_cr4 ();
-+      __write_cr4 (flags[1] | 0x600);	/* Set OSFXSR & OSXMMEXCEPT */
-+#endif
-       FX_SAVE (envbuf);
-       asm ("fninit");
-       asm ("fwait");
-@@ -1971,7 +1976,11 @@
-   else
-     {
-       FX_RESTORE (envbuf);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
-       write_cr4 (flags[1]);	/* Restore cr4 */
-+#else
-+      __write_cr4 (flags[1]);	/* Restore cr4 */
-+#endif
-     }
-   write_cr0 (flags[0]);		/* Restore cr0 */
- }
-diff -durN oss-v4.2-build2011-src-gpl/setup/setupdir.sh oss-v4.2-build2011-src-gpl-patched/setup/setupdir.sh
---- oss-v4.2-build2011-src-gpl/setup/setupdir.sh	2015-04-25 23:03:34.173985609 +0200
-+++ oss-v4.2-build2011-src-gpl-patched/setup/setupdir.sh	2015-04-25 23:03:14.267351737 +0200
-@@ -36,7 +36,7 @@
- # Use Linux24 as the OS name for Linux 2.4.x
- if test "$OS " = "Linux "
- then
--  if test "`uname -r|sed 's/2.//'|sed 's/\..*//'` " = "4 "
-+  if test "`uname -r | cut -d '.' -f 1-2` " = "2.4 "
-   then
- 	OS=Linux24
-   fi
diff --git a/linux-4.6.patch b/linux-4.6.patch
deleted file mode 100644
index 1651fc291b47..000000000000
--- a/linux-4.6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- setup/Linux/oss/build/pci_wrapper.inc	2014-08-31 19:40:14.000000000 +0100
-+++ setup/Linux/oss/build/pci_wrapper.inc	2016-06-15 06:51:46.402770996 +0100
-@@ -71,8 +71,10 @@
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
-  static int __devexit
--#else
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
-  static int
-+#else
-+ void
- #endif
- osspci_remove (struct pci_dev *pcidev)
- {
-@@ -88,11 +90,19 @@
- 	pci_disable_device (dev_map[i].pcidev);
- 	osdev_delete (osdev);
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
- 	return 0;
-+#else
-+	return;
-+#endif
-       }
- 
-   printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n");
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
-   return -EIO;
-+#else
-+  return;
-+#endif
- }
- 
- void
diff --git a/linux-4.8-usercopy.patch b/linux-4.8-usercopy.patch
deleted file mode 100644
index 7ff26c08914a..000000000000
--- a/linux-4.8-usercopy.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- kernel/OS/Linux/os_linux.c	2015-01-28 08:07:23.000000000 +0000
-+++ kernel/OS/Linux/os_linux.c	2016-12-21 22:38:46.369612126 +0000
-@@ -640,7 +640,8 @@
-   int dev = d;
-   oss_cdev_t *cdev;
-   int err;
--  int localbuf[64];		/* 256 bytes is the largest frequently used ioctl size */
-+  /* Remove localbuf (workaround for CONFIG_HARDENED_USERCOPY from kernel 4.8) */
-+  /* int localbuf[64]; */		/* 256 bytes is the largest frequently used ioctl size */
- 
-   int len = 0;
-   int alloced = 0;
-@@ -666,14 +667,18 @@
- 	  return OSS_EFAULT;
- 	}
- 
-+      /* Always use dynamic kernel memory allocation (instead of static localbuf)
-+        (workaround for CONFIG_HARDENED_USERCOPY from kernel 4.8) */
-+      ptr = KERNEL_MALLOC (len);
-+      alloced = 1;
-       /* Use statically allocated buffer for short arguments */
--      if (len > sizeof (localbuf))
-+      /*if (len > sizeof (localbuf))
- 	{
- 	  ptr = KERNEL_MALLOC (len);
- 	  alloced = 1;
- 	}
-       else
--	ptr = localbuf;
-+	ptr = localbuf;*/
- 
-       if (ptr == NULL || arg == 0)
- 	{
-@@ -710,8 +715,8 @@
- 
-   /* Free the local buffer unless it was statically allocated */
-   if (ptr != NULL && alloced)
--    if (len > sizeof (localbuf))
--      KERNEL_FREE (ptr);
-+//    if (len > sizeof (localbuf))
-+    KERNEL_FREE (ptr);
- 
-   return ((err < 0) ? err : 0);
-