libpciaccess-lol-dev-port.patch: Don't use /dev/port since the kernel insists

that it remain unusably broken.

libpciaccess-lol-dev-port.patch

@@ -0,0 +1,143 @@
+diff -up libpciaccess-0.12.902/src/linux_sysfs.c.jx libpciaccess-0.12.902/src/linux_sysfs.c
+--- libpciaccess-0.12.902/src/linux_sysfs.c.jx	2012-02-07 11:48:09.699318237 -0500
++++ libpciaccess-0.12.902/src/linux_sysfs.c	2012-02-08 13:37:19.341169509 -0500
+@@ -1,6 +1,7 @@
+ /*
+  * (C) Copyright IBM Corporation 2006
+  * All Rights Reserved.
++ * Copyright 2012 Red Hat, Inc.
+  *
+  * Permission is hereby granted, free of charge, to any person obtaining a
+  * copy of this software and associated documentation files (the "Software"),
+@@ -44,6 +45,18 @@
+ #include <dirent.h>
+ #include <errno.h>
+ 
++#if defined(__i386__) || defined(__x86_64__)
++#include <sys/io.h>
++#else
++#define inb(x) -1
++#define inw(x) -1
++#define inl(x) -1
++#define outb(x) do {} while (0)
++#define outw(x) do {} while (0)
++#define outl(x) do {} while (0)
++#define iopl(x) -1
++#endif
++
+ #include "config.h"
+ 
+ #ifdef HAVE_MTRR
+@@ -775,19 +788,24 @@ pci_device_linux_sysfs_open_legacy_io(st
+ 	snprintf(name, PATH_MAX, "/sys/class/pci_bus/%04x:%02x/legacy_io",
+ 		 dev->domain, dev->bus);
+ 
+-	ret->fd = open(name, O_RDWR);
++	ret->fd = open(name, O_RDWR | O_CLOEXEC);
+ 	if (ret->fd >= 0)
+ 	    break;
+ 
+ 	dev = pci_device_get_parent_bridge(dev);
+     }
+ 
+-    /* If not, /dev/port is the best we can do */
+-    if (!dev)
+-	ret->fd = open("/dev/port", O_RDWR);
++    /*
++     * You would think you'd want to use /dev/port here.  Don't make that
++     * mistake, /dev/port only does byte-wide i/o cycles which means it
++     * doesn't work.  If you think this is stupid, well, you're right.
++     */
+ 
+-    if (ret->fd < 0)
+-	return NULL;
++    /* If we've no other choice, iopl */
++    if (ret->fd < 0) {
++	if (iopl(3))
++	    return NULL;
++    }
+ 
+     ret->base = base;
+     ret->size = size;
+@@ -799,7 +817,8 @@ static void
+ pci_device_linux_sysfs_close_io(struct pci_device *dev,
+ 				struct pci_io_handle *handle)
+ {
+-    close(handle->fd);
++    if (handle->fd > -1)
++	close(handle->fd);
+ }
+ 
+ static uint32_t
+@@ -807,8 +826,11 @@ pci_device_linux_sysfs_read32(struct pci
+ {
+     uint32_t ret;
+ 
+-    pread(handle->fd, &ret, 4, port + handle->base);
+-
++    if (handle->fd > -1)
++	pread(handle->fd, &ret, 4, port + handle->base);
++    else
++	ret = inl(port + handle->base);
++	
+     return ret;
+ }
+ 
+@@ -817,7 +839,10 @@ pci_device_linux_sysfs_read16(struct pci
+ {
+     uint16_t ret;
+ 
+-    pread(handle->fd, &ret, 2, port + handle->base);
++    if (handle->fd > -1)
++	pread(handle->fd, &ret, 2, port + handle->base);
++    else
++	ret = inw(port + handle->base);
+ 
+     return ret;
+ }
+@@ -827,7 +852,10 @@ pci_device_linux_sysfs_read8(struct pci_
+ {
+     uint8_t ret;
+ 
+-    pread(handle->fd, &ret, 1, port + handle->base);
++    if (handle->fd > -1)
++	pread(handle->fd, &ret, 1, port + handle->base);
++    else
++	ret = inb(port + handle->base);
+ 
+     return ret;
+ }
+@@ -836,21 +864,30 @@ static void
+ pci_device_linux_sysfs_write32(struct pci_io_handle *handle, uint32_t port,
+ 			       uint32_t data)
+ {
+-    pwrite(handle->fd, &data, 4, port + handle->base);
++    if (handle->fd > -1)
++	pwrite(handle->fd, &data, 4, port + handle->base);
++    else
++	outl(data, port + handle->base);
+ }
+ 
+ static void
+ pci_device_linux_sysfs_write16(struct pci_io_handle *handle, uint32_t port,
+ 			       uint16_t data)
+ {
+-    pwrite(handle->fd, &data, 2, port + handle->base);
++    if (handle->fd > -1)
++	pwrite(handle->fd, &data, 2, port + handle->base);
++    else
++	outw(data, port + handle->base);
+ }
+ 
+ static void
+ pci_device_linux_sysfs_write8(struct pci_io_handle *handle, uint32_t port,
+ 			      uint8_t data)
+ {
+-    pwrite(handle->fd, &data, 1, port + handle->base);
++    if (handle->fd > -1)
++	pwrite(handle->fd, &data, 1, port + handle->base);
++    else
++	outb(data, port + handle->base);
+ }
+ 
+ static int

libpciaccess.spec

@@ -3,7 +3,7 @@
 
 Name:           libpciaccess
 Version:        0.12.902
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        PCI access library
 
 Group:          System Environment/Libraries
@@ -15,10 +15,10 @@ URL:            http://gitweb.freedesktop.org/?p=xorg/lib/libpciaccess.git
 #Source0:        libpciaccess-%{gitdate}.tar.bz2
 Source0:	http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Source1:        make-libpciaccess-snapshot.sh
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch2:		libpciaccess-rom-size.patch
 Patch3:		libpciaccess-ios-free.patch
+Patch4:		libpciaccess-lol-dev-port.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig xorg-x11-util-macros
 Requires:       hwdata
@@ -40,6 +40,7 @@ Development package for libpciaccess.
 %setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 %patch2 -p1 -b .rom-size
 %patch3 -p1 -b .ios
+%patch4 -p1 -b .sigh
 
 %build
 autoreconf -v --install
@@ -70,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/pciaccess.pc
 
 %changelog
+* Wed Feb 08 2012 Adam Jackson <ajax@redhat.com> 0.12.902-4
+- libpciaccess-lol-dev-port.patch: Don't use /dev/port since the kernel insists
+  that it remain unusably broken.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.902-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild