mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
sys-fs/e2fsprogs: Security cleanup
Bug: https://bugs.gentoo.org/709374 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
Lars Wendler
@@ -1,4 +1,3 @@
|
||||
DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
|
||||
DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda
|
||||
DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
|
||||
DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
|
||||
|
||||
@@ -1,143 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
|
||||
|
||||
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
|
||||
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
|
||||
https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
|
||||
IUSE="cron fuse nls static-libs elibc_FreeBSD"
|
||||
|
||||
RDEPEND="~sys-libs/${PN}-libs-${PV}
|
||||
>=sys-apps/util-linux-2.16
|
||||
cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
|
||||
fuse? ( sys-fs/fuse:0 )
|
||||
nls? ( virtual/libintl )"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
nls? ( sys-devel/gettext )
|
||||
virtual/pkgconfig
|
||||
sys-apps/texinfo
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.40-fbsd.patch
|
||||
"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
|
||||
|
||||
# Upstream patches (can usually removed with next version bump)
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${CHOST} == *-mint* ]] ; then
|
||||
PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
|
||||
|
||||
# Get rid of doc -- we don't use them. This also prevents a sandbox
|
||||
# violation due to mktexfmt invocation
|
||||
rm -r doc || die "Failed to remove doc dir"
|
||||
|
||||
# blargh ... trick e2fsprogs into using e2fsprogs-libs
|
||||
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
|
||||
|
||||
local myeconfargs=(
|
||||
--with-root-prefix="${EPREFIX}"
|
||||
$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
|
||||
--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
|
||||
--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
|
||||
--enable-symlink-install
|
||||
--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
|
||||
)
|
||||
ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
|
||||
|
||||
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
|
||||
|
||||
einstalldocs
|
||||
|
||||
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 :/
|
||||
if ! use static-libs ; then
|
||||
find "${ED}" -name '*.a' -delete || die
|
||||
fi
|
||||
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user