summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2007-01-29 21:39:16 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2007-01-29 21:39:16 +0000
commitdfd103ac9b9995bf8fcdafee6fbe8052a0794f63 (patch)
treedb4c394a2216b69f19bfe52230442cc77d340423 /gnome-extra/gnome-screensaver
parentFixed rpm sandbox issue, closes bug#157773 (diff)
downloadgentoo-2-dfd103ac9b9995bf8fcdafee6fbe8052a0794f63.tar.gz
gentoo-2-dfd103ac9b9995bf8fcdafee6fbe8052a0794f63.tar.bz2
gentoo-2-dfd103ac9b9995bf8fcdafee6fbe8052a0794f63.zip
Make it build with openpam; bug #163748
(Portage version: 2.1.2-r5)
Diffstat (limited to 'gnome-extra/gnome-screensaver')
-rw-r--r--gnome-extra/gnome-screensaver/ChangeLog7
-rw-r--r--gnome-extra/gnome-screensaver/files/gnome-screensaver-2.16.2-openpam.patch12
-rw-r--r--gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild9
3 files changed, 25 insertions, 3 deletions
diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index 0c819e8a3dc8..36e8efcd09c7 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-extra/gnome-screensaver
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.33 2007/01/21 22:07:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.34 2007/01/29 21:39:16 dang Exp $
+
+ 29 Jan 2007; Daniel Gryniewicz <dang@gentoo.org>
+ +files/gnome-screensaver-2.16.2-openpam.patch,
+ gnome-screensaver-2.16.2.ebuild:
+ Make it build with openpam; bug #163748
21 Jan 2007; Bryan Østergaard <kloeri@gentoo.org>
gnome-screensaver-2.16.2.ebuild:
diff --git a/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.16.2-openpam.patch b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.16.2-openpam.patch
new file mode 100644
index 000000000000..b5855b64ba8c
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/files/gnome-screensaver-2.16.2-openpam.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/opt/home/dang/.diffrc -up -ruN gnome-screensaver-2.16.2.orig/src/gs-auth-pam.c gnome-screensaver-2.16.2/src/gs-auth-pam.c
+--- gnome-screensaver-2.16.2.orig/src/gs-auth-pam.c 2006-11-09 11:17:35.000000000 -0500
++++ gnome-screensaver-2.16.2/src/gs-auth-pam.c 2007-01-29 16:17:04.000000000 -0500
+@@ -226,7 +226,7 @@ pam_conversation (int
+ if (res) {
+ reply [replies].resp_retcode = PAM_SUCCESS;
+ } else {
+- reply [replies].resp_retcode = PAM_INCOMPLETE;
++ reply [replies].resp_retcode = PAM_TRY_AGAIN;
+ }
+ }
+
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild
index 6f8bf0394035..695e7c531e5a 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild,v 1.10 2007/01/21 22:07:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild,v 1.11 2007/01/29 21:39:16 dang Exp $
-inherit gnome2
+inherit gnome2 eutils
DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
@@ -72,6 +72,11 @@ pkg_setup() {
--with-xscreensaverhackdir=/usr/lib/misc/xscreensaver"
}
+src_unpack() {
+ gnome2_src_unpack
+ epatch "${FILESDIR}"/${P}-openpam.patch
+}
+
src_install() {
gnome2_src_install