app-i18n/mozc: Fix server path check.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch
new file mode 100644 (file)
index 0000000..dd606e2
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch
@@ -0,0 +1,95 @@
+https://github.com/google/mozc/issues/471
+
+--- /src/ipc/ipc_path_manager.cc
++++ /src/ipc/ipc_path_manager.cc
+@@ -332,9 +332,21 @@
+     return false;
+   }
+ 
++  // Expand symbolic links in the expected server path to avoid false negatives
++  // during comparisons of the expected server path and the actual server path.
++  string real_server_path = server_path;
++#ifndef OS_WIN
++  char real_server_path_[PATH_MAX];
++  if (realpath(server_path.c_str(), real_server_path_) == NULL) {
++    LOG(ERROR) << "realpath failed: " << strerror(errno);
++    return false;
++  }
++  real_server_path = real_server_path_;
++#endif
++
+   // compare path name
+   if (pid == server_pid_) {
+-    return (server_path == server_path_);
++    return (real_server_path == server_path_);
+   }
+ 
+   server_pid_ = 0;
+@@ -344,17 +356,17 @@
+   {
+     std::wstring expected_server_ntpath;
+     const std::map<string, std::wstring>::const_iterator it =
+-        expected_server_ntpath_cache_.find(server_path);
++        expected_server_ntpath_cache_.find(real_server_path);
+     if (it != expected_server_ntpath_cache_.end()) {
+       expected_server_ntpath = it->second;
+     } else {
+       std::wstring wide_server_path;
+-      Util::UTF8ToWide(server_path, &wide_server_path);
++      Util::UTF8ToWide(real_server_path, &wide_server_path);
+       if (WinUtil::GetNtPath(wide_server_path, &expected_server_ntpath)) {
+-        // Caches the relationship from |server_path| to
+-        // |expected_server_ntpath| in case |server_path| is renamed later.
++        // Caches the relationship from |real_server_path| to
++        // |expected_server_ntpath| in case |real_server_path| is renamed later.
+         // (This can happen during the updating).
+-        expected_server_ntpath_cache_[server_path] = expected_server_ntpath;
++        expected_server_ntpath_cache_[real_server_path] = expected_server_ntpath;
+       }
+     }
+ 
+@@ -371,9 +383,9 @@
+       return false;
+     }
+ 
+-    // Here we can safely assume that |server_path| (expected one) should be
++    // Here we can safely assume that |real_server_path| (expected one) should be
+     // the same to |server_path_| (actual one).
+-    server_path_ = server_path;
++    server_path_ = real_server_path;
+     server_pid_ = pid;
+   }
+ #endif  // OS_WIN
+@@ -399,7 +411,7 @@
+ #ifdef OS_LINUX
+   // load from /proc/<pid>/exe
+   char proc[128];
+-  char filename[512];
++  char filename[PATH_MAX];
+   snprintf(proc, sizeof(proc) - 1, "/proc/%u/exe", pid);
+   const ssize_t size = readlink(proc, filename, sizeof(filename) - 1);
+   if (size == -1) {
+@@ -412,18 +424,18 @@
+   server_pid_ = pid;
+ #endif  // OS_LINUX
+ 
+-  VLOG(1) << "server path: " << server_path << " " << server_path_;
+-  if (server_path == server_path_) {
++  VLOG(1) << "server path: " << real_server_path << " " << server_path_;
++  if (real_server_path == server_path_) {
+     return true;
+   }
+ 
+ #ifdef OS_LINUX
+-  if ((server_path + " (deleted)") == server_path_) {
+-    LOG(WARNING) << server_path << " on disk is modified";
++  if ((real_server_path + " (deleted)") == server_path_) {
++    LOG(WARNING) << real_server_path << " on disk is modified";
+     // If a user updates the server binary on disk during the server is running,
+     // "readlink /proc/<pid>/exe" returns a path with the " (deleted)" suffix.
+     // We allow the special case.
+-    server_path_ = server_path;
++    server_path_ = real_server_path;
+     return true;
+   }
+ #endif  // OS_LINUX

diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index f2300b603247654903ea9f592cc5dabac151d9f4..425b785cbfabceb387c3399cd6966f437b4b0b8c 100644 (file)
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -110,6 +110,7 @@ src_prepare() {
        eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
        eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch"
        eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
+       eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-server_path_check.patch"
        eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
        eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
 

diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index f1d9151c265090b660731ef59d3917229f32a2cf..d7c66b558d92df1a671aa701f4c7eff41b3032f4 100644 (file)
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -110,6 +110,7 @@ src_prepare() {
        eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
        eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch"
        eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
+       eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-server_path_check.patch"
        eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
        eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"