commit for drac: make X not listen on tcp for xfce, bug 61852 thanks to Geoff <thunderlove@charter.net>

Package-Manager: portage-2.1_rc4-r2

5 files changed, 91 insertions, 12 deletions

diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index 7a85595b98d8..3715d131b8f5 100644
--- a/xfce-base/xfce-utils/ChangeLog
+++ b/xfce-base/xfce-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce-utils
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.67 2006/04/22 10:37:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.68 2006/06/05 22:40:09 genstef Exp $
+
+  05 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/nolisten-tcp.patch, xfce-utils-4.2.3.ebuild,
+  xfce-utils-4.3.90.1.ebuild:
+  commit for drac: make X not listen on tcp for xfce, bug 61852 thanks to
+  Geoff <thunderlove@charter.net>
 
   22 Apr 2006; Markus Rothe <corsair@gentoo.org> xfce-utils-4.2.3.ebuild:
   Stable on ppc64
diff --git a/xfce-base/xfce-utils/Manifest b/xfce-base/xfce-utils/Manifest
index fabca5f14b46..66c32b3ab243 100644
--- a/xfce-base/xfce-utils/Manifest
+++ b/xfce-base/xfce-utils/Manifest
@@ -1,13 +1,55 @@
-MD5 d429e5c68520021b8dd98cf871665b15 ChangeLog 8047
+AUX Gentoo 644 RMD160 241dd1e0becafc6203819d35c2239c1a65084259 SHA1 092e34a62d7e21e2f44f19f185c4a4b579f54315 SHA256 33e3cfc4ce5917a8fcb2a1f0bb465d06cbd670f66d504cfe123ebcd4c5360ffd
 MD5 3ddf686258bd88f5d60f701f00c08a30 files/Gentoo 644
+RMD160 241dd1e0becafc6203819d35c2239c1a65084259 files/Gentoo 644
+SHA256 33e3cfc4ce5917a8fcb2a1f0bb465d06cbd670f66d504cfe123ebcd4c5360ffd files/Gentoo 644
+AUX nolisten-tcp.patch 703 RMD160 71c675cb598b4676c751f10b7bd168c82d7e90e4 SHA1 a08284b41de5eca9f457730a9d4e27a0278c3b3c SHA256 3649ac55b8e78e63b7709aa73752cea29bf9c5c4f6e2f09509f8585c5b6ae5f8
+MD5 505d7f21cddeed3361fa552a6c23ff65 files/nolisten-tcp.patch 703
+RMD160 71c675cb598b4676c751f10b7bd168c82d7e90e4 files/nolisten-tcp.patch 703
+SHA256 3649ac55b8e78e63b7709aa73752cea29bf9c5c4f6e2f09509f8585c5b6ae5f8 files/nolisten-tcp.patch 703
+DIST xfce-utils-4.2.1.tar.gz 748056
+DIST xfce-utils-4.2.2.tar.gz 1031911
+DIST xfce-utils-4.2.3.tar.gz 1303388
+DIST xfce-utils-4.3.90.1.tar.bz2 904355 RMD160 63f67c7d95c6e85b0b67bebd18166f4647351cca SHA256 7a785d875341499ac3953df7e026db3ea1239ff28195da32fb042cb7003d8e32
+EBUILD xfce-utils-4.2.1.ebuild 490 RMD160 9167d6a4f05cbe3f4077286589461ec20d3c4917 SHA1 d5f88a90f167bf8b1d785565e9cca99e8fa39de9 SHA256 86e74d753d68699436ae4b91d6cc2dbf8c6b3fc8f4852c6a601da33cef2741bb
+MD5 c3448e2f16a6d3a18902ed4b5b35389e xfce-utils-4.2.1.ebuild 490
+RMD160 9167d6a4f05cbe3f4077286589461ec20d3c4917 xfce-utils-4.2.1.ebuild 490
+SHA256 86e74d753d68699436ae4b91d6cc2dbf8c6b3fc8f4852c6a601da33cef2741bb xfce-utils-4.2.1.ebuild 490
+EBUILD xfce-utils-4.2.2-r1.ebuild 652 RMD160 151778fdf3945945e235b19af708830c3fd5fe8d SHA1 51c2b7961a654cb3f3da9b2e81b1d4050fad9a49 SHA256 80f89be9894ec3f08e49d477e4fefeb20d192c1c85a0fe54d0e42fedff84ca92
+MD5 488d223db503c6dddb0ebc7c768f9382 xfce-utils-4.2.2-r1.ebuild 652
+RMD160 151778fdf3945945e235b19af708830c3fd5fe8d xfce-utils-4.2.2-r1.ebuild 652
+SHA256 80f89be9894ec3f08e49d477e4fefeb20d192c1c85a0fe54d0e42fedff84ca92 xfce-utils-4.2.2-r1.ebuild 652
+EBUILD xfce-utils-4.2.2.ebuild 481 RMD160 ed85a5d99e65a39266bcd2b39d9723bc4c7bec7e SHA1 33af7cec47af94befb7954f5fe13c486ab1aae8a SHA256 7cb88287ef19ea100b60dd9c8a9b3b062a4709258675c4cf6be14283f57caa33
+MD5 7ec05ea198399260e8e0298ba61d4e07 xfce-utils-4.2.2.ebuild 481
+RMD160 ed85a5d99e65a39266bcd2b39d9723bc4c7bec7e xfce-utils-4.2.2.ebuild 481
+SHA256 7cb88287ef19ea100b60dd9c8a9b3b062a4709258675c4cf6be14283f57caa33 xfce-utils-4.2.2.ebuild 481
+EBUILD xfce-utils-4.2.3.ebuild 732 RMD160 9acdf1516717f7bf31b6aedf101ce1864709c200 SHA1 46fe635cbe5fc0ea30e15317012c5d71349e0fd7 SHA256 f1b1989df5ff3193223633cd42e3ad1a68940f4bc657fe9b92f59acf9319c1d1
+MD5 78c397d928ad6e69bcf6448f904c61d3 xfce-utils-4.2.3.ebuild 732
+RMD160 9acdf1516717f7bf31b6aedf101ce1864709c200 xfce-utils-4.2.3.ebuild 732
+SHA256 f1b1989df5ff3193223633cd42e3ad1a68940f4bc657fe9b92f59acf9319c1d1 xfce-utils-4.2.3.ebuild 732
+EBUILD xfce-utils-4.3.90.1.ebuild 970 RMD160 ae48b22dbc609b849d639e75efe2a1a5d60ff09d SHA1 a667ce6451c414e1acedf4cf86748c13cc64f1e3 SHA256 a39d0383a53715005807b1942bca9e9083f50ebe1b5871b3e7c42f8642888853
+MD5 24674f9bb2fe637a4d542a5c141ef674 xfce-utils-4.3.90.1.ebuild 970
+RMD160 ae48b22dbc609b849d639e75efe2a1a5d60ff09d xfce-utils-4.3.90.1.ebuild 970
+SHA256 a39d0383a53715005807b1942bca9e9083f50ebe1b5871b3e7c42f8642888853 xfce-utils-4.3.90.1.ebuild 970
+MISC ChangeLog 8293 RMD160 dd657e7dcd37bca28535c83b8501974ba4a5de29 SHA1 e16d79924acbffc73b1c312acdfa5d79054f2a48 SHA256 e8e514fc2c17d62cb9e0e8445612b889abb09a81cc51aa6a5364ce629bb7852f
+MD5 956764263e93500cccf202b0a2dd3294 ChangeLog 8293
+RMD160 dd657e7dcd37bca28535c83b8501974ba4a5de29 ChangeLog 8293
+SHA256 e8e514fc2c17d62cb9e0e8445612b889abb09a81cc51aa6a5364ce629bb7852f ChangeLog 8293
+MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
+MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
+RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
+SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata.xml 157
 MD5 1769451c4836775c50d544c89d652a2f files/digest-xfce-utils-4.2.1 68
+RMD160 7b4f0ae7bc525f245c583b25400e68900585405c files/digest-xfce-utils-4.2.1 68
+SHA256 c958f624c48619ae39dbf54b27ba2ab60c5375120adacba1b3042a1950ba54bb files/digest-xfce-utils-4.2.1 68
 MD5 aa9d857dda85eef063aa95799c7d4e3e files/digest-xfce-utils-4.2.2 69
+RMD160 1b39f6b60b7ca4cd0c685aa2cdee84010b78a74e files/digest-xfce-utils-4.2.2 69
+SHA256 b13ba5b800b6bea0cb954551c8e01b29d0f6162c800d8e5f33b61df8cbdaf5fa files/digest-xfce-utils-4.2.2 69
 MD5 aa9d857dda85eef063aa95799c7d4e3e files/digest-xfce-utils-4.2.2-r1 69
+RMD160 1b39f6b60b7ca4cd0c685aa2cdee84010b78a74e files/digest-xfce-utils-4.2.2-r1 69
+SHA256 b13ba5b800b6bea0cb954551c8e01b29d0f6162c800d8e5f33b61df8cbdaf5fa files/digest-xfce-utils-4.2.2-r1 69
 MD5 02cae7c98cc291113db7e17773ec5657 files/digest-xfce-utils-4.2.3 69
+RMD160 447642553b3a0b883c670ca4a93b7d0db41c1e53 files/digest-xfce-utils-4.2.3 69
+SHA256 c97ea509af5f0c85e4ea0d126eb744c743a6d13f6b744ca3847ab89b2cffb9d0 files/digest-xfce-utils-4.2.3 69
 MD5 54acc7dea89db32a830268d5f82f560b files/digest-xfce-utils-4.3.90.1 262
-MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
-MD5 c3448e2f16a6d3a18902ed4b5b35389e xfce-utils-4.2.1.ebuild 490
-MD5 488d223db503c6dddb0ebc7c768f9382 xfce-utils-4.2.2-r1.ebuild 652
-MD5 7ec05ea198399260e8e0298ba61d4e07 xfce-utils-4.2.2.ebuild 481
-MD5 91e27d6b2b63596584e1f7de9e0362bc xfce-utils-4.2.3.ebuild 642
-MD5 86bf0ff5b3e9d538a272ed29363588c7 xfce-utils-4.3.90.1.ebuild 881
+RMD160 50565966e9d843cf661e83d60c947e56e0a7d336 files/digest-xfce-utils-4.3.90.1 262
+SHA256 fce074ad7d07e1ca0ac0823d9db05f026bfc8a7a3eb416e98c6e18edebac97eb files/digest-xfce-utils-4.3.90.1 262
diff --git a/xfce-base/xfce-utils/files/nolisten-tcp.patch b/xfce-base/xfce-utils/files/nolisten-tcp.patch
new file mode 100644
index 000000000000..f4f3b9cc5060
--- /dev/null
+++ b/xfce-base/xfce-utils/files/nolisten-tcp.patch
@@ -0,0 +1,19 @@
+diff -ur xfce-utils-4.2.3/scripts/startxfce4.in xfce-utils-4.2.3-r1/scripts/startxfce4.in
+--- xfce-utils-4.2.3/scripts/startxfce4.in	2005-11-05 19:03:34.000000000 +0200
++++ xfce-utils-4.2.3-r1/scripts/startxfce4.in	2006-06-06 01:02:47.000000000 +0300
+@@ -36,12 +36,12 @@
+ fi
+ 
+ if [ -f $BASEDIR/xinitrc ]; then
+-  exec $prog $BASEDIR/xinitrc $*
++  exec $prog $BASEDIR/xinitrc -- -nolisten tcp$*
+ elif [ -f $HOME/.xfce4/xinitrc ]; then
+   mkdir -p $BASEDIR
+   cp $HOME/.xfce4/xinitrc $BASEDIR/
+-  exec $prog $BASEDIR/xinitrc $*
++  exec $prog $BASEDIR/xinitrc -- -nolisten tcp$*
+ else
+-  exec $prog @sysconfdir@/xdg/xfce4/xinitrc $*
++  exec $prog @sysconfdir@/xdg/xfce4/xinitrc -- -nolisten tcp$*
+ fi  
+ 
diff --git a/xfce-base/xfce-utils/xfce-utils-4.2.3.ebuild b/xfce-base/xfce-utils/xfce-utils-4.2.3.ebuild
index 84e62f10de18..4a0ea6546c26 100644
--- a/xfce-base/xfce-utils/xfce-utils-4.2.3.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-4.2.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.2.3.ebuild,v 1.8 2006/04/22 10:37:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.2.3.ebuild,v 1.9 2006/06/05 22:40:09 genstef Exp $
 
-inherit xfce42
+inherit eutils xfce42
 
 DESCRIPTION="Xfce 4 utilities"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
@@ -20,3 +20,9 @@ DEPEND="${RDEPEND}
 
 XFCE_CONFIG="$(use_enable gtkhtml) --enable-gdm"
 core_package
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/nolisten-tcp.patch
+}
diff --git a/xfce-base/xfce-utils/xfce-utils-4.3.90.1.ebuild b/xfce-base/xfce-utils/xfce-utils-4.3.90.1.ebuild
index 92afa400baf2..c8c8612e8f0d 100644
--- a/xfce-base/xfce-utils/xfce-utils-4.3.90.1.ebuild
+++ b/xfce-base/xfce-utils/xfce-utils-4.3.90.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.3.90.1.ebuild,v 1.2 2006/04/20 14:51:13 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/xfce-utils-4.3.90.1.ebuild,v 1.3 2006/06/05 22:40:09 genstef Exp $
 
-inherit xfce44
+inherit eutils xfce44
 
 xfce44_beta
 
@@ -24,6 +24,12 @@ XFCE_CONFIG="--enable-gdm --with-vendor-info=Gentoo"
 
 xfce44_core_package
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/nolisten-tcp.patch
+}
+
 src_install() {
 	make DESTDIR=${D} install || die