~mdw / termux-packages / blame
| Commit | Line | Data |
|---|---|---|
| af01d784 LP |
1 | diff -uNr libgcrypt-1.8.1/random/random.c libgcrypt-1.8.1.mod/random/random.c |
| 2 | --- libgcrypt-1.8.1/random/random.c 2017-06-24 14:34:29.000000000 +0300 | |
| 3 | +++ libgcrypt-1.8.1.mod/random/random.c 2017-09-12 10:37:13.012994125 +0300 | |
| 4 | @@ -40,7 +40,7 @@ | |
| 5 | #include "cipher.h" /* For _gcry_sha1_hash_buffer(). */ | |
| 6 | ||
| 7 | /* The name of a file used to globally configure the RNG. */ | |
| 8 | -#define RANDOM_CONF_FILE "/etc/gcrypt/random.conf" | |
| 9 | +#define RANDOM_CONF_FILE "@TERMUX_PREFIX@/etc/gcrypt/random.conf" | |
| 10 | ||
| 11 | ||
| 12 | /* If not NULL a progress function called from certain places and the | |
| 13 | diff -uNr libgcrypt-1.8.1/random/rndunix.c libgcrypt-1.8.1.mod/random/rndunix.c | |
| 14 | --- libgcrypt-1.8.1/random/rndunix.c 2017-05-23 18:30:34.000000000 +0300 | |
| 15 | +++ libgcrypt-1.8.1.mod/random/rndunix.c 2017-09-12 10:54:50.432993369 +0300 | |
| 16 | @@ -226,6 +226,42 @@ | |
| 17 | const int hasAlternative; /* Whether source has alt.location */ | |
| 18 | } dataSources[] = { | |
| 19 | ||
| 20 | + // For Android | |
| 21 | + { "/system/bin/vmstat", "-s", SC(-3), NULL, 0, 0, 0, 1 }, | |
| 22 | + { "/system/xbin/vmstat", "-s", SC(-3), NULL, 0, 0, 0, 1 }, | |
| 23 | + { "/system/bin/netstat", "-s", SC(2), NULL, 0, 0, 0, 1 }, | |
| 24 | + { "/system/xbin/netstat", "-s", SC(2), NULL, 0, 0, 0, 1 }, | |
| 25 | + { "/system/bin/mpstat", NULL, SC(1), NULL, 0, 0, 0, 0 }, | |
| 26 | + { "/system/xbin/mpstat", NULL, SC(1), NULL, 0, 0, 0, 0 }, | |
| 27 | + { "/system/bin/df", NULL, SC(1), NULL, 0, 0, 0, 0 }, | |
| 28 | + { "/system/xbin/df", NULL, SC(1), NULL, 0, 0, 0, 0 }, | |
| 29 | + { "/system/bin/iostat", NULL, SC(SC_0), NULL, 0, 0, 0, 0 }, | |
| 30 | + { "/system/xbin/iostat", NULL, SC(SC_0), NULL, 0, 0, 0, 0 }, | |
| 31 | + { "/system/bin/uptime", NULL, SC(SC_0), NULL, 0, 0, 0, 1 }, | |
| 32 | + { "/system/xbin/uptime", NULL, SC(SC_0), NULL, 0, 0, 0, 1 }, | |
| 33 | + { "/system/bin/ps", "aux", SC(0.3), NULL, 0, 0, 0, 1 }, | |
| 34 | + { "/system/xbin/ps", "aux", SC(0.3), NULL, 0, 0, 0, 1 }, | |
| 35 | + { "/system/bin/arp", "-a", SC(0.1), NULL, 0, 0, 0, 1 }, | |
| 36 | + { "/system/xbin/arp", "-a", SC(0.1), NULL, 0, 0, 0, 1 }, | |
| 37 | + | |
| 38 | + // For Termux | |
| 39 | + { "@TERMUX_PREFIX@/bin/vmstat", "-s", SC(-3), NULL, 0, 0, 0, 1 }, | |
| 40 | + { "@TERMUX_PREFIX@/bin/applets/vmstat", "-s", SC(-3), NULL, 0, 0, 0, 1 }, | |
| 41 | + { "@TERMUX_PREFIX@/bin/netstat", "-s", SC(2), NULL, 0, 0, 0, 1 }, | |
| 42 | + { "@TERMUX_PREFIX@/bin/applets/netstat", "-s", SC(2), NULL, 0, 0, 0, 1 }, | |
| 43 | + { "@TERMUX_PREFIX@/bin/mpstat", NULL, SC(1), NULL, 0, 0, 0, 0 }, | |
| 44 | + { "@TERMUX_PREFIX@/bin/applets/mpstat", NULL, SC(1), NULL, 0, 0, 0, 0 }, | |
| 45 | + { "@TERMUX_PREFIX@/bin/df", NULL, SC(1), NULL, 0, 0, 0, 0 }, | |
| 46 | + { "@TERMUX_PREFIX@/bin/applets/df", NULL, SC(1), NULL, 0, 0, 0, 0 }, | |
| 47 | + { "@TERMUX_PREFIX@/bin/iostat", NULL, SC(SC_0), NULL, 0, 0, 0, 0 }, | |
| 48 | + { "@TERMUX_PREFIX@/bin/applets/iostat", NULL, SC(SC_0), NULL, 0, 0, 0, 0 }, | |
| 49 | + { "@TERMUX_PREFIX@/bin/uptime", NULL, SC(SC_0), NULL, 0, 0, 0, 1 }, | |
| 50 | + { "@TERMUX_PREFIX@/bin/applets/uptime", NULL, SC(SC_0), NULL, 0, 0, 0, 1 }, | |
| 51 | + { "@TERMUX_PREFIX@/bin/ps", "aux", SC(0.3), NULL, 0, 0, 0, 1 }, | |
| 52 | + { "@TERMUX_PREFIX@/bin/applets/ps", "aux", SC(0.3), NULL, 0, 0, 0, 1 }, | |
| 53 | + { "@TERMUX_PREFIX@/bin/arp", "-a", SC(0.1), NULL, 0, 0, 0, 1 }, | |
| 54 | + { "@TERMUX_PREFIX@/bin/applets/arp", "-a", SC(0.1), NULL, 0, 0, 0, 1 }, | |
| 55 | + | |
| 56 | { "/bin/vmstat", "-s", SC(-3), NULL, 0, 0, 0, 1 }, | |
| 57 | { "/usr/bin/vmstat", "-s", SC(-3), NULL, 0, 0, 0, 0}, | |
| 58 | { "/bin/vmstat", "-c", SC(-3), NULL, 0, 0, 0, 1 }, | |
| 59 | diff -uNr libgcrypt-1.8.1/src/fips.c libgcrypt-1.8.1.mod/src/fips.c | |
| 60 | --- libgcrypt-1.8.1/src/fips.c 2016-04-07 18:30:08.000000000 +0300 | |
| 61 | +++ libgcrypt-1.8.1.mod/src/fips.c 2017-09-12 10:36:08.292994171 +0300 | |
| 62 | @@ -36,7 +36,7 @@ | |
| 63 | ||
| 64 | ||
| 65 | /* The name of the file used to force libgcrypt into fips mode. */ | |
| 66 | -#define FIPS_FORCE_FILE "/etc/gcrypt/fips_enabled" | |
| 67 | +#define FIPS_FORCE_FILE "@TERMUX_PREFIX@/etc/gcrypt/fips_enabled" | |
| 68 | ||
| 69 | ||
| 70 | /* The states of the finite state machine used in fips mode. */ | |
| 71 | diff -uNr libgcrypt-1.8.1/src/hwfeatures.c libgcrypt-1.8.1.mod/src/hwfeatures.c | |
| 72 | --- libgcrypt-1.8.1/src/hwfeatures.c 2017-06-24 14:34:29.000000000 +0300 | |
| 73 | +++ libgcrypt-1.8.1.mod/src/hwfeatures.c 2017-09-12 10:37:03.892994132 +0300 | |
| 74 | @@ -33,7 +33,7 @@ | |
| 75 | #include "hwf-common.h" | |
| 76 | ||
| 77 | /* The name of a file used to globally disable selected features. */ | |
| 78 | -#define HWF_DENY_FILE "/etc/gcrypt/hwf.deny" | |
| 79 | +#define HWF_DENY_FILE "@TERMUX_PREFIX@/etc/gcrypt/hwf.deny" | |
| 80 | ||
| 81 | /* A table to map hardware features to a string. */ | |
| 82 | static struct |