From 496d018bb5d52a09dc1cb67fdb7e7c74db19d9c9 Mon Sep 17 00:00:00 2001 From: Blake Jones Date: Wed, 14 Nov 2012 18:09:56 +1600 Subject: [PATCH] [PATCH v3 01/10] getpwuid: check for standards compliance (Solaris support) --- d3/ec96755be6a48a6ade75ab2b304e29c5eb1f0f | 153 ++++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 d3/ec96755be6a48a6ade75ab2b304e29c5eb1f0f diff --git a/d3/ec96755be6a48a6ade75ab2b304e29c5eb1f0f b/d3/ec96755be6a48a6ade75ab2b304e29c5eb1f0f new file mode 100644 index 000000000..03491984e --- /dev/null +++ b/d3/ec96755be6a48a6ade75ab2b304e29c5eb1f0f @@ -0,0 +1,153 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 4F1ED431FBC + for ; Tue, 13 Nov 2012 18:10:12 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id NhTsbD1LKcMs for ; + Tue, 13 Nov 2012 18:10:11 -0800 (PST) +Received: from foo.net (70-36-235-136.dsl.static.sonic.net [70.36.235.136]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 07B74431FBD + for ; Tue, 13 Nov 2012 18:10:10 -0800 (PST) +Received: from foo.net (localhost [127.0.0.1]) + by foo.net (8.14.5+Sun/8.14.5) with ESMTP id qAE2A9tU018889; + Tue, 13 Nov 2012 18:10:09 -0800 (PST) +Received: (from blakej@localhost) + by foo.net (8.14.5+Sun/8.14.5/Submit) id qAE2A9Np018888; + Tue, 13 Nov 2012 18:10:09 -0800 (PST) +From: Blake Jones +To: notmuch@notmuchmail.org +Subject: [PATCH v3 01/10] getpwuid: check for standards compliance (Solaris + support) +Date: Tue, 13 Nov 2012 18:09:56 -0800 +Message-Id: <1352859005-18631-2-git-send-email-blakej@foo.net> +X-Mailer: git-send-email 1.7.3.2 +In-Reply-To: <1352859005-18631-1-git-send-email-blakej@foo.net> +References: <1352859005-18631-1-git-send-email-blakej@foo.net> +X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0.2 + (foo.net [127.0.0.1]); Tue, 13 Nov 2012 18:10:09 -0800 (PST) +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 14 Nov 2012 02:10:12 -0000 + +Add checks to "configure" to see whether _POSIX_PTHREAD_SEMANTICS needs +to be defined to get the right number of arguments in the prototypes for +getpwuid_r(). Solaris' default implementation conforms to POSIX.1c +Draft 6, rather than the final POSIX.1c spec. The standards-compliant +version can be used by defining _POSIX_PTHREAD_SEMANTICS. + +This change also adds the file "compat/check_getpwuid.c", which +configure uses to perform its check, and modifies compat/compat.h to +define _POSIX_PTHREAD_SEMANTICS if configure detected it was needed. +--- + compat/check_getpwuid.c | 11 +++++++++++ + compat/compat.h | 4 ++++ + configure | 23 +++++++++++++++++++++-- + 3 files changed, 36 insertions(+), 2 deletions(-) + create mode 100644 compat/check_getpwuid.c + +diff --git a/compat/check_getpwuid.c b/compat/check_getpwuid.c +new file mode 100644 +index 0000000..c435eb8 +--- /dev/null ++++ b/compat/check_getpwuid.c +@@ -0,0 +1,11 @@ ++#include ++#include ++ ++int main() ++{ ++ struct passwd passwd, *ignored; ++ ++ (void) getpwuid_r (0, &passwd, NULL, 0, &ignored); ++ ++ return (0); ++} +diff --git a/compat/compat.h b/compat/compat.h +index b2e2736..efea023 100644 +--- a/compat/compat.h ++++ b/compat/compat.h +@@ -54,6 +54,10 @@ char* strcasestr(const char *haystack, const char *needle); + #define IGNORE_RESULT(x) x + #endif /* __GNUC__ */ + ++#if !STD_GETPWUID ++#define _POSIX_PTHREAD_SEMANTICS 1 ++#endif ++ + #ifdef __cplusplus + } + #endif +diff --git a/configure b/configure +index ea8a1ad..bb5031e 100755 +--- a/configure ++++ b/configure +@@ -512,6 +512,17 @@ else + fi + rm -f compat/have_strcasestr + ++printf "Checking for standard version of getpwuid_r... " ++if ${CC} -o compat/check_getpwuid "$srcdir"/compat/check_getpwuid.c > /dev/null 2>&1 ++then ++ printf "Yes.\n" ++ std_getpwuid=1 ++else ++ printf "No (will define _POSIX_PTHREAD_SEMANTICS to get it).\n" ++ std_getpwuid=0 ++fi ++rm -f compat/check_getpwuid ++ + printf "int main(void){return 0;}\n" > minimal.c + + printf "Checking for rpath support... " +@@ -671,6 +682,11 @@ HAVE_GETLINE = ${have_getline} + # build its own version) + HAVE_STRCASESTR = ${have_strcasestr} + ++# Whether the getpwuid_r function is standards-compliant ++# (if not, then notmuch will #define _POSIX_PTHREAD_SEMANTICS ++# to enable the standards-compliant version -- needed for Solaris) ++STD_GETPWUID = ${std_getpwuid} ++ + # Supported platforms (so far) are: LINUX, MACOSX, SOLARIS, FREEBSD, OPENBSD + PLATFORM = ${platform} + +@@ -715,10 +731,13 @@ WITH_ZSH = ${WITH_ZSH} + # Combined flags for compiling and linking against all of the above + CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ +- \$(VALGRIND_CFLAGS) -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) ++ \$(VALGRIND_CFLAGS) \\ ++ -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ ++ -DSTD_GETPWUID=\$(STD_GETPWUID) + CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ + \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\ +- -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) ++ -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ ++ -DSTD_GETPWUID=\$(STD_GETPWUID) + CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) + EOF +-- +1.7.3.2 + -- 2.26.2