Fix for packages updates and versions updates

6in4/Makefile

@@ -1,5 +1,7 @@
 #
 # Copyright (C) 2010-2015 OpenWrt.org
+# Copyright (C) 2018 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
+# - Added gateway setting
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +10,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
-PKG_VERSION:=26
+PKG_VERSION:=27
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0
 

luci-app-glorytun/root/etc/uci-defaults/40_luci-glorytun

@@ -21,6 +21,7 @@ uci -q batch <<-EOF >/dev/null
 	set network.glorytun.leasetime=12h
 	commit network
 EOF
+if [ "$(uci -q show firewall | grep vpn)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		add firewall zone
 		set firewall.@zone[-1].name=vpn
@@ -45,6 +46,7 @@ uci -q batch <<-EOF >/dev/null
 		set firewall.redirect_vpn_to_lan.src_dip=192.168.100.1
 		commit firewall
 	EOF
+fi
 
 rm -f /tmp/luci-indexcache
 exit 0

luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_6in4.lua

@@ -1,4 +1,6 @@
 -- Copyright 2011 Jo-Philipp Wich <jow@openwrt.org>
+-- Copyright 2018 Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
+-- - Add gateway setting
 -- Licensed to the public under the Apache License 2.0.
 
 local map, section, net = ...

mptcp/Makefile

@@ -9,8 +9,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mptcp
-PKG_VERSION:=4.0
+PKG_VERSION:=5.0
-PKG_RELEASE:=2
+PKG_RELEASE:=1
 
 PKG_MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

mptcp/files/etc/uci-defaults/mptcp-defaults

@@ -1,4 +1,5 @@
 #!/bin/sh
+if [ "$(uci -q show network.globals | grep multipath)" = "" ]; then
 	uci -q batch <<-EOF
 	set network.globals.multipath='enable'
 	set network.globals.mptcp_path_manager='fullmesh'
@@ -8,6 +9,7 @@ uci -q batch <<-EOF
 	set network.globals.mptcp_syn_retries=4
 	commit network
 	EOF
+fi
 uci -q batch <<-EOF
     delete ucitrack.@mptcp[-1]
     add ucitrack mptcp

openmptcprouter-full/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openmptcprouter-full
-PKG_VERSION:=0.4
+PKG_VERSION:=0.5
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk

openmptcprouter/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openmptcprouter
-PKG_VERSION:=0.70
+PKG_VERSION:=0.80
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk

openmptcprouter/files/etc/uci-defaults/1920-omr-network

@@ -49,8 +49,7 @@ _setup_wan_interface() {
 	[ -n "$4" ] && uci -q set network.$1.type=$4
 }
 
-[ "$(uci -q get "network.lan.proto")" = static ] || \
+uci -q batch <<EOF
-	uci -q batch <<-EOF
 set network.lan=interface
 set network.lan.proto=static
 set network.lan.ipaddr=192.168.100.1
@@ -92,8 +91,16 @@ uci -q set network.lan.ip4table='lan'
 #uci -q set "network.lan.ip6assign=64"
 
 # Create WAN interfaces
-if [ "$(uci -q show network | grep wan)" = "" ]; then
+if [ "$(uci -q show network | grep wan1)" = "" ]; then
-	if [ -d /sys/class/net/eth1 ]; then
+	if [ -d /sys/class/net/wan ]; then
+		uci -q batch <<-EOF
+		delete network.wan
+		EOF
+		_setup_wan_interface wan1 wan master macvlan
+		_setup_wan_interface wan2 wan on macvlan
+		_setup_macvlan wan1
+		_setup_macvlan wan2
+	elif [ -d /sys/class/net/eth1 ]; then
 		if [ -d /sys/class/net/eth2 ]; then
 			_setup_wan_interface wan1 eth1 master
 			_setup_wan_interface wan2 eth2 on

openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks

@@ -2,6 +2,7 @@
 
 NBCPU=$(grep -c '^processor' /proc/cpuinfo | tr -d "\n")
 if [ "$NBCPU" -gt 2 ]; then
+	if [ "$(uci -q get shadowsocks-libev.hi2)" = "" ]; then
 		for c in $(seq 3 $NBCPU); do
 			uci -q batch <<-EOF >/dev/null
 				set shadowsocks-libev.hi$c=ss_redir
@@ -19,5 +20,6 @@ if [ "$NBCPU" -gt 2 ]; then
 			rm -f /tmp/luci-indexcache
 		done
 	fi
+fi
 
 exit 0

openmptcprouter/files/etc/uci-defaults/1940-omr-dns

@@ -1,13 +1,19 @@
 #!/bin/sh
 
+if [ "$(uci -q get unbound.@unbound[0].listen_port | grep 5353)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		set unbound.@unbound[-1].listen_port=5353
 		set unbound.@unbound[-1].protocol="ip4_only"
 		set unbound.@unbound[-1].enabled=1
 		commit unbound
+	EOF
+fi
+if [ "$(uci -q show dhcp | grep 127.0.0.1#5353)" = "" ]; then
+	uci -q batch <<-EOF >/dev/null
 		add_list dhcp.@dnsmasq[-1].server="127.0.0.1#5353"
 		commit dhcp
 	EOF
+fi
 rm -f /tmp/luci-indexcache
 
 exit 0

openmptcprouter/files/etc/uci-defaults/1960-omr-qos

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+if [ "$(uci -q get qos.wan1)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		delete qos.wan
 		set qos.wan1=interface
@@ -24,6 +25,7 @@ uci -q batch <<-EOF >/dev/null
 		set qos.@classify[-1].comments='Steam'
 		commit qos
 	EOF
+fi
 rm -f /tmp/luci-indexcache
 
 exit 0

openmptcprouter/files/etc/uci-defaults/1980-omr-firewall

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+if [ "$(uci -q show firewall | grep Allow-All-Ping)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		add firewall rule
 		set firewall.@rule[-1].enabled='1'
@@ -11,6 +12,7 @@ uci -q batch <<-EOF >/dev/null
 		set firewall.@rule[-1].icmp_type='echo-request'
 		commit firewall
 	EOF
+fi
 rm -f /tmp/luci-indexcache
 
 exit 0

openmptcprouter/files/etc/uci-defaults/1990-omr-tracker

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+if [ "$(uci -q get omr-tracker.tun0)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		set omr-tracker.tun0=interface
 		set omr-tracker.tun0.type="none"
@@ -8,6 +9,7 @@ uci -q batch <<-EOF >/dev/null
 		set omr-tracker.tun0.interval=2
 		commit omr-tracker
 	EOF
+fi
 rm -f /tmp/luci-indexcache
 
 exit 0

shadowsocks-libev/Makefile

@@ -15,7 +15,7 @@ include $(TOPDIR)/rules.mk
 #
 PKG_NAME:=shadowsocks-libev
 PKG_VERSION:=3.1.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION)