1 |
commit: 55211db471467eb9e89666db17a299fc3a9ae2bf |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 30 10:57:39 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 30 10:57:50 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55211db4 |
7 |
|
8 |
sys-fs/e2fsprogs: Bump to version 1.46.0 |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-fs/e2fsprogs/Manifest | 1 + |
14 |
sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild | 144 +++++++++++++++++++++ |
15 |
.../files/e2fsprogs-1.46.0-pthreads_build.patch | 46 +++++++ |
16 |
sys-fs/e2fsprogs/metadata.xml | 1 + |
17 |
4 files changed, 192 insertions(+) |
18 |
|
19 |
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest |
20 |
index 7802ac56570..3ff83d7d77f 100644 |
21 |
--- a/sys-fs/e2fsprogs/Manifest |
22 |
+++ b/sys-fs/e2fsprogs/Manifest |
23 |
@@ -1,3 +1,4 @@ |
24 |
DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc |
25 |
DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84 |
26 |
DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763 |
27 |
+DIST e2fsprogs-1.46.0.tar.xz 7007144 BLAKE2B d902028a0e538a62428e18e3c2a0a917a73351afc7d8eec804ddac459a1b8c2e11d104201235fb64170acc78942d2c9d5a45039f770cf5ce537cdba18cd559e6 SHA512 c865360e532da42264200934229aa9cfc88c3342fc4e206e82d1fe2a908b0fd3b58f2e9a4796f2ecdeafe1ace9f9ee444ea5b2e3efd488cb934f9a22af6a8f7e |
28 |
|
29 |
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild |
30 |
new file mode 100644 |
31 |
index 00000000000..3bab0326f34 |
32 |
--- /dev/null |
33 |
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.0.ebuild |
34 |
@@ -0,0 +1,144 @@ |
35 |
+# Copyright 1999-2021 Gentoo Authors |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=7 |
39 |
+ |
40 |
+inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript |
41 |
+ |
42 |
+DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" |
43 |
+HOMEPAGE="http://e2fsprogs.sourceforge.net/" |
44 |
+SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz |
45 |
+ elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" |
46 |
+ |
47 |
+LICENSE="GPL-2 BSD" |
48 |
+SLOT="0" |
49 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
50 |
+IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD" |
51 |
+ |
52 |
+RDEPEND="~sys-libs/${PN}-libs-${PV} |
53 |
+ >=sys-apps/util-linux-2.16 |
54 |
+ cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) |
55 |
+ fuse? ( sys-fs/fuse:0 ) |
56 |
+ nls? ( virtual/libintl )" |
57 |
+DEPEND="${RDEPEND}" |
58 |
+BDEPEND=" |
59 |
+ nls? ( sys-devel/gettext ) |
60 |
+ virtual/pkgconfig |
61 |
+ sys-apps/texinfo |
62 |
+" |
63 |
+ |
64 |
+PATCHES=( |
65 |
+ "${FILESDIR}"/${PN}-1.40-fbsd.patch |
66 |
+ "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 |
67 |
+ |
68 |
+ # Upstream patches (can usually removed with next version bump) |
69 |
+ "${FILESDIR}/${P}-pthreads_build.patch" |
70 |
+) |
71 |
+ |
72 |
+src_prepare() { |
73 |
+ if [[ ${CHOST} == *-mint* ]] ; then |
74 |
+ PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) |
75 |
+ fi |
76 |
+ |
77 |
+ default |
78 |
+ |
79 |
+ cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" |
80 |
+ |
81 |
+ # Get rid of doc -- we don't use them. This also prevents a sandbox |
82 |
+ # violation due to mktexfmt invocation |
83 |
+ rm -r doc || die "Failed to remove doc dir" |
84 |
+ |
85 |
+ # blargh ... trick e2fsprogs into using e2fsprogs-libs |
86 |
+ sed -i -r \ |
87 |
+ -e 's:@LIBINTL@:@LTLIBINTL@:' \ |
88 |
+ -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \ |
89 |
+ -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \ |
90 |
+ MCONFIG.in || die "muck libs" #122368 |
91 |
+ sed -i -r \ |
92 |
+ -e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \ |
93 |
+ Makefile.in || die "remove subdirs" |
94 |
+ ln -s $(which mk_cmds) lib/ss/ || die |
95 |
+ |
96 |
+ # Avoid rebuild |
97 |
+ echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h |
98 |
+} |
99 |
+ |
100 |
+src_configure() { |
101 |
+ # Keep the package from doing silly things #261411 |
102 |
+ export VARTEXFONTS="${T}/fonts" |
103 |
+ |
104 |
+ # needs open64() prototypes and friends |
105 |
+ append-cppflags -D_GNU_SOURCE |
106 |
+ |
107 |
+ local myeconfargs=( |
108 |
+ --with-root-prefix="${EPREFIX}" |
109 |
+ $(use_with cron crond-dir "${EPREFIX}/etc/cron.d") |
110 |
+ --with-systemd-unit-dir="$(systemd_get_systemunitdir)" |
111 |
+ --with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d" |
112 |
+ --enable-symlink-install |
113 |
+ --enable-elf-shlibs |
114 |
+ $(tc-has-tls || echo --disable-tls) |
115 |
+ $(use_enable fuse fuse2fs) |
116 |
+ $(use_enable nls) |
117 |
+ --disable-libblkid |
118 |
+ --disable-libuuid |
119 |
+ --disable-fsck |
120 |
+ --disable-uuidd |
121 |
+ $(use_enable lto) |
122 |
+ $(use_enable threads pthread) |
123 |
+ ) |
124 |
+ ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}" |
125 |
+ |
126 |
+ if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then |
127 |
+ eerror "INTL sanity check failed, aborting build." |
128 |
+ eerror "Please post your ${S}/config.log file as an" |
129 |
+ eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" |
130 |
+ die "Preventing included intl cruft from building" |
131 |
+ fi |
132 |
+} |
133 |
+ |
134 |
+src_compile() { |
135 |
+ emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds |
136 |
+ |
137 |
+ # Build the FreeBSD helper |
138 |
+ if use elibc_FreeBSD ; then |
139 |
+ cp "${FILESDIR}"/fsck_ext2fs.c . |
140 |
+ emake V=1 fsck_ext2fs |
141 |
+ fi |
142 |
+} |
143 |
+ |
144 |
+src_install() { |
145 |
+ # need to set root_libdir= manually as any --libdir options in the |
146 |
+ # econf above (i.e. multilib) will screw up the default #276465 |
147 |
+ emake \ |
148 |
+ STRIP=: \ |
149 |
+ root_libdir="${EPREFIX}/usr/$(get_libdir)" \ |
150 |
+ DESTDIR="${D}" \ |
151 |
+ install |
152 |
+ |
153 |
+ einstalldocs |
154 |
+ |
155 |
+ insinto /etc |
156 |
+ doins "${FILESDIR}"/e2fsck.conf |
157 |
+ |
158 |
+ # Move shared libraries to /lib/, install static libraries to |
159 |
+ # /usr/lib/, and install linker scripts to /usr/lib/. |
160 |
+ gen_usr_ldscript -a e2p ext2fs |
161 |
+ |
162 |
+ # configure doesn't have an option to disable static libs :/ |
163 |
+ if ! use static-libs ; then |
164 |
+ find "${ED}" -name '*.a' -delete || die |
165 |
+ fi |
166 |
+ |
167 |
+ if use elibc_FreeBSD ; then |
168 |
+ # Install helpers for us |
169 |
+ into / |
170 |
+ dosbin "${S}"/fsck_ext2fs |
171 |
+ doman "${FILESDIR}"/fsck_ext2fs.8 |
172 |
+ |
173 |
+ # filefrag is linux only |
174 |
+ rm \ |
175 |
+ "${ED}"/usr/sbin/filefrag \ |
176 |
+ "${ED}"/usr/share/man/man8/filefrag.8 || die |
177 |
+ fi |
178 |
+} |
179 |
|
180 |
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.46.0-pthreads_build.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.46.0-pthreads_build.patch |
181 |
new file mode 100644 |
182 |
index 00000000000..9d251d2f0b3 |
183 |
--- /dev/null |
184 |
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.46.0-pthreads_build.patch |
185 |
@@ -0,0 +1,46 @@ |
186 |
+From 24487a7fa64bfa92bea21be3ca8c155e5de7438f Mon Sep 17 00:00:00 2001 |
187 |
+From: Theodore Ts'o <tytso@×××.edu> |
188 |
+Date: Fri, 29 Jan 2021 22:28:31 -0500 |
189 |
+Subject: configure.ac: fix build failure on systems with pthreads && !fuse |
190 |
+ support |
191 |
+ |
192 |
+The configure script checks for pthread.h as part of double-checking |
193 |
+that the FUSE support works correctly, which implicitly defined |
194 |
+HAVE_PHREAD_H. If the FUSE libraries are not present (or fuse support |
195 |
+is explicitly disabled), this check doesn't happen and so |
196 |
+HAVE_PTHREAD_H is not defined, and this causes a build failure. |
197 |
+ |
198 |
+Signed-off-by: Theodore Ts'o <tytso@×××.edu> |
199 |
+--- |
200 |
+ configure | 2 +- |
201 |
+ configure.ac | 1 + |
202 |
+ 2 files changed, 2 insertions(+), 1 deletion(-) |
203 |
+ |
204 |
+diff --git a/configure b/configure |
205 |
+index 9d41d069..6b8b7f4b 100755 |
206 |
+--- a/configure |
207 |
++++ b/configure |
208 |
+@@ -10448,7 +10448,7 @@ fi |
209 |
+ done |
210 |
+ |
211 |
+ fi |
212 |
+-for ac_header in dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h attr/xattr.h linux/falloc.h linux/fd.h linux/fsmap.h linux/major.h linux/loop.h linux/types.h net/if_dl.h netinet/in.h sys/acl.h sys/disklabel.h sys/disk.h sys/file.h sys/ioctl.h sys/key.h sys/mkdev.h sys/mman.h sys/mount.h sys/prctl.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h sys/xattr.h |
213 |
++for ac_header in dirent.h errno.h execinfo.h getopt.h malloc.h mntent.h paths.h pthread.h semaphore.h setjmp.h signal.h stdarg.h stdint.h stdlib.h termios.h termio.h unistd.h utime.h attr/xattr.h linux/falloc.h linux/fd.h linux/fsmap.h linux/major.h linux/loop.h linux/types.h net/if_dl.h netinet/in.h sys/acl.h sys/disklabel.h sys/disk.h sys/file.h sys/ioctl.h sys/key.h sys/mkdev.h sys/mman.h sys/mount.h sys/prctl.h sys/resource.h sys/select.h sys/socket.h sys/sockio.h sys/stat.h sys/syscall.h sys/sysmacros.h sys/time.h sys/types.h sys/un.h sys/wait.h sys/xattr.h |
214 |
+ do : |
215 |
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
216 |
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |
217 |
+diff --git a/configure.ac b/configure.ac |
218 |
+index 141c4d9c..42b6f486 100644 |
219 |
+--- a/configure.ac |
220 |
++++ b/configure.ac |
221 |
+@@ -975,6 +975,7 @@ AC_CHECK_HEADERS(m4_flatten([ |
222 |
+ malloc.h |
223 |
+ mntent.h |
224 |
+ paths.h |
225 |
++ pthread.h |
226 |
+ semaphore.h |
227 |
+ setjmp.h |
228 |
+ signal.h |
229 |
+-- |
230 |
+cgit 1.2.3-1.el7 |
231 |
+ |
232 |
|
233 |
diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml |
234 |
index fd229917a07..05a9b85ad26 100644 |
235 |
--- a/sys-fs/e2fsprogs/metadata.xml |
236 |
+++ b/sys-fs/e2fsprogs/metadata.xml |
237 |
@@ -8,6 +8,7 @@ |
238 |
<use> |
239 |
<flag name="cron">Install e2scrub_all cron script</flag> |
240 |
<flag name='fuse'>Build fuse2fs, a FUSE file system client for ext2/ext3/ext4 file systems</flag> |
241 |
+ <flag name="lto">Build with link time optimization (LTO)</flag> |
242 |
</use> |
243 |
<upstream> |
244 |
<remote-id type="cpe">cpe:/a:e2fsprogs_project:e2fsprogs</remote-id> |