[SM-Commit] GIT changes to master grimoire by Eric Sandall (99d4b3cb071fc1c226a17f96dcb5738efa1064ce)
Eric Sandall
scm at sourcemage.org
Fri Mar 11 20:49:33 EST 2011
GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:
gnome2-libs/gnome-screensaver/DEPENDS | 2 +-
gnome2-libs/gnome-screensaver/HISTORY | 5 +++++
security-libs/linux-pam/HISTORY | 3 +++
security-libs/linux-pam/PRE_SUB_DEPENDS | 5 +++++
security-libs/linux-pam/REPAIR^none^PRE_SUB_DEPENDS | 5 +++++
security-libs/linux-pam/SUB_DEPENDS | 6 ++++++
6 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit 99d4b3cb071fc1c226a17f96dcb5738efa1064ce
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>
gnome-screensaver: Linux-PAM support requires unix_chkpwd SUID
Otherwise you cannot unlock your screen. See
https://bugs.launchpad.net/ubuntu/+bug/299717
CuZnDragon reports he has the same issue with xscreensaver, though I
have not seen it. This fix may be required there as well.
commit dc3535965895a25a134dd8112167867439d98585
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>
linux-pam: Allow forcing unix_chkpwd SUID
diff --git a/gnome2-libs/gnome-screensaver/DEPENDS b/gnome2-libs/gnome-screensaver/DEPENDS
index b74124a..c87876b 100755
--- a/gnome2-libs/gnome-screensaver/DEPENDS
+++ b/gnome2-libs/gnome-screensaver/DEPENDS
@@ -33,7 +33,7 @@ optional_depends libgnomekbd \
"--without-kbd-layout-indicator" \
"Enable keyboard layout indicator?" &&
-optional_depends linux-pam \
+optional_depends -sub CHKPWDSUID linux-pam \
"--enable-pam --with-pam-prefix=/etc/" \
"--disable-pam" \
"Enable PAM support?" &&
diff --git a/gnome2-libs/gnome-screensaver/HISTORY b/gnome2-libs/gnome-screensaver/HISTORY
index b08e0f4..44e377d 100644
--- a/gnome2-libs/gnome-screensaver/HISTORY
+++ b/gnome2-libs/gnome-screensaver/HISTORY
@@ -1,3 +1,8 @@
+2011-03-11 Eric Sandall <sandalle at sourcemage.org>
+ * DEPENDS: Linux-PAM support requires unix_chkpwd SUID
+ Otherwise you cannot unlock your screen. See
+ https://bugs.launchpad.net/ubuntu/+bug/299717
+
2010-09-30 Vasil Yonkov <spirtbrat at sourcemage.org>
* DETAILS: updated spell to 2.30.2
diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY
index 051b9fc..b978c6a 100644
--- a/security-libs/linux-pam/HISTORY
+++ b/security-libs/linux-pam/HISTORY
@@ -1,3 +1,6 @@
+2011-03-11 Eric Sandall <sandalle at sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing unix_chkpwd SUID
+
2010-10-31 Ladislav Hagara <hgr at vabo.cz>
* DETAILS: 1.1.3, SECURITY_PATCH=2, #15898
diff --git a/security-libs/linux-pam/PRE_SUB_DEPENDS b/security-libs/linux-pam/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..218827c
--- /dev/null
+++ b/security-libs/linux-pam/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ CHKPWDSUID) [[ "$PAM_CHKPWD_SUID" == "y" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/security-libs/linux-pam/REPAIR^none^PRE_SUB_DEPENDS b/security-libs/linux-pam/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..218827c
--- /dev/null
+++ b/security-libs/linux-pam/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ CHKPWDSUID) [[ "$PAM_CHKPWD_SUID" == "y" ]] && return 0 ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
diff --git a/security-libs/linux-pam/SUB_DEPENDS b/security-libs/linux-pam/SUB_DEPENDS
new file mode 100755
index 0000000..5d9a9ea
--- /dev/null
+++ b/security-libs/linux-pam/SUB_DEPENDS
@@ -0,0 +1,6 @@
+case "$THIS_SUB_DEPENDS" in
+ CHKPWDSUID) message "${MESSAGE_COLOR}Forcing unix_chkpwd SUID...${DEFAULT_COLOR}"
+ PAM_CHKPWD_SUID="y" ;;
+ *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1;;
+esac
More information about the SM-Commit
mailing list