summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2016-05-23 15:07:18 -0400
committerMike Frysinger <vapier@gentoo.org>2016-05-23 15:08:17 -0400
commit875494e780053656659967370155f221dcdfb5af (patch)
treea67c21c9226a377330551bec6fdcb46f1a60732a /sys-fs/ntfs3g
parentwww-apps/owncloud: security bumps for bug #583682 (diff)
downloadgentoo-875494e780053656659967370155f221dcdfb5af.tar.gz
gentoo-875494e780053656659967370155f221dcdfb5af.tar.bz2
gentoo-875494e780053656659967370155f221dcdfb5af.zip
sys-fs/ntfs3g: fix build w/newer glibc #580136
Diffstat (limited to 'sys-fs/ntfs3g')
-rw-r--r--sys-fs/ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch43
-rw-r--r--sys-fs/ntfs3g/ntfs3g-2016.2.22.ebuild1
2 files changed, 44 insertions, 0 deletions
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch b/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch
new file mode 100644
index 00000000000..2fa1f2b34c8
--- /dev/null
+++ b/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-sysmacros.patch
@@ -0,0 +1,43 @@
+include the headers that define major/minor/makedev in more places
+
+https://bugs.gentoo.org/580136
+
+--- a/libntfs-3g/ioctl.c
++++ b/libntfs-3g/ioctl.c
+@@ -57,6 +57,12 @@
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
++#ifdef HAVE_SYS_MKDEV_H
++#include <sys/mkdev.h>
++#endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+--- a/src/lowntfs-3g.c
++++ b/src/lowntfs-3g.c
+@@ -76,6 +76,9 @@
+ #ifdef HAVE_SYS_MKDEV_H
+ #include <sys/mkdev.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+
+ #if defined(__APPLE__) || defined(__DARWIN__)
+ #include <sys/dirent.h>
+--- a/src/ntfs-3g.c
++++ b/src/ntfs-3g.c
+@@ -75,6 +75,9 @@
+ #ifdef HAVE_SYS_MKDEV_H
+ #include <sys/mkdev.h>
+ #endif
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
+
+ #if defined(__APPLE__) || defined(__DARWIN__)
+ #include <sys/dirent.h>
diff --git a/sys-fs/ntfs3g/ntfs3g-2016.2.22.ebuild b/sys-fs/ntfs3g/ntfs3g-2016.2.22.ebuild
index fbac7ac904e..4222ccd6c90 100644
--- a/sys-fs/ntfs3g/ntfs3g-2016.2.22.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2016.2.22.ebuild
@@ -34,6 +34,7 @@ DOCS="AUTHORS ChangeLog CREDITS README"
PATCHES=(
"${FILESDIR}"/${PN}-2014.2.15-no-split-usr.patch
+ "${FILESDIR}"/${PN}-2016.2.22-sysmacros.patch #580136
)
pkg_setup() {