Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5ad601971d493a162988d9269597aee7a7492955)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5ad601971d493a162988d9269597aee7a7492955)
  • Date: Wed, 27 Feb 2013 09:52:43 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

dev/null |binary
kernels/ndiswrapper/BUILD | 2
kernels/ndiswrapper/DETAILS | 4 -
kernels/ndiswrapper/HISTORY | 6 +
kernels/ndiswrapper/INSTALL | 2
kernels/ndiswrapper/PRE_BUILD | 9 --
kernels/ndiswrapper/kernel-2.6.35.patch | 98
--------------------------------
kernels/ndiswrapper/kernel-2.6.36.patch | 27 --------
kernels/ndiswrapper/kernel-2.6.38.patch | 24 -------
kernels/ndiswrapper/kernel-3.1.patch | 13 ----
printer/cups/DEPENDS | 6 -
printer/cups/HISTORY | 3
12 files changed, 16 insertions(+), 178 deletions(-)

New commits:
commit 5ad601971d493a162988d9269597aee7a7492955
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

ndiswrapper: => 1.58

commit 3fbe6ae56299ec14ce23758dcd4be98665d745ce
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

cups - adjust build flags

diff --git a/kernels/ndiswrapper/BUILD b/kernels/ndiswrapper/BUILD
index 40ca1ba..8f58e6d 100755
--- a/kernels/ndiswrapper/BUILD
+++ b/kernels/ndiswrapper/BUILD
@@ -1 +1 @@
-make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/lib/modules/$(get_kernel_version)/build
+make
diff --git a/kernels/ndiswrapper/DETAILS b/kernels/ndiswrapper/DETAILS
index 84b0553..58ff0f2 100755
--- a/kernels/ndiswrapper/DETAILS
+++ b/kernels/ndiswrapper/DETAILS
@@ -11,11 +11,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn/$SPELL

SOURCE_URL[0]=svn://ndiswrapper.svn.sourceforge.net/svnroot/ndiswrapper/trunk:ndiswrapper
SOURCE_IGNORE=volatile
else
- VERSION=1.56
+ VERSION=1.58
+
SOURCE_HASH=sha512:161e87df13143841ff29f424e979cd9648a0022f0ad74c1189e398c832f5c4a77834fc9dde941c8202773064f2b312968c21b39c5023167fb67ae67ebd86795a
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
fi
WEB_SITE=http://$SPELL.sf.net/
KEYWORDS="ndis driver"
diff --git a/kernels/ndiswrapper/HISTORY b/kernels/ndiswrapper/HISTORY
index 54dbedc..3accb80 100644
--- a/kernels/ndiswrapper/HISTORY
+++ b/kernels/ndiswrapper/HISTORY
@@ -1,3 +1,9 @@
+2013-02-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: upgrade to 1.58
+ * PRE_BUILD: dont't need patches
+ * INSTALL, BUILD: simplify
+ * *.patch: deleted
+
2011-11-18 Sukneet Basuta <sukneet AT sourcemage.org>
* DETAILS: updated spell to 1.56
switched to gpg signing
diff --git a/kernels/ndiswrapper/INSTALL b/kernels/ndiswrapper/INSTALL
index 8d5d5ca..26ce19f 100755
--- a/kernels/ndiswrapper/INSTALL
+++ b/kernels/ndiswrapper/INSTALL
@@ -1,2 +1,2 @@
-make KVERS=$(get_kernel_version)
KBUILD=$INSTALL_ROOT/lib/modules/$(get_kernel_version)/build
mandir=${INSTALL_ROOT}/usr/share/man install &&
+make install &&
mkdir -p /etc/ndiswrapper
diff --git a/kernels/ndiswrapper/PRE_BUILD b/kernels/ndiswrapper/PRE_BUILD
index 52d4d1f..fae2cf6 100755
--- a/kernels/ndiswrapper/PRE_BUILD
+++ b/kernels/ndiswrapper/PRE_BUILD
@@ -2,14 +2,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-# following is taken from ArchLinux
-patch -p1 < $SPELL_DIRECTORY/kernel-2.6.35.patch &&
-patch -p1 < $SPELL_DIRECTORY/kernel-2.6.36.patch &&
-patch -p2 < $SPELL_DIRECTORY/kernel-2.6.38.patch &&
-patch -p1 < $SPELL_DIRECTORY/kernel-3.1.patch &&
-
-# fix regex to accept kernel version 3.x
-sed -i "/uname/s/\/.*\//\/(\\\d+)\\\.(\\\d+)\//" utils/ndiswrapper &&
-
# fix module dir
sed -i "s|misc|kernel/drivers/net/wireless/$pkgname|" driver/Makefile
diff --git a/kernels/ndiswrapper/kernel-2.6.35.patch
b/kernels/ndiswrapper/kernel-2.6.35.patch
deleted file mode 100644
index 1cfdab2..0000000
--- a/kernels/ndiswrapper/kernel-2.6.35.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -uNr ndiswrapper-1.56.old/driver/usb.c ndiswrapper-1.56/driver/usb.c
---- ndiswrapper-1.56.old/driver/usb.c 2010-02-10 18:09:32.000000000 -0800
-+++ ndiswrapper-1.56/driver/usb.c 2010-07-25 02:29:25.442145846 -0700
-@@ -191,9 +191,15 @@
- if (wrap_urb->flags & WRAP_URB_COPY_BUFFER) {
- USBTRACE("freeing DMA buffer for URB: %p %p",
- urb, urb->transfer_buffer);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
- usb_buffer_free(IRP_WRAP_DEVICE(irp)->usb.udev,
-+ urb->transfer_buffer_length,
-+ urb->transfer_buffer, urb->transfer_dma);
-+#else
-+ usb_free_coherent(IRP_WRAP_DEVICE(irp)->usb.udev,
- urb->transfer_buffer_length,
- urb->transfer_buffer, urb->transfer_dma);
-+#endif
- }
- if (urb->setup_packet)
- kfree(urb->setup_packet);
-@@ -303,9 +309,16 @@
- || PageHighMem(virt_to_page(buf))
- #endif
- )) {
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
- urb->transfer_buffer =
-- usb_buffer_alloc(wd->usb.udev, buf_len, alloc_flags,
-+ usb_buffer_alloc(wd->usb.udev, buf_len, alloc_flags,
-+ &urb->transfer_dma);
-+#else
-+ urb->transfer_buffer =
-+ usb_alloc_coherent(wd->usb.udev, buf_len, alloc_flags,
- &urb->transfer_dma);
-+#endif
- if (!urb->transfer_buffer) {
- WARNING("couldn't allocate dma buf");
- IoAcquireCancelSpinLock(&irp->cancel_irql);
-diff -uNr ndiswrapper-1.56.old/driver/wrapndis.c
ndiswrapper-1.56/driver/wrapndis.c
---- ndiswrapper-1.56.old/driver/wrapndis.c 2010-02-10 18:09:32.000000000
-0800
-+++ ndiswrapper-1.56/driver/wrapndis.c 2010-07-25 02:06:13.184631757 -0700
-@@ -936,6 +936,10 @@
- EXIT2(return);
- }
-
-+#ifndef netdev_mc_count
-+#define netdev_mc_count(net_dev) net_dev->mc_count
-+#endif
-+
- static void set_multicast_list(struct ndis_device *wnd)
- {
- struct net_device *net_dev;
-@@ -950,20 +954,26 @@
- packet_filter |= NDIS_PACKET_TYPE_PROMISCUOUS |
- NDIS_PACKET_TYPE_ALL_LOCAL;
- } else if (net_dev->flags & IFF_ALLMULTI ||
-- net_dev->mc_count > wnd->multicast_size) {
-+ netdev_mc_count(net_dev) > wnd->multicast_size) {
- packet_filter |= NDIS_PACKET_TYPE_ALL_MULTICAST;
- TRACE2("0x%08x", packet_filter);
-- } else if (net_dev->mc_count > 0) {
-+ } else if (netdev_mc_count(net_dev) > 0) {
- int i, size;
- char *buf;
-+#ifndef netdev_for_each_mc_addr
- struct dev_mc_list *mclist;
-- size = min(wnd->multicast_size, net_dev->mc_count);
-- TRACE2("%d, %d", wnd->multicast_size, net_dev->mc_count);
-+#else
-+ struct netdev_hw_addr *mclist;
-+#endif
-+
-+ size = min(wnd->multicast_size, netdev_mc_count(net_dev));
-+ TRACE2("%d, %d", wnd->multicast_size,
netdev_mc_count(net_dev));
- buf = kmalloc(size * ETH_ALEN, GFP_KERNEL);
- if (!buf) {
- WARNING("couldn't allocate memory");
- EXIT2(return);
- }
-+#ifndef netdev_for_each_mc_addr
- mclist = net_dev->mc_list;
- for (i = 0; i < size && mclist; mclist = mclist->next) {
- if (mclist->dmi_addrlen != ETH_ALEN)
-@@ -972,6 +982,15 @@
- TRACE2(MACSTRSEP, MAC2STR(mclist->dmi_addr));
- i++;
- }
-+#else
-+ i = 0;
-+ netdev_for_each_mc_addr(mclist, net_dev){
-+ memcpy(buf + i++ * ETH_ALEN,
-+ mclist->addr, ETH_ALEN);
-+ TRACE2(MACSTRSEP, MAC2STR(mclist->addr));
-+
-+ }
-+#endif
- res = mp_set(wnd, OID_802_3_MULTICAST_LIST, buf, i *
ETH_ALEN);
- if (res == NDIS_STATUS_SUCCESS && i > 0)
- packet_filter |= NDIS_PACKET_TYPE_MULTICAST;
diff --git a/kernels/ndiswrapper/kernel-2.6.36.patch
b/kernels/ndiswrapper/kernel-2.6.36.patch
deleted file mode 100644
index 63de303..0000000
--- a/kernels/ndiswrapper/kernel-2.6.36.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- ndiswrapper-1.56.orig/driver/loader.c 2010-02-11 03:09:32.000000000
+0100
-+++ ndiswrapper-1.56/driver/loader.c 2010-10-24 01:38:13.000000000 +0200
-@@ -750,13 +750,13 @@
- }
-
- /* called with loader_mutex is down */
--static int wrapper_ioctl(struct inode *inode, struct file *file,
-+static long wrapper_unlocked_ioctl(struct file *file,
- unsigned int cmd, unsigned long arg)
- {
- struct load_driver *load_driver;
- struct load_device load_device;
- struct load_driver_file load_bin_file;
-- int ret;
-+ long ret;
- void __user *addr = (void __user *)arg;
-
- ENTER1("cmd: %u", cmd);
-@@ -831,7 +831,7 @@
-
- static struct file_operations wrapper_fops = {
- .owner = THIS_MODULE,
-- .ioctl = wrapper_ioctl,
-+ .unlocked_ioctl = wrapper_unlocked_ioctl,
- .release = wrapper_ioctl_release,
- };
-
diff --git a/kernels/ndiswrapper/kernel-2.6.38.patch
b/kernels/ndiswrapper/kernel-2.6.38.patch
deleted file mode 100644
index 6fdb1e8..0000000
--- a/kernels/ndiswrapper/kernel-2.6.38.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- trunk/ndiswrapper/driver/wrapndis.c 2010/09/13 09:36:56 2728
-+++ trunk/ndiswrapper/driver/wrapndis.c 2011/02/14 17:00:00 2729
-@@ -13,16 +13,16 @@
- *
- */
-
--#include "ndis.h"
--#include "iw_ndis.h"
--#include "pnp.h"
--#include "loader.h"
--#include "wrapndis.h"
- #include <linux/inetdevice.h>
- #include <linux/ip.h>
- #include <linux/tcp.h>
- #include <linux/udp.h>
- #include <linux/in.h>
-+#include "ndis.h"
-+#include "iw_ndis.h"
-+#include "pnp.h"
-+#include "loader.h"
-+#include "wrapndis.h"
- #include "wrapper.h"
-
- /* Functions callable from the NDIS driver */
diff --git a/kernels/ndiswrapper/kernel-3.1.patch
b/kernels/ndiswrapper/kernel-3.1.patch
deleted file mode 100644
index e23d586..0000000
--- a/kernels/ndiswrapper/kernel-3.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ndiswrapper-1.56/driver/ntoskernel.h 2010-02-11 02:09:32.000000000
+0000
-+++ ndiswrapper-1.56/driver/ntoskernel.h 2011-11-09 15:39:14.640555480
+0000
-@@ -275,10 +275,6 @@
- #define PM_EVENT_SUSPEND 2
- #endif
-
--#if !defined(HAVE_NETDEV_PRIV)
--#define netdev_priv(dev) ((dev)->priv)
--#endif
--
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)
- #define ISR_PT_REGS_PARAM_DECL
- #define ISR_PT_REGS_ARG
diff --git a/kernels/ndiswrapper/ndiswrapper-1.56.tar.gz.sig
b/kernels/ndiswrapper/ndiswrapper-1.56.tar.gz.sig
deleted file mode 100644
index d4ac23a..0000000
Binary files a/kernels/ndiswrapper/ndiswrapper-1.56.tar.gz.sig and /dev/null
differ
diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index 1cefd86..810813b 100755
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -41,12 +41,12 @@ optional_depends "linux-pam" \

optional_depends "gnutls" \
"--enable-gnutls" \
- "--disable-gnutls" \
+ "" \
"use GNU TLS for SSL/TLS support" &&

optional_depends "openssl" \
- "--enable-ssl" \
- "--disable-ssl" \
+ "--enable-openssl" \
+ "" \
"for encrypted communications" &&

optional_depends "acl" \
diff --git a/printer/cups/HISTORY b/printer/cups/HISTORY
index d2b1b1f..6ec3e40 100644
--- a/printer/cups/HISTORY
+++ b/printer/cups/HISTORY
@@ -1,3 +1,6 @@
+2013-02-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: adjust flags for openssl & gnutls
+
2012-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.6.1




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (5ad601971d493a162988d9269597aee7a7492955), Treeve Jelbert, 02/27/2013

Archive powered by MHonArc 2.6.24.

Top of Page