From 839221db06d1950bb2da1e5222b3fc127bb123e3 Mon Sep 17 00:00:00 2001 From: Chris Frey Date: Fri, 6 Jun 2008 20:23:21 -0400 Subject: [PATCH] Removed openssl dependency due to license issues Debian and Ubuntu have checks in their lintian tool that check for GPL+OpenSSL linkage. In order to remove any potential obstacles to future inclusion in those distros, the dependency is removed here in favour of the small mozilla implementation which is GPL. --- ChangeLog | 6 ++++++ configure.ac | 2 +- debian/control | 2 +- opensync-plugin/README | 1 - rpm/barry.spec | 6 +++--- src/Makefile.am | 6 ++++-- src/socket.cc | 2 +- tools/Makefile.am | 5 +++-- tools/brecsum.cc | 1 - 9 files changed, 19 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1f23ac7..f14476fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,12 @@ Release: version 0.13 - 2008/06/?? 2008/06/06 - added timeout argument to Device::BulkDrain() - added mozilla's sha1 code from git + - removed openssl dependency due to license issues + Debian and Ubuntu have checks in their lintian tool that + check for GPL+OpenSSL linkage. In order to remove any + potential obstacles to future inclusion in those distros, + the dependency is removed here in favour of the small + mozilla implementation which is GPL. 2008/06/04 - added notes to web documentation for OpenBSD - documentation updates: diff --git a/configure.ac b/configure.ac index fbb4f9be..c4c0f60f 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,7 @@ else BOOST_ENABLED="true" fi -PKG_CHECK_MODULES([OPENSSL], [openssl]) +#PKG_CHECK_MODULES([OPENSSL], [openssl]) pkgconfigdir=${libdir}/pkgconfig AC_SUBST(pkgconfigdir) diff --git a/debian/control b/debian/control index 77c3e3b4..a55992dc 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: barry Section: misc Priority: optional Maintainer: Chris Frey -Build-Depends: debhelper (>= 4.0.0), cdbs, autoconf, automake, libtool, pkg-config, libusb-dev, libssl-dev, libboost-serialization-dev, libtar-dev, libgtkmm-2.4-dev, libglademm-2.4-dev, libopensync0-dev (>= 0.22), libopensync0-dev (<< 0.30) +Build-Depends: debhelper (>= 4.0.0), cdbs, autoconf, automake, libtool, pkg-config, libusb-dev, libboost-serialization-dev, libtar-dev, libgtkmm-2.4-dev, libglademm-2.4-dev, libopensync0-dev (>= 0.22), libopensync0-dev (<< 0.30) Standards-Version: 3.6.1 Package: libbarry diff --git a/opensync-plugin/README b/opensync-plugin/README index 8b9c734f..a24b43e2 100644 --- a/opensync-plugin/README +++ b/opensync-plugin/README @@ -48,7 +48,6 @@ any dev or devel packages that come along with them. libxml2 Required by OpenSync libbarry 0.x In the same tarball as this code. libusb Required by libbarry - openssl Required by libbarry In addition to libopensync, you will need a plugin for your desktop software of choice, or for other handheld devices, such as the Palm. diff --git a/rpm/barry.spec b/rpm/barry.spec index 0c13073b..4f6f7de8 100644 --- a/rpm/barry.spec +++ b/rpm/barry.spec @@ -29,7 +29,7 @@ Source: %{name}-%{version}.tar.bz2 URL: http://www.netdirect.ca/downloads/barry Vendor: Net Direct Inc. BuildRoot: %{_tmppath}/%{name}-%{release}-%{version}-root -BuildRequires: libusb-devel, gcc-c++, pkgconfig, boost-devel, openssl-devel +BuildRequires: libusb-devel, gcc-c++, pkgconfig, boost-devel %define barryroot %{_builddir}/%{name}-%{version} @@ -41,7 +41,7 @@ is a registered trademark of Research in Motion Limited.) %package -n libbarry Summary: BlackBerry(tm) Desktop for Linux - libbarry libraries Group: Development/Libraries -Requires: libusb openssl boost +Requires: libusb boost %description -n libbarry Barry is a desktop toolset for managing your BlackBerry(tm) device. (BlackBerry @@ -55,7 +55,7 @@ likely want to also install barry-util and barry-gui. %package -n libbarry-devel Summary: BlackBerry(tm) Desktop for Linux - libbarry libraries Group: Development/Libraries -Requires: libbarry libusb-devel openssl-devel boost-devel +Requires: libbarry libusb-devel boost-devel %description -n libbarry-devel Barry is a desktop toolset for managing your BlackBerry(tm) device. (BlackBerry diff --git a/src/Makefile.am b/src/Makefile.am index 6fbd53a2..3e4e07f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,8 @@ LIB_BARRY_VERSION = 0:13:0 # needed for config.h DEFAULT_INCLUDES = -I$(top_builddir) #INCLUDES = @PACKAGE_CXXFLAGS@ -I@LIBUSB_INC_PATH@ -INCLUDES = $(LIBUSB_CFLAGS) $(OPENSSL_CFLAGS) +#INCLUDES = $(LIBUSB_CFLAGS) $(OPENSSL_CFLAGS) +INCLUDES = $(LIBUSB_CFLAGS) #AM_CXXFLAGS = -ansi -Wall -fno-strict-aliasing -g -D__DEBUG_MODE__ AM_CFLAGS = -Wall -fno-strict-aliasing -g AM_CXXFLAGS = -ansi -Wall -fno-strict-aliasing -g @@ -133,7 +134,8 @@ libbarry_la_SOURCES = time.cc \ protostructs.h \ debug.h \ endian.h -libbarry_la_LIBADD = $(LTLIBOBJS) $(LIBUSB_LIBS) $(OPENSSL_LIBS) +#libbarry_la_LIBADD = $(LTLIBOBJS) $(LIBUSB_LIBS) $(OPENSSL_LIBS) +libbarry_la_LIBADD = $(LTLIBOBJS) $(LIBUSB_LIBS) libbarry_la_LDFLAGS = -version-info ${LIB_BARRY_VERSION} noinst_HEADERS = cbarry.h \ diff --git a/src/socket.cc b/src/socket.cc index 7fad709f..ba370b8f 100644 --- a/src/socket.cc +++ b/src/socket.cc @@ -27,7 +27,7 @@ #include "endian.h" #include "debug.h" #include "packet.h" -#include +#include "sha1.h" #include #include diff --git a/tools/Makefile.am b/tools/Makefile.am index 612b1328..1a77ea14 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -55,7 +55,8 @@ breset_LDADD = $(LIBUSB_LIBS) pppob_SOURCES = pppob.cc pppob_LDADD = ../src/libbarry.la $(LIBUSB_LIBS) -lpthread -brecsum_CXXFLAGS = $(OPENSSL_CFLAGS) +#brecsum_CXXFLAGS = $(OPENSSL_CFLAGS) brecsum_SOURCES = brecsum.cc -brecsum_LDADD = ../src/libbarry.la $(LIBUSB_LIBS) $(OPENSSL_LIBS) -lpthread +#brecsum_LDADD = ../src/libbarry.la $(LIBUSB_LIBS) $(OPENSSL_LIBS) -lpthread +brecsum_LDADD = ../src/libbarry.la $(LIBUSB_LIBS) -lpthread diff --git a/tools/brecsum.cc b/tools/brecsum.cc index d2ee0f02..28654322 100644 --- a/tools/brecsum.cc +++ b/tools/brecsum.cc @@ -21,7 +21,6 @@ */ #include -#include #include #include #include -- 2.11.4.GIT