[arch-commits] Commit in lib32-libpcap/trunk (PKGBUILD)

[David Runge]

    Date: Saturday, October 17, 2020 @ 09:56:43
  Author: dvzrv
Revision: 725295

upgpkg: lib32-libpcap 1.9.1-2: Rebuild to cleanup depends/provides.

Set a version specific dependency on libpcap.
Add bluez-libs and lib32-dbus to makedepends.
Add libpcap.so to provides.
Run autoreconf in prepare().
Enable bluetooth (bluez-libs is a build time requirement it seems).
Add all available sodeps in package() and the respective packages in makedepends.
Install license and docs.
Update contributor info.

Modified:
  lib32-libpcap/trunk/PKGBUILD

----------+
 PKGBUILD |   59 +++++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-17 09:53:52 UTC (rev 725294)
+++ PKGBUILD	2020-10-17 09:56:43 UTC (rev 725295)
@@ -1,45 +1,60 @@
 # Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: David Runge <dvzrv at archlinux.org>
 # Contributor: Christian Hesse <mail at eworm.de>
 # Contributor: Bill Fraser <wfraser at codewise.org>
 # Contributor: Thomas Bächler <thomas at archlinux.org>
 
-_pkgbasename=libpcap
+_name=libpcap
 pkgname=lib32-libpcap
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A system-independent interface for user-level packet capture (32-bit)"
 arch=('x86_64')
 url="http://www.tcpdump.org/"
 license=('BSD')
-depends=('lib32-glibc' 'lib32-libnl' 'lib32-libusb' 'sh' "${_pkgbasename}")
-makedepends=('flex')
+depends=('lib32-glibc' 'lib32-libnl' "${_name}=${pkgver}")
+makedepends=('bluez-libs' 'lib32-dbus')
+provides=('libpcap.so')
 source=("https://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz"{,.sig})
-sha256sums=('635237637c5b619bcceba91900666b64d56ecb7be63f298f601ec786ce087094'
+sha512sums=('ae0d6b0ad8253e7e059336c0f4ed3850d20d7d2f4dc1d942c2951f99a5443a690f0cc42c6f8fdc4a0ccb19e9e985192ba6f399c4bde2c7076e420f547fddfb08'
             'SKIP')
-validpgpkeys=(1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D)
+b2sums=('c217f7080c9f570e1ce7c54359cbf50b6be54658187a78789a8235a61091de6b488c6ef3eb65eae6f3196ce9f5b059e30bb69cbb6ee87abe1c46906e35ff8ca4'
+        'SKIP')
+validpgpkeys=('1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D') # The Tcpdump Group (Package signing key) <release at tcpdump.org>
 
+prepare() {
+  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
+  autoreconf -vfi
+}
+
 build() {
-	export CC="gcc -m32"
-	export CXX="g++ -m32"
-	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
-	cd ${_pkgbasename}-${pkgver}
-	./configure \
-		--prefix=/usr \
-		--libdir=/usr/lib32 \
-		--enable-ipv6 \
-		--enable-bluetooth=no
-	make
+  cd "${pkgname}-${pkgver}"
+  ./configure \
+    --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --enable-ipv6 \
+    --enable-bluetooth \
+    --enable-usb \
+    --with-libnl
+  make
 }
 
 package() {
-	cd ${_pkgbasename}-${pkgver}
+  depends+=('libdbus-1.so')
+  cd "${pkgname}-${pkgver}"
 
-	make DESTDIR=${pkgdir} install
+  make DESTDIR=${pkgdir} install
 
-	rm -rf "${pkgdir}"/usr/lib32/libpcap.a
-	rm -rf "${pkgdir}"/usr/{include,share,bin}
+  # remove files provided by libpcap
+  rm -rf "${pkgdir}"/usr/lib32/libpcap.a
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
 
-	mkdir -p "${pkgdir}/usr/share/licenses"
-	ln -s ${_pkgbasename} "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -vDm 644 {CHANGES,{CONTRIBUTING,README}.md} \
+    -t "${pkgdir}/usr/share/doc/${pkgname}/"
 }