From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Feb 2013 05:57:27 +0000 (-0800)
Subject: Sync with v1.8.1.4
X-Git-Tag: v1.8.2-rc1~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3600c36286517cda38df976946557ce3e87bd82;p=thirdparty%2Fgit.git

Sync with v1.8.1.4
---

b3600c36286517cda38df976946557ce3e87bd82
diff --cc imap-send.c
index 21dc20b57d,ef500111ec..43ac4e0bdf
--- a/imap-send.c
+++ b/imap-send.c
@@@ -31,8 -31,50 +31,9 @@@ typedef void *SSL
  #else
  #include <openssl/evp.h>
  #include <openssl/hmac.h>
+ #include <openssl/x509v3.h>
  #endif
  
 -struct store_conf {
 -	char *name;
 -	const char *path; /* should this be here? its interpretation is driver-specific */
 -	char *map_inbox;
 -	char *trash;
 -	unsigned max_size; /* off_t is overkill */
 -	unsigned trash_remote_new:1, trash_only_new:1;
 -};
 -
 -/* For message->status */
 -#define M_RECENT       (1<<0) /* unsyncable flag; maildir_* depend on this being 1<<0 */
 -#define M_DEAD         (1<<1) /* expunged */
 -#define M_FLAGS        (1<<2) /* flags fetched */
 -
 -struct message {
 -	struct message *next;
 -	size_t size; /* zero implies "not fetched" */
 -	int uid;
 -	unsigned char flags, status;
 -};
 -
 -struct store {
 -	struct store_conf *conf; /* foreign */
 -
 -	/* currently open mailbox */
 -	const char *name; /* foreign! maybe preset? */
 -	char *path; /* own */
 -	struct message *msgs; /* own */
 -	int uidvalidity;
 -	unsigned char opts; /* maybe preset? */
 -	/* note that the following do _not_ reflect stats from msgs, but mailbox totals */
 -	int count; /* # of messages */
 -	int recent; /* # of recent messages - don't trust this beyond the initial read */
 -};
 -
 -struct msg_data {
 -	char *data;
 -	int len;
 -	unsigned char flags;
 -};
 -
  static const char imap_send_usage[] = "git imap-send < <mbox>";
  
  #undef DRV_OK