Thanks. Merged.

On Sun, 2016-08-07 at 15:32 +0200, Jonatan Schlag wrote:
> 
> 
> Am Mi, 20. Jul, 2016 um 5:30 schrieb Michael Tremer <michael.tremer(a)ipfire.org
> >:
> > Hi,
> > 
> > do we need the usbredirserver on IPFire as well or would the libraries be
> > enough?
> No, the libraries are enough I sent a new patch right now.
> > -Michael
> > 
> > On Wed, 2016-07-20 at 12:17 +0200, Jonatan Schlag wrote:
> >  This package adds support for the use redirection of spice.
> >  It is now possible to attach USB devices of the host where the spice
> >  client run to the virtual machine.
> >  
> >  This feature is also enabled in qemu.
> >  
> >  Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
> >  ---
> >   config/rootfiles/packages/libusbredir | 18 ++++++++
> >   lfs/libusbredir                       | 84
> >  +++++++++++++++++++++++++++++++++++
> >   lfs/qemu                              |  6 +--
> >   make.sh                               |  1 +
> >   4 files changed, 106 insertions(+), 3 deletions(-)
> >   create mode 100644 config/rootfiles/packages/libusbredir
> >   create mode 100644 lfs/libusbredir
> >  
> >  diff --git a/config/rootfiles/packages/libusbredir
> >  b/config/rootfiles/packages/libusbredir
> >  new file mode 100644
> >  index 0000000..af3710a
> >  --- /dev/null
> >  +++ b/config/rootfiles/packages/libusbredir
> >  @@ -0,0 +1,18 @@
> >  +#usr/include/usbredirfilter.h
> >  +#usr/include/usbredirhost.h
> >  +#usr/include/usbredirparser.h
> >  +#usr/include/usbredirproto.h
> >  +#usr/lib/libusbredirhost.a
> >  +#usr/lib/libusbredirhost.la
> >  +usr/lib/libusbredirhost.so
> >  +usr/lib/libusbredirhost.so.1
> >  +usr/lib/libusbredirhost.so.1.0.0
> >  +#usr/lib/libusbredirparser.a
> >  +#usr/lib/libusbredirparser.la
> >  +usr/lib/libusbredirparser.so
> >  +usr/lib/libusbredirparser.so.1
> >  +usr/lib/libusbredirparser.so.1.0.0
> >  +#usr/lib/pkgconfig/libusbredirhost.pc
> >  +#usr/lib/pkgconfig/libusbredirparser-0.5.pc
> >  +usr/sbin/usbredirserver
> >  +#usr/share/man/man1/usbredirserver.1
> >  diff --git a/lfs/libusbredir b/lfs/libusbredir
> >  new file mode 100644
> >  index 0000000..6512d27
> >  --- /dev/null
> >  +++ b/lfs/libusbredir
> >  @@ -0,0 +1,84 @@
> >  +##########################################################################
> > ###
> >  ##
> >  +#                                                                         
> >    
> >   #
> >  +# IPFire.org - A linux based
> >  firewall                                         #
> >  +# Copyright (C) 2016  IPFire Team  <info(a)ipfire.org>                      
> >    
> >   #
> >  +#                                                                         
> >    
> >   #
> >  +# This program is free software: you can redistribute it and/or
> >  modify        #
> >  +# it under the terms of the GNU General Public License as published
> >  by        #
> >  +# the Free Software Foundation, either version 3 of the License,
> >  or           #
> >  +# (at your option) any later
> >  version.                                         #
> >  +#                                                                         
> >    
> >   #
> >  +# This program is distributed in the hope that it will be
> >  useful,             #
> >  +# but WITHOUT ANY WARRANTY; without even the implied warranty
> >  of              #
> >  +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
> >  the               #
> >  +# GNU General Public License for more
> >  details.                                #
> >  +#                                                                         
> >    
> >   #
> >  +# You should have received a copy of the GNU General Public
> >  License           #
> >  +# along with this program.  If not, see <http://www.gnu.org/licenses/>.   
> >    
> >   #
> >  +#                                                                         
> >    
> >   #
> >  +##########################################################################
> > ###
> >  ##
> >  +
> >  +##########################################################################
> > ###
> >  ##
> >  +# Definitions
> >  +##########################################################################
> > ###
> >  ##
> >  +
> >  +include Config
> >  +
> >  +VER        = 0.7.1
> >  +
> >  +THISAPP    = usbredir-$(VER)
> >  +DL_FILE    = $(THISAPP).tar.bz2
> >  +DL_FROM    = $(URL_IPFIRE)
> >  +DIR_APP    = $(DIR_SRC)/$(THISAPP)
> >  +TARGET     = $(DIR_INFO)/$(THISAPP)
> >  +PROG       = libusbredir
> >  +PAK_VER    = 1
> >  +
> >  +DEPS       = ""
> >  +
> >  +##########################################################################
> > ###
> >  ##
> >  +# Top-level Rules
> >  +##########################################################################
> > ###
> >  ##
> >  +
> >  +objects = $(DL_FILE)
> >  +
> >  +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> >  +
> >  +$(DL_FILE)_MD5 = 35cfb1720967727dea523b943cc4126b
> >  +
> >  +install : $(TARGET)
> >  +
> >  +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
> >  +
> >  +download :$(patsubst %,$(DIR_DL)/%,$(objects))
> >  +
> >  +md5 : $(subst %,%_MD5,$(objects))
> >  +
> >  +dist: 
> >  +	@$(PAK)
> >  +
> >  +##########################################################################
> > ###
> >  ##
> >  +# Downloading, checking, md5sum
> >  +##########################################################################
> > ###
> >  ##
> >  +
> >  +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
> >  +	@$(CHECK)
> >  +
> >  +$(patsubst %,$(DIR_DL)/%,$(objects)) :
> >  +	@$(LOAD)
> >  +
> >  +$(subst %,%_MD5,$(objects)) :
> >  +	@$(MD5)
> >  +
> >  +##########################################################################
> > ###
> >  ##
> >  +# Installation Details
> >  +##########################################################################
> > ###
> >  ##
> >  +
> >  +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> >  +	@$(PREBUILD)
> >  +	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf
> > $(DIR_DL)/$(DL_FILE)
> >  +	cd $(DIR_APP) && ./configure --prefix=/usr
> >  +	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
> >  +	cd $(DIR_APP) && make install
> >  +	@rm -rf $(DIR_APP)
> >  +	@$(POSTBUILD)
> >  diff --git a/lfs/qemu b/lfs/qemu
> >  index 62010ee..fb4f4b3 100644
> >  --- a/lfs/qemu
> >  +++ b/lfs/qemu
> >  @@ -33,9 +33,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
> >   TARGET     = $(DIR_INFO)/$(THISAPP)
> >   SUP_ARCH   = i586 x86_64
> >   PROG       = qemu
> >  -PAK_VER    = 20
> >  +PAK_VER    = 21
> >   
> >  -DEPS       = "sdl spice"
> >  +DEPS       = "libusbredir sdl spice"
> >   
> >   ##########################################################################
> > ###
> >  ##
> >   # Top-level Rules
> >  @@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> >   	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
> >   		--enable-kvm --disable-bluez --disable-attr \
> >   		--target-list="i386-linux-user x86_64-linux-user arm-
> > linux-
> >  user i386-softmmu x86_64-softmmu arm-softmmu" \
> >  -		--extra-cflags="$(CFLAGS)" --enable-spice
> >  +		--extra-cflags="$(CFLAGS)" --enable-spice --enable-usb-
> > redir
> >   	cd $(DIR_APP) && make $(MAKETUNING)
> >   	cd $(DIR_APP) && make install
> >   
> >  diff --git a/make.sh b/make.sh
> >  index c6b1b5b..a992c2f 100755
> >  --- a/make.sh
> >  +++ b/make.sh
> >  @@ -708,6 +708,7 @@ buildipfire() {
> >     ipfiremake spice-protocol
> >     ipfiremake spice
> >     ipfiremake sdl
> >  +  ipfiremake libusbredir
> >     ipfiremake qemu
> >     ipfiremake sane
> >     ipfiremake netpbm