diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-08-22 22:11:24 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-08-22 22:11:24 +0000 |
| commit | 973405bf52982f297cbd8930cbd9bf6b490ea394 (patch) | |
| tree | 677007ee492cf5546a0fb5d45ce5430ad855b1dc /sys-apps/pciutils/files | |
| parent | Removing vulnerable versions (diff) | |
| download | gentoo-2-973405bf52982f297cbd8930cbd9bf6b490ea394.tar.gz gentoo-2-973405bf52982f297cbd8930cbd9bf6b490ea394.tar.bz2 gentoo-2-973405bf52982f297cbd8930cbd9bf6b490ea394.zip | |
Add FreeBSD support to shut Diego Pettenò up #103241.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'sys-apps/pciutils/files')
| -rw-r--r-- | sys-apps/pciutils/files/pciutils-2.1.11-bsd.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/sys-apps/pciutils/files/pciutils-2.1.11-bsd.patch b/sys-apps/pciutils/files/pciutils-2.1.11-bsd.patch new file mode 100644 index 000000000000..dae78712c4dd --- /dev/null +++ b/sys-apps/pciutils/files/pciutils-2.1.11-bsd.patch @@ -0,0 +1,57 @@ +Fixup support for FreeBSD. + +Patch by Diego Pettenò. + +http://bugs.gentoo.org/103241 + +--- pcimodules.c ++++ pcimodules.c +@@ -16,7 +16,6 @@ + + #include <stdlib.h> + #include <stdio.h> +-#include <malloc.h> + #include <string.h> + #include <unistd.h> + #include <sys/utsname.h> +--- lib/fbsd-device.c ++++ lib/fbsd-device.c +@@ -13,10 +13,21 @@ + + #include <fcntl.h> + #include <string.h> ++#include <errno.h> + #include <unistd.h> ++#include <osreldate.h> + +-#include <pci/pcivar.h> +-#include <pci/pci_ioctl.h> ++#if __FreeBSD_version < 500000 ++# include <pci/pcivar.h> ++#else ++# include <dev/pci/pcivar.h> ++#endif ++ ++#if __FreeBSD_version < 430000 ++# include <pci/pci_ioctl.h> ++#else ++# include <sys/pciio.h> ++#endif + + #include "internal.h" + +@@ -75,8 +86,12 @@ + pi.pi_reg = pos; + pi.pi_width = len; + +- if (ioctl(d->access->fd, PCIOCREAD, &pi) < 0) +- d->access->error("fbsd_read: ioctl(PCIOCREAD) failed"); ++ if (ioctl(d->access->fd, PCIOCREAD, &pi) < 0) { ++ if (errno == ENODEV) ++ return 0; ++ else ++ d->access->error("fbsd_read: ioctl(PCIOCREAD) failed"); ++ } + + switch (len) + { |