contrib: switch libupnp and zlib contrib to github

Sourceforge is down.

Refs #77776

Change-Id: Ic9b77269d0780b5c2c30c72d3290a0e4626f3f22

contrib/src/expat/rules.mak

@@ -2,23 +2,29 @@
 
 EXPAT_VERSION := 2.1.0
 EXPAT_URL := $(SF)/expat/expat-$(EXPAT_VERSION).tar.gz
+EXPAT_GITURL := https://github.com/coapp-packages/expat.git
+EXPAT_HASH := 5ccfa1602907957bf11dc3a1a1cfd683ab3758ae
 
 PKGS += expat
 ifeq ($(call need_pkg,"expat >= 1.95.0"),)
 PKGS_FOUND += expat
 endif
 
-$(TARBALLS)/expat-$(EXPAT_VERSION).tar.gz:
-	$(call download,$(EXPAT_URL))
+$(TARBALLS)/expat-$(EXPAT_HASH).tar.xz:
+	$(call download_git,$(EXPAT_GITURL), master, $(EXPAT_HASH))
 
-.sum-expat: expat-$(EXPAT_VERSION).tar.gz
+.sum-expat: expat-$(EXPAT_HASH).tar.xz
+	$(warning Not implemented.)
+	touch $@
 
-expat: expat-$(EXPAT_VERSION).tar.gz .sum-expat
-	$(UNPACK)
+expat: expat-$(EXPAT_HASH).tar.xz .sum-expat
+	rm -Rf $@ $@-$(EXPAT_HASH)
+	mkdir -p $@-$(EXPAT_HASH)
+	(cd $@-$(EXPAT_HASH) && tar xv --strip-components=1 -f ../$<)
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
 .expat: expat
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(HOSTVARS) bash ./configure $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@

contrib/src/upnp/SHA512SUMS

-97af62a7483cc19cfe80157cbc3383c1b4b7c9c39b848f4ed063784b74df0b9b0527f7b467e01451e0a44dbf9e8a9eab510619146a6ee1e3dce46f3e4af6e661  libupnp-1.6.19.tar.bz2
+6c226b0983dbd1b4837103ec6bcdd4b2fbc1c0c64be1630183065169481cf98e09542cf248aa78fde9b38b1fb97f563cd320a2ecab499e5c8ee71848b1af6c62  pupnp-release-1.6.19.tar.gz

contrib/src/upnp/rules.mak

 # UPNP
 UPNP_VERSION := 1.6.19
-UPNP_URL := http://sourceforge.net/projects/pupnp/files/pupnp/libUPnP%20$(UPNP_VERSION)/libupnp-$(UPNP_VERSION).tar.bz2/download
+UPNP_URL := https://github.com/mrjimenez/pupnp/archive/release-$(UPNP_VERSION).tar.gz
 
 PKGS += upnp
 ifeq ($(call need_pkg,'libupnp'),)
 PKGS_FOUND += upnp
 endif
 
-$(TARBALLS)/libupnp-$(UPNP_VERSION).tar.bz2:
+$(TARBALLS)/pupnp-release-$(UPNP_VERSION).tar.gz:
 	$(call download,$(UPNP_URL))
 
-.sum-upnp: libupnp-$(UPNP_VERSION).tar.bz2
+.sum-upnp: pupnp-release-$(UPNP_VERSION).tar.gz
 
-upnp: libupnp-$(UPNP_VERSION).tar.bz2 .sum-upnp
+upnp: pupnp-release-$(UPNP_VERSION).tar.gz .sum-upnp
 	$(UNPACK)
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/upnp/libupnp-win32.patch
@@ -22,7 +22,7 @@ endif
 	$(APPLY) $(SRC)/upnp/libupnp-ipv6.patch
 	$(APPLY) $(SRC)/upnp/miniserver.patch
 	$(APPLY) $(SRC)/upnp/uuid_upnp.patch
-	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux/
+	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub
 	$(MOVE)
 
 .upnp: upnp

contrib/src/zlib/SHA512SUMS

-ece209d4c7ec0cb58ede791444dc754e0d10811cbbdebe3df61c0fd9f9f9867c1c3ccd5f1827f847c005e24eef34fb5bf87b5d3f894d75da04f1797538290e4a  zlib-1.2.8.tar.gz
+7e393976368975446b263ae4143fb404bc33bf3b436e72007700b5b88e5be332cd461cdec42d31a4b6dffdca2368550f01b9fa1165d81c0aa818bbf2b1ac191e  zlib-1.2.8.tar.gz

contrib/src/zlib/rules.mak

 # ZLIB
 ZLIB_VERSION := 1.2.8
-ZLIB_URL := $(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
+ZLIB_URL := https://github.com/madler/zlib/archive/v$(ZLIB_VERSION).tar.gz
 
 PKGS += zlib
 ifeq ($(call need_pkg,"zlib"),)