Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (f890258fa0341587a3787b208b5110b983e1eacd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (f890258fa0341587a3787b208b5110b983e1eacd)
  • Date: Fri, 11 Mar 2011 19:56:58 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

gnome2-libs/gnome-screensaver/BUILD | 4 ++--
gnome2-libs/gnome-screensaver/CONFIGURE | 2 +-
gnome2-libs/gnome-screensaver/DEPENDS | 2 +-
x11/xscreensaver/DEPENDS | 2 +-
x11/xscreensaver/HISTORY | 5 +++++
5 files changed, 10 insertions(+), 5 deletions(-)

New commits:
commit f890258fa0341587a3787b208b5110b983e1eacd
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xscreensaver: Linux-PAM support requires unix_chkpwd SUID
Otherwise you cannot unlock your screen. See
https://bugs.launchpad.net/ubuntu/+bug/299717

Same fix applied to gnome-screensaver

commit 51e7da8b8a510db0e296e7db5d7167bb4d8b6900
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

gnome-screensaver: Cleanup formatting

diff --git a/gnome2-libs/gnome-screensaver/BUILD
b/gnome2-libs/gnome-screensaver/BUILD
index 4f3c93a..6808477 100755
--- a/gnome2-libs/gnome-screensaver/BUILD
+++ b/gnome2-libs/gnome-screensaver/BUILD
@@ -16,12 +16,12 @@ if [ "${GSCREENSAVER_CONVERT}" == "y" ]; then
mkdir xsavers &&
cd xsavers &&
cp ${SOURCE_DIRECTORY}/data/*xscreensaver* ./ &&
- for XCONFIGS in ${X_CONFIGDIR}/*.xml
+ for XCONFIGS in ${X_CONFIGDIR}/*.xml
do
${XCONV_PRG} ${XCONFIGS}
done &&
cd ${SOURCE_DIRECTORY}
else
message "${PROBLEM_COLOR}No xscreensaver config
files!${DEFAULT_COLOR}"
- fi
+ fi
fi
diff --git a/gnome2-libs/gnome-screensaver/CONFIGURE
b/gnome2-libs/gnome-screensaver/CONFIGURE
index 4a3938a..753c87d 100755
--- a/gnome2-libs/gnome-screensaver/CONFIGURE
+++ b/gnome2-libs/gnome-screensaver/CONFIGURE
@@ -4,4 +4,4 @@ config_query_option GSCREENSAVER_LOCKING "Enable display
locking support?" y \
config_query_option GSCREENSAVER_MIT "Include support for MIT screensaver?"
y \
"--with-mit-ext" "--without-mit-ext"
&&

-config_query GSCREENSAVER_CONVERT "Import xscreensaver hacks?" n

+config_query GSCREENSAVER_CONVERT "Import xscreensaver hacks?" n
diff --git a/gnome2-libs/gnome-screensaver/DEPENDS
b/gnome2-libs/gnome-screensaver/DEPENDS
index c87876b..91a59b6 100755
--- a/gnome2-libs/gnome-screensaver/DEPENDS
+++ b/gnome2-libs/gnome-screensaver/DEPENDS
@@ -52,4 +52,4 @@ optional_depends xscreensaver
\
optional_depends xmlto \
"--enable-docbook-docs" \
"--disable-docbook-docs" \
- "Build documentation?"
+ "Build documentation?"
diff --git a/x11/xscreensaver/DEPENDS b/x11/xscreensaver/DEPENDS
index c670f75..acc1eca 100755
--- a/x11/xscreensaver/DEPENDS
+++ b/x11/xscreensaver/DEPENDS
@@ -7,7 +7,7 @@ message "${MESSAGE_COLOR}The xscreensaver demo program
allows you to" \
"${DEFAULT_COLOR}" &&
optional_depends libglade2 '' '' 'Enable xscreensaver demo?' &&

-optional_depends linux-pam \
+optional_depends -sub 'CHKPWDSUID' linux-pam \
"--with-pam" \
"--without-pam" \
"for Pluggable Authentication Modules (PAM)" &&
diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index 69a5e78..d6cc9ee 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/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-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG




  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (f890258fa0341587a3787b208b5110b983e1eacd), Eric Sandall, 03/11/2011

Archive powered by MHonArc 2.6.24.

Top of Page