Hello community,
here is the log from the commit of package libusb-compat for openSUSE:Factory
checked in at Mon Jun 29 15:16:37 CEST 2009.
--------
--- libusb-compat/libusb-compat.changes 2009-06-19 14:56:25.000000000 +0200
+++ libusb-compat/libusb-compat.changes 2009-06-22 12:09:02.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jun 22 12:08:05 CEST 2009 - sbrabec@suse.cz
+
+- Updated to version 0.1.2:
+ * handle libusb initialization failure
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libusb-compat-0.1.1.tar.bz2
libusb-compat-uninitialized.patch
New:
----
libusb-compat-0.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libusb-compat.spec ++++++
--- /var/tmp/diff_new_pack.O18375/_old 2009-06-29 15:12:52.000000000 +0200
+++ /var/tmp/diff_new_pack.O18375/_new 2009-06-29 15:12:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libusb-compat (Version 0.1.1)
+# spec file for package libusb-compat (Version 0.1.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,11 +24,10 @@
License: BSD 3-clause (or similar) ; LGPL v2.1 or later
Group: System/Libraries
Summary: libusb-1.0 Compatibility Layer for libusb-0.1
-Version: 0.1.1
-Release: 2
+Version: 0.1.2
+Release: 1
Source: %{name}-%{version}.tar.bz2
-Patch0: libusb-compat-libusb0-incompat.patch
-Patch1: libusb-compat-uninitialized.patch
+Patch: libusb-compat-libusb0-incompat.patch
BuildRequires: libusb-1_0-devel pkg-config
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define debug_package_requires libusb-0_1-5 = %{version}-%{release}
@@ -127,9 +126,8 @@
%prep
%setup -q
%if !%FULLY_REPLACE_LIBUSB_0_1
-%patch0
+%patch
%endif
-%patch1 -p0
%build
autoreconf -f -i
@@ -167,41 +165,3 @@
%{_libdir}/pkgconfig/*.pc
%changelog
-* Wed Jun 17 2009 meissner@suse.de
-- Fixed crashes of libgphoto2 (and other usb_find_busses() and
- usb_find_devices() users) when no USB device is in the system
- (like in a chroot without /sys, or on s390 or similar).
- bnc#432129 (again)
-* Fri Jun 05 2009 sbrabec@suse.cz
-- Updated to version 0.1.1:
- * improvements to match libusb-0.1 endpoint addressing behaviour
-* Fri Apr 17 2009 sbrabec@suse.cz
-- Ensure use of read EP in usb_interrupt_read() (bnc#443861).
-* Wed Apr 15 2009 sbrabec@suse.cz
-- Fixed devel dependencies.
-* Wed Apr 15 2009 sbrabec@suse.cz
-- Worked around 'Duplicate License entries' breakage in Autobuild.
-* Tue Apr 14 2009 sbrabec@suse.cz
-- Updated to version 0.1.0:
- * Bug fixes.
- * Documentation of incompatibilities with libusb-0.1.
-- Implemented rpm build option FULLY_REPLACE_LIBUSB_0_1.
-- Another attempt to replace libusb-0.1 completely.
-* Wed Nov 12 2008 sbrabec@suse.cz
-- Changed library soname to libusb-0.1 incompatible libusb-0.1.so.5
- allowing to install both in paralel. (bnc#443861, works around
- also bnc#432129 and bnc#439574)
-- Confllict with libusb-devel instead of obsoleting it.
-* Wed Oct 22 2008 sbrabec@suse.cz
-- Properly obsolete old implementation of the library (bnc#437768).
-* Wed Oct 08 2008 meissner@suse.de
-- handle case where usb_init() failed (ctx NULL), so
- we do not crash. bnc#432129
-- added more NULL ptr checks, where older libusb were
- more graceful and did not crash. bnc#432129
-* Mon Oct 06 2008 sbrabec@suse.cz
-- Added baselibs.conf (bnc#432304).
-* Thu Sep 25 2008 ro@suse.de
-- fix debug package requires
-* Wed Sep 10 2008 sbrabec@suse.cz
-- New package providing compatibility layer for libusb.
++++++ libusb-compat-0.1.1.tar.bz2 -> libusb-compat-0.1.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libusb-compat-0.1.1/ChangeLog new/libusb-compat-0.1.2/ChangeLog
--- old/libusb-compat-0.1.1/ChangeLog 2009-05-28 15:30:20.000000000 +0200
+++ new/libusb-compat-0.1.2/ChangeLog 2009-06-12 00:51:40.000000000 +0200
@@ -1,3 +1,15 @@
+commit 3ffc1160f0599ceb503aa2e0dbbf51a5b72bb9b9
+Author: Daniel Drake
+Date: Thu Jun 11 23:50:59 2009 +0100
+
+ v0.1.2 release
+
+commit 29af8617ad6d460c3bff927f17c4938dab8f10d3
+Author: Daniel Drake
+Date: Fri May 29 12:28:05 2009 -0400
+
+ Better handling of library initialization failure
+
commit f0909ef85c5bf2ee8655864041e5e0453adc9ff0
Author: Daniel Drake
Date: Thu May 28 09:28:50 2009 -0400
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libusb-compat-0.1.1/configure new/libusb-compat-0.1.2/configure
--- old/libusb-compat-0.1.1/configure 2009-05-28 15:29:17.000000000 +0200
+++ new/libusb-compat-0.1.2/configure 2009-06-12 00:49:42.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for libusb-compat 0.1.1.
+# Generated by GNU Autoconf 2.63 for libusb-compat 0.1.2.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@
# Identity of this package.
PACKAGE_NAME='libusb-compat'
PACKAGE_TARNAME='libusb-compat'
-PACKAGE_VERSION='0.1.1'
-PACKAGE_STRING='libusb-compat 0.1.1'
+PACKAGE_VERSION='0.1.2'
+PACKAGE_STRING='libusb-compat 0.1.2'
PACKAGE_BUGREPORT=''
ac_unique_file="libusb/core.c"
@@ -1478,7 +1478,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libusb-compat 0.1.1 to adapt to many kinds of systems.
+\`configure' configures libusb-compat 0.1.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1548,7 +1548,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libusb-compat 0.1.1:";;
+ short | recursive ) echo "Configuration of libusb-compat 0.1.2:";;
esac
cat <<\_ACEOF
@@ -1654,7 +1654,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libusb-compat configure 0.1.1
+libusb-compat configure 0.1.2
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1668,7 +1668,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libusb-compat $as_me 0.1.1, which was
+It was created by libusb-compat $as_me 0.1.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2384,7 +2384,7 @@
# Define the identity of the package.
PACKAGE='libusb-compat'
- VERSION='0.1.1'
+ VERSION='0.1.2'
cat >>confdefs.h <<_ACEOF
@@ -2531,6 +2531,7 @@
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4336,13 +4337,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4339: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4340: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4342: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4343: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4345: output\"" >&5)
+ (eval echo "\"\$as_me:4346: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5548,7 +5549,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5551 "configure"' > conftest.$ac_ext
+ echo '#line 5552 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7401,11 +7402,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7404: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7405: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7408: \$? = $ac_status" >&5
+ echo "$as_me:7409: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7740,11 +7741,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7743: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7744: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7747: \$? = $ac_status" >&5
+ echo "$as_me:7748: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7845,11 +7846,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7848: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7849: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7852: \$? = $ac_status" >&5
+ echo "$as_me:7853: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7900,11 +7901,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7903: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7904: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7907: \$? = $ac_status" >&5
+ echo "$as_me:7908: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10713,7 +10714,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10716 "configure"
+#line 10717 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10809,7 +10810,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10812 "configure"
+#line 10813 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12027,7 +12028,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libusb-compat $as_me 0.1.1, which was
+This file was extended by libusb-compat $as_me 0.1.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12090,7 +12091,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-libusb-compat config.status 0.1.1
+libusb-compat config.status 0.1.2
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libusb-compat-0.1.1/configure.ac new/libusb-compat-0.1.2/configure.ac
--- old/libusb-compat-0.1.1/configure.ac 2009-05-28 15:27:52.000000000 +0200
+++ new/libusb-compat-0.1.2/configure.ac 2009-06-12 00:49:08.000000000 +0200
@@ -1,7 +1,8 @@
-AC_INIT([libusb-compat], [0.1.1])
+AC_INIT([libusb-compat], [0.1.2])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([libusb/core.c])
AM_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
AC_PREREQ([2.50])
AC_PROG_CC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libusb-compat-0.1.1/libusb/core.c new/libusb-compat-0.1.2/libusb/core.c
--- old/libusb-compat-0.1.1/libusb/core.c 2009-05-27 21:31:17.000000000 +0200
+++ new/libusb-compat-0.1.2/libusb/core.c 2009-05-29 18:27:18.000000000 +0200
@@ -208,8 +208,12 @@
int changes = 0;
int r;
- usbi_dbg("");
+ /* libusb-1.0 initialization might have failed, but we can't indicate
+ * this with libusb-0.1, so trap that situation here */
+ if (!ctx)
+ return 0;
+ usbi_dbg("");
r = find_busses(&new_busses);
if (r < 0) {
usbi_err("find_busses failed with error %d", r);
@@ -530,6 +534,11 @@
int r;
int changes = 0;
+ /* libusb-1.0 initialization might have failed, but we can't indicate
+ * this with libusb-0.1, so trap that situation here */
+ if (!ctx)
+ return 0;
+
usbi_dbg("");
dev_list_len = libusb_get_device_list(ctx, &dev_list);
if (dev_list_len < 0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libusb-compat-0.1.1/Makefile.am new/libusb-compat-0.1.2/Makefile.am
--- old/libusb-compat-0.1.1/Makefile.am 2008-06-18 01:13:02.000000000 +0200
+++ new/libusb-compat-0.1.2/Makefile.am 2009-06-12 00:49:28.000000000 +0200
@@ -1,4 +1,5 @@
AUTOMAKE_OPTIONS = dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
DISTCLEANFILES = ChangeLog libusb.pc
EXTRA_DIST = LICENSE
SUBDIRS = libusb
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libusb-compat-0.1.1/Makefile.in new/libusb-compat-0.1.2/Makefile.in
--- old/libusb-compat-0.1.1/Makefile.in 2009-05-28 15:29:16.000000000 +0200
+++ new/libusb-compat-0.1.2/Makefile.in 2009-06-12 00:49:42.000000000 +0200
@@ -205,6 +205,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
DISTCLEANFILES = ChangeLog libusb.pc
EXTRA_DIST = LICENSE
SUBDIRS = libusb $(am__append_1)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libusb-compat-0.1.1/NEWS new/libusb-compat-0.1.2/NEWS
--- old/libusb-compat-0.1.1/NEWS 2009-05-28 15:28:27.000000000 +0200
+++ new/libusb-compat-0.1.2/NEWS 2009-06-12 00:48:16.000000000 +0200
@@ -1,6 +1,9 @@
This file lists notable changes in each release. For the full history of all
changes, see ChangeLog.
+2009-06-11: libusb-compat-0.1.2 release
+ * Handle libusb initialization failure
+
2009-05-28: libusb-compat-0.1.1 release
* Further improvements to match libusb-0.1 endpoint addressing behaviour
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org