From: Hannu Nyman Date: Wed, 1 Feb 2017 21:17:37 +0000 (+0200) Subject: ccache, samba36: fix samba.org addresses to use https X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eaf3fef94636e81772776754a45f1b8ba1886793;p=openwrt%2Fstaging%2Fdedeckeh.git ccache, samba36: fix samba.org addresses to use https samba.org has started to enforce https and currently plain http downloads with curl/wget fail, so convert samba.org download links to use https. Modernise links at the same time. Also convert samba.org URL fields to have https. Signed-off-by: Hannu Nyman --- diff --git a/config/Config-devel.in b/config/Config-devel.in index d953e6679a..30fbd6f7a9 100644 --- a/config/Config-devel.in +++ b/config/Config-devel.in @@ -67,7 +67,7 @@ menuconfig DEVEL bool "Use ccache" if DEVEL default n help - Compiler cache; see http://ccache.samba.org/. + Compiler cache; see https://ccache.samba.org/ config EXTERNAL_KERNEL_TREE string "Use external kernel tree" if DEVEL diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile index 8b58c1c06f..669e6534fe 100644 --- a/package/network/services/ppp/Makefile +++ b/package/network/services/ppp/Makefile @@ -30,7 +30,7 @@ include $(INCLUDE_DIR)/package.mk define Package/ppp/Default SECTION:=net CATEGORY:=Network - URL:=http://ppp.samba.org/ + URL:=https://ppp.samba.org/ endef define Package/ppp diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile index 1311e09001..fcf772195a 100644 --- a/package/network/services/samba36/Makefile +++ b/package/network/services/samba36/Makefile @@ -11,8 +11,8 @@ PKG_NAME:=samba PKG_VERSION:=3.6.25 PKG_RELEASE:=5 -PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \ - http://ftp.samba.org/pub/samba/stable +PKG_SOURCE_URL:=https://download.samba.org/pub/samba \ + https://download.samba.org/pub/samba/stable PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_HASH:=8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 @@ -34,7 +34,7 @@ define Package/samba36-server SECTION:=net CATEGORY:=Network TITLE:=Samba 3.6 SMB/CIFS server - URL:=http://www.samba.org/ + URL:=https://www.samba.org/ DEPENDS:=+USE_GLIBC:librt $(ICONV_DEPENDS) endef @@ -42,7 +42,7 @@ define Package/samba36-client SECTION:=net CATEGORY:=Network TITLE:=Samba 3.6 SMB/CIFS client - URL:=http://www.samba.org/ + URL:=https://www.samba.org/ DEPENDS:=+libreadline +libncurses endef diff --git a/tools/ccache/Makefile b/tools/ccache/Makefile index c5136a47ae..1ff63e7630 100644 --- a/tools/ccache/Makefile +++ b/tools/ccache/Makefile @@ -11,7 +11,8 @@ PKG_NAME:=ccache PKG_VERSION:=3.3.2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=http://samba.org/ftp/ccache/ +PKG_SOURCE_URL:=https://download.samba.org/pub/ccache/ \ + https://samba.org/ftp/ccache/ PKG_HASH:=907685cb23d8f82074b8d1a9b4ebabb36914d151ac7b96a840c68c08d1a14530 include $(INCLUDE_DIR)/host-build.mk