[arch-commits] Commit in slmodem/trunk (PKGBUILD kernel-2.6.36.patch slmodem.install)

2010-11-01 Thread Tobias Powalowski 
Date: Monday, November 1, 2010 @ 05:03:02
  Author: tpowa
Revision: 97680

upgpkg: slmodem 2.9.11-54
bump to latest kernel version

Added:
  slmodem/trunk/kernel-2.6.36.patch
Modified:
  slmodem/trunk/PKGBUILD
  slmodem/trunk/slmodem.install

-+
 PKGBUILD|   16 +---
 kernel-2.6.36.patch |   25 +
 slmodem.install |4 ++--
 3 files changed, 36 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-11-01 08:21:04 UTC (rev 97679)
+++ PKGBUILD2010-11-01 09:03:02 UTC (rev 97680)
@@ -1,24 +1,25 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 
-_kernver=2.6.35-ARCH;
+_kernver=2.6.36-ARCH;
 
 pkgname=slmodem
 pkgver=2.9.11
-pkgrel=53
+pkgrel=54
 
 pkgdesc=Drivers for the Smartlink winmodems. For stock arch 2.6 kernel 
 arch=(i686)
 license=('custom:Smartlink')
 url=http://linmodems.technion.ac.il/packages/smartlink/; 
-depends=('kernel26=2.6.35' 'kernel262.6.36' 'slmodem-utils')
-makedepends=('kernel26-headers=2.6.35' 'kernel26-headers2.6.36') 
+depends=('kernel26=2.6.36' 'kernel262.6.37' 'slmodem-utils')
+makedepends=('kernel26-headers=2.6.36' 'kernel26-headers2.6.37') 
 install=slmodem.install 
 
source=(http://linmodems.technion.ac.il/packages/smartlink/slmodem-2.9.11-20080126.tar.gz
 \
   
http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-20080126.tar.gz
   kernel-2.6.24.patch
   kernel-2.6.33.patch
-  kernel-2.6.34.patch)
+  kernel-2.6.34.patch
+  kernel-2.6.36.patch)
 
 build() {
   cd $srcdir/
@@ -29,7 +30,7 @@
   cd $srcdir/$pkgname-$pkgver-20080126
   patch -Np0 -i ../kernel-2.6.24.patch || return 1
   patch -Np0 -i ../kernel-2.6.33.patch || return 1
-
+  patch -Np0 -i ../kernel-2.6.36.patch || return 1
   sed 's|^obj-m := slamr.o slusb.o|obj-m := slamr.o|' -i drivers/Makefile
   make KERNEL_DIR=/lib/modules/${_kernver}/build SUPPORT_ALSA=1 
DESTDIR=$pkgdir drivers || return 1
   # Install kernel modules
@@ -41,4 +42,5 @@
  '25244ef3924566866f4fae2feca78218'
  '5a5e313a5040fcff7bf11c33f008e61e'
  'c03b607c7c4819bf693da4fa71324691'
- '4401b7353fa5894be28e217d4396af99')
+ '4401b7353fa5894be28e217d4396af99'
+ '1cd248732b9bca04fcd73734ab701047')

Added: kernel-2.6.36.patch
===
--- kernel-2.6.36.patch (rev 0)
+++ kernel-2.6.36.patch 2010-11-01 09:03:02 UTC (rev 97680)
@@ -0,0 +1,25 @@
+--- drivers/amrmo_init.c~  2010-11-01 09:59:31.253338565 +0100
 drivers/amrmo_init.c   2010-11-01 10:02:56.413334268 +0100
+@@ -430,11 +430,11 @@
+ 
+ 
+ 
+-static int amrmo_ioctl(struct inode *inode, struct file *file, unsigned int 
cmd, unsigned long arg)
++static long amrmo_unlocked_ioctl(struct file *file, unsigned int cmd, 
unsigned long arg)
+ {
+   struct amrmo_struct *amrmo = (struct amrmo_struct *)file-private_data;
+ unsigned long flags;
+-  int ret;
++  long ret;
+   unsigned stat;
+   AMRMO_DBG(amrmo_ioctl: cmd %x, arg %lx...\n,cmd,arg);
+ switch (cmd) 
+@@ -502,7 +502,7 @@
+ .read =amrmo_read,
+ .write =   amrmo_write,
+ .poll =amrmo_poll,
+-.ioctl =   amrmo_ioctl,
++.unlocked_ioctl =   amrmo_unlocked_ioctl,
+ .open =amrmo_open,
+ .release = amrmo_release,
+ };

Modified: slmodem.install
===
--- slmodem.install 2010-11-01 08:21:04 UTC (rev 97679)
+++ slmodem.install 2010-11-01 09:03:02 UTC (rev 97680)
@@ -21,7 +21,7 @@
 
   # updating module dependencies
   echo  Updating module dependencies. Please wait ...
-  KERNEL_VERSION=2.6.35-ARCH
+  KERNEL_VERSION=2.6.36-ARCH
   depmod -v $KERNEL_VERSION/dev/null 21 
 echo
 echo
@@ -39,7 +39,7 @@
 post_remove() {
   # updating module dependencies
   echo  Updating module dependencies. Please wait ...
-  KERNEL_VERSION=2.6.35-ARCH
+  KERNEL_VERSION=2.6.36-ARCH
   depmod -v $KERNEL_VERSION/dev/null 21 
 }

[arch-commits] Commit in slmodem/trunk (PKGBUILD)

2010-08-28 Thread Tobias Powalowski 
Date: Saturday, August 28, 2010 @ 03:18:27
  Author: tpowa
Revision: 89047

upgpkg: slmodem 2.9.11-53
rebuild against latest kernel

Modified:
  slmodem/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-28 07:18:23 UTC (rev 89046)
+++ PKGBUILD2010-08-28 07:18:27 UTC (rev 89047)
@@ -5,7 +5,7 @@
 
 pkgname=slmodem
 pkgver=2.9.11
-pkgrel=52
+pkgrel=53
 
 pkgdesc=Drivers for the Smartlink winmodems. For stock arch 2.6 kernel 
 arch=(i686)

[arch-commits] Commit in slmodem/trunk (PKGBUILD slmodem.install)

2010-08-04 Thread Tobias Powalowski 
Date: Wednesday, August 4, 2010 @ 15:31:35
  Author: tpowa
Revision: 86804

upgpkg: slmodem 2.9.11-52
bump to major new kernel

Modified:
  slmodem/trunk/PKGBUILD
  slmodem/trunk/slmodem.install

-+
 PKGBUILD|8 
 slmodem.install |4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-04 19:31:18 UTC (rev 86803)
+++ PKGBUILD2010-08-04 19:31:35 UTC (rev 86804)
@@ -1,18 +1,18 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 
-_kernver=2.6.34-ARCH;
+_kernver=2.6.35-ARCH;
 
 pkgname=slmodem
 pkgver=2.9.11
-pkgrel=51
+pkgrel=52
 
 pkgdesc=Drivers for the Smartlink winmodems. For stock arch 2.6 kernel 
 arch=(i686)
 license=('custom:Smartlink')
 url=http://linmodems.technion.ac.il/packages/smartlink/; 
-depends=('kernel26=2.6.34' 'kernel262.6.35' 'slmodem-utils')
-makedepends=('kernel26-headers=2.6.34' 'kernel26-headers2.6.35') 
+depends=('kernel26=2.6.35' 'kernel262.6.36' 'slmodem-utils')
+makedepends=('kernel26-headers=2.6.35' 'kernel26-headers2.6.36') 
 install=slmodem.install 
 
source=(http://linmodems.technion.ac.il/packages/smartlink/slmodem-2.9.11-20080126.tar.gz
 \
   
http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-20080126.tar.gz

Modified: slmodem.install
===
--- slmodem.install 2010-08-04 19:31:18 UTC (rev 86803)
+++ slmodem.install 2010-08-04 19:31:35 UTC (rev 86804)
@@ -21,7 +21,7 @@
 
   # updating module dependencies
   echo  Updating module dependencies. Please wait ...
-  KERNEL_VERSION=2.6.34-ARCH
+  KERNEL_VERSION=2.6.35-ARCH
   depmod -v $KERNEL_VERSION/dev/null 21 
 echo
 echo
@@ -39,7 +39,7 @@
 post_remove() {
   # updating module dependencies
   echo  Updating module dependencies. Please wait ...
-  KERNEL_VERSION=2.6.34-ARCH
+  KERNEL_VERSION=2.6.35-ARCH
   depmod -v $KERNEL_VERSION/dev/null 21 
 }

[arch-commits] Commit in slmodem/trunk (PKGBUILD kernel-2.6.34.patch slmodem.install)

2010-05-17 Thread Tobias Powalowski 
Date: Monday, May 17, 2010 @ 15:34:49
  Author: tpowa
Revision: 80494

upgpkg: slmodem 2.9.11-51
rebuild against latest kernel

Added:
  slmodem/trunk/kernel-2.6.34.patch
Modified:
  slmodem/trunk/PKGBUILD
  slmodem/trunk/slmodem.install

-+
 PKGBUILD|   30 +-
 kernel-2.6.34.patch |   22 ++
 slmodem.install |4 ++--
 3 files changed, 41 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-17 18:22:37 UTC (rev 80493)
+++ PKGBUILD2010-05-17 19:34:49 UTC (rev 80494)
@@ -1,40 +1,44 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 
-_kernver=2.6.33-ARCH;
+_kernver=2.6.34-ARCH;
 
 pkgname=slmodem
 pkgver=2.9.11
-pkgrel=50
+pkgrel=51
 
 pkgdesc=Drivers for the Smartlink winmodems. For stock arch 2.6 kernel 
 arch=(i686)
 license=('custom:Smartlink')
 url=http://linmodems.technion.ac.il/packages/smartlink/; 
-depends=('kernel26=2.6.33' 'kernel262.6.34' 'slmodem-utils')
-makedepends=('kernel26-headers=2.6.33' 'kernel26-headers2.6.34') 
+depends=('kernel26=2.6.34' 'kernel262.6.35' 'slmodem-utils')
+makedepends=('kernel26-headers=2.6.34' 'kernel26-headers2.6.35') 
 install=slmodem.install 
 
source=(http://linmodems.technion.ac.il/packages/smartlink/slmodem-2.9.11-20080126.tar.gz
 \
   
http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-20080126.tar.gz
   kernel-2.6.24.patch
-  kernel-2.6.33.patch) 
+  kernel-2.6.33.patch
+  kernel-2.6.34.patch)
 
-build() { 
-  cd $startdir/src/ungrab-winmodem-20080126
+build() {
+  cd $srcdir/
+  patch -Np0 -i ../kernel-2.6.34.patch || return 1
+  cd $srcdir/ungrab-winmodem-20080126
   make KERNEL_DIR=/lib/modules/${_kernver}/build || return 1
-  install -D -m644 ungrab-winmodem.ko 
$startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/ungrab-winmodem.ko
-  cd $startdir/src/$pkgname-$pkgver-20080126
+  install -D -m644 ungrab-winmodem.ko 
$pkgdir/lib/modules/${_kernver}/kernel/drivers/net/ungrab-winmodem.ko
+  cd $srcdir/$pkgname-$pkgver-20080126
   patch -Np0 -i ../kernel-2.6.24.patch || return 1
   patch -Np0 -i ../kernel-2.6.33.patch || return 1
+
   sed 's|^obj-m := slamr.o slusb.o|obj-m := slamr.o|' -i drivers/Makefile
-  make KERNEL_DIR=/lib/modules/${_kernver}/build SUPPORT_ALSA=1 
DESTDIR=$startdir/pkg drivers || return 1 
+  make KERNEL_DIR=/lib/modules/${_kernver}/build SUPPORT_ALSA=1 
DESTDIR=$pkgdir drivers || return 1
   # Install kernel modules
-  install -D -m 644 drivers/slamr.ko 
$startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/slamr.ko
+  install -D -m 644 drivers/slamr.ko 
$pkgdir/lib/modules/${_kernver}/kernel/drivers/net/slamr.ko
   #install -D -m 644 drivers/slusb.ko 
$startdir/pkg/lib/modules/${_kernver}/kernel/drivers/usb/net/slusb.ko 
   sed -i -e s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g 
$startdir/slmodem.install
 }
-
 md5sums=('8670dd7e1e1a46296ac4c80f7ac0471d'
  '25244ef3924566866f4fae2feca78218'
  '5a5e313a5040fcff7bf11c33f008e61e'
- 'c03b607c7c4819bf693da4fa71324691')
+ 'c03b607c7c4819bf693da4fa71324691'
+ '4401b7353fa5894be28e217d4396af99')

Added: kernel-2.6.34.patch
===
--- kernel-2.6.34.patch (rev 0)
+++ kernel-2.6.34.patch 2010-05-17 19:34:49 UTC (rev 80494)
@@ -0,0 +1,22 @@
+--- ungrab-winmodem-20080126/ungrab-winmodem.c~2010-05-17 
21:29:24.261834039 +0200
 ungrab-winmodem-20080126/ungrab-winmodem.c 2010-05-17 21:29:24.289770941 
+0200
+@@ -76,7 +76,7 @@
+ {
+   struct pci_dev *dev = NULL;
+   struct device *reldev;
+-while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
++while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+   if(pci_match_id(softmodem_pci_tbl, dev)  pci_dev_driver(dev) 

+  (reldev = get_device(dev-dev)) ) {
+   printk(KERN_INFO device %04x:%04x is grabbed by driver 
%s: try to release\n,
+--- slmodem-2.9.11-20080126/drivers/amrmo_init.c~  2010-05-17 
21:31:53.029933461 +0200
 slmodem-2.9.11-20080126/drivers/amrmo_init.c   2010-05-17 
21:31:53.076443380 +0200
+@@ -749,7 +749,7 @@
+ #ifdef OLD_KERNEL
+   pci_for_each_dev(dev) {
+ #else
+-while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
++while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+ #endif
+   if(pci_match_id(amrmo_pci_tbl, dev) 
+  pci_dev_driver(dev)) {

Modified: slmodem.install
===
--- slmodem.install 2010-05-17 18:22:37 UTC (rev 80493)
+++ slmodem.install 2010-05-17 19:34:49 UTC (rev 80494)
@@ -21,7 +21,7 @@
 
   # updating module dependencies
   echo  Updating module dependencies. Please wait ...
-

[arch-commits] Commit in slmodem/trunk (PKGBUILD kernel-2.6.33.patch slmodem.install)

2010-02-27 Thread Tobias Powalowski 
Date: Saturday, February 27, 2010 @ 10:27:59
  Author: tpowa
Revision: 70611

upgpkg: slmodem 2.9.11-50
rebuild against .33 kernel

Added:
  slmodem/trunk/kernel-2.6.33.patch
Modified:
  slmodem/trunk/PKGBUILD
  slmodem/trunk/slmodem.install

-+
 PKGBUILD|   16 ++--
 kernel-2.6.33.patch |   11 +++
 slmodem.install |4 ++--
 3 files changed, 23 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-27 15:24:51 UTC (rev 70610)
+++ PKGBUILD2010-02-27 15:27:59 UTC (rev 70611)
@@ -1,22 +1,23 @@
 # $Id$
 # Maintainer: Tobias Powalowski tp...@archlinux.org
 
-_kernver=2.6.32-ARCH;
+_kernver=2.6.33-ARCH;
 
 pkgname=slmodem
 pkgver=2.9.11
-pkgrel=49
+pkgrel=50
 
 pkgdesc=Drivers for the Smartlink winmodems. For stock arch 2.6 kernel 
 arch=(i686)
 license=('custom:Smartlink')
 url=http://linmodems.technion.ac.il/packages/smartlink/; 
-depends=('kernel26=2.6.32.3' 'kernel262.6.33' 'slmodem-utils')
-makedepends=('kernel26-headers=2.6.32' 'kernel26-headers2.6.33') 
+depends=('kernel26=2.6.33' 'kernel262.6.34' 'slmodem-utils')
+makedepends=('kernel26-headers=2.6.33' 'kernel26-headers2.6.34') 
 install=slmodem.install 
 
source=(http://linmodems.technion.ac.il/packages/smartlink/slmodem-2.9.11-20080126.tar.gz
 \
   
http://linmodems.technion.ac.il/packages/smartlink/ungrab-winmodem-20080126.tar.gz
-  kernel-2.6.24.patch) 
+  kernel-2.6.24.patch
+  kernel-2.6.33.patch) 
 
 build() { 
   cd $startdir/src/ungrab-winmodem-20080126
@@ -24,6 +25,7 @@
   install -D -m644 ungrab-winmodem.ko 
$startdir/pkg/lib/modules/${_kernver}/kernel/drivers/net/ungrab-winmodem.ko
   cd $startdir/src/$pkgname-$pkgver-20080126
   patch -Np0 -i ../kernel-2.6.24.patch || return 1
+  patch -Np0 -i ../kernel-2.6.33.patch || return 1
   sed 's|^obj-m := slamr.o slusb.o|obj-m := slamr.o|' -i drivers/Makefile
   make KERNEL_DIR=/lib/modules/${_kernver}/build SUPPORT_ALSA=1 
DESTDIR=$startdir/pkg drivers || return 1 
   # Install kernel modules
@@ -31,6 +33,8 @@
   #install -D -m 644 drivers/slusb.ko 
$startdir/pkg/lib/modules/${_kernver}/kernel/drivers/usb/net/slusb.ko 
   sed -i -e s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g 
$startdir/slmodem.install
 }
+
 md5sums=('8670dd7e1e1a46296ac4c80f7ac0471d'
  '25244ef3924566866f4fae2feca78218'
- '5a5e313a5040fcff7bf11c33f008e61e')
+ '5a5e313a5040fcff7bf11c33f008e61e'
+ 'c03b607c7c4819bf693da4fa71324691')

Added: kernel-2.6.33.patch
===
--- kernel-2.6.33.patch (rev 0)
+++ kernel-2.6.33.patch 2010-02-27 15:27:59 UTC (rev 70611)
@@ -0,0 +1,11 @@
+--- drivers/kernel-ver.c~  2010-02-27 16:26:26.0 +0100
 drivers/kernel-ver.c   2010-02-27 16:26:26.0 +0100
+@@ -6,7 +6,7 @@
+ #include stdio.h
+ #include linux/version.h
+ #if LINUX_VERSION_CODE = KERNEL_VERSION(2,6,18)
+-#include linux/utsrelease.h
++#include generated/utsrelease.h
+ #endif
+ 
+ int main()

Modified: slmodem.install
===
--- slmodem.install 2010-02-27 15:24:51 UTC (rev 70610)
+++ slmodem.install 2010-02-27 15:27:59 UTC (rev 70611)
@@ -21,7 +21,7 @@
 
   # updating module dependencies
   echo  Updating module dependencies. Please wait ...
-  KERNEL_VERSION=2.6.32-ARCH
+  KERNEL_VERSION=2.6.33-ARCH
   depmod -v $KERNEL_VERSION/dev/null 21 
 echo
 echo
@@ -39,7 +39,7 @@
 post_remove() {
   # updating module dependencies
   echo  Updating module dependencies. Please wait ...
-  KERNEL_VERSION=2.6.32-ARCH
+  KERNEL_VERSION=2.6.33-ARCH
   depmod -v $KERNEL_VERSION/dev/null 21 
 }

[arch-commits] Commit in slmodem/trunk (PKGBUILD)

2010-01-09 Thread Tobias Powalowski 
Date: Saturday, January 9, 2010 @ 11:11:25
  Author: tpowa
Revision: 62469

upgpkg: slmodem 2.9.11-49
rebuild against latest kernel version

Modified:
  slmodem/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-09 16:10:04 UTC (rev 62468)
+++ PKGBUILD2010-01-09 16:11:25 UTC (rev 62469)
@@ -5,13 +5,13 @@
 
 pkgname=slmodem
 pkgver=2.9.11
-pkgrel=48
+pkgrel=49
 
 pkgdesc=Drivers for the Smartlink winmodems. For stock arch 2.6 kernel 
 arch=(i686)
 license=('custom:Smartlink')
 url=http://linmodems.technion.ac.il/packages/smartlink/; 
-depends=('kernel26=2.6.32' 'kernel262.6.33' 'slmodem-utils')
+depends=('kernel26=2.6.32.3' 'kernel262.6.33' 'slmodem-utils')
 makedepends=('kernel26-headers=2.6.32' 'kernel26-headers2.6.33') 
 install=slmodem.install 
 
source=(http://linmodems.technion.ac.il/packages/smartlink/slmodem-2.9.11-20080126.tar.gz
 \