diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2006-07-01 01:28:04 +0000 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2006-07-01 01:28:04 +0000 |
commit | d31ea0f25289def822660f238e8aae24b8a50b4b (patch) | |
tree | d8c71e49eb557be8f40d46f43b870b796af12908 /x11-apps/xdm | |
parent | Pull old version. (diff) | |
download | historical-d31ea0f25289def822660f238e8aae24b8a50b4b.tar.gz historical-d31ea0f25289def822660f238e8aae24b8a50b4b.tar.bz2 historical-d31ea0f25289def822660f238e8aae24b8a50b4b.zip |
Pull old version.
Package-Manager: portage-2.1.1_pre1-r1
Diffstat (limited to 'x11-apps/xdm')
-rw-r--r-- | x11-apps/xdm/Manifest | 30 | ||||
-rw-r--r-- | x11-apps/xdm/files/digest-xdm-1.0.4-r1 | 3 | ||||
-rw-r--r-- | x11-apps/xdm/files/xdm-1.0.4-setuid.diff | 44 | ||||
-rw-r--r-- | x11-apps/xdm/xdm-1.0.4-r1.ebuild | 63 |
4 files changed, 4 insertions, 136 deletions
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest index aa2f803c602d..17066c132d67 100644 --- a/x11-apps/xdm/Manifest +++ b/x11-apps/xdm/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX Xsession 1521 RMD160 c02efb9e96a8dc836d71aa1b47c36358ad61129c SHA1 b94699037a667c716462296c25b4d912fd5d783b SHA256 8a09cd1cef9ebce190e13009e8b21a8504eac1cec3fc31a10d3740b6c7aa49b6 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/Xsession 1521 RMD160 c02efb9e96a8dc836d71aa1b47c36358ad61129c files/Xsession 1521 @@ -9,10 +6,6 @@ AUX wtmp.patch 799 RMD160 515f6fb67c43877c41384a5012a9afea047b6f22 SHA1 2591d85c MD5 d7eb1588964b8a757c454fa38bde30e4 files/wtmp.patch 799 RMD160 515f6fb67c43877c41384a5012a9afea047b6f22 files/wtmp.patch 799 SHA256 7ce7c837484e380be21022ffa4e306ee8c555fbffd6e53e85aef59f24074020d files/wtmp.patch 799 -AUX xdm-1.0.4-setuid.diff 1364 RMD160 1640fc1859e80ec7a8f58cbd9bcd0c6591338beb SHA1 5b33a136ceffd40230fb65bf3cc635f8fc84e279 SHA256 35e7354aaf5b9ed3fb0c95b23ccaf6f5e83857a3336a0bf075b67659faf2d7f6 -MD5 24d467822a4dbf2f536ee419e0322f2d files/xdm-1.0.4-setuid.diff 1364 -RMD160 1640fc1859e80ec7a8f58cbd9bcd0c6591338beb files/xdm-1.0.4-setuid.diff 1364 -SHA256 35e7354aaf5b9ed3fb0c95b23ccaf6f5e83857a3336a0bf075b67659faf2d7f6 files/xdm-1.0.4-setuid.diff 1364 AUX xdm.pamd 169 RMD160 a48ee2ed15d64412fb0035b3c18fe602d6175501 SHA1 0995682b53cccd2b618a48c2d1325abb7e706b00 SHA256 edf108933d7ebfdd0b601e7bbe0a47601f16a5e45a1af26fde3eefce8079a288 MD5 4a17967449d093f6430fbee47a24afba files/xdm.pamd 169 RMD160 a48ee2ed15d64412fb0035b3c18fe602d6175501 files/xdm.pamd 169 @@ -21,34 +14,19 @@ AUX xwilling-hang.patch 589 RMD160 1c624acd002d4b45cf6fb318ab4010425120c09b SHA1 MD5 7c232f7520a16f42492ee90056cd4609 files/xwilling-hang.patch 589 RMD160 1c624acd002d4b45cf6fb318ab4010425120c09b files/xwilling-hang.patch 589 SHA256 7ee42e52cf2e2aedba74daabee0bb2fa4648262eb00dc92bc778c61b9afb59f4 files/xwilling-hang.patch 589 -DIST xdm-1.0.4.tar.bz2 363486 RMD160 fe4f62979d1f4fed394464e535544435c41fb8b3 SHA1 f7f490fb87c9249fbf6f4f92e730b6eb90365959 SHA256 d1c7a90da45ab38100c86311432832dcb968fd58bfc04007b3bcdb5446d6fb9b DIST xdm-1.0.5.tar.bz2 363931 RMD160 bdd25a22146ffb495416c580d83c4dbaf6fdc3c9 SHA1 ed7bbef74a820ccca093a827c86bc440a9e89a0d SHA256 4550c517bd6dcd842c1e4ba6545a4850a7fd708ec2ab831b573f49a40c6defae -EBUILD xdm-1.0.4-r1.ebuild 1575 RMD160 f8a2a3392f04525ee3feb1fb7f06810daa757171 SHA1 74bc174c8492e1858c1a93ed1aaf48f1dc442da0 SHA256 9b859f3d5bea9423c8c8bbec1687ac93755705087cfc8c6964158de260a5fb47 -MD5 1d6306f00af035523da9bdc1a6c554b3 xdm-1.0.4-r1.ebuild 1575 -RMD160 f8a2a3392f04525ee3feb1fb7f06810daa757171 xdm-1.0.4-r1.ebuild 1575 -SHA256 9b859f3d5bea9423c8c8bbec1687ac93755705087cfc8c6964158de260a5fb47 xdm-1.0.4-r1.ebuild 1575 EBUILD xdm-1.0.5.ebuild 1538 RMD160 68f45c3163f34ac764a5ed1efd41fe66badde425 SHA1 4578dcd31ac168eced3ddfc7834ea9171ee28b02 SHA256 68525f10e0dc16311434daf53947c8f7d436fbdba50db29827092fff90b3eb2c MD5 b6ecfb6ad75f549d3f7d8a514ee7cdad xdm-1.0.5.ebuild 1538 RMD160 68f45c3163f34ac764a5ed1efd41fe66badde425 xdm-1.0.5.ebuild 1538 SHA256 68525f10e0dc16311434daf53947c8f7d436fbdba50db29827092fff90b3eb2c xdm-1.0.5.ebuild 1538 -MISC ChangeLog 8755 RMD160 59ea956f832f83f52d36462bfe5039c8522369bb SHA1 b848f12354d706c37650cb16d376eb3879a9553a SHA256 17f3016846875285e21dc2a4567d986d8e3ed2921322939716e5127f15f7ba0c -MD5 6dd78fc94962f0bfe90ade1812813b65 ChangeLog 8755 -RMD160 59ea956f832f83f52d36462bfe5039c8522369bb ChangeLog 8755 -SHA256 17f3016846875285e21dc2a4567d986d8e3ed2921322939716e5127f15f7ba0c ChangeLog 8755 +MISC ChangeLog 8886 RMD160 87492d88456371aa8f0fa75f64f98dd5c8a1a57c SHA1 38f52b0183f5f97246151eac21724727d6add305 SHA256 92cd81aaf68a89203761bc9808d8ca29a45904c7cb06ed58a04c78da7632d807 +MD5 08c08dc4b546f95aa2a543fca2d7c851 ChangeLog 8886 +RMD160 87492d88456371aa8f0fa75f64f98dd5c8a1a57c ChangeLog 8886 +SHA256 92cd81aaf68a89203761bc9808d8ca29a45904c7cb06ed58a04c78da7632d807 ChangeLog 8886 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156 -MD5 4be6a6f46dd21ebbf73d82ba6c14a652 files/digest-xdm-1.0.4-r1 232 -RMD160 251810cd68573b105e0533c94aa0e4be3e730003 files/digest-xdm-1.0.4-r1 232 -SHA256 2a53fff01cb85c3eb1265f2f990d6ab4d8a3dc9235015734ec09366de03578c9 files/digest-xdm-1.0.4-r1 232 MD5 0918fa81f924780fa977920e65e9fd11 files/digest-xdm-1.0.5 232 RMD160 6b8601ab705de7c8d1df97221d91577d7ab4cc7f files/digest-xdm-1.0.5 232 SHA256 d9e331b55536f294b67a10763ec6d0b83ad1ebed0507b48701670be6f87cdc0f files/digest-xdm-1.0.5 232 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3 (GNU/Linux) - -iD8DBQFEpTtokT4lNIS36YERAokMAKDEevPlEzcNO6PRsKU83PY73YQVYgCfXKme -9usv67m6GXFf/GE/m7YJ428= -=5jXJ ------END PGP SIGNATURE----- diff --git a/x11-apps/xdm/files/digest-xdm-1.0.4-r1 b/x11-apps/xdm/files/digest-xdm-1.0.4-r1 deleted file mode 100644 index 751dc08d6522..000000000000 --- a/x11-apps/xdm/files/digest-xdm-1.0.4-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 aeed9697f27c0730a550a1ac7efdc189 xdm-1.0.4.tar.bz2 363486 -RMD160 fe4f62979d1f4fed394464e535544435c41fb8b3 xdm-1.0.4.tar.bz2 363486 -SHA256 d1c7a90da45ab38100c86311432832dcb968fd58bfc04007b3bcdb5446d6fb9b xdm-1.0.4.tar.bz2 363486 diff --git a/x11-apps/xdm/files/xdm-1.0.4-setuid.diff b/x11-apps/xdm/files/xdm-1.0.4-setuid.diff deleted file mode 100644 index b633792ad579..000000000000 --- a/x11-apps/xdm/files/xdm-1.0.4-setuid.diff +++ /dev/null @@ -1,44 +0,0 @@ -Index: session.c -=================================================================== -RCS file: /cvs/xorg/app/xdm/session.c,v -retrieving revision 1.7 -diff -u -r1.7 session.c ---- session.c 3 Jun 2006 00:05:24 -0000 1.7 -+++ session.c 19 Jun 2006 21:30:50 -0000 -@@ -492,8 +492,14 @@ - else - ResetServer (d); - if (removeAuth) { -- setgid (verify.gid); -- setuid (verify.uid); -+ if (setgid (verify.gid) == -1) { -+ LogError( "SessionExit: setgid: %s\n", strerror(errno)); -+ exit(status); -+ } -+ if (setuid (verify.uid) == -1) { -+ LogError( "SessionExit: setuid: %s\n", strerror(errno)); -+ exit(status); -+ } - RemoveUserAuthorization (d, &verify); - #if defined(K5AUTH) && !defined(USE_PAM) /* PAM modules should handle this */ - /* do like "kdestroy" program */ -Index: xdmshell.c -=================================================================== -RCS file: /cvs/xorg/app/xdm/xdmshell.c,v -retrieving revision 1.3 -diff -u -r1.3 xdmshell.c ---- xdmshell.c 14 Jul 2005 22:58:25 -0000 1.3 -+++ xdmshell.c 19 Jun 2006 21:30:50 -0000 -@@ -183,7 +183,11 @@ - #endif - - /* make xdm run in a non-setuid environment */ -- setuid (geteuid()); -+ if (setuid (geteuid()) == -1) { -+ fprintf(stderr, "%s: cannot setuid (error %d, %s)\r\n", -+ ProgramName, errno, strerror(errno)); -+ exit(1); -+ } - - /* - * exec /usr/bin/X11/xdm -nodaemon -udpPort 0 diff --git a/x11-apps/xdm/xdm-1.0.4-r1.ebuild b/x11-apps/xdm/xdm-1.0.4-r1.ebuild deleted file mode 100644 index 1c3a7e4c0b8a..000000000000 --- a/x11-apps/xdm/xdm-1.0.4-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.0.4-r1.ebuild,v 1.1 2006/06/20 16:15:20 spyderous Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" - -inherit multilib x-modular pam - -DEFAULTVT="vt7" - -DESCRIPTION="X.Org xdm application" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="xprint ipv6 pam" -RDEPEND="x11-apps/xrdb - x11-libs/libXdmcp - x11-libs/libXaw - >=x11-apps/xinit-1.0.2-r3 - x11-libs/libX11 - x11-libs/libXt" -DEPEND="${RDEPEND} - x11-proto/xproto" - -PATCHES="${FILESDIR}/wtmp.patch - ${FILESDIR}/xwilling-hang.patch - ${FILESDIR}/${P}-setuid.diff" - -CONFIGURE_OPTIONS="$(use_enable xprint) - $(use_enable ipv6) - $(use_with pam) - --with-default-vt=${DEFAULTVT} - --with-xdmconfigdir=/etc/X11/xdm" - -pkg_setup() { - if use xprint && ! built_with_use x11-libs/libXaw xprint; then - die "Build x11-libs/libXaw with USE=xprint." - fi -} - -src_install() { - x-modular_src_install - exeinto /usr/$(get_libdir)/X11/xdm - doexe ${FILESDIR}/Xsession - newpamd ${FILESDIR}/xdm.pamd xdm -} - -pkg_preinst() { - x-modular_pkg_preinst - - # Check for leftover /usr/lib/X11/xdm symlink - if [[ -L "/usr/lib/X11/xdm" ]]; then - ewarn "/usr/lib/X11/xdm is a symlink; deleting." - rm /usr/lib/X11/xdm - fi -} - -pkg_postinst() { - x-modular_pkg_postinst - - ewarn "Install x11-apps/sessreg, or you won't be able to log in." - ewarn "It cannot be added as a dependency yet, because it isn't" - ewarn "tested on all architectures." -} |