From d30819033d52eea130bde7d118255d9606654bf8 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 21 Nov 2013 00:01:21 +0100
Subject: [PATCH] usbutils: update to 007.

---
 config/rootfiles/common/usbutils | 13 ++++++++++---
 lfs/usbutils                     | 16 ++++++++--------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/config/rootfiles/common/usbutils b/config/rootfiles/common/usbutils
index 3858b3964f..1162c3ab12 100644
--- a/config/rootfiles/common/usbutils
+++ b/config/rootfiles/common/usbutils
@@ -1,5 +1,12 @@
-#usr/man/man8/lsusb.8
-usr/sbin/lsusb
-usr/sbin/update-usbids
+usr/bin/lsusb
+usr/bin/lsusb.py
+usr/bin/usb-devices
+usr/bin/usbhid-dump
+usr/sbin/update-usbids.sh
 #usr/share/hwdata
 #usr/share/hwdata/usb.ids
+#usr/share/man/man1/usb-devices.1
+#usr/share/man/man8/lsusb.8
+#usr/share/man/man8/usbhid-dump.8
+#usr/share/pkgconfig
+#usr/share/pkgconfig/usbutils.pc
diff --git a/lfs/usbutils b/lfs/usbutils
index 3b5c302cdc..51192e7e72 100644
--- a/lfs/usbutils
+++ b/lfs/usbutils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013   IPFire Team  <info@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        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 0.72
+VER        = 007
 
 THISAPP    = usbutils-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ee345fe605ffcfce843dae4aed81122b
+$(DL_FILE)_MD5 = c9df5107ae9d26b10a1736a261250139
 
 install : $(TARGET)
 
@@ -69,11 +69,11 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && sed -i 's|DEST=|&/usr/share/hwdata/|' update-usbids.sh
-	cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share/hwdata
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure	--prefix=/usr \
+					--datadir=/usr/share/hwdata \
+					--disable-zlib
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	cd $(DIR_APP) && install -v -m755 update-usbids.sh /usr/sbin/update-usbids
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-- 
2.39.2