Add new version to address sparc alignment problem, Bug #246483 which see

for details.
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.20-gentoo-r8 x86_64

4 files changed, 168 insertions, 2 deletions

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 4d233e025cb4..eff42da0e178 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/tor
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.136 2008/11/01 18:43:09 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.137 2008/11/14 00:54:09 fmccor Exp $
+
+*tor-0.2.0.31-r1 (14 Nov 2008)
+
+  14 Nov 2008; Ferris McCormick <fmccor@gentoo.org>
+  +files/tor-0.2.0.31-sparc.patch, +tor-0.2.0.31-r1.ebuild:
+  Add new version to address sparc alignment problem, Bug #246483 which see
+  for details.
 
   01 Nov 2008; nixnut <nixnut@gentoo.org> tor-0.2.0.31.ebuild:
   Stable on ppc wrt bug 244679
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 61c3dc95b2b8..2f225d40353d 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,9 +1,11 @@
 AUX tor-0.2.0.30-logrotate.patch 291 RMD160 256507536cb7629a21c855816428885b3587f14c SHA1 e1592a63df6677c8e2537ae5363eda39c4a3aeb1 SHA256 8c8c4d33d758127eedb234cda6836be625188c09e9eadfea290f6cf575516c22
+AUX tor-0.2.0.31-sparc.patch 2849 RMD160 74a35891ad0d509015b62b8c727a67073d89491d SHA1 50d2c7acb33ebfcb9bbae920d7d8d8132b5592ea SHA256 754aa16de135ec6c0fef44d836f8637eba8dbbb6d20f94cc7ab8b727415257aa
 AUX tor.initd-r4 1549 RMD160 2f36cbc9e14c0021139212634b8e0ac585058e44 SHA1 4593e7a1b482bc7b8e787b57d0160f57415b9817 SHA256 0b3c6fdb62b0ce1f4812b0e3ce19dcc7176d4b723cb24b46e4c8474d5b119222
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.0.30.tar.gz 2155463 RMD160 e51a38aa1531076bc9722e1584403f917d207dd0 SHA1 c6fbb3bf0141f4b34cc90845373b3dfa8b47ddc4 SHA256 bc9e8bf841ef64f8b06eef91eeab430f91147a3c4d7a6919826fa33b20453387
 DIST tor-0.2.0.31.tar.gz 2156305 RMD160 584cbbd9f295a8f677bc95a5f05dc78f6184b97a SHA1 a586cc017a791ac481fde836c3cf8e3667fb5cfc SHA256 05894f5cfcb78ebab234f6e73350430e57f4c8bec4a4c3e60a41e1e9fb13c66c
 EBUILD tor-0.2.0.30-r1.ebuild 1742 RMD160 23335d3bd8c4a0ecc28cbd02942f7fcadf7a9cd7 SHA1 eeab29287dc8f988934df090c4418bdbb38cae9b SHA256 b3408f145289e1344fc79f866af77b70e9180c324abe42e653b1e2e7d000c895
+EBUILD tor-0.2.0.31-r1.ebuild 1805 RMD160 0e12fb5439e85605cb70d46f6dc440660a04964d SHA1 c3d9ea961fa4a887f092e0cc4a985d9d407a6380 SHA256 924bce63d64e3cffa6fce3301addc526560cc4dbad28cb02cfce05525b7f1202
 EBUILD tor-0.2.0.31.ebuild 1749 RMD160 6aefe4bf8c1fb14643183da691c20969999d2ed8 SHA1 447b7c67e3ab1f0ffc94b77e07f184591ec6598c SHA256 1bd55271b87892c3c36c488d4633bc95127dcf9e2e84fc5e10152cd96a1ffde0
-MISC ChangeLog 20175 RMD160 41473fba4eb3c060872c7949a8b4f1c417dcb5e1 SHA1 e1f25710b6a3d1845127071489481a872912889a SHA256 2b3850350d4ad023fd0a8e68e31988f54d6a1dfd1fbfbfaef56a4810e125857f
+MISC ChangeLog 20411 RMD160 8a9a587f57e6566e0c932037ea25a945140d922f SHA1 9a67a90cf11caac61f2747caabe8186855a14f2d SHA256 bddca50c461efedc5b779171b395a2ec3da43f367b1870c5bb3a0f5f598c303f
 MISC metadata.xml 423 RMD160 d053d3997ad9765665ab54fb201840b15c6915d3 SHA1 97fcb174f7c312b3e7a4f9b17f366a726e07345f SHA256 93b2c804410987cf63abb109afb6c6a7bf7bca3d9a207138be0d6d1c50a6c746
diff --git a/net-misc/tor/files/tor-0.2.0.31-sparc.patch b/net-misc/tor/files/tor-0.2.0.31-sparc.patch
new file mode 100644
index 000000000000..b7634765a1d6
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.0.31-sparc.patch
@@ -0,0 +1,87 @@
+--- src/or/buffers.c-	2008-11-13 22:41:16.000000000 +0000
++++ src/or/buffers.c	2008-11-13 22:46:46.000000000 +0000
+@@ -957,7 +957,8 @@
+     return 0;
+   peek_from_buf(hdr, sizeof(hdr), buf);
+ 
+-  command = *(uint8_t*)(hdr+2);
++  /* command = *(uint8_t*)(hdr+2); */
++  command = get_uint8(hdr+2);
+   if (!(CELL_COMMAND_IS_VAR_LENGTH(command)))
+     return 0;
+ 
+@@ -966,7 +967,8 @@
+     return 1;
+   result = var_cell_new(length);
+   result->command = command;
+-  result->circ_id = ntohs(*(uint16_t*)hdr);
++  /* result->circ_id = ntohs(*(uint16_t*)hdr); */
++  result->circ_id = ntohs(get_uint16(hdr));
+ 
+   buf_remove_from_front(buf, VAR_CELL_HEADER_SIZE);
+   peek_from_buf(result->payload, length, buf);
+--- src/or/connection_or.c-	2008-06-13 05:12:28.000000000 +0000
++++ src/or/connection_or.c	2008-11-13 22:48:56.000000000 +0000
+@@ -157,8 +157,12 @@
+ void
+ var_cell_pack_header(const var_cell_t *cell, char *hdr_out)
+ {
++	/*
+   *(uint16_t*)(hdr_out) = htons(cell->circ_id);
+   *(uint8_t*)(hdr_out+2) = cell->command;
++  */
++  set_uint16(hdr_out, htons(cell->circ_id));
++  set_uint8(hdr_out+2, cell->command);
+   set_uint16(hdr_out+3, htons(cell->payload_len));
+ }
+ 
+--- src/common/compat.h-	2008-11-14 00:17:28.000000000 +0000
++++ src/common/compat.h	2008-11-14 00:18:31.000000000 +0000
+@@ -454,8 +454,10 @@
+ /* ===== OS compatibility */
+ const char *get_uname(void);
+ 
++uint8_t get_uint8(const char *cp) ATTR_PURE ATTR_NONNULL((1));
+ uint16_t get_uint16(const char *cp) ATTR_PURE ATTR_NONNULL((1));
+ uint32_t get_uint32(const char *cp) ATTR_PURE ATTR_NONNULL((1));
++void set_uint8(char *cp, uint8_t v) ATTR_NONNULL((1));
+ void set_uint16(char *cp, uint16_t v) ATTR_NONNULL((1));
+ void set_uint32(char *cp, uint32_t v) ATTR_NONNULL((1));
+ 
+--- src/common/compat.c-	2008-11-14 00:23:11.000000000 +0000
++++ src/common/compat.c	2008-11-14 00:21:34.000000000 +0000
+@@ -407,6 +407,18 @@
+ #endif
+ 
+ /**
++ * Read a 8-bit value beginning at <b>cp</b>.  Equivalent to
++ * *(uint8_t*)(cp), but will not cause segfaults on platforms that forbid
++ * unaligned memory access.  (fmccor@gentoo.org)
++ */
++uint8_t
++get_uint8(const char *cp)
++{
++  uint8_t v;
++  memcpy(&v,cp,1);
++  return v;
++}
++/**
+  * Read a 16-bit value beginning at <b>cp</b>.  Equivalent to
+  * *(uint16_t*)(cp), but will not cause segfaults on platforms that forbid
+  * unaligned memory access.
+@@ -431,6 +443,15 @@
+   return v;
+ }
+ /**
++ * Set a 8-bit value beginning at <b>cp</b> to <b>v</b>. Equivalent to
++ * *(uint8_t)(cp) = v, but will not cause segfaults on platforms that forbid
++ * unaligned memory access. (fmccor@gentoo.org) */
++void
++set_uint8(char *cp, uint8_t v)
++{
++  memcpy(cp,&v,1);
++}
++/**
+  * Set a 16-bit value beginning at <b>cp</b> to <b>v</b>. Equivalent to
+  * *(uint16_t)(cp) = v, but will not cause segfaults on platforms that forbid
+  * unaligned memory access. */
diff --git a/net-misc/tor/tor-0.2.0.31-r1.ebuild b/net-misc/tor/tor-0.2.0.31-r1.ebuild
new file mode 100644
index 000000000000..c242afc1256d
--- /dev/null
+++ b/net-misc/tor/tor-0.2.0.31-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/tor-0.2.0.31-r1.ebuild,v 1.1 2008/11/14 00:54:10 fmccor Exp $
+
+inherit eutils
+
+DESCRIPTION="Anonymizing overlay network for TCP"
+HOMEPAGE="http://tor.eff.org"
+MY_PV=${PV/_/-}
+SRC_URI="http://tor.eff.org/dist/${PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug logrotate"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/libevent-1.2"
+RDEPEND="${DEPEND}
+	net-proxy/tsocks"
+
+pkg_setup() {
+	enewgroup tor
+	enewuser tor -1 -1 /var/lib/tor tor
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/torrc.sample-0.1.2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.2.0.30-logrotate.patch
+	epatch "${FILESDIR}"/${PN}-0.2.0.31-sparc.patch
+}
+
+src_compile() {
+	econf $(use_enable debug)
+	emake || die
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/tor.initd-r4 tor
+	emake DESTDIR="${D}" install || die
+	keepdir /var/{lib,log,run}/tor
+
+	dodoc README ChangeLog AUTHORS ReleaseNotes \
+		doc/{HACKING,TODO} \
+		doc/spec/*.txt
+
+	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
+
+	if use logrotate; then
+		sed -e "s:/lib::" \
+			-e "s:/rc.d::" \
+			-e "s:\\*:\\*.:" \
+			-e "s:sharedscripts:create 0640 tor tor\n\tsharedscripts:" -i contrib/tor.logrotate || die
+		insinto /etc/logrotate.d
+		newins contrib/tor.logrotate tor
+	fi
+}
+
+pkg_postinst() {
+	elog "You must create /etc/tor/torrc, you can use the sample that is in that directory"
+	elog "To have privoxy and tor working together you must add:"
+	elog "forward-socks4a / localhost:9050 ."
+	elog "(notice the . at the end of the line)"
+	elog "to /etc/privoxy/config"
+}