Bump
This commit is contained in:
Mario Fetka
@@ -1,6 +1,10 @@
|
||||
AUX jfsutils-1.1.12-libjfs.patch 2776 SHA256 4aa6726db09692e54c2d214f333dc8554b98531fb764825b0bde4a6ad103cf5b SHA512 0377319e16f8ed4100abfb69dfba152114cb92640d53f5f8e985fbb048a5fee36c6f69575af8f1f32eb8e859da2a7337f0db5b0f3af11073c3889c67178049cd WHIRLPOOL dbba78a64475f45502eeccaa0111b0ac500f64e12c5607c974c84d1ce64a94f32b73e8c486ec60fb6bd4f6528c99404c4cc13fbb1f9f773bbaf917e199ffb4f0
|
||||
AUX jfsutils-1.1.15-linux-headers.patch 386 SHA256 561c10a49be14a69698b07a12bca3cb5b6ac4af3893b2ea47cee7a01b532c2e0 SHA512 da36f4fe9d9faef5fd1ca5a863dd67c0beb539fcb819b56273c9a8ee0dc428b3278b86ef430a1c9b4ee64dfedeba05d877ad8db9d5d59f1cc4b2ecd1a2c03346 WHIRLPOOL 45f19f273f0134ca06c91bb49694c831047a1a3bcac5a39e8dae059823c4783f7f290db3f65586de6232376a5106ad083f499e154518ede7ff7435556531a052
|
||||
DIST jfsutils-1.1.15.tar.gz 539148 SHA256 244a15f64015ce3ea17e49bdf6e1a0fb4f9af92b82fa9e05aa64cb30b5f07a4d SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858 WHIRLPOOL 8a62c037601999f616041250e06adc10fceb48fc80b319003383ac08b2e1fbb2aaaca781848be2845d6e99f05d1d7a884f9af89e2a6236d64cc4387be02222e8
|
||||
EBUILD jfsutils-1.1.15.ebuild 1083 SHA256 92f4ccb0ea94c48d91157ea173b42255a8f4166e00d704dfced256ba8b6bdd81 SHA512 1f4467f55aff51917de9b5d0daf8b7f1df894407b0f362b71aced462b350279c871bf501e8e284c99d2d8a8b686c0ef8af7c75e426dd8eeb1510770dadf8304d WHIRLPOOL cc9993af510140b7a51afa53954e4c1cf83154b446f21d708ad6b6aba3eda45f8acef7a7ff4ef0a0aabab881c26707a07efbd125183c63025160a02575deb5c7
|
||||
MISC ChangeLog 12020 SHA256 876891c9b690a4a8875897f8b19b6a68ea7689bedad01cc58b1d9eb5697919d3 SHA512 f13f78c64d91bf4cc545a5f2f02d3daa2031af78740c1b2c91a964cf46447298d30e02b936f7a461ed59095286b81f1db7d97772432fab77cde0409e91ade3b4 WHIRLPOOL 50eb21e705d3b9066fecf584faa11e38c13ced6591af07509ac7f20229ffe0db3f2bfda8e200246586d225b009e64a5f2aeccce2c5e5637699f34e168842e279
|
||||
MISC metadata.xml 262 SHA256 adf3f9badc5b8533930b52fb0547fd1b6d4218c0412771c1041c6c27adb05ab4 SHA512 055d4a2fc3cd08c3f98c261d4f2ecfec1014d2b719e87c9a0a780fe6b34c8961c28d2ed60ef1e4c6c9df7e84696fcd1fb2b72347d666f66e475db518e6c962f0 WHIRLPOOL 858ffb591081ef929cb4997b724bac740564ef5866d86d5a8b93e773b68c461c23a4c7d1c7baef230c0f1ad1ac9cdc2a52627d115298a7b2198d6bffd0e32bde
|
||||
AUX jfsutils-1.1.12-libjfs.patch 2776 BLAKE2B 34d5422f2cafe9c396f0dfcdbe008289933412ed1642ec5eb3fb2b1e2746b8374997ef46dcaa722c686f854e67b6fad4cc0d327cb7e54c9dd83ddb8a85634145 SHA512 0377319e16f8ed4100abfb69dfba152114cb92640d53f5f8e985fbb048a5fee36c6f69575af8f1f32eb8e859da2a7337f0db5b0f3af11073c3889c67178049cd
|
||||
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-r1.ebuild 1270 BLAKE2B fd9664939207cb63db891bb71b8c468bc376a5e8b4976dd9220224f4512616651174bd36daab43f08e50e55a74ab1a60315b7ee924d6dc8b0352385f99bbe245 SHA512 bc7dc8ce7922f930f0bd83d480d4ed08716ffbbe69d40278da25c8d38820775d37fdc5ab452c2faa27b15c9986b6264e1806f8e1635025764f317a7ce6a03ec6
|
||||
MISC ChangeLog 12020 BLAKE2B bbd821c52cff6d99a2a7114f55a4adcc2a5ed18b9b670b3668eee710a10004853197f97a2f790380f53f912da79b87746c5dff829f58d355a3b3ada94546c8ec SHA512 f13f78c64d91bf4cc545a5f2f02d3daa2031af78740c1b2c91a964cf46447298d30e02b936f7a461ed59095286b81f1db7d97772432fab77cde0409e91ade3b4
|
||||
MISC metadata.xml 684 BLAKE2B 71d427e0a1162565c4f80686a6aa79773ca773159b457e1301d294f0c6ab0ee45d540df797c0ce98309d21a444f488a0d94353a8a66881801ab108799ab0c42c SHA512 bb82a7efa250c1c2d328b54b8bd0548a6ecad5e3e448dba9bdc3a22ebd10e34578417cb1acf3909feddcc445bb3bf73d14b6af2fec7648aae4f6edf23e485543
|
||||
|
||||
10
sys-fs/jfsutils/files/jfsutils-1.1.15-check-for-ar.patch
Normal file
10
sys-fs/jfsutils/files/jfsutils-1.1.15-check-for-ar.patch
Normal file
@@ -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
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
71
sys-fs/jfsutils/files/jfsutils-1.1.15-gcc10.patch
Normal file
71
sys-fs/jfsutils/files/jfsutils-1.1.15-gcc10.patch
Normal file
@@ -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;
|
||||
|
||||
/*
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
Index: jfsutils-1.1.15/libfs/devices.h
|
||||
===================================================================
|
||||
--- jfsutils-1.1.15.orig/libfs/devices.h
|
||||
+++ jfsutils-1.1.15/libfs/devices.h
|
||||
https://sourceforge.net/p/jfs/bugs/286/
|
||||
https://bugs.gentoo.org/448844
|
||||
|
||||
--- a/libfs/devices.h
|
||||
+++ b/libfs/devices.h
|
||||
@@ -42,6 +42,7 @@
|
||||
|
||||
struct stat;
|
||||
|
||||
15
sys-fs/jfsutils/files/jfsutils-1.1.15-sysmacros.patch
Normal file
15
sys-fs/jfsutils/files/jfsutils-1.1.15-sysmacros.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
https://bugs.gentoo.org/580056
|
||||
|
||||
--- a/libfs/devices.c
|
||||
+++ b/libfs/devices.c
|
||||
@@ -30,6 +30,10 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
+#if HAVE_SYS_SYSMACROS_H
|
||||
+#include <sys/sysmacros.h>
|
||||
+#endif
|
||||
+
|
||||
#ifdef HAVE_SYS_MOUNT_H
|
||||
#ifdef HAVE_SYS_PARAM_H
|
||||
#include <sys/param.h>
|
||||
55
sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
Normal file
55
sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
Normal file
@@ -0,0 +1,55 @@
|
||||
# Copyright 1999-2021 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 ~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
|
||||
"${FILESDIR}"/jfsutils-1.1.12-libjfs.patch
|
||||
)
|
||||
|
||||
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
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/jfsutils/jfsutils-1.1.15.ebuild,v 1.8 2013/02/21 10:28:53 scarabeus Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit flag-o-matic eutils autotools
|
||||
|
||||
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 hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86"
|
||||
IUSE="static"
|
||||
|
||||
DEPEND="virtual/libc"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README )
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${P}-linux-headers.patch"
|
||||
epatch "${FILESDIR}/jfsutils-1.1.12-libjfs.patch"
|
||||
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 /sbin/jfs_mkfs /sbin/mkfs.jfs
|
||||
dosym /sbin/jfs_fsck /sbin/fsck.jfs
|
||||
}
|
||||
@@ -1,9 +1,19 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>kernel-misc</herd>
|
||||
<maintainer type="person">
|
||||
<email>polynomial-c@gentoo.org</email>
|
||||
<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>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
Reference in New Issue
Block a user