diff --git a/Makefile b/Makefile index 11baf7cd..bbaee4bc 100644 --- a/Makefile +++ b/Makefile @@ -32,11 +32,11 @@ KMODULES = drivers/usb/serial/cp210x.ko \ MINISATIP_COMMIT=54df9348e7bd7e6075f54f1b93ec4ad36429abe0 MINISATIP5_COMMIT=67e88c2d743d6df9c4a96aad772414169f61b764 -MINISATIP7_COMMIT=407833b54abb8b62773bed6a6c04f676abf8d356 +MINISATIP7_COMMIT=df737931da04bc1a178d7abddb3d6d9b57d70fe9 -BUSYBOX=busybox-1.24.1 +BUSYBOX=busybox-1.26.2 -DROPBEAR=dropbear-2015.71 +DROPBEAR=dropbear-2016.74 DROPBEAR_SBIN_FILES=dropbear DROPBEAR_BIN_FILES=dbclient dropbearconvert dropbearkey scp @@ -47,11 +47,11 @@ MTD_UTILS_COMMIT=v1.5.1 LIBTIRPC_VERSION=0.2.5 LIBTIRPC=libtirpc-$(LIBTIRPC_VERSION) -RPCBIND_VERSION=0.2.2 +RPCBIND_VERSION=0.2.3 RPCBIND=rpcbind-$(RPCBIND_VERSION) RPCBIND_SBIN_FILES=rpcbind rpcinfo -NFSUTILS_VERSION=1.3.3 +NFSUTILS_VERSION=1.3.4 NFSUTILS=nfs-utils-$(NFSUTILS_VERSION) NFSUTILS_SBIN_FILES=utils/showmount/showmount \ utils/exportfs/exportfs \ @@ -62,13 +62,13 @@ NFSUTILS_SBIN_FILES=utils/showmount/showmount \ utils/statd/statd \ utils/nfsd/nfsd -NANO_VERSION=2.4.3 +NANO_VERSION=2.8.1 NANO=nano-$(NANO_VERSION) NANO_FILENAME=$(NANO).tar.gz -NANO_DOWNLOAD=http://www.nano-editor.org/dist/v2.4/$(NANO_FILENAME) +NANO_DOWNLOAD=http://www.nano-editor.org/dist/v2.8/$(NANO_FILENAME) PYTHON3_VERSION0=3.5 -PYTHON3_VERSION=$(PYTHON3_VERSION0).1 +PYTHON3_VERSION=$(PYTHON3_VERSION0).3 PYTHON3=Python-$(PYTHON3_VERSION) PYTHON3_PACKAGE_NAME=$(PYTHON3)-1 PYTHON3_FILENAME=$(PYTHON3).tgz @@ -78,8 +78,8 @@ MULTICAST_RTP_PACKAGE_NAME=multicast-rtp-1 TVHEADEND_COMMIT=master -# 10663 10937 -OSCAM_REV=11234 +# 10663 10937 11234 +OSCAM_REV=11384 define GIT_CLONE @mkdir -p apps/host @@ -414,7 +414,6 @@ apps/$(BUSYBOX)/Makefile: apps/$(BUSYBOX)/busybox: apps/$(BUSYBOX)/Makefile make -C apps/$(BUSYBOX) CROSS_COMPILE=$(TOOLCHAIN)/bin/sh4-linux- defconfig make -C apps/$(BUSYBOX) CROSS_COMPILE=$(TOOLCHAIN)/bin/sh4-linux- - #make -C apps/$(DROPBEAR) PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" .PHONY: busybox busybox: apps/$(BUSYBOX)/busybox diff --git a/kernel/include/linux/fs.h b/kernel/include/linux/fs.h index 1ff09626..72546452 100644 --- a/kernel/include/linux/fs.h +++ b/kernel/include/linux/fs.h @@ -307,6 +307,7 @@ struct inodes_stat_t { #define BLKIOOPT _IO(0x12,121) #define BLKALIGNOFF _IO(0x12,122) #define BLKPBSZGET _IO(0x12,123) +#define BLKSECDISCARD _IO(0x12,125) #define BMAP_IOCTL 1 /* obsolete - kept for compatibility */ #define FIBMAP _IO(0x00,1) /* bmap access */ diff --git a/out/packages/Python-3.5.3-1.tar.gz b/out/packages/Python-3.5.3-1.tar.gz new file mode 100644 index 00000000..3b7fa4d7 Binary files /dev/null and b/out/packages/Python-3.5.3-1.tar.gz differ diff --git a/patches/minisatip7-axe.patch b/patches/minisatip7-axe.patch index 421b0147..9c2613d9 100644 --- a/patches/minisatip7-axe.patch +++ b/patches/minisatip7-axe.patch @@ -1,48 +1,21 @@ diff --git a/adapter.c b/adapter.c -index 9ddbcbb..26bd3b6 100644 +index 26bd3b6..4606a1e 100644 --- a/adapter.c +++ b/adapter.c -@@ -1056,6 +1056,18 @@ get_adapter1(int aid, char *file, int line) - return a[aid]; - } - -+adapter * -+get_configured_adapter1(int aid, char *file, int line) -+{ -+ if (aid < 0 || aid >= MAX_ADAPTERS || !a[aid] || disabled[aid]) -+ { -+ LOG("%s:%d: get_configured_adapter returns NULL for adapter_id %d", -+ file, line, aid); -+ return NULL; -+ } -+ return a[aid]; -+} -+ - char* get_stream_pids(int s_id, char *dest, int max_size); - char * - describe_adapter(int sid, int aid, char *dad, int ld) -diff --git a/adapter.h b/adapter.h -index 7e28640..58c4edd 100755 ---- a/adapter.h -+++ b/adapter.h -@@ -139,6 +139,7 @@ int update_pids(int aid); - int tune(int aid, int sid); - SPid *find_pid(int aid, int p); - adapter * get_adapter1(int aid, char *file, int line); -+adapter * get_configured_adapter1(int aid, char *file, int line); - char *describe_adapter(int sid, int aid, char *dad, int ld); - void dump_pids(int aid); - void sort_pids(int aid); -@@ -165,6 +166,7 @@ int signal_thread(sockets *s); - int compare_tunning_parameters(int aid, transponder * tp); - - #define get_adapter(a) get_adapter1(a, __FILE__, __LINE__) -+#define get_configured_adapter(a) get_configured_adapter1(a, __FILE__, __LINE__) - #define get_adapter_nw(aid) ((aid >= 0 && aid < MAX_ADAPTERS && a[aid] && a[aid]->enabled)?a[aid]:NULL) - - #define adapter_lock(a) adapter_lock1(__FILE__,__LINE__,a) +@@ -1873,9 +1873,9 @@ _symbols adapters_sym[] = + { "ad_sys", VAR_AARRAY_INT, a, 1, MAX_ADAPTERS, offsetof( + adapter, tp.sys) }, + { "ad_allsys", VAR_FUNCTION_STRING, (void *) &get_all_delsys, 0, +- 0, 0 }, ++ MAX_ADAPTERS, 0 }, + { "ad_pids", VAR_FUNCTION_STRING, (void *) &get_adapter_pids, 0, +- 0, 0 }, ++ MAX_ADAPTERS, 0 }, + { "tuner_s2", VAR_INT, &tuner_s2, 1, 0, 0 }, + { "tuner_t2", VAR_INT, &tuner_t2, 1, 0, 0 }, + { "tuner_c2", VAR_INT, &tuner_c2, 1, 0, 0 }, diff --git a/axe.c b/axe.c -index 3c553c3..1efd30c 100755 +index 486b2f8..642f152 100755 --- a/axe.c +++ b/axe.c @@ -107,6 +107,8 @@ void axe_set_network_led(int on) @@ -54,82 +27,543 @@ index 3c553c3..1efd30c 100755 // if(*rv < 0 || *rv == 0 || errno == -EAGAIN) if(*rv < 0 || *rv == 0 || errno == -EAGAIN) { -@@ -213,11 +215,8 @@ static inline int extra_quattro(int input, int diseqc, int *equattro) - adapter *use_adapter(int input) +@@ -770,9 +772,9 @@ char *get_axe_coax(int aid, char *dest, int max_size) + + _symbols axe_sym[] = { - int input2 = input < 4 ? input : -1; -- adapter *ad = get_adapter(input2); -+ adapter *ad = get_configured_adapter(input2); - char buf[32]; -- if(!ad) -- init_hw(input2); -- ad = get_adapter(input2); - if (ad) { - if (ad->fe2 <= 0) { - sprintf (buf, "/dev/axe/frontend-%d", input); -@@ -287,7 +286,7 @@ int axe_setup_switch(adapter *ad) - pos = absolute_table[diseqc][aid]; - if (pos <= 0) continue; - pos--; -- ad2 = get_adapter(aid); -+ ad2 = get_configured_adapter(aid); - if (!ad2) continue; - if (ad2->fe2 <= 0) continue; - if ((ad2->axe_used & ~(1 << ad->id)) == 0) continue; -@@ -300,7 +299,7 @@ int axe_setup_switch(adapter *ad) - pos = absolute_table[diseqc][aid]; - if (pos <= 0) continue; - pos--; -- ad2 = get_adapter(aid); -+ ad2 = get_configured_adapter(aid); - if (!ad2) continue; - LOGL(3, "axe: checking %d used 0x%x in %d", ad->id, ad2->axe_used, ad2->id); - if (ad2->axe_used & ~(1 << ad->id)) continue; -@@ -327,7 +326,7 @@ int axe_setup_switch(adapter *ad) - } - if (adm->old_pol >= 0) { - for (aid = 0; aid < 4; aid++) { -- ad2 = get_adapter(aid); -+ ad2 = get_configured_adapter(aid); - if (!ad2 || ad2->fe2 <= 0 || ad == ad2) continue; - if (ad2->slave && ad2->slave - 1 != adm->pa) continue; - if (!ad2->slave && ad2 != adm) continue; -@@ -408,7 +407,7 @@ int axe_setup_switch(adapter *ad) +- { "ad_axe_pktc", VAR_FUNCTION_INT64, (void *) &get_axe_pktc, 0, 0, 0 }, +- { "ad_axe_ccerr", VAR_FUNCTION_INT64, (void *) &get_axe_ccerr, 0, 0, 0 }, +- { "ad_axe_coax", VAR_FUNCTION_STRING, (void *) &get_axe_coax, 0, 0, 0 }, ++ { "ad_axe_pktc", VAR_FUNCTION_INT64, (void *) &get_axe_pktc, 0, MAX_ADAPTERS, 0 }, ++ { "ad_axe_ccerr", VAR_FUNCTION_INT64, (void *) &get_axe_ccerr, 0, MAX_ADAPTERS, 0 }, ++ { "ad_axe_coax", VAR_FUNCTION_STRING, (void *) &get_axe_coax, 0, MAX_ADAPTERS, 0 }, + { NULL, 0, NULL, 0, 0 } + }; - axe: - for (aid = 0; aid < 4; aid++) { -- ad2 = get_adapter(aid); -+ ad2 = get_configured_adapter(aid); - if (ad2) - LOGL(3, "axe_fe: used[%d] = 0x%x, pol=%d, hiband=%d, diseqc=%d", - aid, ad2->axe_used, ad2->old_pol, ad2->old_hiband, ad2->old_diseqc); -@@ -757,7 +756,7 @@ char *get_axe_coax(int aid, char *dest, int max_size) - return dest; - - for (i = 0; i < 4; i++) { -- ad = get_adapter(i); -+ ad = get_configured_adapter(i); - if (ad && ad->axe_used & (1< + + +- Minisatip/$version$ on $http_host$ ++ Minisatip status + + + + +@@ -58,201 +66,204 @@ + + + +-
Refresh: ++ ++ ++ ++
Refresh: + sec. + + + +- ++ ++ ++ ++ ++ ++
++ ++
+ +