# # # rename "netxx/probe_impl.h" # to "netxx/netxx/probe_impl.h" # # rename "netxx/socket.h" # to "netxx/netxx/socket.h" # # patch "monotone/Makefile.am" # from [4b74e4730af430229c5692f09d1d34c4c1b6eec1] # to [467c9f2b963ec04fe5c0d9e2bc84d3246131bd2f] # # patch "monotone/charset.cc" # from [def75cc4314c266b06bc44652c52367b82a9ad3a] # to [663cee67c071fd58bbfc82272beccca8958ec124] # # patch "monotone/configure.ac" # from [cd1e42d9f2fba6f0bd8e9e77ae5da915905a8361] # to [3c7e363be60bc7937ffd4707fd34547c7a88c8b8] # # patch "monotone/database.cc" # from [0e55fc85ea2dfec7e34ed8de385881c60ea4316f] # to [87eb7415b0d059666dd56c70cda48a2bfb947082] # # patch "monotone/schema_migration.cc" # from [e12c30bd63024372cfa3ac533a2261272374b180] # to [923af273d88aaa5e3289a0dc3e757b54504a0609] # # patch "monotone/unix/ssh_agent_platform.hh" # from [4f48ace4c0cb407ccfdfa2a149b080717f135a3b] # to [f4905305f1277953aabfe401d6d89c1b17b87d4f] # # patch "monotone/unix/tester-check-net.c" # from [bb758c2b16c6a1978a5a96f4ddd204b6feac6e37] # to [7d43a61f0cfabaf5288747a07833628d15aa1c5a] # # patch "netxx/Makefile.am" # from [2394a740f6a1c6fe4565c5290eeee758e2acbc70] # to [64edb564edac2d96dc8b1713c71cf3f022d6c8bd] # # patch "netxx/accept.cxx" # from [61ab2bb4c059529f3d29e6793844ea4ca6cea464] # to [1a6c58f016129037e23bda6f761ca1b49199297b] # # patch "netxx/datagram.cxx" # from [cb81586c446b5d395cf2bfe216a2023c374e02ba] # to [dc955d26c7055fbb767c057b697cb4a11b6cc27a] # # patch "netxx/datagramserver.cxx" # from [00dfd5b4c42d0f5568ebc216ae4202e441b057e1] # to [8b02e9441ddd4b73759553f02105d75a79263aa0] # # patch "netxx/probe.cxx" # from [9fcd8e6d98293d2141317f7444683e3d1226aaeb] # to [917e700f06e2a92e0daea68cef842f3b753e07af] # # patch "netxx/probe_select.cxx" # from [02f768a044bd21d516b19b230e46c6a8f2a704ec] # to [5f45b6ecd6cc8f16b06a1b3f23267bdac53fd319] # # patch "netxx/recvfrom.h" # from [48530cf07adb935134178cf44b6bf1640cc5f855] # to [2e54d11976f5549dc72d95b06d43e5b30eb2202f] # # patch "netxx/serverbase.cxx" # from [601bf254688ae70030b4d21fd48dbda7673a0410] # to [3576358d34cde7833acd4fd98ce49950e806845b] # # patch "netxx/serverbase.h" # from [cc105770de1a33531d9c6ae31d34368ea3085117] # to [015543d69f1d9b91d080a3662f94ec6e73896d10] # # patch "netxx/sockaddr.h" # from [2f123a08f0a2bbba15a921709c9e8fed84e7c1f7] # to [146a70bda02b5b338cf7ed715de3337699cb5a5d] # # patch "netxx/socket.cxx" # from [b6525dbe4fba6d50fb4831ae54950ee3f9e9d991] # to [4c67db78f60e78acadbda8493d53c41e056789ff] # # patch "netxx/stream.cxx" # from [27e887a773618acd5196b6311b3dcbcfe24b67bb] # to [8d0d7a85e20d0bc013ab85b5ebbb938ce5665e72] # # patch "netxx/streambase.cxx" # from [ff108a2ac000dd3d662248ed8fab89e3c7ebd7c4] # to [6556d2d09642151d80ed6df476b2f89380980d48] # # patch "netxx/streamserver.cxx" # from [7421c6078a24a4d3818fe748f908a4c6b01b1fd3] # to [a58066c717467df3c017290592ff73a84bc51e64] # ============================================================ --- monotone/Makefile.am 4b74e4730af430229c5692f09d1d34c4c1b6eec1 +++ monotone/Makefile.am 467c9f2b963ec04fe5c0d9e2bc84d3246131bd2f @@ -119,22 +119,19 @@ UNIT_TEST_OBJ_SUPPORT = \ # testing, but can be used "as is" from the main build. (many of # these _should_ have unit tests, but they haven't been written yet.) UNIT_TEST_OBJ_SUPPORT = \ - mtn-app_state.$(OBJEXT) mtn-cert.$(OBJEXT) \ - mtn-constants.$(OBJEXT) mtn-database.$(OBJEXT) \ - mtn-epoch.$(OBJEXT) mtn-file_io.$(OBJEXT) mtn-gzip.$(OBJEXT) \ - mtn-hmac.$(OBJEXT) mtn-inodeprint.$(OBJEXT) \ - mtn-key_store.$(OBJEXT) mtn-keys.$(OBJEXT) mtn-lcs.$(OBJEXT) \ - mtn-legacy.$(OBJEXT) mtn-lua.$(OBJEXT) mtn-lua_hooks.$(OBJEXT) \ - mtn-merkle_tree.$(OBJEXT) mtn-mt_version.$(OBJEXT) \ - mtn-mtn-sanity.$(OBJEXT) mtn-options.$(OBJEXT) \ - mtn-package_full_revision.$(OBJEXT) \ - mtn-package_revision.$(OBJEXT) mtn-pcrewrap.$(OBJEXT) \ - mtn-project.$(OBJEXT) mtn-randomizer.$(OBJEXT) \ - mtn-sanity.$(OBJEXT) mtn-schema.$(OBJEXT) \ - mtn-schema_migration.$(OBJEXT) \ - mtn-specialized_lexical_cast.$(OBJEXT) mtn-ssh_agent.$(OBJEXT) \ - mtn-std_hooks.$(OBJEXT) mtn-ui.$(OBJEXT) mtn-work.$(OBJEXT) \ - mtn-work_migration.$(OBJEXT) + app_state.$(OBJEXT) cert.$(OBJEXT) constants.$(OBJEXT) \ + database.$(OBJEXT) epoch.$(OBJEXT) file_io.$(OBJEXT) \ + gzip.$(OBJEXT) hmac.$(OBJEXT) inodeprint.$(OBJEXT) \ + key_store.$(OBJEXT) keys.$(OBJEXT) lcs.$(OBJEXT) \ + legacy.$(OBJEXT) lua.$(OBJEXT) lua_hooks.$(OBJEXT) \ + merkle_tree.$(OBJEXT) mt_version.$(OBJEXT) \ + mtn-sanity.$(OBJEXT) options.$(OBJEXT) \ + package_full_revision.$(OBJEXT) package_revision.$(OBJEXT) \ + pcrewrap.$(OBJEXT) project.$(OBJEXT) randomizer.$(OBJEXT) \ + sanity.$(OBJEXT) schema.$(OBJEXT) schema_migration.$(OBJEXT) \ + specialized_lexical_cast.$(OBJEXT) ssh_agent.$(OBJEXT) \ + std_hooks.$(OBJEXT) ui.$(OBJEXT) work.$(OBJEXT) \ + work_migration.$(OBJEXT) # primaries bin_PROGRAMS = mtn @@ -182,6 +179,7 @@ SUBDIRS = po # i18n SUBDIRS = po +unix/fs.o : CPPFLAGS += -DLOCALEDIR=\"$(localedir)\" # testsuite stuff (could this possibly be more ugly?) To get # parallelism, we cannot use Automake's TESTS feature at all. @@ -204,7 +202,7 @@ check-local: tester_tests.status unit_te check-local: tester_tests.status unit_tests.status lua_tests.status PACKAGE_BUGREPORT=$(PACKAGE_BUGREPORT) \ - $(SHELL) util/summarize-tests $^ + $(SHELL) $(srcdir)/util/summarize-tests $^ # We want the tests re-run even if the .status files already exist. # .PHONY does not work for that (bad interaction with pattern rules), ============================================================ --- monotone/charset.cc def75cc4314c266b06bc44652c52367b82a9ad3a +++ monotone/charset.cc 663cee67c071fd58bbfc82272beccca8958ec124 @@ -11,10 +11,9 @@ #include "vector.hh" #include +#include +#include -#include "idna/idna.h" -#include "idna/stringprep.h" - #include "charset.hh" #include "numeric_vocab.hh" #include "sanity.hh" @@ -48,10 +47,20 @@ charset_convert(string const & src_chars dst = src; else { + char const * dst_charset_c; +#ifdef ICONV_TRANSLIT + string dst_charset_tl; + if (best_effort) + { + dst_charset_tl = dst_charset + "//TRANSLIT"; + dst_charset_c = dst_charset_tl.c_str(); + } + else +#endif + dst_charset_c = dst_charset.c_str(); char * converted = stringprep_convert(src.c_str(), - dst_charset.c_str(), - src_charset.c_str(), - best_effort); + dst_charset_c, + src_charset.c_str()); E(converted != NULL, F("failed to convert string from %s to %s: '%s'") % src_charset % dst_charset % src); ============================================================ --- monotone/configure.ac cd1e42d9f2fba6f0bd8e9e77ae5da915905a8361 +++ monotone/configure.ac 3c7e363be60bc7937ffd4707fd34547c7a88c8b8 @@ -137,7 +137,7 @@ AC_CHECK_FUNCS([atexit memset mkstemp st AC_FUNC_ICONV_TRANSLIT AC_CHECK_FUNCS([atexit memset mkstemp strptime lrint \ __cxa_current_exception_type __cxa_demangle \ - putenv setenv unsetenv dirfd fstatat mkdtemp]) + putenv setenv unsetenv dirfd fstatat mkdtemp socket]) # Stick some logic into config.status, after the logic that ============================================================ --- monotone/database.cc 0e55fc85ea2dfec7e34ed8de385881c60ea4316f +++ monotone/database.cc 87eb7415b0d059666dd56c70cda48a2bfb947082 @@ -22,7 +22,7 @@ #include #include "lexical_cast.hh" -#include "sqlite/sqlite3.h" +#include #include "app_state.hh" #include "cert.hh" ============================================================ --- monotone/schema_migration.cc e12c30bd63024372cfa3ac533a2261272374b180 +++ monotone/schema_migration.cc 923af273d88aaa5e3289a0dc3e757b54504a0609 @@ -10,7 +10,7 @@ #include "base.hh" #include #include "lexical_cast.hh" -#include "sqlite/sqlite3.h" +#include #include #include "sanity.hh" ============================================================ --- monotone/unix/ssh_agent_platform.hh 4f48ace4c0cb407ccfdfa2a149b080717f135a3b +++ monotone/unix/ssh_agent_platform.hh f4905305f1277953aabfe401d6d89c1b17b87d4f @@ -8,7 +8,7 @@ // PURPOSE. #include "../numeric_vocab.hh" -#include "../netxx/stream.h" +#include class ssh_agent_platform { private: ============================================================ --- monotone/unix/tester-check-net.c bb758c2b16c6a1978a5a96f4ddd204b6feac6e37 +++ monotone/unix/tester-check-net.c 7d43a61f0cfabaf5288747a07833628d15aa1c5a @@ -16,9 +16,9 @@ will exit unsuccessfully and produce diagnostics on stderr. */ #include "config.h" +#include #if defined HAVE_SOCKET && defined HAVE_NETINET_IN_H -#include #include #include #include ============================================================ --- netxx/Makefile.am 2394a740f6a1c6fe4565c5290eeee758e2acbc70 +++ netxx/Makefile.am 64edb564edac2d96dc8b1713c71cf3f022d6c8bd @@ -1,17 +1,18 @@ nobase_include_HEADERS = \ lib_LIBRARIES = libnetxx.a nobase_include_HEADERS = \ netxx/address.h netxx/datagram.h netxx/datagramserver.h \ - netxx/netbuf.h netxx/peer.h netxx/probe.h netxx/probeinfo.h \ - netxx/sockopt.h netxx/streambase.h netxx/stream.h \ - netxx/streamserver.h netxx/timeout.h netxx/types.h + netxx/netbuf.h netxx/peer.h netxx/probe.h netxx/probe_impl.h \ + netxx/probeinfo.h netxx/socket.h netxx/sockopt.h \ + netxx/streambase.h netxx/stream.h netxx/streamserver.h \ + netxx/timeout.h netxx/types.h libnetxx_a_SOURCES = \ accept.cxx address.cxx datagram.cxx datagramserver.cxx \ osutil.cxx peer.cxx probe.cxx probe_select.cxx recvfrom.cxx \ serverbase.cxx sockaddr.cxx socket.cxx sockopt.cxx stream.cxx \ streambase.cxx streamserver.cxx \ - accept.h common.h compat.h osutil.h probe_impl.h recvfrom.h \ - resolve.h serverbase.h sockaddr.h socket.h + accept.h common.h compat.h osutil.h recvfrom.h resolve.h \ + serverbase.h sockaddr.h # conditionally included EXTRA_libnetxx_a_SOURCES = \ ============================================================ --- netxx/accept.cxx 61ab2bb4c059529f3d29e6793844ea4ca6cea464 +++ netxx/accept.cxx 1a6c58f016129037e23bda6f761ca1b49199297b @@ -42,7 +42,7 @@ #include "netxx/sockopt.h" #include "netxx/types.h" #include "sockaddr.h" -#include "socket.h" +#include "netxx/socket.h" //#################################################################### Netxx::Peer Netxx::call_accept (Socket &socket, bool dont_block) ============================================================ --- netxx/datagram.cxx cb81586c446b5d395cf2bfe216a2023c374e02ba +++ netxx/datagram.cxx dc955d26c7055fbb767c057b697cb4a11b6cc27a @@ -41,7 +41,7 @@ #include "netxx/datagram.h" #include "netxx/address.h" #include "netxx/peer.h" -#include "socket.h" +#include "netxx/socket.h" #include "sockaddr.h" #include "recvfrom.h" ============================================================ --- netxx/datagramserver.cxx 00dfd5b4c42d0f5568ebc216ae4202e441b057e1 +++ netxx/datagramserver.cxx 8b02e9441ddd4b73759553f02105d75a79263aa0 @@ -43,7 +43,7 @@ #include "netxx/address.h" #include "netxx/probeinfo.h" #include "serverbase.h" -#include "socket.h" +#include "netxx/socket.h" #include "recvfrom.h" // standard includes ============================================================ --- netxx/probe.cxx 9fcd8e6d98293d2141317f7444683e3d1226aaeb +++ netxx/probe.cxx 917e700f06e2a92e0daea68cef842f3b753e07af @@ -41,7 +41,7 @@ #include #include #include -#include "probe_impl.h" +#include "netxx/probe_impl.h" // standard includes #include ============================================================ --- netxx/probe_select.cxx 02f768a044bd21d516b19b230e46c6a8f2a704ec +++ netxx/probe_select.cxx 5f45b6ecd6cc8f16b06a1b3f23267bdac53fd319 @@ -42,7 +42,7 @@ #include "common.h" // Netxx includes -#include "probe_impl.h" +#include "netxx/probe_impl.h" #include "netxx/types.h" #include "netxx/timeout.h" ============================================================ --- netxx/recvfrom.h 48530cf07adb935134178cf44b6bf1640cc5f855 +++ netxx/recvfrom.h 2e54d11976f5549dc72d95b06d43e5b30eb2202f @@ -40,7 +40,7 @@ // local includes #include "netxx/types.h" #include "netxx/peer.h" -#include "socket.h" +#include "netxx/socket.h" // standard includes #include ============================================================ --- netxx/serverbase.cxx 601bf254688ae70030b4d21fd48dbda7673a0410 +++ netxx/serverbase.cxx 3576358d34cde7833acd4fd98ce49950e806845b @@ -42,7 +42,7 @@ #include "netxx/address.h" #include "netxx/sockopt.h" #include "netxx/probeinfo.h" -#include "socket.h" +#include "netxx/socket.h" // standard includes #include ============================================================ --- netxx/serverbase.h cc105770de1a33531d9c6ae31d34368ea3085117 +++ netxx/serverbase.h 015543d69f1d9b91d080a3662f94ec6e73896d10 @@ -42,8 +42,8 @@ #include #include #include -#include "socket.h" -#include "probe_impl.h" +#include "netxx/socket.h" +#include "netxx/probe_impl.h" // standard includes #include ============================================================ --- netxx/sockaddr.h 2f123a08f0a2bbba15a921709c9e8fed84e7c1f7 +++ netxx/sockaddr.h 146a70bda02b5b338cf7ed715de3337699cb5a5d @@ -39,7 +39,7 @@ // Netxx includes #include "common.h" -#include "socket.h" +#include "netxx/socket.h" #include "netxx/types.h" namespace Netxx { ============================================================ --- netxx/socket.cxx b6525dbe4fba6d50fb4831ae54950ee3f9e9d991 +++ netxx/socket.cxx 4c67db78f60e78acadbda8493d53c41e056789ff @@ -39,7 +39,7 @@ #include "common.h" // Netxx includes -#include "socket.h" +#include "netxx/socket.h" #include "netxx/timeout.h" // standard includes ============================================================ --- netxx/stream.cxx 27e887a773618acd5196b6311b3dcbcfe24b67bb +++ netxx/stream.cxx 8d0d7a85e20d0bc013ab85b5ebbb938ce5665e72 @@ -40,7 +40,7 @@ // Netxx includes #include "netxx/stream.h" #include "netxx/probeinfo.h" -#include "socket.h" +#include "netxx/socket.h" // standard includes #include ============================================================ --- netxx/streambase.cxx ff108a2ac000dd3d662248ed8fab89e3c7ebd7c4 +++ netxx/streambase.cxx 6556d2d09642151d80ed6df476b2f89380980d48 @@ -44,7 +44,7 @@ #include "netxx/address.h" #include "netxx/peer.h" #include "netxx/types.h" -#include "socket.h" +#include "netxx/socket.h" // standard includes #include ============================================================ --- netxx/streamserver.cxx 7421c6078a24a4d3818fe748f908a4c6b01b1fd3 +++ netxx/streamserver.cxx a58066c717467df3c017290592ff73a84bc51e64 @@ -45,7 +45,7 @@ #include "netxx/types.h" #include "netxx/probeinfo.h" #include "serverbase.h" -#include "socket.h" +#include "netxx/socket.h" #include "accept.h" // standard includes