summaryrefslogtreecommitdiff
path: root/source/a/reiserfsprogs
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/reiserfsprogs')
-rwxr-xr-xsource/a/reiserfsprogs/reiserfsprogs.SlackBuild5
-rw-r--r--source/a/reiserfsprogs/reiserfsprogs.glibc228.diff24
2 files changed, 28 insertions, 1 deletions
diff --git a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild
index 1b88550a..d5e2a93f 100755
--- a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild
+++ b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild
@@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-reiserfsprogs
@@ -67,6 +67,9 @@ cd $TMP
rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
cd $PKGNAM-$VERSION || exit 1
+
+zcat $CWD/reiserfsprogs.glibc228.diff.gz | patch -p1 --backup --suffix=.orig || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/a/reiserfsprogs/reiserfsprogs.glibc228.diff b/source/a/reiserfsprogs/reiserfsprogs.glibc228.diff
new file mode 100644
index 00000000..2c611931
--- /dev/null
+++ b/source/a/reiserfsprogs/reiserfsprogs.glibc228.diff
@@ -0,0 +1,24 @@
+--- ./include/misc.h.orig 2017-07-24 20:34:11.000000000 -0500
++++ ./include/misc.h 2018-09-18 19:00:40.783069613 -0500
+@@ -73,7 +73,7 @@
+ int get_dma_info(dma_info_t *dma_info);
+ void clean_after_dma_check(int fd, dma_info_t *dma_info);
+
+-int valid_offset(int fd, loff_t offset);
++int valid_offset(int fd, off_t offset);
+ unsigned long count_blocks(const char *filename, int blocksize);
+
+ void print_how_far(FILE * fp, unsigned long *passed, unsigned long total,
+--- ./include/reiserfs_lib.h.orig 2016-06-07 09:22:56.000000000 -0500
++++ ./include/reiserfs_lib.h 2018-09-18 19:00:40.786069613 -0500
+@@ -297,8 +297,8 @@
+ char *key_of_what(const struct reiserfs_key *key);
+ int type_unknown(const struct reiserfs_key *key);
+ void set_type(int format, struct reiserfs_key *key, int type);
+-void set_offset(int format, struct reiserfs_key *key, loff_t offset);
+-void set_type_and_offset(int format, struct reiserfs_key *key, loff_t offset,
++void set_offset(int format, struct reiserfs_key *key, off_t offset);
++void set_type_and_offset(int format, struct reiserfs_key *key, off_t offset,
+ int type);
+
+ typedef int (*check_unfm_func_t) (reiserfs_filsys_t , __u32);