diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2011-04-25 13:37:00 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-05-31 22:45:18 +0200 |
| commit | 75a4a592e5ccda30715f93563d741b83e0dcf39e (patch) | |
| tree | 502f745607e77a2c4386ad38d818ddcafe81489c /source/l/libusb | |
| parent | b76270bf9e6dd375e495fec92140a79a79415d27 (diff) | |
| download | current-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.gz current-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.xz | |
Slackware 13.37slackware-13.37
Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!
Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
As always, thanks to the Slackware community for testing, suggestions,
and feedback. :-)
Have fun!
Diffstat (limited to 'source/l/libusb')
| -rwxr-xr-x | source/l/libusb/libusb.SlackBuild | 19 | ||||
| -rw-r--r-- | source/l/libusb/libusb.fix.debug.log.level.diff | 12 |
2 files changed, 20 insertions, 11 deletions
diff --git a/source/l/libusb/libusb.SlackBuild b/source/l/libusb/libusb.SlackBuild index 67d0756a7..26bc4b5d0 100755 --- a/source/l/libusb/libusb.SlackBuild +++ b/source/l/libusb/libusb.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,19 +21,17 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-1.0.6} # libusb version +VERSION=${VERSION:-1.0.8} # libusb version USBCOMPAT=${USBCOMPAT:-0.1.3} # libusb-compat version -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j6} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) export ARCH=i486 ;; arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi @@ -64,6 +62,9 @@ cd $TMP rm -rf libusb-$VERSION tar xvf $CWD/libusb-$VERSION.tar.bz2 cd libusb-$VERSION + +zcat $CWD/libusb.fix.debug.log.level.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -138,12 +139,8 @@ if [ -r ChangeLog ]; then fi # Now handle the package-wide stuff -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ - xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ - xargs strip --strip-unneeded 2> /dev/null -) +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null # Compress and if needed symlink the man pages: if [ -d $PKG/usr/man ]; then diff --git a/source/l/libusb/libusb.fix.debug.log.level.diff b/source/l/libusb/libusb.fix.debug.log.level.diff new file mode 100644 index 000000000..59af816eb --- /dev/null +++ b/source/l/libusb/libusb.fix.debug.log.level.diff @@ -0,0 +1,12 @@ +--- ./libusb/os/linux_usbfs.c.orig 2010-04-22 16:14:46.000000000 -0500 ++++ ./libusb/os/linux_usbfs.c 2011-03-24 18:40:38.000000000 -0500 +@@ -1055,7 +1055,8 @@ + hpriv->fd = open(filename, O_RDWR); + if (hpriv->fd < 0) { + if (errno == EACCES) { +- fprintf(stderr, "libusb couldn't open USB device %s: " ++ usbi_err(HANDLE_CTX(handle), ++ "libusb couldn't open USB device %s: " + "Permission denied.\n" + "libusb requires write access to USB device nodes.\n", + filename); |