diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-04-17 04:23:44 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-17 04:23:44 +0000 |
| commit | 2aa8fd39c3e1b6e4ca0959caf534510949baa805 (patch) | |
| tree | d72308454315acf98e9065b1147172b1f4d6c755 /x11-apps | |
| parent | Add patch to build on non-x86 arches (diff) | |
| download | historical-2aa8fd39c3e1b6e4ca0959caf534510949baa805.tar.gz historical-2aa8fd39c3e1b6e4ca0959caf534510949baa805.tar.bz2 historical-2aa8fd39c3e1b6e4ca0959caf534510949baa805.zip | |
Dont loop forever trying to create /tmp/.font-unix. If it fails sanity, then just abort the process.
Package-Manager: portage-2.2_pre5
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xfs/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-apps/xfs/Manifest | 10 | ||||
| -rwxr-xr-x | x11-apps/xfs/files/xfs.start | 10 |
3 files changed, 18 insertions, 8 deletions
diff --git a/x11-apps/xfs/ChangeLog b/x11-apps/xfs/ChangeLog index cc3d0e0311cd..dfe3562da797 100644 --- a/x11-apps/xfs/ChangeLog +++ b/x11-apps/xfs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xfs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.51 2008/03/10 01:57:30 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.52 2008/04/17 04:23:44 vapier Exp $ + + 17 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/xfs.start: + Dont loop forever trying to create /tmp/.font-unix. If it fails sanity, then + just abort the process. 10 Mar 2008; Donnie Berkholz <dberkholz@gentoo.org>; ChangeLog: Bump. diff --git a/x11-apps/xfs/Manifest b/x11-apps/xfs/Manifest index e5176cee40f2..bdeb6de70a7b 100644 --- a/x11-apps/xfs/Manifest +++ b/x11-apps/xfs/Manifest @@ -3,17 +3,17 @@ Hash: SHA1 AUX xfs.conf.d 577 RMD160 8456dd8edbc6f96788155172cf98f28c2d423d8c SHA1 f0caa87674b257803cacbf0b4734c695d4a019e5 SHA256 1fd57f91542bad494d0e4959b23397969603ba590d7ebe37bdadfa53b2a4dce2 AUX xfs.config 1117 RMD160 832f8de8aa2643bb39bff5384a870d3f7e30d5ac SHA1 4bf214473fccad56c936040836249ee1cbd3f77e SHA256 3a1b8b5f7e40ee34f314acbf8fe612162c81974f8333f8ccae66ccb740c70092 -AUX xfs.start 7710 RMD160 8bcabe63c87011616182c59e0185234ed65d3b80 SHA1 c7066d089bc6813e81cb0ee1c1973fd93710a28e SHA256 654669dc598893a25a92cc90086434b1233ae22328be856a58e7f18262e28fc6 +AUX xfs.start 7819 RMD160 852983cfdbd014daf9cb96778364cceaf46b0b88 SHA1 d8b72eb132e180227b37abc6509aed77726944bd SHA256 ccf58bdc0858339758bfc6af0613821cd5ad74e4ead0e47ece9c9b8458990c7f DIST xfs-1.0.5.tar.bz2 152131 RMD160 9e95f914e1813c9a1b78e19608ac5c0bab61784d SHA1 3b5d0a6f86415148124762c780d50d81b73f405c SHA256 f586f2101d42e512e7d20a6a6715c3c2cad19cacbee3b4034a0818de349e38f9 DIST xfs-1.0.6.tar.bz2 162148 RMD160 35147a468699b7895d4b104e222f81deaaed095f SHA1 ca2c89fa8b1d831549e187f8b86b3566d1ba8098 SHA256 5a3ad18fdc67e261454740217f7c02d1b6825013abcebdcd778a4865fd823353 EBUILD xfs-1.0.5.ebuild 996 RMD160 c06d38e52a0bb2cf3574a8f66d55bdeda9207041 SHA1 bcc24f612523e7d460d8fa95e06d035c5cb64901 SHA256 40cc2ca64b626f96bd73d474753e9a1180915077b672f9ae5e69be67f6191782 EBUILD xfs-1.0.6.ebuild 1010 RMD160 d7a392dddca31f2be9ba5abfbb11787e90c396a1 SHA1 4e73f4b03fc48a0140fa4b400628fa65593dc957 SHA256 4b35f063ce9869a63888dc5bb323f0c4cb24853f645589a520bc61c4a5d2a14e -MISC ChangeLog 6295 RMD160 da7215b8889f29ecdf1e61d51ea24169f414b584 SHA1 add3e60e8772849547646875cc725f0f42d4e7ad SHA256 cf937147644393ec840afc15afe34b0d29c40f51e854d4387e5695cb9f206436 +MISC ChangeLog 6465 RMD160 38db423c80f01f9081a7d49897d9d2bcc3f0ac0d SHA1 25fa0065a8615db75cafae2b44e827939aa5c266 SHA256 b7ce1cac844fe9e137a62e8a81860a4151229e7a4ad7d4c7953bfb46a025d7c5 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFH1JWPXVaO67S1rtsRAuXRAJ9676ZBgBB7mgJ6JTD/e3fjQ36BUwCdGKan -o1pUGqs/RacjGd5Km5SoFvI= -=kzJ3 +iD8DBQFIBtDZj9hvisErhMIRAjtjAKCkOc2PLj+CVAPSRzoZgsNBCaw1EwCaAkxZ +c/3/BmaC98nLyaiGd09CRnE= +=oDbE -----END PGP SIGNATURE----- diff --git a/x11-apps/xfs/files/xfs.start b/x11-apps/xfs/files/xfs.start index 9290a0ec60f9..ca3b456548ce 100755 --- a/x11-apps/xfs/files/xfs.start +++ b/x11-apps/xfs/files/xfs.start @@ -1,8 +1,8 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 # Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.start,v 1.3 2007/09/30 08:21:18 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.start,v 1.4 2008/04/17 04:23:44 vapier Exp $ #NB: Config is in /etc/conf.d/xfs @@ -306,12 +306,18 @@ start() { ebegin "Starting X Font Server" if [ "`grep -e "^xfs:" /etc/passwd`" ] ; then + local sanity=0 # Fix possible race condition, bug #185660 while ! [ -d /tmp/.font-unix ]; do # Fix possible security problem, turned to hard failure in 6.8.0 # See discussion at http://freedesktop.org/bugzilla/show_bug.cgi?id=306 rm -rf /tmp/.font-unix mkdir -m 1777 /tmp/.font-unix + ((sanity+=1)) + if [ ${sanity} -gt 1000 ] ; then + eend 1 "i give up" + return 1 + fi done start-stop-daemon --start --quiet --exec /usr/bin/xfs \ |