From 64022a3261d89e2808b664a7874b0a8e0ded58f4 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Wed, 28 Mar 2007 12:34:41 +0000 Subject: [PATCH] -pam really doesn't use PAM. Keyworded ~x86-fbsd. Package-Manager: portage-2.1.2.2 --- gnome-extra/gnome-screensaver/ChangeLog | 7 +++- gnome-extra/gnome-screensaver/Manifest | 34 +++++++------------ .../gnome-screensaver-2.16.2.ebuild | 21 +++++------- .../gnome-screensaver-2.18.0.ebuild | 22 ++++++------ 4 files changed, 37 insertions(+), 47 deletions(-) diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog index 49eb5abeea58..1d95ad6f517d 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.36 2007/03/27 21:25:50 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.37 2007/03/28 12:34:41 uberlord Exp $ + + 28 Mar 2007; Roy Marples + gnome-screensaver-2.16.2.ebuild, gnome-screensaver-2.18.0.ebuild: + -pam really doesn't use PAM + Keyworded ~x86-fbsd. *gnome-screensaver-2.18.0 (27 Mar 2007) diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest index 9310e7551cf5..e878207afca9 100644 --- a/gnome-extra/gnome-screensaver/Manifest +++ b/gnome-extra/gnome-screensaver/Manifest @@ -1,6 +1,3 @@ ------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 @@ -16,18 +13,18 @@ EBUILD gnome-screensaver-2.14.2.ebuild 2783 RMD160 008f2dbddd4a43c2b5d670d972ce5 MD5 fcc6c62dff7ce9fbb78f019383d57d92 gnome-screensaver-2.14.2.ebuild 2783 RMD160 008f2dbddd4a43c2b5d670d972ce57fa49f5cdfc gnome-screensaver-2.14.2.ebuild 2783 SHA256 d82ead29dd13672379a00c4115a10d308a867847abc61d4a712353695a47dbf2 gnome-screensaver-2.14.2.ebuild 2783 -EBUILD gnome-screensaver-2.16.2.ebuild 2800 RMD160 0d9f2c9f1a3a7b7e0978c3dc3b9812d3456b8d02 SHA1 49edde6ad01876758302bb817ab9963e2a264aca SHA256 1edd871856bb9c0474dd31719f60039c1924268c7426131be5c23317aa51b7d8 -MD5 1f6e72905c7b1d1480364edc0799025c gnome-screensaver-2.16.2.ebuild 2800 -RMD160 0d9f2c9f1a3a7b7e0978c3dc3b9812d3456b8d02 gnome-screensaver-2.16.2.ebuild 2800 -SHA256 1edd871856bb9c0474dd31719f60039c1924268c7426131be5c23317aa51b7d8 gnome-screensaver-2.16.2.ebuild 2800 -EBUILD gnome-screensaver-2.18.0.ebuild 2787 RMD160 9dd8f3dd4c3cb6cff2484aebb7bc1efb48ea8eec SHA1 580fd4176523ffaca1a2b5b023d8d6b9fa608f2e SHA256 73c9b6f08d9b45edebedbda29c2c8140d622a3081ba883c94c0fd4b2773aae06 -MD5 0a7ed93178c4f0f6e240ee7a3d9b9831 gnome-screensaver-2.18.0.ebuild 2787 -RMD160 9dd8f3dd4c3cb6cff2484aebb7bc1efb48ea8eec gnome-screensaver-2.18.0.ebuild 2787 -SHA256 73c9b6f08d9b45edebedbda29c2c8140d622a3081ba883c94c0fd4b2773aae06 gnome-screensaver-2.18.0.ebuild 2787 -MISC ChangeLog 5319 RMD160 c68fe2eb48fa4c2d5c69634c82629b95371f7a32 SHA1 e557ce47286c518efcb4c7093bf1143eeff7604c SHA256 a1e334e86d34e8bd96924fcb7cef95606112625ee1e9e0a7c5180a443274f7ea -MD5 9a923e0f9dc62021d5b906f0cbad9ba0 ChangeLog 5319 -RMD160 c68fe2eb48fa4c2d5c69634c82629b95371f7a32 ChangeLog 5319 -SHA256 a1e334e86d34e8bd96924fcb7cef95606112625ee1e9e0a7c5180a443274f7ea ChangeLog 5319 +EBUILD gnome-screensaver-2.16.2.ebuild 2879 RMD160 d532a1d45bded2a3fabc2aa81f3ecb73d9910138 SHA1 f987054bd9c08f93cf91dc7aa1bcc83e534f74cd SHA256 11dcb579567aa494227211eaaff8320e1078e7279dae3e222f8ef3372d2fcb0a +MD5 25f28206aa7614a420e7d9cb892aa997 gnome-screensaver-2.16.2.ebuild 2879 +RMD160 d532a1d45bded2a3fabc2aa81f3ecb73d9910138 gnome-screensaver-2.16.2.ebuild 2879 +SHA256 11dcb579567aa494227211eaaff8320e1078e7279dae3e222f8ef3372d2fcb0a gnome-screensaver-2.16.2.ebuild 2879 +EBUILD gnome-screensaver-2.18.0.ebuild 2882 RMD160 e4552c75786aab8b49cd5f1aae91e1167f40facb SHA1 9ae5bce465b8d19753cc21facd857ca289125c2c SHA256 96b37696b22c2a1becc4b00e4d2d788d6c57c33b4dcdf9028e5a2a90857d4620 +MD5 c909db94292ab3886c570a4b740624a7 gnome-screensaver-2.18.0.ebuild 2882 +RMD160 e4552c75786aab8b49cd5f1aae91e1167f40facb gnome-screensaver-2.18.0.ebuild 2882 +SHA256 96b37696b22c2a1becc4b00e4d2d788d6c57c33b4dcdf9028e5a2a90857d4620 gnome-screensaver-2.18.0.ebuild 2882 +MISC ChangeLog 5494 RMD160 222dff18ba5f7deb43f93e3e9ee0a754ee96106b SHA1 2cb20d3900254e374fb631b9222ce106909f20fe SHA256 f4d83163eaafdce7705920f5336f56bd8985b2012f43eb76f7a6a49123361c9d +MD5 1e3bb4dd556ef699153202f0b71fa786 ChangeLog 5494 +RMD160 222dff18ba5f7deb43f93e3e9ee0a754ee96106b ChangeLog 5494 +SHA256 f4d83163eaafdce7705920f5336f56bd8985b2012f43eb76f7a6a49123361c9d ChangeLog 5494 MISC metadata.xml 472 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 SHA1 18913172dba9d94ca5952b7f8bfb2aa13808bb67 SHA256 e70be8f69acbda81bd1e90c1bd3a57a0b5ccb5fa09c7a6f04427ef888e1872bc MD5 77f62dae0c1bc21d5cf698695368d2d8 metadata.xml 472 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 metadata.xml 472 @@ -41,10 +38,3 @@ SHA256 f481877a69608e5e36f45cdeafd1159ab497f8e490dce100b1bf4774ed59035a files/di MD5 d56210ea9ed6a74ea0e65542f2dda549 files/digest-gnome-screensaver-2.18.0 280 RMD160 2fbfb28eb51e3e6aa2cd76fc72e628d61d2b0794 files/digest-gnome-screensaver-2.18.0 280 SHA256 3dc85257082faa8199c2806fd4c453a191d0e6361828813949f0ce99cbfe2c1b files/digest-gnome-screensaver-2.18.0 280 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGCYt6omPajV0RnrERApN8AJ0cHEuqiovgnsEjzA3EXx1jahYf+wCfXSqG -WKK3wkNbMdIZXkCK0xafbAY= -=divX ------END PGP SIGNATURE----- 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 e3168fb33a26..650ced0c45c6 100644 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild +++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild @@ -1,6 +1,6 @@ # 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.12 2007/03/18 01:25:49 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.2.ebuild,v 1.13 2007/03/28 12:34:41 uberlord Exp $ inherit gnome2 eutils @@ -9,7 +9,7 @@ HOMEPAGE="http://live.gnome.org/GnomeScreensaver" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="debug doc xinerama opengl pam" RDEPEND=">=gnome-base/gconf-2.6.1 @@ -27,8 +27,8 @@ RDEPEND=">=gnome-base/gconf-2.6.1 xinerama? ( x11-libs/libXinerama x11-proto/xineramaproto ) - pam? ( sys-libs/pam ) - !pam? ( sys-apps/shadow ) + pam? ( virtual/pam ) + !pam? ( kernel_linux? ( sys-apps/shadow ) ) x11-libs/libX11 x11-libs/libXext @@ -51,17 +51,11 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" - pkg_setup() { - if use pam ; then - G2CONF="--enable-pam" - else - G2CONF="--with-shadow" - fi - G2CONF="${G2CONF} \ $(use_enable doc docbook-docs) \ $(use_enable debug) \ + $(use_enable pam) \ $(use_enable xinerama) \ $(use_with opengl gl) \ --enable-locking \ @@ -90,7 +84,10 @@ src_install() { dodoc ${S}/xss-conversion.txt - # If you are using shadow, you need to set the setuid bit on the dialog + # Non PAM users will need this suid to read the password hashes. + # OpenPAM users will probably need this too when + # http://bugzilla.gnome.org/show_bug.cgi?id=370847 + # is fixed. if ! use pam ; then fperms +s /usr/libexec/gnome-screensaver-dialog fi diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.0.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.0.ebuild index a4b2cb3eecf7..0340c4832f3c 100644 --- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.0.ebuild +++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.0.ebuild @@ -1,6 +1,6 @@ # 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.18.0.ebuild,v 1.1 2007/03/27 21:25:50 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.0.ebuild,v 1.2 2007/03/28 12:34:41 uberlord Exp $ inherit gnome2 @@ -9,8 +9,8 @@ HOMEPAGE="http://live.gnome.org/GnomeScreensaver" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug doc xinerama opengl pam" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="debug doc xinerama opengl pam kernel_linux" RDEPEND=">=gnome-base/gconf-2.6.1 >=x11-libs/gtk+-2.8 @@ -30,8 +30,8 @@ RDEPEND=">=gnome-base/gconf-2.6.1 x11-libs/libXinerama x11-proto/xineramaproto ) - pam? ( sys-libs/pam ) - !pam? ( sys-apps/shadow ) + pam? ( virtual/pam ) + !pam? ( kernel_linux? ( sys-apps/shadow ) ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr @@ -53,15 +53,10 @@ DEPEND="${RDEPEND} DOCS="AUTHORS ChangeLog HACKING NEWS README TODO" pkg_setup() { - if use pam ; then - G2CONF="--enable-pam" - else - G2CONF="--with-shadow" - fi - G2CONF="${G2CONF} \ $(use_enable doc docbook-docs) \ $(use_enable debug) \ + $(use_enable pam) \ $(use_enable xinerama) \ $(use_with opengl gl) \ --enable-locking --with-libexif --with-dpms-ext \ @@ -84,7 +79,10 @@ src_install() { dodoc ${S}/xss-conversion.txt - # If you are using shadow, you need to set the setuid bit on the dialog + # Non PAM users will need this suid to read the password hashes. + # OpenPAM users will probably need this too when + # http://bugzilla.gnome.org/show_bug.cgi?id=370847 + # is fixed. if ! use pam ; then fperms +s /usr/libexec/gnome-screensaver-dialog fi -- 2.26.2