[kernel] r19191 - in dists/sid/linux-tools/debian: . build/drivers/staging/usbip patches templates

[Ben Hutchings]

Author: benh
Date: Sun Jun 24 01:51:39 2012
New Revision: 19191

Log:
usbipd: Enable TCP wrappers for access control

Added:
   dists/sid/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch
   dists/sid/linux-tools/debian/patches/usbip-fix-explicit-configure-with-tcp-wrappers.patch
Modified:
   dists/sid/linux-tools/debian/build/drivers/staging/usbip/Makefile
   dists/sid/linux-tools/debian/changelog
   dists/sid/linux-tools/debian/patches/series
   dists/sid/linux-tools/debian/templates/control.source.in

Modified: dists/sid/linux-tools/debian/build/drivers/staging/usbip/Makefile
==============================================================================
--- dists/sid/linux-tools/debian/build/drivers/staging/usbip/Makefile	Sun Jun 24 01:40:30 2012	(r19190)
+++ dists/sid/linux-tools/debian/build/drivers/staging/usbip/Makefile	Sun Jun 24 01:51:39 2012	(r19191)
@@ -10,7 +10,7 @@
 	mkdir -p userspace
 	cd userspace && $(srcdir)/configure \
 		--prefix=/usr \
-		--with-tcp-wrappers=no \
+		--with-tcp-wrappers \
 		--with-usbids-dir=/usr/share/misc \
 		--disable-shared
 	$(MAKE) -C userspace

Modified: dists/sid/linux-tools/debian/changelog
==============================================================================
--- dists/sid/linux-tools/debian/changelog	Sun Jun 24 01:40:30 2012	(r19190)
+++ dists/sid/linux-tools/debian/changelog	Sun Jun 24 01:51:39 2012	(r19191)
@@ -12,6 +12,7 @@
   * Build usbip userland packages (Closes: #568362)
     - Do not build a shared library package; the API and ABI have changed
       from libusbip0 but there has been no upstream soversion change
+  * usbipd: Enable TCP wrappers for access control
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 09 Jun 2012 19:56:44 +0100
 

Modified: dists/sid/linux-tools/debian/patches/series
==============================================================================
--- dists/sid/linux-tools/debian/patches/series	Sun Jun 24 01:40:30 2012	(r19190)
+++ dists/sid/linux-tools/debian/patches/series	Sun Jun 24 01:51:39 2012	(r19191)
@@ -2,3 +2,5 @@
 tools-perf-version.patch
 tools-perf-install.patch
 usbip-update-man-pages.patch
+usbip-fix-explicit-configure-with-tcp-wrappers.patch
+usbip-document-tcp-wrappers.patch

Added: dists/sid/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-tools/debian/patches/usbip-document-tcp-wrappers.patch	Sun Jun 24 01:51:39 2012	(r19191)
@@ -0,0 +1,27 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: usbip: Document TCP wrappers
+
+Add references to TCP wrappers configuration in the manual page.
+
+--- a/drivers/staging/usbip/userspace/doc/usbipd.8
++++ b/drivers/staging/usbip/userspace/doc/usbipd.8
+@@ -14,7 +14,8 @@
+ before usbipd makes them available to other hosts.
+ 
+ The daemon accepts connections from USB/IP clients
+-on TCP port 3240.
++on TCP port 3240.  The clients authorised to connect may be
++configured as documented in hosts_access(5).
+ 
+ .SH OPTIONS
+ .HP
+@@ -39,7 +40,8 @@
+ 
+ .B usbipd
+ offers no authentication or authorization for USB/IP. Any
+-USB/IP client can connect and use exported devices.
++USB/IP client running on an authorised host can connect and
++use exported devices.
+ 
+ .SH EXAMPLES
+ 

Added: dists/sid/linux-tools/debian/patches/usbip-fix-explicit-configure-with-tcp-wrappers.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-tools/debian/patches/usbip-fix-explicit-configure-with-tcp-wrappers.patch	Sun Jun 24 01:51:39 2012	(r19191)
@@ -0,0 +1,37 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Subject: usbip: Fix explicit configure --with-tcp-wrappers
+
+If the --with-tcp-wrappers[=yes] option is given and the wrap library
+checks out, we currently add '-lwrap' to $LIBS but then reset it to
+$saved_LIBS.  In fact there is no need to save and restore $LIBS here
+because failure is fatal.  $wrap_LIB is also unused, so don't set that
+either.
+
+--- a/drivers/staging/usbip/userspace/configure.ac
++++ b/drivers/staging/usbip/userspace/configure.ac
+@@ -56,8 +56,7 @@
+ 	    [AS_HELP_STRING([--with-tcp-wrappers],
+ 			    [use the libwrap (TCP wrappers) library])],
+ 	    dnl [ACTION-IF-GIVEN]
+-	    [saved_LIBS="$LIBS"
+-	     if test "$withval" = "yes"; then
++	    [if test "$withval" = "yes"; then
+ 		     AC_MSG_RESULT([yes])
+ 		     AC_MSG_CHECKING([for hosts_access in -lwrap])
+ 		     LIBS="-lwrap $LIBS"
+@@ -65,13 +64,11 @@
+ 		       [int hosts_access(); int allow_severity, deny_severity;],
+ 		       [hosts_access()],
+ 		       [AC_MSG_RESULT([yes]);
+-			AC_DEFINE([HAVE_LIBWRAP], [1],
+-				  [use tcp wrapper]) wrap_LIB="-lwrap"],
++			AC_DEFINE([HAVE_LIBWRAP], [1], [use tcp wrapper])],
+ 		       [AC_MSG_RESULT([not found]); exit 1])
+ 	     else
+ 		     AC_MSG_RESULT([no])
+-	     fi
+-	     LIBS="$saved_LIBS"],
++	     fi],
+ 	    dnl [ACTION-IF-NOT-GIVEN]
+ 	    [AC_MSG_RESULT([(default)])
+ 	     AC_MSG_CHECKING([for hosts_access in -lwrap])

Modified: dists/sid/linux-tools/debian/templates/control.source.in
==============================================================================
--- dists/sid/linux-tools/debian/templates/control.source.in	Sun Jun 24 01:40:30 2012	(r19190)
+++ dists/sid/linux-tools/debian/templates/control.source.in	Sun Jun 24 01:51:39 2012	(r19191)
@@ -7,6 +7,6 @@
 Build-Depends:
  debhelper (>> 7), python,
  asciidoc, binutils-dev, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev, xmlto,
- autoconf, automake, libtool, libglib2.0-dev, libsysfs-dev
+ autoconf, automake, libtool, libglib2.0-dev, libsysfs-dev, libwrap0-dev
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-tools/
 Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-tools/