gentoo auto-resync : 18:11:2022 - 06:58:04

3 files changed, 80 insertions, 0 deletions

diff --git a/sys-fs/jfsutils/Manifest b/sys-fs/jfsutils/Manifest
index fc1fc8052385..4768070923bc 100644
--- a/sys-fs/jfsutils/Manifest
+++ b/sys-fs/jfsutils/Manifest
@@ -2,7 +2,9 @@ AUX jfsutils-1.1.15-check-for-ar.patch 207 BLAKE2B 52f709e4ddf5899245fe3cb248512
 AUX jfsutils-1.1.15-format-security-errors.patch 1057 BLAKE2B c5283e945fe5db2fdc87f35c21adb5d7135f04a80e3dd8f4a9ea29ce44a58ec718e7aa8334bcda0c42a5ae764242442fc41fa91aba004904e0cf7804a1851122 SHA512 10e0baed287338826e3ba5c73aa4f16e55892390e252d2874de9e39b5bcb63ff18cc6019af36de64bece5dd2c6c04566bb8a3a5bd6d2656da9b9f116dcce02d2
 AUX jfsutils-1.1.15-gcc10.patch 2015 BLAKE2B 58accef19b804367f6801724a443e9eefd3bd18f74653486ea178b4d97c358c894f4eeb87380408f5e12c998d9462520cb124a63c38c3c4880155a634a8f00bb SHA512 e1804d55afd57a758247902e0e31f93406712e9ce42541b88e7c1126b949eb46ca44f47f191f032225cd57b01736296bfbb72034ad49fc18d5ad6e57050fd0f2
 AUX jfsutils-1.1.15-linux-headers.patch 318 BLAKE2B c04fc414526ed854ed9fd0ac6cd8c1874c924e4446ade2ec85eec2ccbdd8a9c6f580fe6b4b91e61050a468855c46082f2373de08246640362ab81b8e74199cad SHA512 1fd097f403e0ffd434b433fcbf20664166b7ed9b9878f81719d45747fc96249ebac25f8afc9f1f6e532bfac90fe98f1474bb616da3c83fd69cc57d2fe3c11815
+AUX jfsutils-1.1.15-musl-fix-includes.patch 542 BLAKE2B 3d9a7e88611685a8000d2a2395edcbf0671a10e1e49e826b1f87e919161eab30889f3236cf6d0b68c070fb2c26e4ad4fe9742f82bf4429ee226d42dc28f532c1 SHA512 3e1e0f83059f685b087b5d2d2a4b2c190d02b675bc826f3aee25a4a158e75544a27383251f5b2634d1d8f67fe70c5c9e4aa9c192b7a9bf01df1370d7ec64d0f1
 AUX jfsutils-1.1.15-sysmacros.patch 276 BLAKE2B 5c45f4bfc1a03843f59d715bf1c837f33a455e74508b82360c7f77ecd19205e23bc53f445e1bb8c03ca5e88d210685e0dc0ac28f8dfa3eb0b88c4347888e94fd SHA512 3f6472cdfc706e32cc2cefdf673450cb98e81c24c16dea47cacd95f83d75461c8750a9f4dc73ac30782d91e2b7814efdc7e736ef30bffb6cc8ceaf6dba8d51d5
 DIST jfsutils-1.1.15.tar.gz 539148 BLAKE2B 8fe3b4b157482311e7afd938b0d7d22af62a4d342c5d0e6527fc04a90ecc3a5b80de226a4faec582b17bb5a5f10371ab8e0f87e72dc5e1211a0b79180cc5a952 SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858
 EBUILD jfsutils-1.1.15-r1.ebuild 1233 BLAKE2B 5929edfb3976591f20871c7295abc363d495466929245a58b2593b83ac23d811498e8aabcfa44b11c13368d880aaef7743f208b2f6751815a393eb7bc073b36f SHA512 29ce886188d07399a4d5883045a398b7db91e2641df7cb521574f94b03cb23544e474b3113ed79c5f1f652312244071109f5a376b895610968119cf08e55933e
+EBUILD jfsutils-1.1.15-r2.ebuild 1292 BLAKE2B da723cd62a69716ab117ace8a220f52676424fec83e29439dd44f43f68f995c89927a617f0c672157ae7d64be2c55c5d4706605301e108a0e4ce7449f25cfcb8 SHA512 67cf3a4ade954e0283a119dfe8ee4d1073cbc39ddcffb8d5ec48eab0bd0e1e727a5eec5a30c91a4d8f29c40e24cd6aa001a14f0422a5c6e50f628c168e61d6b1
 MISC metadata.xml 600 BLAKE2B c46a9aacd96887980123e08a895435ceed6fee8ee66c77ca5cbe35dc6401c1bab800502c7718de580d6a4ea0f6c4550f961efd66513f84f318d943bc8b706811 SHA512 33e857b758682c2259d51ea1dfd3ba6b27a1fe5191822001070e468f6c6f82eb880ca71e0f2970571c6d60e7fc08f3685f5a0ac3b79c27e8b7b79e00394e5009
diff --git a/sys-fs/jfsutils/files/jfsutils-1.1.15-musl-fix-includes.patch b/sys-fs/jfsutils/files/jfsutils-1.1.15-musl-fix-includes.patch
new file mode 100644
index 000000000000..08599a2d001d
--- /dev/null
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-musl-fix-includes.patch
@@ -0,0 +1,23 @@
+Closes: https://bugs.gentoo.org/715568
+
+From https://git.alpinelinux.org/aports/commit/main/jfsutils/musl-fix-includes.patch?id=d9768c312ddc047df6c2c9b1674b2ab37ddf4e2a 2013-12-17 13:59:36 +0000
+From Timo Teräs <timo.teras@iki.fi>
+
+--- a/libfs/fssubs.c
++++ b/libfs/fssubs.c
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <paths.h>
+ 
+ #if HAVE_MNTENT_H
+ #include <mntent.h>
+@@ -31,7 +32,6 @@
+ #endif
+ 
+ #if HAVE_GETMNTINFO
+-#include <paths.h>
+ #include <sys/param.h>
+ #include <sys/mount.h>
+ #endif
diff --git a/sys-fs/jfsutils/jfsutils-1.1.15-r2.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15-r2.ebuild
new file mode 100644
index 000000000000..19d2ac302052
--- /dev/null
+++ b/sys-fs/jfsutils/jfsutils-1.1.15-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
+HOMEPAGE="http://jfs.sourceforge.net/"
+SRC_URI="http://jfs.sourceforge.net/project/pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="static"
+
+LIB_DEPEND="sys-apps/util-linux:=[static-libs]"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )"
+
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-linux-headers.patch #448844
+	"${FILESDIR}"/${P}-sysmacros.patch #580056
+	"${FILESDIR}"/${P}-check-for-ar.patch #726032
+	"${FILESDIR}"/${P}-gcc10.patch #707314
+	"${FILESDIR}"/${P}-format-security-errors.patch #557140
+	"${FILESDIR}"/${P}-musl-fix-includes.patch # 715568
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	use static && append-ldflags -static
+	econf --sbindir=/sbin
+}
+
+src_install() {
+	default
+
+	rm -f "${ED}"/sbin/{mkfs,fsck}.jfs || die
+	dosym jfs_mkfs /sbin/mkfs.jfs
+	dosym jfs_fsck /sbin/fsck.jfs
+}