[PATCH 1/2] build: add canonicalize_file_name to symbols exported from libnotmuch.so

diff --git a/55/03fd9210579280394ec8dc597711dc81bd4c93 b/55/03fd9210579280394ec8dc597711dc81bd4c93
new file mode 100644 (file)
index 0000000..a9d5b13
--- /dev/null
+++ b/55/03fd9210579280394ec8dc597711dc81bd4c93
@@ -0,0 +1,69 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id AF6E5431FC3\r
+       for <notmuch@notmuchmail.org>; Wed,  9 Apr 2014 04:24:23 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id UEpueR-Sveyd for <notmuch@notmuchmail.org>;\r
+       Wed,  9 Apr 2014 04:24:18 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 42690431FC0\r
+       for <notmuch@notmuchmail.org>; Wed,  9 Apr 2014 04:24:18 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WXqc2-0000aX-P1; Wed, 09 Apr 2014 08:24:14 -0300\r
+Received: (nullmailer pid 11013 invoked by uid 1000); Wed, 09 Apr 2014\r
+       11:24:11 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] build: add canonicalize_file_name to symbols exported\r
+       from libnotmuch.so\r
+Date: Wed,  9 Apr 2014 08:24:02 -0300\r
+Message-Id: <1397042643-10975-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.9.0\r
+In-Reply-To: <87r4586p7m.fsf@zancas.localnet>\r
+References: <87r4586p7m.fsf@zancas.localnet>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 09 Apr 2014 11:24:24 -0000\r
+\r
+This is needed for our compat version of canonicalize_file_name to be used.\r
+---\r
+ lib/gen-version-script.sh | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh\r
+index 76670d5..64a7374 100644\r
+--- a/lib/gen-version-script.sh\r
++++ b/lib/gen-version-script.sh\r
+@@ -23,6 +23,6 @@ while read sym; do\r
+           ;;\r
+     esac\r
+ done\r
+-nm $* | awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $2 == "T" && $3 ~ "^get(line|delim)$" {print $3 ";"}'\r
++nm $* | awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $2 == "T" && $3 ~ "^(getline|getdelim|canonicalize_file_name)$" {print $3 ";"}'\r
+ sed  -n 's/^[[:space:]]*\(notmuch_[a-z_]*\)[[:space:]]*(.*/ \1;/p' $HEADER\r
+ printf "local: *;\n};\n"\r
+-- \r
+1.9.0\r
+\r