11 files changed, 12 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am
index 397a51c9fd..2d3b9beafe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1172,11 +1172,11 @@ BASE_VERSION=`echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; printf("%d.%d.%d"),
 PREV_VERSION=`echo "$(VERSION)" | awk -F. '{$$3 = $$3 + 0 ; if ($$3 > 0) $$3-- ; printf("%d.%d.%d"), $$1, $$2, $$3}'`
 PREV_DIR="wireshark-$(PREV_VERSION)"
 PREV_FILE="$(PREV_DIR).tar.bz2"
-PREV_URL="http://www.wireshark.org/download/src/all-versions/$(PREV_FILE)"
+PREV_URL="https://www.wireshark.org/download/src/all-versions/$(PREV_FILE)"
 
 patch-bzip2: distdir
 	if test x$(BASE_VERSION) != x$(PREV_VERSION) ; then \
-		curl -z $(PREV_FILE) -o $(PREV_FILE) $(PREV_URL) && \
+		curl --time-cond $(PREV_FILE) --location --output $(PREV_FILE) $(PREV_URL) && \
 		tar -xjf $(PREV_FILE) && \
 		diff -urN $(PREV_DIR) $(distdir) | bzip2 > patch-wireshark-$(PREV_VERSION)-to-$(VERSION).bz2 && \
 		echo "Created patch-bzip2" ; \
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 3e05a477f6..401f22dbcb 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -438,7 +438,7 @@ checkapi:
 	$(PERL) ../tools/checkAPIs.pl -g termoutput -build $(LIBWIRESHARK_SRC)
 
 #
-# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
 #
 # Local variables:
 # c-basic-offset: 8
diff --git a/epan/nghttp2/Makefile.am b/epan/nghttp2/Makefile.am
index 36cd33daf6..8256a3dca4 100644
--- a/epan/nghttp2/Makefile.am
+++ b/epan/nghttp2/Makefile.am
@@ -51,7 +51,7 @@ EXTRA_DIST = \
 	README.nghttp2
 
 #
-# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
 #
 # Local variables:
 # c-basic-offset: 8
diff --git a/epan/nghttp2/Makefile.common b/epan/nghttp2/Makefile.common
index d0a525b6b9..a3893a34d8 100644
--- a/epan/nghttp2/Makefile.common
+++ b/epan/nghttp2/Makefile.common
@@ -40,7 +40,7 @@ LIBNGHTTP2_INCLUDES =			\
 
 
 #
-# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
 #
 # Local variables:
 # c-basic-offset: 8
diff --git a/epan/nghttp2/Makefile.nmake b/epan/nghttp2/Makefile.nmake
index d0bf4c0e50..852f18e22c 100644
--- a/epan/nghttp2/Makefile.nmake
+++ b/epan/nghttp2/Makefile.nmake
@@ -31,7 +31,7 @@ checkapi:
 	$(LIBNGHTTP2_SRC)
 
 #
-# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
 #
 # Local variables:
 # c-basic-offset: 8
diff --git a/epan/wmem/Makefile.am b/epan/wmem/Makefile.am
index d3aa52d1ae..0d05311792 100644
--- a/epan/wmem/Makefile.am
+++ b/epan/wmem/Makefile.am
@@ -61,7 +61,7 @@ checkapi:
 	$(LIBWMEM_SRC)
 
 #
-# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
 #
 # Local variables:
 # c-basic-offset: 8
diff --git a/epan/wmem/Makefile.common b/epan/wmem/Makefile.common
index 4c2b8317a1..dfd39f5af1 100644
--- a/epan/wmem/Makefile.common
+++ b/epan/wmem/Makefile.common
@@ -62,7 +62,7 @@ LIBWMEM_INCLUDES =			\
 
 
 #
-# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
 #
 # Local variables:
 # c-basic-offset: 8
diff --git a/epan/wmem/Makefile.nmake b/epan/wmem/Makefile.nmake
index fdc51e59ed..d7e6a92853 100644
--- a/epan/wmem/Makefile.nmake
+++ b/epan/wmem/Makefile.nmake
@@ -46,7 +46,7 @@ checkapi:
 	$(WMEM_SRC)
 
 #
-# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
 #
 # Local variables:
 # c-basic-offset: 8
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index c291af6bf1..063ff9fb02 100644
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -134,7 +134,7 @@ checkapi:
 #	file_util.c unicode-utils.c
 
 #
-# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
 #
 # Local variables:
 # c-basic-offset: 8
diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index 5e8ba72e70..48fa8b090f 100644
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -137,7 +137,7 @@ LIBWSUTIL_INCLUDES = 	\
 	strncasecmp.h
 
 #
-# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
 #
 # Local variables:
 # c-basic-offset: 8
diff --git a/wsutil/Makefile.nmake b/wsutil/Makefile.nmake
index 64dbdb3d46..a92ee5da2d 100644
--- a/wsutil/Makefile.nmake
+++ b/wsutil/Makefile.nmake
@@ -68,7 +68,7 @@ checkapi:
 #	file_util.c unicode-utils.c
 
 #
-# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
 #
 # Local variables:
 # c-basic-offset: 8