[arch-commits] Commit in ndiswrapper/trunk (PKGBUILD linux33.patch linux37.patch)

[Thorsten Töpper]

    Date: Wednesday, February 20, 2013 @ 16:28:51
  Author: ttoepper
Revision: 84610

upgpkg: ndiswrapper 1.58-1

Modified:
  ndiswrapper/trunk/PKGBUILD
Deleted:
  ndiswrapper/trunk/linux33.patch
  ndiswrapper/trunk/linux37.patch

---------------+
 PKGBUILD      |   17 ++++-------------
 linux33.patch |   50 --------------------------------------------------
 linux37.patch |   12 ------------
 3 files changed, 4 insertions(+), 75 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-20 15:28:24 UTC (rev 84609)
+++ PKGBUILD	2013-02-20 15:28:51 UTC (rev 84610)
@@ -5,8 +5,8 @@
 
 _extramodules=extramodules-3.7-ARCH
 pkgname=ndiswrapper
-pkgver=1.57
-pkgrel=29
+pkgver=1.58
+pkgrel=1
 pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors."
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -16,13 +16,9 @@
 makedepends=('linux-headers')
 provides=("$pkgname-utils" "$pkgname-bin")
 replaces=("$pkgname-utils" "$pkgname-bin")
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
-        "linux33.patch"
-        "linux37.patch")
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
 options=('!strip')
-sha256sums=('208699faa01ab8ca707cb8a28db20417d07887f993c0830dd34c7d9c4f84a56c'
-            '05fb73a665567ea4bbc33fb80cb7fa3b6123997a5c46bf24f2bf1bba25725bd0'
-            '3e94b838ec38bb43340b4d2b3f887ec3112d93803d4aa51230a6e0b0ff8ef789')
+sha1sums=('a256812b3136648ed93e04146d2276a3ca70957c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -31,12 +27,7 @@
 
   # modinfo path fix
   sed -i "/modinfo/s/s/usr\//" driver/Makefile
-  patch -i "$srcdir/linux33.patch" -N -p0
 
-  # fix linux37 - Thanks to Manjaro Linux
-  sed -i "s|/include/linux/version.h|/include/generated/uapi/linux/version.h|g" driver/Makefile
-  patch -i $srcdir/linux37.patch -N -p1
-
   # make sure we point to the right build directory
   sed -i "/^KBUILD/ s,.*,KBUILD = $(readlink -f /usr/lib/modules/$_kver/build)," driver/Makefile
 

Deleted: linux33.patch
===================================================================
--- linux33.patch	2013-02-20 15:28:24 UTC (rev 84609)
+++ linux33.patch	2013-02-20 15:28:51 UTC (rev 84610)
@@ -1,50 +0,0 @@
---- driver/ndis.c	2011-12-31 21:30:16.000000000 +0100
-+++ driver/ndis.c.new	2012-04-08 11:14:16.746614153 +0200
-@@ -2654,9 +2654,15 @@
- 	(ULONG *idle, ULONG *kernel_user, ULONG *index)
- {
- 	int cpu = smp_processor_id();
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
-+	*idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE];
-+	*kernel_user = kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM] +
-+	 kcpustat_cpu(cpu).cpustat[CPUTIME_USER];
-+#else
- 	*idle = kstat_cpu(cpu).cpustat.idle;
- 	*kernel_user = kstat_cpu(cpu).cpustat.system +
- 		kstat_cpu(cpu).cpustat.user;
-+#endif
- 	*index = cpu;
- }
- 
---- driver/wrapndis.c	2011-12-31 21:30:16.000000000 +0100
-+++ driver/wrapndis.c.new	2012-04-08 11:13:00.574116936 +0200
-@@ -1684,6 +1684,7 @@
- 		return 0;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
- static u32 ndis_get_rx_csum(struct net_device *dev)
- {
- 	struct ndis_device *wnd = netdev_priv(dev);
-@@ -1735,18 +1736,21 @@
- 	else
- 		return -EOPNOTSUPP;
- }
-+#endif
- 
- static struct ethtool_ops ndis_ethtool_ops = {
- 	.get_drvinfo	= ndis_get_drvinfo,
- 	.get_link	= ndis_get_link,
- 	.get_wol	= ndis_get_wol,
- 	.set_wol	= ndis_set_wol,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
- 	.get_tx_csum	= ndis_get_tx_csum,
- 	.get_rx_csum	= ndis_get_rx_csum,
- 	.set_tx_csum	= ndis_set_tx_csum,
- 	.set_rx_csum	= ndis_set_rx_csum,
- 	.get_sg		= ndis_get_sg,
- 	.set_sg		= ndis_set_sg,
-+#endif
- };
- 
- static int notifier_event(struct notifier_block *notifier, unsigned long event,

Deleted: linux37.patch
===================================================================
--- linux37.patch	2013-02-20 15:28:24 UTC (rev 84609)
+++ linux37.patch	2013-02-20 15:28:51 UTC (rev 84610)
@@ -1,12 +0,0 @@
-diff -ur a/driver/Makefile b/driver/Makefile
---- a/driver/Makefile	2012-04-30 23:54:20.000000000 -0500
-+++ b/driver/Makefile	2012-12-12 17:15:05.891026637 -0600
-@@ -118,6 +118,8 @@
- EXTRA_CFLAGS += -DENABLE_USB
- endif
- 
-+WRAP_WQ = 1
-+
- ifdef WRAP_WQ
- EXTRA_CFLAGS += -DWRAP_WQ
- OBJS += workqueue.o