icedove-libre-16.0.2.1-1: updating version

3 files changed, 9 insertions, 337 deletions

diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 6bd50cd47..f4f6c5c76 100755
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer : Márcio Silva <coadde@adinet.com.uy>
-# Maintainer : André Silva <andre.paulista@adinet.com.uy>
+# Maintainer : Márcio Silva <coadde@lavabit.com>
+# Maintainer : André Silva <emulatorman@lavabit.com>
 
 # We're getting this from Debian Experimental
 _debname=icedove
-_debver=11.0
+_debver=16.0.2
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -28,17 +28,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         mozconfig
         channel-prefs.js
         vendor.js
-        gcc47.patch
-        clrf.patch
         makefile.patch
         ${_pkgname}.desktop)
-md5sums=('0d4aaf892cd1cbf9bda38928947025fe'
-         'd4401c080fe5190e8bb1326f10808231'
+options=(!emptydirs)
+md5sums=('a3724f40d28014acf593528bb8a048f0'
+         '53d62a4841d7989d1f6d1b04929394b4'
          'd6d58d3104a44624e0a3d227cdf1c211'
          '476ec205162340fb0679f522c9d31c3b'
          '4eecc4fc5aafaf0da651a09eadc90bee'
-         '94d5cd599ccc4438f192d8daabf98b6a'
-         'c395d443a8c4c16880c7322bcf174743'
          'c4ed43e85945e180a89cce03e45ec62c'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
 
@@ -61,9 +58,7 @@ build() {
   done
   quilt push -av
 
-  patch -Np1 -i "$srcdir/gcc47.patch"
-  patch -Np1 -i "$srcdir/clrf.patch"
-  patch -Np1 -i "$srcdir/makefile.patch"
+  patch -Np1 -i "$srcdir/makefile.patch" # small fix
 
   cp "${srcdir}/mozconfig" .mozconfig
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
@@ -74,9 +69,9 @@ package() {
 
   make -j1 -f client.mk DESTDIR="${pkgdir}" install
 
-  install -m644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref"
+  install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js"
   # Recommend free addons
-  install -m644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/pref"
+  install -Dm644 "${srcdir}/channel-prefs.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/channel-prefs.js"
 
   for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do
       install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
diff --git a/libre/icedove-libre/clrf.patch b/libre/icedove-libre/clrf.patch
deleted file mode 100755
index 375708ac4..000000000
--- a/libre/icedove-libre/clrf.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-03-12 23:37:12.000000000 -0300
-+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-05-07 12:33:58.517612453 -0300
-@@ -688,7 +688,7 @@
-     PL_strcat(encoding, "{");
-     lengthStr.AppendInt((PRInt32) strlen(value));
-     PL_strcat(encoding, lengthStr.get());
--    PL_strcat(encoding, "}"CRLF);
-+    PL_strcat(encoding, "}" CRLF);
-     PL_strcat(encoding, value);
-     return NS_OK;
-   }
-diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-05-07 12:41:08.003264793 -0300
-@@ -753,7 +753,7 @@
-           }
-         }
-       }
--#define EXTRA_KEYWORD_HDR "                                                                                 "MSG_LINEBREAK
-+#define EXTRA_KEYWORD_HDR "                                                                                 " MSG_LINEBREAK
- 
-        // if status offset isn't in the first block, this code won't work. There's no good reason
-       // for the status offset not to be at the beginning of the message anyway.
-@@ -1203,7 +1203,7 @@
-         // check if there's an envelope header; if not, write one.
-         if (strncmp(m_dataBuffer, "From ", 5))
-         {
--          m_fileStream->Write("From "CRLF, 7, &bytesWritten);
-+          m_fileStream->Write("From " CRLF, 7, &bytesWritten);
-           m_offlineMsgSize += bytesWritten;
-         }
-       }
-diff -Nur comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp	2012-05-07 12:44:43.127347489 -0300
-@@ -1722,7 +1722,7 @@
- {
-   m_sendDone = PR_TRUE;
-   nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
--  SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
-+  SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
-   m_nextState = SMTP_RESPONSE;
-   m_nextStateAfterResponse = SMTP_DONE;
-   return(0);
-@@ -1969,7 +1969,7 @@
-     {
-       nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
-       // send a quit command to close the connection with the server.
--      if (SendData(url, "QUIT"CRLF) == NS_OK)
-+      if (SendData(url, "QUIT" CRLF) == NS_OK)
-       {
-         m_nextState = SMTP_RESPONSE;
-         m_nextStateAfterResponse = SMTP_ERROR_DONE;
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp	2012-05-07 12:48:29.417179064 -0300
-@@ -8298,7 +8298,7 @@
-           bool needMoreData = false;
-           char * newLine = nsnull;
-           PRUint32 numBytesInLine = 0;
--          const char *envelope = "From "CRLF;
-+          const char *envelope = "From " CRLF;
-           offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
-           fileSize += bytesWritten;
-           do
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp	2012-05-07 15:45:58.551202719 -0300
-@@ -1410,7 +1410,7 @@
- {
-   // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
-   nsCAutoString commandBuffer(GetServerCommandTag());
--  commandBuffer.Append(" IDLE"CRLF);
-+  commandBuffer.Append(" IDLE" CRLF);
- 
-   do
-   {
-@@ -3290,7 +3290,7 @@
-     commandString.Append(messageIds);
-     commandString.Append(" (");
-     commandString.Append(attribute);
--    commandString.Append(")"CRLF);
-+    commandString.Append(")" CRLF);
-     nsresult rv = SendData(commandString.get());
- 
-     if (NS_SUCCEEDED(rv))
-@@ -5283,7 +5283,7 @@
- 
-   IncrementCommandTagNumber();
-   nsCAutoString command(GetServerCommandTag());
--  command.Append(" expunge"CRLF);
-+  command.Append(" expunge" CRLF);
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -5359,7 +5359,7 @@
-   command.Append(gAppName);
-   command.Append("\" \"version\" \"");
-   command.Append(gAppVersion);
--  command.Append("\")"CRLF);
-+  command.Append("\")" CRLF);
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -5816,7 +5816,7 @@
-     nsCAutoString correctedPassword;
-     EscapeUserNamePasswordString(password.get(), &correctedPassword);
-     command.Append(correctedPassword);
--    command.Append("\""CRLF);
-+    command.Append("\"" CRLF);
-     rv = SendData(command.get(), PR_TRUE /* suppress logging */);
-     NS_ENSURE_SUCCESS(rv, rv);
-     ParseIMAPandCheckForNewMail();
-@@ -7446,7 +7446,7 @@
-   nsCString command(GetServerCommandTag());
-   command += " create \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if(NS_SUCCEEDED(rv))
-@@ -7549,7 +7549,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " lsub \"\" \"";
-   command += escapedPattern;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   PR_Free(boxnameWithOnlineDirectory);
- 
-@@ -7578,7 +7578,7 @@
-   command += useXLIST ?
-     " xlist \"\" \"" : " list \"\" \"";
-   command += escapedPattern;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   PR_Free(boxnameWithOnlineDirectory);
- 
-@@ -7599,7 +7599,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " subscribe \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -7617,7 +7617,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " unsubscribe \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -7631,7 +7631,7 @@
-   if (m_urlInProgress)
-     return;
-   nsCAutoString command (GetServerCommandTag());
--  command += " IDLE"CRLF;
-+  command += " IDLE" CRLF;
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-   {
-@@ -7658,7 +7658,7 @@
-   nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
-   if (asyncInputStream)
-     asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
--  nsresult rv = SendData("DONE"CRLF);
-+  nsresult rv = SendData("DONE" CRLF);
-   // set a short timeout if we don't want to wait for a response
-   if (m_transport && !waitForResponse)
-     m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
-@@ -7727,8 +7727,8 @@
-   PRUint32 msgsHandled = 0;
-   const char *formatString;
-   formatString = (idsAreUid)
--      ? "%s uid store %s %s"CRLF
--      : "%s store %s %s"CRLF;
-+      ? "%s uid store %s %s" CRLF
-+      : "%s store %s %s" CRLF;
- 
-   do
-   {
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-05-07 12:57:22.050615120 -0300
-@@ -185,7 +185,7 @@
-   
-   NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && 
-     *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
--  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
-+  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
-   if (sendingIdleDone)
-     fWaitingForMoreClientInput = PR_FALSE;
- 
-diff -Nur comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp	2012-05-07 12:59:45.857182813 -0300
-@@ -2483,7 +2483,7 @@
-         return(MK_OUT_OF_MEMORY);
-     m_pop3ConData->next_state_after_response = POP3_GET_LIST;
-     m_listpos = 0;
--    return SendData(m_url, "LIST"CRLF);
-+    return SendData(m_url, "LIST" CRLF);
- }
- 
- 
-diff -Nur comm-release.orig/mailnews/mime/src/mimedrft.cpp comm-release/mailnews/mime/src/mimedrft.cpp
---- comm-release.orig/mailnews/mime/src/mimedrft.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/mime/src/mimedrft.cpp	2012-05-07 13:01:42.912022177 -0300
-@@ -1473,7 +1473,7 @@
-                 *newbody = 0;
-                 PL_strcatn(newbody, newbodylen, "<PRE>");
-                 PL_strcatn(newbody, newbodylen, body);
--                PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
-+                PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
-                 PR_Free(body);
-                 body = newbody;
-               }
-diff -Nur comm-release.orig/mailnews/mime/src/mimemult.cpp comm-release/mailnews/mime/src/mimemult.cpp
---- comm-release.orig/mailnews/mime/src/mimemult.cpp	2012-03-12 23:37:13.000000000 -0300
-+++ comm-release/mailnews/mime/src/mimemult.cpp	2012-05-07 13:04:41.511265477 -0300
-@@ -280,7 +280,7 @@
-             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
-             MimeWriteAString(obj, fileName);
--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
-             MimeWriteAString(obj, obj->options->state->detachedFilePath);
-             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-@@ -293,10 +293,10 @@
-             status = MimeWriteAString(obj, header);
-             if (status < 0) 
-               return status;
--            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
-+            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
-             MimeWriteAString(obj, fileName);
--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
-           }
-           nsCString result;
-           char timeBuffer[128];
-@@ -306,8 +306,8 @@
-                                  "%a %b %d %H:%M:%S %Y",
-                                  &now);
-           MimeWriteAString(obj, nsDependentCString(timeBuffer));
--          MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
--          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
-+          MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-+          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
-           MimeHeaders_write_raw_headers(mult->hdrs, obj->options, PR_FALSE);
-         }
-         PRInt32 old_nchildren = container->nchildren;
diff --git a/libre/icedove-libre/gcc47.patch b/libre/icedove-libre/gcc47.patch
deleted file mode 100755
index 115d65131..000000000
--- a/libre/icedove-libre/gcc47.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc comm-release/mozilla/ipc/chromium/src/base/file_util.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:38:11.474783536 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util.cc 2012-04-03 18:43:29.218995578 +0000
-@@ -8,7 +8,7 @@
- #include <io.h>
- #endif
- #include <stdio.h>
--#if defined(ANDROID)
-+#if defined(ANDROID) || defined(OS_POSIX)
- #include <unistd.h>
- #endif
- 
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:38:11.381450924 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -5,6 +5,9 @@
- #include "base/file_util.h"
- 
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include <string>
- #include <vector>
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:38:11.438117153 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -6,6 +6,9 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:38:11.418117308 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-03 18:43:29.218995578 +0000
-@@ -14,6 +14,8 @@
- #include <time.h>
- #endif
- 
-+#include <unistd.h>
-+
- #include <limits>
- 
- #include "base/basictypes.h"
-diff -Nur comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in comm-release/mozilla/toolkit/crashreporter/client/Makefile.in
---- comm-release.orig/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:38:56.101105510 +0000
-+++ comm-release/mozilla/toolkit/crashreporter/client/Makefile.in 2012-04-03 18:43:29.218995578 +0000
-@@ -69,6 +69,9 @@
- $(STDCXX_COMPAT) \
- $(NULL)
- 
-+# Needed for moz_free
-+LIBS += -L$(LIBXUL_DIST)/lib -lmozalloc
-+
- ifeq ($(OS_ARCH),WINNT)
- CPPSRCS += crashreporter_win.cpp
- LIBS += \