diff options
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/e2fsprogs/Manifest | 3 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild | 128 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.43.1.ebuild | 134 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild | 134 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-subst-perms.patch | 31 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-sysmacros.patch | 74 |
6 files changed, 0 insertions, 504 deletions
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index d664e74c4048..422683f8e765 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -1,7 +1,4 @@ -DIST e2fsprogs-1.42.13.tar.gz 6511931 SHA256 59993ff3a44f82e504561e0ebf95e8c8fa9f9f5746eb6a7182239605d2a4e2d4 SHA512 d341790f55c3bff34425369063757280b9ba6ac08f405e14f94f299345ae76c0dc6e90871b746cc98c73467448d888fe5bc029688b5eed5fd22c3c37bf285cd0 WHIRLPOOL 2b26e355ad8e378cc7402be5fd5f5abe0af2aa6a1214b357dca682b922aa07c97af427b369ef21ddb3ee731768234a5f5faf488b92a68b0175d07845dbe7783f DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7 -DIST e2fsprogs-1.43.1.tar.xz 5078696 SHA256 97e36a029224e2606baa6e9ea693b04a4d192ccd714572a1b50a2df9c687b23d SHA512 5bc9c8f992519acaadf44925357ddb03569801e65d889de4bb40a85b61a8d78c9d97bd33fb9c099d3dac8039e837f7c525a84053e17b6c9b296948a39f6f60fd WHIRLPOOL 034d393487fbadabf6e8a75a7a647bfc55f1c762143f2add7e90cd41954350f2f02cf0d6e90ae6ed5034de266420d63e41f713f3b27eac5e9f2a0545b5509e7d -DIST e2fsprogs-1.43.2.tar.gz 7389995 SHA256 20085fd43d52b8f81bda259a7df5c2b1a7a745b6fd3d082a2915965dd77f5365 SHA512 4a008f2200024685df37d5fb5c01097ca005d335c7bb2b0c6b2f13db71d9046da7dbbd367ef25800e0e16312bbfdbab603d78ac675581bb39610234002756be4 WHIRLPOOL f6d193b14e1a6b8160d419e78f43981176b1ddcb8edc6d5a2daac12647565948006eb415b332be19b3e8c3e29ea7b4f8583dce1fa9002d9f0968327b2542432d DIST e2fsprogs-1.43.3-missing_uninit_bg.patch 1317 SHA256 4a4a59215efde3b0b398a19c9e74f73ae9bbbca954cf3e2aaaaa5f0a9f836313 SHA512 bd80dd679245c4d26837fa5a0f7dc6a05560973d912a3fe8f5c3c8c352675496f21c9b775d37fb190a7fbb3fb61882b6d4d6a20b34918cda0bfe65e7d0cce8e8 WHIRLPOOL a03a7461183b08ac178dc7d0c6a230df93d75902b0abc33ec0c7a19d018fdc4264910e688db4708bd16b23d175a3a9928e38c31f8377f7d28352bac83a8cd90f DIST e2fsprogs-1.43.3.tar.gz 7405892 SHA256 ce8ef1bbb0d4730f170167284fda156ac9d6bf18db2750eb94af619a81b19927 SHA512 77e753f77222a0a7a334d7d93c900ea6cb339ed40af29952e414fc4e45d8c5c01d67771978a941195effe666df965746c2b31977c5f05ff307429b978dac8dea WHIRLPOOL c90dea3d01a103b7d11d0611b1b005748065ae90f15a02f3bde4c4baf9403931b40d2024297a2e02a92d11841d35decf8a4715d682212d4641ff34bb2f80d5db DIST e2fsprogs-1.43.4.tar.gz 7552516 SHA256 1644db4fc58300c363ba1ab688cf9ca1e46157323aee1029f8255889be4bc856 SHA512 f73787aa6d2a521d156043779a4264231e28d7b15d95848a390cb00878cf07db73d0776954c4fef6446e2399f9feaf1ece6f3826cbbc303d14f4031ac133451b WHIRLPOOL 484d693bc8d5c2507655d5caf08bb09a71b48b5de76a9d9b484d8e9b9ccbad12bc811512ed0d5a53362e1471c0caff9e9a7e652c733c73cbc47b7d3702359601 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild deleted file mode 100644 index 34a40471fd6c..000000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.42.13.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -case ${PV} in -*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; -*) UP_PV=${PV} ;; -esac - -inherit eutils flag-o-matic multilib toolchain-funcs - -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" -IUSE="nls static-libs elibc_FreeBSD" - -RDEPEND="~sys-libs/${PN}-libs-${PV} - >=sys-apps/util-linux-2.16 - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig - sys-apps/texinfo" - -S=${WORKDIR}/${P%_pre*} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch - epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch - if [[ ${CHOST} == *-mint* ]] ; then - epatch "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch - fi - epatch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 - epatch "${FILESDIR}"/${PN}-1.42.13-subst-perms.patch #550986 - epatch "${FILESDIR}"/${PN}-1.42.13-sysmacros.patch - - # blargh ... trick e2fsprogs into using e2fsprogs-libs - rm -rf doc - sed -i -r \ - -e 's:@LIBINTL@:@LTLIBINTL@:' \ - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ - MCONFIG.in || die "muck libs" #122368 - sed -i -r \ - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ - Makefile.in || die "remove subdirs" - ln -s $(which mk_cmds) lib/ss/ || die - - # Avoid rebuild - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h -} - -src_configure() { - # Keep the package from doing silly things #261411 - export VARTEXFONTS=${T}/fonts - - # needs open64() prototypes and friends - append-cppflags -D_GNU_SOURCE - - ac_cv_path_LDCONFIG=: \ - econf \ - --with-root-prefix="${EPREFIX}/" \ - --enable-symlink-install \ - $(tc-is-static-only || echo --enable-elf-shlibs) \ - $(tc-has-tls || echo --disable-tls) \ - --without-included-gettext \ - $(use_enable nls) \ - --disable-libblkid \ - --disable-libuuid \ - --disable-quota \ - --disable-fsck \ - --disable-uuidd - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then - eerror "INTL sanity check failed, aborting build." - eerror "Please post your ${S}/config.log file as an" - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" - die "Preventing included intl cruft from building" - fi -} - -src_compile() { - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds - - # Build the FreeBSD helper - if use elibc_FreeBSD ; then - cp "${FILESDIR}"/fsck_ext2fs.c . - emake V=1 fsck_ext2fs - fi -} - -src_install() { - # need to set root_libdir= manually as any --libdir options in the - # econf above (i.e. multilib) will screw up the default #276465 - emake \ - STRIP=: \ - root_libdir="${EPREFIX}/usr/$(get_libdir)" \ - DESTDIR="${D}" \ - install install-libs - dodoc README RELEASE-NOTES - - insinto /etc - doins "${FILESDIR}"/e2fsck.conf - - # Move shared libraries to /lib/, install static libraries to - # /usr/lib/, and install linker scripts to /usr/lib/. - gen_usr_ldscript -a e2p ext2fs - # configure doesn't have an option to disable static libs :/ - use static-libs || find "${D}" -name '*.a' -delete - - if use elibc_FreeBSD ; then - # Install helpers for us - into / - dosbin "${S}"/fsck_ext2fs - doman "${FILESDIR}"/fsck_ext2fs.8 - - # filefrag is linux only - rm \ - "${ED}"/usr/sbin/filefrag \ - "${ED}"/usr/share/man/man8/filefrag.8 || die - fi -} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.1.ebuild deleted file mode 100644 index 7cfe9cf21ad6..000000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.1.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -case ${PV} in -*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; -*) UP_PV=${PV} ;; -esac - -inherit eutils flag-o-matic multilib toolchain-funcs - -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.xz - mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.xz - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" -IUSE="fuse nls static-libs elibc_FreeBSD" - -RDEPEND="~sys-libs/${PN}-libs-${PV} - >=sys-apps/util-linux-2.16 - fuse? ( sys-fs/fuse ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig - sys-apps/texinfo" - -S=${WORKDIR}/${P%_pre*} - -PATCHES=( - "${FILESDIR}"/${PN}-1.41.8-makefile.patch - "${FILESDIR}"/${PN}-1.40-fbsd.patch - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 - "${FILESDIR}"/${PN}-1.43-sysmacros.patch -) - -src_prepare() { - if [[ ${CHOST} == *-mint* ]] ; then - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) - fi - - epatch "${PATCHES[@]}" - - # blargh ... trick e2fsprogs into using e2fsprogs-libs - rm -rf doc - sed -i -r \ - -e 's:@LIBINTL@:@LTLIBINTL@:' \ - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ - MCONFIG.in || die "muck libs" #122368 - sed -i -r \ - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ - Makefile.in || die "remove subdirs" - ln -s $(which mk_cmds) lib/ss/ || die - - # Avoid rebuild - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h -} - -src_configure() { - # Keep the package from doing silly things #261411 - export VARTEXFONTS=${T}/fonts - - # needs open64() prototypes and friends - append-cppflags -D_GNU_SOURCE - - ac_cv_path_LDCONFIG=: \ - econf \ - --with-root-prefix="${EPREFIX}/" \ - --enable-symlink-install \ - $(tc-is-static-only || echo --enable-elf-shlibs) \ - $(tc-has-tls || echo --disable-tls) \ - --without-included-gettext \ - $(use_enable fuse fuse2fs) \ - $(use_enable nls) \ - --disable-libblkid \ - --disable-libuuid \ - --disable-fsck \ - --disable-uuidd - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then - eerror "INTL sanity check failed, aborting build." - eerror "Please post your ${S}/config.log file as an" - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" - die "Preventing included intl cruft from building" - fi -} - -src_compile() { - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds - - # Build the FreeBSD helper - if use elibc_FreeBSD ; then - cp "${FILESDIR}"/fsck_ext2fs.c . - emake V=1 fsck_ext2fs - fi -} - -src_install() { - # need to set root_libdir= manually as any --libdir options in the - # econf above (i.e. multilib) will screw up the default #276465 - emake \ - STRIP=: \ - root_libdir="${EPREFIX}/usr/$(get_libdir)" \ - DESTDIR="${D}" \ - install install-libs - dodoc README RELEASE-NOTES - - insinto /etc - doins "${FILESDIR}"/e2fsck.conf - - # Move shared libraries to /lib/, install static libraries to - # /usr/lib/, and install linker scripts to /usr/lib/. - gen_usr_ldscript -a e2p ext2fs - # configure doesn't have an option to disable static libs :/ - use static-libs || find "${D}" -name '*.a' -delete - - if use elibc_FreeBSD ; then - # Install helpers for us - into / - dosbin "${S}"/fsck_ext2fs - doman "${FILESDIR}"/fsck_ext2fs.8 - - # filefrag is linux only - rm \ - "${ED}"/usr/sbin/filefrag \ - "${ED}"/usr/share/man/man8/filefrag.8 || die - fi -} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild deleted file mode 100644 index 0db67024344b..000000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.43.2.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -case ${PV} in -*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;; -*) UP_PV=${PV} ;; -esac - -inherit eutils flag-o-matic multilib toolchain-funcs - -DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" -HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz - mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" - -LICENSE="GPL-2 BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint" -IUSE="fuse nls static-libs elibc_FreeBSD" - -RDEPEND="~sys-libs/${PN}-libs-${PV} - >=sys-apps/util-linux-2.16 - fuse? ( sys-fs/fuse ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig - sys-apps/texinfo" - -S=${WORKDIR}/${P%_pre*} - -PATCHES=( - "${FILESDIR}"/${PN}-1.41.8-makefile.patch - "${FILESDIR}"/${PN}-1.40-fbsd.patch - "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 - "${FILESDIR}"/${PN}-1.43-sysmacros.patch -) - -src_prepare() { - if [[ ${CHOST} == *-mint* ]] ; then - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) - fi - - epatch "${PATCHES[@]}" - - # blargh ... trick e2fsprogs into using e2fsprogs-libs - rm -rf doc - sed -i -r \ - -e 's:@LIBINTL@:@LTLIBINTL@:' \ - -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ - -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ - MCONFIG.in || die "muck libs" #122368 - sed -i -r \ - -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ - Makefile.in || die "remove subdirs" - ln -s $(which mk_cmds) lib/ss/ || die - - # Avoid rebuild - echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h -} - -src_configure() { - # Keep the package from doing silly things #261411 - export VARTEXFONTS=${T}/fonts - - # needs open64() prototypes and friends - append-cppflags -D_GNU_SOURCE - - ac_cv_path_LDCONFIG=: \ - econf \ - --with-root-prefix="${EPREFIX}/" \ - --enable-symlink-install \ - $(tc-is-static-only || echo --enable-elf-shlibs) \ - $(tc-has-tls || echo --disable-tls) \ - --without-included-gettext \ - $(use_enable fuse fuse2fs) \ - $(use_enable nls) \ - --disable-libblkid \ - --disable-libuuid \ - --disable-fsck \ - --disable-uuidd - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then - eerror "INTL sanity check failed, aborting build." - eerror "Please post your ${S}/config.log file as an" - eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" - die "Preventing included intl cruft from building" - fi -} - -src_compile() { - emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds - - # Build the FreeBSD helper - if use elibc_FreeBSD ; then - cp "${FILESDIR}"/fsck_ext2fs.c . - emake V=1 fsck_ext2fs - fi -} - -src_install() { - # need to set root_libdir= manually as any --libdir options in the - # econf above (i.e. multilib) will screw up the default #276465 - emake \ - STRIP=: \ - root_libdir="${EPREFIX}/usr/$(get_libdir)" \ - DESTDIR="${D}" \ - install install-libs - dodoc README RELEASE-NOTES - - insinto /etc - doins "${FILESDIR}"/e2fsck.conf - - # Move shared libraries to /lib/, install static libraries to - # /usr/lib/, and install linker scripts to /usr/lib/. - gen_usr_ldscript -a e2p ext2fs - # configure doesn't have an option to disable static libs :/ - use static-libs || find "${D}" -name '*.a' -delete - - if use elibc_FreeBSD ; then - # Install helpers for us - into / - dosbin "${S}"/fsck_ext2fs - doman "${FILESDIR}"/fsck_ext2fs.8 - - # filefrag is linux only - rm \ - "${ED}"/usr/sbin/filefrag \ - "${ED}"/usr/share/man/man8/filefrag.8 || die - fi -} diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-subst-perms.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-subst-perms.patch deleted file mode 100644 index 2162f0396870..000000000000 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-subst-perms.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0930fcd65ec8f135c90f673eab2a7a196103537d Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Thu, 17 Sep 2015 14:18:16 -0400 -Subject: [PATCH e2fsprogs] subst: use 0644 perms - -When running on NFS, opening files with 0444 perms for writing can -sometimes fail. Since there's no real reason for these files to be -read-only, give the owner write permission. - -URL: https://bugs.gentoo.org/550986 -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - util/subst.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/subst.c b/util/subst.c -index f36adb4..e4004c9 100644 ---- a/util/subst.c -+++ b/util/subst.c -@@ -370,7 +370,7 @@ int main(int argc, char **argv) - } - strcpy(newfn, outfn); - strcat(newfn, ".new"); -- fd = open(newfn, O_CREAT|O_TRUNC|O_RDWR, 0444); -+ fd = open(newfn, O_CREAT|O_TRUNC|O_RDWR, 0644); - if (fd < 0) { - perror(newfn); - exit(1); --- -2.5.1 - diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-sysmacros.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-sysmacros.patch deleted file mode 100644 index 2e4c4e0564c2..000000000000 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.13-sysmacros.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 13a12900148e6b778d8532ca76ff38edcec5a45f Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 28 Mar 2016 20:31:33 -0400 -Subject: [PATCH e2fsprogs] include sys/sysmacros.h as needed - -The minor/major/makedev macros are not entirely standard. glibc has had -the definitions in sys/sysmacros.h since the start, and wants to move away -from always defining them implicitly via sys/types.h (as this pollutes the -namespace in violation of POSIX). Other C libraries have already dropped -them. Since the configure script already checks for this header, use that -to pull in the header in files that use these macros. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> - ---- a/lib/blkid/devname.c -+++ b/lib/blkid/devname.c -@@ -36,6 +36,9 @@ - #if HAVE_SYS_MKDEV_H - #include <sys/mkdev.h> - #endif -+#ifdef HAVE_SYS_SYSMACROS_H -+#include <sys/sysmacros.h> -+#endif - #include <time.h> - - #include "blkidP.h" ---- a/lib/blkid/devno.c -+++ b/lib/blkid/devno.c -@@ -31,6 +31,9 @@ - #if HAVE_SYS_MKDEV_H - #include <sys/mkdev.h> - #endif -+#ifdef HAVE_SYS_SYSMACROS_H -+#include <sys/sysmacros.h> -+#endif - - #include "blkidP.h" - ---- a/lib/ext2fs/finddev.c -+++ b/lib/ext2fs/finddev.c -@@ -31,6 +31,9 @@ - #if HAVE_SYS_MKDEV_H - #include <sys/mkdev.h> - #endif -+#ifdef HAVE_SYS_SYSMACROS_H -+#include <sys/sysmacros.h> -+#endif - - #include "ext2_fs.h" - #include "ext2fs.h" ---- a/lib/ext2fs/ismounted.c -+++ b/lib/ext2fs/ismounted.c -@@ -49,6 +49,9 @@ - #endif /* HAVE_GETMNTINFO */ - #include <string.h> - #include <sys/stat.h> -+#ifdef HAVE_SYS_SYSMACROS_H -+#include <sys/sysmacros.h> -+#endif - - #include "ext2_fs.h" - #include "ext2fs.h" ---- a/misc/mk_hugefiles.c -+++ b/misc/mk_hugefiles.c -@@ -35,6 +35,9 @@ extern int optind; - #include <sys/ioctl.h> - #include <sys/types.h> - #include <sys/stat.h> -+#ifdef HAVE_SYS_SYSMACROS_H -+#include <sys/sysmacros.h> -+#endif - #include <libgen.h> - #include <limits.h> - #include <blkid/blkid.h> |