diff options
| author | richard <richard@pkgsrc.org> | 2014-08-10 06:35:29 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2014-08-10 06:35:29 +0000 |
| commit | 0901a74b2a2d73f222b0cf8ff66128fa469240d7 (patch) | |
| tree | f1508ede583266b429ad113ab91a0d258e10757e /sysutils | |
| parent | b398ee5757d71750f19b509dab061e83a44f397b (diff) | |
| download | pkgsrc-0901a74b2a2d73f222b0cf8ff66128fa469240d7.tar.gz | |
Solaris: Fix fd leak in pci_device_solx_devfs_map_range() as in upstream patch:
http://cgit.freedesktop.org/xorg/lib/libpciaccess/commit/?id=1654a0462723b3b75d7a4a20bedfc653cc3e1f1a
Revision bump to pick it up...
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/libpciaccess/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/libpciaccess/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/libpciaccess/patches/patch-src_solx__devfs.c | 18 |
3 files changed, 22 insertions, 2 deletions
diff --git a/sysutils/libpciaccess/Makefile b/sysutils/libpciaccess/Makefile index 3a6484b6231..99aa4cf0fa7 100644 --- a/sysutils/libpciaccess/Makefile +++ b/sysutils/libpciaccess/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2013/12/21 11:05:23 jperkin Exp $ +# $NetBSD: Makefile,v 1.19 2014/08/10 06:35:29 richard Exp $ DISTNAME= libpciaccess-0.13.2 +PKGREVISION= 1 CATEGORIES= sysutils x11 MASTER_SITES= ${MASTER_SITE_XORG:=lib/} EXTRACT_SUFX= .tar.bz2 diff --git a/sysutils/libpciaccess/distinfo b/sysutils/libpciaccess/distinfo index cc0bfcb7032..5977691b0fd 100644 --- a/sysutils/libpciaccess/distinfo +++ b/sysutils/libpciaccess/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.25 2013/12/21 11:05:23 jperkin Exp $ +$NetBSD: distinfo,v 1.26 2014/08/10 06:35:29 richard Exp $ SHA1 (libpciaccess-0.13.2.tar.bz2) = 63df515a4c5d5a339a7c1f9e4baa6543efa3c7da RMD160 (libpciaccess-0.13.2.tar.bz2) = d02d6be193cbea6a56c08b041c5ef3d3902f330c Size (libpciaccess-0.13.2.tar.bz2) = 359231 bytes SHA1 (patch-configure) = 2b1bbc1ccd26372d7f45b0cbcf970823cafc6a7c SHA1 (patch-src_common__interface.c) = cac11689864531fa4721e09374ead730bd1691a6 +SHA1 (patch-src_solx__devfs.c) = 4800fde06d511592bbc4448f09656ee4d7abce2c diff --git a/sysutils/libpciaccess/patches/patch-src_solx__devfs.c b/sysutils/libpciaccess/patches/patch-src_solx__devfs.c new file mode 100644 index 00000000000..92ac7561c03 --- /dev/null +++ b/sysutils/libpciaccess/patches/patch-src_solx__devfs.c @@ -0,0 +1,18 @@ +$NetBSD: patch-src_solx__devfs.c,v 1.3 2014/08/10 06:35:30 richard Exp $ +Caching fd's for reuse is most effective when you actually stick +the newly opened fd in the cache, instead of letting it leak at +the end of the function. +http://cgit.freedesktop.org/xorg/lib/libpciaccess/commit/?id=1654a0462723b3b75d7a4a20bedfc653cc3e1f1a + +--- src/solx_devfs.c.orig 2013-07-20 22:54:34.000000000 +0000 ++++ src/solx_devfs.c +@@ -724,6 +724,9 @@ pci_device_solx_devfs_map_range(struct p + strerror(errno)); + return err; + } ++#ifndef __sparc ++ xsvc_fd = map_fd; ++#endif + } + + map->memory = mmap(NULL, map->size, prot, MAP_SHARED, map_fd, map->base); |