gentoo resync : 25.08.2020

6 files changed, 154 insertions, 9 deletions

diff --git a/sys-fs/jfsutils/Manifest b/sys-fs/jfsutils/Manifest
index 7218b3628c18..bcc8c804fd17 100644
--- a/sys-fs/jfsutils/Manifest
+++ b/sys-fs/jfsutils/Manifest
@@ -1,5 +1,8 @@
+AUX jfsutils-1.1.15-check-for-ar.patch 207 BLAKE2B 52f709e4ddf5899245fe3cb2485124672ae7549f2fa9d39e5dc8eef1a5e5fe8f8accfddaab96b0502b19c3dc4119cb76602fff384c3a03604c7330098d52e3f3 SHA512 2596252cccc0c5cc3f570949c26d6b7dad0889e9afa0713276daf996141a184e1ac9f36e4875f5f95096d01628ba87989b7a1a0ccdaa333c8a38bf36100f0f90
+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-sysmacros.patch 276 BLAKE2B 5c45f4bfc1a03843f59d715bf1c837f33a455e74508b82360c7f77ecd19205e23bc53f445e1bb8c03ca5e88d210685e0dc0ac28f8dfa3eb0b88c4347888e94fd SHA512 3f6472cdfc706e32cc2cefdf673450cb98e81c24c16dea47cacd95f83d75461c8750a9f4dc73ac30782d91e2b7814efdc7e736ef30bffb6cc8ceaf6dba8d51d5
 DIST jfsutils-1.1.15.tar.gz 539148 BLAKE2B 8fe3b4b157482311e7afd938b0d7d22af62a4d342c5d0e6527fc04a90ecc3a5b80de226a4faec582b17bb5a5f10371ab8e0f87e72dc5e1211a0b79180cc5a952 SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858
-EBUILD jfsutils-1.1.15.ebuild 903 BLAKE2B 61e1f3983e44f0a39d2f75b00e2204c471cd46bdce3d00c62312ee2dbb7a3ffe5fdec3011a5d38c5b68cd889dd2793079c0ff02b886b7cafb9f876864106f421 SHA512 896ced8f28263026af4f35de04f6e23442c2f53887ff3d7a23b4874152982d867199c863b8c3ff9311b3e7d7df0b60114cccdb04f7fefcb73ff3e3f103111d52
-MISC metadata.xml 420 BLAKE2B 1e6317bfbec962c8404b304ff98179641b1eb460d0b40f20823c876b3dcfd6b7243ca311b6c912440d86d510ef5210510de528c69651b805c5bb26c00bca7531 SHA512 15c5545e60302be536d0f09b4529a76d13d57e8bbd45be1294798bbf11247c8a7148849b5e5481eab968007d1dcb1f43db6297ed752901a5b564136b8bbf1a11
+EBUILD jfsutils-1.1.15-r1.ebuild 1211 BLAKE2B e7d449eda7a3419417b8f74142f48d1e13a06e9029f824498d31035ad72fab053191fa73e5615759ae2dcd0c1a17ed42e59808f408237c9b3d8273ec568a00a0 SHA512 ffbb3a604b0c781f8ada406873c17e008b9626accad700197d062ad9a0aa1966327bacb135664e625e585a7c07d8418fdbb6272fb164e06338d34e010b08fdd2
+MISC metadata.xml 683 BLAKE2B db09548b3469462387d1835ad1c835cb45be5fdf5f18b4940ba35e20a1dd5a57159519e862672fdf08989a0c1b4351d721226ee289523fc214dfafb506150f23 SHA512 e81833363d32078db3c370d6a3faa1803857af05e6df470bc3b625da06680bcf725b443697ef356d73d3b4d4c7e4230ba54459e260f9a5e738978a08742af189
diff --git a/sys-fs/jfsutils/files/jfsutils-1.1.15-check-for-ar.patch b/sys-fs/jfsutils/files/jfsutils-1.1.15-check-for-ar.patch
new file mode 100644
index 000000000000..6469e7d82d22
--- /dev/null
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-check-for-ar.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -9,6 +9,7 @@ dnl Don't include maintainer make-rules by default
+ AM_MAINTAINER_MODE
+ 
+ dnl Checks for programs.
++AM_PROG_AR
+ AC_PROG_AWK
+ AC_PROG_CC
+ AC_PROG_INSTALL
diff --git a/sys-fs/jfsutils/files/jfsutils-1.1.15-format-security-errors.patch b/sys-fs/jfsutils/files/jfsutils-1.1.15-format-security-errors.patch
new file mode 100644
index 000000000000..f66b9e0d46df
--- /dev/null
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-format-security-errors.patch
@@ -0,0 +1,40 @@
+Origin: https://sources.debian.org/patches/jfsutils/1.1.15-5/format-security-errors.patch/
+
+--- a/fscklog/display.c
++++ b/fscklog/display.c
+@@ -182,7 +182,7 @@ void dump_service_log()
+ 				} else {
+ 					/* the record looks ok */
+ 					msg_txt = &log_entry[log_entry_pos];
+-					printf(msg_txt);
++					printf("%s", msg_txt);
+ 					/*
+ 					 * set up for the next record
+ 					 */
+--- a/fscklog/fscklog.c
++++ b/fscklog/fscklog.c
+@@ -252,8 +252,8 @@ int v_send_msg(int msg_num, const char *file_name, int line_number, ...) {
+ 
+ 	sprintf(debug_detail, " [%s:%d]\n", basename(file_name), line_number);
+ 
+-	printf(msg_string);
+-	printf(debug_detail);
++	printf("%s", msg_string);
++	printf("%s", debug_detail);
+ 
+ 	return 0;
+ }
+--- a/logdump/helpers.c
++++ b/logdump/helpers.c
+@@ -95,8 +95,8 @@ int v_fsck_send_msg(int msg_num, const char *file_name, int line_number, ...) {
+ 
+ 	sprintf(debug_detail, " [%s:%d]\n", file_name, line_number);
+ 
+-	printf(msg_string);
+-	printf(debug_detail);
++	printf("%s", msg_string);
++	printf("%s", debug_detail);
+ 
+ 	return 0;
+ }
+ 
diff --git a/sys-fs/jfsutils/files/jfsutils-1.1.15-gcc10.patch b/sys-fs/jfsutils/files/jfsutils-1.1.15-gcc10.patch
new file mode 100644
index 000000000000..72160e8b4fae
--- /dev/null
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-gcc10.patch
@@ -0,0 +1,71 @@
+Fix building with GCC 10
+
+Origin: https://sources.debian.org/patches/jfsutils/1.1.15-5/gcc10_fix-1.patch/
+
+--- jfsutils-1.1.15.old/fscklog/display.c
++++ jfsutils-1.1.15.new/fscklog/display.c
+@@ -54,7 +54,7 @@
+  * output: fsck extracted service log I/O buffer
+  *
+  */
+-char xchklog_buffer[XCHKLOG_BUFSIZE];
++static char xchklog_buffer[XCHKLOG_BUFSIZE];
+ 
+ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+  *
+--- jfsutils-1.1.15.old/libfs/logredo.c
++++ jfsutils-1.1.15.new/libfs/logredo.c
+@@ -87,9 +87,9 @@
+  *    S T U F F    F O R    T H E    L O G
+  *
+  */
+-struct logsuper logsup;		/* log super block */
+-int32_t numdoblk;		/* number of do blocks used     */
+-int32_t numnodofile;		/* number of nodo file blocks used  */
++static struct logsuper logsup;		/* log super block */
++static int32_t numdoblk;		/* number of do blocks used     */
++static int32_t numnodofile;		/* number of nodo file blocks used  */
+ int32_t numExtDtPg = 0;		/* number of extended dtpage blocks used  */
+ 
+ /*
+@@ -129,7 +129,7 @@
+  */
+ 
+ /* buffer header table */
+-struct bufhdr {
++static struct bufhdr {
+ 	int16_t next;		/* 2: next on free/lru list */
+ 	int16_t prev;		/* 2: previous on free/lru list */
+ 	int16_t hnext;		/* 2: next on hash chain */
+@@ -142,7 +142,7 @@
+ } bufhdr[NBUFPOOL];		/* (24) */
+ 
+ /* buffer table */
+-struct bufpool {
++static struct bufpool {
+ 	char bytes[PSIZE];
+ } buffer[NBUFPOOL - 1];
+ 
+@@ -151,15 +151,16 @@
+  *
+  * log has its own 4 page buffer pool.
+  */
+-uint8_t afterdata[LOGPSIZE * 2];	/* buffer to read in redopage data */
++static uint8_t afterdata[LOGPSIZE * 2];	/* buffer to read in redopage data */
+ 
+ /*
+  * Miscellaneous
+  */
+-caddr_t prog;			/* Program name */
+-int32_t mntcnt, bufsize;
+-char *mntinfo;
+-int32_t retcode;		/* return code from logredo    */
++static caddr_t prog;			/* Program name */
++extern int32_t mntcnt;
++static int32_t bufsize;
++static char *mntinfo;
++static int32_t retcode;		/* return code from logredo    */
+ int end_of_transaction = 0;
+ 
+ /*
+ 
diff --git a/sys-fs/jfsutils/jfsutils-1.1.15.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
index 9d17529ffecb..2a8654317bd8 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.15.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit flag-o-matic eutils
+inherit autotools flag-o-matic
 
 DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
 HOMEPAGE="http://jfs.sourceforge.net/"
@@ -14,11 +14,27 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 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
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-linux-headers.patch #448844
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580056
+	default
+
+	eautoreconf
 }
 
 src_configure() {
@@ -33,6 +49,6 @@ src_install() {
 	default
 
 	rm -f "${ED}"/sbin/{mkfs,fsck}.jfs || die
-	dosym /sbin/jfs_mkfs /sbin/mkfs.jfs
-	dosym /sbin/jfs_fsck /sbin/fsck.jfs
+	dosym jfs_mkfs /sbin/mkfs.jfs
+	dosym jfs_fsck /sbin/fsck.jfs
 }
diff --git a/sys-fs/jfsutils/metadata.xml b/sys-fs/jfsutils/metadata.xml
index 048c190bdfca..23eb0811376e 100644
--- a/sys-fs/jfsutils/metadata.xml
+++ b/sys-fs/jfsutils/metadata.xml
@@ -6,7 +6,12 @@
 		<name>Lars Wendler</name>
 	</maintainer>
 	<longdescription>
-		Utilities for working with IBM's journaled file system
+		The jfsutils package contains administration and debugging
+		tools for IBM's journaled file system.
+
+		IBM's journaled file system technology, currently used in IBM enterprise servers,
+		is designed for high-throughput server environments, key to running intranet and
+		other high-performance e-business file servers.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">jfs</remote-id>