[gentoo-commits] dev/blueness:master commit in: net-misc/tor/files/, net-misc/tor/

[Anthony G. Basile]

commit:     8b4712ad2dbf7b5faee3d56a4832cfe487f9c700
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 15:19:38 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 15:19:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=8b4712ad

net-misc/tor: link error fixed, moved to tree

(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key 0xD0455535)

---
 net-misc/tor/ChangeLog                             |   10 ---
 net-misc/tor/Manifest                              |   19 -----
 .../files/tor-0.2.2.24_alpha-respect-CFLAGS.patch  |   24 ------
 net-misc/tor/files/tor.confd                       |    3 -
 net-misc/tor/files/tor.initd-r6                    |   58 --------------
 net-misc/tor/files/torrc-r1                        |    7 --
 net-misc/tor/files/torrc.sample.patch              |   30 -------
 net-misc/tor/metadata.xml                          |   19 -----
 net-misc/tor/tor-0.2.3.8_alpha.ebuild              |   84 --------------------
 9 files changed, 0 insertions(+), 254 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
deleted file mode 100644
index 26927a3..0000000
--- a/net-misc/tor/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-*tor-0.2.3.8_alpha (25 Nov 2011)
-
-  25 Nov 2011; Anthony G. Basile <blueness@g.o>
-  +files/tor-0.2.2.24_alpha-respect-CFLAGS.patch, +tor-0.2.3.8_alpha.ebuild,
-  +files/tor.confd, +files/tor.initd-r6, +files/torrc-r1,
-  +files/torrc.sample.patch, +metadata.xml:
-  testing because of link failure
-

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
deleted file mode 100644
index bb62441..0000000
--- a/net-misc/tor/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8
-AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c
-AUX tor.initd-r6 1601 RMD160 f1ef0dd197f051a826e3785348a2a8cc490c04eb SHA1 ee9f5116c3a69a7adb2be15ce14e3904261e84c4 SHA256 67d5bb618cfbc4d4c05e5589bfd2e24f6563c4e3c6ba1d6c472b285b4480e20d
-AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738
-AUX torrc.sample.patch 1281 RMD160 dfc56376c636acbf965ae80237873489659d46a2 SHA1 01ebc6c28b4d1753266bf34ef72de92937865c4f SHA256 b60b3f454eb0d475c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14
-DIST tor-0.2.3.8-alpha.tar.gz 2909997 RMD160 eec1f3b549b1513d2c39791c79a18496d97a4809 SHA1 7ca5c1cfa5a1a3d1c923298a47fe2430495bedcc SHA256 b7c40f5f4fbd0a42b6863c29a69cc7b06d9e1cc9609f934a550f2019426d8dc4
-EBUILD tor-0.2.3.8_alpha.ebuild 2364 RMD160 ffb1a886a8f3afd50448da52899ab29e4a3a8150 SHA1 010227d454fe0ff6691447ebbddf25fee097a9a4 SHA256 43cfd7470c48c1232556b1fcac24f029356643a66e930c7948bb45aacabab923
-MISC ChangeLog 305 RMD160 1946e00c0b3eba0f187616b56b2588f8982b0bd3 SHA1 e6e7591a5ee45a288ac4f313942c5973506b77d0 SHA256 6c5edbd4f0db80cf5a3b06ea533187f9df1596ff2d86774a61280d16a2ff476e
-MISC metadata.xml 690 RMD160 1ae6238c81555b6b4bf2f11479e18a5acdb7b418 SHA1 920cafba2dacb7a034e32f782467c96532465434 SHA256 117ed70261e343abf65a93351f6ba7a5bca941c183bf79168953a3efc5afb0b5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk7PkZ8ACgkQl5yvQNBFVTVY8QCcC0Z4VgYfJA2CB4b2c3GEpv+Z
-sewAnjC4Sp1NHnMKMZdAXta+bPkNcHkB
-=Swca
------END PGP SIGNATURE-----

diff --git a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
deleted file mode 100644
index 86b797b..0000000
--- a/net-misc/tor/files/tor-0.2.2.24_alpha-respect-CFLAGS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur tor-0.2.2.24-alpha.orig/configure.in tor-0.2.2.24-alpha/configure.in
---- tor-0.2.2.24-alpha.orig/configure.in	2011-04-08 16:32:17.000000000 -0400
-+++ tor-0.2.2.24-alpha/configure.in	2011-04-18 07:10:57.000000000 -0400
-@@ -9,6 +9,11 @@
- 
- AC_CANONICAL_HOST
- 
-+GENTOO_CFLAGS="$CFLAGS"
-+GENTOO_LDFLAGS="$LDFLAGS"
-+CFLAGS=
-+LDFLAGS=
-+
- if test -f /etc/redhat-release ; then
-   if test -f /usr/kerberos/include ; then
-     CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
-@@ -971,6 +976,8 @@
- 
- 
- CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"
-+CFLAGS="$CFLAGS $GENTOO_CFLAGS"
-+LDFLAGS="$LDFLAGS $GENTOO_LDFLAGS"
- 
- AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile src/config/torrc.sample src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
- AC_OUTPUT

diff --git a/net-misc/tor/files/tor.confd b/net-misc/tor/files/tor.confd
deleted file mode 100644
index 4195bf3..0000000
--- a/net-misc/tor/files/tor.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# Set the file limit
-rc_ulimit="-n 30000"

diff --git a/net-misc/tor/files/tor.initd-r6 b/net-misc/tor/files/tor.initd-r6
deleted file mode 100644
index 55204cc..0000000
--- a/net-misc/tor/files/tor.initd-r6
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/files/tor.initd-r6,v 1.5 2011/09/14 10:53:02 blueness Exp $
-
-extra_commands="checkconfig reload"
-PIDFILE=/var/run/tor/tor.pid
-CONFFILE=/etc/tor/torrc
-
-depend() {
-        need net
-}
-
-checkconfig() {
-        # first check that it exists
-        if [ ! -f ${CONFFILE} ] ; then
-                eerror "You need to setup ${CONFFILE} first"
-                eerror "Example is in ${CONFFILE}.sample"
-                return 1
-	fi
-
-	# now verify whether the configuration is valid
-	/usr/bin/tor --verify-config -f ${CONFFILE} > /dev/null 2>&1
-	if [ $? -eq 0 ] ; then
-		einfo "Tor configuration (${CONFFILE}) is valid."
-		return 0
-	else
-		eerror "Tor configuration (${CONFFILE}) not valid."
-		/usr/bin/tor --verify-config -f ${CONFFILE}
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	checkpath -d -m 0755 -o tor:tor /var/run/tor
-        ebegin "Starting Tor"
-        HOME=/var/lib/tor
-	start-stop-daemon --start --pidfile "${PIDFILE}" --quiet --exec /usr/bin/tor  -- -f "${CONFFILE}" --runasdaemon 1 --PidFile "${PIDFILE}" > /dev/null 2>&1
-        eend $?
-}
-
-stop() {
-        ebegin "Stopping Tor"
-	start-stop-daemon --stop --pidfile "${PIDFILE}" --exec /usr/bin/tor -- --PidFile "${PIDFILE}"
-        eend $?
-}
-
-reload() {
-	if [ ! -f ${PIDFILE} ]; then
-		eerror "${SVCNAME} isn't running"
-		return 1
-	fi
-	checkconfig || return 1
-	ebegin "Reloading Tor configuration"
-	start-stop-daemon --signal HUP --pidfile ${PIDFILE}
-	eend $?
-}

diff --git a/net-misc/tor/files/torrc-r1 b/net-misc/tor/files/torrc-r1
deleted file mode 100644
index 322a794..0000000
--- a/net-misc/tor/files/torrc-r1
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Minimal torrc so tor will work out of the box
-#
-User tor
-PIDFile /var/run/tor/tor.pid
-Log notice syslog
-DataDirectory /var/lib/tor/data

diff --git a/net-misc/tor/files/torrc.sample.patch b/net-misc/tor/files/torrc.sample.patch
deleted file mode 100644
index 4a1592a..0000000
--- a/net-misc/tor/files/torrc.sample.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nuar tor-0.2.2.32.orig/src/config/torrc.sample.in tor-0.2.2.32/src/config/torrc.sample.in
---- tor-0.2.2.32.orig/src/config/torrc.sample.in	2011-08-29 23:13:09.000000000 -0400
-+++ tor-0.2.2.32/src/config/torrc.sample.in	2011-08-29 23:14:19.000000000 -0400
-@@ -12,6 +12,10 @@
- ## Tor will look for this file in various places based on your platform:
- ## https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#torrc
- 
-+## Default username and group the server will run as
-+User tor
-+
-+PIDFile /var/run/tor/tor.pid
- 
- ## Replace this with "SocksPort 0" if you plan to run Tor only as a
- ## relay, and not make any local application connections yourself.
-@@ -40,6 +44,7 @@
- #Log notice syslog
- ## To send all messages to stderr:
- #Log debug stderr
-+Log notice syslog
- 
- ## Uncomment this to start the process in the background... or use
- ## --runasdaemon 1 on the command line. This is ignored on Windows;
-@@ -49,6 +54,7 @@
- ## The directory for keeping all the keys/etc. By default, we store
- ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
- #DataDirectory @LOCALSTATEDIR@/lib/tor
-+DataDirectory   /var/lib/tor/data
- 
- ## The port on which Tor will listen for local connections from Tor
- ## controller applications, as documented in control-spec.txt.

diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
deleted file mode 100644
index 9381df6..0000000
--- a/net-misc/tor/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>blueness@g.o</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<maintainer>
-		<email>chiiph@g.o</email>
-		<name>Tomás Touceda</name>
-	</maintainer>
-	<use>
-		<flag name='tor-hardening'>Compile tor with hardening on vanilla compilers/linkers</flag>
-		<flag name='transparent-proxy'>Enable transparent proxying</flag>
-		<flag name='bufferevents'>Use Libevent's buffered IO</flag>
-		<flag name='nat-pmp'>Enable NAT Port Mapping Protocol</flag>
-		<flag name='upnp'>Enable Universal Plug and Play</flag>
-	</use>
-</pkgmetadata>

diff --git a/net-misc/tor/tor-0.2.3.8_alpha.ebuild b/net-misc/tor/tor-0.2.3.8_alpha.ebuild
deleted file mode 100644
index 3d77e62..0000000
--- a/net-misc/tor/tor-0.2.3.8_alpha.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.3.7_alpha.ebuild,v 1.1 2011/10/31 10:16:33 blueness Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic versionator
-
-MY_PV="$(replace_version_separator 4 -)"
-MY_PF="${PN}-${MY_PV}"
-DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
-SRC_URI="http://www.torproject.org/dist/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+bufferevents doc nat-pmp tor-hardening transparent-proxy threads upnp"
-
-DEPEND="dev-libs/openssl
-	>=dev-libs/libevent-2.0.14
-	nat-pmp? ( net-libs/libnatpmp )
-	upnp? ( <net-libs/miniupnpc-1.6 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup tor
-	enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/torrc.sample.patch
-
-	einfo "Regenerating autotools files ..."
-	epatch "${FILESDIR}"/${PN}-0.2.2.24_alpha-respect-CFLAGS.patch
-	eautoreconf
-}
-
-src_configure() {
-	# Upstream isn't sure of all the user provided CFLAGS that
-	# will break tor, but does recommend against -fstrict-aliasing.
-	# We'll filter-flags them here as we encounter them.
-	filter-flags -fstrict-aliasing
-	econf --docdir=/usr/share/doc/${PF} \
-		$(use_enable bufferevents) \
-		$(use_enable doc asciidoc) \
-		$(use_enable nat-pmp) \
-		$(use_enable tor-hardening gcc-hardening) \
-		$(use_enable tor-hardening linker-hardening) \
-		$(use_enable transparent-proxy transparent) \
-		$(use_enable threads) \
-		$(use_enable upnp)
-}
-
-src_install() {
-	newconfd "${FILESDIR}"/tor.confd tor
-	newinitd "${FILESDIR}"/tor.initd-r6 tor
-	emake DESTDIR="${D}" install
-	keepdir /var/lib/tor
-
-	dodoc README ChangeLog ReleaseNotes \
-		doc/{HACKING,TODO} \
-		doc/spec/README
-
-	fperms 750 /var/lib/tor
-	fowners tor:tor /var/lib/tor
-
-	insinto /etc/tor/
-	newins "${FILESDIR}"/torrc-r1 torrc
-}
-
-pkg_postinst() {
-	elog
-	elog "We created a configuration file for tor, /etc/tor/torrc, but you can"
-	elog "change it according to your needs.  Use the torrc.sample that is in"
-	elog "that directory as a guide.  Also, to have privoxy work with tor"
-	elog "just add the following line"
-	elog
-	elog "forward-socks4a / localhost:9050 ."
-	elog
-	elog "to /etc/privoxy/config.  Notice the . at the end!"
-	elog
-}