Start xdm after openvpn. (Scott Thomson, bug #139434)

Package-Manager: portage-2.1.1_pre3

4 files changed, 20 insertions, 15 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 65aef6c5f3a2..807ac1147552 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.62 2006/07/10 18:37:53 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.63 2006/07/16 17:23:39 joshuabaergen Exp $
+
+  16 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org> files/xdm.start:
+  Start xdm after openvpn.  (Scott Thomson, bug #139434)
 
   10 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>; files/xdm.start:
   (#139824) Start after ypbind and autofs for network authentication.
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 8313aff7882f..7721dc24b0c6 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -22,10 +22,10 @@ AUX xdm.confd 668 RMD160 336b367da62beb39bcf4ce60efc07c7c00dc7133 SHA1 57e33bae4
 MD5 1ef321642c38bfb020e92723722319fb files/xdm.confd 668
 RMD160 336b367da62beb39bcf4ce60efc07c7c00dc7133 files/xdm.confd 668
 SHA256 d8b6828dae11bd2e632c9000b087d59c66192e1e21183124e7bf90ddee09f128 files/xdm.confd 668
-AUX xdm.start 3808 RMD160 611230a633a09d5e7f0c2659f9f589615cebae34 SHA1 6f774b371512e192e13320d1b93b5339d0494c3d SHA256 3f28258b440841d2553b0b79b72cfdd38e703ae88b7f550da55dad830ce39822
-MD5 0634aa69fd0d972403b7a2b69eccebae files/xdm.start 3808
-RMD160 611230a633a09d5e7f0c2659f9f589615cebae34 files/xdm.start 3808
-SHA256 3f28258b440841d2553b0b79b72cfdd38e703ae88b7f550da55dad830ce39822 files/xdm.start 3808
+AUX xdm.start 3820 RMD160 46a7211279816942b9818abb241fc6049363c346 SHA1 549b2f6097a0911e1ea406202768972e7cd0d294 SHA256 924d93ab2de803f03f4f5ef60fd2224c89b78bbd12c5638e821f541556a9fa36
+MD5 3f09a5c9ab17401cf18439837149a3e7 files/xdm.start 3820
+RMD160 46a7211279816942b9818abb241fc6049363c346 files/xdm.start 3820
+SHA256 924d93ab2de803f03f4f5ef60fd2224c89b78bbd12c5638e821f541556a9fa36 files/xdm.start 3820
 AUX xinit-1.0.2-setuid.diff 544 RMD160 62daa9092848c2886ae6ca159cd0188078d1da77 SHA1 816fa2fea8dbc1479ed594dace6281538de5e0ad SHA256 665a12f7d7a0da742fbfb4b2270ce8482b25ae268b8dc1de483de8ad25b55f31
 MD5 1377016ad0dd0e127419e4452d66a8ef files/xinit-1.0.2-setuid.diff 544
 RMD160 62daa9092848c2886ae6ca159cd0188078d1da77 files/xinit-1.0.2-setuid.diff 544
@@ -38,19 +38,19 @@ AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845
 MD5 708a3daf8950bbfe3aa231efb7533cb0 files/xserver.pamd 125
 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 files/xserver.pamd 125
 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2 files/xserver.pamd 125
-DIST xinit-1.0.2.tar.bz2 96536
+DIST xinit-1.0.2.tar.bz2 96536 RMD160 b3ced92e7ffb1afc3880799ed18f584e7f58d048 SHA1 78a2fefebbe75a65682373fa22721c8789f55580 SHA256 254ee0f81384fb184229d73d546fb07344c5448bbd4f4a66fef595ae49f8f395
 EBUILD xinit-1.0.2-r6.ebuild 1321 RMD160 f1deca75a47115eb6019ecf64e9e55ad8e4b79c2 SHA1 3327b9d607c4d4bb73fee1ef849eef1a8d2bb4bb SHA256 9ab61bf79ecb105dd4393e25a4c3221059e430645cc172dbc4e04117058e9800
 MD5 b461f317821ce15bd98c113a80712d17 xinit-1.0.2-r6.ebuild 1321
 RMD160 f1deca75a47115eb6019ecf64e9e55ad8e4b79c2 xinit-1.0.2-r6.ebuild 1321
 SHA256 9ab61bf79ecb105dd4393e25a4c3221059e430645cc172dbc4e04117058e9800 xinit-1.0.2-r6.ebuild 1321
-MISC ChangeLog 10060 RMD160 3bce3e69653c5a414896bc0aec703a10ab809664 SHA1 be4cc6a2e2cd8ead07e493442b1cf2f24e593a37 SHA256 bb1306c4ca0d8d0238c7a753fde63b2f9edb56dc53e290bfbdb779a2c05a7422
-MD5 295c961bdce5e819c020802bac2aef3a ChangeLog 10060
-RMD160 3bce3e69653c5a414896bc0aec703a10ab809664 ChangeLog 10060
-SHA256 bb1306c4ca0d8d0238c7a753fde63b2f9edb56dc53e290bfbdb779a2c05a7422 ChangeLog 10060
+MISC ChangeLog 10196 RMD160 c1880455bfbf8b45ca2b4044e0790d5edc5df107 SHA1 b6debbed7f194f4abeff1220a593552253a34447 SHA256 b7183d248daa98c046a4197a7ad7959fb6916db53fb467cc8afe7481c797dfbb
+MD5 fe69432461fe7ae13e32bd449dd3cc0e ChangeLog 10196
+RMD160 c1880455bfbf8b45ca2b4044e0790d5edc5df107 ChangeLog 10196
+SHA256 b7183d248daa98c046a4197a7ad7959fb6916db53fb467cc8afe7481c797dfbb ChangeLog 10196
 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 7c9ec298fe21850712f28ece69f55eae files/digest-xinit-1.0.2-r6 63
-RMD160 0cc4fe8b25a434f00e1ee54bf49bcd664408b492 files/digest-xinit-1.0.2-r6 63
-SHA256 b57fcf10dc1808b4dc9d4523329b0d6075b16166277252105432a846eb9d5125 files/digest-xinit-1.0.2-r6 63
+MD5 c8f5beff4bef1118192ff37d20b3819a files/digest-xinit-1.0.2-r6 235
+RMD160 4a431e028d1dda40bc62e2b5af370efd00d821d7 files/digest-xinit-1.0.2-r6 235
+SHA256 a8f4441513332ff52b02d667e403ebb39418f3eb6df177c51899f70b21c59cd1 files/digest-xinit-1.0.2-r6 235
diff --git a/x11-apps/xinit/files/digest-xinit-1.0.2-r6 b/x11-apps/xinit/files/digest-xinit-1.0.2-r6
index d1a7a8fa385c..29ec40dd3a6d 100644
--- a/x11-apps/xinit/files/digest-xinit-1.0.2-r6
+++ b/x11-apps/xinit/files/digest-xinit-1.0.2-r6
@@ -1 +1,3 @@
 MD5 d591fafe69b57969b0521c461073a01f xinit-1.0.2.tar.bz2 96536
+RMD160 b3ced92e7ffb1afc3880799ed18f584e7f58d048 xinit-1.0.2.tar.bz2 96536
+SHA256 254ee0f81384fb184229d73d546fb07344c5448bbd4f4a66fef595ae49f8f395 xinit-1.0.2.tar.bz2 96536
diff --git a/x11-apps/xinit/files/xdm.start b/x11-apps/xinit/files/xdm.start
index 9fd4d14872b0..65a17416f19b 100755
--- a/x11-apps/xinit/files/xdm.start
+++ b/x11-apps/xinit/files/xdm.start
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.start,v 1.6 2006/07/10 18:37:53 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.start,v 1.7 2006/07/16 17:23:39 joshuabaergen Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
@@ -44,7 +44,7 @@ depend() {
 	# this should start as early as possible
 	# we can't do 'before *' as that breaks it
 	# (#139824) Start after ypbind and autofs for network authentication
-	after bootmisc readahead-list ypbind autofs
+	after bootmisc readahead-list ypbind autofs openvpn
 	before alsasound net.lo
 
 	# Start before X