[arch-commits] Commit in pciutils/trunk (2 files)

[Andreas Radke]

    Date: Saturday, May 21, 2016 @ 13:18:10
  Author: andyrtr
Revision: 268460

upgpkg: pciutils 3.5.0-2

missing LIBPCI_3.0 ABI in the new relase; FS#49423

Added:
  pciutils/trunk/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff
Modified:
  pciutils/trunk/PKGBUILD

------------------------------------------------------+
 PKGBUILD                                             |   15 +++++++++---
 fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff |   21 +++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-21 05:57:05 UTC (rev 268459)
+++ PKGBUILD	2016-05-21 11:18:10 UTC (rev 268460)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=pciutils
 pkgver=3.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -10,9 +10,18 @@
 url="http://mj.ucw.cz/sw/pciutils/"
 depends=('glibc' 'hwids' 'kmod')
 source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-       ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6eeea209e4eea9eb8ce3faaedb3a10d0')
+       ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz
+       fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff)
+md5sums=('6eeea209e4eea9eb8ce3faaedb3a10d0'
+         '1c3cf4f4e691262e6272ebb6e34706a0')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # fix broken ABI
+  # FS#49423; http://www.spinics.net/lists/linux-pci/msg51269.html
+  patch -Np1 -i ${srcdir}/fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a 

Added: fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff
===================================================================
--- fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff	                        (rev 0)
+++ fix_lack_of_exposure_of_pci_init_for_LIBPCI_3.0.diff	2016-05-21 11:18:10 UTC (rev 268460)
@@ -0,0 +1,21 @@
+--- a/lib/init.c	2016-05-20 11:53:00.065874342 -0400
++++ b/lib/init.c	2016-05-20 11:53:16.725850370 -0400
+@@ -214,6 +214,8 @@
+ }
+ 
+ STATIC_ALIAS(void pci_init(struct pci_access *a), pci_init_v35(a));
++DEFINE_ALIAS(void pci_init_v30(struct pci_access *a), pci_init_v35);
++SYMBOL_VERSION(pci_init_v30, pci_init at LIBPCI_3.0);
+ SYMBOL_VERSION(pci_init_v35, pci_init@@LIBPCI_3.5);
+ 
+ void
+--- a/lib/internal.h	2016-05-14 05:58:01.000000000 -0400
++++ b/lib/internal.h	2016-05-20 12:04:02.144993094 -0400
+@@ -61,6 +61,7 @@
+ void pci_mfree(void *);
+ char *pci_strdup(struct pci_access *a, const char *s);
+ 
++void pci_init_v30(struct pci_access *a) VERSIONED_ABI;
+ void pci_init_v35(struct pci_access *a) VERSIONED_ABI;
+ 
+ /* access.c */