aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-02-10 13:22:47 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-12 13:32:48 +0700
commitd25f4ebbd13e19005a42736fcade3bb723504f5f (patch)
treec468f1d137ccb0d72fb92a63df832aaa4c768e6b
parentb1a648a11a6fdd7f1ed91c639220e8d7f11e8255 (diff)
system/ocfs2-tools: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/ocfs2-tools/ocfs2-tools.SlackBuild14
-rw-r--r--system/ocfs2-tools/ocfs2-tools.info6
2 files changed, 10 insertions, 10 deletions
diff --git a/system/ocfs2-tools/ocfs2-tools.SlackBuild b/system/ocfs2-tools/ocfs2-tools.SlackBuild
index 2b216792bb776..5a7168f481f94 100644
--- a/system/ocfs2-tools/ocfs2-tools.SlackBuild
+++ b/system/ocfs2-tools/ocfs2-tools.SlackBuild
@@ -22,10 +22,13 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220210 bkw: Modified by SlackBuilds.org: use correct github download URL,
+# and update for v1.8.7 as the old version doesn't support 15.0's kernel.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=ocfs2-tools
-VERSION=${VERSION:-1.8.5}
+VERSION=${VERSION:-1.8.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +41,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -77,14 +77,14 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-{$VERSION,$PRGNAM-$VERSION}
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION || cd $PRGNAM-$PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/system/ocfs2-tools/ocfs2-tools.info b/system/ocfs2-tools/ocfs2-tools.info
index fc59cc59a6497..e5907d2d28ed6 100644
--- a/system/ocfs2-tools/ocfs2-tools.info
+++ b/system/ocfs2-tools/ocfs2-tools.info
@@ -1,8 +1,8 @@
PRGNAM="ocfs2-tools"
-VERSION="1.8.5"
+VERSION="1.8.7"
HOMEPAGE="https://github.com/markfasheh/ocfs2-tools/"
-DOWNLOAD="https://github.com/markfasheh/ocfs2-tools/archive/ocfs2-tools-1.8.5.tar.gz"
-MD5SUM="d6d76da6006e28272a223065a7802798"
+DOWNLOAD="https://github.com/markfasheh/ocfs2-tools/archive/ocfs2-tools-1.8.7/ocfs2-tools-ocfs2-tools-1.8.7.tar.gz"
+MD5SUM="c4a155e7f844d38d3d08438eb9997d7f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""