Date: Wednesday, February 20, 2013 @ 16:28:56
Author: ttoepper
Revision: 84611
archrelease: copy trunk to community-i686, community-x86_64
Added:
ndiswrapper/repos/community-i686/PKGBUILD
(from rev 84610, ndiswrapper/trunk/PKGBUILD)
ndiswrapper/repos/community-i686/ndiswrapper.install
(from rev 84610, ndiswrapper/trunk/ndiswrapper.install)
ndiswrapper/repos/community-x86_64/PKGBUILD
(from rev 84610, ndiswrapper/trunk/PKGBUILD)
ndiswrapper/repos/community-x86_64/ndiswrapper.install
(from rev 84610, ndiswrapper/trunk/ndiswrapper.install)
Deleted:
ndiswrapper/repos/community-i686/PKGBUILD
ndiswrapper/repos/community-i686/linux33.patch
ndiswrapper/repos/community-i686/linux37.patch
ndiswrapper/repos/community-i686/ndiswrapper.install
ndiswrapper/repos/community-x86_64/PKGBUILD
ndiswrapper/repos/community-x86_64/linux33.patch
ndiswrapper/repos/community-x86_64/linux37.patch
ndiswrapper/repos/community-x86_64/ndiswrapper.install
--------------------------------------+
community-i686/PKGBUILD | 105 +++++++++++++++------------------
community-i686/linux33.patch | 50 ---------------
community-i686/linux37.patch | 12 ---
community-i686/ndiswrapper.install | 34 +++++-----
community-x86_64/PKGBUILD | 105 +++++++++++++++------------------
community-x86_64/linux33.patch | 50 ---------------
community-x86_64/linux37.patch | 12 ---
community-x86_64/ndiswrapper.install | 34 +++++-----
8 files changed, 130 insertions(+), 272 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-02-20 15:28:51 UTC (rev 84610)
+++ community-i686/PKGBUILD 2013-02-20 15:28:56 UTC (rev 84611)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Thorsten Töpper <atsutane...@freethoughts.de>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Tobias Powalowski <tp...@archlinux.org>
-
-_extramodules=extramodules-3.7-ARCH
-pkgname=ndiswrapper
-pkgver=1.57
-pkgrel=29
-pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by
vendors."
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://ndiswrapper.sourceforge.net";
-install=ndiswrapper.install
-depends=('linux>=3.7' 'linux<3.8' 'wireless_tools' 'perl')
-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")
-options=('!strip')
-sha256sums=('208699faa01ab8ca707cb8a28db20417d07887f993c0830dd34c7d9c4f84a56c'
- '05fb73a665567ea4bbc33fb80cb7fa3b6123997a5c46bf24f2bf1bba25725bd0'
- '3e94b838ec38bb43340b4d2b3f887ec3112d93803d4aa51230a6e0b0ff8ef789')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- _kver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
- # 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
-
- make KVERS=$_kver
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- _kver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
- make INST_DIR="usr/lib/modules/$_extramodules" \
- KVERS=$_kver DESTDIR="$pkgdir/" install
-
- gzip "$pkgdir/usr/lib/modules/$_extramodules/$pkgname.ko"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ndiswrapper/repos/community-i686/PKGBUILD (from rev 84610,
ndiswrapper/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-02-20 15:28:56 UTC (rev 84611)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Thorsten Töpper <atsutane...@freethoughts.de>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Contributor: Tobias Powalowski <tp...@archlinux.org>
+
+_extramodules=extramodules-3.7-ARCH
+pkgname=ndiswrapper
+pkgver=1.58
+pkgrel=1
+pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by
vendors."
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://ndiswrapper.sourceforge.net";
+install=ndiswrapper.install
+depends=('linux>=3.7' 'linux<3.8' 'wireless_tools' 'perl')
+makedepends=('linux-headers')
+provides=("$pkgname-utils" "$pkgname-bin")
+replaces=("$pkgname-utils" "$pkgname-bin")
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz";)
+options=('!strip')
+sha1sums=('a256812b3136648ed93e04146d2276a3ca70957c')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ _kver="$(cat /usr/lib/modules/${_extramodules}/version)"
+
+ # modinfo path fix
+ sed -i "/modinfo/s/s/usr\//" driver/Makefile
+
+ # make sure we point to the right build directory
+ sed -i "/^KBUILD/ s,.*,KBUILD = $(readlink -f
/usr/lib/modules/$_kver/build)," driver/Makefile
+
+ make KVERS=$_kver
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ _kver="$(cat /usr/lib/modules/${_extramodules}/version)"
+
+ make INST_DIR="usr/lib/modules/$_extramodules" \
+ KVERS=$_kver DESTDIR="$pkgdir/" install
+
+ gzip "$pkgdir/usr/lib/modules/$_extramodules/$pkgname.ko"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/linux33.patch
===================================================================
--- community-i686/linux33.patch 2013-02-20 15:28:51 UTC (rev 84610)
+++ community-i686/linux33.patch 2013-02-20 15:28:56 UTC (rev 84611)
@@ -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: community-i686/linux37.patch
===================================================================
--- community-i686/linux37.patch 2013-02-20 15:28:51 UTC (rev 84610)
+++ community-i686/linux37.patch 2013-02-20 15:28:56 UTC (rev 84611)
@@ -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
Deleted: community-i686/ndiswrapper.install
===================================================================
--- community-i686/ndiswrapper.install 2013-02-20 15:28:51 UTC (rev 84610)
+++ community-i686/ndiswrapper.install 2013-02-20 15:28:56 UTC (rev 84611)
@@ -1,17 +0,0 @@
-post_install()
-{
- post_upgrade
-}
-
-post_upgrade()
-{
- EXTRAMODULES='extramodules-3.7-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove()
-{
- post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ndiswrapper/repos/community-i686/ndiswrapper.install (from rev 84610,
ndiswrapper/trunk/ndiswrapper.install)
===================================================================
--- community-i686/ndiswrapper.install (rev 0)
+++ community-i686/ndiswrapper.install 2013-02-20 15:28:56 UTC (rev 84611)
@@ -0,0 +1,17 @@
+post_install()
+{
+ post_upgrade
+}
+
+post_upgrade()
+{
+ EXTRAMODULES='extramodules-3.7-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove()
+{
+ post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-02-20 15:28:51 UTC (rev 84610)
+++ community-x86_64/PKGBUILD 2013-02-20 15:28:56 UTC (rev 84611)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Thorsten Töpper <atsutane...@freethoughts.de>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Tobias Powalowski <tp...@archlinux.org>
-
-_extramodules=extramodules-3.7-ARCH
-pkgname=ndiswrapper
-pkgver=1.57
-pkgrel=29
-pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by
vendors."
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://ndiswrapper.sourceforge.net";
-install=ndiswrapper.install
-depends=('linux>=3.7' 'linux<3.8' 'wireless_tools' 'perl')
-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")
-options=('!strip')
-sha256sums=('208699faa01ab8ca707cb8a28db20417d07887f993c0830dd34c7d9c4f84a56c'
- '05fb73a665567ea4bbc33fb80cb7fa3b6123997a5c46bf24f2bf1bba25725bd0'
- '3e94b838ec38bb43340b4d2b3f887ec3112d93803d4aa51230a6e0b0ff8ef789')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- _kver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
- # 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
-
- make KVERS=$_kver
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- _kver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
- make INST_DIR="usr/lib/modules/$_extramodules" \
- KVERS=$_kver DESTDIR="$pkgdir/" install
-
- gzip "$pkgdir/usr/lib/modules/$_extramodules/$pkgname.ko"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ndiswrapper/repos/community-x86_64/PKGBUILD (from rev 84610,
ndiswrapper/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-02-20 15:28:56 UTC (rev 84611)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Thorsten Töpper <atsutane...@freethoughts.de>
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Contributor: Tobias Powalowski <tp...@archlinux.org>
+
+_extramodules=extramodules-3.7-ARCH
+pkgname=ndiswrapper
+pkgver=1.58
+pkgrel=1
+pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by
vendors."
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://ndiswrapper.sourceforge.net";
+install=ndiswrapper.install
+depends=('linux>=3.7' 'linux<3.8' 'wireless_tools' 'perl')
+makedepends=('linux-headers')
+provides=("$pkgname-utils" "$pkgname-bin")
+replaces=("$pkgname-utils" "$pkgname-bin")
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz";)
+options=('!strip')
+sha1sums=('a256812b3136648ed93e04146d2276a3ca70957c')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ _kver="$(cat /usr/lib/modules/${_extramodules}/version)"
+
+ # modinfo path fix
+ sed -i "/modinfo/s/s/usr\//" driver/Makefile
+
+ # make sure we point to the right build directory
+ sed -i "/^KBUILD/ s,.*,KBUILD = $(readlink -f
/usr/lib/modules/$_kver/build)," driver/Makefile
+
+ make KVERS=$_kver
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ _kver="$(cat /usr/lib/modules/${_extramodules}/version)"
+
+ make INST_DIR="usr/lib/modules/$_extramodules" \
+ KVERS=$_kver DESTDIR="$pkgdir/" install
+
+ gzip "$pkgdir/usr/lib/modules/$_extramodules/$pkgname.ko"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/linux33.patch
===================================================================
--- community-x86_64/linux33.patch 2013-02-20 15:28:51 UTC (rev 84610)
+++ community-x86_64/linux33.patch 2013-02-20 15:28:56 UTC (rev 84611)
@@ -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: community-x86_64/linux37.patch
===================================================================
--- community-x86_64/linux37.patch 2013-02-20 15:28:51 UTC (rev 84610)
+++ community-x86_64/linux37.patch 2013-02-20 15:28:56 UTC (rev 84611)
@@ -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
Deleted: community-x86_64/ndiswrapper.install
===================================================================
--- community-x86_64/ndiswrapper.install 2013-02-20 15:28:51 UTC (rev
84610)
+++ community-x86_64/ndiswrapper.install 2013-02-20 15:28:56 UTC (rev
84611)
@@ -1,17 +0,0 @@
-post_install()
-{
- post_upgrade
-}
-
-post_upgrade()
-{
- EXTRAMODULES='extramodules-3.7-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove()
-{
- post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
Copied: ndiswrapper/repos/community-x86_64/ndiswrapper.install (from rev 84610,
ndiswrapper/trunk/ndiswrapper.install)
===================================================================
--- community-x86_64/ndiswrapper.install (rev 0)
+++ community-x86_64/ndiswrapper.install 2013-02-20 15:28:56 UTC (rev
84611)
@@ -0,0 +1,17 @@
+post_install()
+{
+ post_upgrade
+}
+
+post_upgrade()
+{
+ EXTRAMODULES='extramodules-3.7-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove()
+{
+ post_upgrade
+}
+
+# vim:set ts=2 sw=2 et:
