fixed chroot permissions

Package-Manager: portage-2.1.1-r1

5 files changed, 164 insertions, 15 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index b1497bc7b4b5..95b40ecefa94 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tor
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.73 2006/10/21 16:22:10 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.74 2006/10/22 16:06:24 humpback Exp $
+
+*tor-0.1.0.18-r1 (22 Oct 2006)
+
+  22 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
+  tor-0.1.0.18.ebuild, +tor-0.1.0.18-r1.ebuild:
+  Small configuration issue in the chroot. Fixes bug #139354.
 
   21 Oct 2006; Gustavo Felisberto <humpback@gentoo.org>;
   tor-0.1.0.18.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.24.ebuild:
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 7de28d26a24c..318b00c15089 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -24,10 +24,14 @@ SHA256 df93f901e5c0d19da37fc9b5f2a8651451338851221c390d1e4961ab1f6c2226 files/to
 DIST tor-0.1.0.18.tar.gz 633222 RMD160 5bb12bbc808c08026098410657785ab61f4efd43 SHA1 cac98320fe14d195c261aa577cd0b2324f157351 SHA256 bc815e1b12e9eab1a03a9c83aa7169820bf250a8fce445c533996293e9e01cf6
 DIST tor-0.1.1.23.tar.gz 847906 RMD160 e958ed22f44e5f06736cadb5406dad04510a69f5 SHA1 d3f0120f5a18658231127281343aafb6c06aed70 SHA256 a2ac0b10089902c2de8649e07823dc46b8876cd3e0236505e5e7f1f49ee11025
 DIST tor-0.1.1.24.tar.gz 849462 RMD160 cf6cd6cb69fac2fc89f0e0b48c8188fae8051ab2 SHA1 627a449efc2c094eafd8389d33f29a9030feb3a3 SHA256 f32cda1434a71fa5fe89197ff34fc4c29186ecdd92336b490e259a7627f96711
-EBUILD tor-0.1.0.18.ebuild 4097 RMD160 8ae479e2e49dc9977914aa23e97739e7ef55b4f5 SHA1 0b11a035c90b6a9b5d7318dbc5e58410d7384a70 SHA256 dd267b23eeb8e1d4a51ca143107e8574dce183edcdbbc9ee2cffc78e94ee5d35
-MD5 759f290db78893f0e93872fde35f3e69 tor-0.1.0.18.ebuild 4097
-RMD160 8ae479e2e49dc9977914aa23e97739e7ef55b4f5 tor-0.1.0.18.ebuild 4097
-SHA256 dd267b23eeb8e1d4a51ca143107e8574dce183edcdbbc9ee2cffc78e94ee5d35 tor-0.1.0.18.ebuild 4097
+EBUILD tor-0.1.0.18-r1.ebuild 4005 RMD160 c8a036cb3ece4ef917ead9dd082880db34a65f46 SHA1 962c1910cf3bc414f959bac645bbad724893dac0 SHA256 cfe363b490a4405f587e932b8b7a56694905d7a8f45b2979e361778182e77629
+MD5 44089e8b967ce4c2ae32d3d277787b2a tor-0.1.0.18-r1.ebuild 4005
+RMD160 c8a036cb3ece4ef917ead9dd082880db34a65f46 tor-0.1.0.18-r1.ebuild 4005
+SHA256 cfe363b490a4405f587e932b8b7a56694905d7a8f45b2979e361778182e77629 tor-0.1.0.18-r1.ebuild 4005
+EBUILD tor-0.1.0.18.ebuild 4090 RMD160 166e337329b459568e2e079dd9dea8807824b8be SHA1 8b093dfa2ad44fb16405bfdfa2bc113a9ca836cc SHA256 b0e1a73df92bd238521a4b6bb1b7e4c6e51c1ff2cee613c63ebe8cd22ec7d794
+MD5 6372ec82b7cb63a4db1a000e471fcd55 tor-0.1.0.18.ebuild 4090
+RMD160 166e337329b459568e2e079dd9dea8807824b8be tor-0.1.0.18.ebuild 4090
+SHA256 b0e1a73df92bd238521a4b6bb1b7e4c6e51c1ff2cee613c63ebe8cd22ec7d794 tor-0.1.0.18.ebuild 4090
 EBUILD tor-0.1.1.23.ebuild 1406 RMD160 59c2903841bca860019ebbfd83f6ba5ec36cb67c SHA1 3a5691005fb4d4de3e8137919084339de60f8b2b SHA256 803464276250daca52c3898db285152c2b4f88b1afd19423de9bb1f3468cf8fa
 MD5 9995d3039d07d889dfe9def16ece8e67 tor-0.1.1.23.ebuild 1406
 RMD160 59c2903841bca860019ebbfd83f6ba5ec36cb67c tor-0.1.1.23.ebuild 1406
@@ -36,10 +40,10 @@ EBUILD tor-0.1.1.24.ebuild 1411 RMD160 dff5007635398e6a99a43217530dc8ff38ff764b
 MD5 7f01b84d26723e8f3af6a4b14b99a46e tor-0.1.1.24.ebuild 1411
 RMD160 dff5007635398e6a99a43217530dc8ff38ff764b tor-0.1.1.24.ebuild 1411
 SHA256 42f066a43fc43bff89fc795c2223d6bc3073d2543e6fd8931b1661801bc0b9e8 tor-0.1.1.24.ebuild 1411
-MISC ChangeLog 11475 RMD160 2cb31081c4afb04ca49ed1b14cd76322e7609678 SHA1 7ba321dfaeeacb9fa8d95f21aa39add9ccee5b3d SHA256 ab82965debba6d806c9997363eab4a8abb097f090dc858e302bfd5135527c012
-MD5 f6f5ea559a79abbe230165596ad962f9 ChangeLog 11475
-RMD160 2cb31081c4afb04ca49ed1b14cd76322e7609678 ChangeLog 11475
-SHA256 ab82965debba6d806c9997363eab4a8abb097f090dc858e302bfd5135527c012 ChangeLog 11475
+MISC ChangeLog 11675 RMD160 e9daf16a146a68a8e3600df968bb90547b57635b SHA1 714c084ebeddead2e39958ca58cf3f17d864287a SHA256 58536b1aa96020fa9b73b8e7ea4405e6d66d100c2df624bde835ab82ce115945
+MD5 0605111a0604f1d456b5bba666b36a24 ChangeLog 11675
+RMD160 e9daf16a146a68a8e3600df968bb90547b57635b ChangeLog 11675
+SHA256 58536b1aa96020fa9b73b8e7ea4405e6d66d100c2df624bde835ab82ce115945 ChangeLog 11675
 MISC metadata.xml 224 RMD160 87e0a44a0ea05af5ad562f03d35b841c42c48971 SHA1 76b617d1cccc3a09fc6995f19e800d99775064c7 SHA256 5a95452656188e381651219d143d53498f11199a52ade7ed467a94e001e72bd6
 MD5 b79b08e0f979feb256c93295714b4fc9 metadata.xml 224
 RMD160 87e0a44a0ea05af5ad562f03d35b841c42c48971 metadata.xml 224
@@ -47,6 +51,9 @@ SHA256 5a95452656188e381651219d143d53498f11199a52ade7ed467a94e001e72bd6 metadata
 MD5 f35714e74255040250817b15d5925d3d files/digest-tor-0.1.0.18 238
 RMD160 22b1ed62644fe2ef4af1ed23ca7ff6d0ca5f3221 files/digest-tor-0.1.0.18 238
 SHA256 cffe6237bccc939f69d6b9fd590b8b4dfec6455a3f841e6c75feeeb936b6627f files/digest-tor-0.1.0.18 238
+MD5 f35714e74255040250817b15d5925d3d files/digest-tor-0.1.0.18-r1 238
+RMD160 22b1ed62644fe2ef4af1ed23ca7ff6d0ca5f3221 files/digest-tor-0.1.0.18-r1 238
+SHA256 cffe6237bccc939f69d6b9fd590b8b4dfec6455a3f841e6c75feeeb936b6627f files/digest-tor-0.1.0.18-r1 238
 MD5 45b101c447f3c43d0d427f1d04dcb67d files/digest-tor-0.1.1.23 238
 RMD160 8a83d2c6e85d54c22b013b76f047f809981328c4 files/digest-tor-0.1.1.23 238
 SHA256 133ea58018c050b70d4ed06c314062e5113f2480518627481f101ce70ed35479 files/digest-tor-0.1.1.23 238
@@ -56,7 +63,7 @@ SHA256 ee0b42d159b483c1509eb690e18d2ec275dbbcdbfdbf18729a8cf7277c4188c4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFOklB8zY1VwezZiERAjtyAKCRphPK7YRwdO0BUOnZzZcqdBSIbwCeKzrN
-PlEEgvd3K2Y3iQ3M3xpENxg=
-=BcgM
+iD8DBQFFO5cS8zY1VwezZiERAkFqAJ9KGVpf9nUia50szvejITG2aTYdMQCfQOPk
+ftemKqG8pSmA0aombJ8f8AE=
+=4kpx
 -----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/digest-tor-0.1.0.18-r1 b/net-misc/tor/files/digest-tor-0.1.0.18-r1
new file mode 100644
index 000000000000..56fe090c1a89
--- /dev/null
+++ b/net-misc/tor/files/digest-tor-0.1.0.18-r1
@@ -0,0 +1,3 @@
+MD5 b76e661873fe27debf4df15920e9abd4 tor-0.1.0.18.tar.gz 633222
+RMD160 5bb12bbc808c08026098410657785ab61f4efd43 tor-0.1.0.18.tar.gz 633222
+SHA256 bc815e1b12e9eab1a03a9c83aa7169820bf250a8fce445c533996293e9e01cf6 tor-0.1.0.18.tar.gz 633222
diff --git a/net-misc/tor/tor-0.1.0.18-r1.ebuild b/net-misc/tor/tor-0.1.0.18-r1.ebuild
new file mode 100644
index 000000000000..cf606b456c3e
--- /dev/null
+++ b/net-misc/tor/tor-0.1.0.18-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.0.18-r1.ebuild,v 1.1 2006/10/22 16:06:25 humpback Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="The Onion Router - Anonymizing overlay network for TCP"
+HOMEPAGE="http://tor.eff.org/"
+SRC_URI="http://tor.eff.org/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+DEPEND=">=dev-libs/openssl-0.9.6
+		dev-libs/libevent"
+RDEPEND="!static? (
+			net-proxy/tsocks
+			>=dev-libs/openssl-0.9.6
+			dev-libs/libevent
+		)"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/torrc.sample-0.1.0.16.patch
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	use static && append-flags -static
+	econf || die
+	emake || die
+}
+
+src_install() {
+	exeinto /etc/init.d ; newexe ${FILESDIR}/tor.initd-r1 tor
+	insinto /etc/conf.d ; newins ${FILESDIR}/tor.confd tor
+	make DESTDIR=${D} install || die
+
+	dodoc README ChangeLog AUTHORS INSTALL \
+		doc/{CLIENTS,FAQ,HACKING,TODO} \
+		doc/{control-spec.txt,rend-spec.txt,tor-doc.css,tor-doc.html,tor-spec.txt}
+
+	dodir /var/lib/tor
+	dodir /var/log/tor
+	fperms 750 /var/lib/tor /var/log/tor
+	fowners tor:tor /var/lib/tor /var/log/tor
+}
+
+pkg_postinst() {
+	einfo "You must create /etc/tor/torrc, you can use the sample that is in that directory"
+	einfo "To have privoxy and tor working together you must add:"
+	einfo "forward-socks4a / localhost:9050 ."
+	ewarn "(notice the . at the end of the line)"
+	einfo "to /etc/privoxy/config"
+	einfo
+	einfo "The Tor ebuild now includes chroot support."
+	einfo "If you like to run tor in chroot AND this is a new install OR"
+	einfo "your tor doesn't already run in chroot, simply run:"
+	einfo "\`emerge --config =${CATEGORY}/${PF} \`"
+	einfo "Before running the above command you might want to change the chroot"
+	einfo "dir in /etc/conf.d/tor. Otherwise /chroot/tor will be used."
+}
+
+pkg_config() {
+	CHROOT=`sed -n 's/^[[:blank:]]\?CHROOT="\([^"]\+\)"/\1/p' /etc/conf.d/tor 2>/dev/null`
+	EXISTS="no"
+
+	if [ -z "${CHROOT}" -a ! -d "/chroot/tor" ]; then
+		CHROOT="/chroot/tor"
+	elif [ -d ${CHROOT} ]; then
+		eerror; eerror "${CHROOT:-/chroot/tor} already exists. Quitting."; eerror; EXISTS="yes"
+	fi
+
+	if [ ! "$EXISTS" = yes ]; then
+		USERNAME="tor"
+		BINARY="/usr/bin/tor"
+
+		einfo
+		einfo "Setting up the chroot directory..."
+		mkdir -m 700 -p ${CHROOT}
+		mkdir -p ${CHROOT}/etc/tor \
+			${CHROOT}/dev ${CHROOT}/var/log/tor ${CHROOT}/var/lib/tor \
+			${CHROOT}/usr/bin ${CHROOT}/var/run ${CHROOT}/lib \
+			${CHROOT}/usr/lib
+
+		einfo "Creating devices..."
+		mknod -m 0444 ${CHROOT}/dev/random c 1 8
+		mknod -m 0444 ${CHROOT}/dev/urandom c 1 9
+		mknod -m 0666 ${CHROOT}/dev/null c 1 3
+
+		einfo "Adding ${USERNAME} to ${CHROOT}/etc/passwd and group..."
+		grep ^${USERNAME}: /etc/passwd > ${CHROOT}/etc/passwd
+		grep ^${USERNAME}: /etc/group > ${CHROOT}/etc/group
+
+		einfo "Copying system files..."
+		cp -p /etc/{nsswitch.conf,host.conf,resolv.conf,hosts,localtime} ${CHROOT}/etc
+		cp -p /lib/{libc.*,libnsl.*,libnss_*.*,libresolv.*,libgcc_*.*,ld-linux.*} ${CHROOT}/lib
+
+		# Static version has no dynamic dependencies
+		if useq !static ; then
+			einfo "Copying dependencies..."
+			for DEP in $(ldd $BINARY | awk '{print $3}'); do
+				test -f ${DEP} && cp ${DEP} ${CHROOT}${DEP}
+			done
+		fi
+
+		einfo "Copying binaries and config files..."
+		for i in ${BINARY}; do
+			cp ${i} ${CHROOT}${i}
+		done
+
+		cp -R /etc/tor ${CHROOT}/etc/
+		cp -Rp /var/lib/tor ${CHROOT}/var/lib/
+
+		einfo "Setting permissions..."
+		chown root:${USERNAME} ${CHROOT} ${CHROOT}/var/lib/tor \
+			${CHROOT}/var/log/tor ${CHROOT}/var/run
+		chmod 0750 ${CHROOT}/var/lib/tor ${CHROOT}/var/run ${CHROOT}/var/log/tor
+		chmod 0444 ${CHROOT}/etc/{group,host.conf,hosts,localtime,nsswitch.conf}
+		chmod 0444 ${CHROOT}/etc/{passwd,resolv.conf}
+		chmod 0644 ${CHROOT}/etc/tor/*
+
+		einfo "Done."
+	fi
+}
diff --git a/net-misc/tor/tor-0.1.0.18.ebuild b/net-misc/tor/tor-0.1.0.18.ebuild
index af4a27ec6e68..1f54354be640 100644
--- a/net-misc/tor/tor-0.1.0.18.ebuild
+++ b/net-misc/tor/tor-0.1.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.0.18.ebuild,v 1.8 2006/10/21 16:22:10 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.0.18.ebuild,v 1.9 2006/10/22 16:06:24 humpback Exp $
 
 inherit eutils flag-o-matic
 
@@ -123,9 +123,9 @@ pkg_config() {
 		cp -Rp /var/lib/tor ${CHROOT}/var/lib/
 
 		einfo "Setting permissions..."
-		chown ${USERNAME}:${USERNAME} ${CHROOT} ${CHROOT}/var/lib/tor \
+		chown root:${USERNAME} ${CHROOT} ${CHROOT}/var/lib/tor \
 			${CHROOT}/var/log/tor ${CHROOT}/var/run
-		chmod 0700 ${CHROOT}/var/lib/tor ${CHROOT}/var/run ${CHROOT}/var/log/tor
+		chmod 0750 ${CHROOT}/var/lib/tor ${CHROOT}/var/run ${CHROOT}/var/log/tor
 		chmod 0444 ${CHROOT}/etc/{group,host.conf,hosts,localtime,nsswitch.conf}
 		chmod 0444 ${CHROOT}/etc/{passwd,resolv.conf}
 		chmod 0644 ${CHROOT}/etc/tor/*