Merge pull request #83 from Jalle19/dvbaes

Refresh build URLs, remove unrecognized --disable-dvbaes option

Dockerfile

@@ -6,7 +6,7 @@ RUN yum -y update && \
   yum -y install epel-release && \
   yum -y install wget make gcc git python wget tar \
                  bzip2 uboot-tools patch fakeroot \
-                 svn file autoconf automake libtool \
+                 file autoconf automake libtool \
                  texinfo
 
 # Required for git operations when container is running as an UID that doesn't exist in /etc/passwd

Makefile

@@ -37,7 +37,7 @@ MINISATIP_COMMIT=v1.2.12
 
 BUSYBOX=busybox-1.26.2
 
-CHRONY=chrony-4.3
+CHRONY=chrony-4.5
 CHRONY_SBIN_FILES=chronyd chronyc
 
 DROPBEAR=dropbear-2022.82
@@ -55,8 +55,7 @@ NANO=nano-$(NANO_VERSION)
 NANO_FILENAME=$(NANO).tar.gz
 NANO_DOWNLOAD=http://www.nano-editor.org/dist/v2.8/$(NANO_FILENAME)
 
-# 10663 10937 11234 11398 11434
-OSCAM_REV=11693
+OSCAM_COMMIT=e1d2fb78 # r11763
 
 IPERF=iperf-3.1.3
 IPERF_LIB_FILES=libiperf.so libiperf.so.0 libiperf.so.0.0.0
@@ -148,7 +147,7 @@ fs.cpio: $(CPIO_SRCS)
 	  $(foreach f,$(notdir $(wildcard apps/minisatip/html/*)), -e "apps/minisatip/html/$f:usr/share/minisatip/html/$f") \
 	  -e "apps/$(NANO)/src/nano:usr/bin/nano" \
 	  -e "apps/mtd-utils/nandwrite:usr/sbin/nandwrite2" \
-	  -e "apps/oscam-svn/Distribution/oscam-1.20_svn$(OSCAM_REV)-sh4-linux:sbin/oscamd" \
+	  -e "apps/oscam/oscam:sbin/oscamd" \
 	  -e "apps/$(IPERF)/src/.libs/iperf3:bin/iperf3" \
 	  $(foreach f,$(IPERF_LIB_FILES), -e "apps/$(IPERF)/src/.libs/$(f):lib/$(f)") \
 	  -e "apps/unicable/dsqsend/senddsq:sbin/senddsq" \
@@ -290,7 +289,6 @@ apps/minisatip/minisatip: apps/$(LIBDVBCSA)/src/.libs/libdvbcsa.a
 		--enable-dvbapi \
 		--enable-dvbcsa \
 		--disable-dvbca \
-		--disable-dvbaes \
 		--disable-netcv
 	make -C apps/minisatip -j $(CPUS) \
 		CC=$(TOOLCHAIN)/bin/sh4-linux-gcc \
@@ -344,7 +342,7 @@ busybox: apps/$(BUSYBOX)/busybox
 #
 
 apps/$(CHRONY)/configure:
-	$(call WGET,https://download.tuxfamily.org/chrony/$(CHRONY).tar.gz,apps/$(CHRONY).tar.gz)
+	$(call WGET,https://chrony-project.org/releases/$(CHRONY).tar.gz,apps/$(CHRONY).tar.gz)
 	tar -C apps -xf apps/$(CHRONY).tar.gz
 
 apps/$(CHRONY)/Makefile: apps/$(CHRONY)/configure
@@ -368,7 +366,7 @@ chrony: apps/$(CHRONY)/chronyd
 #
 
 apps/$(DROPBEAR)/configure:
-	$(call WGET,https://mirror.dropbear.nl/mirror/$(DROPBEAR).tar.bz2,apps/$(DROPBEAR).tar.bz2)
+	$(call WGET,https://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).tar.bz2,apps/$(DROPBEAR).tar.bz2)
 	tar -C apps -xjf apps/$(DROPBEAR).tar.bz2
 
 apps/$(DROPBEAR)/dropbear: apps/$(DROPBEAR)/configure
@@ -495,15 +493,14 @@ binutils: apps/$(BINUTILS)/binutils/addr2line
 # oscam
 #
 
-apps/oscam-svn/config.sh:
-  # we cannot validate the server certificate because our OpenSSL and root certificates are too old
-	cd apps && echo 't' | svn checkout https://svn.streamboard.tv/oscam/trunk/ oscam-svn -r $(OSCAM_REV)
+apps/oscam/config.sh:
+	$(call GIT_CLONE,https://git.streamboard.tv/common/oscam.git,oscam,$(OSCAM_COMMIT))
 
-apps/oscam-svn/Distribution/oscam-1.20_svn$(OSCAM_REV)-sh4-linux: apps/oscam-svn/config.sh
-	make -C apps/oscam-svn -j $(CPUS) CROSS_DIR=$(TOOLCHAIN)/bin/ CROSS=sh4-linux-
+apps/oscam/oscam: apps/oscam/config.sh
+	make -C apps/oscam -j $(CPUS) CROSS_DIR=$(TOOLCHAIN)/bin/ CROSS=sh4-linux- OSCAM_BIN=oscam
 
 .PHONY: oscam
-oscam: apps/oscam-svn/Distribution/oscam-1.20_svn$(OSCAM_REV)-sh4-linux
+oscam: apps/oscam/oscam
 
 #
 # nano