From 776be59f83ffff510a07af432b340d18fa6e0c38 Mon Sep 17 00:00:00 2001
From: AlmAck <gluca86@gmail.com>
Date: Tue, 22 Apr 2014 20:44:14 +0200
Subject: [PATCH] lts kernel (3.2.57) group rebuild

---
 bbswitch-lts/PKGBUILD                         | 11 ++++----
 catalyst-lts/PKGBUILD                         | 25 +++++++++++--------
 .../ati-compat_alloc_user_space.patch         | 15 +++++++++++
 dkms-lts/PKGBUILD                             |  2 +-
 madwifi-lts/PKGBUILD                          | 23 ++++++++---------
 nvidia-173xx-lts/PKGBUILD                     |  6 ++---
 nvidia-304xx-lts/PKGBUILD                     |  6 ++---
 nvidia-lts/PKGBUILD                           |  8 +++---
 8 files changed, 56 insertions(+), 40 deletions(-)
 create mode 100644 catalyst-lts/ati-compat_alloc_user_space.patch

diff --git a/bbswitch-lts/PKGBUILD b/bbswitch-lts/PKGBUILD
index 9df11de9e..cc7df443e 100644
--- a/bbswitch-lts/PKGBUILD
+++ b/bbswitch-lts/PKGBUILD
@@ -1,13 +1,12 @@
 # Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
-# contributor: abveritas@chakra-project.org
 
-_extramodules=extramodules-3.2-CHAKRA-LTS
-_kver="3.2.51-1-lts"
+_extramodules=extramodules-3.2-lts
+_kver="$(cat /lib/modules/${_extramodules}/version)"
  
 pkgname=bbswitch-lts
 _pkgname=bbswitch
-pkgver=0.7
-pkgrel=2
+pkgver=0.8
+pkgrel=1
 pkgdesc="kernel module allowing to switch dedicated graphics card on Optimus laptops"
 arch=('x86_64')
 url=("http://github.com/Bumblebee-Project/bbswitch")
@@ -17,7 +16,7 @@ install=bbswitch.install
 depends=('linux-lts>=3.2' 'linux-lts<3.4')
 makedepends=('linux-lts' 'linux-lts-headers')
 source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
-md5sums=('b9df5ea40109ef9766448a0577c798e6')
+md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807')
 build() {
   cd ${srcdir}/${_pkgname}-${pkgver}
   make KDIR=/lib/modules/${_kver}/build KVERSION=${_kver} 
diff --git a/catalyst-lts/PKGBUILD b/catalyst-lts/PKGBUILD
index d450d1d7d..d2d8ccbe5 100644
--- a/catalyst-lts/PKGBUILD
+++ b/catalyst-lts/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
 
-_kernver="3.2.51-1-lts"
+_extramodules=extramodules-3.2-lts
+_kver="$(cat /lib/modules/${_extramodules}/version)"
 
 pkgname=catalyst-lts
 pkgver=13.12
-pkgrel=1
+pkgrel=2
 pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only"
 arch=('x86_64')
 url="http://www.ati.amd.com"
@@ -22,11 +23,12 @@ source=(http://www2.ati.com/drivers/linux/amd-catalyst-${pkgver}-linux-x86.x86_6
 	lano1106_fglrx-13.8_proc.patch
 	arch_3.13_kernel_acpi_node.patch
 	looks_like_amd_forgot_this.patch
-        jammy.patch # changes taken from http://ati.cchtml.com/show_bug.cgi?id=944#c5
+	ati-compat_alloc_user_space.patch
+	jammy.patch # changes taken from http://ati.cchtml.com/show_bug.cgi?id=944#c5
 	fglrx_supported
 	switchlibglx
 	switchlibGL)
-md5sums=('2418a94b699fe8fdec01ccd32f684c90'
+md5sums=('6b16cad1acf7aa4851fa00e43b9e3c1f'
          '660396540b0ceaff71d6155c986734de'
          '3e1b82bd69774ea808da69c983d6a43b'
          '5184b94a2a40216a67996999481dd9ee'
@@ -34,6 +36,7 @@ md5sums=('2418a94b699fe8fdec01ccd32f684c90'
          '2ab4837233de42332753882445373d7b'
          '25e7c640aeafb08bb5593b647c69cf9b'
          '1c86b8e1d298ed29a7f6da65132620c6'
+         '21013e49598edfffa7f37b62b2d6a930'
          '3af2f4eca848d595791b8a4adc48a4cc'
          '8bd182de340d6ed8b2dfcedfd3e5a389'
          '99032d919ede27884b5c3e87ab110a96'
@@ -66,6 +69,8 @@ build() {
     patch -Np1 -i ../lano1106_fglrx-13.8_proc.patch
     patch -Np1 -i ../arch_3.13_kernel_acpi_node.patch
     patch -Np1 -i ../looks_like_amd_forgot_this.patch
+    # https://github.com/herecura/herecura/blob/master/keep-old-system-alive/catalyst-legacy-slk/ati-2.6.36-compat_alloc_user_space.patch
+    patch -Np1 -i ../ati-compat_alloc_user_space.patch
 
     cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod"
     cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a" .
@@ -74,7 +79,7 @@ build() {
 
     msg "Compiling fglrx module ..."
     # Compile module using _ati_check variables
-    make -C /lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} \
+    make -C /lib/modules/${_kver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} \
     MODFLAGS="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX -DCOMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE $def_smp $def_modversions" \
     PAGE_ATTR_FIX=$PAGE_ATTR_FIX COMPAT_ALLOC_USER_SPACE=$COMPAT_ALLOC_USER_SPACE modules
 }
@@ -85,12 +90,12 @@ package() {
     for r in /lib/modules/*; do
       s=${r:13}
       if [[ ${s:0:3} = "ext" ]]; then
-	if [[ `cat ${r}/version | grep -c ${_kernver}` != 0 ]]; then
+	if [[ `cat ${r}/version | grep -c ${_kver}` != 0 ]]; then
 	  _destidir=${s}
 	  sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${s}/" $startdir/catalyst.install
 	fi
-	elif [[ ${s} = ${_kernver} ]] && [[ ! -e ${r}/extramodules ]]; then
-	  _destidir=${_kernver}/video
+	elif [[ ${s} = ${_kver} ]] && [[ ! -e ${r}/extramodules ]]; then
+	  _destidir=${_kver}/video
 	  sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=null/" $startdir/catalyst.install
       fi
     done
@@ -100,7 +105,7 @@ package() {
     install -m755 -d "${pkgdir}/lib/modules/${_destidir}/"
     install -m644 fglrx.ko "${pkgdir}/lib/modules/${_destidir}/"
     find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
-    sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" $startdir/catalyst.install
+    sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kver}/" $startdir/catalyst.install
 
     # License
     install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
@@ -111,5 +116,5 @@ package() {
     install -m644 "${srcdir}/switchlibglx" "${pkgdir}/usr/lib/fglrx/"
     install -m644 "${srcdir}/switchlibGL" "${pkgdir}/usr/lib/fglrx/"
 
-    sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" $startdir/*.install
+    sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kver}/" $startdir/*.install
 }
diff --git a/catalyst-lts/ati-compat_alloc_user_space.patch b/catalyst-lts/ati-compat_alloc_user_space.patch
new file mode 100644
index 000000000..2055b4685
--- /dev/null
+++ b/catalyst-lts/ati-compat_alloc_user_space.patch
@@ -0,0 +1,15 @@
+--- 13.11/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2013-11-22 19:52:37.000000000 +0100
++++ 13.11/common/lib/modules/fglrx/build_mod/kcl_ioctl.c	2013-11-25 11:48:51.227678982 +0100
+@@ -193,7 +193,11 @@ void ATI_API_CALL KCL_IOCTL_UnregisterCo
+  */
+ void* ATI_API_CALL KCL_IOCTL_AllocUserSpace32(long size)
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
++ void __user *ret = arch_compat_alloc_user_space(size);
++#else
+     void __user *ret = COMPAT_ALLOC_USER_SPACE(size);
++#endif
+ 
+     /* prevent stack overflow */
+     if (!access_ok(VERIFY_WRITE, ret, size))
+ 
diff --git a/dkms-lts/PKGBUILD b/dkms-lts/PKGBUILD
index 57431ba69..19bdf2628 100644
--- a/dkms-lts/PKGBUILD
+++ b/dkms-lts/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=dkms-lts
 _pkgname=dkms
 pkgver=2.2.0.3
-pkgrel=7
+pkgrel=8
 pkgdesc='Dynamic Kernel Modules System'
 arch=('any')
 url='http://linux.dell.com/dkms/'
diff --git a/madwifi-lts/PKGBUILD b/madwifi-lts/PKGBUILD
index 3ba583da5..5df6b45b7 100644
--- a/madwifi-lts/PKGBUILD
+++ b/madwifi-lts/PKGBUILD
@@ -1,16 +1,13 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# maintainer abveritas@chakra-project.org
+# maintainer almack@chakraos.org
 
 # Find the kernel name inside the chroot
-_extramodules=extramodules-3.2-CHAKRA-LTS
-_kver="3.2.51-1-lts"
+_extramodules=extramodules-3.2-lts
+_kver="$(cat /lib/modules/${_extramodules}/version)"
 
 pkgname=madwifi-lts
-pkgver=0.9.4.4181
-_ver=r4181-20130909
-pkgrel=7
+pkgver=0.9.4.4182
+_ver=r4182-20140204
+pkgrel=1
 pkgdesc="Madwifi drivers for Atheros wireless chipsets"
 arch=('x86_64')
 license=('GPL')
@@ -19,14 +16,14 @@ depends=('madwifi-utils' 'linux-lts>=3.2' 'linux-lts<3.4')
 makedepends=('linux-lts-headers' 'sharutils')
 install=madwifi-ng.install
 # subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi
-source=(http://snapshots.madwifi-project.org/madwifi-trunk-current.tar.gz)
+source=(http://snapshots.madwifi-project.org/madwifi-0.9.4-current.tar.gz)
 	#http://downloads.sourceforge.net/madwifi/madwifi-${pkgver}.tar.gz)
-md5sums=('6505f0a18a3115915daf4dba9ddba4fc')
+md5sums=('8c373ac12f551b197586a5bc398bc7a6')
 groups=("linux-lts-modules")
 
 build()
 {
-  cd madwifi-trunk-$_ver
+  cd madwifi-*-${_ver}
 
   # kernel 3.2 abi change
   sed -i -e "s/.ndo_set_multicast_list/.ndo_set_rx_mode/" ath/if_ath.c
@@ -40,7 +37,7 @@ build()
 
 package()
 {
-  cd madwifi-trunk-$_ver
+  cd madwifi-*-${_ver}
   make KERNELPATH=/lib/modules/${_kver}/build KERNELRELEASE=${_kver} modules \
        DESTDIR="${pkgdir}" KERNELRELEASE=${_kver} install-modules
   sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" ${startdir}/*.install
diff --git a/nvidia-173xx-lts/PKGBUILD b/nvidia-173xx-lts/PKGBUILD
index c0c409c52..d393a36f0 100644
--- a/nvidia-173xx-lts/PKGBUILD
+++ b/nvidia-173xx-lts/PKGBUILD
@@ -2,12 +2,12 @@
 # contributor abveritas@chakra-project.org
 
 # Find the kernel name inside the chroot
-_extramodules=extramodules-3.2-CHAKRA-LTS
-_kver="3.2.51-1-lts"
+_extramodules=extramodules-3.2-lts
+_kver="$(cat /lib/modules/${_extramodules}/version)"
 
 pkgname=nvidia-173xx-lts
 pkgver=173.14.39
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers for linux - LTS package"
 arch=('x86_64')
 url="http://www.nvidia.com/"
diff --git a/nvidia-304xx-lts/PKGBUILD b/nvidia-304xx-lts/PKGBUILD
index c8bdfe09d..2391e97a3 100644
--- a/nvidia-304xx-lts/PKGBUILD
+++ b/nvidia-304xx-lts/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
 
 # Find the kernel name inside the chroot
-_extramodules=extramodules-3.2-CHAKRA-LTS
-_kver="3.2.51-1-lts"
+_extramodules=extramodules-3.2-lts
+_kver="$(cat /lib/modules/${_extramodules}/version)"
 
 pkgname=nvidia-304xx-lts
 pkgver=304.117
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers for linux."
 arch=('x86_64')
 url="http://www.nvidia.com/"
diff --git a/nvidia-lts/PKGBUILD b/nvidia-lts/PKGBUILD
index 242820fac..14380110c 100644
--- a/nvidia-lts/PKGBUILD
+++ b/nvidia-lts/PKGBUILD
@@ -1,11 +1,11 @@
 # maintainer abveritas@chakra-project.org
 
 # Find the kernel name inside the chroot
-_extramodules=extramodules-3.2-CHAKRA-LTS
-_kver="3.2.51-1-lts"
+_extramodules=extramodules-3.2-lts
+_kver="$(cat /lib/modules/${_extramodules}/version)"
 
 pkgname=nvidia-lts
-pkgver=331.20
+pkgver=331.38
 pkgrel=1
 pkgdesc="NVIDIA drivers for linux."
 arch=('x86_64')
@@ -17,7 +17,7 @@ license=('custom')
 install=nvidia.install
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
 source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-md5sums=('28295eed56c2ca996401c0093279620f')
+md5sums=('f2059ae373665cb6c8fb826e1173b04d')
 
 build() {
     cd "${srcdir}"
-- 
GitLab