- updated

Changed files:
    pciutils-nowhich.patch -> 1.2
    pciutils-pcimodules.patch -> 1.4

diff --git a/pciutils-nowhich.patch b/pciutils-nowhich.patch
index 86784d29e58d44b2ce82acd6db206b6ef4fe7d30..cc0751e145e02423914500ef3505a30b95faba0a 100644 (file)
--- a/pciutils-nowhich.patch
+++ b/pciutils-nowhich.patch
@@ -1,35 +1,31 @@
 --- pciutils-2.2.9/update-pciids.sh~   2006-09-09 13:36:17.000000000 +0300
 +++ pciutils-2.2.9/update-pciids.sh    2008-04-15 03:40:37.506541329 +0300
-@@ -10,22 +10,22 @@
+@@ -19,23 +19,23 @@
        DECOMP="cat"
        SRC="$SRC.gz"
        GREP=zgrep
--elif which bzip2 >/dev/null ; then
--      DECOMP="bzip2 -d"
+-elif which bzip2 >/dev/null 2>&1 ; then
 +elif [ -x /usr/bin/bzip2 ]; then
-+      DECOMP="/usr/bin/bzip2 -d"
+       DECOMP="bzip2 -d"
        SRC="$SRC.bz2"
--elif which gzip >/dev/null ; then
--      DECOMP="gzip -d"
+-elif which gzip >/dev/null 2>&1 ; then
 +elif [ -x /usr/bin/gzip ]; then
-+      DECOMP="/usr/bin/gzip -d"
+       DECOMP="gzip -d"
        SRC="$SRC.gz"
  else
        DECOMP="cat"
  fi
  
--if which curl >/dev/null ; then
--      DL="curl -o $DEST.new $SRC"
--elif which wget >/dev/null ; then
--      DL="wget -O $DEST.new $SRC"
--elif which lynx >/dev/null ; then
--      DL="eval lynx -source $SRC >$DEST.new"
+-if which curl >/dev/null 2>&1 ; then
 +if [ -x /usr/bin/curl ]; then
-+      DL="/usr/bin/curl -o $DEST.new $SRC"
+       DL="curl -o $DEST.new $SRC"
+     ${quiet} && DL="$DL -s -S"
+-elif which wget >/dev/null 2>&1 ; then
 +elif [ -x /usr/bin/wget ]; then
-+      DL="/usr/bin/wget -O $DEST.new $SRC"
+       DL="wget -O $DEST.new $SRC"
+       ${quiet} && DL="$DL -q"
+-elif which lynx >/dev/null 2>&1 ; then
 +elif [ -x /usr/bin/lynx ]; then
-+      DL="eval /usr/bin/lynx -source $SRC >$DEST.new"
+       DL="eval lynx -source $SRC >$DEST.new"
  else
        echo >&2 "update-pciids: cannot find curl, wget or lynx"
-       exit 1

diff --git a/pciutils-pcimodules.patch b/pciutils-pcimodules.patch
index b668f1fe6a7448a1bfa210a66a3fd7d9c47ce194..83ecb6eec83a6d0005520e566be324b1eca77256 100644 (file)
--- a/pciutils-pcimodules.patch
+++ b/pciutils-pcimodules.patch
@@ -1,21 +1,21 @@
 --- pciutils-2.2.4/Makefile.orig       2006-09-13 00:46:05.065201750 +0200
 +++ pciutils-2.2.4/Makefile    2006-09-13 00:47:30.430536750 +0200
-@@ -24,7 +24,7 @@
+@@ -50,7 +50,7 @@
  
  export
  
--all: $(PCILIB) lspci setpci lspci.8 setpci.8 update-pciids update-pciids.8 $(PCI_IDS)
-+all: $(PCILIB) lspci setpci pcimodules lspci.8 setpci.8 update-pciids update-pciids.8 $(PCI_IDS)
+-all: lib/$(PCILIB) lspci setpci example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS)
++all: lib/$(PCILIB) lspci setpci pcimodules example lspci.8 setpci.8 pcilib.7 update-pciids update-pciids.8 $(PCI_IDS)
  
- $(PCILIB): $(PCIINC) force
+ lib/$(PCILIB): $(PCIINC) force
        $(MAKE) -C lib all
-@@ -37,6 +37,7 @@
- pci/config.h:
-       cd pci && ./configure $(IDSDIR) $(VERSION) $(HOST) $(RELEASE)
+@@ -60,6 +60,7 @@
+ lib/config.h lib/config.mk:
+       cd lib && ./configure
  
-+pcimodules: pcimodules.o common.o $(PCILIB)
- lspci: lspci.o common.o $(PCILIB)
- setpci: setpci.o common.o $(PCILIB)
++pcimodules: pcimodules.o common.o lib/$(PCILIB)
+ lspci: lspci.o common.o lib/$(PCILIB)
+ setpci: setpci.o common.o lib/$(PCILIB)
  
 --- pciutils-2.1.11/pcimodules.c.pix   2003-01-04 23:06:00.000000000 +0100
 +++ pciutils-2.1.11/pcimodules.c       2003-01-04 23:06:00.000000000 +0100