sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libgcrypt: do not use binaries from $PREFIX/bin/applets

Browse Source
This commit is contained in:
Leonid Pliushch 2020-07-09 01:40:08 +03:00
parent 656550b02c
commit 338f8b43bc
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/libgcrypt/fix-hardcoded-paths.patch
View File

@ -1,6 +1,6 @@
diff -uNr libgcrypt-1.8.1/random/random.c libgcrypt-1.8.1.mod/random/random.c
--- libgcrypt-1.8.1/random/random.c 2017-06-24 14:34:29.000000000 +0300
+++ libgcrypt-1.8.1.mod/random/random.c 2017-09-12 10:37:13.012994125 +0300
diff -uNr libgcrypt-1.8.5/random/random.c libgcrypt-1.8.5.mod/random/random.c
--- libgcrypt-1.8.5/random/random.c 2017-11-23 20:16:58.000000000 +0200
+++ libgcrypt-1.8.5.mod/random/random.c 2020-07-09 01:38:34.654910933 +0300
@@ -40,7 +40,7 @@
#include "cipher.h" /* For _gcry_sha1_hash_buffer(). */
@ -10,10 +10,10 @@ diff -uNr libgcrypt-1.8.1/random/random.c libgcrypt-1.8.1.mod/random/random.c
/* If not NULL a progress function called from certain places and the
diff -uNr libgcrypt-1.8.1/random/rndunix.c libgcrypt-1.8.1.mod/random/rndunix.c
--- libgcrypt-1.8.1/random/rndunix.c 2017-05-23 18:30:34.000000000 +0300
+++ libgcrypt-1.8.1.mod/random/rndunix.c 2017-09-12 10:54:50.432993369 +0300
@@ -226,6 +226,42 @@
diff -uNr libgcrypt-1.8.5/random/rndunix.c libgcrypt-1.8.5.mod/random/rndunix.c
--- libgcrypt-1.8.5/random/rndunix.c 2017-11-23 20:16:58.000000000 +0200
+++ libgcrypt-1.8.5.mod/random/rndunix.c 2020-07-09 01:39:42.815220008 +0300
@@ -226,6 +226,34 @@
const int hasAlternative; /* Whether source has alt.location */
} dataSources[] = {
@ -37,28 +37,20 @@ diff -uNr libgcrypt-1.8.1/random/rndunix.c libgcrypt-1.8.1.mod/random/rndunix.c
+
+ // For Termux
+ { "@TERMUX_PREFIX@/bin/vmstat", "-s", SC(-3), NULL, 0, 0, 0, 1 },
+ { "@TERMUX_PREFIX@/bin/applets/vmstat", "-s", SC(-3), NULL, 0, 0, 0, 1 },
+ { "@TERMUX_PREFIX@/bin/netstat", "-s", SC(2), NULL, 0, 0, 0, 1 },
+ { "@TERMUX_PREFIX@/bin/applets/netstat", "-s", SC(2), NULL, 0, 0, 0, 1 },
+ { "@TERMUX_PREFIX@/bin/mpstat", NULL, SC(1), NULL, 0, 0, 0, 0 },
+ { "@TERMUX_PREFIX@/bin/applets/mpstat", NULL, SC(1), NULL, 0, 0, 0, 0 },
+ { "@TERMUX_PREFIX@/bin/df", NULL, SC(1), NULL, 0, 0, 0, 0 },
+ { "@TERMUX_PREFIX@/bin/applets/df", NULL, SC(1), NULL, 0, 0, 0, 0 },
+ { "@TERMUX_PREFIX@/bin/iostat", NULL, SC(SC_0), NULL, 0, 0, 0, 0 },
+ { "@TERMUX_PREFIX@/bin/applets/iostat", NULL, SC(SC_0), NULL, 0, 0, 0, 0 },
+ { "@TERMUX_PREFIX@/bin/uptime", NULL, SC(SC_0), NULL, 0, 0, 0, 1 },
+ { "@TERMUX_PREFIX@/bin/applets/uptime", NULL, SC(SC_0), NULL, 0, 0, 0, 1 },
+ { "@TERMUX_PREFIX@/bin/ps", "aux", SC(0.3), NULL, 0, 0, 0, 1 },
+ { "@TERMUX_PREFIX@/bin/applets/ps", "aux", SC(0.3), NULL, 0, 0, 0, 1 },
+ { "@TERMUX_PREFIX@/bin/arp", "-a", SC(0.1), NULL, 0, 0, 0, 1 },
+ { "@TERMUX_PREFIX@/bin/applets/arp", "-a", SC(0.1), NULL, 0, 0, 0, 1 },
+
{ "/bin/vmstat", "-s", SC(-3), NULL, 0, 0, 0, 1 },
{ "/usr/bin/vmstat", "-s", SC(-3), NULL, 0, 0, 0, 0},
{ "/bin/vmstat", "-c", SC(-3), NULL, 0, 0, 0, 1 },
diff -uNr libgcrypt-1.8.1/src/fips.c libgcrypt-1.8.1.mod/src/fips.c
--- libgcrypt-1.8.1/src/fips.c 2016-04-07 18:30:08.000000000 +0300
+++ libgcrypt-1.8.1.mod/src/fips.c 2017-09-12 10:36:08.292994171 +0300
diff -uNr libgcrypt-1.8.5/src/fips.c libgcrypt-1.8.5.mod/src/fips.c
--- libgcrypt-1.8.5/src/fips.c 2017-11-23 20:16:58.000000000 +0200
+++ libgcrypt-1.8.5.mod/src/fips.c 2020-07-09 01:38:34.658910952 +0300
@@ -36,7 +36,7 @@
@ -68,9 +60,9 @@ diff -uNr libgcrypt-1.8.1/src/fips.c libgcrypt-1.8.1.mod/src/fips.c
/* The states of the finite state machine used in fips mode. */
diff -uNr libgcrypt-1.8.1/src/hwfeatures.c libgcrypt-1.8.1.mod/src/hwfeatures.c
--- libgcrypt-1.8.1/src/hwfeatures.c 2017-06-24 14:34:29.000000000 +0300
+++ libgcrypt-1.8.1.mod/src/hwfeatures.c 2017-09-12 10:37:03.892994132 +0300
diff -uNr libgcrypt-1.8.5/src/hwfeatures.c libgcrypt-1.8.5.mod/src/hwfeatures.c
--- libgcrypt-1.8.5/src/hwfeatures.c 2017-11-23 20:16:58.000000000 +0200
+++ libgcrypt-1.8.5.mod/src/hwfeatures.c 2020-07-09 01:38:34.658910952 +0300
@@ -33,7 +33,7 @@
#include "hwf-common.h"