mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-11-01 08:51:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

testing/dislocker: fix build with gcc11

Browse Source
This commit is contained in:
psykose 2022-04-25 18:44:45 +00:00 committed by alice
parent 8f621b15aa
commit c170f7f830
2 changed files with 151 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
testing/dislocker/APKBUILD
View File

@ -16,7 +16,9 @@ makedepends="
samurai
"
subpackages="$pkgname-doc $pkgname-libs"
source="$pkgname-$pkgver.tar.gz::https://github.com/Aorimn/dislocker/archive/v$pkgver.tar.gz"
source="$pkgname-$pkgver.tar.gz::https://github.com/Aorimn/dislocker/archive/v$pkgver.tar.gz
fix-build.patch
"
build() {
cmake -B build -G Ninja \
@ -32,4 +34,5 @@ package() {
sha512sums="
c62241d70d51f6445a2f6d0f08e099bbc1a4257ca98232471fc43ec63e69d62ae5f702c995ec00b7e1db7d33f4bb3a31ea05bc13862bf3b539feb301a0e034ff dislocker-0.7.3.tar.gz
7041559becbb5136d52b9494898ab3e315bdd7eddef7276e5f3f3cacd8a585718407d9fbcb9c589cc8702519d95cc4a37b6442358a5e8a3281ef5b05591295e6 fix-build.patch
"

147
testing/dislocker/fix-build.patch Normal file
View File

@ -0,0 +1,147 @@
diff -U3 -r a/src/config.c b/src/config.c
--- a/src/config.c 2022-04-25 20:41:04.627290032 +0200
+++ b/src/config.c 2022-04-25 20:44:19.075583833 +0200
@@ -56,13 +56,13 @@
static void setclearkey(dis_context_t dis_ctx, char* optarg)
{
(void) optarg;
- int true = TRUE;
- dis_setopt(dis_ctx, DIS_OPT_USE_CLEAR_KEY, &true);
+ int flag = TRUE;
+ dis_setopt(dis_ctx, DIS_OPT_USE_CLEAR_KEY, &flag);
}
static void setbekfile(dis_context_t dis_ctx, char* optarg)
{
- int true = TRUE;
- dis_setopt(dis_ctx, DIS_OPT_USE_BEK_FILE, &true);
+ int flag = TRUE;
+ dis_setopt(dis_ctx, DIS_OPT_USE_BEK_FILE, &flag);
dis_setopt(dis_ctx, DIS_OPT_SET_BEK_FILE_PATH, optarg);
}
static void setforceblock(dis_context_t dis_ctx, char* optarg)
@@ -76,14 +76,14 @@
}
static void setfvek(dis_context_t dis_ctx, char* optarg)
{
- int true = TRUE;
- dis_setopt(dis_ctx, DIS_OPT_USE_FVEK_FILE, &true);
+ int flag = TRUE;
+ dis_setopt(dis_ctx, DIS_OPT_USE_FVEK_FILE, &flag);
dis_setopt(dis_ctx, DIS_OPT_SET_FVEK_FILE_PATH, optarg);
}
static void setvmk(dis_context_t dis_ctx, char* optarg)
{
- int true = TRUE;
- dis_setopt(dis_ctx, DIS_OPT_USE_VMK_FILE, &true);
+ int flag = TRUE;
+ dis_setopt(dis_ctx, DIS_OPT_USE_VMK_FILE, &flag);
dis_setopt(dis_ctx, DIS_OPT_SET_VMK_FILE_PATH, optarg);
}
static void setlogfile(dis_context_t dis_ctx, char* optarg)
@@ -97,8 +97,8 @@
}
static void setrecoverypwd(dis_context_t dis_ctx, char* optarg)
{
- int true = TRUE;
- dis_setopt(dis_ctx, DIS_OPT_USE_RECOVERY_PASSWORD, &true);
+ int flag = TRUE;
+ dis_setopt(dis_ctx, DIS_OPT_USE_RECOVERY_PASSWORD, &flag);
dis_setopt(dis_ctx, DIS_OPT_SET_RECOVERY_PASSWORD, optarg);
hide_opt(optarg);
}
@@ -111,19 +111,19 @@
static void setro(dis_context_t dis_ctx, char* optarg)
{
(void) optarg;
- int true = TRUE;
- dis_setopt(dis_ctx, DIS_OPT_READ_ONLY, &true);
+ int flag = TRUE;
+ dis_setopt(dis_ctx, DIS_OPT_READ_ONLY, &flag);
}
static void setstateok(dis_context_t dis_ctx, char* optarg)
{
(void) optarg;
- int true = TRUE;
- dis_setopt(dis_ctx, DIS_OPT_DONT_CHECK_VOLUME_STATE, &true);
+ int flag = TRUE;
+ dis_setopt(dis_ctx, DIS_OPT_DONT_CHECK_VOLUME_STATE, &flag);
}
static void setuserpassword(dis_context_t dis_ctx, char* optarg)
{
- int true = TRUE;
- dis_setopt(dis_ctx, DIS_OPT_USE_USER_PASSWORD, &true);
+ int flag = TRUE;
+ dis_setopt(dis_ctx, DIS_OPT_USE_USER_PASSWORD, &flag);
dis_setopt(dis_ctx, DIS_OPT_SET_USER_PASSWORD, optarg);
hide_opt(optarg);
}
@@ -266,7 +266,7 @@
return -1;
dis_config_t* cfg = &dis_ctx->cfg;
- int true = TRUE;
+ int flag = TRUE;
long_opts = malloc(nb_options * sizeof(struct option));
@@ -285,12 +285,12 @@
{
case 'c':
{
- dis_setopt(dis_ctx, DIS_OPT_USE_CLEAR_KEY, &true);
+ dis_setopt(dis_ctx, DIS_OPT_USE_CLEAR_KEY, &flag);
break;
}
case 'f':
{
- dis_setopt(dis_ctx, DIS_OPT_USE_BEK_FILE, &true);
+ dis_setopt(dis_ctx, DIS_OPT_USE_BEK_FILE, &flag);
dis_setopt(dis_ctx, DIS_OPT_SET_BEK_FILE_PATH, optarg);
break;
}
@@ -312,13 +312,13 @@
}
case 'k':
{
- dis_setopt(dis_ctx, DIS_OPT_USE_FVEK_FILE, &true);
+ dis_setopt(dis_ctx, DIS_OPT_USE_FVEK_FILE, &flag);
dis_setopt(dis_ctx, DIS_OPT_SET_FVEK_FILE_PATH, optarg);
break;
}
case 'K':
{
- dis_setopt(dis_ctx, DIS_OPT_USE_VMK_FILE, &true);
+ dis_setopt(dis_ctx, DIS_OPT_USE_VMK_FILE, &flag);
dis_setopt(dis_ctx, DIS_OPT_SET_VMK_FILE_PATH, optarg);
break;
}
@@ -340,7 +340,7 @@
}
case 'p':
{
- dis_setopt(dis_ctx, DIS_OPT_USE_RECOVERY_PASSWORD, &true);
+ dis_setopt(dis_ctx, DIS_OPT_USE_RECOVERY_PASSWORD, &flag);
dis_setopt(dis_ctx, DIS_OPT_SET_RECOVERY_PASSWORD, optarg);
hide_opt(optarg);
break;
@@ -353,17 +353,17 @@
}
case 'r':
{
- dis_setopt(dis_ctx, DIS_OPT_READ_ONLY, &true);
+ dis_setopt(dis_ctx, DIS_OPT_READ_ONLY, &flag);
break;
}
case 's':
{
- dis_setopt(dis_ctx, DIS_OPT_DONT_CHECK_VOLUME_STATE, &true);
+ dis_setopt(dis_ctx, DIS_OPT_DONT_CHECK_VOLUME_STATE, &flag);
break;
}
case 'u':
{
- dis_setopt(dis_ctx, DIS_OPT_USE_USER_PASSWORD, &true);
+ dis_setopt(dis_ctx, DIS_OPT_USE_USER_PASSWORD, &flag);
dis_setopt(dis_ctx, DIS_OPT_SET_USER_PASSWORD, optarg);
hide_opt(optarg);
break;