[PATCH 03/10] Fix compilation of smtp-dummy on FreeBSD

diff --git a/e9/49b16ef16285eb48be1fa2d6fc7cf7fd6e8645 b/e9/49b16ef16285eb48be1fa2d6fc7cf7fd6e8645
new file mode 100644 (file)
index 0000000..ae60964
--- /dev/null
+++ b/e9/49b16ef16285eb48be1fa2d6fc7cf7fd6e8645
@@ -0,0 +1,94 @@
+Return-Path: <pioto@pioto.org>\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 4D6F2431FC9\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:43:53 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 WroFUyJtPYBa for <notmuch@notmuchmail.org>;\r
+       Fri, 25 May 2012 06:43:53 -0700 (PDT)\r
+Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com\r
+       [209.85.220.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E5C93431FC0\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:43:52 -0700 (PDT)\r
+Received: by mail-vc0-f181.google.com with SMTP id f1so727472vcb.26\r
+       for <notmuch@notmuchmail.org>; Fri, 25 May 2012 06:43:52 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :x-gm-message-state;\r
+       bh=DmfSVQ2dSAKVi3FNMdMTUj7BhHG6Zljmiokf1W9iDu4=;\r
+       b=Hbx/ZRJeU4OBsh/08kdYAIxA3dKqzBl+kIqrwwMMMNdJXjY9VMd0xYkQBpcOHP2qNT\r
+       jPRacClWPNYPt8nuEJa6onfw344Y3JSSB2MJqP846vPwWASbta9GVzplJooTQFdGxLib\r
+       Cf2KaL4iqYaWtFC2ZM87bkJxruVTziZjNLNsljcCJoJuI8sSVu2nR48g5XaROqsU/D/V\r
+       poTk/Gukc6U3vm8+4j2Dy01cYJgW+iyYVdlM7NxU1PJE4QiJXomopSFJvJSfCguF5MZ/\r
+       hSXCUKjTH/ty4xNutEVl2cWLiAN1v86HU4XpOh4DWw4xfM62v+ou1sYtbfDDhjIz6atN\r
+       V97g==\r
+Received: by 10.52.95.110 with SMTP id dj14mr3107634vdb.69.1337953432618;\r
+       Fri, 25 May 2012 06:43:52 -0700 (PDT)\r
+Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net.\r
+       [71.182.155.97])\r
+       by mx.google.com with ESMTPS id c17sm4240559vdj.11.2012.05.25.06.43.51\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 25 May 2012 06:43:52 -0700 (PDT)\r
+Received: by nas.home.pioto.org (Postfix, from userid 1001)\r
+       id 60303287C9; Fri, 25 May 2012 09:43:51 -0400 (EDT)\r
+From: Mike Kelly <pioto@pioto.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 03/10] Fix compilation of smtp-dummy on FreeBSD\r
+Date: Fri, 25 May 2012 09:43:24 -0400\r
+Message-Id: <1337953411-21000-4-git-send-email-pioto@pioto.org>\r
+X-Mailer: git-send-email 1.7.10.2\r
+In-Reply-To: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
+References: <1337953411-21000-1-git-send-email-pioto@pioto.org>\r
+X-Gm-Message-State:\r
+ ALoCoQlcOTxIc2Mx5r7HNMEJoude/pmR++DbFYb3MfEMUyPTDjRZ1Tt6jUEQx+wxCFkMXG6Rn+H7\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: Fri, 25 May 2012 13:43:53 -0000\r
+\r
+---\r
+ test/smtp-dummy.c |    5 ++++-\r
+ 1 file changed, 4 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/test/smtp-dummy.c b/test/smtp-dummy.c\r
+index 3801a5e..aa82fa1 100644\r
+--- a/test/smtp-dummy.c\r
++++ b/test/smtp-dummy.c\r
+@@ -33,11 +33,14 @@\r
+  * have been warned.\r
+  */\r
+ \r
++#define _GNU_SOURCE /* for getline */\r
+ #include <stdio.h>\r
+ #include <stdlib.h>\r
+ #include <string.h>\r
+ #include <errno.h>\r
+-#include <netinet/ip.h>\r
++#include <sys/types.h>\r
++#include <sys/socket.h>\r
++#include <netinet/in.h>\r
+ #include <netdb.h>\r
+ #include <unistd.h>\r
+ \r
+-- \r
+1.7.10.2\r
+\r