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

util-linux: update fix-paths.patch

Browse Source
This commit is contained in:
Leonid Pliushch 2020-11-22 21:26:09 +00:00
parent 50dcc1a43a
commit 9bf5a78434
1 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
packages/util-linux/fix-paths.patch
View File

@ -1,7 +1,7 @@
diff -uNr util-linux-2.35.2/include/pathnames.h util-linux-2.35.2.mod/include/pathnames.h
--- util-linux-2.35.2/include/pathnames.h 2020-05-20 15:27:43.450013565 +0300
+++ util-linux-2.35.2.mod/include/pathnames.h 2020-07-09 01:54:37.539260814 +0300
@@ -202,4 +202,107 @@
diff -uNr util-linux-2.36.1/include/pathnames.h util-linux-2.36.1.mod/include/pathnames.h
--- util-linux-2.36.1/include/pathnames.h 2020-11-16 10:41:16.338846226 +0000
+++ util-linux-2.36.1.mod/include/pathnames.h 2020-11-22 21:23:16.999470089 +0000
@@ -206,4 +206,107 @@
#define _PATH_DEV_RFKILL "/dev/rfkill"
#define _PATH_SYS_RFKILL "/sys/class/rfkill"
@ -109,9 +109,9 @@ diff -uNr util-linux-2.35.2/include/pathnames.h util-linux-2.35.2.mod/include/pa
+#endif
+
#endif /* PATHNAMES_H */
diff -uNr util-linux-2.35.2/lib/exec_shell.c util-linux-2.35.2.mod/lib/exec_shell.c
--- util-linux-2.35.2/lib/exec_shell.c 2020-02-27 11:26:34.563141252 +0200
+++ util-linux-2.35.2.mod/lib/exec_shell.c 2020-07-09 01:53:27.882946782 +0300
diff -uNr util-linux-2.36.1/lib/exec_shell.c util-linux-2.36.1.mod/lib/exec_shell.c
--- util-linux-2.36.1/lib/exec_shell.c 2020-11-13 11:33:31.084801627 +0000
+++ util-linux-2.36.1.mod/lib/exec_shell.c 2020-11-22 21:23:17.000470088 +0000
@@ -28,7 +28,7 @@
#include "exec_shell.h"
@ -121,9 +121,9 @@ diff -uNr util-linux-2.35.2/lib/exec_shell.c util-linux-2.35.2.mod/lib/exec_shel
void __attribute__((__noreturn__)) exec_shell(void)
{
diff -uNr util-linux-2.35.2/lib/loopdev.c util-linux-2.35.2.mod/lib/loopdev.c
--- util-linux-2.35.2/lib/loopdev.c 2020-05-20 15:27:43.451013558 +0300
+++ util-linux-2.35.2.mod/lib/loopdev.c 2020-07-09 01:53:27.886946800 +0300
diff -uNr util-linux-2.36.1/lib/loopdev.c util-linux-2.36.1.mod/lib/loopdev.c
--- util-linux-2.36.1/lib/loopdev.c 2020-11-16 10:41:16.338846226 +0000
+++ util-linux-2.36.1.mod/lib/loopdev.c 2020-11-22 21:23:17.000470088 +0000
@@ -105,13 +105,13 @@
/* set new */
if (device) {
@ -141,10 +141,10 @@ diff -uNr util-linux-2.35.2/lib/loopdev.c util-linux-2.35.2.mod/lib/loopdev.c
dir = _PATH_DEV_LOOP "/"; /* _PATH_DEV uses tailing slash */
}
snprintf(lc->device, sizeof(lc->device), "%s%s",
diff -uNr util-linux-2.35.2/libblkid/src/blkidP.h util-linux-2.35.2.mod/libblkid/src/blkidP.h
--- util-linux-2.35.2/libblkid/src/blkidP.h 2020-05-20 15:27:43.453013547 +0300
+++ util-linux-2.35.2.mod/libblkid/src/blkidP.h 2020-07-09 01:53:27.886946800 +0300
@@ -286,7 +286,7 @@
diff -uNr util-linux-2.36.1/libblkid/src/blkidP.h util-linux-2.36.1.mod/libblkid/src/blkidP.h
--- util-linux-2.36.1/libblkid/src/blkidP.h 2020-11-16 10:41:16.339846221 +0000
+++ util-linux-2.36.1.mod/libblkid/src/blkidP.h 2020-11-22 21:23:17.000470088 +0000
@@ -287,7 +287,7 @@
#define BLKID_BIC_FL_CHANGED 0x0004 /* Cache has changed from disk */
/* config file */
@ -153,7 +153,7 @@ diff -uNr util-linux-2.35.2/libblkid/src/blkidP.h util-linux-2.35.2.mod/libblkid
/* cache file on systemds with /run */
#define BLKID_RUNTIME_TOPDIR "/run"
@@ -294,7 +294,7 @@
@@ -295,7 +295,7 @@
#define BLKID_CACHE_FILE BLKID_RUNTIME_DIR "/blkid.tab"
/* old systems */
@ -162,9 +162,9 @@ diff -uNr util-linux-2.35.2/libblkid/src/blkidP.h util-linux-2.35.2.mod/libblkid
#define BLKID_PROBE_OK 0
#define BLKID_PROBE_NONE 1
diff -uNr util-linux-2.35.2/libblkid/src/topology/dm.c util-linux-2.35.2.mod/libblkid/src/topology/dm.c
--- util-linux-2.35.2/libblkid/src/topology/dm.c 2020-02-27 11:26:34.573141186 +0200
+++ util-linux-2.35.2.mod/libblkid/src/topology/dm.c 2020-07-09 01:53:27.886946800 +0300
diff -uNr util-linux-2.36.1/libblkid/src/topology/dm.c util-linux-2.36.1.mod/libblkid/src/topology/dm.c
--- util-linux-2.36.1/libblkid/src/topology/dm.c 2020-02-27 09:26:34.573141186 +0000
+++ util-linux-2.36.1.mod/libblkid/src/topology/dm.c 2020-11-22 21:23:17.001470087 +0000
@@ -30,9 +30,8 @@
const struct blkid_idmag *mag __attribute__((__unused__)))
{
@ -177,9 +177,9 @@ diff -uNr util-linux-2.35.2/libblkid/src/topology/dm.c util-linux-2.35.2.mod/lib
};
int dmpipe[] = { -1, -1 }, stripes, stripesize;
const char *cmd = NULL;
diff -uNr util-linux-2.35.2/libblkid/src/topology/lvm.c util-linux-2.35.2.mod/libblkid/src/topology/lvm.c
--- util-linux-2.35.2/libblkid/src/topology/lvm.c 2017-09-18 12:48:03.563891490 +0300
+++ util-linux-2.35.2.mod/libblkid/src/topology/lvm.c 2020-07-09 01:53:27.886946800 +0300
diff -uNr util-linux-2.36.1/libblkid/src/topology/lvm.c util-linux-2.36.1.mod/libblkid/src/topology/lvm.c
--- util-linux-2.36.1/libblkid/src/topology/lvm.c 2017-09-18 09:48:03.563891490 +0000
+++ util-linux-2.36.1.mod/libblkid/src/topology/lvm.c 2020-11-22 21:23:17.001470087 +0000
@@ -36,9 +36,8 @@
const struct blkid_idmag *mag __attribute__((__unused__)))
{
@ -192,10 +192,10 @@ diff -uNr util-linux-2.35.2/libblkid/src/topology/lvm.c util-linux-2.35.2.mod/li
};
int lvpipe[] = { -1, -1 }, stripes = 0, stripesize = 0;
FILE *stream = NULL;
diff -uNr util-linux-2.35.2/libmount/src/cache.c util-linux-2.35.2.mod/libmount/src/cache.c
--- util-linux-2.35.2/libmount/src/cache.c 2020-05-20 15:27:43.460013503 +0300
+++ util-linux-2.35.2.mod/libmount/src/cache.c 2020-07-09 01:53:27.886946800 +0300
@@ -632,7 +632,7 @@
diff -uNr util-linux-2.36.1/libmount/src/cache.c util-linux-2.36.1.mod/libmount/src/cache.c
--- util-linux-2.36.1/libmount/src/cache.c 2020-11-10 09:25:56.566810017 +0000
+++ util-linux-2.36.1.mod/libmount/src/cache.c 2020-11-22 21:23:17.001470087 +0000
@@ -633,7 +633,7 @@
/* users assume backing file name rather than /dev/loopN in
* output if the device has been initialized by mount(8).
*/
@ -204,9 +204,9 @@ diff -uNr util-linux-2.35.2/libmount/src/cache.c util-linux-2.35.2.mod/libmount/
struct loopdev_cxt lc;
if (loopcxt_init(&lc, 0) || loopcxt_set_device(&lc, pretty))
diff -uNr util-linux-2.35.2/libmount/src/context_loopdev.c util-linux-2.35.2.mod/libmount/src/context_loopdev.c
--- util-linux-2.35.2/libmount/src/context_loopdev.c 2020-03-03 12:16:39.603294025 +0200
+++ util-linux-2.35.2.mod/libmount/src/context_loopdev.c 2020-07-09 01:53:27.886946800 +0300
diff -uNr util-linux-2.36.1/libmount/src/context_loopdev.c util-linux-2.36.1.mod/libmount/src/context_loopdev.c
--- util-linux-2.36.1/libmount/src/context_loopdev.c 2020-03-03 10:16:39.603294025 +0000
+++ util-linux-2.36.1.mod/libmount/src/context_loopdev.c 2020-11-22 21:23:17.002470086 +0000
@@ -129,7 +129,7 @@
rc = 0;
@ -216,9 +216,9 @@ diff -uNr util-linux-2.35.2/libmount/src/context_loopdev.c util-linux-2.35.2.mod
rc = loopdev_is_used((char *) src, bf, offset, 0, LOOPDEV_FL_OFFSET);
} else if (opts && (cxt->user_mountflags & MNT_MS_LOOP) &&
diff -uNr util-linux-2.35.2/libmount/src/tab.c util-linux-2.35.2.mod/libmount/src/tab.c
--- util-linux-2.35.2/libmount/src/tab.c 2020-05-15 13:21:21.435962611 +0300
+++ util-linux-2.35.2.mod/libmount/src/tab.c 2020-07-09 01:53:27.886946800 +0300
diff -uNr util-linux-2.36.1/libmount/src/tab.c util-linux-2.36.1.mod/libmount/src/tab.c
--- util-linux-2.36.1/libmount/src/tab.c 2020-11-10 09:25:56.568810004 +0000
+++ util-linux-2.36.1.mod/libmount/src/tab.c 2020-11-22 21:23:17.002470086 +0000
@@ -1740,7 +1740,7 @@
int flags = 0;
@ -228,21 +228,9 @@ diff -uNr util-linux-2.35.2/libmount/src/tab.c util-linux-2.35.2.mod/libmount/sr
continue; /* does not look like loopdev */
if (mnt_fs_get_option(fstab_fs, "offset", &val, &len) == 0) {
diff -uNr util-linux-2.35.2/libuuid/src/uuidd.h util-linux-2.35.2.mod/libuuid/src/uuidd.h
--- util-linux-2.35.2/libuuid/src/uuidd.h 2020-02-19 17:17:42.282325812 +0200
+++ util-linux-2.35.2.mod/libuuid/src/uuidd.h 2020-07-09 01:53:27.890946819 +0300
@@ -38,7 +38,7 @@
#define UUIDD_DIR _PATH_RUNSTATEDIR "/uuidd"
#define UUIDD_SOCKET_PATH UUIDD_DIR "/request"
#define UUIDD_PIDFILE_PATH UUIDD_DIR "/uuidd.pid"
-#define UUIDD_PATH "/usr/sbin/uuidd"
+#define UUIDD_PATH "@TERMUX_PREFIX@/bin/uuidd"
#define UUIDD_OP_GETPID 0
#define UUIDD_OP_GET_MAXOP 1
diff -uNr util-linux-2.35.2/libuuid/src/uuidP.h util-linux-2.35.2.mod/libuuid/src/uuidP.h
--- util-linux-2.35.2/libuuid/src/uuidP.h 2020-02-27 11:26:34.585141107 +0200
+++ util-linux-2.35.2.mod/libuuid/src/uuidP.h 2020-07-09 01:53:27.890946819 +0300
diff -uNr util-linux-2.36.1/libuuid/src/uuidP.h util-linux-2.36.1.mod/libuuid/src/uuidP.h
--- util-linux-2.36.1/libuuid/src/uuidP.h 2020-07-01 10:35:59.983754261 +0000
+++ util-linux-2.36.1.mod/libuuid/src/uuidP.h 2020-11-22 21:23:17.003470085 +0000
@@ -39,7 +39,7 @@
#include "uuid.h"
@ -252,10 +240,22 @@ diff -uNr util-linux-2.35.2/libuuid/src/uuidP.h util-linux-2.35.2.mod/libuuid/sr
/*
* Offset between 15-Oct-1582 and 1-Jan-70
diff -uNr util-linux-2.35.2/login-utils/su-common.c util-linux-2.35.2.mod/login-utils/su-common.c
--- util-linux-2.35.2/login-utils/su-common.c 2020-05-20 15:27:43.467013460 +0300
+++ util-linux-2.35.2.mod/login-utils/su-common.c 2020-07-09 01:53:27.890946819 +0300
@@ -96,7 +96,7 @@
diff -uNr util-linux-2.36.1/libuuid/src/uuidd.h util-linux-2.36.1.mod/libuuid/src/uuidd.h
--- util-linux-2.36.1/libuuid/src/uuidd.h 2020-11-16 10:41:16.342846207 +0000
+++ util-linux-2.36.1.mod/libuuid/src/uuidd.h 2020-11-22 21:23:17.003470085 +0000
@@ -38,7 +38,7 @@
#define UUIDD_DIR _PATH_RUNSTATEDIR "/uuidd"
#define UUIDD_SOCKET_PATH UUIDD_DIR "/request"
#define UUIDD_PIDFILE_PATH UUIDD_DIR "/uuidd.pid"
-#define UUIDD_PATH "/usr/sbin/uuidd"
+#define UUIDD_PATH "@TERMUX_PREFIX@/bin/uuidd"
#define UUIDD_OP_GETPID 0
#define UUIDD_OP_GET_MAXOP 1
diff -uNr util-linux-2.36.1/login-utils/su-common.c util-linux-2.36.1.mod/login-utils/su-common.c
--- util-linux-2.36.1/login-utils/su-common.c 2020-11-16 10:41:16.342846207 +0000
+++ util-linux-2.36.1.mod/login-utils/su-common.c 2020-11-22 21:23:17.004470084 +0000
@@ -101,7 +101,7 @@
#define is_pam_failure(_rc) ((_rc) != PAM_SUCCESS)
/* The shell to run if none is given in the user's passwd entry. */
@ -264,9 +264,9 @@ diff -uNr util-linux-2.35.2/login-utils/su-common.c util-linux-2.35.2.mod/login-
/* The user to become if none is specified. */
#define DEFAULT_USER "root"
diff -uNr util-linux-2.35.2/login-utils/sulogin.c util-linux-2.35.2.mod/login-utils/sulogin.c
--- util-linux-2.35.2/login-utils/sulogin.c 2020-02-27 11:26:34.589141080 +0200
+++ util-linux-2.35.2.mod/login-utils/sulogin.c 2020-07-09 01:53:27.890946819 +0300
diff -uNr util-linux-2.36.1/login-utils/sulogin.c util-linux-2.36.1.mod/login-utils/sulogin.c
--- util-linux-2.36.1/login-utils/sulogin.c 2020-11-13 11:33:31.084801627 +0000
+++ util-linux-2.36.1.mod/login-utils/sulogin.c 2020-11-22 21:24:51.388374725 +0000
@@ -743,7 +743,7 @@
if (pwd->pw_shell[0])
su_shell = pwd->pw_shell;
@ -277,21 +277,21 @@ diff -uNr util-linux-2.35.2/login-utils/sulogin.c util-linux-2.35.2.mod/login-ut
if ((p = strrchr(su_shell, '/')) == NULL)
p = su_shell;
@@ -792,9 +792,9 @@
execl(su_shell, shell, NULL);
execl(su_shell, shell, (char *)NULL);
warn(_("failed to execute %s"), su_shell);
- xsetenv("SHELL", "/bin/sh", 1);
- execl("/bin/sh", profile ? "-sh" : "sh", NULL);
- execl("/bin/sh", profile ? "-sh" : "sh", (char *)NULL);
- warn(_("failed to execute %s"), "/bin/sh");
+ xsetenv("SHELL", "@TERMUX_PREFIX@/bin/sh", 1);
+ execl("@TERMUX_PREFIX@/bin/sh", profile ? "-sh" : "sh", NULL);
+ execl("@TERMUX_PREFIX@/bin/sh", profile ? "-sh" : "sh", (char *)NULL);
+ warn(_("failed to execute %s"), "@TERMUX_PREFIX@/bin/sh");
}
static void usage(void)
diff -uNr util-linux-2.35.2/misc-utils/whereis.c util-linux-2.35.2.mod/misc-utils/whereis.c
--- util-linux-2.35.2/misc-utils/whereis.c 2020-05-20 15:27:43.473013423 +0300
+++ util-linux-2.35.2.mod/misc-utils/whereis.c 2020-07-09 01:54:02.827104318 +0300
diff -uNr util-linux-2.36.1/misc-utils/whereis.c util-linux-2.36.1.mod/misc-utils/whereis.c
--- util-linux-2.36.1/misc-utils/whereis.c 2020-11-16 10:41:16.343846201 +0000
+++ util-linux-2.36.1.mod/misc-utils/whereis.c 2020-11-22 21:23:17.005470083 +0000
@@ -97,82 +97,18 @@
};
@ -379,10 +379,10 @@ diff -uNr util-linux-2.35.2/misc-utils/whereis.c util-linux-2.35.2.mod/misc-util
NULL
};
diff -uNr util-linux-2.35.2/sys-utils/setarch.c util-linux-2.35.2.mod/sys-utils/setarch.c
--- util-linux-2.35.2/sys-utils/setarch.c 2020-05-20 15:27:43.555012916 +0300
+++ util-linux-2.35.2.mod/sys-utils/setarch.c 2020-07-09 01:53:27.890946819 +0300
@@ -328,7 +328,7 @@
diff -uNr util-linux-2.36.1/sys-utils/setarch.c util-linux-2.36.1.mod/sys-utils/setarch.c
--- util-linux-2.36.1/sys-utils/setarch.c 2020-11-13 11:33:31.084801627 +0000
+++ util-linux-2.36.1.mod/sys-utils/setarch.c 2020-11-22 21:23:17.005470083 +0000
@@ -349,7 +349,7 @@
/* Don't use ifdef sparc here, we get "Unrecognized architecture"
* error message later if necessary */
if (strcmp(arch, "sparc32bash") == 0) {
@ -391,8 +391,8 @@ diff -uNr util-linux-2.35.2/sys-utils/setarch.c util-linux-2.35.2.mod/sys-utils/
shell_arg = "";
goto set_arch;
}
@@ -437,7 +437,7 @@
verify_arch_domain(target, arch);
@@ -458,7 +458,7 @@
verify_arch_domain(doms, target, arch);
if (!argc) {
- shell = "/bin/sh";
@ -400,9 +400,9 @@ diff -uNr util-linux-2.35.2/sys-utils/setarch.c util-linux-2.35.2.mod/sys-utils/
shell_arg = "-sh";
}
if (verbose) {
diff -uNr util-linux-2.35.2/sys-utils/setpriv.c util-linux-2.35.2.mod/sys-utils/setpriv.c
--- util-linux-2.35.2/sys-utils/setpriv.c 2020-02-27 11:26:34.709140285 +0200
+++ util-linux-2.35.2.mod/sys-utils/setpriv.c 2020-07-09 01:53:27.890946819 +0300
diff -uNr util-linux-2.36.1/sys-utils/setpriv.c util-linux-2.36.1.mod/sys-utils/setpriv.c
--- util-linux-2.36.1/sys-utils/setpriv.c 2020-07-01 10:36:00.074753746 +0000
+++ util-linux-2.36.1.mod/sys-utils/setpriv.c 2020-11-22 21:23:17.006470082 +0000
@@ -52,7 +52,7 @@
#define SETPRIV_EXIT_PRIVERR 127 /* how we exit when we fail to set privs */
@ -412,9 +412,9 @@ diff -uNr util-linux-2.35.2/sys-utils/setpriv.c util-linux-2.35.2.mod/sys-utils/
static gid_t get_group(const char *s, const char *err);
diff -uNr util-linux-2.35.2/text-utils/more.c util-linux-2.35.2.mod/text-utils/more.c
--- util-linux-2.35.2/text-utils/more.c 2020-05-20 15:27:43.565012854 +0300
+++ util-linux-2.35.2.mod/text-utils/more.c 2020-07-09 01:53:27.890946819 +0300
diff -uNr util-linux-2.36.1/text-utils/more.c util-linux-2.36.1.mod/text-utils/more.c
--- util-linux-2.36.1/text-utils/more.c 2020-11-10 09:25:56.658809468 +0000
+++ util-linux-2.36.1.mod/text-utils/more.c 2020-11-22 21:23:17.007470081 +0000
@@ -78,6 +78,7 @@
# include <magic.h>
#endif
@ -423,10 +423,10 @@ diff -uNr util-linux-2.35.2/text-utils/more.c util-linux-2.35.2.mod/text-utils/m
#include "strutils.h"
#include "nls.h"
#include "xalloc.h"
diff -uNr util-linux-2.35.2/text-utils/pg.c util-linux-2.35.2.mod/text-utils/pg.c
--- util-linux-2.35.2/text-utils/pg.c 2020-05-20 15:27:43.565012854 +0300
+++ util-linux-2.35.2.mod/text-utils/pg.c 2020-07-09 01:53:27.894946836 +0300
@@ -1365,7 +1365,7 @@
diff -uNr util-linux-2.36.1/text-utils/pg.c util-linux-2.36.1.mod/text-utils/pg.c
--- util-linux-2.36.1/text-utils/pg.c 2020-11-13 11:33:31.084801627 +0000
+++ util-linux-2.36.1.mod/text-utils/pg.c 2020-11-22 21:23:17.007470081 +0000
@@ -1368,7 +1368,7 @@
{
const char *sh = getenv("SHELL");
if (!sh)