Patch: Build failures on 0.2.0.28rc BSD
Hi.
This patch fixes some build failures on: FreeBSD RELENG_4, gcc version 2.95.4 20020320 [FreeBSD] warning: preprocessing directive not recognized within macro arg Please modify patch as needed and apply if appropriate.
Also, 'make install' rebuilds tor_main.Po, tor_main.o and tor. This should not happen when called as: 'make ; make install' because 'make' already made them. 'make install' should just pick up and install all the previously built bits from the build hierarchy.
Lastly, when registering on this bugtracker, the registration link sent in the registration mail is not https. As with the rest of the site, it should be as well.
Thanks [for Tor too].
======================================================== --- ./src/or/config.c.orig Wed Jun 11 07:09:55 2008 +++ ./src/or/config.c Sun Jun 15 18:54:54 2008 @@ -198,13 +198,12 @@ V(FetchServerDescriptors, BOOL, "1"), V(FetchHidServDescriptors, BOOL, "1"), V(FetchUselessDescriptors, BOOL, "0"),
- V(GeoIPFile, STRING, #ifdef WIN32
- ""
- V(GeoIPFile, STRING, ""), #else
- SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"
- V(GeoIPFile, STRING,
- SHARE_DATADIR PATH_SEPARATOR "tor" PATH_SEPARATOR "geoip"),
#endif
-),
V(Group, STRING, NULL),
V(HardwareAccel, BOOL, "0"),
V(HashedControlPassword, LINELIST, NULL),
--- ./src/or/routerlist.c.orig Fri Jun 13 00:18:28 2008
+++ ./src/or/routerlist.c Sun Jun 15 18:57:30 2008
@@ -4391,8 +4391,8 @@
r->cache_info.signed_descriptor_digest);
tor_assert(&(r->cache_info) == sd2);
tor_assert(r->cache_info.routerlist_index == r_sl_idx);
-#if 0
/* XXXX021.
+#if 0
*
- Hoo boy. We need to fix this one, and the fix is a bit tricky, so
- commenting this out is just a band-aid. @@ -4409,13 +4409,13 @@
- reset our retry count for an extrainfo, but that's not the end
- of the world. Changing the representation in 0.2.0.x would just
- destabilize the codebase.
-
*/
-
*/
- /* XXXX021 see above. #if 0
- /* XXXX021 see above. */ if (!tor_digest_is_zero(sd->extra_info_digest)) { signed_descriptor_t sd3 = sdmap_get(rl->desc_by_eid_map, sd->extra_info_digest); tor_assert(sd3 == sd); } #endif +/ });
RIMAP_FOREACH(rl->identity_map, d, r) {
[Automatically added by flyspray2trac: Operating System: BSD]