Make it build with openpam; bug #163748

Package-Manager: portage-2.1.2-r5

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index 0c819e8a3dc80f4150d83e17aa00b032fa2a81d0..36e8efcd09c7b7dd63bf8d53d4a2ab1f910cef3b 100644 (file)
--- 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/Manifest b/gnome-extra/gnome-screensaver/Manifest
index 6a52d8122b20768cef6b38fb44ca9de837d5dfa5..931cc8716553dd749fc9a7b32914de2bbeb8968a 100644 (file)
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gnome-screensaver-2.16.2-openpam.patch 729 RMD160 7c21188af7a05618667f7b0aa7098a89153c446f SHA1 21dbc7e4419cef2f59adaaddcd5fef84f2d8dd38 SHA256 771644bc11b3c3d750175fda208a44b1747789578c2b19c436c5ba65d5a8fa4c
+MD5 4120f4d802a72346a164ab012a5b5c34 files/gnome-screensaver-2.16.2-openpam.patch 729
+RMD160 7c21188af7a05618667f7b0aa7098a89153c446f files/gnome-screensaver-2.16.2-openpam.patch 729
+SHA256 771644bc11b3c3d750175fda208a44b1747789578c2b19c436c5ba65d5a8fa4c files/gnome-screensaver-2.16.2-openpam.patch 729
 AUX xss-conversion.txt 922 RMD160 88de6927c2db0db9c0f6ad26defe52d41a536af7 SHA1 1602c4c4c8de01c841b656c68b67350765fd27e1 SHA256 da83b6709d30d676baf4f2b10ee80f10c3b79f64361c22d1535c9dc76213ff63
 MD5 310b89420e12f58729dea40364f9b1a9 files/xss-conversion.txt 922
 RMD160 88de6927c2db0db9c0f6ad26defe52d41a536af7 files/xss-conversion.txt 922
@@ -11,14 +15,14 @@ EBUILD gnome-screensaver-2.14.2.ebuild 2786 RMD160 5c81c4bd29678d8c778dce884be09
 MD5 ee63f1f091b3dc6fab6e26dd8d847d15 gnome-screensaver-2.14.2.ebuild 2786
 RMD160 5c81c4bd29678d8c778dce884be094e371f2ad49 gnome-screensaver-2.14.2.ebuild 2786
 SHA256 af82a17b704aa4048e9b4164cacb7cad36648ee07f15524df71cc8c2c1fc8985 gnome-screensaver-2.14.2.ebuild 2786
-EBUILD gnome-screensaver-2.16.2.ebuild 2717 RMD160 fd506f749e212da10655edc84c7244d4cfda63be SHA1 710b66613c9dd6b5012e3c1d23299656ceb34922 SHA256 6c67cf327a5f9c4feadadb748dfb03464b9ca8582a9037f3fa3472b86bf0b1e5
-MD5 cbb54a0cb520f3f8ce835a0a33c4566e gnome-screensaver-2.16.2.ebuild 2717
-RMD160 fd506f749e212da10655edc84c7244d4cfda63be gnome-screensaver-2.16.2.ebuild 2717
-SHA256 6c67cf327a5f9c4feadadb748dfb03464b9ca8582a9037f3fa3472b86bf0b1e5 gnome-screensaver-2.16.2.ebuild 2717
-MISC ChangeLog 4854 RMD160 48b36dc3483eb440a99ac58373975a56d2dbd101 SHA1 337ef3d42317a49c9f810785b25e49a3952653d0 SHA256 a0d3b5e525eb62e584bb950a3b6a58ea60b14218981edf74a65a9f05cbf96cc2
-MD5 3f526ef295bd10ae8043b808ed1a6357 ChangeLog 4854
-RMD160 48b36dc3483eb440a99ac58373975a56d2dbd101 ChangeLog 4854
-SHA256 a0d3b5e525eb62e584bb950a3b6a58ea60b14218981edf74a65a9f05cbf96cc2 ChangeLog 4854
+EBUILD gnome-screensaver-2.16.2.ebuild 2800 RMD160 2c714c85a88ff6a2b1bbc406de0d21cabe550809 SHA1 f14c06e1d66291e8c70bef7f9e7a924ccd90dd89 SHA256 4ec1d7b28114c1dda7564354ab85fe6f829c5d419ac08e9479331355dbf41938
+MD5 6d3344457df02e763437d28ee957b5e3 gnome-screensaver-2.16.2.ebuild 2800
+RMD160 2c714c85a88ff6a2b1bbc406de0d21cabe550809 gnome-screensaver-2.16.2.ebuild 2800
+SHA256 4ec1d7b28114c1dda7564354ab85fe6f829c5d419ac08e9479331355dbf41938 gnome-screensaver-2.16.2.ebuild 2800
+MISC ChangeLog 5030 RMD160 abd2bd924882bdf689664c404b0808cf4de598c5 SHA1 8a3e49f0111d16c11eec289c755a96b7bedcdf20 SHA256 fd641da00ac5d42081874fc94484ab2f4e246424fdaa6447eba528c6e371adbe
+MD5 48a8e6bc87e5a4c6a460f44c5a2eaf12 ChangeLog 5030
+RMD160 abd2bd924882bdf689664c404b0808cf4de598c5 ChangeLog 5030
+SHA256 fd641da00ac5d42081874fc94484ab2f4e246424fdaa6447eba528c6e371adbe ChangeLog 5030
 MISC metadata.xml 472 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 SHA1 18913172dba9d94ca5952b7f8bfb2aa13808bb67 SHA256 e70be8f69acbda81bd1e90c1bd3a57a0b5ccb5fa09c7a6f04427ef888e1872bc
 MD5 77f62dae0c1bc21d5cf698695368d2d8 metadata.xml 472
 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 metadata.xml 472
@@ -32,7 +36,7 @@ SHA256 f481877a69608e5e36f45cdeafd1159ab497f8e490dce100b1bf4774ed59035a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFs+PmugEuf3OQ0akRAlZ7AJ0bEvapjxTViAPW4wVE/OYr81AmlwCfYqg/
-5TjNdzEndOiUMTTww6UgVXA=
-=zC+9
+iD8DBQFFvmmNomPajV0RnrERAq87AJ405taH0wT+bEDRu7s9aX1+Can1vACfTFdL
+XH43vXhVibqi1LYfbOrO5fQ=
+=u1eo
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..b5855b6
--- /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 6f8bf03940355ea01d22dc21fa641506a8fcfb74..695e7c531e5a3529c1fac63e370c74b4941ae395 100644 (file)
--- 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