diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-11-26 20:04:41 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-11-27 08:59:50 +0100 |
commit | dcb09037c6d84f27932186ec03741d52d60862e5 (patch) | |
tree | ee505e48b8533b49d70ee59d68efc3335ec3c0e1 /source/ap/xfsdump/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch | |
parent | 9b6fab2c3603408615a3a733985c7a7002cebfa1 (diff) | |
download | current-dcb09037c6d84f27932186ec03741d52d60862e5.tar.gz |
Tue Nov 26 20:04:41 UTC 201920191126200441
ap/xfsdump-3.1.8-x86_64-4.txz: Rebuilt.
Patched for new xfsprogs-5.3.0 API. Thanks to nobodino.
d/cmake-3.16.0-x86_64-1.txz: Upgraded.
n/gnupg2-2.2.18-x86_64-1.txz: Upgraded.
gpg: Prepare against chosen-prefix SHA-1 collisions in key signatures.
This change removes all SHA-1 based key signature newer than 2019-01-19
from the web-of-trust. Note that this includes all key signatures
created with dsa1024 keys. The new option --allow-weak-key-signatures
can be used to override the new and safer behaviour.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-14855
(* Security fix *)
n/iproute2-5.4.0-x86_64-1.txz: Upgraded.
x/libepoxy-1.5.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap/xfsdump/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch')
-rw-r--r-- | source/ap/xfsdump/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/source/ap/xfsdump/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch b/source/ap/xfsdump/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch new file mode 100644 index 00000000..750433be --- /dev/null +++ b/source/ap/xfsdump/0004-xfsdump.xfsprogs-5.3.0.xfs_inogrp_t.patch @@ -0,0 +1,81 @@ +--- ./dump/inomap.c.orig 2019-11-26 13:32:54.382758726 -0600 ++++ ./dump/inomap.c 2019-11-26 13:34:21.686751502 -0600 +@@ -79,8 +79,8 @@ + bool_t, + bool_t *); + static void cb_context_free( void ); +-static int cb_count_inogrp( void *, int, xfs_inogrp_t *); +-static int cb_add_inogrp( void *, int, xfs_inogrp_t * ); ++static int cb_count_inogrp( void *, int, struct xfs_inogrp *); ++static int cb_add_inogrp( void *, int, struct xfs_inogrp * ); + static int cb_add( void *, jdm_fshandle_t *, int, struct xfs_bstat * ); + static bool_t cb_inoinresumerange( xfs_ino_t ); + static bool_t cb_inoresumed( xfs_ino_t ); +@@ -488,7 +488,7 @@ + } + + static int +-cb_count_inogrp( void *arg1, int fsfd, xfs_inogrp_t *inogrp ) ++cb_count_inogrp( void *arg1, int fsfd, struct xfs_inogrp *inogrp ) + { + int *count = (int *)arg1; + (*count)++; +@@ -1116,7 +1116,7 @@ + * order. adds a new segment to the inomap and ino-to-gen map. + */ + static int +-cb_add_inogrp( void *arg1, int fsfd, xfs_inogrp_t *inogrp ) ++cb_add_inogrp( void *arg1, int fsfd, struct xfs_inogrp *inogrp ) + { + hnk_t *hunk; + seg_t *segp; +--- ./common/util.h.orig 2019-11-26 13:32:54.397758725 -0600 ++++ ./common/util.h 2019-11-26 13:34:21.685751502 -0600 +@@ -112,7 +112,7 @@ + extern int inogrp_iter( int fsfd, + int ( * fp )( void *arg1, + int fsfd, +- xfs_inogrp_t *inogrp ), ++ struct xfs_inogrp *inogrp ), + void * arg1, + int *statp ); + +--- ./common/util.c.orig 2019-11-26 13:32:54.415758723 -0600 ++++ ./common/util.c 2019-11-26 13:34:21.685751502 -0600 +@@ -274,23 +274,23 @@ + inogrp_iter( int fsfd, + int ( * fp )( void *arg1, + int fsfd, +- xfs_inogrp_t *inogrp ), ++ struct xfs_inogrp *inogrp ), + void * arg1, + int *statp ) + { + xfs_ino_t lastino; + int inogrpcnt; +- xfs_inogrp_t *igrp; ++ struct xfs_inogrp *igrp; + xfs_fsop_bulkreq_t bulkreq; + + /* stat set with return from callback func */ + *statp = 0; + +- igrp = malloc(INOGRPLEN * sizeof(xfs_inogrp_t)); ++ igrp = malloc(INOGRPLEN * sizeof(struct xfs_inogrp)); + if (!igrp) { + mlog(MLOG_NORMAL | MLOG_ERROR, + _("malloc of stream context failed (%d bytes): %s\n"), +- INOGRPLEN * sizeof(xfs_inogrp_t), ++ INOGRPLEN * sizeof(struct xfs_inogrp), + strerror(errno)); + return -1; + } +@@ -302,7 +302,7 @@ + bulkreq.ubuffer = igrp; + bulkreq.ocount = &inogrpcnt; + while (!ioctl(fsfd, XFS_IOC_FSINUMBERS, &bulkreq)) { +- xfs_inogrp_t *p, *endp; ++ struct xfs_inogrp *p, *endp; + + if ( inogrpcnt == 0 ) { + free(igrp); |