From ba7caeb0cb80f1fb385dfddd69473d69276cb191 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/4] 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..160fcbb73453 --- /dev/null +++ b/srcpkgs/lxdm/patches/default-PATH.patch @@ -0,0 +1,22 @@ +From e46c33735f81ca5607247fd0690ebbe9f1565708 Mon Sep 17 00:00:00 2001 +From: Piotr Wójcik +Date: Tue, 8 Oct 2019 19:32:15 +0200 +Subject: [PATCH] tweak default PATH + + +diff --git a/src/lxdm.c b/src/lxdm.c +index a37f051..8a0e6c6 100644 +--- a/src/lxdm.c ++++ b/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 537077a493829ca129e624dc95b53548118df3a1 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/4] openssh: sync default PATH --- srcpkgs/openssh/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index c74b56e08ac3..5beea5260428 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,13 +1,14 @@ # Template file for 'openssh' pkgname=openssh version=9.3p1 -revision=2 +revision=3 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/sbin:/usr/bin:/sbin:/bin + --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 6a58227eff85ca604a1ded86d599d362d3ed1652 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/4] util-linux: sync default PATH --- 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 90b768803f05..d17a31a482f5 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 000000000000..d811470b16a1 --- /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 29477fc6ea89..99819d02068b 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 From 09ad7c3e027800bd6c2a946d4872aac33090e584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 27 Jun 2023 00:11:02 +0200 Subject: [PATCH 4/4] sddm: sync default PATH --- .../sddm/patches/0.19.0--default-path.patch | 22 +++++++++++++++++++ srcpkgs/sddm/template | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/sddm/patches/0.19.0--default-path.patch diff --git a/srcpkgs/sddm/patches/0.19.0--default-path.patch b/srcpkgs/sddm/patches/0.19.0--default-path.patch new file mode 100644 index 000000000000..bc3f8bd348cd --- /dev/null +++ b/srcpkgs/sddm/patches/0.19.0--default-path.patch @@ -0,0 +1,22 @@ +From 57d716be7cb0588538d89bb72113bec82adf9e52 Mon Sep 17 00:00:00 2001 +From: Piotr Wójcik +Date: Mon, 26 Jun 2023 23:15:05 +0200 +Subject: default-path + + +diff --git a/src/common/Configuration.h b/src/common/Configuration.h +index cf44a62..4c01c4a 100644 +--- a/src/common/Configuration.h ++++ b/src/common/Configuration.h +@@ -82,7 +82,7 @@ namespace SDDM { + ); + + Section(Users, +- Entry(DefaultPath, QString, _S("/usr/local/bin:/usr/bin:/bin"), _S("Default $PATH for logged in users")); ++ Entry(DefaultPath, QString, _S("/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin"), _S("Default $PATH for logged in users")); + Entry(MinimumUid, int, UID_MIN, _S("Minimum user id for displayed users")); + Entry(MaximumUid, int, UID_MAX, _S("Maximum user id for displayed users")); + Entry(HideUsers, QStringList, QStringList(), _S("Comma-separated list of users that should not be listed")); +-- +2.41.0 + diff --git a/srcpkgs/sddm/template b/srcpkgs/sddm/template index 2a87381c8e8a..63fa93f160cf 100644 --- a/srcpkgs/sddm/template +++ b/srcpkgs/sddm/template @@ -1,7 +1,7 @@ # Template file for 'sddm' pkgname=sddm version=0.19.0 -revision=3 +revision=4 build_style=cmake configure_args="-DBUILD_MAN_PAGES=ON -DNO_SYSTEMD=ON -DUSE_ELOGIND=ON -DLOGIN_DEFS_PATH=${XBPS_SRCPKGDIR}/shadow/files/login.defs