diff --git a/build/build.sh b/build/build.sh index ac4f74fc..ec8d50ce 100755 --- a/build/build.sh +++ b/build/build.sh @@ -26,7 +26,7 @@ function usage() { echo else echo "branch names:" - echo " master openwrt-22.03 openwrt-21.02" + echo " master openwrt-23.05 openwrt-22.03" echo echo "arch names:" echo " run build/build.sh with a branch name to see available arch names" @@ -74,6 +74,7 @@ unbuf="stdbuf --output=0 --error=0" ( # pick the right URL dlurl="$dlmirror/snapshots/targets" + [ "$branch" == "openwrt-23.05" ] && dlurl="$dlmirror/releases/23.05-SNAPSHOT/targets" [ "$branch" == "openwrt-22.03" ] && dlurl="$dlmirror/releases/22.03-SNAPSHOT/targets" [ "$branch" == "openwrt-21.02" ] && dlurl="$dlmirror/releases/21.02-SNAPSHOT/targets" diff --git a/build/targets-master.txt b/build/targets-master.txt index 9fa8f037..9ccfb5b5 100644 --- a/build/targets-master.txt +++ b/build/targets-master.txt @@ -16,10 +16,11 @@ arm_cortex-a9_vfpv3-d16 mvebu/cortexa9 tegra/generic arm_fa526 gemini/generic arm_mpcore oxnas/ox820 arm_xscale kirkwood/generic +armeb_xscale ixp4xx/generic i386_pentium-mmx x86/legacy x86/geode i386_pentium4 x86/generic mips64_octeonplus octeon/generic -mips_24kc ath79/generic ath79/mikrotik ath79/nand ath79/tiny lantiq/xway lantiq/xway_legacy malta/be realtek/rtl839x realtek/rtl930x realtek/rtl931x +mips_24kc ath79/generic ath79/mikrotik ath79/nand ath79/tiny lantiq/xrx200 lantiq/xway lantiq/xway_legacy malta/be realtek/rtl839x realtek/rtl930x realtek/rtl931x mips_4kec realtek/rtl838x mips_mips32 bmips/bcm6318 bmips/bcm6328 bmips/bcm6358 bmips/bcm6362 bmips/bcm6368 bmips/bcm63268 lantiq/ase mipsel_24kc ramips/mt7620 ramips/mt7621 ramips/mt76x8 ramips/rt288x ramips/rt305x diff --git a/build/targets-openwrt-23.05.txt b/build/targets-openwrt-23.05.txt index 57e259e6..7010dd7a 100644 --- a/build/targets-openwrt-23.05.txt +++ b/build/targets-openwrt-23.05.txt @@ -19,7 +19,7 @@ arm_xscale kirkwood/generic i386_pentium-mmx x86/legacy x86/geode i386_pentium4 x86/generic mips64_octeonplus octeon/generic -mips_24kc ath79/generic ath79/mikrotik ath79/nand ath79/tiny lantiq/xway lantiq/xway_legacy malta/be realtek/rtl839x realtek/rtl930x realtek/rtl931x +mips_24kc ath79/generic ath79/mikrotik ath79/nand ath79/tiny lantiq/xrx200 lantiq/xway lantiq/xway_legacy malta/be realtek/rtl839x realtek/rtl930x realtek/rtl931x mips_4kec realtek/rtl838x mips_mips32 bcm63xx/generic bcm63xx/smp bmips/bcm6318 bmips/bcm6328 bmips/bcm6358 bmips/bcm6362 bmips/bcm6368 bmips/bcm63268 lantiq/ase mipsel_24kc ramips/mt7620 ramips/mt7621 ramips/mt76x8 ramips/rt288x ramips/rt305x diff --git a/build/targets-testbuildbot.txt b/build/targets-testbuildbot.txt index 9fa8f037..15a80c22 100644 --- a/build/targets-testbuildbot.txt +++ b/build/targets-testbuildbot.txt @@ -1,32 +1,6 @@ # Generated by 'openwrt.git/scripts/dump-target-info.pl architectures' -aarch64_cortex-a53 bcm27xx/bcm2710 bcm4908/generic mediatek/mt7622 mediatek/filogic mvebu/cortexa53 qualcommax/ipq807x sunxi/cortexa53 -aarch64_cortex-a72 bcm27xx/bcm2711 mvebu/cortexa72 -aarch64_generic armsr/armv8 layerscape/armv8_64b octeontx/generic rockchip/armv8 -arm_arm1176jzf-s_vfp bcm27xx/bcm2708 -arm_arm926ej-s at91/sam9x mxs/generic -arm_cortex-a15_neon-vfpv4 armsr/armv7 ipq806x/generic ipq806x/chromium -arm_cortex-a5_vfpv4 at91/sama5 -arm_cortex-a7 mediatek/mt7629 -arm_cortex-a7_neon-vfpv4 bcm27xx/bcm2709 imx/cortexa7 ipq40xx/generic ipq40xx/chromium ipq40xx/mikrotik layerscape/armv7 mediatek/mt7623 sunxi/cortexa7 -arm_cortex-a7_vfpv4 at91/sama7 -arm_cortex-a8_vfpv3 sunxi/cortexa8 -arm_cortex-a9 bcm53xx/generic -arm_cortex-a9_neon imx/cortexa9 zynq/generic -arm_cortex-a9_vfpv3-d16 mvebu/cortexa9 tegra/generic -arm_fa526 gemini/generic -arm_mpcore oxnas/ox820 -arm_xscale kirkwood/generic -i386_pentium-mmx x86/legacy x86/geode -i386_pentium4 x86/generic -mips64_octeonplus octeon/generic -mips_24kc ath79/generic ath79/mikrotik ath79/nand ath79/tiny lantiq/xway lantiq/xway_legacy malta/be realtek/rtl839x realtek/rtl930x realtek/rtl931x -mips_4kec realtek/rtl838x -mips_mips32 bmips/bcm6318 bmips/bcm6328 bmips/bcm6358 bmips/bcm6362 bmips/bcm6368 bmips/bcm63268 lantiq/ase -mipsel_24kc ramips/mt7620 ramips/mt7621 ramips/mt76x8 ramips/rt288x ramips/rt305x -mipsel_24kc_24kf pistachio/generic -mipsel_74kc bcm47xx/mips74k ramips/rt3883 -mipsel_mips32 bcm47xx/generic bcm47xx/legacy -powerpc_464fp apm821xx/nand apm821xx/sata -powerpc_8548 mpc85xx/p1010 mpc85xx/p1020 mpc85xx/p2020 -riscv64_riscv64 sifiveu/generic +aarch64_generic armsr/armv8 +arm_cortex-a7_neon-vfpv4 ipq40xx/generic ipq40xx/mikrotik +mips_24kc ath79/tiny +mipsel_24kc ramips/mt7621 x86_64 x86/64 diff --git a/packages/falter-berlin-firewall-defaults/Makefile b/packages/falter-berlin-firewall-defaults/Makefile deleted file mode 100644 index fd7f357a..00000000 --- a/packages/falter-berlin-firewall-defaults/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -include $(TOPDIR)/rules.mk - -PKG_NAME:=falter-berlin-firewall-defaults -PKG_VERSION:=3 - -include $(INCLUDE_DIR)/package.mk - -define Package/falter-berlin-firewall-defaults - SECTION:=falter-berlin - CATEGORY:=falter-berlin - TITLE:=Freifunk Berlin firewall default configuration - URL:=http://github.com/freifunk-berlin/packages_berlin - EXTRA_DEPENDS:=firewall4 - PKGARCH:=all -endef - -define Package/falter-berlin-firewall-defaults/description - Freifunk Berlin configuration files for firewall -endef - -define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) -endef - -define Build/Configure -endef - -define Build/Compile -endef - -define Package/falter-berlin-firewall-defaults/install - $(INSTALL_DIR) $(1)/etc/uci-defaults - $(CP) ./uci-defaults/* $(1)/etc/uci-defaults -endef - -$(eval $(call BuildPackage,falter-berlin-firewall-defaults)) diff --git a/packages/falter-berlin-firewall-defaults/uci-defaults/freifunk-berlin-firewall-defaults b/packages/falter-berlin-firewall-defaults/uci-defaults/freifunk-berlin-firewall-defaults deleted file mode 100644 index 4fc5cada..00000000 --- a/packages/falter-berlin-firewall-defaults/uci-defaults/freifunk-berlin-firewall-defaults +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/sh - -. /lib/functions/guard.sh -guard "firewall" - -# reset firewall config -uci import firewall <&2 && exit 1 - -host="${1:-leipzig.freifunk.net}" - -wget -O /dev/null "http://$host/cgi-bin-dev-zero.bin" -test "$?" = "1" && wget -O /dev/null "http://$host/cgi-bin/dev-zero.bin" -test "$?" = "1" && wget -O /dev/null "http://$host/cgi-bin/luci/freifunk/status/zeroes" -test "$?" = "1" && echo "$host: no zero download found..." && exit 1 diff --git a/packages/falter-common/files-more/etc/uci-defaults/freifunk-berlin-firewall-defaults b/packages/falter-common/files-more/etc/uci-defaults/freifunk-berlin-firewall-defaults new file mode 100644 index 00000000..a4d19c24 --- /dev/null +++ b/packages/falter-common/files-more/etc/uci-defaults/freifunk-berlin-firewall-defaults @@ -0,0 +1,134 @@ +#!/bin/sh + +# shellcheck disable=SC1091 +# shellcheck disable=SC2140 + +. /lib/functions/guard.sh +guard "firewall" + +# reset firewall config +uci import firewall <&2 && exit 1 - -host="${1:-leipzig.freifunk.net}" - -wget -O /dev/null "http://$host/cgi-bin-dev-zero.bin" -test "$?" = "1" && wget -O /dev/null "http://$host/cgi-bin/dev-zero.bin" -test "$?" = "1" && wget -O /dev/null "http://$host/cgi-bin/luci/freifunk/status/zeroes" -test "$?" = "1" && echo "$host: no zero download found..." && exit 1 diff --git a/packages/tunspace/tunspace.uc b/packages/tunspace/tunspace.uc index 9a11fbb2..b221889f 100644 --- a/packages/tunspace/tunspace.uc +++ b/packages/tunspace/tunspace.uc @@ -11,6 +11,11 @@ // - [x] test multiple ifaces // - [x] bug: possible multiple use of servers // - [x] better logging +// - [ ] disable strom temporarily +// - [ ] nftables rules for mss clamping +// - [ ] retry dhcp on boot +// - [ ] less logging +// - [ ] omit dhcp if lease isn't old, allows for more frequent maintenance intervals // - [ ] implement check_cert option // - [ ] implement disabled option // - [ ] warn if ipv6 RA is disabled