mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-18 21:11:08 +02:00
Merge pull request #435 from ajeddeloh/andrew-fix-e2fsprogs
removing e2fsprogs, they are now in coreos-overlay
This commit is contained in:
Alex Crawford
commit
8da3ff96d8
File diff suppressed because it is too large
Load Diff
@ -1,21 +0,0 @@
|
|||||||
AUX 0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch 1251 SHA256 01dc8bf59f6d5f435abd4b26dda92897abc338f452a80de33600594d25586013 SHA512 fae120ce7bb4897d9726f6d50ae550a8826e2313296eb9ba480df7264f755976b5b8adf2472287b6e367e3320329c6981d3902afff6b9aa32cf9fab779d5edb3 WHIRLPOOL d542a6b763074fbdcf6586b7463c3144c851eb027c3a649e360ec038aa1f87194f0cdd746ba17f7ec5edd85002def0e9d3b6794de26c5e18e04192f57bbd4a66
|
|
||||||
AUX e2fsck.conf 138 SHA256 c2864aa7c5c5bf27227909bdb9af395fc07294d1f93d372ef10c79309d7aec08 SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef WHIRLPOOL b05c69b375411efe850a993a244e26513d6e4a8c1cfb3ea91617a283c819a47f2200a459849285a0e60288e86869d624aeee0589f4a6b9243572c500671f3b31
|
|
||||||
AUX e2fsprogs-1.38-tests-locale.patch 656 SHA256 7d12df7c4f00f1c1c81dcbd74cc0f8c1cffaa3b5089fbaa40222a7a9f2fbe598 SHA512 ac15d1c0d0e56a53429c722049f73fdcc01134085993cbd7f7fe555faa6fb5ca6347ce721a43cf68ed2170e44f6330bfd168b4163b07091241b731e4b539b73b WHIRLPOOL 148c248d02a798402b99c4818ca404102ca1d5db64e82f8842928d488231a523e4db6f9b9ccee19ab1f0a130b73d6015eca67d6ef581858befa76d9dd4338766
|
|
||||||
AUX e2fsprogs-1.40-fbsd.patch 352 SHA256 52865c6600fa0f601a89e4396797ae2d23a1ed895e64b098c36e8bcab1ac8505 SHA512 86374e641f958d7c4b53eb44abf7933af064b55a38fef6ca26f848bb63f0c6bf2966852c7cf0770337aef95ff965de95ef282205771e86be36e7ad74e8f81146 WHIRLPOOL b8889db0ced2312a06cbf2ca135340a9cb6c88aa0e3fc467f4cb4dc3c40c90f4be57d1678a735ef42a1d4b8313bcd1a3130d899cf5e9af39bfd13a37d1b1d449
|
|
||||||
AUX e2fsprogs-1.41.5-makefile.patch 3253 SHA256 7d2d075a475e47d90dd181fdaaf6554b80939802e7bf161fcd6b72d2b1510b10 SHA512 096579bf4bf3dd1ae32ce9c03111f143a750cb6ee3a46e153ddb834505e62978920c9ad07719beaa1a7d713e95eb26f2587f87003a2c6786ed7db3709cf15f41 WHIRLPOOL c03540de2dcaeb304be6e58f50260a399051de627cb639d927499eb29e7234752bc232ff8fa68dbcf8e1661d8887835b8f0f70be7843cbd1bec09295e01756c9
|
|
||||||
AUX e2fsprogs-1.41.8-makefile.patch 317 SHA256 f8a4e2180f557c3bb9a50c38300e406420b3df296f50d6eab59d0b28cb65904d SHA512 dbd738affe910d3812ca4d969a6d4295b09abc413cab23f29dcbd0c1e82eefa095a61a377c494dd9b7e1d189d4edadc469dbf2d1a1068c11dd5fc8311bd83f8f WHIRLPOOL f81ecb87217bb312bbbb08357f76b2d5d7c2dc9cdee69d37e67e7b34632f4a3f3d2bab66aa600fa98776808b30cada735de05135ac60a5c2f9b59daf88b7eb53
|
|
||||||
AUX e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch 1285 SHA256 a1090094da6b858d51d7a8d2d03ec96b97468672785a824cef774c5d0090da30 SHA512 a892e92fbe1e1238b72cd5b53d9825c5bd2116aeb0b1fb9eb60a14bc984a16b65624265d108ffc0f9e638a773b655999eb3ec0056c46084b4291ff639a3c72ef WHIRLPOOL 20d7b4d36774e4bfd52f37d06b98fb13245a820e4d9bac54e33846e90451a94aa510d08649e035791a9ca301fc883043415eb8e4726cb21653c29a20e38003b8
|
|
||||||
AUX e2fsprogs-1.42.10-fix-build-cflags.patch 302 SHA256 757d0307ad5dcdd1b30b2c64918a675e1883f15c001ff07f97acd2352691e3ed SHA512 058826bb2684a00f7b0cdd8c3e4578c2d2428c3685f2514d098d8c702b83218681c4be3968ef9ac993b6abe66da5f092a8222ffff27423f45f3d48c4a33a61fd WHIRLPOOL d7e6c28a05d72f99a8eb039be3a3b14dce72fc9bbae31b3fddf89a51f140e231cbfed72e835ac1f21c07f340a3dfafcfc7274b42ce3b270e90e095b007d4927d
|
|
||||||
AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 SHA256 3dc8246ee1d00d1ff4652aad0c4768d8a94317a5e8580507da33d23d8dbcf622 SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507 WHIRLPOOL d68c4944734a67320a75f8e951b714b3fda08b220680797412ce946bb3c4f531074e4e8417ae92afec5b3d997ac20322f6e87c328b9269ef497a9a33da2c48e7
|
|
||||||
AUX e2fsprogs-1.42.13-subst-perms.patch 918 SHA256 4b8005ef30e7772a0f27a4c36e230792f1fe4ec8272461cc8a57ab63ba937651 SHA512 f69b4f95fd3f7a9066642ed751518714b392f78e31a1be54e7bbb5c646438d8d3359324c8031c5ad97aec4abf10af08e3240b6a40dd9abb442c0e719010dde2d WHIRLPOOL c31e6cb47cc2753ae9e0a44c8a13f54b94da1f6e158b2f2d5d3f775118208c1fb1bf4b781564339e704e7dfd440d4b1ac3674c2fde3b42e75e4de5ccb94d2dfe
|
|
||||||
AUX fsck_ext2fs.8 3751 SHA256 750efa9a54ff23f9494b20396de9c7464747a721b6a0a08c1e564c06778888c8 SHA512 d8f0bf3d7d299a9c28e2cea0934d0a905f79aceac49de7c89031de54a663f27ded1361108aee22e0d37590634a94dc39db23e0bdb0d3405e92ae52a02d69d402 WHIRLPOOL 6958bf9d93bbb5772206caf09b974fd64e9a6dccc601777c94315bf41c8b4618759bdf1d88431f24aec1b5fb76a6e5869b39ca2804f7192817ec2b5105ca73bc
|
|
||||||
AUX fsck_ext2fs.c 2742 SHA256 5923e37addc2adffc2e51f21e667f879aef4daae14cb167c3e686da555f4ea63 SHA512 db2da9fd7f61282d79f22f2f461ee40fc85efa893d534fa364b803bba4e5ffb14677276db94e4482b3444411f11847d4f2c23c9994df99a826eb5eabe815088a WHIRLPOOL a2e9247a3bf25595676504fcef5532bd7ff18e034bb685116e21646b95d500a7d917eedd47ee869c77c8b7d9366dfadda7488ba7d0e768b0b4be3ff34f17d2fc
|
|
||||||
DIST e2fsprogs-1.41.7.tar.gz 4425159 SHA256 2e2eeb5201e952dd02b77f609a0e630acdbce5d2b823ec11668e34f6bfde2f2c SHA512 c17c5f23feb7747941e7f019f197cca1cd4a84c067ad27d1a578ae213c7d7274aa79f3a64c7d69515f3f94db80df01ca71d4af83e9ea84c578a7257205395f7c WHIRLPOOL f760d7e658a1c78835ca470d077c7076a21f727f7d0a2411f5428363d12b7cd1676e2f221be9d9d1f5843c25320f7ef2f896ea47c9d4dc91190e0bc7df89ef36
|
|
||||||
DIST e2fsprogs-1.42.12.tar.gz 6381695 SHA256 e17846d91a0edd89fa59b064bde8f8e5cec5851e35f587bcccb4014dbd63186c SHA512 a4b03470ed8f3e6c353250d80807070b8d5529ce219f7ec3076af89bd7cd674fbd443aab4d07dccff74606c9f620e349da32b451e3896a0635f6c700419f7cbf WHIRLPOOL 15f85fe969b174a99f06d875afafc83cc3e85cde0d8f1d833cb045c30259b3bfa9293ee84eeb793d9c60ece2cba4ca6bacbb8c861f11f3b56bd863ca1a2296f2
|
|
||||||
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
|
|
||||||
EBUILD e2fsprogs-1.41.7-r1.ebuild 4047 SHA256 abb9a0e933846968e55cfd080038538cc0fc0c82ddaf41c96e0ff27f4a8e8c0a SHA512 61914609362dec4382cd5872cb2022b5c2cf1cbbd864fe7c3df515d1def699aed5f4adcca3b23bd86565925cb691d91a1206e7f46055dafe584fbc0d103ba600 WHIRLPOOL 1780f9e69d791eef8e541dcdb6eabf172f887a55cda3d1e2db9f7e1fb123aa8d5cdcbf79d6411775704d7664fe142a6fecc3879ba743f50acfc4e3ba46058ae5
|
|
||||||
EBUILD e2fsprogs-1.42.12.ebuild 3572 SHA256 d99c176f3f7352c73a63dc32f4b4a10f0bc00c0aee25809c0eb702842f08a972 SHA512 d61d902716f0340eefc96b7d6ac968cb56eb777fbc81def5ecbda0090993c81769333e5d72c20fe47fea49838b32826b34505fe2c7aac0aa688bf0e3cc8d69fa WHIRLPOOL be71063b305bdfeb8fb571242073ecddd60244235768eed647706458a16aea487777ef3636ac79e36c26c9dfc672a3b43098307b4f31640ac29a77ac36e0bfe3
|
|
||||||
EBUILD e2fsprogs-1.42.13.ebuild 3638 SHA256 84016981812928852f14257f7b25d289db5438c515a66294a3375437566a204c SHA512 0aa77071dab236d79ee19cbf7494ad2dbbcf9eeccf408c3da86d49fa9f80d0605d2954d4af26d4b2f98de3286d93ec6a8f92a13ef8979e647ad36455a6791f60 WHIRLPOOL d421358834fc7f7244e8367806064ca7f5ca158273402123a57d3fcbfdc50598ad7560037197f973211d4b9874478b19507eb0ef431bc7dc9402067fc7735ea4
|
|
||||||
MISC ChangeLog 48117 SHA256 fd49ccd4dc8e7a53c8cba64fb936f960ee7c58fcf4150485321b23475a193f84 SHA512 82134fcce2aaa6bf15f3339b79b657b4e0827a132cca8c89a6521f7c6bc1246d3d55cd46d6c9adbd5b3e6f458e9f4e5e267d10f4c9929f15c9cd985949f5ee85 WHIRLPOOL ed9f1377d27424101d492f92a515cdf60f723cd6f519ea8a82b16d46ec86c7f297b8224b6d2833c83a6ca5e4c6f2140e7155beb1ce0d45f503debc51d71b9db2
|
|
||||||
MISC metadata.xml 331 SHA256 c951ebab261c6eb78dbb1b90e7e8e63fe59847806ec7eee668806b629ba4ab32 SHA512 e06aab896567d0836c1ae005116f3ec1dbbab1b89986ea3b7095788be4cd50bb9afe2d8c3d81556bb49a9818930637c96c9de3d6024fc29e9c2aa16860d090a4 WHIRLPOOL a159b3ed9ede424a1d836add1dddff30f2ff32f0fcee62bb4353f66455d1032449ac42f5637660e37b20d0ac9f7433a1137fa3e51427cfc3b0bde054ceeedbb1
|
|
||||||
@ -1,138 +0,0 @@
|
|||||||
# Copyright 1999-2012 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Id$
|
|
||||||
|
|
||||||
inherit eutils flag-o-matic toolchain-funcs multilib
|
|
||||||
|
|
||||||
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
|
|
||||||
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
|
|
||||||
SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2 BSD"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
|
||||||
IUSE="nls elibc_FreeBSD"
|
|
||||||
|
|
||||||
RDEPEND="~sys-libs/${PN}-libs-${PV}
|
|
||||||
nls? ( virtual/libintl )"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
nls? ( sys-devel/gettext )
|
|
||||||
virtual/pkgconfig
|
|
||||||
sys-apps/texinfo"
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
if [[ ! -e ${ROOT}/etc/mtab ]] ; then
|
|
||||||
# add some crap to deal with missing /etc/mtab #217719
|
|
||||||
ewarn "No /etc/mtab file, creating one temporarily"
|
|
||||||
echo "${PN} crap for src_test" > "${ROOT}"/etc/mtab
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_unpack() {
|
|
||||||
unpack ${A}
|
|
||||||
cd "${S}"
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.41.5-makefile.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
|
|
||||||
epatch "${FILESDIR}"/0001-resize2fs-Fix-error-message-so-the-mountpoint-is-pri.patch #276352
|
|
||||||
# blargh ... trick e2fsprogs into using e2fsprogs-libs
|
|
||||||
rm -rf doc
|
|
||||||
sed -i -r \
|
|
||||||
-e 's:@LIBINTL@:@LTLIBINTL@:' \
|
|
||||||
-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
|
|
||||||
-e '/^DEPLIB(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"
|
|
||||||
# stupid configure script clobbers CC for us
|
|
||||||
sed -i \
|
|
||||||
-e '/if test -z "$CC" ; then CC=cc; fi/d' \
|
|
||||||
configure || die "touching configure"
|
|
||||||
|
|
||||||
# we want to build the blkid/findfs binaries, but not the libs
|
|
||||||
sed -i \
|
|
||||||
-e '/BLKID_CMT=/s:BLKID_CMT:LIBBLKID_CMT:g' \
|
|
||||||
configure || die "touching configure for blkid"
|
|
||||||
sed -i \
|
|
||||||
-e '/BLKID_LIB_SUBDIR/s:@BLKID_CMT@:@LIBBLKID_CMT@:g' \
|
|
||||||
Makefile.in || die "remove blkid subdir better"
|
|
||||||
append-cppflags -DCONFIG_BUILD_FINDFS #275923
|
|
||||||
|
|
||||||
# Avoid rebuild
|
|
||||||
touch lib/ss/ss_err.h
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
# Keep the package from doing silly things #261411
|
|
||||||
export VARTEXFONTS=${T}/fonts
|
|
||||||
|
|
||||||
# We want to use the "bsd" libraries while building on Darwin, but while
|
|
||||||
# building on other Gentoo/*BSD we prefer elf-naming scheme.
|
|
||||||
local libtype
|
|
||||||
case ${CHOST} in
|
|
||||||
*-darwin*) libtype=bsd;;
|
|
||||||
*) libtype=elf;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
ac_cv_path_LDCONFIG=: \
|
|
||||||
econf \
|
|
||||||
--with-root-prefix=/ \
|
|
||||||
--enable-${libtype}-shlibs \
|
|
||||||
--with-ldopts="${LDFLAGS}" \
|
|
||||||
$(tc-has-tls || echo --disable-tls) \
|
|
||||||
--without-included-gettext \
|
|
||||||
$(use_enable nls) \
|
|
||||||
$(use_enable userland_GNU fsck) \
|
|
||||||
--disable-libblkid \
|
|
||||||
--disable-libuuid \
|
|
||||||
|| die
|
|
||||||
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
|
|
||||||
emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
|
|
||||||
|
|
||||||
# Build the FreeBSD helper
|
|
||||||
if use elibc_FreeBSD ; then
|
|
||||||
cp "${FILESDIR}"/fsck_ext2fs.c .
|
|
||||||
emake fsck_ext2fs || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
if [[ -r ${ROOT}/etc/mtab ]] ; then
|
|
||||||
if [[ $(<"${ROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
|
|
||||||
rm -f "${ROOT}"/etc/mtab
|
|
||||||
fi
|
|
||||||
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="/$(get_libdir)" \
|
|
||||||
DESTDIR="${D}" \
|
|
||||||
install install-libs || die
|
|
||||||
dodoc README RELEASE-NOTES
|
|
||||||
|
|
||||||
if use elibc_FreeBSD ; then
|
|
||||||
# Install helpers for us
|
|
||||||
into /
|
|
||||||
dosbin "${S}"/fsck_ext2fs || die
|
|
||||||
doman "${FILESDIR}"/fsck_ext2fs.8
|
|
||||||
|
|
||||||
# these manpages are already provided by FreeBSD libc
|
|
||||||
# and filefrag is linux only
|
|
||||||
rm -f \
|
|
||||||
"${D}"/usr/sbin/filefrag \
|
|
||||||
"${D}"/usr/share/man/man8/filefrag.8 \
|
|
||||||
"${D}"/usr/bin/uuidgen \
|
|
||||||
"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
|
|
||||||
"${D}"/usr/share/man/man1/uuidgen.1 || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
@ -1,126 +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.10-fix-build-cflags.patch #516854
|
|
||||||
|
|
||||||
# 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
|
|
||||||
}
|
|
||||||
@ -1,127 +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
|
|
||||||
|
|
||||||
# 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
|
|
||||||
}
|
|
||||||
@ -1,45 +0,0 @@
|
|||||||
https://bugs.gentoo.org/276352
|
|
||||||
|
|
||||||
From 3a4d9869d47c462c84688b0f8b15df5ab6f93381 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Theodore Ts'o <tytso@mit.edu>
|
|
||||||
Date: Thu, 2 Jul 2009 13:54:22 -0400
|
|
||||||
Subject: [PATCH] resize2fs: Fix error message so the mountpoint is printed correctly
|
|
||||||
|
|
||||||
The resize2fs program was freeing the mountpoint information too
|
|
||||||
early, so garbage was getting printed instead of the correct
|
|
||||||
information in an error message.
|
|
||||||
|
|
||||||
Addresses-Debian-Bug: #535452
|
|
||||||
|
|
||||||
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
|
|
||||||
---
|
|
||||||
resize/main.c | 5 ++---
|
|
||||||
1 files changed, 2 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/resize/main.c b/resize/main.c
|
|
||||||
index 9b03ba9..2dae161 100644
|
|
||||||
--- a/resize/main.c
|
|
||||||
+++ b/resize/main.c
|
|
||||||
@@ -250,10 +250,8 @@ int main (int argc, char ** argv)
|
|
||||||
device_name);
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
- if (!(mount_flags & EXT2_MF_MOUNTED) || (mtpt[len-1] == 0)) {
|
|
||||||
- free(mtpt);
|
|
||||||
+ if (!(mount_flags & EXT2_MF_MOUNTED) || (mtpt[len-1] == 0))
|
|
||||||
break;
|
|
||||||
- }
|
|
||||||
free(mtpt);
|
|
||||||
len = 2 * len;
|
|
||||||
}
|
|
||||||
@@ -453,6 +451,7 @@ int main (int argc, char ** argv)
|
|
||||||
((flags & RESIZE_PERCENT_COMPLETE) ?
|
|
||||||
resize_progress_func : 0));
|
|
||||||
}
|
|
||||||
+ free(mtpt);
|
|
||||||
if (retval) {
|
|
||||||
com_err(program_name, retval, _("while trying to resize %s"),
|
|
||||||
device_name);
|
|
||||||
--
|
|
||||||
1.6.3.3
|
|
||||||
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
# See the e2fsck.conf man page for more info
|
|
||||||
|
|
||||||
[options]
|
|
||||||
|
|
||||||
# allow fsck to run sanely at any point in time #142850
|
|
||||||
buggy_init_scripts = yes
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
Since the tests analyze the output messages, force the default locale.
|
|
||||||
|
|
||||||
http://bugs.gentoo.org/99766
|
|
||||||
|
|
||||||
--- tests/test_script.in
|
|
||||||
+++ tests/test_script.in
|
|
||||||
@@ -3,6 +3,19 @@
|
|
||||||
# Test script for e2fsck
|
|
||||||
#
|
|
||||||
|
|
||||||
+# NLS nuisances.
|
|
||||||
+for as_var in \
|
|
||||||
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
|
||||||
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
|
||||||
+ LC_TELEPHONE LC_TIME
|
|
||||||
+do
|
|
||||||
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
|
||||||
+ eval $as_var=C; export $as_var
|
|
||||||
+ else
|
|
||||||
+ unset $as_var
|
|
||||||
+ fi
|
|
||||||
+done
|
|
||||||
+
|
|
||||||
if test "$1"x = x ; then
|
|
||||||
TESTS=`ls -d $SRCDIR/[a-zA-Z]_* | $EGREP -v "\.failed|\.new"`
|
|
||||||
else
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- a/lib/ext2fs/ext2_fs.h
|
|
||||||
+++ b/lib/ext2fs/ext2_fs.h
|
|
||||||
@@ -414,7 +414,7 @@
|
|
||||||
|
|
||||||
#define i_size_high i_dir_acl
|
|
||||||
|
|
||||||
-#if defined(__KERNEL__) || defined(__linux__)
|
|
||||||
+#if defined(__KERNEL__) || defined(__linux__) || defined(__FreeBSD__)
|
|
||||||
#define i_reserved1 osd1.linux1.l_i_reserved1
|
|
||||||
#define i_frag osd2.linux2.l_i_frag
|
|
||||||
#define i_fsize osd2.linux2.l_i_fsize
|
|
||||||
@ -1,91 +0,0 @@
|
|||||||
--- e2fsprogs-1.41.5/e2fsck/Makefile.in
|
|
||||||
+++ e2fsprogs-1.41.5/e2fsck/Makefile.in
|
|
||||||
@@ -195,12 +195,12 @@
|
|
||||||
@echo " LINK $(root_sbindir)/fsck.ext2"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
|
|
||||||
+ @$(LN_S) -f e2fsck \
|
|
||||||
$(DESTDIR)$(root_sbindir)/fsck.ext2
|
|
||||||
@echo " LINK $(root_sbindir)/fsck.ext3"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
|
|
||||||
+ @$(LN_S) -f e2fsck \
|
|
||||||
$(DESTDIR)$(root_sbindir)/fsck.ext3
|
|
||||||
@echo " LINK $(root_sbindir)/fsck.ext4"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
|
|
||||||
+ @$(LN_S) -f e2fsck \
|
|
||||||
$(DESTDIR)$(root_sbindir)/fsck.ext4
|
|
||||||
@echo " LINK $(root_sbindir)/fsck.ext4dev"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/e2fsck \
|
|
||||||
+ @$(LN_S) -f e2fsck \
|
|
||||||
$(DESTDIR)$(root_sbindir)/fsck.ext4dev
|
|
||||||
@@ -221,12 +221,12 @@
|
|
||||||
@echo " LINK $(man8dir)/fsck.ext2.8"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
|
|
||||||
+ @$(LN_S) -f e2fsck.8 \
|
|
||||||
$(DESTDIR)$(man8dir)/fsck.ext2.8
|
|
||||||
@echo " LINK $(man8dir)/fsck.ext3.8"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
|
|
||||||
+ @$(LN_S) -f e2fsck.8 \
|
|
||||||
$(DESTDIR)$(man8dir)/fsck.ext3.8
|
|
||||||
@echo " LINK $(man8dir)/fsck.ext4.8"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
|
|
||||||
+ @$(LN_S) -f e2fsck.8 \
|
|
||||||
$(DESTDIR)$(man8dir)/fsck.ext4.8
|
|
||||||
@echo " LINK $(man8dir)/fsck.ext4.8"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(man8dir)/e2fsck.8 \
|
|
||||||
+ @$(LN_S) -f e2fsck.8 \
|
|
||||||
$(DESTDIR)$(man8dir)/fsck.ext4dev.8
|
|
||||||
--- e2fsprogs-1.41.5/misc/Makefile.in
|
|
||||||
+++ e2fsprogs-1.41.5/misc/Makefile.in
|
|
||||||
@@ -394,19 +394,19 @@
|
|
||||||
@echo " LINK $(root_sbindir)/mkfs.ext2"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
|
|
||||||
+ @$(LN_S) -f mke2fs \
|
|
||||||
$(DESTDIR)$(root_sbindir)/mkfs.ext2
|
|
||||||
@echo " LINK $(root_sbindir)/mkfs.ext3"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
|
|
||||||
+ @$(LN_S) -f mke2fs \
|
|
||||||
$(DESTDIR)$(root_sbindir)/mkfs.ext3
|
|
||||||
@echo " LINK $(root_sbindir)/mkfs.ext4"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
|
|
||||||
+ @$(LN_S) -f mke2fs \
|
|
||||||
$(DESTDIR)$(root_sbindir)/mkfs.ext4
|
|
||||||
@echo " LINK $(root_sbindir)/mkfs.ext4dev"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/mke2fs \
|
|
||||||
+ @$(LN_S) -f mke2fs \
|
|
||||||
$(DESTDIR)$(root_sbindir)/mkfs.ext4dev
|
|
||||||
@echo " LINK $(root_sbindir)/e2label"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
|
|
||||||
+ @$(LN_S) -f tune2fs \
|
|
||||||
$(DESTDIR)$(root_sbindir)/e2label
|
|
||||||
@if test -n "$(FINDFS_LINK)"; then \
|
|
||||||
echo " LINK $(root_sbindir)/findfs"; \
|
|
||||||
- $(LN) -f $(DESTDIR)$(root_sbindir)/tune2fs \
|
|
||||||
+ $(LN_S) -f tune2fs \
|
|
||||||
$(DESTDIR)$(root_sbindir)/$(FINDFS_LINK); \
|
|
||||||
@@ -431,12 +431,12 @@
|
|
||||||
@echo " LINK mkfs.ext2.8"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
|
|
||||||
+ @$(LN_S) -f mke2fs.8 \
|
|
||||||
$(DESTDIR)$(man8dir)/mkfs.ext2.8
|
|
||||||
@echo " LINK mkfs.ext3.8"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
|
|
||||||
+ @$(LN_S) -f mke2fs.8 \
|
|
||||||
$(DESTDIR)$(man8dir)/mkfs.ext3.8
|
|
||||||
@echo " LINK mkfs.ext4.8"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
|
|
||||||
+ @$(LN_S) -f mke2fs.8 \
|
|
||||||
$(DESTDIR)$(man8dir)/mkfs.ext4.8
|
|
||||||
@echo " LINK mkfs.ext4dev.8"
|
|
||||||
- @$(LN) -f $(DESTDIR)$(man8dir)/mke2fs.8 \
|
|
||||||
+ @$(LN_S) -f mke2fs.8 \
|
|
||||||
$(DESTDIR)$(man8dir)/mkfs.ext4dev.8
|
|
||||||
--- e2fsprogs-1.41.5/Makefile.in
|
|
||||||
+++ e2fsprogs-1.41.5/Makefile.in
|
|
||||||
@@ -281,6 +66,7 @@
|
|
||||||
uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
|
|
||||||
|
|
||||||
install-libs: install-libs-recursive
|
|
||||||
+install-libs-recursive: | install-shlibs-libs-recursive
|
|
||||||
|
|
||||||
uninstall-libs: uninstall-libs-recursive
|
|
||||||
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- e2fsprogs-1.41.5/Makefile.in
|
|
||||||
+++ e2fsprogs-1.41.5/Makefile.in
|
|
||||||
@@ -281,6 +66,7 @@
|
|
||||||
uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
|
|
||||||
|
|
||||||
install-libs: install-libs-recursive
|
|
||||||
+install-libs-recursive: | install-shlibs-libs-recursive
|
|
||||||
|
|
||||||
uninstall-libs: uninstall-libs-recursive
|
|
||||||
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
From 5c15bf5f978bae01f1ca3cbe6414ab1d355a6adf Mon Sep 17 00:00:00 2001
|
|
||||||
From: Theodore Ts'o <tytso@mit.edu>
|
|
||||||
Date: Thu, 22 May 2014 18:52:27 -0400
|
|
||||||
Subject: e2fsck: fix Makefile dependency for quota.o
|
|
||||||
|
|
||||||
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
|
|
||||||
|
|
||||||
diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
|
|
||||||
index 4b10f6f..f773fea 100644
|
|
||||||
--- a/e2fsck/Makefile.in
|
|
||||||
+++ b/e2fsck/Makefile.in
|
|
||||||
@@ -552,3 +552,13 @@ logfile.o: $(srcdir)/logfile.c $(top_builddir)/lib/config.h \
|
|
||||||
$(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
|
|
||||||
$(top_srcdir)/lib/../e2fsck/dict.h
|
|
||||||
prof_err.o: prof_err.c
|
|
||||||
+quota.o: $(srcdir)/quota.c $(top_builddir)/lib/config.h \
|
|
||||||
+ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \
|
|
||||||
+ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
|
|
||||||
+ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \
|
|
||||||
+ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \
|
|
||||||
+ $(top_builddir)/lib/ext2fs/ext2_err.h \
|
|
||||||
+ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \
|
|
||||||
+ $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/quotaio.h \
|
|
||||||
+ $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \
|
|
||||||
+ $(top_srcdir)/lib/../e2fsck/dict.h $(srcdir)/problem.h
|
|
||||||
--
|
|
||||||
cgit v0.10.1
|
|
||||||
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
https://bugs.gentoo.org/516854
|
|
||||||
|
|
||||||
--- a/e2fsprogs-libs-1.42.10/configure
|
|
||||||
+++ b/e2fsprogs-libs-1.42.10/configure
|
|
||||||
@@ -1328,7 +1328,7 @@
|
|
||||||
BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
|
|
||||||
BUILD_LDFLAGS="$LDFLAGS"
|
|
||||||
else
|
|
||||||
- BUILD_CFLAGS=
|
|
||||||
+ BUILD_CFLAGS="$INCLUDES"
|
|
||||||
BUILD_LDFLAGS=
|
|
||||||
fi
|
|
||||||
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
https://bugs.gentoo.org/516854
|
|
||||||
|
|
||||||
--- e2fsprogs-1.42.13/configure
|
|
||||||
+++ e2fsprogs-1.42.13/configure
|
|
||||||
@@ -1315,6 +1315,8 @@
|
|
||||||
if test $cross_compiling = no; then
|
|
||||||
BUILD_CFLAGS="$CFLAGS $CPPFLAGS $INCLUDES -DHAVE_CONFIG_H"
|
|
||||||
BUILD_LDFLAGS="$LDFLAGS"
|
|
||||||
+else
|
|
||||||
+ BUILD_CFLAGS="$INCLUDES"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
@ -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
|
|
||||||
|
|
||||||
@ -1,96 +0,0 @@
|
|||||||
.TH fsck_ext2fs 8 2006-07-02 "Matthias Andree" "FreeBSD Ports"
|
|
||||||
.\"
|
|
||||||
.\" fsck_ext2fs.8 - manual page for fsck_ext2fs wrapper
|
|
||||||
.\"
|
|
||||||
.\" (C) Copyright 2006 by Matthias Andree <matthias.andree@gmx.de>
|
|
||||||
.\"
|
|
||||||
.\" License: This file may be redistributed in accordance with the terms
|
|
||||||
.\" of the GNU General Public License v2.
|
|
||||||
.\"
|
|
||||||
.\" Upstream $Id$
|
|
||||||
.\" $FreeBSD: ports/sysutils/e2fsprogs/files/fsck_ext2fs.8,v 1.1 2006/07/04 15:47:51 leeym Exp $
|
|
||||||
.\"
|
|
||||||
.SH NAME
|
|
||||||
.B fsck_ext2fs
|
|
||||||
\- compatibility wrapper for e2fsck
|
|
||||||
.SH SYNOPSIS
|
|
||||||
.P
|
|
||||||
.B fsck_ext2fs
|
|
||||||
[\fB\-Fpfnyv\fR] [\fB\-b\fR \fIblock\fR]
|
|
||||||
.SH DESCRIPTION
|
|
||||||
.P
|
|
||||||
\fBfsck_ext2fs\fR maps the traditional FreeBSD \fBfsck_ffs\fR options to
|
|
||||||
options with the same functionality for \fBe2fsck,\fR runs \fBe2fsck\fR
|
|
||||||
and then maps its exit status to values that FreeBSD understands.
|
|
||||||
\fBe2fsck\fR is a utility to check and repair ext2 and ext3 file
|
|
||||||
systems.
|
|
||||||
|
|
||||||
.SH OPTIONS
|
|
||||||
.IP \fB\-F\fR
|
|
||||||
(check foreground mode required) Immediately exits with status 1 to tell
|
|
||||||
\fBfsck\fR that ext2fs cannot be checked in the background. \fBfsck\fR
|
|
||||||
usually runs \fBfsck_*\fR programs twice, first with \fB\-F\fR to find
|
|
||||||
out if they can do background checking, then either immediately without
|
|
||||||
\fB\-F\fR for foreground checking or deferred in the background with
|
|
||||||
\fB\-B\fR.
|
|
||||||
.IP \fB\-p\fR
|
|
||||||
(preen mode) This option suppresses adding the \fB\-f\fR option (unless
|
|
||||||
\fB\-f\fR is also given) and adds the \fB\-p\fR option to the
|
|
||||||
\fBe2fsck\fR command line. This causes \fBe2fsck\fR to automatically fix
|
|
||||||
any filesystem problems that can safely be fixed without operator
|
|
||||||
intervention. Without this option given, \fBe2fsck\fR will be run with
|
|
||||||
the \fB\-f\fR option to force a check, since interactive scan and repair
|
|
||||||
mode is the default on FreeBSD, but not on Linux where \fBe2fsck\fR
|
|
||||||
comes from.
|
|
||||||
.IP \fB\-f\fR
|
|
||||||
(force check) This option forces the check of a clean file system while
|
|
||||||
preening and is passed to \fBe2fsck\fR verbatim.
|
|
||||||
.IP \fB\-n\fR
|
|
||||||
("no" mode) This option causes the file system to be opened in read-only
|
|
||||||
mode and assume "no" as answer to all questions. This is the only way to
|
|
||||||
safely run \fBfsck\fR on a mounted ext2 or ext3 file system. This option
|
|
||||||
is passed to \fBe2fsck\fR verbatim.
|
|
||||||
.IP \fB\-y\fR
|
|
||||||
("yes" mode) This option is passed verbatim to \fBe2fsck\fR and causes
|
|
||||||
it to assume "yes" as answer to all questions. This allows the
|
|
||||||
non-interactive use of e2fsck but is rather aggressive. Use with care.
|
|
||||||
.IP \fB\-v\fR
|
|
||||||
(verbose output) This option is passed verbatim to \fBe2fsck\fR and
|
|
||||||
causes it to verbosely report its progress.
|
|
||||||
.IP "\fB\-b\fR \fIblock\fR"
|
|
||||||
(use alternate super block) This option is passed verbatim to
|
|
||||||
\fBe2fsck\fR and selects an alternate super block, for use when the
|
|
||||||
primary super block has been damaged. Please see the \fBe2fsck\fR(8)
|
|
||||||
manual page for details.
|
|
||||||
|
|
||||||
.SH EXIT STATUS
|
|
||||||
If errors remain after \fBe2fsck\fR, an invalid option or too many
|
|
||||||
options have been specified, \fBe2fsck\fR was killed with a signal or
|
|
||||||
the \fIfork\fB system call failed, \fBfsck_ext2fs\fR exits with status
|
|
||||||
EXIT_FAILURE (usually 1). If \fBe2fsck\fR cannot be started, exits with
|
|
||||||
status 127. If the file system is clean after \fBe2fsck\fR operation,
|
|
||||||
exits with status EXIT_SUCCESS (0).
|
|
||||||
|
|
||||||
.SH NOTES
|
|
||||||
.P
|
|
||||||
This utility is merely meant as an adaptor so that \fBe2fsck\fR can be
|
|
||||||
run during the boot process, it does not support all options that
|
|
||||||
\fBe2fsck\fR offers. If you need one of its advanced options, please run
|
|
||||||
\fBe2fsck\fR directly.
|
|
||||||
|
|
||||||
.SH FILES
|
|
||||||
.TP
|
|
||||||
.I /sbin/e2fsck
|
|
||||||
is the location of the \fBe2fsck\fR program to run.
|
|
||||||
|
|
||||||
.SH AUTHOR
|
|
||||||
.P
|
|
||||||
Matthias Andree <matthias.andree@gmx.de> wrote the program and this
|
|
||||||
manual page.
|
|
||||||
.SH CONFORMING TO
|
|
||||||
The FreeBSD 6.1 command line interface for \fBfsck_ufs\fR(8).
|
|
||||||
.SH SEE ALSO
|
|
||||||
.BR fsck (8),
|
|
||||||
.BR e2fsck (8)
|
|
||||||
and
|
|
||||||
.BR fsck_ufs (8).
|
|
||||||
@ -1,147 +0,0 @@
|
|||||||
/*
|
|
||||||
* fsck_ext2fs - wrapper for e2fsck on FreeBSD
|
|
||||||
* Copyright (C) 2004,2006 Matthias Andree <matthias.andree@gmx.de>
|
|
||||||
* redistributable in accordance with the
|
|
||||||
* GNU General Public License v2
|
|
||||||
*
|
|
||||||
* $FreeBSD: ports/sysutils/e2fsprogs/files/fsck_ext2fs.c,v 1.5 2006/07/04 15:47:51 leeym Exp $
|
|
||||||
*
|
|
||||||
* Upstream: $Id$
|
|
||||||
*
|
|
||||||
* format: gindent -kr
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#include <sys/time.h>
|
|
||||||
#include <sys/resource.h>
|
|
||||||
#include <errno.h>
|
|
||||||
|
|
||||||
__attribute__ ((noreturn))
|
|
||||||
static int die(const char *tag)
|
|
||||||
{
|
|
||||||
perror(tag);
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
int ch, i = 1, force = 0, status, verbose = 0, t;
|
|
||||||
long block = 0;
|
|
||||||
enum { normal, preen, yes, no } mode = normal;
|
|
||||||
char *cmd[256];
|
|
||||||
pid_t pid;
|
|
||||||
|
|
||||||
cmd[0] = "/sbin/e2fsck";
|
|
||||||
while ((ch = getopt(argc, argv, "BFpfnyb:v")) != -1) {
|
|
||||||
switch (ch) {
|
|
||||||
case 'p':
|
|
||||||
mode = preen;
|
|
||||||
break;
|
|
||||||
case 'f':
|
|
||||||
force = 1;
|
|
||||||
break;
|
|
||||||
case 'n':
|
|
||||||
mode = no;
|
|
||||||
break;
|
|
||||||
case 'y':
|
|
||||||
mode = yes;
|
|
||||||
break;
|
|
||||||
case 'b':
|
|
||||||
block = atol(optarg);
|
|
||||||
break;
|
|
||||||
case 'v':
|
|
||||||
verbose++;
|
|
||||||
break;
|
|
||||||
case 'F':
|
|
||||||
/* e2fsck does not support background checking,
|
|
||||||
* hence exit with nonzero status to force
|
|
||||||
* the foreground check. */
|
|
||||||
exit(1);
|
|
||||||
case 'B':
|
|
||||||
default:
|
|
||||||
fprintf(stderr, "%s: unknown option -%c\n",
|
|
||||||
argv[0], optopt);
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (force)
|
|
||||||
cmd[i++] = "-f";
|
|
||||||
|
|
||||||
switch (mode) {
|
|
||||||
case normal:
|
|
||||||
/* FreeBSD needs -f to force a check only in context
|
|
||||||
* with -p -- so map normal to force to match
|
|
||||||
* expectations */
|
|
||||||
if (!force)
|
|
||||||
cmd[i++] = "-f";
|
|
||||||
break;
|
|
||||||
case yes:
|
|
||||||
cmd[i++] = "-y";
|
|
||||||
break;
|
|
||||||
case no:
|
|
||||||
cmd[i++] = "-n";
|
|
||||||
break;
|
|
||||||
case preen:
|
|
||||||
cmd[i++] = "-p";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (block) {
|
|
||||||
static char b[30];
|
|
||||||
|
|
||||||
sprintf(b, "-b %ld", block);
|
|
||||||
cmd[i++] = b;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* silently limit verbose to 15 so we don't overflow the cmd array */
|
|
||||||
if (verbose > 15)
|
|
||||||
verbose = 15;
|
|
||||||
|
|
||||||
for (t = verbose; t > 1; t--)
|
|
||||||
cmd[i++] = "-v";
|
|
||||||
|
|
||||||
while (optind < argc) {
|
|
||||||
cmd[i++] = argv[optind++];
|
|
||||||
/* sanity check so we don't overflow the cmd buffer */
|
|
||||||
if (i+1 == sizeof(cmd)/sizeof(cmd[0])) {
|
|
||||||
errno = E2BIG;
|
|
||||||
die(argv[0]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cmd[i++] = 0;
|
|
||||||
|
|
||||||
if (verbose) {
|
|
||||||
for (i=0; cmd[i]; i++)
|
|
||||||
fputs(cmd[i], stderr),
|
|
||||||
fputc(' ', stderr);
|
|
||||||
fputc('\n', stderr);
|
|
||||||
}
|
|
||||||
|
|
||||||
pid = fork();
|
|
||||||
switch (pid) {
|
|
||||||
case -1:
|
|
||||||
/* error */
|
|
||||||
die("fork");
|
|
||||||
break;
|
|
||||||
case 0:
|
|
||||||
/* child */
|
|
||||||
(void) execv(cmd[0], cmd);
|
|
||||||
perror("execve");
|
|
||||||
_exit(127);
|
|
||||||
default:
|
|
||||||
/* parent */
|
|
||||||
if (pid != waitpid(pid, &status, 0))
|
|
||||||
die("waitpid");
|
|
||||||
if (WIFSIGNALED(status)
|
|
||||||
|| (WIFEXITED(status) && WEXITSTATUS(status) >= 4))
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
exit(EXIT_SUCCESS);
|
|
||||||
}
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<herd>base-system</herd>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="cpe">cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id>
|
|
||||||
<remote-id type="sourceforge">e2fsprogs</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
||||||
Loading…
x
Reference in New Issue
Block a user