summaryrefslogtreecommitdiffstats
path: root/source/ap
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-09-15 21:15:56 +0000
committer Eric Hameleers <alien@slackware.com>2019-09-16 08:59:36 +0200
commit975ec5de232ae505fc2082132eeeffbde12f93b7 (patch)
treea15951e93027808b5b0c7251f58c40cbffb77292 /source/ap
parent054dcd3d5a3815a8088a3f92dd548f909ed23f40 (diff)
downloadcurrent-975ec5de232ae505fc2082132eeeffbde12f93b7.tar.gz
current-975ec5de232ae505fc2082132eeeffbde12f93b7.tar.xz
Sun Sep 15 21:15:56 UTC 201920190915211556
a/procps-ng-3.3.15-x86_64-3.txz: Rebuilt. Upgraded to psmisc-23.2. ap/xfsdump-3.1.8-x86_64-3.txz: Rebuilt. Rebuilt against xfsprogs-5.2.1. Thanks to nobodino. l/sip-4.19.19-x86_64-1.txz: Upgraded. n/ModemManager-1.10.6-x86_64-1.txz: Upgraded. n/dhcpcd-8.0.6-x86_64-1.txz: Upgraded. x/libXfont2-2.0.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/ap')
-rwxr-xr-xsource/ap/xfsdump/xfsdump.SlackBuild5
-rw-r--r--source/ap/xfsdump/xfsdump.xfsprogs-5.2.1.diff11
2 files changed, 15 insertions, 1 deletions
diff --git a/source/ap/xfsdump/xfsdump.SlackBuild b/source/ap/xfsdump/xfsdump.SlackBuild
index e633688a3..f498d1fb8 100755
--- a/source/ap/xfsdump/xfsdump.SlackBuild
+++ b/source/ap/xfsdump/xfsdump.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xfsdump
VERSION=${VERSION:-$(echo xfsdump-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -68,6 +68,9 @@ find . \
# developers did... ;-)
#autoreconf -vif
+# Fix build against xfsprogs-5.2.1:
+zcat $CWD/xfsdump.xfsprogs-5.2.1.diff.gz | patch -p1 --verbose || exit 1
+
./configure \
--prefix=/usr \
--sbindir=/usr/sbin \
diff --git a/source/ap/xfsdump/xfsdump.xfsprogs-5.2.1.diff b/source/ap/xfsdump/xfsdump.xfsprogs-5.2.1.diff
new file mode 100644
index 000000000..d12be1b36
--- /dev/null
+++ b/source/ap/xfsdump/xfsdump.xfsprogs-5.2.1.diff
@@ -0,0 +1,11 @@
+--- ./common/fs.c.orig 2015-11-10 13:40:23.000000000 -0600
++++ ./common/fs.c 2019-09-15 15:30:26.633808720 -0500
+@@ -204,7 +204,7 @@
+ int
+ fs_getid( char *mnts, uuid_t *idb )
+ {
+- xfs_fsop_geom_v1_t geo;
++ struct xfs_fsop_geom_v1 geo;
+ int fd;
+
+ fd = open( mnts, O_RDONLY );