Leonid Plyushch
5 years ago
No known key found for this signature in database
GPG Key ID: 45F2964132545795
2 changed files with
2 additions and
24 deletions
-
packages/util-linux/build.sh
-
packages/util-linux/fix-paths.patch
|
|
|
@ -1,10 +1,9 @@ |
|
|
|
TERMUX_PKG_HOMEPAGE=https://en.wikipedia.org/wiki/Util-linux |
|
|
|
TERMUX_PKG_DESCRIPTION="Miscellaneous system utilities" |
|
|
|
TERMUX_PKG_LICENSE="GPL-2.0" |
|
|
|
TERMUX_PKG_VERSION=2.34 |
|
|
|
TERMUX_PKG_REVISION=2 |
|
|
|
TERMUX_PKG_VERSION=2.35 |
|
|
|
TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/utils/util-linux/v${TERMUX_PKG_VERSION:0:4}/util-linux-${TERMUX_PKG_VERSION}.tar.xz |
|
|
|
TERMUX_PKG_SHA256=743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5 |
|
|
|
TERMUX_PKG_SHA256=b3081b560268c1ec3367e035234e91616fa7923a0afc2b1c80a2a6d8b9dfe2c9 |
|
|
|
TERMUX_PKG_DEPENDS="ncurses, libcrypt, zlib" |
|
|
|
TERMUX_PKG_BREAKS="util-linux-dev" |
|
|
|
TERMUX_PKG_REPLACES="util-linux-dev" |
|
|
|
|
|
|
|
@ -250,27 +250,6 @@ diff -uNr util-linux-2.34/libuuid/src/uuidP.h util-linux-2.34.mod/libuuid/src/uu |
|
|
|
|
|
|
|
/* |
|
|
|
* Offset between 15-Oct-1582 and 1-Jan-70 |
|
|
|
diff -uNr util-linux-2.34/login-utils/login.c util-linux-2.34.mod/login-utils/login.c
|
|
|
|
--- util-linux-2.34/login-utils/login.c 2019-05-27 12:53:09.756205982 +0300
|
|
|
|
+++ util-linux-2.34.mod/login-utils/login.c 2019-07-23 19:16:35.311138086 +0300
|
|
|
|
@@ -1359,7 +1359,7 @@
|
|
|
|
|
|
|
|
strcpy(buff, "exec "); |
|
|
|
strcat(buff, pwd->pw_shell); |
|
|
|
- childArgv[childArgc++] = "/bin/sh";
|
|
|
|
+ childArgv[childArgc++] = "@TERMUX_PREFIX@/bin/sh";
|
|
|
|
childArgv[childArgc++] = "-sh"; |
|
|
|
childArgv[childArgc++] = "-c"; |
|
|
|
childArgv[childArgc++] = buff; |
|
|
|
@@ -1378,7 +1378,7 @@
|
|
|
|
|
|
|
|
execvp(childArgv[0], childArgv + 1); |
|
|
|
|
|
|
|
- if (!strcmp(childArgv[0], "/bin/sh"))
|
|
|
|
+ if (!strcmp(childArgv[0], "@TERMUX_PREFIX@/bin/sh"))
|
|
|
|
warn(_("couldn't exec shell script")); |
|
|
|
else |
|
|
|
warn(_("no shell")); |
|
|
|
diff -uNr util-linux-2.34/login-utils/su-common.c util-linux-2.34.mod/login-utils/su-common.c
|
|
|
|
--- util-linux-2.34/login-utils/su-common.c 2019-04-24 13:44:31.858967658 +0300
|
|
|
|
+++ util-linux-2.34.mod/login-utils/su-common.c 2019-07-23 19:16:35.314471404 +0300
|
|
|
|
|
