bumped, fixed bug and cleaned older versions

(Portage version: 2.1.2.7)

9 files changed, 23 insertions, 280 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index b667b6efb76e..bf8025bf9e23 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/tor
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.79 2007/05/15 16:08:36 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.80 2007/05/31 09:50:14 humpback Exp $
+
+*tor-0.1.2.14 (31 May 2007)
+
+  31 May 2007; <humpback@gentoo.org> -tor-0.1.0.18.ebuild,
+  -tor-0.1.0.18-r1.ebuild, -tor-0.1.2.13.ebuild, +tor-0.1.2.14.ebuild:
+  Bumped 0.1.2.13 to 0.1.2.14, removed older versions. Fixed #178975 with idea 
+  from Remy Blank
 
   15 May 2007; <humpback@gentoo.org> tor-0.1.0.18.ebuild,
   tor-0.1.0.18-r1.ebuild, tor-0.1.1.23.ebuild, tor-0.1.1.26.ebuild,
diff --git a/net-misc/tor/files/digest-tor-0.1.0.18 b/net-misc/tor/files/digest-tor-0.1.0.18
deleted file mode 100644
index 56fe090c1a89..000000000000
--- a/net-misc/tor/files/digest-tor-0.1.0.18
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-tor-0.1.0.18-r1 b/net-misc/tor/files/digest-tor-0.1.0.18-r1
deleted file mode 100644
index 56fe090c1a89..000000000000
--- a/net-misc/tor/files/digest-tor-0.1.0.18-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-tor-0.1.2.13 b/net-misc/tor/files/digest-tor-0.1.2.13
deleted file mode 100644
index 80357acabf3f..000000000000
--- a/net-misc/tor/files/digest-tor-0.1.2.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 db54abdddf7eb5859b6e1bdf5f7ece00 tor-0.1.2.13.tar.gz 1181719
-RMD160 8364e35a1b2580ff5d02081757c0550bbf13e8cb tor-0.1.2.13.tar.gz 1181719
-SHA256 c8a33521b32e04b00ce97c4ab980a4232b4029284cd2944f496609a9797ba21b tor-0.1.2.13.tar.gz 1181719
diff --git a/net-misc/tor/files/digest-tor-0.1.2.14 b/net-misc/tor/files/digest-tor-0.1.2.14
new file mode 100644
index 000000000000..eba8c8ef67cb
--- /dev/null
+++ b/net-misc/tor/files/digest-tor-0.1.2.14
@@ -0,0 +1,3 @@
+MD5 dc93a52f9c12ec7fe73b3905a28f09ec tor-0.1.2.14.tar.gz 1225040
+RMD160 f7ce98688519bd2d41bc0dd95fb90a120eae4207 tor-0.1.2.14.tar.gz 1225040
+SHA256 bc23e6f826f1f736e9d5e56ba79195099882aef2029a63dd667915bc1eb836a6 tor-0.1.2.14.tar.gz 1225040
diff --git a/net-misc/tor/files/tor.logrotate.patch b/net-misc/tor/files/tor.logrotate.patch
new file mode 100644
index 000000000000..fb3d37d607c5
--- /dev/null
+++ b/net-misc/tor/files/tor.logrotate.patch
@@ -0,0 +1,10 @@
+--- contrib/tor.logrotate.in.ori	2007-05-31 10:38:24.774901656 +0100
++++ contrib/tor.logrotate.in	2007-05-31 10:38:52.189956005 +0100
+@@ -7,6 +7,6 @@
+ 	notifempty
+ 	sharedscripts
+ 	postrotate
+-		/etc/rc.d/init.d/tor reload > /dev/null
++		/etc/rc.d/init.d/tor reload > /dev/null || true
+ 	endscript
+ }
diff --git a/net-misc/tor/tor-0.1.0.18-r1.ebuild b/net-misc/tor/tor-0.1.0.18-r1.ebuild
deleted file mode 100644
index 23600a8277aa..000000000000
--- a/net-misc/tor/tor-0.1.0.18-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2007 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.2 2007/05/15 16:08:36 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
-	keepdir /var/{lib,log,run}/tor
-	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
deleted file mode 100644
index 03033b8a0b6e..000000000000
--- a/net-misc/tor/tor-0.1.0.18.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2007 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.10 2007/05/15 16:08:36 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"
-## Arch temas please please dont mark this stable untill you really test the
-## chroot stuff
-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
-	keepdir /var/{lib,log,run}/tor
-
-	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.2.13.ebuild b/net-misc/tor/tor-0.1.2.14.ebuild
index 7e10cef32789..80359209733b 100644
--- a/net-misc/tor/tor-0.1.2.13.ebuild
+++ b/net-misc/tor/tor-0.1.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.2.13.ebuild,v 1.2 2007/05/15 16:08:36 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.1.2.14.ebuild,v 1.1 2007/05/31 09:50:14 humpback Exp $
 
 inherit eutils
 
@@ -29,6 +29,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/tor.logrotate.patch
 }
 
 src_compile() {