summaryrefslogtreecommitdiff
path: root/source/a/e2fsprogs
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/a/e2fsprogs
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/e2fsprogs')
-rw-r--r--source/a/e2fsprogs/e2fsprogs-1.43.1.tar.signbin287 -> 0 bytes
-rw-r--r--source/a/e2fsprogs/e2fsprogs-1.44.2.tar.signbin0 -> 310 bytes
-rwxr-xr-xsource/a/e2fsprogs/e2fsprogs.SlackBuild22
-rw-r--r--source/a/e2fsprogs/e2fsprogs.no.64bit.by.default.diff15
-rw-r--r--source/a/e2fsprogs/slack-desc6
5 files changed, 26 insertions, 17 deletions
diff --git a/source/a/e2fsprogs/e2fsprogs-1.43.1.tar.sign b/source/a/e2fsprogs/e2fsprogs-1.43.1.tar.sign
deleted file mode 100644
index 362b4274..00000000
--- a/source/a/e2fsprogs/e2fsprogs-1.43.1.tar.sign
+++ /dev/null
Binary files differ
diff --git a/source/a/e2fsprogs/e2fsprogs-1.44.2.tar.sign b/source/a/e2fsprogs/e2fsprogs-1.44.2.tar.sign
new file mode 100644
index 00000000..5fda26e6
--- /dev/null
+++ b/source/a/e2fsprogs/e2fsprogs-1.44.2.tar.sign
Binary files differ
diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild
index d96c7193..78f6b385 100755
--- a/source/a/e2fsprogs/e2fsprogs.SlackBuild
+++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2008, 2009, 2010, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,10 @@
# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port.
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=e2fsprogs
-VERSION=${VERSION:-$(echo e2fsprogs*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
+VERSION=${VERSION:-$(echo e2fsprogs*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -41,6 +42,14 @@ 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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
@@ -63,7 +72,6 @@ case "$ARCH" in
*) TARGET=$ARCH-slackware-linux ;;
esac
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-e2fsprogs
@@ -71,7 +79,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf e2fsprogs-$VERSION
-tar xvf $CWD/e2fsprogs-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/e2fsprogs-$VERSION.tar.?z || exit 1
cd e2fsprogs-$VERSION || exit 1
chown -R root:root .
find . \
@@ -100,7 +108,7 @@ CFLAGS="$SLKCFLAGS" \
--disable-libblkid \
--disable-libuuid \
--disable-uuidd \
- --build=$TARGET
+ --build=$TARGET || exit 1
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
@@ -147,7 +155,7 @@ fi
ln -sf mke2fs mkfs.ext4dev
ln -sf tune2fs e2label
cat << EOF > fsck.ext2
-#!/bin/sh
+#!/bin/bash
exec /sbin/e2fsck -C 0 \$*
EOF
chmod 0755 fsck.ext2
diff --git a/source/a/e2fsprogs/e2fsprogs.no.64bit.by.default.diff b/source/a/e2fsprogs/e2fsprogs.no.64bit.by.default.diff
index b866f0cc..0b27c5f0 100644
--- a/source/a/e2fsprogs/e2fsprogs.no.64bit.by.default.diff
+++ b/source/a/e2fsprogs/e2fsprogs.no.64bit.by.default.diff
@@ -1,12 +1,13 @@
---- ./misc/mke2fs.conf.in.orig 2016-05-17 00:32:58.000000000 -0500
-+++ ./misc/mke2fs.conf.in 2016-05-24 19:04:24.956000477 -0500
-@@ -11,7 +11,8 @@
+--- ./misc/mke2fs.conf.in.orig 2018-03-10 13:13:00.833182754 -0600
++++ ./misc/mke2fs.conf.in 2018-03-10 13:14:47.333192710 -0600
+@@ -11,8 +11,9 @@
features = has_journal
}
ext4 = {
-- features = has_journal,extent,huge_file,flex_bg,64bit,dir_nlink,extra_isize
-+ features = has_journal,extent,huge_file,flex_bg,dir_nlink,extra_isize
-+ auto_64-bit_support = 1
+- features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
++ features = has_journal,extent,huge_file,flex_bg,metadata_csum,dir_nlink,extra_isize
inode_size = 256
++ auto_64-bit_support = 1
}
- ext4dev = {
+ small = {
+ blocksize = 1024
diff --git a/source/a/e2fsprogs/slack-desc b/source/a/e2fsprogs/slack-desc
index 5a41b153..e8d0d91e 100644
--- a/source/a/e2fsprogs/slack-desc
+++ b/source/a/e2fsprogs/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|