Fixes for w-c-1.50

(Portage version: 2.0.51.22-r2)

9 files changed, 34 insertions, 44 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index 7955537a6dc2..bdae035d1454 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.25 2005/12/04 16:19:15 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.26 2005/12/04 22:43:35 rl03 Exp $
+
+  04 Dec 2005; Renat Lumpau <rl03@gentoo.org> files/3.2.1/reconfig,
+  files/3.4.2/reconfig, files/3.4.4/reconfig:
+  Fixes for w-c-1.50
 
 *rt-3.4.4 (04 Dec 2005)
 
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index cd036afb882b..479796530fcb 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ead23ec5d52fefb7d8ba409ff8302d32 rt-3.4.3.ebuild 5999
 MD5 939107934a799efb520c62c057341273 rt-3.2.1.ebuild 4362
 MD5 e6c24f991dcd8d32e842687d9b9c2bb8 ChangeLog 4303
@@ -10,7 +7,7 @@ MD5 5f5c3f76ea4676e743612e38341780fe files/digest-rt-3.2.1 61
 MD5 74849aa771037cfdb03fc4a8b8d01af6 files/digest-rt-3.4.3 61
 MD5 a859c86fce7cdcad017a5858ede1c0e6 files/digest-rt-3.4.4 61
 MD5 15fc088b37155656e008679f3c07eea7 files/3.2.1/postinstall-en.txt 1648
-MD5 0706d6edcd1c4e23f526d611c9c6b531 files/3.2.1/reconfig 1170
+MD5 ea7fd972eafdc6962d1c3a0cdeba47e7 files/3.2.1/reconfig 1213
 MD5 4dcfdbf63b882b398473d975b34fa23e files/3.4.2/config.layout-gentoo 616
 MD5 3d2e627499ec86839cc0099719fcc3bd files/3.4.2/rt_apache2.conf 574
 MD5 b54ebbfd3fc1dd2a49d396e3dba2b857 files/3.4.2/rt_apache1_fcgi.conf 990
@@ -19,13 +16,6 @@ MD5 3d2e627499ec86839cc0099719fcc3bd files/3.4.2/rt_apache.conf 574
 MD5 c807deb11e08ab9f37a658bd5e971c7f files/3.4.2/rt.conf.d 405
 MD5 54a1cd04dc0d0788ce920d941e5601d0 files/3.4.2/rt.init.d 1019
 MD5 cee32ca276838f6d74230c66d0bfc961 files/3.4.2/Callback.patch 1567
-MD5 0b5844df3dcd4e7e8a3231d7dc16826b files/3.4.2/reconfig 1232
+MD5 ab9254622d4be36732c1ed102031a0ce files/3.4.2/reconfig 1231
 MD5 73c354dd8ba0f64a74e5c6cd01b33834 files/3.4.2/rt_apache2_fcgi.conf 993
-MD5 28ed7a899ba4f40410c4796ffacb292b files/3.4.4/reconfig 1190
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDkxcOEzitwsaoONoRAkfRAJ9KANvGny7P0eYf0+ZAq+aaEvMiFwCgqse4
-GW9H/iFokGMptHG2TCqFIP0=
-=K3O1
------END PGP SIGNATURE-----
+MD5 7255563978025158e1e0df47269d5e72 files/3.4.4/reconfig 1189
diff --git a/www-apps/rt/files/3.2.1/reconfig b/www-apps/rt/files/3.2.1/reconfig
index 7f831600df69..447c5b490234 100644
--- a/www-apps/rt/files/3.2.1/reconfig
+++ b/www-apps/rt/files/3.2.1/reconfig
@@ -1,12 +1,12 @@
 #!/bin/bash
 if [ $1 = "start" -o $1 = "install" ]; then
-	# fix location
-	sed -i "s|${MY_HOSTROOTDIR}|${VHOST_ROOT}|g" /usr/bin/standalone_httpd /usr/bin/rt-crontool /usr/bin/webmux.pl /usr/lib/RT.pm
-	sed -i "s|${MY_HOSTROOTDIR}|\/usr|" /usr/bin/mason_handler.scgi
-	sed -i "s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|" /usr/lib/RT.pm /usr/bin/rt-mailgate
+	# don't fix location - breaks sandbox
+	#sed -i "s|${MY_HOSTROOTDIR}|${VHOST_ROOT}|g" /usr/bin/standalone_httpd /usr/bin/rt-crontool /usr/bin/webmux.pl /usr/lib/RT.pm
+	# sed -i "s|${MY_HOSTROOTDIR}|\/usr|" /usr/bin/mason_handler.scgi
+	# sed -i "s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|" /usr/lib/RT.pm /usr/bin/rt-mailgate
 
 	# fix permissions
-	chown -R  ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} /var/rt
+	# chown -R  ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} /var/rt
 
 	# check for upgrades
 	cd ${VHOST_ROOT}/rt-config/upgrade
@@ -20,6 +20,7 @@ if [ $1 = "start" -o $1 = "install" ]; then
 	ls
 
 elif [ $1 = "clean" ]; then
-	rm -f /usr/bin/standalone_httpd /usr/bin/rt-crontool /usr/bin/webmux.pl /usr/lib/RT.pm /usr/bin/mason_handler.scgi /usr/bin/rt-mailgate
-	rm -rf /var/rt
+	echo $1
+	# rm -f /usr/bin/standalone_httpd /usr/bin/rt-crontool /usr/bin/webmux.pl /usr/lib/RT.pm /usr/bin/mason_handler.scgi /usr/bin/rt-mailgate
+	# rm -rf /var/rt
 fi
diff --git a/www-apps/rt/files/3.4.2/reconfig b/www-apps/rt/files/3.4.2/reconfig
index f254a3c2212f..4f69cd0998d4 100644
--- a/www-apps/rt/files/3.4.2/reconfig
+++ b/www-apps/rt/files/3.4.2/reconfig
@@ -32,7 +32,7 @@ if [ $1 = "install" ]; then
 elif [ $1 = "clean" ]; then
 	echo "Please examine the contents of the following directories"
 	echo "and delete anything that is no longer necessary"
-	echo 
+	echo
 	echo ${VHOST_ROOT}/${PF}
 	echo ${MY_INSTALLDIR}
 fi
diff --git a/www-apps/rt/files/3.4.4/reconfig b/www-apps/rt/files/3.4.4/reconfig
index 61e08d74f941..6830548da6e8 100644
--- a/www-apps/rt/files/3.4.4/reconfig
+++ b/www-apps/rt/files/3.4.4/reconfig
@@ -31,7 +31,7 @@ if [ $1 = "install" ]; then
 elif [ $1 = "clean" ]; then
 	echo "Please examine the contents of the following directories"
 	echo "and delete anything that is no longer necessary"
-	echo 
+	echo
 	echo ${VHOST_ROOT}/${PF}
 	echo ${MY_INSTALLDIR}
 fi
diff --git a/www-apps/twiki/ChangeLog b/www-apps/twiki/ChangeLog
index 665aaf07bb3a..22c98c521912 100644
--- a/www-apps/twiki/ChangeLog
+++ b/www-apps/twiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/twiki
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.18 2005/11/10 14:05:00 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/ChangeLog,v 1.19 2005/12/04 22:40:23 rl03 Exp $
+
+  04 Dec 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  files/reconfig:
+  Fixes for w-c-1.50
 
   10 Nov 2005; Renat Lumpau <rl03@gentoo.org> twiki-20041030-r1.ebuild:
   DEPEND on app-arch/unzip wrt bug #112054.
diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
index 03a1041ccf3f..ff332a4fa555 100644
--- a/www-apps/twiki/Manifest
+++ b/www-apps/twiki/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0d8009de158a121e3cd78b854cefed80 twiki-20041030-r1.ebuild 1589
 MD5 c16525040c09bb881930fefd91045d59 ChangeLog 3794
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 MD5 e2754c98027bd6468cfe636616377892 files/exec_command.patch 2445
 MD5 d6ef3da92ece6d68c83fa4be8f6f97be files/twiki.conf 508
 MD5 fab10473182738fadb4188bf90af8162 files/execwithsearch.patch 653
-MD5 81a10e4ed2ea4d51fd1001d051951a61 files/postinstall-en.txt 795
+MD5 ade44a9892b0925e73e2aae832a08e0f files/postinstall-en.txt 790
 MD5 4369d80c9ef3589ccebce4a23095082b files/digest-twiki-20041030-r1 138
-MD5 f4898afe44208d27fee4ab3910b8cc88 files/reconfig 588
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDc1OZEzitwsaoONoRAswuAJ9CQn96EuCYIcJ//BqJg7PlmsAUogCfZLWb
-b8pO2LSOh+JcwVyRs+l6oHw=
-=HJqr
------END PGP SIGNATURE-----
+MD5 ccb6e12008c8bb68dce61d0ab690a70d files/reconfig 639
diff --git a/www-apps/twiki/files/postinstall-en.txt b/www-apps/twiki/files/postinstall-en.txt
index c70a30ed65d3..9f2f04a354b1 100644
--- a/www-apps/twiki/files/postinstall-en.txt
+++ b/www-apps/twiki/files/postinstall-en.txt
@@ -1,8 +1,8 @@
 
-You are almost done! 
+You are almost done!
 
-1. Apache configs have been installed for you. You will need to restart
-   Apache for them to take effect.
+1. Apache configs have been installed for you. You will need to edit them
+   to set the correct paths!
 
 2. You may want to edit TWiki's config to suit your needs:
    ${MY_INSTALLDIR}/lib/TWiki.cfg
diff --git a/www-apps/twiki/files/reconfig b/www-apps/twiki/files/reconfig
index 80d6883fb2a8..59e8525acee1 100644
--- a/www-apps/twiki/files/reconfig
+++ b/www-apps/twiki/files/reconfig
@@ -8,11 +8,12 @@ die() {
 }
 
 if [ $1 = "install" ]; then
-	if [ -a /etc/apache/vhosts.d/twiki.conf ]; then
-		sed -e "s|HOST|${VHOST_HOSTNAME}|
-		s|DOCROOT|${VHOST_HTDOCSDIR}|
-		s|ROOTDIR|${MY_INSTALLDIR}|g" -i /etc/apache/vhosts.d/twiki.conf || die "sed failed"
-	fi
+	# don't change Apache files - breaks sandbox
+	#if [ -a /etc/apache/vhosts.d/twiki.conf ]; then
+	#	sed -e "s|HOST|${VHOST_HOSTNAME}|
+	#	s|DOCROOT|${VHOST_HTDOCSDIR}|
+	#	s|ROOTDIR|${MY_INSTALLDIR}|g" -i /etc/apache/vhosts.d/twiki.conf || die "sed failed"
+	#fi
 
 	# fix lib locations
 	sed -e "s|../lib|${MY_INSTALLDIR}/lib|" -i ${MY_INSTALLDIR}/bin/setlib.cfg || die