pciutils: Bump to 3.9.0

root-packages/pciutils/3.9.0/config.h.in

@@ -0,0 +1,17 @@
+#define PCI_CONFIG_H
+#define PCI_ARCH_@TERMUX_ARCH@
+#define PCI_OS_LINUX
+#define PCI_HAVE_PM_LINUX_SYSFS
+#define PCI_HAVE_PM_LINUX_PROC
+#define PCI_HAVE_PM_MMIO_CONF
+#define PCI_HAVE_LINUX_BYTEORDER_H
+#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"
+#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"
+#define PCI_PATH_DEVMEM_DEVICE "/dev/mem"
+#define PCI_HAVE_64BIT_ADDRESS
+#define PCI_HAVE_PM_DUMP
+#define PCI_COMPRESSED_IDS
+#define PCI_IDS "pci.ids.gz"
+#define PCI_PATH_IDS_DIR "@TERMUX_PREFIX@/share"
+#define PCI_SHARED_LIB
+#define PCILIB_VERSION "3.9.0"

root-packages/pciutils/3.9.0/config.mk.in

@@ -0,0 +1,30 @@
+WITH_LIBS=
+LIBEXT=so
+EXEEXT=
+LSPCIDIR=$(BINDIR)
+LIBZ=-lz
+WITH_LIBS+=$(LIBZ)
+PCILIB=$(LIBNAME).$(LIBEXT).$(VERSION)
+LDLIBS=
+LIB_LDLIBS=$(WITH_LIBS)
+PCILIB_LDFLAGS+=-Wl,-soname,$(LIBNAME).$(LIBEXT).$(ABI_VERSION)
+PCILIB_LDFLAGS+=-Wl,--version-script=libpci.ver
+PCILIBPC=$(LIBNAME).pc
+PCIIMPLIB=$(PCILIB)
+PCI_CONFIG_H=1
+PCI_ARCH_@TERMUX_ARCH@=1
+PCI_OS_LINUX=1
+PCI_HAVE_PM_LINUX_SYSFS=1
+PCI_HAVE_PM_LINUX_PROC=1
+PCI_HAVE_PM_MMIO_CONF=1
+PCI_HAVE_LINUX_BYTEORDER_H=1
+PCI_PATH_PROC_BUS_PCI=/proc/bus/pci
+PCI_PATH_SYS_BUS_PCI=/sys/bus/pci
+PCI_PATH_DEVMEM_DEVICE=/dev/mem
+PCI_HAVE_64BIT_ADDRESS=1
+PCI_HAVE_PM_DUMP=1
+PCI_COMPRESSED_IDS=1
+PCI_IDS=pci.ids.gz
+PCI_PATH_IDS_DIR=@TERMUX_PREFIX@/share
+PCI_SHARED_LIB=1
+PCILIB_VERSION=3.9.0

root-packages/pciutils/Makefile.patch

@@ -13,29 +13,35 @@
  
  # Use libkmod to resolve kernel modules on Linux (yes/no, default: detect)
  LIBKMOD=
-@@ -32,8 +32,8 @@
- ABI_VERSION=.3
+@@ -32,9 +32,9 @@
+ ABI_VERSION=3
  
  # Installation directories
 -PREFIX=/usr/local
--SBINDIR=$(PREFIX)/sbin
 +PREFIX?=/usr/local
+ BINDIR=$(PREFIX)/bin
+-SBINDIR=$(PREFIX)/sbin
 +SBINDIR=$(PREFIX)/bin
  SHAREDIR=$(PREFIX)/share
  IDSDIR=$(SHAREDIR)
  MANDIR:=$(shell if [ -d $(PREFIX)/share/man ] ; then echo $(PREFIX)/share/man ; else echo $(PREFIX)/man ; fi)
-@@ -44,10 +44,10 @@
+@@ -45,14 +45,14 @@
  # Commands
  INSTALL=install
  DIRINSTALL=install -d
 -STRIP=-s
++STRIP=
+ ifdef CROSS_COMPILE
 -CC=$(CROSS_COMPILE)gcc
++CC?=$(CROSS_COMPILE)gcc
+ else
+-CC=cc
++CC?=cc
+ endif
 -AR=$(CROSS_COMPILE)ar
 -RANLIB=$(CROSS_COMPILE)ranlib
-+STRIP=
-+CC?=$(CROSS_COMPILE)gcc
 +AR?=$(CROSS_COMPILE)ar
 +RANLIB?=$(CROSS_COMPILE)ranlib
+ DLLTOOL=$(CROSS_COMPILE)dlltool
+ WINDRES=$(CROSS_COMPILE)windres
  
- # Base name of the library (overriden on NetBSD, which has its own libpci)
- LIBNAME=libpci

root-packages/pciutils/build.sh

@@ -2,20 +2,26 @@ TERMUX_PKG_HOMEPAGE=https://mj.ucw.cz/sw/pciutils/
 TERMUX_PKG_DESCRIPTION="a collection of programs for inspecting and manipulating configuration of PCI devices"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=3.7.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=3.9.0
 TERMUX_PKG_SRCURL=https://mj.ucw.cz/download/linux/pci/pciutils-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=08c27e01030d1fcc700d02bc2ea66c638f58a3d150e45e58852aa82ad4160d84
+TERMUX_PKG_SHA256=8953a785b2e3af414434b8fdcbfb75c90758819631001e60dd3afb89b22b2331
 TERMUX_PKG_DEPENDS="zlib"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_pre_configure () {
-	local ARCH=${TERMUX_ARCH}
-	if [[ ${ARCH} == "arm" ]]; then
-		ARCH="armv7l"
+	# ${str^^} returns upper case string
+	local _ARCH=${TERMUX_ARCH^^}
+	if [[ ${_ARCH} == "ARM" ]]; then
+		_ARCH="ARMV7L"
 	fi
 
-	# ${str^^} returns upper case string
-	sed -i "s%\@TERMUX_ARCH\@%${ARCH^^}%g" ./lib/config.h
-	sed -i "s%\@TERMUX_ARCH\@%${ARCH^^}%g" ./lib/config.mk
+	local f
+	for f in config.h config.mk; do
+		local in=$TERMUX_PKG_BUILDER_DIR/$TERMUX_PKG_VERSION/${f}.in
+		local out=$TERMUX_PKG_SRCDIR/lib/${f}
+		sed \
+			-e 's|@TERMUX_ARCH@|'"${_ARCH}"'|g' \
+			-e 's|@TERMUX_PREFIX@|'"${TERMUX_PREFIX}"'|g' \
+			${in} > ${out}
+	done
 }

root-packages/pciutils/config.h.patch

@@ -1,18 +0,0 @@
---- /dev/null	2018-05-15 17:54:13.876121969 +0000
-+++ ./lib/config.h	2018-05-15 20:51:48.262434344 +0000
-@@ -0,0 +1,15 @@
-+#define PCI_CONFIG_H
-+#define PCI_ARCH_@TERMUX_ARCH@
-+#define PCI_OS_LINUX
-+#define PCI_HAVE_PM_LINUX_SYSFS
-+#define PCI_HAVE_PM_LINUX_PROC
-+#define PCI_HAVE_LINUX_BYTEORDER_H
-+#define PCI_PATH_PROC_BUS_PCI "/proc/bus/pci"
-+#define PCI_PATH_SYS_BUS_PCI "/sys/bus/pci"
-+#define PCI_HAVE_64BIT_ADDRESS
-+#define PCI_HAVE_PM_DUMP
-+#define PCI_COMPRESSED_IDS
-+#define PCI_IDS "pci.ids.gz"
-+#define PCI_PATH_IDS_DIR "@TERMUX_PREFIX@/share"
-+#define PCI_SHARED_LIB
-+#define PCILIB_VERSION "3.5.6"

root-packages/pciutils/config.mk.patch

@@ -1,27 +0,0 @@
---- /dev/null	2018-05-15 17:54:13.876121969 +0000
-+++ ./lib/config.mk	2018-05-15 20:49:52.162339095 +0000
-@@ -0,0 +1,24 @@
-+WITH_LIBS=
-+LIBEXT=so
-+LIBZ=-lz
-+WITH_LIBS+=$(LIBZ)
-+PCILIB=$(LIBNAME).$(LIBEXT).$(VERSION)
-+LDLIBS=
-+LIB_LDLIBS=$(WITH_LIBS)
-+SONAME=-Wl,-soname,$(LIBNAME).$(LIBEXT)$(ABI_VERSION)
-+PCILIBPC=$(LIBNAME).pc
-+PCI_CONFIG_H=1
-+PCI_ARCH_@TERMUX_ARCH@=1
-+PCI_OS_LINUX=1
-+PCI_HAVE_PM_LINUX_SYSFS=1
-+PCI_HAVE_PM_LINUX_PROC=1
-+PCI_HAVE_LINUX_BYTEORDER_H=1
-+PCI_PATH_PROC_BUS_PCI=/proc/bus/pci
-+PCI_PATH_SYS_BUS_PCI=/sys/bus/pci
-+PCI_HAVE_64BIT_ADDRESS=1
-+PCI_HAVE_PM_DUMP=1
-+PCI_COMPRESSED_IDS=1
-+PCI_IDS=pci.ids.gz
-+PCI_PATH_IDS_DIR=@TERMUX_PREFIX@/share
-+PCI_SHARED_LIB=1
-+PCILIB_VERSION=3.5.6