diff options
Diffstat (limited to 'x11-apps')
-rw-r--r-- | x11-apps/xdm/ChangeLog | 12 | ||||
-rw-r--r-- | x11-apps/xdm/Manifest | 24 | ||||
-rw-r--r-- | x11-apps/xdm/files/digest-xdm-1.0.3-r1 | 3 | ||||
-rw-r--r-- | x11-apps/xdm/files/wtmp.patch | 18 | ||||
-rw-r--r-- | x11-apps/xdm/files/xwilling-hang.patch | 11 | ||||
-rw-r--r-- | x11-apps/xdm/xdm-1.0.3-r1.ebuild (renamed from x11-apps/xdm/xdm-1.0.3.ebuild) | 10 | ||||
-rw-r--r-- | x11-apps/xinit/Manifest | 12 |
7 files changed, 72 insertions, 18 deletions
diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog index 1a3b94af446e..03d2482c8f1e 100644 --- a/x11-apps/xdm/ChangeLog +++ b/x11-apps/xdm/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for x11-apps/xdm # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.40 2006/04/20 05:38:24 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.41 2006/04/20 06:34:22 spyderous Exp $ + +*xdm-1.0.3-r1 (20 Apr 2006) + + 20 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; +files/wtmp.patch, + +files/xwilling-hang.patch, -xdm-1.0.3.ebuild, +xdm-1.0.3-r1.ebuild: + (#10486) Don't run Xwilling script as the nobody user, /bin/false can't run + anything (Kashif Shaikh). (#12767) Use sessreg to register and unregister + sessions with wtmp and utmp (Arcady Genkin). (#70689) Set defaultvt to vt7 + rather than blank; part of the 'Start login manager sooner' optimization. + This also requires updating the xinit dep to 1.0.2-r2. 20 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; -files/xdm.start: Remove unused file. diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest index c67bf56b806c..af9abc6c8948 100644 --- a/x11-apps/xdm/Manifest +++ b/x11-apps/xdm/Manifest @@ -1,18 +1,24 @@ -MD5 dbfe6d9240e8fb7080375266509caa33 ChangeLog 6571 -RMD160 818035b379682728142b29ba462f0808c5efea9f ChangeLog 6571 -SHA256 4a37c2ad698e9936e4d9c8c73553a472e2a620f8a51fc3576a73f0ab4d31e594 ChangeLog 6571 +MD5 f43a7b5f8643e450188f993d22cae389 ChangeLog 7110 +RMD160 da29cf740a945a0da852586868ac7b9ed3d241da ChangeLog 7110 +SHA256 a14f526d97ed50f616f34ec6424bf21114869c1621ec534ed012c171e3ef3216 ChangeLog 7110 MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/Xsession 1521 RMD160 c02efb9e96a8dc836d71aa1b47c36358ad61129c files/Xsession 1521 SHA256 8a09cd1cef9ebce190e13009e8b21a8504eac1cec3fc31a10d3740b6c7aa49b6 files/Xsession 1521 -MD5 5125d709aee8c1d22f4e6a1c6b1cb431 files/digest-xdm-1.0.3 232 -RMD160 bff021630b720e9145e1698a5c9813de415451e3 files/digest-xdm-1.0.3 232 -SHA256 07f9231d76c3ab21b874127d4d269f35516a76cdf91322b959e78cc640ed3979 files/digest-xdm-1.0.3 232 +MD5 5125d709aee8c1d22f4e6a1c6b1cb431 files/digest-xdm-1.0.3-r1 232 +RMD160 bff021630b720e9145e1698a5c9813de415451e3 files/digest-xdm-1.0.3-r1 232 +SHA256 07f9231d76c3ab21b874127d4d269f35516a76cdf91322b959e78cc640ed3979 files/digest-xdm-1.0.3-r1 232 +MD5 d7eb1588964b8a757c454fa38bde30e4 files/wtmp.patch 799 +RMD160 515f6fb67c43877c41384a5012a9afea047b6f22 files/wtmp.patch 799 +SHA256 7ce7c837484e380be21022ffa4e306ee8c555fbffd6e53e85aef59f24074020d files/wtmp.patch 799 MD5 4a17967449d093f6430fbee47a24afba files/xdm.pamd 169 RMD160 a48ee2ed15d64412fb0035b3c18fe602d6175501 files/xdm.pamd 169 SHA256 edf108933d7ebfdd0b601e7bbe0a47601f16a5e45a1af26fde3eefce8079a288 files/xdm.pamd 169 +MD5 7c232f7520a16f42492ee90056cd4609 files/xwilling-hang.patch 589 +RMD160 1c624acd002d4b45cf6fb318ab4010425120c09b files/xwilling-hang.patch 589 +SHA256 7ee42e52cf2e2aedba74daabee0bb2fa4648262eb00dc92bc778c61b9afb59f4 files/xwilling-hang.patch 589 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156 -MD5 321c383362bb0a0b4a0a404ef11d2f05 xdm-1.0.3.ebuild 1223 -RMD160 afc6a93f3495f919048b9ec87bfa22957d1a23ca xdm-1.0.3.ebuild 1223 -SHA256 b5d758f42ed2391a87532922a7fec1fdfbaa84a05f78b47962d5064b4fcbb46a xdm-1.0.3.ebuild 1223 +MD5 742ec23d7b96440b9892428764cd3d2b xdm-1.0.3-r1.ebuild 1329 +RMD160 3f67e62f55ae7208b0ffd7a2abb55eb2b3b42f8e xdm-1.0.3-r1.ebuild 1329 +SHA256 ac633847e61182444e0c0b2d8da68a8f98e64812f78c54b69216ff23b46c5742 xdm-1.0.3-r1.ebuild 1329 diff --git a/x11-apps/xdm/files/digest-xdm-1.0.3-r1 b/x11-apps/xdm/files/digest-xdm-1.0.3-r1 new file mode 100644 index 000000000000..ca5e8506386b --- /dev/null +++ b/x11-apps/xdm/files/digest-xdm-1.0.3-r1 @@ -0,0 +1,3 @@ +MD5 4540fd015672f8fb8590ab16f4974cfe xdm-1.0.3.tar.bz2 352952 +RMD160 ce94a9c7c4cf690f4caa9a05f47918634240e987 xdm-1.0.3.tar.bz2 352952 +SHA256 086cd942e96e0a4cd111107aa59f4d9aca0e8ac05a4c350a5855a9ac0cc4bada xdm-1.0.3.tar.bz2 352952 diff --git a/x11-apps/xdm/files/wtmp.patch b/x11-apps/xdm/files/wtmp.patch new file mode 100644 index 000000000000..6d2d0a9c3441 --- /dev/null +++ b/x11-apps/xdm/files/wtmp.patch @@ -0,0 +1,18 @@ +diff -urN xdm-1.0.3.orig/config/GiveConsole xdm-1.0.3/config/GiveConsole +--- xdm-1.0.3.orig/config/GiveConsole 2006-04-19 22:40:45.000000000 -0700 ++++ xdm-1.0.3/config/GiveConsole 2006-04-19 23:06:51.000000000 -0700 +@@ -8,3 +8,5 @@ + # causing serious grief. + # + chown $USER /dev/console ++/usr/bin/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \ ++ -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER +diff -urN xdm-1.0.3.orig/config/TakeConsole xdm-1.0.3/config/TakeConsole +--- xdm-1.0.3.orig/config/TakeConsole 2006-04-19 22:40:45.000000000 -0700 ++++ xdm-1.0.3/config/TakeConsole 2006-04-19 23:07:37.000000000 -0700 +@@ -5,3 +5,5 @@ + # + chmod 622 /dev/console + chown root /dev/console ++/usr/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \ ++ -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER diff --git a/x11-apps/xdm/files/xwilling-hang.patch b/x11-apps/xdm/files/xwilling-hang.patch new file mode 100644 index 000000000000..93a0b14fd54a --- /dev/null +++ b/x11-apps/xdm/files/xwilling-hang.patch @@ -0,0 +1,11 @@ +--- xdm-1.0.3.orig/config/xdm-config.cpp 2006-04-19 22:40:45.000000000 -0700 ++++ xdm-1.0.3/config/xdm-config.cpp 2006-04-19 23:10:44.000000000 -0700 +@@ -18,7 +18,7 @@ + DisplayManager.servers: XDMCONFIGDIR/Xservers + DisplayManager.accessFile: XDMCONFIGDIR/Xaccess + DisplayManager*resources: XDMCONFIGDIR/Xresources +-DisplayManager.willing: SU nobody -c XDMSCRIPTDIR/Xwilling ++DisplayManager.willing: XDMSCRIPTDIR/Xwilling + ! All displays should use authorization, but we cannot be sure + ! X terminals may not be configured that way, so they will require + ! individual resource settings. diff --git a/x11-apps/xdm/xdm-1.0.3.ebuild b/x11-apps/xdm/xdm-1.0.3-r1.ebuild index a65c5fd387f5..65738f831827 100644 --- a/x11-apps/xdm/xdm-1.0.3.ebuild +++ b/x11-apps/xdm/xdm-1.0.3-r1.ebuild @@ -1,27 +1,33 @@ # 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.3.ebuild,v 1.2 2006/04/02 15:03:55 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-1.0.3-r1.ebuild,v 1.1 2006/04/20 06:34:22 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-0.99.1_pre20050905-r1 + >=x11-apps/xinit-1.0.2-r2 x11-libs/libX11 x11-libs/libXt" DEPEND="${RDEPEND} x11-proto/xproto" +PATCHES="${FILESDIR}/wtmp.patch + ${FILESDIR}/xwilling-hang.patch" + CONFIGURE_OPTIONS="$(use_enable xprint) $(use_enable ipv6) $(use_with pam) + --with-default-vt=${DEFAULTVT} --with-xdmconfigdir=/etc/X11/xdm" pkg_setup() { diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest index 708c9fff24b1..00e2a6d4ec8d 100644 --- a/x11-apps/xinit/Manifest +++ b/x11-apps/xinit/Manifest @@ -1,6 +1,6 @@ -MD5 cb8fc889b87f4c0c456045aa3c48fa27 ChangeLog 7024 -RMD160 092e842971f9d697a072881e94d012408e828c96 ChangeLog 7024 -SHA256 f786296571f86750f4f028183583766f40df2d3f60098b38ec87d94f45e3f610 ChangeLog 7024 +MD5 189c84bb758ac05c9688a630fd37d81e ChangeLog 7199 +RMD160 8b90872a6bc7439e9586e437281419f82f81c6f4 ChangeLog 7199 +SHA256 f5d50e6a46a7e5fa05b2f069bd3fcc9cf653e69881c9c6ceba3e604b6d76afe6 ChangeLog 7199 MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 files/Xsession 2187 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 files/Xsession 2187 @@ -19,9 +19,9 @@ SHA256 481252dd205a0eefcfdf1a265b2c359280363ceaf1460ca5eab42b9eb3b3c826 files/no MD5 965333ca03efda8a7302620a63c429f6 files/startDM.sh 922 RMD160 1f1db006ad51e5b3ec5c43f9867a4489d341bd61 files/startDM.sh 922 SHA256 36781509e239d5d7777e181c3d95462602bcc41a95f4881c3bca2a463086f9f7 files/startDM.sh 922 -MD5 374ccfcf68b65a217281ccad1b3f4c41 files/xdm.confd 423 -RMD160 d13735d4b063856c3142becb2f041cd3390ac060 files/xdm.confd 423 -SHA256 8c18c5674152dabab4c9b9837c881430fd3ac48ffd0497d41fa1c9e46ace4bff files/xdm.confd 423 +MD5 4bf619123010af8f624f4082f1f73b68 files/xdm.confd 500 +RMD160 746a5994745c93ae6a034f612dbf2e0df7da323d files/xdm.confd 500 +SHA256 1f6225e4c0b1e6eb50a35f394e33032acbdac100c987c92d5cc521e6bbfbbaae files/xdm.confd 500 MD5 2d8c9c76bd932f311ad86f490680d349 files/xdm.start 3418 RMD160 cc2ab8c312c595edb7f181868783d91399ee1c2e files/xdm.start 3418 SHA256 85623bc26002fa7626b2c07292fa55b9af10682f00221bcfb55bec7efa8ccdcc files/xdm.start 3418 |