From b6d1f8063b63fefe93a2d15a3b10c73b84bd5399 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Sat, 26 Nov 2011 15:44:00 +0000 Subject: Switched to openrc style init script for old 0.2.1 branch Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- net-misc/tor/ChangeLog | 8 +++- net-misc/tor/Manifest | 11 ++--- net-misc/tor/files/tor.initd-r4 | 57 ----------------------- net-misc/tor/tor-0.2.1.31-r1.ebuild | 92 +++++++++++++++++++++++++++++++++++++ net-misc/tor/tor-0.2.1.31.ebuild | 92 ------------------------------------- 5 files changed, 104 insertions(+), 156 deletions(-) delete mode 100644 net-misc/tor/files/tor.initd-r4 create mode 100644 net-misc/tor/tor-0.2.1.31-r1.ebuild delete mode 100644 net-misc/tor/tor-0.2.1.31.ebuild diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog index 275c252e53d6..dc01e6ad02d4 100644 --- a/net-misc/tor/ChangeLog +++ b/net-misc/tor/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/tor # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.296 2011/11/26 15:31:01 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.297 2011/11/26 15:44:00 blueness Exp $ + +*tor-0.2.1.31-r1 (26 Nov 2011) + + 26 Nov 2011; Anthony G. Basile -tor-0.2.1.31.ebuild, + +tor-0.2.1.31-r1.ebuild, -files/tor.initd-r4: + Switched to openrc style init script for old 0.2.1 branch 26 Nov 2011; Anthony G. Basile -tor-0.2.1.30.ebuild, -files/tor.conf: diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest index 9b49c09cb303..c25eb4143cba 100644 --- a/net-misc/tor/Manifest +++ b/net-misc/tor/Manifest @@ -6,7 +6,6 @@ AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 RMD160 f623fd1f40cd2175c0c5b6bea3441fc87f7e8d0a SHA1 c8634481cd8273f98945f17f297f2506331d3b8d SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8 AUX tor-0.2.2.34_disable-stats-requiring-geoip.patch 1346 RMD160 6743fe26f480426ee74eb4255e35b2df1e594803 SHA1 9c1fb464e8ef974add26f9f68e2bd58a3af3d78c SHA256 9042eeada2837de284463225e8d2a471c7fac1b26b0ba8fac125d2556a7e561a AUX tor.confd 44 RMD160 d19946be72538d0826667730e9e9a1736b0385ff SHA1 f9a40fadd018794e537282344f01c609e4dbeac7 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c -AUX tor.initd-r4 1553 RMD160 df0fc912c2e36797059de07d15a384d9ffe7d393 SHA1 82323d97b6d790b41027eec01e263d226c5b83e9 SHA256 4bf3c0906b0406564394eb51d47c1b5566904ed459e31ec1b1c1162c3b4aee92 AUX tor.initd-r6 1601 RMD160 f1ef0dd197f051a826e3785348a2a8cc490c04eb SHA1 ee9f5116c3a69a7adb2be15ce14e3904261e84c4 SHA256 67d5bb618cfbc4d4c05e5589bfd2e24f6563c4e3c6ba1d6c472b285b4480e20d AUX torrc 169 RMD160 f3fe077f017af465013e34f7b50f95f65d063cf0 SHA1 48061474d7176fc2dbf9be1e4595190877ba8a66 SHA256 7bddc22f07f41d7c5deeafb9cf010b4bf79bb6324a4c7ab86eeb81cdaec86a97 AUX torrc-r1 140 RMD160 4949b9c875ee65d876381015eb7f00a2c611494c SHA1 52e5bc3cfb19f8c912697e5489cc1b7527f8059e SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf649ef2738 @@ -16,17 +15,17 @@ DIST tor-0.2.1.31.tar.gz 2558057 RMD160 31d95b71675c845ae657a0bcc522599015a2c088 DIST tor-0.2.2.34.tar.gz 2752710 RMD160 3cbf6f00ab88010ed2f916526c4acef9a8514c37 SHA1 81d777d07d01513da483bcd27dc92bc36112e771 SHA256 a027a535b35e5f9ca7091e4c83a06b4be48f0f95d6906bdd467ccc0659e7e798 DIST tor-0.2.3.7-alpha.tar.gz 2902591 RMD160 fe37e44f7af19b16ad0a983491fd631746d481d3 SHA1 7ac27fc0a991b5042bbd89d342a9f67908ce132d SHA256 c736e3de356b78fd47c96c6c64bdceb9dec9ef2457475a0601d261cf1854b695 DIST tor-0.2.3.8-alpha.tar.gz 2909997 RMD160 eec1f3b549b1513d2c39791c79a18496d97a4809 SHA1 7ca5c1cfa5a1a3d1c923298a47fe2430495bedcc SHA256 b7c40f5f4fbd0a42b6863c29a69cc7b06d9e1cc9609f934a550f2019426d8dc4 -EBUILD tor-0.2.1.31.ebuild 2856 RMD160 d0f4d326b7e761a546e3da04f8513ab95b715514 SHA1 6af834b213fa70f26ba9d14ad59a18b9af444d60 SHA256 0e7586cca58c9baa4af672aa1a8e00a7747e292514bfe27f92dafd4092c029a5 +EBUILD tor-0.2.1.31-r1.ebuild 2859 RMD160 dda9674702f2062dc0c93ba9de9cbb25e0a02097 SHA1 df3d678adc46a2da51eaaf61375553fa0409c80e SHA256 a96abf0688b938375515e2e4b72da0a3e6bc20bf799ae355154bec2c68cce7cf EBUILD tor-0.2.2.34-r1.ebuild 2264 RMD160 cfb388ba36e7f7cc78b793090d0d4b785387f4ea SHA1 7a5af2c851672196ce408426d2b159b0f4d390bf SHA256 eced7473565fb8c1b929411e72b17506fee114671f4b69ece02ff2e38c61ef84 EBUILD tor-0.2.2.34.ebuild 2181 RMD160 398f58883a22b50c26a73428c3b912d939794699 SHA1 0d784d0e8f424aa973d60d3f0b8ae6531d629590 SHA256 a78413b4ee090a6f73609b4b2528b2085ab5dd1f8e6707f7f4a60e3451d8b7bf EBUILD tor-0.2.3.7_alpha.ebuild 2364 RMD160 ffb1a886a8f3afd50448da52899ab29e4a3a8150 SHA1 010227d454fe0ff6691447ebbddf25fee097a9a4 SHA256 43cfd7470c48c1232556b1fcac24f029356643a66e930c7948bb45aacabab923 EBUILD tor-0.2.3.8_alpha.ebuild 2234 RMD160 c0e9f4fe0ef5331af90732667863ee433bd0a968 SHA1 ed36014de8f4daa093a48506dfa576f5b133689f SHA256 99f0d59774241cd4645d05765ec900afbd36706a8b76c3858e55dfd098c65357 -MISC ChangeLog 43874 RMD160 f6e9a1ee4412b752a76eb9b9712c30a47e838374 SHA1 72f3f78802017501a38a94aa598923d37483c6b7 SHA256 34dd0d9a4e4407b133b45e3cd3d265ae84755104ab54a6b596b65812ffdabb1e +MISC ChangeLog 44092 RMD160 b695ee90358e9a3c09c3126acd00cac2557fd618 SHA1 47e199974c545cf455eb9b662b42bd19f829261d SHA256 f79a238a2714949526c7bb5e5c524d00371fe0a6769e8cb409989f8e86d5a6d8 MISC metadata.xml 596 RMD160 2527172185bb74e5ea6167d56b2e3476c48eb078 SHA1 93be4ae496f77aa63bb77d720f51bf3510798daa SHA256 c7622b255363171fd1b351e14e592beb901d332f976a2e77c409e14ef5ed20bc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEUEAREIAAYFAk7RBj8ACgkQl5yvQNBFVTWQsgCfVbrgO3IeBWgeUNMYGgwlHc8w -5fEAl0Gbk9NQyMI7NKNVf44VpVCRlBU= -=8MXf +iEYEAREIAAYFAk7RCUkACgkQl5yvQNBFVTVyQACfR3RCkvojmEh5s60ekqYCPh+s +zykAoIodr0qN7yypPyJ5GxwdctK2nso+ +=OtjS -----END PGP SIGNATURE----- diff --git a/net-misc/tor/files/tor.initd-r4 b/net-misc/tor/files/tor.initd-r4 deleted file mode 100644 index 597a9550e451..000000000000 --- a/net-misc/tor/files/tor.initd-r4 +++ /dev/null @@ -1,57 +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-r4,v 1.7 2011/08/23 12:26:36 blueness Exp $ - -opts="${opts} 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 - 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/tor-0.2.1.31-r1.ebuild b/net-misc/tor/tor-0.2.1.31-r1.ebuild new file mode 100644 index 000000000000..a5048f9a67e3 --- /dev/null +++ b/net-misc/tor/tor-0.2.1.31-r1.ebuild @@ -0,0 +1,92 @@ +# 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.1.31-r1.ebuild,v 1.1 2011/11/26 15:44:00 blueness Exp $ + +EAPI=4 + +inherit autotools eutils flag-o-matic + +DESCRIPTION="Anonymizing overlay network for TCP" +HOMEPAGE="http://www.torproject.org/" +MY_PV=${PV/_/-} +SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="debug" + +DEPEND="dev-libs/openssl + >=dev-libs/libevent-1.2" +RDEPEND="${DEPEND}" + +pkg_setup() { + enewgroup tor + enewuser tor -1 -1 /var/lib/tor tor +} + +src_prepare() { + epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch + epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch + + einfo "Regenerating autotools files ..." + epatch "${FILESDIR}"/${PN}-0.2.1.30-respect-CFLAGS.patch + eautoreconf + + # Normally tor uses a bundled libevent fragment to provide + # asynchronous DNS requests. This is generally a bad idea, but at + # the moment the official libevent does not have the 0x20 hack, so + # anonymity is higher with the bundled variant. Remove patch as + # soon as upstream has installed the autoconf option to use + # system's libevent. This hasn't happened, so we + # have to live with the bundled libevent for this release, as the + # current version in tree won't suffice for tor to build + # See http://bugs.noreply.org/flyspray/index.php?do=details&id=920 + # for upstream's report + # Let's revisit this when libevent-2* is unmasked + # use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch +} + +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 $(use_enable debug) +} + +src_install() { + # allow the tor user more open files to avoid errors, see bug 251171 + newconfd "${FILESDIR}"/tor.confd tor + + newinitd "${FILESDIR}"/tor.initd-r6 tor + emake DESTDIR="${D}" install + keepdir /var/{lib,log,run}/tor + + dodoc README ChangeLog AUTHORS ReleaseNotes \ + doc/{HACKING,TODO} + + fperms 750 /var/lib/tor /var/log/tor + fperms 755 /var/run/tor + fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor + + insinto /etc/tor/ + doins "${FILESDIR}"/torrc + + insinto /etc/logrotate.d + newins contrib/tor.logrotate tor +} + +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 +} diff --git a/net-misc/tor/tor-0.2.1.31.ebuild b/net-misc/tor/tor-0.2.1.31.ebuild deleted file mode 100644 index 1e8f2ce8bdcd..000000000000 --- a/net-misc/tor/tor-0.2.1.31.ebuild +++ /dev/null @@ -1,92 +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.1.31.ebuild,v 1.1 2011/10/28 18:20:03 blueness Exp $ - -EAPI=4 - -inherit autotools eutils flag-o-matic - -DESCRIPTION="Anonymizing overlay network for TCP" -HOMEPAGE="http://www.torproject.org/" -MY_PV=${PV/_/-} -SRC_URI="http://www.torproject.org/dist/${PN}-${MY_PV}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug" - -DEPEND="dev-libs/openssl - >=dev-libs/libevent-1.2" -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup tor - enewuser tor -1 -1 /var/lib/tor tor -} - -src_prepare() { - epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch - epatch "${FILESDIR}"/${PN}-0.2.1.19-logrotate.patch - - einfo "Regenerating autotools files ..." - epatch "${FILESDIR}"/${PN}-0.2.1.30-respect-CFLAGS.patch - eautoreconf - - # Normally tor uses a bundled libevent fragment to provide - # asynchronous DNS requests. This is generally a bad idea, but at - # the moment the official libevent does not have the 0x20 hack, so - # anonymity is higher with the bundled variant. Remove patch as - # soon as upstream has installed the autoconf option to use - # system's libevent. This hasn't happened, so we - # have to live with the bundled libevent for this release, as the - # current version in tree won't suffice for tor to build - # See http://bugs.noreply.org/flyspray/index.php?do=details&id=920 - # for upstream's report - # Let's revisit this when libevent-2* is unmasked - # use bundledlibevent || epatch "${FILESDIR}"/${PN}-0.2.1.5-no-internal-libevent.patch -} - -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 $(use_enable debug) -} - -src_install() { - # allow the tor user more open files to avoid errors, see bug 251171 - newconfd "${FILESDIR}"/tor.confd tor - - newinitd "${FILESDIR}"/tor.initd-r4 tor - emake DESTDIR="${D}" install - keepdir /var/{lib,log,run}/tor - - dodoc README ChangeLog AUTHORS ReleaseNotes \ - doc/{HACKING,TODO} - - fperms 750 /var/lib/tor /var/log/tor - fperms 755 /var/run/tor - fowners tor:tor /var/lib/tor /var/log/tor /var/run/tor - - insinto /etc/tor/ - doins "${FILESDIR}"/torrc - - insinto /etc/logrotate.d - newins contrib/tor.logrotate tor -} - -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 -} -- cgit v1.2.3-65-gdbad