[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, September 3, 2020 @ 20:28:44 Author: eworm Revision: 395419 upgpkg: cryptsetup 2.3.4-1: new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-09-03 19:46:21 UTC (rev 395418) +++ PKGBUILD2020-09-03 20:28:44 UTC (rev 395419) @@ -2,7 +2,7 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.3.3 +pkgver=2.3.4 pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) @@ -18,7 +18,7 @@ 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df' +sha256sums=('9d16eebb96b53b514778e813019b8dd15fea9fec5aafde9fae5febf59df83773' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' 'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, May 28, 2020 @ 12:12:24 Author: eworm Revision: 387763 upgpkg: cryptsetup 2.3.3-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-05-28 11:57:53 UTC (rev 387762) +++ PKGBUILD2020-05-28 12:12:24 UTC (rev 387763) @@ -2,8 +2,8 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.3.2 -pkgrel=2 +pkgver=2.3.3 +pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL') @@ -18,7 +18,7 @@ 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('a89e13dff0798fd0280e801d5f0cc8cfdb2aa5b1929bec1b7322e13d3eca95fb' +sha256sums=('3bca4ffe39e2f94cef50f6ea65acb873a6dbce5db34fc6bcefe38b6d095e82df' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' 'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Friday, May 8, 2020 @ 05:58:47 Author: eworm Revision: 382761 add soname depends Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-08 05:56:16 UTC (rev 382760) +++ PKGBUILD2020-05-08 05:58:47 UTC (rev 382761) @@ -8,7 +8,8 @@ arch=(x86_64) license=('GPL') url='https://gitlab.com/cryptsetup/cryptsetup/' -depends=('device-mapper' 'openssl' 'popt' 'libutil-linux' 'json-c' 'argon2') +depends=('device-mapper' 'libdevmapper.so' 'openssl' 'popt' 'libutil-linux' + 'libuuid.so' 'json-c' 'libjson-c.so' 'argon2' 'libargon2.so') makedepends=('util-linux') provides=('libcryptsetup.so') options=('!emptydirs')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, May 7, 2020 @ 06:44:33 Author: eworm Revision: 382619 upgpkg: cryptsetup 2.3.2-2 rebuild with soname provides Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-07 06:39:10 UTC (rev 382618) +++ PKGBUILD2020-05-07 06:44:33 UTC (rev 382619) @@ -3,7 +3,7 @@ pkgname=cryptsetup pkgver=2.3.2 -pkgrel=1 +pkgrel=2 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, May 7, 2020 @ 05:36:01 Author: eworm Revision: 382577 add soname provide Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |1 + 1 file changed, 1 insertion(+) Modified: PKGBUILD === --- PKGBUILD2020-05-07 05:33:03 UTC (rev 382576) +++ PKGBUILD2020-05-07 05:36:01 UTC (rev 382577) @@ -10,6 +10,7 @@ url='https://gitlab.com/cryptsetup/cryptsetup/' depends=('device-mapper' 'openssl' 'popt' 'libutil-linux' 'json-c' 'argon2') makedepends=('util-linux') +provides=('libcryptsetup.so') options=('!emptydirs') validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgname}-${pkgver}.tar."{xz,sign}
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD json-c-0.14.patch)
Date: Thursday, April 30, 2020 @ 15:24:25 Author: eworm Revision: 381984 upgpkg: cryptsetup 2.3.2-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD Deleted: cryptsetup/trunk/json-c-0.14.patch ---+ PKGBUILD | 17 - json-c-0.14.patch | 681 2 files changed, 5 insertions(+), 693 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-04-30 14:53:24 UTC (rev 381983) +++ PKGBUILD2020-04-30 15:24:25 UTC (rev 381984) @@ -2,8 +2,8 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.3.1 -pkgrel=3 +pkgver=2.3.2 +pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL') @@ -15,20 +15,13 @@ source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgname}-${pkgver}.tar."{xz,sign} 'hooks-encrypt' 'install-encrypt' -'install-sd-encrypt' -'json-c-0.14.patch') -sha256sums=('92aba4d559a2cf7043faed92e0f22c5addea36bd63f8c039ba5a8f3a159fe7d2' +'install-sd-encrypt') +sha256sums=('a89e13dff0798fd0280e801d5f0cc8cfdb2aa5b1929bec1b7322e13d3eca95fb' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' 'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57' -'31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db' -'e166c55d0fd4361749d6c449d6d04837957661ab58ebd5ef9a735de61640cc3b') +'31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db') -prepare() { - cd "${srcdir}"/$pkgname-${pkgver} - patch -Np1 -i ../json-c-0.14.patch -} - build() { cd "${srcdir}"/$pkgname-${pkgver} Deleted: json-c-0.14.patch === --- json-c-0.14.patch 2020-04-30 14:53:24 UTC (rev 381983) +++ json-c-0.14.patch 2020-04-30 15:24:25 UTC (rev 381984) @@ -1,681 +0,0 @@ -From 604abec333a0efb44fd8bc610aa0b1151dd0f612 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Mon, 13 Apr 2020 11:48:17 +0200 -Subject: [PATCH] Add support for upcoming json-c 0.14.0. - - * TRUE/FALSE are not defined anymore. 1 and 0 are used instead. - * json_object_get_uint64() and json_object_new_uint64() are part -of the upstream API now. - lib/luks2/luks2_internal.h | 4 +++- - lib/luks2/luks2_json_metadata.c | 38 + - 2 files changed, 23 insertions(+), 19 deletions(-) - -diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h -index b9fec6b5..939101d6 100644 a/lib/luks2/luks2_internal.h -+++ b/lib/luks2/luks2_internal.h -@@ -58,9 +58,11 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr); - void hexprint_base64(struct crypt_device *cd, json_object *jobj, -const char *sep, const char *line_sep); - -+#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) - uint64_t json_object_get_uint64(json_object *jobj); --uint32_t json_object_get_uint32(json_object *jobj); - json_object *json_object_new_uint64(uint64_t value); -+#endif -+uint32_t json_object_get_uint32(json_object *jobj); - - int json_object_object_add_by_uint(json_object *jobj, unsigned key, json_object *jobj_val); - void json_object_object_del_by_uint(json_object *jobj, unsigned key); -diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c -index 781280c2..712c2bbd 100644 a/lib/luks2/luks2_json_metadata.c -+++ b/lib/luks2/luks2_json_metadata.c -@@ -234,13 +234,14 @@ static json_bool json_str_to_uint64(json_object *jobj, uint64_t *value) - tmp = strtoull(json_object_get_string(jobj), &endptr, 10); - if (*endptr || errno) { - *value = 0; -- return FALSE; -+ return 0; - } - - *value = tmp; -- return TRUE; -+ return 1; - } - -+#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) - uint64_t json_object_get_uint64(json_object *jobj) - { - uint64_t r; -@@ -262,6 +263,7 @@ json_object *json_object_new_uint64(uint64_t value) - jobj = json_object_new_string(num); - return jobj; - } -+#endif - - /* - * Validate helpers -@@ -273,9 +275,9 @@ static json_bool numbered(struct crypt_device *cd, const char *name, const char - for (i = 0; key[i]; i++) - if (!isdigit(key[i])) { - log_dbg(cd, "%s \"%s\" is not in numbered form.", name, key); -- return FALSE; -+ return 0; - } -- return TRUE; -+ return 1; - } - - json_object *json_contains(struct crypt_device *cd, json_object *jobj, const char *name, -@@ -300,7 +302,7 @@ json_bool validate_json_uint32(json_object *jobj) - errno = 0; - tmp = json_object_get_int64(jobj); - --
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD json-c-0.14.patch)
Date: Thursday, April 30, 2020 @ 13:01:56 Author: eworm Revision: 381970 upgpkg: cryptsetup 2.3.1-3 fix build with json 0.14 (FS#66477, https://gitlab.com/cryptsetup/cryptsetup/-/issues/556) Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/json-c-0.14.patch ---+ PKGBUILD |4 json-c-0.14.patch | 507 2 files changed, 509 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-04-30 12:23:10 UTC (rev 381969) +++ PKGBUILD2020-04-30 13:01:56 UTC (rev 381970) @@ -3,7 +3,7 @@ pkgname=cryptsetup pkgver=2.3.1 -pkgrel=2 +pkgrel=3 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL') @@ -22,7 +22,7 @@ '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' 'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57' '31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db' -'bbf6abba86d4c76307734e95593a5ba3647e1d80d51e521f7e542c92a3d89408') +'e166c55d0fd4361749d6c449d6d04837957661ab58ebd5ef9a735de61640cc3b') prepare() { cd "${srcdir}"/$pkgname-${pkgver} Modified: json-c-0.14.patch === --- json-c-0.14.patch 2020-04-30 12:23:10 UTC (rev 381969) +++ json-c-0.14.patch 2020-04-30 13:01:56 UTC (rev 381970) @@ -172,3 +172,510 @@ } static int LUKS2_keyslot_validate(struct crypt_device *cd, json_object *hdr_jobj, json_object *hdr_keyslot, const char *key) +From e6a356974330e3ae21579a5737976e9a2aad1b51 Mon Sep 17 00:00:00 2001 +From: Ondrej Kozina +Date: Tue, 14 Apr 2020 17:24:54 +0200 +Subject: [PATCH] Avoid name clash with newer json-c library. + +This is partial revert of previous commit and also +fixes wrong decision to name our internal helpers with +json_object prefix. +--- + lib/luks2/luks2_internal.h | 8 +++- + lib/luks2/luks2_json_format.c | 6 +++--- + lib/luks2/luks2_json_metadata.c | 18 -- + lib/luks2/luks2_keyslot.c | 8 + lib/luks2/luks2_keyslot_luks2.c | 16 + lib/luks2/luks2_keyslot_reenc.c | 20 ++-- + lib/luks2/luks2_luks1_convert.c | 22 +++--- + lib/luks2/luks2_reencrypt.c | 16 + lib/luks2/luks2_segment.c | 12 ++-- + 9 files changed, 61 insertions(+), 65 deletions(-) + +diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h +index 939101d6..a5bcb1f2 100644 +--- a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h +@@ -58,11 +58,9 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr); + void hexprint_base64(struct crypt_device *cd, json_object *jobj, +const char *sep, const char *line_sep); + +-#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) +-uint64_t json_object_get_uint64(json_object *jobj); +-json_object *json_object_new_uint64(uint64_t value); +-#endif +-uint32_t json_object_get_uint32(json_object *jobj); ++uint64_t crypt_jobj_get_uint64(json_object *jobj); ++uint32_t crypt_jobj_get_uint32(json_object *jobj); ++json_object *crypt_jobj_new_uint64(uint64_t value); + + int json_object_object_add_by_uint(json_object *jobj, unsigned key, json_object *jobj_val); + void json_object_object_del_by_uint(json_object *jobj, unsigned key); +diff --git a/lib/luks2/luks2_json_format.c b/lib/luks2/luks2_json_format.c +index 0fde2ffd..1416766e 100644 +--- a/lib/luks2/luks2_json_format.c b/lib/luks2/luks2_json_format.c +@@ -325,8 +325,8 @@ int LUKS2_generate_hdr( + + json_object_object_add_by_uint(jobj_segments, 0, jobj_segment); + +- json_object_object_add(jobj_config, "json_size", json_object_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN)); +- json_object_object_add(jobj_config, "keyslots_size", json_object_new_uint64(keyslots_size)); ++ json_object_object_add(jobj_config, "json_size", crypt_jobj_new_uint64(metadata_size - LUKS2_HDR_BIN_LEN)); ++ json_object_object_add(jobj_config, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); + + JSON_DBG(cd, hdr->jobj, "Header JSON:"); + return 0; +@@ -400,6 +400,6 @@ int LUKS2_set_keyslots_size(struct crypt_device *cd, + if (!json_object_object_get_ex(hdr->jobj, "config", &jobj_config)) + return 1; + +- json_object_object_add(jobj_config, "keyslots_size", json_object_new_uint64(keyslots_size)); ++ json_object_object_add(jobj_config, "keyslots_size", crypt_jobj_new_uint64(keyslots_size)); + return 0; + } +diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c +index 712c2bbd..68da9c2d 100644 +--- a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c +@@ -219,7 +219,7 @@ int LUKS2_get_default_segment(struct luks
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD json-c-0.14.patch)
Date: Saturday, April 25, 2020 @ 14:17:23 Author: foutrelis Revision: 381556 upgpkg: cryptsetup 2.3.1-2: json-c 0.14 rebuild Added: cryptsetup/trunk/json-c-0.14.patch Modified: cryptsetup/trunk/PKGBUILD ---+ PKGBUILD | 13 ++- json-c-0.14.patch | 174 2 files changed, 184 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-04-25 13:20:13 UTC (rev 381555) +++ PKGBUILD2020-04-25 14:17:23 UTC (rev 381556) @@ -3,7 +3,7 @@ pkgname=cryptsetup pkgver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL') @@ -15,13 +15,20 @@ source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgname}-${pkgver}.tar."{xz,sign} 'hooks-encrypt' 'install-encrypt' -'install-sd-encrypt') +'install-sd-encrypt' +'json-c-0.14.patch') sha256sums=('92aba4d559a2cf7043faed92e0f22c5addea36bd63f8c039ba5a8f3a159fe7d2' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' 'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57' -'31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db') +'31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db' +'bbf6abba86d4c76307734e95593a5ba3647e1d80d51e521f7e542c92a3d89408') +prepare() { + cd "${srcdir}"/$pkgname-${pkgver} + patch -Np1 -i ../json-c-0.14.patch +} + build() { cd "${srcdir}"/$pkgname-${pkgver} Added: json-c-0.14.patch === --- json-c-0.14.patch (rev 0) +++ json-c-0.14.patch 2020-04-25 14:17:23 UTC (rev 381556) @@ -0,0 +1,174 @@ +From 604abec333a0efb44fd8bc610aa0b1151dd0f612 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Mon, 13 Apr 2020 11:48:17 +0200 +Subject: [PATCH] Add support for upcoming json-c 0.14.0. + + * TRUE/FALSE are not defined anymore. 1 and 0 are used instead. + * json_object_get_uint64() and json_object_new_uint64() are part +of the upstream API now. +--- + lib/luks2/luks2_internal.h | 4 +++- + lib/luks2/luks2_json_metadata.c | 38 + + 2 files changed, 23 insertions(+), 19 deletions(-) + +diff --git a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h +index b9fec6b5..939101d6 100644 +--- a/lib/luks2/luks2_internal.h b/lib/luks2/luks2_internal.h +@@ -58,9 +58,11 @@ json_object *LUKS2_get_segments_jobj(struct luks2_hdr *hdr); + void hexprint_base64(struct crypt_device *cd, json_object *jobj, +const char *sep, const char *line_sep); + ++#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) + uint64_t json_object_get_uint64(json_object *jobj); +-uint32_t json_object_get_uint32(json_object *jobj); + json_object *json_object_new_uint64(uint64_t value); ++#endif ++uint32_t json_object_get_uint32(json_object *jobj); + + int json_object_object_add_by_uint(json_object *jobj, unsigned key, json_object *jobj_val); + void json_object_object_del_by_uint(json_object *jobj, unsigned key); +diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c +index 781280c2..712c2bbd 100644 +--- a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c +@@ -234,13 +234,14 @@ static json_bool json_str_to_uint64(json_object *jobj, uint64_t *value) + tmp = strtoull(json_object_get_string(jobj), &endptr, 10); + if (*endptr || errno) { + *value = 0; +- return FALSE; ++ return 0; + } + + *value = tmp; +- return TRUE; ++ return 1; + } + ++#if !(defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99)) + uint64_t json_object_get_uint64(json_object *jobj) + { + uint64_t r; +@@ -262,6 +263,7 @@ json_object *json_object_new_uint64(uint64_t value) + jobj = json_object_new_string(num); + return jobj; + } ++#endif + + /* + * Validate helpers +@@ -273,9 +275,9 @@ static json_bool numbered(struct crypt_device *cd, const char *name, const char + for (i = 0; key[i]; i++) + if (!isdigit(key[i])) { + log_dbg(cd, "%s \"%s\" is not in numbered form.", name, key); +- return FALSE; ++ return 0; + } +- return TRUE; ++ return 1; + } + + json_object *json_contains(struct crypt_device *cd, json_object *jobj, const char *name, +@@ -300,7 +302,7 @@ json_bool validate_json_uint32(json_object *jobj) + errno = 0; + tmp = json_object_get_int64(jobj); + +- return (errno || tmp < 0 || tmp > UINT32_MAX) ? FALSE : TRUE; ++ return (errno || tmp < 0 || tmp > UINT32_MAX) ? 0 : 1; + } +
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, March 12, 2020 @ 10:07:09 Author: eworm Revision: 377406 upgpkg: cryptsetup 2.3.1-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-03-12 08:17:20 UTC (rev 377405) +++ PKGBUILD2020-03-12 10:07:09 UTC (rev 377406) @@ -2,7 +2,7 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.3.0 +pkgver=2.3.1 pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) @@ -16,7 +16,7 @@ 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('395690de99509428354d3cd15cf023bed01487e6f1565b2181e013dc847bbc85' +sha256sums=('92aba4d559a2cf7043faed92e0f22c5addea36bd63f8c039ba5a8f3a159fe7d2' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' 'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Sunday, February 2, 2020 @ 20:06:48 Author: eworm Revision: 374500 upgpkg: cryptsetup 2.3.0-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-02-02 18:19:37 UTC (rev 374499) +++ PKGBUILD2020-02-02 20:06:48 UTC (rev 374500) @@ -2,7 +2,7 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.2.2 +pkgver=2.3.0 pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) @@ -16,7 +16,7 @@ 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46' +sha256sums=('395690de99509428354d3cd15cf023bed01487e6f1565b2181e013dc847bbc85' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' 'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Friday, November 1, 2019 @ 20:05:22 Author: eworm Revision: 366422 upgpkg: cryptsetup 2.2.2-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-11-01 19:53:11 UTC (rev 366421) +++ PKGBUILD2019-11-01 20:05:22 UTC (rev 366422) @@ -2,7 +2,7 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) @@ -16,7 +16,7 @@ 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('94e79a31ed38bdb0acd9af7ccca1605a2ac62ca850ed640202876b1ee11c1c61' +sha256sums=('2af0ec9551ab9c870074cae9d3f68d82cab004f4095fa89db0e4413713424a46' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' 'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Sunday, October 6, 2019 @ 18:57:36 Author: eworm Revision: 363971 base group removal Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |1 - 1 file changed, 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-10-06 18:40:17 UTC (rev 363970) +++ PKGBUILD2019-10-06 18:57:36 UTC (rev 363971) @@ -8,7 +8,6 @@ arch=(x86_64) license=('GPL') url='https://gitlab.com/cryptsetup/cryptsetup/' -groups=('base') depends=('device-mapper' 'openssl' 'popt' 'libutil-linux' 'json-c' 'argon2') makedepends=('util-linux') options=('!emptydirs')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Friday, September 6, 2019 @ 11:48:23 Author: eworm Revision: 361974 upgpkg: cryptsetup 2.2.1-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-09-06 06:48:33 UTC (rev 361973) +++ PKGBUILD2019-09-06 11:48:23 UTC (rev 361974) @@ -2,7 +2,7 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) @@ -17,7 +17,7 @@ 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('9d8f8cac2836a1623c075b5cba96032271dc81a28b2aa27fbd8331e831416bb1' +sha256sums=('94e79a31ed38bdb0acd9af7ccca1605a2ac62ca850ed640202876b1ee11c1c61' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' 'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Friday, February 8, 2019 @ 15:42:53 Author: eworm Revision: 345646 upgpkg: cryptsetup 2.1.0-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-02-08 15:42:52 UTC (rev 345645) +++ PKGBUILD2019-02-08 15:42:53 UTC (rev 345646) @@ -2,7 +2,7 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.0.6 +pkgver=2.1.0 pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) @@ -13,11 +13,11 @@ makedepends=('util-linux') options=('!emptydirs') validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz -source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/${pkgname}-${pkgver}.tar."{xz,sign} +source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgname}-${pkgver}.tar."{xz,sign} 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('7c51fae0f0e7ea9af0f515b2ac77009fb2969a6619ebab47d097dca38b083d30' +sha256sums=('a3eeb2741f8f3376d16585191f3c60e067dd987e096c3c4b073fab7748b1c897' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' '7b8c8a189f1b63cb4a0c0dd93d3452615bdc05f0e33570c78b338446a59ca750'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Monday, December 3, 2018 @ 14:57:13 Author: eworm Revision: 340975 upgpkg: cryptsetup 2.0.6-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-12-03 13:32:56 UTC (rev 340974) +++ PKGBUILD2018-12-03 14:57:13 UTC (rev 340975) @@ -2,7 +2,7 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.0.5 +pkgver=2.0.6 pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) @@ -17,7 +17,7 @@ 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('a0f72ca2c824a5a555dc8924413dfe947eca23ab2e30bcff54eaafefe5fe301d' +sha256sums=('7c51fae0f0e7ea9af0f515b2ac77009fb2969a6619ebab47d097dca38b083d30' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' '7b8c8a189f1b63cb4a0c0dd93d3452615bdc05f0e33570c78b338446a59ca750'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Sunday, October 28, 2018 @ 19:55:31 Author: eworm Revision: 337478 upgpkg: cryptsetup 2.0.5-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-10-28 18:55:54 UTC (rev 337477) +++ PKGBUILD2018-10-28 19:55:31 UTC (rev 337478) @@ -2,7 +2,7 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.0.4 +pkgver=2.0.5 pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) @@ -17,7 +17,7 @@ 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('9d3a3c7033293e0c97f0ad0501fd5b4d4913ae497cbf70cca06633ccc54b5734' +sha256sums=('a0f72ca2c824a5a555dc8924413dfe947eca23ab2e30bcff54eaafefe5fe301d' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' '7b8c8a189f1b63cb4a0c0dd93d3452615bdc05f0e33570c78b338446a59ca750'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Friday, August 3, 2018 @ 12:01:12 Author: eworm Revision: 330484 upgpkg: cryptsetup 2.0.4-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-08-03 06:52:55 UTC (rev 330483) +++ PKGBUILD2018-08-03 12:01:12 UTC (rev 330484) @@ -3,8 +3,8 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.0.3 -pkgrel=2 +pkgver=2.0.4 +pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL') @@ -18,7 +18,7 @@ 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4' +sha256sums=('9d3a3c7033293e0c97f0ad0501fd5b4d4913ae497cbf70cca06633ccc54b5734' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' '7b8c8a189f1b63cb4a0c0dd93d3452615bdc05f0e33570c78b338446a59ca750'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Sunday, June 3, 2018 @ 12:43:55 Author: jelle Revision: 325624 upgpkg: cryptsetup 2.0.3-2 json-c rebuild Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-06-03 12:34:39 UTC (rev 325623) +++ PKGBUILD2018-06-03 12:43:55 UTC (rev 325624) @@ -4,7 +4,7 @@ pkgname=cryptsetup pkgver=2.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Friday, May 4, 2018 @ 20:25:17 Author: eworm Revision: 323380 upgpkg: cryptsetup 2.0.3-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-05-04 15:20:23 UTC (rev 323379) +++ PKGBUILD2018-05-04 20:25:17 UTC (rev 323380) @@ -3,7 +3,7 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) @@ -18,7 +18,7 @@ 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('4f8105d7f3bf758d58da3058b3cbd66c0ca81492b2dafe8ae7c049cc9e939e97' +sha256sums=('4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' '7b8c8a189f1b63cb4a0c0dd93d3452615bdc05f0e33570c78b338446a59ca750'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD install-sd-encrypt)
Date: Monday, April 9, 2018 @ 13:03:18 Author: eworm Revision: 321390 add mkswap in initramfs Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/install-sd-encrypt + PKGBUILD |2 +- install-sd-encrypt |3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-04-09 12:19:24 UTC (rev 321389) +++ PKGBUILD2018-04-09 13:03:18 UTC (rev 321390) @@ -22,7 +22,7 @@ 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' '7b8c8a189f1b63cb4a0c0dd93d3452615bdc05f0e33570c78b338446a59ca750' -'7891087a588ede7a5b885c439217af325c994471e821fbfbf4f4ccce47679261') +'95a16baa273a0ea5c531bc4b65e7f142ae7cb6423b5e512f4413d1dd4a545421') build() { cd "${srcdir}"/$pkgname-${pkgver} Modified: install-sd-encrypt === --- install-sd-encrypt 2018-04-09 12:19:24 UTC (rev 321389) +++ install-sd-encrypt 2018-04-09 13:03:18 UTC (rev 321390) @@ -28,6 +28,9 @@ # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1 add_binary "/usr/lib/libgcc_s.so.1" +# add mkswap for creating swap space on the fly (see 'swap' in crypttab(5)) +add_binary "mkswap" + [[ -f /etc/crypttab.initramfs ]] && add_file "/etc/crypttab.initramfs" "/etc/crypttab" }
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Wednesday, March 7, 2018 @ 13:11:33 Author: eworm Revision: 317976 upgpkg: cryptsetup 2.0.2-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-03-07 12:18:14 UTC (rev 317975) +++ PKGBUILD2018-03-07 13:11:33 UTC (rev 317976) @@ -3,7 +3,7 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) @@ -18,7 +18,7 @@ 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('41d188092c52e23d576af41cf0cfe0555d8f7efa21598d4c57c56ea1b6d9c975' +sha256sums=('4f8105d7f3bf758d58da3058b3cbd66c0ca81492b2dafe8ae7c049cc9e939e97' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' '7b8c8a189f1b63cb4a0c0dd93d3452615bdc05f0e33570c78b338446a59ca750'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Sunday, January 21, 2018 @ 19:36:42 Author: eworm Revision: 315204 upgpkg: cryptsetup 2.0.1-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD | 12 1 file changed, 4 insertions(+), 8 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-01-21 18:33:10 UTC (rev 315203) +++ PKGBUILD2018-01-21 19:36:42 UTC (rev 315204) @@ -3,8 +3,8 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=2.0.0 -pkgrel=5 +pkgver=2.0.1 +pkgrel=1 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL') @@ -18,7 +18,7 @@ 'hooks-encrypt' 'install-encrypt' 'install-sd-encrypt') -sha256sums=('adc623b9e3e3ab5c14145b8baf21b741e513ee5bf90d2b4d85a745c2f05da199' +sha256sums=('41d188092c52e23d576af41cf0cfe0555d8f7efa21598d4c57c56ea1b6d9c975' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' '6a68c833ff0af50651e66471aa21de8219e3cf66b28f87227a9580c48b689115' @@ -27,15 +27,11 @@ build() { cd "${srcdir}"/$pkgname-${pkgver} - # https://gitlab.com/cryptsetup/cryptsetup/issues/362 - # TODO: remove configure option once this hits a release - ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ --enable-libargon2 \ ---disable-static \ ---with-luks2-lock-path=/run/cryptsetup +--disable-static make }
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD hooks-encrypt install-sd-encrypt)
Date: Wednesday, January 3, 2018 @ 23:45:44 Author: eworm Revision: 314001 upgpkg: cryptsetup 2.0.0-5 use upstream change that fixes LUKS2 in early userspace https://gitlab.com/cryptsetup/cryptsetup/issues/362 Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/hooks-encrypt cryptsetup/trunk/install-sd-encrypt + PKGBUILD | 12 hooks-encrypt |2 -- install-sd-encrypt |9 - 3 files changed, 8 insertions(+), 15 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-01-03 23:32:52 UTC (rev 314000) +++ PKGBUILD2018-01-03 23:45:44 UTC (rev 314001) @@ -4,7 +4,7 @@ pkgname=cryptsetup pkgver=2.0.0 -pkgrel=4 +pkgrel=5 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL') @@ -20,18 +20,22 @@ 'install-sd-encrypt') sha256sums=('adc623b9e3e3ab5c14145b8baf21b741e513ee5bf90d2b4d85a745c2f05da199' 'SKIP' -'9b827e6e91d17efe1add010049dd0781902255939702561485073cda8ae6c923' +'416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' '6a68c833ff0af50651e66471aa21de8219e3cf66b28f87227a9580c48b689115' -'b6b7f1328f291c44b9515a220815d1aaee2f1cf89dce5d5c3db47a90ae697939') +'dbcb94323f65eab2cdd7a241fe3eba7aa3b344c1bd10a7fd800f146e61e8') build() { cd "${srcdir}"/$pkgname-${pkgver} + # https://gitlab.com/cryptsetup/cryptsetup/issues/362 + # TODO: remove configure option once this hits a release + ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ --enable-libargon2 \ ---disable-static +--disable-static \ +--with-luks2-lock-path=/run/cryptsetup make } Modified: hooks-encrypt === --- hooks-encrypt 2018-01-03 23:32:52 UTC (rev 314000) +++ hooks-encrypt 2018-01-03 23:45:44 UTC (rev 314001) @@ -4,8 +4,6 @@ modprobe -a -q dm-crypt >/dev/null 2>&1 [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" -mkdir -p "/run/lock/cryptsetup/" - # Get keyfile if specified ckeyfile="/crypto_keyfile.bin" if [ -n "$cryptkey" ]; then Modified: install-sd-encrypt === --- install-sd-encrypt 2018-01-03 23:32:52 UTC (rev 314000) +++ install-sd-encrypt 2018-01-03 23:45:44 UTC (rev 314001) @@ -25,15 +25,6 @@ add_systemd_unit systemd-ask-password-console.path add_systemd_unit systemd-ask-password-console.service -# the directory /run/lock/cryptsetup/ is supposed to be created by -# systemd-tmpfiles, but that is not available in early userspace. -# https://github.com/systemd/systemd/issues/7794 -mkdir -p "$BUILDROOT/etc/systemd/system/systemd-cryptsetup@.service.d/" -cat >"$BUILDROOT/etc/systemd/system/systemd-cryptsetup@.service.d/lock.conf" <
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD install-sd-encrypt)
Date: Wednesday, January 3, 2018 @ 15:34:13 Author: eworm Revision: 313987 upgpkg: cryptsetup 2.0.0-4 fix cryptsetup with LUKS2 in systemd-based initcpio (FS#56771) Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/install-sd-encrypt + PKGBUILD |4 ++-- install-sd-encrypt | 12 2 files changed, 14 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-01-03 11:06:25 UTC (rev 313986) +++ PKGBUILD2018-01-03 15:34:13 UTC (rev 313987) @@ -4,7 +4,7 @@ pkgname=cryptsetup pkgver=2.0.0 -pkgrel=3 +pkgrel=4 pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt' arch=(x86_64) license=('GPL') @@ -22,7 +22,7 @@ 'SKIP' '9b827e6e91d17efe1add010049dd0781902255939702561485073cda8ae6c923' '6a68c833ff0af50651e66471aa21de8219e3cf66b28f87227a9580c48b689115' -'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd') +'b6b7f1328f291c44b9515a220815d1aaee2f1cf89dce5d5c3db47a90ae697939') build() { cd "${srcdir}"/$pkgname-${pkgver} Modified: install-sd-encrypt === --- install-sd-encrypt 2018-01-03 11:06:25 UTC (rev 313986) +++ install-sd-encrypt 2018-01-03 15:34:13 UTC (rev 313987) @@ -25,6 +25,18 @@ add_systemd_unit systemd-ask-password-console.path add_systemd_unit systemd-ask-password-console.service +# the directory /run/lock/cryptsetup/ is supposed to be created by +# systemd-tmpfiles, but that is not available in early userspace. +# https://github.com/systemd/systemd/issues/7794 +mkdir -p "$BUILDROOT/etc/systemd/system/systemd-cryptsetup@.service.d/" +cat >"$BUILDROOT/etc/systemd/system/systemd-cryptsetup@.service.d/lock.conf" <
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Monday, December 25, 2017 @ 19:54:12 Author: eworm Revision: 313614 upgpkg: cryptsetup 2.0.0-2 json-c 0.13 rebuild Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-12-25 13:16:55 UTC (rev 313613) +++ PKGBUILD2017-12-25 19:54:12 UTC (rev 313614) @@ -4,7 +4,7 @@ pkgname=cryptsetup pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(x86_64) license=('GPL')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Wednesday, December 13, 2017 @ 13:19:10 Author: eworm Revision: 312232 drop --enable-cryptsetup-reencrypt configure option This option does no longer exist, support for reencryption is enabled by default. Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-12-13 12:58:00 UTC (rev 312231) +++ PKGBUILD2017-12-13 13:19:10 UTC (rev 312232) @@ -26,12 +26,17 @@ build() { cd "${srcdir}"/$pkgname-${pkgver} - ./configure --prefix=/usr --sbindir=/usr/bin --disable-static --enable-cryptsetup-reencrypt + + ./configure \ +--prefix=/usr \ +--sbindir=/usr/bin \ +--disable-static make } package() { cd "${srcdir}"/$pkgname-${pkgver} + make DESTDIR="${pkgdir}" install # install hook install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Monday, December 11, 2017 @ 07:55:29 Author: eworm Revision: 312165 upgpkg: cryptsetup 2.0.0-1 new upstream release This is a major upgrade with soname bump and new dependency json-c. Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-12-11 07:52:59 UTC (rev 312164) +++ PKGBUILD2017-12-11 07:55:29 UTC (rev 312165) @@ -3,23 +3,22 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=1.7.5 -pkgrel=2 +pkgver=2.0.0 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(x86_64) license=('GPL') url="https://gitlab.com/cryptsetup/cryptsetup/"; groups=('base') -depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux') +depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux' 'json-c') makedepends=('util-linux') options=('!emptydirs') -source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.xz - https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.sign +source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/${pkgname}-${pkgver}.tar.{xz,sign} encrypt_hook encrypt_install sd-encrypt) validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz -sha256sums=('2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd' +sha256sums=('adc623b9e3e3ab5c14145b8baf21b741e513ee5bf90d2b4d85a745c2f05da199' 'SKIP' '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Saturday, November 4, 2017 @ 23:11:06 Author: eworm Revision: 308918 upgpkg: cryptsetup 1.7.5-2 build with latest changes Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-11-04 22:19:29 UTC (rev 308917) +++ PKGBUILD2017-11-04 23:11:06 UTC (rev 308918) @@ -4,7 +4,7 @@ pkgname=cryptsetup pkgver=1.7.5 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -21,7 +21,7 @@ validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz sha256sums=('2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd' 'SKIP' -'4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff' +'416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae' 'd442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, April 27, 2017 @ 11:09:04 Author: eworm Revision: 294905 upgpkg: cryptsetup 1.7.5-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-04-27 09:55:56 UTC (rev 294904) +++ PKGBUILD2017-04-27 11:09:04 UTC (rev 294905) @@ -3,7 +3,7 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=1.7.4 +pkgver=1.7.5 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) @@ -19,7 +19,7 @@ encrypt_install sd-encrypt) validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz -sha256sums=('7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016' +sha256sums=('2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd' 'SKIP' '4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, March 16, 2017 @ 07:28:32 Author: bpiotrowski Revision: 290908 upgpkg: cryptsetup 1.7.4-1 Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-03-15 21:29:44 UTC (rev 290907) +++ PKGBUILD2017-03-16 07:28:32 UTC (rev 290908) @@ -3,7 +3,7 @@ # Contributor: Thomas Bächler pkgname=cryptsetup -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) @@ -19,7 +19,7 @@ encrypt_install sd-encrypt) validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz -sha256sums=('af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02' +sha256sums=('7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016' 'SKIP' '4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Monday, October 31, 2016 @ 08:52:01 Author: bpiotrowski Revision: 279513 upgpkg: cryptsetup 1.7.3-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-10-31 08:23:47 UTC (rev 279512) +++ PKGBUILD2016-10-31 08:52:01 UTC (rev 279513) @@ -1,7 +1,9 @@ # $Id$ -# Maintainer: Thomas Bächler +# Maintainer: Bartłomiej Piotrowski +# Contributor: Thomas Bächler + pkgname=cryptsetup -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) @@ -17,7 +19,7 @@ encrypt_install sd-encrypt) validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz -sha256sums=('dbb35dbf5f0c1749168c86c913fe98e872247bfc8425314b494c2423e7e43342' +sha256sums=('af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02' 'SKIP' '4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Saturday, June 4, 2016 @ 15:54:01 Author: bpiotrowski Revision: 268948 upgpkg: cryptsetup 1.7.2-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-06-04 12:28:28 UTC (rev 268947) +++ PKGBUILD2016-06-04 13:54:01 UTC (rev 268948) @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.7.1 +pkgver=1.7.2 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) @@ -17,7 +17,7 @@ encrypt_install sd-encrypt) validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz -sha256sums=('73dc8a63cc984b56aa6a3c99f355262471bcfe78b3240b8b9d0caa8002911fec' +sha256sums=('dbb35dbf5f0c1749168c86c913fe98e872247bfc8425314b494c2423e7e43342' 'SKIP' '4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Wednesday, November 4, 2015 @ 23:05:09 Author: bpiotrowski Revision: 250120 Add validpgpkeys Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-11-04 22:00:48 UTC (rev 250119) +++ PKGBUILD2015-11-04 22:05:09 UTC (rev 250120) @@ -12,11 +12,13 @@ makedepends=('util-linux') options=('!emptydirs') source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.xz - #https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.sign + https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.sign encrypt_hook encrypt_install sd-encrypt) +validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz sha256sums=('075524a7cc0db36d12119fa79116750accb1c6c8825d5faa2534b74b8ce3d148' +'SKIP' '4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae' 'd442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Wednesday, November 4, 2015 @ 22:55:12 Author: bpiotrowski Revision: 250116 upgpkg: cryptsetup 1.7.0-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-11-04 21:20:31 UTC (rev 250115) +++ PKGBUILD2015-11-04 21:55:12 UTC (rev 250116) @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.6.8 +pkgver=1.7.0 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) @@ -11,12 +11,12 @@ depends=('device-mapper' 'libgcrypt' 'popt' 'libutil-linux') makedepends=('util-linux') options=('!emptydirs') -source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.xz - #https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.sign +source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.xz + #https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/${pkgname}-${pkgver}.tar.sign encrypt_hook encrypt_install sd-encrypt) -sha256sums=('45a6ccd3c65b7d904e58e1cb3656a7e997190b6a05b5ff7c6887e4a41c5f19bc' +sha256sums=('075524a7cc0db36d12119fa79116750accb1c6c8825d5faa2534b74b8ce3d148' '4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae' 'd442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, October 8, 2015 @ 16:26:50 Author: bpiotrowski Revision: 248502 upgpkg: cryptsetup 1.6.8-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-10-08 14:20:58 UTC (rev 248501) +++ PKGBUILD2015-10-08 14:26:50 UTC (rev 248502) @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.6.7 +pkgver=1.6.8 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) @@ -16,7 +16,7 @@ encrypt_hook encrypt_install sd-encrypt) -sha256sums=('c23c24c8d662032da8650c1c84985221be8bbedf4737c1540bba7e4517dfe820' +sha256sums=('45a6ccd3c65b7d904e58e1cb3656a7e997190b6a05b5ff7c6887e4a41c5f19bc' '4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae' 'd442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, June 18, 2015 @ 01:02:38 Author: bpiotrowski Revision: 241003 upgpkg: cryptsetup 1.6.7-1 new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-06-17 22:04:57 UTC (rev 241002) +++ PKGBUILD2015-06-17 23:02:38 UTC (rev 241003) @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.6.6 +pkgver=1.6.7 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) @@ -16,7 +16,7 @@ encrypt_hook encrypt_install sd-encrypt) -sha256sums=('2d2ce28e4e1137dd599d87884b62ef6dbf14fd7848b2a2bf7d61cf125fbd8e6f' +sha256sums=('c23c24c8d662032da8650c1c84985221be8bbedf4737c1540bba7e4517dfe820' '4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae' 'd442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, July 3, 2014 @ 11:42:07 Author: fyan Revision: 216393 upgpkg: cryptsetup 1.6.5-1 - new upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-07-03 07:42:18 UTC (rev 216392) +++ PKGBUILD2014-07-03 09:42:07 UTC (rev 216393) @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.6.4 +pkgver=1.6.5 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) @@ -15,7 +15,7 @@ encrypt_hook encrypt_install sd-encrypt) -sha256sums=('70b8e86eef94bbb4441ad38460d87138130d7fe5d01131c3ba50b9f0dca0' +sha256sums=('267973f20be43f9d685f7193aa23954b60768c74a1d330243114d4b8bc17ca9a' '4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae' 'd442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, February 27, 2014 @ 18:38:30 Author: thomas Revision: 206487 upgpkg: cryptsetup 1.6.4-1 Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD | 23 +-- 1 file changed, 9 insertions(+), 14 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-02-27 17:25:26 UTC (rev 206486) +++ PKGBUILD2014-02-27 17:38:30 UTC (rev 206487) @@ -1,8 +1,8 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.6.3 -pkgrel=2 +pkgver=1.6.4 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -10,20 +10,19 @@ groups=('base') depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux') options=('!emptydirs') -source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 -http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc +source=(https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.xz + #https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/${pkgname}-${pkgver}.tar.sign encrypt_hook encrypt_install sd-encrypt) -md5sums=('a7aeb549a543eeac433eadfb6bc67837' - 'SKIP' - 'c279d86d6dc18322c054d2272ebb9e90' - '21c45f9cab3e0b5165f68358884fbd0f' - '6cf7e170ecd13e42fe829209628fdb4d') +sha256sums=('70b8e86eef94bbb4441ad38460d87138130d7fe5d01131c3ba50b9f0dca0' +'4406f8dc83f4f1b408e49d557515f721d91b358355c71fbe51f74ab27e5c84ff' +'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae' +'d442304e6a78b3513ebc53be3fe2f1276a7df470c8da701b3ece971d59979bdd') build() { cd "${srcdir}"/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static --enable-cryptsetup-reencrypt + ./configure --prefix=/usr --sbindir=/usr/bin --disable-static --enable-cryptsetup-reencrypt make } @@ -34,8 +33,4 @@ install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt install -D -m644 "${srcdir}"/sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt - - # usrmove - cd "$pkgdir"/usr - mv sbin bin }
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Tuesday, December 17, 2013 @ 00:23:21 Author: thomas Revision: 201612 upgpkg: cryptsetup 1.6.3-2: rebuild for libgcrypt 1.6.0 Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-12-16 23:16:21 UTC (rev 201611) +++ PKGBUILD2013-12-16 23:23:21 UTC (rev 201612) @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler pkgname=cryptsetup pkgver=1.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Monday, December 16, 2013 @ 23:41:47 Author: thomas Revision: 201602 upgpkg: cryptsetup 1.6.3-1 Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-12-16 22:30:58 UTC (rev 201601) +++ PKGBUILD2013-12-16 22:41:47 UTC (rev 201602) @@ -1,8 +1,8 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.6.2 -pkgrel=2 +pkgver=1.6.3 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -15,7 +15,7 @@ encrypt_hook encrypt_install sd-encrypt) -md5sums=('cd834da49fbe92dd66df02cc5c61280f' +md5sums=('a7aeb549a543eeac433eadfb6bc67837' 'SKIP' 'c279d86d6dc18322c054d2272ebb9e90' '21c45f9cab3e0b5165f68358884fbd0f'
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD sd-encrypt)
Date: Sunday, September 29, 2013 @ 02:43:41 Author: thomas Revision: 195243 upgpkg: cryptsetup 1.6.2-2 - add sd-encrypt hook Added: cryptsetup/trunk/sd-encrypt Modified: cryptsetup/trunk/PKGBUILD + PKGBUILD |9 ++--- sd-encrypt | 42 ++ 2 files changed, 48 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-28 23:11:01 UTC (rev 195242) +++ PKGBUILD2013-09-29 00:43:41 UTC (rev 195243) @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler pkgname=cryptsetup pkgver=1.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -13,11 +13,13 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook -encrypt_install) +encrypt_install +sd-encrypt) md5sums=('cd834da49fbe92dd66df02cc5c61280f' 'SKIP' 'c279d86d6dc18322c054d2272ebb9e90' - '21c45f9cab3e0b5165f68358884fbd0f') + '21c45f9cab3e0b5165f68358884fbd0f' + '6cf7e170ecd13e42fe829209628fdb4d') build() { cd "${srcdir}"/$pkgname-${pkgver} @@ -31,6 +33,7 @@ # install hook install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt + install -D -m644 "${srcdir}"/sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt # usrmove cd "$pkgdir"/usr Added: sd-encrypt === --- sd-encrypt (rev 0) +++ sd-encrypt 2013-09-29 00:43:41 UTC (rev 195243) @@ -0,0 +1,42 @@ +#!/bin/bash + +build() { +local mod + +add_module dm-crypt +if [[ $CRYPTO_MODULES ]]; then +for mod in $CRYPTO_MODULES; do +add_module "$mod" +done +else +add_all_modules '/crypto/' +fi + +add_binary "dmsetup" +add_file "/usr/lib/udev/rules.d/10-dm.rules" +add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" +add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" +add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" + +add_systemd_unit cryptsetup.target +add_binary /usr/lib/systemd/system-generators/systemd-cryptsetup-generator +add_binary /usr/lib/systemd/systemd-cryptsetup + +add_systemd_unit systemd-ask-password-console.path +add_systemd_unit systemd-ask-password-console.service + +[[ -f /etc/crypttab.initramfs ]] && add_file /etc/crypttab.initramfs /etc/crypttab +} + +help() { +cat <
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Tuesday, August 13, 2013 @ 22:30:45 Author: thomas Revision: 192548 upgpkg: cryptsetup 1.6.2-1 Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-08-13 20:30:09 UTC (rev 192547) +++ PKGBUILD2013-08-13 20:30:45 UTC (rev 192548) @@ -1,8 +1,8 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.6.1 -pkgrel=2 +pkgver=1.6.2 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -14,7 +14,7 @@ http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) -md5sums=('f374d11e3b0e7ca0f805756fd02e34ff' +md5sums=('cd834da49fbe92dd66df02cc5c61280f' 'SKIP' 'c279d86d6dc18322c054d2272ebb9e90' '21c45f9cab3e0b5165f68358884fbd0f')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, May 30, 2013 @ 19:42:08 Author: tomegun Revision: 186715 upgpkg: cryptsetup 1.6.1-2 usrmove Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-05-30 17:41:26 UTC (rev 186714) +++ PKGBUILD2013-05-30 17:42:08 UTC (rev 186715) @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler pkgname=cryptsetup pkgver=1.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -31,4 +31,8 @@ # install hook install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt + + # usrmove + cd "$pkgdir"/usr + mv sbin bin }
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, May 2, 2013 @ 17:23:33 Author: dreisner Revision: 184139 upgpkg: cryptsetup 1.6.1-1 Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-05-02 15:21:00 UTC (rev 184138) +++ PKGBUILD2013-05-02 15:23:33 UTC (rev 184139) @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) @@ -14,8 +14,8 @@ http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) -md5sums=('99002ac59a65ea371e7a98200943cb80' - 'd933e3e59998e491f674b42fd66d6183' +md5sums=('f374d11e3b0e7ca0f805756fd02e34ff' + 'SKIP' 'c279d86d6dc18322c054d2272ebb9e90' '21c45f9cab3e0b5165f68358884fbd0f')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD encrypt_hook)
Date: Saturday, February 9, 2013 @ 17:06:29 Author: thomas Revision: 177818 upgpkg: cryptsetup 1.6.0-1 Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/encrypt_hook --+ PKGBUILD |8 encrypt_hook |6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-02-09 15:02:46 UTC (rev 177817) +++ PKGBUILD2013-02-09 16:06:29 UTC (rev 177818) @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.5.1 +pkgver=1.6.0 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) @@ -14,9 +14,9 @@ http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) -md5sums=('87cc018c0c65f36043f38ceb8ffd4d81' - '5f711687f453f4d5a38596f60df5247a' - 'c970831d733ca42e20415005967e7843' +md5sums=('99002ac59a65ea371e7a98200943cb80' + 'd933e3e59998e491f674b42fd66d6183' + 'c279d86d6dc18322c054d2272ebb9e90' '21c45f9cab3e0b5165f68358884fbd0f') build() { Modified: encrypt_hook === --- encrypt_hook2013-02-09 15:02:46 UTC (rev 177817) +++ encrypt_hook2013-02-09 16:06:29 UTC (rev 177818) @@ -66,7 +66,7 @@ dopassphrase=1 # If keyfile exists, try to use that if [ -f ${ckeyfile} ]; then -if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then +if eval cryptsetup --key-file ${ckeyfile} open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then dopassphrase=0 else echo "Invalid keyfile. Reverting to passphrase." @@ -78,7 +78,7 @@ echo "A password is required to access the ${cryptname} volume:" #loop until we get a real password -while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do +while ! eval cryptsetup open --type luks ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do sleep 2; done fi @@ -98,7 +98,7 @@ err "Non-LUKS decryption not attempted..." return 1 fi -exe="cryptsetup create $cryptname $resolved $cryptargs" +exe="cryptsetup open --type plain $resolved $cryptname $cryptargs" IFS=: read c_hash c_cipher c_keysize c_offset c_skip <
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD encrypt_hook)
Date: Saturday, October 20, 2012 @ 12:46:40 Author: dreisner Revision: 169407 upgpkg: cryptsetup 1.5.1-1 Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/encrypt_hook --+ PKGBUILD | 12 ++-- encrypt_hook |4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-10-20 16:41:52 UTC (rev 169406) +++ PKGBUILD2012-10-20 16:46:40 UTC (rev 169407) @@ -1,8 +1,8 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.5.0 -pkgrel=2 +pkgver=1.5.1 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -14,6 +14,10 @@ http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) +md5sums=('87cc018c0c65f36043f38ceb8ffd4d81' + '5f711687f453f4d5a38596f60df5247a' + 'c970831d733ca42e20415005967e7843' + '21c45f9cab3e0b5165f68358884fbd0f') build() { cd "${srcdir}"/$pkgname-${pkgver} @@ -28,7 +32,3 @@ install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt } -md5sums=('0fa7ba8923b0ce8eed2aa65f2cb9950c' - 'efe1b74dfadf37726397fd27ad0df965' - '4dab1b0e23d81907b79b49c2d8d719b5' - '21c45f9cab3e0b5165f68358884fbd0f') Modified: encrypt_hook === --- encrypt_hook2012-10-20 16:41:52 UTC (rev 169406) +++ encrypt_hook2012-10-20 16:46:40 UTC (rev 169407) @@ -11,7 +11,9 @@ $cryptkey EOF -if resolved=$(resolve_device "${ckdev}" ${rootdelay}); then +if [ "$ckdev" = "rootfs" ]; then +ckeyfile=$ckarg1 +elif resolved=$(resolve_device "${ckdev}" ${rootdelay}); then case ${ckarg1} in *[!0-9]*) # Use a file on the device
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, August 9, 2012 @ 14:10:07 Author: thomas Revision: 165050 upgpkg: cryptsetup 1.5.0-2: Build EXPERIMENTAL cryptsetup-reencrypt Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-08-09 18:01:13 UTC (rev 165049) +++ PKGBUILD2012-08-09 18:10:07 UTC (rev 165050) @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler pkgname=cryptsetup pkgver=1.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -17,7 +17,7 @@ build() { cd "${srcdir}"/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr --disable-static --enable-cryptsetup-reencrypt make }
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Sunday, July 15, 2012 @ 15:56:57 Author: tomegun Revision: 163559 upgpkg: cryptsetup 1.5.0-1 upstream release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-07-15 17:45:02 UTC (rev 163558) +++ PKGBUILD2012-07-15 19:56:57 UTC (rev 163559) @@ -1,24 +1,19 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.4.3 +pkgver=1.5.0 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/"; groups=('base') -depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt' 'util-linux') -conflicts=('mkinitcpio<0.7') +depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) -sha256sums=('d5ff2c00f6f791d77fa5636a02ae43ddbb46c6c793bdeafdec5e38fd15f99d0a' -'ad610fe77d78bf7e91b7473f9d9c84de46ed1cc21f006fe3ae4791b0b6f42f3a' -'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316' -'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae') build() { cd "${srcdir}"/$pkgname-${pkgver} @@ -33,3 +28,7 @@ install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt } +md5sums=('0fa7ba8923b0ce8eed2aa65f2cb9950c' + 'efe1b74dfadf37726397fd27ad0df965' + '4dab1b0e23d81907b79b49c2d8d719b5' + '21c45f9cab3e0b5165f68358884fbd0f')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Monday, June 25, 2012 @ 14:43:24 Author: thomas Revision: 162352 upgpkg: cryptsetup 1.4.3-1: upstream update Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-06-25 18:39:40 UTC (rev 162351) +++ PKGBUILD2012-06-25 18:43:24 UTC (rev 162352) @@ -1,22 +1,22 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.4.2 -pkgrel=2 +pkgver=1.4.3 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/"; groups=('base') -depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') +depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt' 'util-linux') conflicts=('mkinitcpio<0.7') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) -sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7' -'4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed' +sha256sums=('d5ff2c00f6f791d77fa5636a02ae43ddbb46c6c793bdeafdec5e38fd15f99d0a' +'ad610fe77d78bf7e91b7473f9d9c84de46ed1cc21f006fe3ae4791b0b6f42f3a' 'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316' 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Friday, May 25, 2012 @ 19:50:20 Author: dreisner Revision: 159621 upgpkg: cryptsetup 1.4.2-2 - update install hook for mkinitcpio 0.9.0 (FS#29992) - add support for UUID cryptkey and cryptdevice (FS#24700) Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2012-05-25 23:48:59 UTC (rev 159620) +++ PKGBUILD2012-05-25 23:50:20 UTC (rev 159621) @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler pkgname=cryptsetup pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD encrypt_hook encrypt_install)
Date: Friday, May 25, 2012 @ 19:48:44 Author: dreisner Revision: 159619 upgpkg: cryptsetup 1.4.2-1 - update install hook for mkinitcpio 0.9.0 (FS#29992) - add support for UUID cryptkey and cryptdevice (FS#24700) Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/encrypt_hook cryptsetup/trunk/encrypt_install -+ PKGBUILD|4 ++-- encrypt_hook| 17 + encrypt_install | 17 +++-- 3 files changed, 22 insertions(+), 16 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-05-25 23:31:16 UTC (rev 159618) +++ PKGBUILD2012-05-25 23:48:44 UTC (rev 159619) @@ -17,8 +17,8 @@ encrypt_install) sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7' '4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed' -'e4c00e2da274bf4cab3f72a0de779790a11a946d36b83144e74d3791e230b262' -'cba1dc38ff6cc4d3740d0badfb2b151bb03d19e8e9fa497569ac2fb6f4196e0e') +'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316' +'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae') build() { cd "${srcdir}"/$pkgname-${pkgver} Modified: encrypt_hook === --- encrypt_hook2012-05-25 23:31:16 UTC (rev 159618) +++ encrypt_hook2012-05-25 23:48:44 UTC (rev 159619) @@ -10,20 +10,21 @@ IFS=: read ckdev ckarg1 ckarg2 &1 umount /ckey ;; *) # Read raw data from the block device # ckarg1 is numeric: ckarg1=offset, ckarg2=length -dd if="$ckdev" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 +dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1 ;; esac fi @@ -58,13 +59,13 @@ esac done -if poll_device "${cryptdev}" ${rootdelay}; then -if cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then +if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then +if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated dopassphrase=1 # If keyfile exists, try to use that if [ -f ${ckeyfile} ]; then -if eval cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then +if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then dopassphrase=0 else echo "Invalid keyfile. Reverting to passphrase." @@ -76,7 +77,7 @@ echo "A password is required to access the ${cryptname} volume:" #loop until we get a real password -while ! eval cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do +while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do sleep 2; done fi @@ -96,7 +97,7 @@ err "Non-LUKS decryption not attempted..." return 1 fi -exe="cryptsetup create $cryptname $cryptdev $cryptargs" +exe="cryptsetup create $cryptname $resolved $cryptargs" IFS=: read c_hash c_cipher c_keysize c_offset c_skip <
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD encrypt_hook encrypt_install)
Date: Sunday, May 13, 2012 @ 09:45:33 Author: thomas Revision: 158937 upgpkg: cryptsetup 1.4.2-1 - upstream update - move cryptsetup to /usr - fix typo in the mkinitcpio hook help Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/encrypt_hook cryptsetup/trunk/encrypt_install -+ PKGBUILD| 15 --- encrypt_hook| 10 +- encrypt_install |2 +- 3 files changed, 14 insertions(+), 13 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-05-13 13:26:46 UTC (rev 158936) +++ PKGBUILD2012-05-13 13:45:33 UTC (rev 158937) @@ -1,8 +1,8 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.4.1 -pkgrel=3 +pkgver=1.4.2 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -15,13 +15,14 @@ http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) -sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb' -'71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88' -'811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757' -'ddbbdcb8eff93a3a7622ec633e90d5c0d68e3afbeaf942dc2309adab345047d4') +sha256sums=('1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7' +'4e6dbece8d1baad861479aca70d0cf30887420da9b5eab45d65d064c656893ed' +'e4c00e2da274bf4cab3f72a0de779790a11a946d36b83144e74d3791e230b262' +'cba1dc38ff6cc4d3740d0badfb2b151bb03d19e8e9fa497569ac2fb6f4196e0e') + build() { cd "${srcdir}"/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static --sbindir=/sbin + ./configure --prefix=/usr --disable-static make } Modified: encrypt_hook === --- encrypt_hook2012-05-13 13:26:46 UTC (rev 158936) +++ encrypt_hook2012-05-13 13:45:33 UTC (rev 158937) @@ -1,7 +1,7 @@ #!/usr/bin/ash run_hook() { -/sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 +modprobe -a -q dm-crypt >/dev/null 2>&1 [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" # Get keyfile if specified @@ -59,12 +59,12 @@ done if poll_device "${cryptdev}" ${rootdelay}; then -if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then +if cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated dopassphrase=1 # If keyfile exists, try to use that if [ -f ${ckeyfile} ]; then -if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then +if eval cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then dopassphrase=0 else echo "Invalid keyfile. Reverting to passphrase." @@ -76,7 +76,7 @@ echo "A password is required to access the ${cryptname} volume:" #loop until we get a real password -while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do +while ! eval cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do sleep 2; done fi @@ -96,7 +96,7 @@ err "Non-LUKS decryption not attempted..." return 1 fi -exe="/sbin/cryptsetup create $cryptname $cryptdev $cryptargs" +exe="cryptsetup create $cryptname $cryptdev $cryptargs" IFS=: read c_hash c_cipher c_keysize c_offset c_skip <
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD encrypt_install)
Date: Friday, April 20, 2012 @ 14:28:16 Author: eric Revision: 156538 upgpkg: cryptsetup 1.4.1-3 Fix initcpio install hook (close FS#29542), Move library from /lib to /usr/lib Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/encrypt_install -+ PKGBUILD|9 +++-- encrypt_install |8 2 files changed, 7 insertions(+), 10 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-04-20 17:48:38 UTC (rev 156537) +++ PKGBUILD2012-04-20 18:28:16 UTC (rev 156538) @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler pkgname=cryptsetup pkgver=1.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -18,10 +18,10 @@ sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb' '71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88' '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757' -'d4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573') +'ddbbdcb8eff93a3a7622ec633e90d5c0d68e3afbeaf942dc2309adab345047d4') build() { cd "${srcdir}"/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib + ./configure --prefix=/usr --disable-static --sbindir=/sbin make } @@ -31,7 +31,4 @@ # install hook install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt - # Fix pkgconfig location - install -d -m755 "${pkgdir}"/usr/lib - mv "${pkgdir}"/lib/pkgconfig "${pkgdir}"/usr/lib/ } Modified: encrypt_install === --- encrypt_install 2012-04-20 17:48:38 UTC (rev 156537) +++ encrypt_install 2012-04-20 18:28:16 UTC (rev 156538) @@ -12,10 +12,10 @@ [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" add_binary "/sbin/dmsetup" -add_file "/lib/udev/rules.d/10-dm.rules" -add_file "/lib/udev/rules.d/13-dm-disk.rules" -add_file "/lib/udev/rules.d/95-dm-notify.rules" -add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" +add_file "/usr/lib/udev/rules.d/10-dm.rules" +add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" +add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" +add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" } help ()
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Friday, April 20, 2012 @ 13:06:39 Author: tpowa Revision: 156534 upgpkg: cryptsetup 1.4.1-2 move hook and install to /usr Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2012-04-20 16:54:05 UTC (rev 156533) +++ PKGBUILD2012-04-20 17:06:39 UTC (rev 156534) @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler pkgname=cryptsetup pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') @@ -29,8 +29,8 @@ cd "${srcdir}"/$pkgname-${pkgver} make DESTDIR="${pkgdir}" install # install hook - install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/lib/initcpio/hooks/encrypt - install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/lib/initcpio/install/encrypt + install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt + install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt # Fix pkgconfig location install -d -m755 "${pkgdir}"/usr/lib mv "${pkgdir}"/lib/pkgconfig "${pkgdir}"/usr/lib/
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD encrypt_hook)
Date: Sunday, October 30, 2011 @ 19:08:05 Author: thomas Revision: 141488 upgpkg: cryptsetup 1.4.0-1 upstream update + add --allow-discards support to the encrypt hook Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/encrypt_hook --+ PKGBUILD | 11 +-- encrypt_hook | 22 +++--- 2 files changed, 24 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-10-30 22:51:16 UTC (rev 141487) +++ PKGBUILD2011-10-30 23:08:05 UTC (rev 141488) @@ -1,9 +1,9 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.3.1 -pkgrel=2 -pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" +pkgver=1.4.0 +pkgrel=1 +pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/"; @@ -14,10 +14,9 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) -sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' -'b8269d358363eb8d67d1ffa1469068e454a89154636283bcc3edc6486b7fff4e' +sha256sums=('96d682853c8019cfeae0b21250cd2d00af42e46251807e8dbda2ff8427c2e9ed' +'811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757' 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573') - build() { cd $srcdir/$pkgname-${pkgver} ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib Modified: encrypt_hook === --- encrypt_hook2011-10-30 22:51:16 UTC (rev 141487) +++ encrypt_hook2011-10-30 23:08:05 UTC (rev 141488) @@ -41,6 +41,7 @@ DEPRECATED_CRYPT=0 cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)" cryptname="$(echo "${cryptdevice}" | cut -d: -f2)" +cryptoptions="$(echo "${cryptdevice}" | cut -d: -f3)" else DEPRECATED_CRYPT=1 cryptdev="${root}" @@ -52,13 +53,28 @@ echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." } +OLDIFS="${IFS}" +IFS="," +for cryptopt in ${cryptoptions}; do +case ${cryptopt} in +allow-discards) +echo "Enabling TRIM/discard support." +cryptargs="${cryptargs} --allow-discards" +;; +*) +echo "Encryption option '${cryptopt}' not known, ignoring." >&2 +;; +esac +done +IFS="${OLDIFS}" + if poll_device "${cryptdev}" ${rootdelay}; then if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated dopassphrase=1 # If keyfile exists, try to use that if [ -f ${ckeyfile} ]; then -if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; then +if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then dopassphrase=0 else echo "Invalid keyfile. Reverting to passphrase." @@ -70,7 +86,7 @@ echo "A password is required to access the ${cryptname} volume:" #loop until we get a real password -while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do +while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do sleep 2; done fi @@ -90,7 +106,7 @@ err "Non-LUKS decryption not attempted..." return 1 fi -exe="/sbin/cryptsetup create ${cryptname} ${cryptdev}" +exe="/sbin/cryptsetup create ${cryptname} ${cryptdev} ${cryptargs}" tmp=$(echo "${crypto}" | cut -d: -f1) [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\"" tmp=$(echo "${crypto}" | cut -d: -f2)
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD encrypt_hook encrypt_install)
Date: Thursday, June 30, 2011 @ 13:57:50 Author: thomas Revision: 129976 cryptsetup: Adjust mkinitcpio hook for mkinitcpio 0.7 Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/encrypt_hook cryptsetup/trunk/encrypt_install -+ PKGBUILD|8 encrypt_hook|3 ++- encrypt_install |3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-06-30 17:54:05 UTC (rev 129975) +++ PKGBUILD2011-06-30 17:57:50 UTC (rev 129976) @@ -2,21 +2,21 @@ # Maintainer: Thomas Bächler pkgname=cryptsetup pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/"; groups=('base') depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') -conflicts=('mkinitcpio<0.5.99') +conflicts=('mkinitcpio<0.7') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' -'64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' -'07918fc349b3a7c4a73e8ad1cc3d97a2a79ebc7655090ab9ebb00b1e092c85aa') +'b8269d358363eb8d67d1ffa1469068e454a89154636283bcc3edc6486b7fff4e' +'d4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573') build() { cd $srcdir/$pkgname-${pkgver} Modified: encrypt_hook === --- encrypt_hook2011-06-30 17:54:05 UTC (rev 129975) +++ encrypt_hook2011-06-30 17:57:50 UTC (rev 129976) @@ -6,7 +6,8 @@ /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -e "/dev/mapper/control" ]; then -/bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') +mkdir /dev/mapper +mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" Modified: encrypt_install === --- encrypt_install 2011-06-30 17:54:05 UTC (rev 129975) +++ encrypt_install 2011-06-30 17:57:50 UTC (rev 129976) @@ -1,6 +1,6 @@ # vim: set ft=sh: -install () +build() { if [ -z "${CRYPTO_MODULES}" ]; then MODULES=" dm-crypt $(all_modules "/crypto/") " @@ -9,7 +9,6 @@ fi FILES="" SCRIPT="encrypt" -add_dir "/dev/mapper" [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" add_binary "/sbin/dmsetup"
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD encrypt_install)
Date: Saturday, May 28, 2011 @ 13:14:11 Author: thomas Revision: 125738 cryptsetup: update to 1.3.1 and add 11-dm-initramfs.rules udev rule to initramfs to fix weird bugs with udev rules Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/encrypt_install -+ PKGBUILD|8 encrypt_install |1 + 2 files changed, 5 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-05-28 17:13:18 UTC (rev 125737) +++ PKGBUILD2011-05-28 17:14:11 UTC (rev 125738) @@ -1,22 +1,22 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/"; groups=('base') -depends=('device-mapper' 'libgcrypt' 'popt') +depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') conflicts=('mkinitcpio<0.5.99') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) -sha256sums=('c675059a25061851dcaf9732a2118d75585097c8fbb3985026526988e8d76394' +sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' -'8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a') +'07918fc349b3a7c4a73e8ad1cc3d97a2a79ebc7655090ab9ebb00b1e092c85aa') build() { cd $srcdir/$pkgname-${pkgver} Modified: encrypt_install === --- encrypt_install 2011-05-28 17:13:18 UTC (rev 125737) +++ encrypt_install 2011-05-28 17:14:11 UTC (rev 125738) @@ -16,6 +16,7 @@ add_file "/lib/udev/rules.d/10-dm.rules" add_file "/lib/udev/rules.d/13-dm-disk.rules" add_file "/lib/udev/rules.d/95-dm-notify.rules" +add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" } help ()
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Saturday, May 14, 2011 @ 05:00:27 Author: thomas Revision: 123894 cryptsetup: Upstream update 1.2.0 -> 1.3.0 Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2011-05-14 08:27:37 UTC (rev 123893) +++ PKGBUILD2011-05-14 09:00:27 UTC (rev 123894) @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.2.0 +pkgver=1.3.0 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) @@ -14,7 +14,7 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) -sha256sums=('411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea' +sha256sums=('c675059a25061851dcaf9732a2118d75585097c8fbb3985026526988e8d76394' '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' '8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Sunday, July 11, 2010 @ 06:36:02 Author: thomas Revision: 85278 Upstream update 1.1.2->1.1.3 Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-07-11 10:30:45 UTC (rev 85277) +++ PKGBUILD2010-07-11 10:36:02 UTC (rev 85278) @@ -1,20 +1,20 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.1.2 -pkgrel=2 +pkgver=1.1.3 +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/"; groups=('base') -depends=('device-mapper' 'libgcrypt' 'popt' 'e2fsprogs') +depends=('device-mapper' 'libgcrypt' 'popt') conflicts=('mkinitcpio<0.5.99') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) -sha256sums=('45972839fbb169b3ad5649454c217b7f5b0b3c8bf07e32f51a334a88217c7293' +sha256sums=('9c8e68a272f6d9cfb6cd65cc0743f4c44a2096c61f74e0602bf40208b5e69c0a' '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' '8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a')
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Wednesday, June 30, 2010 @ 13:29:50 Author: thomas Revision: 84519 Fix pkgconfig location, see https://bugs.archlinux.org/task/19883 Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-06-30 16:51:55 UTC (rev 84518) +++ PKGBUILD2010-06-30 17:29:50 UTC (rev 84519) @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler pkgname=cryptsetup pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) license=('GPL') @@ -22,8 +22,15 @@ cd $srcdir/$pkgname-${pkgver} ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib make || return 1 +} + +package() { + cd $srcdir/$pkgname-${pkgver} make DESTDIR=$pkgdir install # install hook - install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt || return 1 - install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt || return 1 + install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt + install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt + # Fix pkgconfig location + install -d -m755 $pkgdir/usr/lib + mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib/ }
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Monday, May 31, 2010 @ 13:45:41 Author: thomas Revision: 81542 Upstream update: 1.1.2 Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-05-31 17:42:31 UTC (rev 81541) +++ PKGBUILD2010-05-31 17:45:41 UTC (rev 81542) @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) @@ -14,7 +14,7 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) -sha256sums=('a0d07cfc03d3a12d54e68eebb509e6ce45bbd5169ae277256ea7bd165cc246bd' +sha256sums=('45972839fbb169b3ad5649454c217b7f5b0b3c8bf07e32f51a334a88217c7293' '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' '8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a')
Re: [arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
On Thursday May 27 2010 19:32:40 Thomas Bächler wrote: > pkgname=cryptsetup > -_realver=1.1.1-rc2 > -pkgver=$(echo ${_realver} | sed 's|-|_|g') > +pkgver=1.1.1 warning: cryptsetup: local (1.1.1_rc2-1) is newer than testing (1.1.1-1) Hi Thomas, seems that it needs 'force' -- Andrea Scarpino - andreascarpino.it KDE Maintainer in Arch Linux
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Thursday, May 27, 2010 @ 13:32:40 Author: thomas Revision: 81244 Update to final 1.1.1 release Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD |9 - 1 file changed, 4 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-05-27 17:32:22 UTC (rev 81243) +++ PKGBUILD2010-05-27 17:32:40 UTC (rev 81244) @@ -1,8 +1,7 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -_realver=1.1.1-rc2 -pkgver=$(echo ${_realver} | sed 's|-|_|g') +pkgver=1.1.1 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) @@ -12,15 +11,15 @@ depends=('device-mapper' 'libgcrypt' 'popt' 'e2fsprogs') conflicts=('mkinitcpio<0.5.99') options=('!libtool' '!emptydirs') -source=(http://cryptsetup.googlecode.com/files/${pkgname}-${_realver}.tar.bz2 +source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) -sha256sums=('02875d87ab1957a0f53f421eac0154a72c45564d88c10f59a013e6c449f68f55' +sha256sums=('a0d07cfc03d3a12d54e68eebb509e6ce45bbd5169ae277256ea7bd165cc246bd' '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' '8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a') build() { - cd $srcdir/$pkgname-${_realver} + cd $srcdir/$pkgname-${pkgver} ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib make || return 1 make DESTDIR=$pkgdir install
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD)
Date: Monday, May 3, 2010 @ 14:16:43 Author: thomas Revision: 79383 Update to the latest 1.1.1 release candidate Remove the static binary Modified: cryptsetup/trunk/PKGBUILD --+ PKGBUILD | 22 +++--- 1 file changed, 7 insertions(+), 15 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-05-03 18:12:54 UTC (rev 79382) +++ PKGBUILD2010-05-03 18:16:43 UTC (rev 79383) @@ -1,8 +1,9 @@ # $Id$ # Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.1.0 -pkgrel=2 +_realver=1.1.1-rc2 +pkgver=$(echo ${_realver} | sed 's|-|_|g') +pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) license=('GPL') @@ -11,27 +12,18 @@ depends=('device-mapper' 'libgcrypt' 'popt' 'e2fsprogs') conflicts=('mkinitcpio<0.5.99') options=('!libtool' '!emptydirs') -source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 +source=(http://cryptsetup.googlecode.com/files/${pkgname}-${_realver}.tar.bz2 encrypt_hook encrypt_install) -sha256sums=('b343fa6bf3c48b633e68da25e44aebd6a32a3dc21c10604acd6faa04e41f58f3' +sha256sums=('02875d87ab1957a0f53f421eac0154a72c45564d88c10f59a013e6c449f68f55' '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' '8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a') -md5sums=('8177f1833f4d6aaacc5812046d2010b6' - '1b25c0aca2cfd0306dd70de1888cb5b8' - '69af34d82690ce8204ce2d249c24be7a') build() { - cd $srcdir/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static + cd $srcdir/$pkgname-${_realver} + ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib make || return 1 make DESTDIR=$pkgdir install - # include a static cryptsetup binary for initrd setups - make clean - cd $srcdir/$pkgname-${pkgver} - ./configure --prefix=/usr --enable-static - make || return 1 - install -D -m755 src/cryptsetup $pkgdir/sbin/cryptsetup.static || return 1 # install hook install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt || return 1 install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt || return 1
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD encrypt_hook encrypt_install)
Date: Friday, February 5, 2010 @ 17:53:48 Author: thomas Revision: 67245 Prepare for mkinitcpio 0.6 Modified: cryptsetup/trunk/PKGBUILD cryptsetup/trunk/encrypt_hook cryptsetup/trunk/encrypt_install -+ PKGBUILD| 12 - encrypt_hook| 70 +++--- encrypt_install | 10 +-- 3 files changed, 49 insertions(+), 43 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-05 22:51:54 UTC (rev 67244) +++ PKGBUILD2010-02-05 22:53:48 UTC (rev 67245) @@ -2,24 +2,24 @@ # Maintainer: Thomas Bächler pkgname=cryptsetup pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/"; groups=('base') depends=('device-mapper' 'libgcrypt' 'popt' 'e2fsprogs') -conflicts=('mkinitcpio<0.5.24.99') +conflicts=('mkinitcpio<0.5.99') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook encrypt_install) sha256sums=('b343fa6bf3c48b633e68da25e44aebd6a32a3dc21c10604acd6faa04e41f58f3' -'b2a8ee13156b7962b48186c97080421336fd3b9641a7711b89bcc49ab73dc62a' -'fa76c48065e26109592431867f468721c360d481dcb0bdc0adc49e750171faa2') +'64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' +'8e4920bb4b5ce96508aa0c42b9b07326b70daf630519f1aa1d8082bca709c12a') md5sums=('8177f1833f4d6aaacc5812046d2010b6' - '6bdb1b83539453d403335aed1a579a5c' - '24b76e9cb938bc3c8dcff396cbab28c7') + '1b25c0aca2cfd0306dd70de1888cb5b8' + '69af34d82690ce8204ce2d249c24be7a') build() { cd $srcdir/$pkgname-${pkgver} Modified: encrypt_hook === --- encrypt_hook2010-02-05 22:51:54 UTC (rev 67244) +++ encrypt_hook2010-02-05 22:53:48 UTC (rev 67245) @@ -5,16 +5,17 @@ { /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then -if [ ! -c "/dev/mapper/control" ]; then -read dev_t < /sys/class/misc/device-mapper/dev -/bin/mknod "/dev/mapper/control" c $(/bin/replace "${dev_t}" ':') +if [ ! -e "/dev/mapper/control" ]; then +/bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" # Get keyfile if specified ckeyfile="/crypto_keyfile.bin" if [ "x${cryptkey}" != "x" ]; then -set -- $(/bin/replace "${cryptkey}" ':'); ckdev=$1; ckarg1=$2; ckarg2=$3 +ckdev="$(echo "${cryptkey}" | cut -d: -f1)" +ckarg1="$(echo "${cryptkey}" | cut -d: -f2)" +ckarg2="$(echo "${cryptkey}" | cut -d: -f3)" if poll_device "${ckdev}" ${rootdelay}; then case ${ckarg1} in *[!0-9]*) @@ -37,7 +38,8 @@ if [ -n "${cryptdevice}" ]; then DEPRECATED_CRYPT=0 -set -- $(/bin/replace "${cryptdevice}" ':'); cryptdev="$1"; cryptname="$2"; +cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)" +cryptname="$(echo "${cryptdevice}" | cut -d: -f2)" else DEPRECATED_CRYPT=1 cryptdev="${root}" @@ -50,12 +52,12 @@ } if poll_device "${cryptdev}" ${rootdelay}; then -if /bin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then +if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated dopassphrase=1 # If keyfile exists, try to use that if [ -f ${ckeyfile} ]; then -if eval /bin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; then +if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; then dopassphrase=0 else echo "Invalid keyfile. Reverting to passphrase." @@ -67,7 +69,7 @@ echo "A password is required to access the ${cryptname} volume:" #loop until we get a real password -while ! eval /bin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do +while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do sleep 2; done fi @@ -79,33 +81,33 @@ err "Password succeeded, but ${cryptname} creation failed, aborting..." exit 1 fi -elif [ "x${crypto}" != "x" ]; th
[arch-commits] Commit in cryptsetup/trunk (PKGBUILD luksOpen-status.patch)
Date: Sunday, January 24, 2010 @ 09:28:39 Author: thomas Revision: 65135 Upstream update to 1.1.0, fixing tons of bugs Modified: cryptsetup/trunk/PKGBUILD Deleted: cryptsetup/trunk/luksOpen-status.patch ---+ PKGBUILD | 17 - luksOpen-status.patch | 13 - 2 files changed, 8 insertions(+), 22 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-01-24 14:27:48 UTC (rev 65134) +++ PKGBUILD2010-01-24 14:28:39 UTC (rev 65135) @@ -1,7 +1,7 @@ # $Id$ -# Maintainer: Judd Vinet +# Maintainer: Thomas Bächler pkgname=cryptsetup -pkgver=1.0.7 +pkgver=1.1.0 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" arch=(i686 x86_64) @@ -13,17 +13,16 @@ options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook - encrypt_install - luksOpen-status.patch) -md5sums=('5eea2a77391a8a1a651b31cbaef59e22' + encrypt_install) +sha256sums=('b343fa6bf3c48b633e68da25e44aebd6a32a3dc21c10604acd6faa04e41f58f3' +'b2a8ee13156b7962b48186c97080421336fd3b9641a7711b89bcc49ab73dc62a' +'fa76c48065e26109592431867f468721c360d481dcb0bdc0adc49e750171faa2') +md5sums=('8177f1833f4d6aaacc5812046d2010b6' '6bdb1b83539453d403335aed1a579a5c' - '24b76e9cb938bc3c8dcff396cbab28c7' - 'd4be8d2059d5427c057be4de4e948887') + '24b76e9cb938bc3c8dcff396cbab28c7') build() { cd $srcdir/$pkgname-${pkgver} - # suppress "Command successful" message on luksOpen - patch -p1 -i $srcdir/luksOpen-status.patch || return 1 ./configure --prefix=/usr --disable-static make || return 1 make DESTDIR=$pkgdir install Deleted: luksOpen-status.patch === --- luksOpen-status.patch 2010-01-24 14:27:48 UTC (rev 65134) +++ luksOpen-status.patch 2010-01-24 14:28:39 UTC (rev 65135) @@ -1,13 +0,0 @@ -diff -Nur cryptsetup-luks-1.0.4.orig/src/cryptsetup.c cryptsetup-luks-1.0.4/src/cryptsetup.c cryptsetup-luks-1.0.4.orig/src/cryptsetup.c2006-10-04 15:47:00.0 +0200 -+++ cryptsetup-luks-1.0.4/src/cryptsetup.c 2006-12-16 15:54:12.0 +0100 -@@ -249,7 +249,8 @@ - if (opt_readonly) - options.flags |= CRYPT_FLAG_READONLY; - r = crypt_luksOpen(&options); -- show_status(-r); -+ if(r) -+ show_status(-r); - return r; - } -