From 37c241ad246578980932fe99e90de186727894f2 Mon Sep 17 00:00:00 2001
From: Steve Purcell <steve@sanityinc.com>
Date: Sat, 22 Aug 2015 16:33:21 +1200
Subject: [PATCH] Use and promote https URLs for MELPA and MELPA Stable

See #2109
---
 Cask                               |  2 +-
 Makefile                           |  2 +-
 README.md                          | 12 ++++++------
 html/partials/getting-started.html |  4 ++--
 html/updates.rss.erb               |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cask b/Cask
index af371cf638d..540b791d7fd 100644
--- a/Cask
+++ b/Cask
@@ -1,4 +1,4 @@
-(source "melpa" "http://melpa.org/packages/")
+(source "melpa" "https://melpa.org/packages/")
 
 (development
  (depends-on "ecukes")
diff --git a/Makefile b/Makefile
index a0389a16d41..1daa8a9ce13 100644
--- a/Makefile
+++ b/Makefile
@@ -106,7 +106,7 @@ sandbox: packages/archive-contents
 		--eval '(setq user-emacs-directory "$(SANDBOX)")' \
 		-l package \
 		--eval "(add-to-list 'package-archives '(\"gnu\" . \"http://elpa.gnu.org/packages/\") t)" \
-		--eval "(add-to-list 'package-archives '(\"melpa\" . \"http://melpa.org/packages/\") t)" \
+		--eval "(add-to-list 'package-archives '(\"melpa\" . \"https://melpa.org/packages/\") t)" \
 		--eval "(add-to-list 'package-archives '(\"sandbox\" . \"$(shell pwd)/$(PKGDIR)/\") t)" \
 		--eval "(package-refresh-contents)" \
 		--eval "(package-initialize)"
diff --git a/README.md b/README.md
index cf34777b2c4..a8687fe49ad 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ code using simple recipes. (Think of it as a server-side version of
 Packages are updated at intervals throughout the day.
 
 To browse available packages, check out the
-[archive index page](http://melpa.org/).
+[archive index page](https://melpa.org/).
 
 Adding packages is as simple as submitting a new recipe as a pull request;
 read on for details.
@@ -41,10 +41,10 @@ Enable installation of packages from MELPA by adding an entry to
 ```lisp
 (require 'package)
 (add-to-list 'package-archives
-             '("melpa" . "http://melpa.org/packages/") t)
+             '("melpa" . "https://melpa.org/packages/") t)
 (when (< emacs-major-version 24)
   ;; For important compatibility libraries like cl-lib
-  (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
+  (add-to-list 'package-archives '("gnu" . "https://elpa.gnu.org/packages/")))
 (package-initialize)
 ```
 
@@ -425,7 +425,7 @@ format.
  such as Emacs 24. If you have an older version of Emacs, you can get a
  suitable `package.el` [here](http://bit.ly/pkg-el23).
 
-[melpa]: http://melpa.org
+[melpa]: https://melpa.org
 
 
 ## API
@@ -489,11 +489,11 @@ in your `package-archives` list.
 
 ```lisp
 (add-to-list 'package-archives
-             '("melpa-stable" . "http://stable.melpa.org/packages/"))
+             '("melpa-stable" . "https://stable.melpa.org/packages/"))
 ```
 
 An online list of available packages can be found at 
-[http://stable.melpa.org](http://stable.melpa.org).
+[https://stable.melpa.org](https://stable.melpa.org).
 
 ### Stable Version Generation
 
diff --git a/html/partials/getting-started.html b/html/partials/getting-started.html
index 94294b57ab4..3b8d3e5be57 100644
--- a/html/partials/getting-started.html
+++ b/html/partials/getting-started.html
@@ -20,7 +20,7 @@ <h2>Installing</h2>
 
       <pre><code>(require 'package) ;; You might already have this line
 (add-to-list 'package-archives
-             '("melpa" . "http://melpa.org/packages/"))
+             '("melpa" . "https://melpa.org/packages/"))
 (when (< emacs-major-version 24)
   ;; For important compatibility libraries like cl-lib
   (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/")))
@@ -32,7 +32,7 @@ <h2>Installing</h2>
       </p>
 
       <pre><code>(add-to-list 'package-archives
-             '("melpa-stable" . "http://stable.melpa.org/packages/") t)</code></pre>
+             '("melpa-stable" . "https://stable.melpa.org/packages/") t)</code></pre>
 
       <h3>Customizations</h3>
       <p>
diff --git a/html/updates.rss.erb b/html/updates.rss.erb
index b461bc8f874..ed5ba6030e0 100644
--- a/html/updates.rss.erb
+++ b/html/updates.rss.erb
@@ -3,10 +3,10 @@
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
    xmlns:atom="http://www.w3.org/2005/Atom">
-<% base_url = "http://melpa.org/" %>
+<% base_url = "https://melpa.org/" %>
   <channel>
     <title>MELPA package updates</title>
-    <link>http://melpa.org</link>
+    <link>https://melpa.org</link>
     <atom:link href="<%= base_url %>updates.rss" rel="self" type="application/rss+xml" />
     <language>en-us</language>
     <ttl>40</ttl>