summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-09-15 02:22:33 +0000
committerAnthony G. Basile <blueness@gentoo.org>2012-09-15 02:22:33 +0000
commitb0aac4b104ae829166dc041403bc21105190b094 (patch)
treebae840ccba9412161a0e88626874c63acfdc0dd8 /net-misc/tor
parentStable arm, bug #434882 (diff)
downloadhistorical-b0aac4b104ae829166dc041403bc21105190b094.tar.gz
historical-b0aac4b104ae829166dc041403bc21105190b094.tar.bz2
historical-b0aac4b104ae829166dc041403bc21105190b094.zip
Remove older RC and older patch
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'net-misc/tor')
-rw-r--r--net-misc/tor/ChangeLog6
-rw-r--r--net-misc/tor/Manifest11
-rw-r--r--net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch38
-rw-r--r--net-misc/tor/tor-0.2.3.19_rc.ebuild86
4 files changed, 9 insertions, 132 deletions
diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 12771d79db22..b15e479e8e22 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/tor
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.352 2012/09/15 02:05:40 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.353 2012/09/15 02:22:33 blueness Exp $
+
+ 15 Sep 2012; Anthony G. Basile <blueness@gentoo.org>
+ -files/tor-0.2.1.30-respect-CFLAGS.patch, -tor-0.2.3.19_rc.ebuild:
+ Remove older RC and older patch
15 Sep 2012; Anthony G. Basile <blueness@gentoo.org> tor-0.2.2.39.ebuild:
Stable arm, bug #434882
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index b46d60f56073..1f5e64ad4a35 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,7 +1,6 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776 SHA512 4ca30c55bbfa673467e02ccd7b07674c6acb660535aca2f1a5b58f15f85950b07ce55ccf15a17fb733862b6f9ad45d9e84805e7f3bbdaec7c6504ac80d3e61eb WHIRLPOOL 702f4462428f5513150d353cd31e74a23047852551404aa582cbf699bd3a682a17732dbaa6eb844b7188d50ea3f0b45824e11ae10dda7a156eee702ccdb90bbe
AUX tor-0.2.2.24_alpha-respect-CFLAGS.patch 1001 SHA256 2107434c7e7243d24043cf87eeccf60643e0cf94e8a883ebd725c23e13e667e8 SHA512 335d5dbc2f92a38ceb5ad60af38f93d8fbee77727f98cbaf38b6b925be6bceb84930685227257d6b92abfbb42e466329bc52f8e8b558573c39c0ebffe2849f7e WHIRLPOOL 0ad3d5cbc43d988e5977ed4ff00ee83bdd483d7e0e5a435a45683e0841bf482c06289c53bf4745d24f06b203ee8add5e3e52b85eb4d39a994c13930669bc0785
AUX tor-0.2.3.14_alpha-torrc.sample.patch 1365 SHA256 7f8d64e84590a62c4b5b1ef55ffbac32b770eaeb4252ef550e6130af918cf63b SHA512 8691db8957ab22e8619b4909faef0534a82faee78c685fef005372e0bc423f1b8d83e930a32a2b2dee239796a47b2147d2dd7fd53938161024fd1dfda0be8eec WHIRLPOOL 0531fb6393311ee88915f47862665606f96e94b27064701d35e9828a9f3547bf0db8710cdb4e539f515496607cffbd70a32098cd4f2e7ea90ac595e1c80ccb5f
AUX tor.confd 44 SHA256 41d780f291847e19f632428bbf27c3f289414afd237546d2974da1b75384c25c SHA512 9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660 WHIRLPOOL d3060208cf59c2de5839e7358fae37db883899f715a7411c7ba4c9e09926b6098aca7bfcaa269ea51b47b9f197ccd509f0c1e19909a87b1e087a88b30915a1cf
@@ -10,22 +9,20 @@ AUX torrc-r1 140 SHA256 6766943a69e4784d02f173b5d74b8eb9345f878ef4eb36edab34bbf6
AUX torrc.sample.patch 1281 SHA256 b60b3f454eb0d475c6746ee18b70f1681f8653a4b2e032889135f8939dd13e14 SHA512 3a84e7f2d91b0ef82f5de513ac4436aec9486b75ba1205fd40c0235fda4c9f133e1a362c6234baf06e36f2a57953be0b577846bd9ea3d88f86fbe2af9cb6f304 WHIRLPOOL 706919331d180928c240b6457ba6856dd76e39aff5dcc02344a726a8cffb8ba719c463579bd5b946c231488518d601d313de019a3dee2303120d54d5c206a55a
DIST tor-0.2.2.38.tar.gz 2928500 SHA256 8ee32e7fa14ddc1ded299e9c396b5628d473233528c3a22f8bfc7eac9094b4cf SHA512 d9ebb714ba8e1bc1408165a4f532597c865b1243193cf3739dff2c14e808c8d96f2a6d504504b0b4829d5f5909037046a0df41fbac7960cdb3fdd7a11cd57ffe WHIRLPOOL c228ca2302b2e550540950d966df0c912ca7d0c65dd9e70caff7d1da39ba51f255d9b494c0ae0c78efd6e3bd2c7247840c497a8f5a3e7dbd446c60dbf24cd8ff
DIST tor-0.2.2.39.tar.gz 2929303 SHA256 0d0c778d4697d5c5bd4f732ca179c22e8e359c634617ca9b6665e33d1863622a SHA512 69553740ac3f581cd7ed5e29eddc3395569061727dbb13412e33ff3a1f51ecc694b5369abb23a35a0d660057d9a6e515aa1c8d0c72dc88ab29c914f648859055 WHIRLPOOL a56684e8fb9d1158dceacb28d08d2c921ef7f26f5c08b643dddcb7f40011752c5154fe2e96c62a1ed18988a47f39f3a8abc99279cc3850eb302eded94f1c86b7
-DIST tor-0.2.3.19-rc.tar.gz 3154401 SHA256 af9722675e525b915647f0d1f871db5a1562e7a18681ea259e04ce26b8425d73 SHA512 b99873d242398e2e46a5af04877deea3a59e5f58958b2b3b9e9dcd4a6dcef8077e19553c1438f915fea21db7a02a9c699e472020aca5ae35ef0f75a132823472 WHIRLPOOL c478636eb08f117778b17d5e232043d2dce341f7c97029b9b1bd7eb3128257eed202b2ec9d8f4f7f5aa3aee5194064d81fc0f772f31ae4d8401f3dfe959d41bd
DIST tor-0.2.3.20-rc.tar.gz 3156310 SHA256 baca355aa606ded00fff2a8c7ede38400e42810c02629cf266190d2be8d5bdc3 SHA512 367185110178b02d66ac2f3a68edd4b34003748028e5531b5a2c87058bd7bab2cf9473dedae88bb49f28ccf2aedcfb893d540de6d0189f3a22fda6f96d72447f WHIRLPOOL fa1d37bf062f74e2b49320a646781262a4059123613a36397bb92a56fa715daed17f172b154a50340d444bff9f94931a1acefae3d4b2081f75b7e7f3a48805a7
DIST tor-0.2.3.22-rc.tar.gz 3163406 SHA256 829aa19402827147884c4bc2eb600935076179a5567e1fe9760bb24a1867b387 SHA512 a9bed7789001c99a113992f5e042ae7d9212522249452836c76de1105b7fea4bc96a18cc69413a616442d858d03159e014940ebd19f033eb43406b919020c90c WHIRLPOOL 8af8d47c85b807503d621e802495e04d0da8565f891d57f1f54c8d82545e68b6c4590e2077f182e59fac656919e9baf76a99e5d25432718e2429c7e170e363ee
DIST tor-0.2.4.2-alpha.tar.gz 3140670 SHA256 888877ebecc696d01c9abccbd1a5df42d4c0173ee6c451834e443d98a8c1e8e6 SHA512 9db67a90194923a5d0d4f5eee4a2deef4b61946b6960988df01724f3b9d613e36a29a894de55668a63800b04b8ce7821188620a835d64c4119afa5bab2f6beab WHIRLPOOL 5db1a5b032d402896dd38e720ba9df6f262c9ef0a01a6e5f7f3ac24248f2e70381c00c654e0088bc258dc1d388d948c670aa66b306f80189645d1b874d2d08d0
EBUILD tor-0.2.2.38.ebuild 2147 SHA256 4eb0b66dfc5c5b7587c5c007e95422c524233c59e1a0006ba3ba93482f2211e0 SHA512 e3e90d713482dc696cdae0c9fb9da9c372d6797786a300ba58ff2877c7a3f89c18c99ee773aafd29d2146571058f3e63689ccd91ed169ca2ed73d38429f43b1f WHIRLPOOL f17843e6a925834b48cccc9f64b7ea9c88e57435f1b70fd547e88896961c507fe1280b5972bea6d6958c325c11362b55c2ad24fd54f60149a39c33d3eb803912
EBUILD tor-0.2.2.39.ebuild 2151 SHA256 f36116f993c5e2eedd6c5c48f053bf769a43371573a5083df6d4463f07022fcf SHA512 4f425b33e4ad5014161ba1ecad1ec171c88b7b8c9d1177e86fca1622e89031d68d3d8ed13b14bdd99c576355579118b72eef86686d0b6fc745140e0ddd5b6589 WHIRLPOOL aecfd65df8519ffde1269a0591fffef0352bfdca6dbbfca4fecd3e59d70fcdde3ec9c5fe14bc4e5eb6f7e675c870b9765bd7c74cd7172bafab0ca5e5c75640c3
-EBUILD tor-0.2.3.19_rc.ebuild 2374 SHA256 0a362449e224c1182b98351d73ee2cb6b47946c9b12eb9f126b803e5e42fbde9 SHA512 09b9459c07cf5d02c6ae14b71585e5513813c60189842e7edcadb67fac81284386a56116f9b8952d2769b1ca2418e8ade8c3b3b378dd952c5774d7a50d8d7ba7 WHIRLPOOL 250fa62766a73c3214527dd7afefd70841e5f5cfdada1183c443a11147bab88261396cf5123915b5b693c4a289ef9d33e8c5142ab1f331eb00acfca38a59ac35
EBUILD tor-0.2.3.20_rc.ebuild 2374 SHA256 0bfa2e146d1baccd1f5a470eb5f7ba9895e899aa8cf219328350116c42e52dca SHA512 b079cda498e2a76e319274dae8667b2cb2400e591e7a69599ad4979abf27d92872a1f167d974990b8efc45d98877fceb9136619c98d8fcc8497a07395c4868ba WHIRLPOOL cad1dd7fab4914c483bb0f05ff3d7a589ab2fda728168fcb480682cdc4d1e6724508a2957facd87af7ae98f8c95fd3611180b7e9d962a0f7fefd76a1aac63cc0
EBUILD tor-0.2.3.22_rc.ebuild 2374 SHA256 a1f8456a5539c3cf516b6de850516642f9b56e5940559eb412600026f2a2fef9 SHA512 ab3f9a59d4ed9e38e07d2e2140f31fcbdad1d17607ac21e3df898115b360389f35576830606e0540fd2706828a19f31ef6cfc8270284f4d0ba93d75327d47ec0 WHIRLPOOL 0ff8138116db10b83072bfc5a65fde88ea69cc027a7ed992ca881c8c4c259aef32a100c5535e1f4cb07a2b5c25ddb87e6f4dd4c171daf981dd9fb1f015a8c9a6
EBUILD tor-0.2.4.2_alpha.ebuild 2354 SHA256 754842a20f5532f0110ac3cbf00c3a24112060f3ab070cf2e98d87e796824ac2 SHA512 92eb81276d6def4e9426271c852f3c632387d611276aaa947fd92958342e43bdc02a454f3065e61af3cb840d6d45ac6d22cfdf6fdb16ae4b664cbb353eea6686 WHIRLPOOL bb2cd09828cf8fb12305373649eaa86efca1291f8f05f09aa46d1b94d9a871925c1e4df137f46f84c2773fe42f6bfc0a55c45c0cdf85ef0c898ffda76781de9a
-MISC ChangeLog 52610 SHA256 e53c5bcf89ebbcf356f9fc7685f1a2b7f9c5b2a1f2a76181feedc26024aa9a59 SHA512 84a80a48058d73227d90a8a1ddf3e6c02d0be5772c5805b966c137639183d51acd6ae744e62a4e74605f214d1fe5a84318c33b46bc52c83c55d7ecb60ea47970 WHIRLPOOL fb12daf52d314d37d5b329381e16e3612644e0e81a1745bd0278b49c13c41e0bfc2acdb5d456b5298dab34a3ce9c39c911d3d85e58029f79b41e249ee5fd9dd6
+MISC ChangeLog 52769 SHA256 c10d072a1f6e73109e97ab4e101ec7b14159e4fe5aa9ef27dd031ed561ef4d07 SHA512 dc7beb93985f80e8ee8d73e0954d9e74c19efdee257e9468dc414ebcfb4eafd1df4a3c9ad0bd331ca0cd388ec54435a32354d0009c58c0c8cd76acd5943247a9 WHIRLPOOL 1a87aa474fbd5382644cfa680f9c4b009386c43460f0548c4e296795f52020e3915a84aa6c270cccc327e7b330827f1c0bfa4ac83b495de569a927142886cc38
MISC metadata.xml 645 SHA256 743582b5e621facf5b53d278b936d553d29a1d29bcedf32e818fbe0f967bd102 SHA512 cb7a97f5803074bea8051ab377ebe8a5ec0d6694c345f5cfa2d669ae6c2f8f6533052471911d5ab8afdd1a74f8c6238c01ee265e69c6a305726b52b69b21987f WHIRLPOOL 2b4d676e9354234eb612e58844a007732c1145349d165f4093a0b10ceca23ea8d8931b6f271640c8ef0733e18836d1e282e87192aa9000ec84ffbb3bec6c8051
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlBT4lsACgkQl5yvQNBFVTXn5wCglht2bkohvNzFUSTTbeo6EFXP
-sz8AoItJRY7kQZ4uLdjUNGhRYmjYGFpk
-=Teee
+iEYEAREIAAYFAlBT5lEACgkQl5yvQNBFVTWGJACfdS9IVXcSk9QeZKblrcSaDmeK
+2/EAnRvpoJ6p4Gi/RNFyjzyXzb1o6X2R
+=yXrw
-----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
deleted file mode 100644
index 3776756cacf6..000000000000
--- a/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur tor-0.2.1.30.orig/configure.in tor-0.2.1.30/configure.in
---- tor-0.2.1.30.orig/configure.in 2011-02-23 03:25:39.000000000 -0500
-+++ tor-0.2.1.30/configure.in 2011-04-09 13:25:40.000000000 -0400
-@@ -10,6 +10,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"
-@@ -784,12 +789,11 @@
- # Set CFLAGS _after_ all the above checks, since our warnings are stricter
- # than autoconf's macros like.
- if test "$GCC" = yes; then
-- CFLAGS="$CFLAGS -Wall -g -O2"
-+ CFLAGS="$CFLAGS -Wall"
- # Disable GCC's strict aliasing checks. They are an hours-to-debug
- # accident waiting to happen.
- CFLAGS="$CFLAGS -fno-strict-aliasing"
- else
-- CFLAGS="$CFLAGS -g -O"
- enable_gcc_warnings=no
- enable_gcc_warnings_advisory=no
- fi
-@@ -865,6 +869,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 contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
- AC_OUTPUT
diff --git a/net-misc/tor/tor-0.2.3.19_rc.ebuild b/net-misc/tor/tor-0.2.3.19_rc.ebuild
deleted file mode 100644
index b79f0b8821f3..000000000000
--- a/net-misc/tor/tor-0.2.3.19_rc.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 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.19_rc.ebuild,v 1.2 2012/07/11 23:53:39 blueness Exp $
-
-EAPI="4"
-
-inherit 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="https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz"
-S="${WORKDIR}/${MY_PF}"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+bufferevents nat-pmp tor-hardening transparent-proxy threads upnp selinux web"
-
-DEPEND="dev-libs/openssl
- sys-libs/zlib
- >=dev-libs/libevent-2.0.14
- nat-pmp? ( net-libs/libnatpmp )
- upnp? ( net-libs/miniupnpc )
- selinux? ( sec-policy/selinux-tor )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- enewgroup tor
- enewuser tor -1 -1 /var/lib/tor tor
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.2.3.14_alpha-torrc.sample.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 \
- --enable-asciidoc \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable bufferevents) \
- $(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) \
- $(use_enable web tor2web-mode)
-}
-
-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
-}