Add xscreensaver

diff --git a/config/packages-list b/config/packages-list
index 01f3735..3b814ff 100644 (file)
--- a/config/packages-list
+++ b/config/packages-list
@@ -447,6 +447,7 @@ XARCHIVER="xarchiver-0.5.2"
 XINETD="xinetd-2.3.15"
 XMLTO="xmlto-0.0.25"
 XMLTOMAN="xmltoman-0.4"
+XSCREENSAVER="xscreensaver-5.22"
 XTERM="xterm-293"
 XVIDCORE="xvidcore-1.3.2"
 XZ_UTILS="xz-5.0.4"

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 92fae32..a100c7c 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -58,6 +58,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o \
     ipkg -m acnb ${GCONF}
     ipkg ${GNOME_KEYRING}
     ipkg ${LIBSOUP} "--disable-static --without-gnome"
+
+    ipkg ${XSCREENSAVER} "--libexecdir=/usr/lib"
 fi
 
 ipkg ${GPARTED} "--disable-doc"

diff --git a/stage5/misc/xscreensaver-pam.d/xscreensaver b/stage5/misc/xscreensaver-pam.d/xscreensaver
new file mode 100644 (file)
index 0000000..96aefb1
--- /dev/null
+++ b/stage5/misc/xscreensaver-pam.d/xscreensaver
@@ -0,0 +1,3 @@
+
+auth    include system-auth
+account include system-account

diff --git a/stage5/packages-update b/stage5/packages-update
index f5571b7..19b6548 100755 (executable)
--- a/stage5/packages-update
+++ b/stage5/packages-update
@@ -57,6 +57,7 @@ fpkg -m gnome ${LIBGLADE}
 fpkg -m gnome ${GCONF}
 fpkg -m gnome ${GNOME_KEYRING}
 fpkg -m gnome ${LIBSOUP}
+fpkg -e "tar.gz" ${XSCREENSAVER} "http://www.jwz.org/xscreensaver"
 
 fpkg -e "tar.bz2" -m sf ${GPARTED}
 fpkg -m sf ${GHOSTSCRIPT}

diff --git a/stage5/pkg/xscreensaver b/stage5/pkg/xscreensaver
new file mode 100644 (file)
index 0000000..b705974
--- /dev/null
+++ b/stage5/pkg/xscreensaver
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+hvbuild_post()
+{
+    install -v -m644 ${SCRDIR}/misc/xscreensaver-pam.d/* /etc/pam.d/
+}