Browse Source
system/reiser4progs: Updated for version 1.2.2.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
pull/186/head
Pierre-Philipp Braun
4 years ago
committed by
Willy Sudiarto Raharjo
No known key found for this signature in database
GPG Key ID: 3F617144D7238786
3 changed files with
6 additions and
44 deletions
-
system/reiser4progs/fix_libreiser4_linking.diff
-
system/reiser4progs/reiser4progs.SlackBuild
-
system/reiser4progs/reiser4progs.info
|
|
|
@ -1,31 +0,0 @@ |
|
|
|
diff -Naur reiser4progs-1.1.0/libreiser4/profile.c reiser4progs-1.1.0.patched/libreiser4/profile.c
|
|
|
|
--- reiser4progs-1.1.0/libreiser4/profile.c 2015-08-23 13:13:59.000000000 -0400
|
|
|
|
+++ reiser4progs-1.1.0.patched/libreiser4/profile.c 2017-02-14 16:48:03.318110246 -0500
|
|
|
|
@@ -5,7 +5,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
#include <reiser4/libreiser4.h> |
|
|
|
-#include <misc/misc.h>
|
|
|
|
+#include <stdlib.h>
|
|
|
|
+#include <errno.h>
|
|
|
|
|
|
|
|
/* All default plugin ids. This is used for getting plugin id if it cannot be |
|
|
|
obtained by usual way (get from disk structures, etc.). All these may be |
|
|
|
@@ -332,6 +333,7 @@
|
|
|
|
reiser4_plug_t *plug; |
|
|
|
long long int val; |
|
|
|
uint8_t i; |
|
|
|
+ char *error;
|
|
|
|
|
|
|
|
aal_assert("umka-924", slot != NULL); |
|
|
|
aal_assert("umka-923", name != NULL); |
|
|
|
@@ -354,7 +356,8 @@
|
|
|
|
} |
|
|
|
|
|
|
|
if (defprof.pid[i].id.type == PARAM_PLUG_TYPE) { |
|
|
|
- if ((val = misc_str2long((char *)name, 10)) == INVAL_DIG) {
|
|
|
|
+ val = strtol((char *)name, &error, 10);
|
|
|
|
+ if (errno == ERANGE || *error) {
|
|
|
|
aal_error("Invalid value \"%s\" is provided for the " |
|
|
|
"profile slot \"%s\".", (char *)name, |
|
|
|
defprof.pid[i].name); |
|
|
|
@ -5,8 +5,8 @@ |
|
|
|
cd $(dirname $0) ; CWD=$(pwd) |
|
|
|
|
|
|
|
PRGNAM=reiser4progs |
|
|
|
VERSION=${VERSION:-1.2.1} |
|
|
|
BUILD=${BUILD:-2} |
|
|
|
VERSION=${VERSION:-1.2.2} |
|
|
|
BUILD=${BUILD:-1} |
|
|
|
TAG=${TAG:-_SBo} |
|
|
|
PKGTYPE=${PKGTYPE:-tgz} |
|
|
|
|
|
|
|
@ -60,12 +60,6 @@ find -L . \ |
|
|
|
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ |
|
|
|
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; |
|
|
|
|
|
|
|
# 20170214 bkw: Fix unresolved symbol errors when trying to link with |
|
|
|
# -lreiser4. This doesn't affect reiser4progs itself, but allows other |
|
|
|
# programs (in particular, partclone) to link with its library. Patched |
|
|
|
# code originally came from the partclone maintainer. |
|
|
|
patch -p1 < $CWD/fix_libreiser4_linking.diff |
|
|
|
|
|
|
|
CFLAGS="$SLKCFLAGS" \ |
|
|
|
CXXFLAGS="$SLKCFLAGS" \ |
|
|
|
./configure \ |
|
|
|
@ -75,7 +69,6 @@ CXXFLAGS="$SLKCFLAGS" \ |
|
|
|
--localstatedir=/var \ |
|
|
|
--mandir=/usr/man \ |
|
|
|
--docdir=/usr/doc/$PRGNAM-$VERSION \ |
|
|
|
--enable-libminimal \ |
|
|
|
--build=$ARCH-slackware-linux |
|
|
|
|
|
|
|
make |
|
|
|
|
|
|
|
@ -1,8 +1,8 @@ |
|
|
|
PRGNAM="reiser4progs" |
|
|
|
VERSION="1.2.1" |
|
|
|
HOMEPAGE="https://sourceforge.net/projects/reiser4/" |
|
|
|
DOWNLOAD="https://sourceforge.net/projects/reiser4/files/reiser4-utils/reiser4progs/reiser4progs-1.2.1.tar.gz" |
|
|
|
MD5SUM="5c3af8644a4ab291fd59ccff6539a1ed" |
|
|
|
VERSION="1.2.2" |
|
|
|
HOMEPAGE="https://sourceforge.net/projects/reiser4/files/reiser4-utils/reiser4progs/" |
|
|
|
DOWNLOAD="https://sourceforge.net/projects/reiser4/files/reiser4-utils/reiser4progs/reiser4progs-1.2.2.tar.gz" |
|
|
|
MD5SUM="339a52a45688dbc128aaf30b9dc6c15d" |
|
|
|
DOWNLOAD_x86_64="" |
|
|
|
MD5SUM_x86_64="" |
|
|
|
REQUIRES="libaal" |
|
|
|
|
