summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-03-08 00:37:46 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-03-08 00:37:46 +0000
commit1164edd5d94f0373423f6e56e9e7579a21f34aab (patch)
tree50a4f2de39cd9b0fdfa620b2a5026543ceaae502 /system
parentc16460e0f1b53bd1c277d866f2dfea00eba5f47a (diff)
downloadpackages-1164edd5d94f0373423f6e56e9e7579a21f34aab.tar.gz
packages-1164edd5d94f0373423f6e56e9e7579a21f34aab.tar.bz2
packages-1164edd5d94f0373423f6e56e9e7579a21f34aab.tar.xz
packages-1164edd5d94f0373423f6e56e9e7579a21f34aab.zip
system/cryptsetup: bump to 2.1.0, drop unnecessary patch, modernise
Diffstat (limited to 'system')
-rw-r--r--system/cryptsetup/APKBUILD11
-rw-r--r--system/cryptsetup/flush-stdout.patch17
2 files changed, 2 insertions, 26 deletions
diff --git a/system/cryptsetup/APKBUILD b/system/cryptsetup/APKBUILD
index d3ba1d2ee..637505c9d 100644
--- a/system/cryptsetup/APKBUILD
+++ b/system/cryptsetup/APKBUILD
@@ -1,12 +1,11 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer:
pkgname=cryptsetup
-pkgver=2.0.6
+pkgver=2.1.0
pkgrel=0
pkgdesc="Setup tool for block device encryption"
url="https://gitlab.com/cryptsetup/cryptsetup"
arch="all"
-options="!checkroot"
license="GPL-2.0+"
depends=""
makedepends_build=""
@@ -16,14 +15,11 @@ makedepends="$makedepends_build $makedepends_host"
checkdepends="device-mapper sharutils cmd:which bash"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs $pkgname-openrc"
source="https://www.kernel.org/pub/linux/utils/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.gz
- flush-stdout.patch
dmcrypt.confd
dmcrypt.initd
"
-builddir="$srcdir"/$pkgname-$pkgver
build() {
- cd "$builddir"
./configure \
--build="$CBUILD" \
--host="$CHOST" \
@@ -37,12 +33,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR=$pkgdir install
mkdir -p "$pkgdir"/usr/lib
@@ -62,7 +56,6 @@ libs() {
mv "$pkgdir"/lib "$subpkgdir"/
}
-sha512sums="9e3458122e34c86d21b9a9c0c648e8e6134d7e2058bc00514137c5136782cea493cf0db5b0c2884fac759c0c2ea185e99d4a223d6f338c1cb3f5281eadd6626e cryptsetup-2.0.6.tar.gz
-301e3e3da5a899e0a6f01f44fbf37bb6a3f5b6a4fb41243bae6d3b7aea747276e784626cd1b19721cc264652c10ae8c560c4d20094e33bb82fb2fae0160682c0 flush-stdout.patch
+sha512sums="c8bfe5aa59acbe8c9f8a859dbe2f10c1f3194d578ada8081c4ede0dda0c991f9ef4fde2d268e322e283fbd35e9470e0631c44439d69693965ecc35bb73986dcb cryptsetup-2.1.0.tar.gz
74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733 dmcrypt.confd
81dad61cdecf1dc529b26eb3cdc15979a582c876b01268f88e7a71c8fae6911137c03bfa63fee64e064e5fb31f673610be27ecab9fc432229f13e7040698bd5c dmcrypt.initd"
diff --git a/system/cryptsetup/flush-stdout.patch b/system/cryptsetup/flush-stdout.patch
deleted file mode 100644
index ae21a235f..000000000
--- a/system/cryptsetup/flush-stdout.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./src/utils_tools.c.orig 2014-10-24 12:58:35.151717616 -0200
-+++ ./src/utils_tools.c 2014-10-24 13:00:42.716855265 -0200
-@@ -105,10 +105,13 @@
-
- case CRYPT_LOG_NORMAL:
- fputs(msg, stdout);
-+ fflush(stdout);
- break;
- case CRYPT_LOG_VERBOSE:
-- if (opt_verbose)
-+ if (opt_verbose) {
- fputs(msg, stdout);
-+ fflush(stdout);
-+ }
- break;
- case CRYPT_LOG_ERROR:
- fputs(msg, stderr);