diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/cryptsetup/APKBUILD | 14 | ||||
| -rw-r--r-- | main/cryptsetup/strerror_r.patch | 23 |
2 files changed, 5 insertions, 32 deletions
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD index 03b276bc99..a8c6a721e5 100644 --- a/main/cryptsetup/APKBUILD +++ b/main/cryptsetup/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=cryptsetup -pkgver=1.6.6 -pkgrel=4 +pkgver=1.6.7 +pkgrel=0 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" url="http://code.google.com/p/cryptsetup/" arch="all" @@ -11,7 +11,6 @@ makedepends="lvm2-dev openssl-dev popt-dev util-linux-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" source="https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/cryptsetup-$pkgver.tar.gz flush-stdout.patch - strerror_r.patch dmcrypt.confd dmcrypt.initd " @@ -60,18 +59,15 @@ libs() { mv "$pkgdir"/lib "$subpkgdir"/ } -md5sums="24790bd4f4fa24570d7ea9af27ccf079 cryptsetup-1.6.6.tar.gz +md5sums="1b1856113b9711385e47f07d9cbb9e1d cryptsetup-1.6.7.tar.gz 7d5c8727ea417cabe86df67a9de1de16 flush-stdout.patch -b52c14f089d3256b481d202d0d0844bf strerror_r.patch 1369aeaed84e41c8d585695596a24bd6 dmcrypt.confd 1cd8aea7f04bb9bc2c781b243e40d6b3 dmcrypt.initd" -sha256sums="38ccd1ceff41760ccfbaaa5394ebb6117d69bd0ea2e00bf07c0d1353c41be6ac cryptsetup-1.6.6.tar.gz +sha256sums="22744badd2319c241726f916979121b436ed6755dcd0e1f5394b1787def85e57 cryptsetup-1.6.7.tar.gz 6ac335bb14ff2f90de00769be20da4c5527101fab6593259a4d87be84904ae67 flush-stdout.patch -f95844d176b46c85dbe66bb7d929cfbc9f220bd41bc84b2a9047ad6e1dfdb559 strerror_r.patch 0c30e081c0b8f879964ae49735f10b05a1d92f4f481042851958860945e13271 dmcrypt.confd 0cc0a0e846d737c226877ccb3378af075f4b1bc40110333f577d84549306ac2e dmcrypt.initd" -sha512sums="ce8ea9402f0eb9f3ab920df51837492802dd35394422ef4643a0eb82e6aad67cf72ac428b7caf622539af188f9fe5ba530f06b522f65ed55b0133c5c67ab2723 cryptsetup-1.6.6.tar.gz +sha512sums="82007a00a371cefee190b2a0ff1e555de5c8a12df7cdc621a0812d167331cf43d3a06c2f501e236275ab9b8a07dbd79c08122b46f22fc0a75cf4305cf0447477 cryptsetup-1.6.7.tar.gz 301e3e3da5a899e0a6f01f44fbf37bb6a3f5b6a4fb41243bae6d3b7aea747276e784626cd1b19721cc264652c10ae8c560c4d20094e33bb82fb2fae0160682c0 flush-stdout.patch -c522c28b010d44fc8f14a8e997fd411505214c54b2c7070ed646e7ac0960dbfd0bbf450c9554361d8bdb45197812874ef14cb8508e00cf83601b05fc5bc2cd47 strerror_r.patch d04ae17d3708ef20ade7afb223d4ef19e1b6812e0be8f9499e37e9c71344568b42030d9dd8f6918a9bfb211a3a94b40a9354e3b32a009cb165e84508d0a5e14b dmcrypt.confd e321ed6b2f5606325928a493930bd2ac9212cfef9565fa01491be33896fa3f27e8e9e828ace1cbfabef997bdcfe2635e283dd2697a1e926dd524360bb7f53ac0 dmcrypt.initd" diff --git a/main/cryptsetup/strerror_r.patch b/main/cryptsetup/strerror_r.patch deleted file mode 100644 index 6dde3d514a..0000000000 --- a/main/cryptsetup/strerror_r.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/utils_tools.c b/src/utils_tools.c -index 4e8b0b4..1b4f3e5 100644 ---- a/src/utils_tools.c -+++ b/src/utils_tools.c -@@ -176,11 +176,18 @@ void show_status(int errcode) - crypt_get_error(error, sizeof(error)); - - if (!error[0]) { -+#if defined(__GLIBC__) -+ /* GNU libc strerror_r is non-portable. */ - error_ = strerror_r(-errcode, error, sizeof(error)); - if (error_ != error) { - strncpy(error, error_, sizeof(error)); - error[sizeof(error) - 1] = '\0'; - } -+#else -+ /* POSIX variant */ -+ if (strerror_r(-errcode, error, sizeof(error)) != 0) -+ error[0] = '\0'; -+#endif - } - - log_err(_("Command failed with code %i"), -errcode); |