From 7cc9f28dd6ce00e96754d67d114c933cd762b58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Fri, 6 Sep 2019 20:55:47 +0200 Subject: [PATCH] util-linux: adjust PATH for usrmerge --- srcpkgs/util-linux-common/template | 2 +- srcpkgs/util-linux/patches/default-PATH.patch | 37 +++++++++++++++++++ srcpkgs/util-linux/template | 2 +- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/util-linux/patches/default-PATH.patch diff --git a/srcpkgs/util-linux-common/template b/srcpkgs/util-linux-common/template index 90b768803f0..d17a31a482f 100644 --- a/srcpkgs/util-linux-common/template +++ b/srcpkgs/util-linux-common/template @@ -2,7 +2,7 @@ # Keep this package sync with util-linux pkgname=util-linux-common version=2.38.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin diff --git a/srcpkgs/util-linux/patches/default-PATH.patch b/srcpkgs/util-linux/patches/default-PATH.patch new file mode 100644 index 00000000000..d811470b16a --- /dev/null +++ b/srcpkgs/util-linux/patches/default-PATH.patch @@ -0,0 +1,37 @@ +From 52f81526dbbea59e5c8f6aee64db1a9c29509d58 Mon Sep 17 00:00:00 2001 +From: Piotr Wójcik +Date: Tue, 30 Mar 2021 22:58:45 +0200 +Subject: [PATCH] default-PATH + + +diff --git a/include/pathnames.h b/include/pathnames.h +index 3845d4c..984b4d8 100644 +--- a/include/pathnames.h ++++ b/include/pathnames.h +@@ -19,20 +19,12 @@ + /* DEFPATHs from don't include /usr/local */ + #undef _PATH_DEFPATH + +-#ifdef USE_USRDIR_PATHS_ONLY +-# define _PATH_DEFPATH "/usr/local/bin:/usr/bin" +-#else +-# define _PATH_DEFPATH "/usr/local/bin:/bin:/usr/bin" +-#endif ++# define _PATH_DEFPATH "/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin" + + #undef _PATH_DEFPATH_ROOT + +-#ifdef USE_USRDIR_PATHS_ONLY +-# define _PATH_DEFPATH_ROOT "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin" +-#else +-# define _PATH_DEFPATH_ROOT "/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" +-#endif +- ++# define _PATH_DEFPATH_ROOT "/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin" ++ + #define _PATH_HUSHLOGIN ".hushlogin" + #define _PATH_HUSHLOGINS "/etc/hushlogins" + +-- +2.31.0 + diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index 29477fc6ea8..99819d02068 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -2,7 +2,7 @@ # Keep this package sync with util-linux-common pkgname=util-linux version=2.38.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--exec-prefix=\${prefix} --enable-libuuid --disable-makeinstall-chown --enable-libblkid --enable-fsck --disable-rpath --enable-fs-paths-extra=/usr/sbin:/usr/bin