summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2011-03-28 00:23:11 +0000
committerAnthony G. Basile <blueness@gentoo.org>2011-03-28 00:23:11 +0000
commitda412e7f5c3add68997e033c7914f7d916ddfa12 (patch)
treef7705fede66035d69828ac24543eaddd86188954 /net-misc/tor
parentVersion bump wrt #360845 by Agostino Sarubbo. Remove -Werror from src/CMakeLi... (diff)
downloadhistorical-da412e7f5c3add68997e033c7914f7d916ddfa12.tar.gz
historical-da412e7f5c3add68997e033c7914f7d916ddfa12.tar.bz2
historical-da412e7f5c3add68997e033c7914f7d916ddfa12.zip
Improved fix to build system, see bug #360765
Package-Manager: portage-2.1.9.42/cvs/Linux x86_64
Diffstat (limited to 'net-misc/tor')
-rw-r--r--net-misc/tor/ChangeLog6
-rw-r--r--net-misc/tor/Manifest12
-rw-r--r--net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch22
3 files changed, 30 insertions, 10 deletions
diff --git a/net-misc/tor/ChangeLog b/net-misc/tor/ChangeLog
index 8b435821b55e..fbc1d11b730e 100644
--- a/net-misc/tor/ChangeLog
+++ b/net-misc/tor/ChangeLog
@@ -1,6 +1,10 @@
# 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.246 2011/03/25 03:02:12 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tor/ChangeLog,v 1.247 2011/03/28 00:23:11 blueness Exp $
+
+ 28 Mar 2011; Anthony G. Basile <blueness@gentoo.org>
+ files/tor-0.2.2.23_alpha-respect-CFLAGS.patch:
+ Improved fix to build system, see bug #360765
*tor-0.2.2.23_alpha-r1 (25 Mar 2011)
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index bfb703ddab1a..c5dcb5984787 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX tor-0.2.1.19-logrotate.patch 746 RMD160 34ae926877e1b388c5e1c3cf0a16feba8b3f010b SHA1 3df06da077694b2312cc33a76db4a9e27a602d78 SHA256 60370cb70e089f4e675f39610c651537d0df5e5d1066c36417f479738549bec3
-AUX tor-0.2.2.23_alpha-respect-CFLAGS.patch 981 RMD160 3143afbb42e96aea50dd694ca4f89eefad6779b3 SHA1 c1ef8d7888b5961bfcda7369d3a59d868c9731f8 SHA256 fc754324ff535bbe7e0e09b4a016b726d3dcfd3bb7d7004a3b527012a272fe02
+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
@@ -15,12 +15,12 @@ EBUILD tor-0.2.1.29.ebuild 2505 RMD160 1fa43d7e06fbc0d6d4ebe1a3896c2989016ac54c
EBUILD tor-0.2.1.30.ebuild 2646 RMD160 bf549834e3cd4074be8a07c303736b5ba65b4ace SHA1 917d6ce04d6924fcaa7b82d162e73e09d310ac17 SHA256 6433f81f7b5c5bed9026ac82931886a4aabce536ada12a17144f452b57b9e5ae
EBUILD tor-0.2.2.23_alpha-r1.ebuild 2377 RMD160 1eb54ceefe1e73be6c13d34bda3a7fdf155cb45b SHA1 1a09a2df9db3cee84764d453ba2fb9355afcd633 SHA256 6d55474eed5799c58d47e5cebc396adfd8f33a8b950eee9b2e0d6b6090b3654d
EBUILD tor-0.2.2.23_alpha.ebuild 1992 RMD160 d766b164fb96a7502251ccc164b3ed0f3c2b62e6 SHA1 63d6897c6c20cab300a5fc10f26ed7c3d1b7e33d SHA256 d9439def845446bcdca10965302aeb8177d2728394e4674a30c152d2eeae579f
-MISC ChangeLog 35374 RMD160 3f30bcfe06872f3fc501d853d1e5f552a77c27a1 SHA1 368a088615e40e095190f836cc302047875eae9c SHA256 ba568bdc4de3402a5ad0ae2c2ae67f5c16746f9cf49cab982fb4784fcaebc9e6
+MISC ChangeLog 35527 RMD160 1b3fab0e4b51a3b7ee697834c012e8d7da0558e3 SHA1 e1ca03f1a7be4b754e4be1c5d22bd94f587b6747 SHA256 97aeb2e80a727159834863fe3c414567c600dcd10c88ccea7af73b8e2f6a4994
MISC metadata.xml 363 RMD160 b21bb38c95a109d36b252b8e48b9c6724f75721c SHA1 6354a0d53fa168ddcd650f87872124f1edb345ef SHA256 650857d8f3d615ee0d0bcdb3d600d98eb58bae0d98c021dc6ff5ec774d77a142
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2MBb4ACgkQl5yvQNBFVTX4/gCgjG/gx1kmLKMEPunuz7QzS8x2
-1AgAnRlP0kF3WOkJb1Z7mHGKGVo83air
-=R1Bo
+iEYEAREIAAYFAk2P1PkACgkQl5yvQNBFVTVrFACgpAxRpCi4VUl8XyIznuwoN/+E
+pncAn0/t/pTwWIpqSDY/2FJqeVHAU232
+=ZiYu
-----END PGP SIGNATURE-----
diff --git a/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch b/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
index 0ca78a815167..a762e2f4d394 100644
--- a/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
+++ b/net-misc/tor/files/tor-0.2.2.23_alpha-respect-CFLAGS.patch
@@ -1,17 +1,33 @@
diff -Naur tor-0.2.2.23-alpha.orig/configure.in tor-0.2.2.23-alpha/configure.in
--- tor-0.2.2.23-alpha.orig/configure.in 2011-03-08 18:38:16.000000000 -0500
-+++ tor-0.2.2.23-alpha/configure.in 2011-03-24 19:09:33.000000000 -0400
-@@ -9,6 +9,9 @@
++++ tor-0.2.2.23-alpha/configure.in 2011-03-27 19:53:55.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"
-@@ -945,6 +948,8 @@
+@@ -865,12 +870,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
+@@ -945,6 +949,8 @@
CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"