From c33d72d6521d341728182303da468f1b8b231098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 8 Oct 2019 19:42:38 +0200 Subject: [PATCH 1/3] lxdm: sync default PATH --- srcpkgs/lxdm/patches/default-PATH.patch | 22 ++++++++++++++++++++++ srcpkgs/lxdm/template | 4 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/lxdm/patches/default-PATH.patch diff --git a/srcpkgs/lxdm/patches/default-PATH.patch b/srcpkgs/lxdm/patches/default-PATH.patch new file mode 100644 index 000000000000..564cc00ccc38 --- /dev/null +++ b/srcpkgs/lxdm/patches/default-PATH.patch @@ -0,0 +1,22 @@ +From e46c33735f81ca5607247fd0690ebbe9f1565708 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= +Date: Tue, 8 Oct 2019 19:32:15 +0200 +Subject: [PATCH] tweak default PATH + + +diff --git src/lxdm.c src/lxdm.c +index a37f051..8a0e6c6 100644 +--- src/lxdm.c ++++ src/lxdm.c +@@ -1399,7 +1399,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) + if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */ + env=g_environ_setenv(env, "PATH", path, TRUE); /* override current $PATH with config value */ + else /* don't use the global env, they are bad for user */ +- env=g_environ_setenv(env, "PATH", "/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin", TRUE); /* set proper default */ ++ env=g_environ_setenv(env, "PATH", "/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin", TRUE); /* set proper default */ + g_free(path); + /* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */ + if( lang && lang[0] ) +-- +2.23.0 + diff --git a/srcpkgs/lxdm/template b/srcpkgs/lxdm/template index 55ae9b5356eb..d9e532be58ac 100644 --- a/srcpkgs/lxdm/template +++ b/srcpkgs/lxdm/template @@ -1,7 +1,7 @@ # Template file for 'lxdm' pkgname=lxdm version=0.5.3 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-consolekit --with-pam --enable-gtk3" hostmakedepends="automake gettext-devel libtool pkg-config intltool" @@ -16,13 +16,13 @@ conf_files=" /etc/lxdm/Xsession /etc/lxdm/lxdm.conf /etc/pam.d/lxdm" -system_groups="lxdm" short_desc="GUI login manager for LXDE" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://lxde.org" distfiles="${SOURCEFORGE_SITE}/lxdm/lxdm-${version}.tar.xz" checksum=4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f +system_groups="lxdm" pre_configure() { autoreconf -fi From bb84d194d0b4398fa8f3c427f174bf94d30b0155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 30 Mar 2021 22:03:49 +0200 Subject: [PATCH 2/3] openssh: sync default PATH --- srcpkgs/openssh/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index 49b949304096..2507ca37a99f 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,12 +1,14 @@ # Template file for 'openssh' pkgname=openssh version=8.5p1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--datadir=/usr/share/openssh --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody --with-mantype=doc --without-rpath --with-xauth=/usr/bin/xauth --disable-strip --with-privsep-path=/var/chroot/ssh + --with-default-path=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin + --with-superuser-path=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin --with-pid-dir=/run --with-pam --with-libedit --with-Werror $(vopt_if ldns --with-ldns=$XBPS_CROSS_BASE/usr) From 40830b363192b75b58f89897d1aa1cf54dd156dd 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 3/3] util-linux: sync default PATH --- srcpkgs/util-linux-libs/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-libs/template b/srcpkgs/util-linux-libs/template index ad8c4512a35c..47065a3fed1d 100644 --- a/srcpkgs/util-linux-libs/template +++ b/srcpkgs/util-linux-libs/template @@ -2,7 +2,7 @@ # Keep this package sync with util-linux pkgname=util-linux-libs version=2.36.2 -revision=1 +revision=2 wrksrc="util-linux-$version" build_style=meta hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz" diff --git a/srcpkgs/util-linux/patches/default-PATH.patch b/srcpkgs/util-linux/patches/default-PATH.patch new file mode 100644 index 000000000000..cf535e183135 --- /dev/null +++ b/srcpkgs/util-linux/patches/default-PATH.patch @@ -0,0 +1,37 @@ +From 52f81526dbbea59e5c8f6aee64db1a9c29509d58 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= +Date: Tue, 30 Mar 2021 22:58:45 +0200 +Subject: [PATCH] default-PATH + + +diff --git include/pathnames.h include/pathnames.h +index 3845d4c..984b4d8 100644 +--- include/pathnames.h ++++ 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 4fb8292531ba..1f36daa329bd 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -2,7 +2,7 @@ # Keep this package sync with util-linux-libs pkgname=util-linux version=2.36.2 -revision=1 +revision=2 hostmakedepends="automake bison gettext gettext-devel libtool pkg-config xz" makedepends="libcap-ng-devel pam-devel readline-devel zlib-devel eudev-libudev-devel"