4 files changed, 46 insertions, 55 deletions
diff --git a/source/a/pciutils/pciutils-3.2.0.tar.sign b/source/a/pciutils/pciutils-3.2.0.tar.sign
deleted file mode 100644
index 5cc46614f..000000000
--- a/source/a/pciutils/pciutils-3.2.0.tar.sign
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-iQIVAwUAUXFFN8KOeEftcPgtAQLG3w/8C2cNMhW3v4romdMzTFJ0StgayKsQhvNk
-BxG1FLexwswGWO91TPz52bwOcgN+8OZODsTLf2iMmnt5wVnskov/z73KHPEXKFW7
-Q7fpbSszaAWklDL0G4Pp6kdt7yxFKgqPDSIbKbmMNTzFdTF5QyqajAJ6/3ah1cEt
-z75Nb3II24Yaip7ibRjb8d1OS9EpN64J+pEbrGLPh7FFOfqfY6yQtFdajdLor31x
-/zs/VcI1gjlGaKym8zQkamH561NDQLUoWxSNjnNDLbSEn369r4pBBuQbr4iXrPDB
-dGV+g6FXLFGb7QRODrLsRO+xLswQG7Jpn7dyd7Uxf1HoYuy8USXMg5gZPjNctWA3
-ZRF4RAP4AgxLSIwQBZqDjjDIwf52cJsrKC37AFLqmWMn5zyPNcLdFlkYbN2DiwPE
-5Q2egQMB13xeURwOgEeQ3BA5AbAOx4JdlctyM+WUl5zhzheUqlmZRN6rg/cJt1HY
-NhsbA4Gkt2OZYXJdpPixBJENxV8RJftNMVd4WKhLktJ8uzLoG/sWfyI6NBOXC17x
-7+fZTFV9MeY9/JJsyY8WMYT94ut7wyR7nSFfe6ZsPSRV8DTZNlSITF9Qb3czTGOY
-te4jC/oH+yNzyWCLvRD0uuf/cxmZKQqfsfosU4w+0nONoe15CCWkx7laYwBx0hN3
-l7tsXYaGnbk=
-=fcLj
------END PGP SIGNATURE-----
diff --git a/source/a/pciutils/pciutils-3.4.1.tar.sign b/source/a/pciutils/pciutils-3.4.1.tar.sign
new file mode 100644
index 000000000..ec76e3bd4
--- /dev/null
+++ b/source/a/pciutils/pciutils-3.4.1.tar.sign
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iQIVAwUAVokuY8KOeEftcPgtAQIocQ/+P7n7axTElRQb6X4qmc9Dpn8iPUd4WL5L
+8tdOsWN8iILg0QjdOPRhsBjtIdrjIy2XuYJQavJyGLhHuLDTTlxbvzT7MBPRDy0n
+M1B/S1al6IjI6hjW7czTgPJUJ4po+I3vCpDRI4BgXYNPy59rp45xELdQsb8ybGp9
+4zkcSCHzGS7h2fc5pNLr5Kk18wXD5HtKtXSNRee3u4aK1GfBgpcCUMHf86/Ddqqz
+kriEcNUkOjEmfgXTlCDH0XPh/sE3efB2yD5G9AcSwEtDAyb2XPuTQifB8aPDVrEw
+5GSg6el5MPkMH6+nfFk2lQ2FT4T3FTd6IgcABCSAk5SmtX45dmlzOIBSY6ngL0QI
+wrnnHesJqat7gHIAXO8ox4vt77VbTnQklSks5PSKNZ1ySluomZs9RqLh5jtGqyqq
+nT4cTBGG48a4pejkbA0Ew3LTXjfZAVIDAPkWc5J0LT0m4xdgfYxEgJTkmIR74Mdl
+CWqe7eZYcWP7fD51ViuAZA9Pko1+eUDebinEKVlDKw+cFe7R3tHPWK0BKwE/c8pE
+CH5kQZKswKWMxVro6gmFO/fQOHovUKnfRfnNYAXUNUt1Kwt5Nh/khOsvcw3g1dFL
+CHi0Yp7uuw1sMHGKGJtmBWC6Q1ljl/HRPwcewCAaeiga96Wt/XrsaasktrNGzWQT
+3o5upw70HSE=
+=/4W8
+-----END PGP SIGNATURE-----
diff --git a/source/a/pciutils/pciutils.SlackBuild b/source/a/pciutils/pciutils.SlackBuild
index c79361066..776d1a927 100755
--- a/source/a/pciutils/pciutils.SlackBuild
+++ b/source/a/pciutils/pciutils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010, 2013  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2013, 2015, 2016  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,14 +22,14 @@
 
 
 VERSION=${VERSION:-$(echo pciutils-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
-NUMJOBS=${NUMJOBS:--j3}
+NUMJOBS=${NUMJOBS:--j7}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
        *) export ARCH=$( uname -m ) ;;
@@ -40,8 +40,8 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-pciutils
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
@@ -56,7 +56,7 @@ mkdir -p $TMP $PKG
 cd $TMP
 rm -rf pciutils-$VERSION
 tar xvf $CWD/pciutils-$VERSION.tar.xz || exit 1
-cd pciutils-$VERSION
+cd pciutils-$VERSION || exit 1
 
 chown -R root:root .
 find . \
@@ -66,9 +66,10 @@ find . \
   -exec chmod 644 {} \;
 
 zcat $CWD/pciutils.dontcompress.diff.gz | patch -p1 || exit 1
-zcat $CWD/pciutils.update.pci.ids.url.diff.gz | patch -p1 || exit 1
 
-make \
+# Build/install the library and utilities:
+make clean
+make install install-lib \
   PREFIX=/usr \
   SBINDIR=/sbin \
   LIBDIR=/usr/lib${LIBDIRSUFFIX} \
@@ -76,29 +77,30 @@ make \
   IDSDIR=/usr/share/hwdata \
   PCI_IDS=pci.ids \
   PCI_COMPRESSED_IDS=0 \
-  SHARED=no \
+  SHARED=yes \
   OPT="$SLKCFLAGS" \
-  $NUMJOBS || exit 1
+  DESTDIR=$PKG || exit 1
 
-make install install-lib \
-  PREFIX=/usr \
-  SBINDIR=/sbin \
-  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-  MANDIR=/usr/man \
-  IDSDIR=/usr/share/hwdata \
-  PCI_IDS=pci.ids \
-  PCI_COMPRESSED_IDS=0 \
-  SHARED=no \
-  DESTDIR=$PKG
+chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/libpci.so.*
+
+# Move libraries, as they might be needed by programs that bring a network
+# mounted /usr online:
+mkdir $PKG/lib${LIBDIRSUFFIX}
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  for file in lib*.so.?.* ; do
+    mv $file ../../lib${LIBDIRSUFFIX}
+    ln -sf ../../lib${LIBDIRSUFFIX}/$file .
+  done
+  cp -a lib*.so.? ../../lib${LIBDIRSUFFIX}
+)
 
 mkdir -p $PKG/usr/sbin
 mv $PKG/sbin/update-pciids $PKG/usr/sbin/update-pciids
 
-# Do not compress pci.ids
-( cd $PKG/usr/share ; gzip -d pci.ids.gz )
-
-# Put a compat symlink in place 
-ln -s hwdata/pci.ids $PKG/usr/share/pci.ids
+# Use pci.ids from hwdata package
+rm -f $PKG/usr/share/hwdata/pci.ids
+# Remove empty directories:
+rmdir $PKG/usr/share/hwdata $PKG/usr/share
 
 # Compress and link manpages, if any:
 if [ -d $PKG/usr/man ]; then
@@ -120,7 +122,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \
 
 mkdir -p $PKG/usr/doc/pciutils-$VERSION
 cp -a \
-  COPYING* README TODO \
+  COPYING* README* TODO \
   $PKG/usr/doc/pciutils-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
diff --git a/source/a/pciutils/pciutils.update.pci.ids.url.diff b/source/a/pciutils/pciutils.update.pci.ids.url.diff
deleted file mode 100644
index 1588f729c..000000000
--- a/source/a/pciutils/pciutils.update.pci.ids.url.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./update-pciids.sh.orig	2012-07-02 21:45:31.280890064 -0500
-+++ ./update-pciids.sh	2012-07-02 21:46:03.875889369 -0500
-@@ -3,7 +3,7 @@
- [ "$1" = "-q" ] && quiet=true || quiet=false
- 
- set -e
--SRC="http://pci-ids.ucw.cz/v2.2/pci.ids"
-+SRC="http://pciids.sourceforge.net/pci.ids"
- DEST=pci.ids
- PCI_COMPRESSED_IDS=0
- GREP=grep