From e254d5c83f3f4b3805e2085bf39b3056a3ca9a36 Mon Sep 17 00:00:00 2001 From: "Vladimir.Marek" Date: Fri, 16 Aug 2013 16:38:14 +0200 Subject: [PATCH] [PATCH 1/4] getpwuid: check for standards compliance (Solaris support) --- 90/8fb94462540a3ddfab1b29b83ef39355db6aca | 168 ++++++++++++++++++++++ 1 file changed, 168 insertions(+) create mode 100644 90/8fb94462540a3ddfab1b29b83ef39355db6aca diff --git a/90/8fb94462540a3ddfab1b29b83ef39355db6aca b/90/8fb94462540a3ddfab1b29b83ef39355db6aca new file mode 100644 index 000000000..272874c67 --- /dev/null +++ b/90/8fb94462540a3ddfab1b29b83ef39355db6aca @@ -0,0 +1,168 @@ +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 478A9429E45 + for ; Fri, 16 Aug 2013 07:38:53 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.299 +X-Spam-Level: +X-Spam-Status: No, score=-2.299 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3, UNPARSEABLE_RELAY=0.001] + 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 f3Wb--pT8dUv for ; + Fri, 16 Aug 2013 07:38:48 -0700 (PDT) +Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 87672431FAF + for ; Fri, 16 Aug 2013 07:38:48 -0700 (PDT) +Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) + by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with + ESMTP id r7GEceL9004881 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Fri, 16 Aug 2013 14:38:41 GMT +Received: from aserz7022.oracle.com (aserz7022.oracle.com [141.146.126.231]) + by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id + r7GEcc7O005774 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); + Fri, 16 Aug 2013 14:38:38 GMT +Received: from abhmt119.oracle.com (abhmt119.oracle.com [141.146.116.71]) + by aserz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id + r7GEcccS029689; Fri, 16 Aug 2013 14:38:38 GMT +Received: from tbd.cz.oracle.com (/10.163.101.124) + by default (Oracle Beehive Gateway v4.0) + with ESMTP ; Fri, 16 Aug 2013 07:38:37 -0700 +From: Vladimir.Marek@oracle.com +To: notmuch@notmuchmail.org +Subject: [PATCH 1/4] getpwuid: check for standards compliance (Solaris + support) +Date: Fri, 16 Aug 2013 16:38:14 +0200 +Message-Id: <1376663897-24385-2-git-send-email-Vladimir.Marek@oracle.com> +X-Mailer: git-send-email 1.7.9.2 +In-Reply-To: <1376663897-24385-1-git-send-email-Vladimir.Marek@oracle.com> +References: <1376663897-24385-1-git-send-email-Vladimir.Marek@oracle.com> +X-Source-IP: acsinet21.oracle.com [141.146.126.237] +Cc: Vladimir Marek +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: Fri, 16 Aug 2013 14:38:53 -0000 + +From: Blake Jones + +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. + +Signed-off-by: Vladimir Marek +--- + 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..c1ee0f9 100644 +--- a/compat/compat.h ++++ b/compat/compat.h +@@ -30,6 +30,10 @@ + extern "C" { + #endif + ++#if !STD_GETPWUID ++#define _POSIX_PTHREAD_SEMANTICS 1 ++#endif ++ + #if !HAVE_GETLINE + #include + #include +diff --git a/configure b/configure +index 3ba1ec3..b5465e4 100755 +--- a/configure ++++ b/configure +@@ -519,6 +519,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... " +@@ -681,6 +692,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} + +@@ -725,10 +741,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.9.2 + -- 2.26.2