Merge branch 'master' of https://github.com/pfsense/pfsense-packages into hap_de-install_logging

Conflicts:
	config/haproxy-devel/haproxy.inc

2 files changed, 18 insertions, 18 deletions

diff --git a/config/widescreen/bin/fbegin.inc_ b/config/widescreen/bin/fbegin.inc_
index a7a96e0f..73f26aaa 100644
--- a/config/widescreen/bin/fbegin.inc_
+++ b/config/widescreen/bin/fbegin.inc_
@@ -211,13 +211,13 @@ $diagnostics_menu = msort(array_merge($diagnostics_menu, return_ext_menu("Diagno
 if(! $g['disablehelpmenu']) {
 	$help_menu = array();
 	$help_menu[] = array("About this Page", $helpurl);
-	$help_menu[] = array("User Forum", "http://www.pfsense.org/j.php?jumpto=forum");
-	$help_menu[] = array("Documentation", "http://www.pfsense.org/j.php?jumpto=doc");
-	$help_menu[] = array("Developers Wiki", "http://www.pfsense.org/j.php?jumpto=devwiki");
-	$help_menu[] = array("Paid Support", "http://www.pfsense.org/j.php?jumpto=portal");
-	$help_menu[] = array("pfSense Book", "http://www.pfsense.org/j.php?jumpto=book");
-	$help_menu[] = array("Search portal", "http://www.pfsense.org/j.php?jumpto=searchportal");
-	$help_menu[] = array("FreeBSD Handbook", "http://www.pfsense.org/j.php?jumpto=fbsdhandbook");
+	$help_menu[] = array("User Forum", "https://www.pfsense.org/j.php?jumpto=forum");
+	$help_menu[] = array("Documentation", "https://www.pfsense.org/j.php?jumpto=doc");
+	$help_menu[] = array("Developers Wiki", "https://www.pfsense.org/j.php?jumpto=devwiki");
+	$help_menu[] = array("Paid Support", "https://www.pfsense.org/j.php?jumpto=portal");
+	$help_menu[] = array("pfSense Book", "https://www.pfsense.org/j.php?jumpto=book");
+	$help_menu[] = array("Search portal", "https://www.pfsense.org/j.php?jumpto=searchportal");
+	$help_menu[] = array("FreeBSD Handbook", "https://www.pfsense.org/j.php?jumpto=fbsdhandbook");
 	$help_menu = msort(array_merge($help_menu, return_ext_menu("Help")),0);	
 }
 
diff --git a/config/widescreen/widescreen.xml b/config/widescreen/widescreen.xml
index 98dd9daa..0692b533 100644
--- a/config/widescreen/widescreen.xml
+++ b/config/widescreen/widescreen.xml
@@ -10,57 +10,57 @@
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/widescreen/</prefix>
 		<chmod>077</chmod>
-		<item>http://www.pfsense.org/packages/config/widescreen/widescreen.inc</item>
+		<item>https://packages.pfsense.org/packages/config/widescreen/widescreen.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/widescreen/</prefix>
 		<chmod>644</chmod>
-		<item>http://www.pfsense.org/packages/config/widescreen/bin/all.css_</item>
+		<item>https://packages.pfsense.org/packages/config/widescreen/bin/all.css_</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/widescreen/</prefix>
 		<chmod>644</chmod>
-		<item>http://www.pfsense.org/packages/config/widescreen/bin/fbegin.inc_</item>
+		<item>https://packages.pfsense.org/packages/config/widescreen/bin/fbegin.inc_</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/widescreen/</prefix>
 		<chmod>644</chmod>
-		<item>http://www.pfsense.org/packages/config/widescreen/bin/fend.inc_</item>
+		<item>https://packages.pfsense.org/packages/config/widescreen/bin/fend.inc_</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/widescreen/</prefix>
 		<chmod>644</chmod>
-		<item>http://www.pfsense.org/packages/config/widescreen/bin/footer-left.png</item>
+		<item>https://packages.pfsense.org/packages/config/widescreen/bin/footer-left.png</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/widescreen/</prefix>
 		<chmod>644</chmod>
-		<item>http://www.pfsense.org/packages/config/widescreen/bin/footer-middle.png</item>
+		<item>https://packages.pfsense.org/packages/config/widescreen/bin/footer-middle.png</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/widescreen/</prefix>
 		<chmod>644</chmod>
-		<item>http://www.pfsense.org/packages/config/widescreen/bin/footer-right.png</item>
+		<item>https://packages.pfsense.org/packages/config/widescreen/bin/footer-right.png</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/widescreen/</prefix>
 		<chmod>644</chmod>
-		<item>http://www.pfsense.org/packages/config/widescreen/bin/header-mid.png</item>
+		<item>https://packages.pfsense.org/packages/config/widescreen/bin/header-mid.png</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/widescreen/</prefix>
 		<chmod>644</chmod>
-		<item>http://www.pfsense.org/packages/config/widescreen/bin/horiz-left.png</item>
+		<item>https://packages.pfsense.org/packages/config/widescreen/bin/horiz-left.png</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/widescreen/</prefix>
 		<chmod>644</chmod>
-		<item>http://www.pfsense.org/packages/config/widescreen/bin/horiz-right.png</item>
+		<item>https://packages.pfsense.org/packages/config/widescreen/bin/horiz-right.png</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/widescreen/</prefix>
 		<chmod>644</chmod>
-		<item>http://www.pfsense.org/packages/config/widescreen/bin/index.php_</item>
+		<item>https://packages.pfsense.org/packages/config/widescreen/bin/index.php_</item>
 	</additional_files_needed>
 	<custom_php_install_command>
 		widescreen_custom_php_install_command();