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

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     b85167014d9adf1abababfaf19fcc3c5c4f4f7ec
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  9 17:39:27 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Apr  9 17:39:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=b8516701

net-misc/tor: backport of tor-0.2.2.23_alpha-respect-CFLAGS.patch

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

---
 net-misc/tor/ChangeLog                             |    4 ++
 net-misc/tor/Manifest                              |   15 +++++++-
 .../tor/files/tor-0.2.1.30-respect-CFLAGS.patch    |   38 ++++++++++++++++++++
 net-misc/tor/tor-0.2.1.30-r1.ebuild                |   11 +++++-
 4 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 13339b6..c8e1f9a 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.225 2011/01/07 23:54:09 fauli Exp $
 
+  09 Apr 2011; Anthony G. Basile <blueness@gentoo.org>
+  tor-0.2.1.30-r1.ebuild, +files/tor-0.2.1.30-respect-CFLAGS.patch:
+  backport of tor-0.2.2.23_alpha-respect-CFLAGS.patch
+
 *tor-0.2.2.23_alpha-r1 (25 Mar 2011)
 
   25 Mar 2011; Anthony G. Basile <blueness@gentoo.org>

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index b08b535..17ea9a6 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
+AUX tor-0.2.1.30-respect-CFLAGS.patch 1626 RMD160 6cf173c52d0db4b2ca8eca724e484f53bd93431c SHA1 a702160c6cf577ead6da53f24875b324e02e8821 SHA256 91952c032232577c3a8a3e9e00b1f46623d0cfe1b05f28285e27fd1d1106e776
 AUX tor-0.2.2.23_alpha-respect-CFLAGS.patch 1460 RMD160 8a4245ab8132454e1ae1b12bbc241c8718854515 SHA1 bf8f56d78b4572caceaa5043f299c3255471e70a SHA256 7d8ed0359f108a32cdeb3c2b613cbaae6469124e07a0033a035e4b1670023782
 AUX tor.conf 89 RMD160 3ed95351d715ed05db3baa3dd8802832cb06989f SHA1 ec2a2cb216c35e37803b29a508d0914639a7f82b SHA256 3ed15ecce5c312fb4d50e0e8f3a645d67c660e2930a9dbadf010803b8fd095a0
 AUX tor.initd-r4 1566 RMD160 95692924474ad8e76dfdd60c44a9b4a618356d75 SHA1 cefe786a37b042edde03c00cb0500d6aade6cdd9 SHA256 aa5733badb87ebfe5efd0c3750a24f4589a480555f7c6ed579aa1c621ad09efc
 AUX torrc 119 RMD160 3b7ec5a87893d371b2659bb49ac77cf3deff0f38 SHA1 c573f42578261ccc7b223261d5083cdff5afe095 SHA256 97a80a09bb3d615b93947f0d1a9c1883ef340860e89b879f2247d61b1c2476f0
 AUX torrc.sample-0.1.2.6.patch 1145 RMD160 3656774f05abe54ec22a121954a1d437fe1da520 SHA1 a0c658eafc8feb134e4ce8c7a5cdf94074ad79f5 SHA256 5b94e1d8c097626402b0b388fefb15f11b95db112b23d358e04cfe55331911f1
 DIST tor-0.2.1.30.tar.gz 2447447 RMD160 05e4a1443a5494982ef78dc61a088da26a09e9cf SHA1 f25b89d8c677c83ee0559036d5b13d49b272b3b0 SHA256 f352a1a8ffa469ae251324f89386074074bcffef1a7c6a72caa7e4c2d12ce109
-EBUILD tor-0.2.1.30-r1.ebuild 2652 RMD160 706d604d7e3bec644ce886118c84c90292e51826 SHA1 692d4fb5227c0a321188d96b103ae85f44ab618b SHA256 45b1a91f94a958f9578f2672e533a86483157a0cccc212558061a1d7e56fd648
-MISC ChangeLog 34372 RMD160 11aaa4dbd583897de1f340e6951341b5e48e3fb1 SHA1 e14eae16b8fc3d5e84b7f97379864ebbe889dfd5 SHA256 21cae52b2a4a3145ba4a8e686d3f355d2cb314bc9c21d7d32a2b428c954321ce
+EBUILD tor-0.2.1.30-r1.ebuild 3029 RMD160 cc28e282f1de5dcb23ed029d9a7b5ce526e52fda SHA1 ec56c04558cdca878e8b77021511c1efacd22392 SHA256 dc3d018672dfbaad0f01e13f3354621104755f69a20d6f765d414ca223c45dd9
+MISC ChangeLog 34550 RMD160 bbbea3c98f158d36813848197096d3f6c19e889f SHA1 daba92e0acf4abdee906a276f7c51930a71befff SHA256 31f71719889693f087173a9cfe5aedd414d13fd9a8ad279c279c0d1810598006
 MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk2gmc8ACgkQl5yvQNBFVTWv1ACfZUaKMD08Q1aEqarROicE+R7H
+wtcAnjduE8HyvMwHAHxC/3P4vdUoJ+qS
+=uq//
+-----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
new file mode 100644
index 0000000..3776756
--- /dev/null
+++ b/net-misc/tor/files/tor-0.2.1.30-respect-CFLAGS.patch
@@ -0,0 +1,38 @@
+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.1.30-r1.ebuild b/net-misc/tor/tor-0.2.1.30-r1.ebuild
index 8b0e4be..f17799b 100644
--- a/net-misc/tor/tor-0.2.1.30-r1.ebuild
+++ b/net-misc/tor/tor-0.2.1.30-r1.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit eutils
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="Anonymizing overlay network for TCP"
 HOMEPAGE="http://www.torproject.org/"
@@ -31,6 +31,11 @@ pkg_setup() {
 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 || die "eautoreconf failed"
+
 	# 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
@@ -46,6 +51,10 @@ src_prepare() {
 }
 
 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)
 }