patches: change patches to be "git am" compatible

patches/openwrt/001-mac80211_mesh_no_fwding_by_default.patch → patches/openwrt/1001-mac80211_mesh_no_fwding_by_default.patch

@@ -1,3 +1,10 @@
+From: template <nomail@local>
+Date: Fri, 6 Sep 2019 08:29:50 +0000
+Subject: mac80211_mesh_no_fwding_by_default
+
+---
+
+
 diff --git a/package/kernel/mac80211/patches/999-mac80211-mesh-no-forwarding-by-default.patch b/package/kernel/mac80211/patches/999-mac80211-mesh-no-forwarding-by-default.patch
 new file mode 100644
 index 0000000000..5bff861737
@@ -16,3 +23,7 @@ index 0000000000..5bff861737
 + 	.rssi_threshold = MESH_RSSI_THRESHOLD,
 + 	.ht_opmode = IEEE80211_HT_OP_MODE_PROTECTION_NONHT_MIXED,
 + 	.dot11MeshHWMPactivePathToRootTimeout = MESH_PATH_TO_ROOT_TIMEOUT,
+-- 
+2.20.1
+
+

patches/openwrt/002-add_ramips-nexx-image.patch → patches/openwrt/1002-add_ramips-nexx-image.patch

@@ -1,8 +1,6 @@
-commit 1dd4c2929696797625709537bc51f46f00999b6d
-Author: Sven Roederer <[email protected]>
+From: Sven Roederer <[email protected]>
 Date:   Tue May 3 11:31:49 2016 +0200
-
-    ramips: add target for Nexx WT3020-images
+Subject: ramips: add target for Nexx WT3020-images
 
 diff --git a/target/linux/ramips/mt7620/profiles/nexx.mk b/target/linux/ramips/mt7620/profiles/nexx.mk
 new file mode 100644
@@ -27,3 +25,7 @@ index 0000000..9c668c5
 +	Support for Nexx WT3020-series
 +endef
 +$(eval $(call Profile,WT3020))
+-- 
+2.20.1
+
+

patches/openwrt/004-openwrt-release_use_configured_revision.patch → patches/openwrt/1004-openwrt-release_use_configured_revision.patch

@@ -1,3 +1,10 @@
+From: template <nomail@local>
+Date: Fri, 6 Sep 2019 08:29:50 +0000
+Subject: openwrt-release_use_configured_revision
+
+---
+
+
 diff -ur package_a/base-files/files/etc/openwrt_release package/base-files/files/etc/openwrt_release
 --- a/package/base-files/files/etc/openwrt_release	2017-03-06 03:50:57.000000000 +0100
 +++ b/package/base-files/files/etc/openwrt_release	2017-10-30 12:14:34.639257255 +0100
@@ -9,3 +16,7 @@ diff -ur package_a/base-files/files/etc/openwrt_release package/base-files/files
  DISTRIB_TARGET='%S'
  DISTRIB_ARCH='%A'
  DISTRIB_DESCRIPTION='%D %V %C'
+-- 
+2.20.1
+
+

patches/openwrt/005-hostapd_nolegacy_by_default.patch → patches/openwrt/1005-hostapd_nolegacy_by_default.patch

@@ -1,3 +1,10 @@
+From: template <nomail@local>
+Date: Fri, 6 Sep 2019 08:29:50 +0000
+Subject: hostapd_nolegacy_by_default
+
+---
+
+
 diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
 index 1f28661..378b114 100644
 --- a/package/network/services/hostapd/files/hostapd.sh
@@ -11,3 +18,7 @@ index 1f28661..378b114 100644
 
  	[ "$hwmode" = "b" ] && legacy_rates=1
 
+-- 
+2.20.1
+
+

patches/openwrt/600-imagebuilder-custom-postinst-script.patch → patches/openwrt/1600-imagebuilder-custom-postinst-script.patch

@@ -1,3 +1,10 @@
+From: template <nomail@local>
+Date: Fri, 6 Sep 2019 08:29:50 +0000
+Subject: imagebuilder-custom-postinst-script
+
+---
+
+
 diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
 index 95df8bf113..0debd5a882 100644
 --- a/target/imagebuilder/files/Makefile
@@ -12,3 +19,7 @@ index 95df8bf113..0debd5a882 100644
  	$(MAKE) -s build_image
  	$(MAKE) -s checksum
 
+-- 
+2.20.1
+
+

patches/openwrt/700-banner-info.patch → patches/openwrt/1700-banner-info.patch

@@ -1,5 +1,12 @@
+From: template <nomail@local>
+Date: Fri, 6 Sep 2019 08:29:50 +0000
+Subject: banner-info
+
+---
+
+
 --- lede/package/base-files/files/etc/banner	2017-12-10 21:27:21.352612551 +0100
-+++ /tmp/banner	2017-12-10 21:19:20.000000000 +0100
++++ new/package/base-files/files/etc/banner	2017-12-10 21:19:20.000000000 +0100
 @@ -1,8 +1,20 @@
 -  _______                     ________        __
 - |       |.-----.-----.-----.|  |  |  |.----.|  |_
@@ -28,3 +35,7 @@
 + For questions write a mail to <[email protected]>
 + or check https://berlin.freifunk.net/contact for our weekly meetings.
 +
+-- 
+2.20.1
+
+

patches/openwrt/800-mbedtls-accept-rsa-1024.patch → patches/openwrt/1800-mbedtls-accept-rsa-1024.patch

@@ -1,3 +1,10 @@
+From: template <nomail@local>
+Date: Fri, 6 Sep 2019 08:29:50 +0000
+Subject: mbedtls-accept-rsa-1024
+
+---
+
+
 Index: openwrt/package/libs/mbedtls/patches/201-accept-rsa-1024.patch
 ===================================================================
 --- /dev/null
@@ -15,3 +22,7 @@ Index: openwrt/package/libs/mbedtls/patches/201-accept-rsa-1024.patch
 + 
 + /*
 +
+-- 
+2.20.1
+
+

patches/packages/freifunk/701-luci-freifunk-policyrouting-berlin.patch → patches/packages/freifunk/0701-luci-freifunk-policyrouting-berlin.patch

@@ -1,7 +1,32 @@
-Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting
-===================================================================
---- openwrt.orig/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting
-+++ openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting
+From f717dc06d33edaf7b6304f15842ceea86066a923 Mon Sep 17 00:00:00 2001
+From: Sven Roederer <[email protected]>
+Date: Wed, 20 Nov 2019 22:44:02 +0100
+Subject: [PATCH] policy-routing: modify default to berlin-specific version
+
+---
+ .../package/freifunk-policyrouting/Makefile   |   2 +-
+ .../files/etc/config/freifunk-policyrouting   |   6 +-
+ .../etc/hotplug.d/iface/30-policyrouting      |  90 +++++++--------
+ .../files/etc/init.d/freifunk-policyrouting   | 105 +++++++++++++++---
+ 4 files changed, 132 insertions(+), 71 deletions(-)
+
+diff --git a/contrib/package/freifunk-policyrouting/Makefile b/contrib/package/freifunk-policyrouting/Makefile
+index a9301cef3..3a92224ff 100644
+--- a/contrib/package/freifunk-policyrouting/Makefile
++++ b/contrib/package/freifunk-policyrouting/Makefile
+@@ -4,7 +4,7 @@
+ include $(TOPDIR)/rules.mk
+
+ PKG_NAME:=freifunk-policyrouting
+-PKG_RELEASE:=6
++PKG_RELEASE:=7
+
+ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+diff --git a/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting b/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting
+index 3dd2998f9..8a88d030c 100644
+--- a/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting
++++ b/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting
 @@ -1,7 +1,5 @@
 -
  config 'settings' 'pr'
@@ -12,10 +37,10 @@ Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/c
 -
 +	option 'fallback' '0'
 +	option 'zones' 'freifunk'
-Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
-===================================================================
---- openwrt.orig/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
-+++ openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
+diff --git a/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting b/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
+index 327e8793b..fc5d80248 100644
+--- a/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
++++ b/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
 @@ -4,7 +4,7 @@
  . /lib/functions/network.sh
 
@@ -61,7 +86,7 @@ Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/h
  				$cmd
  				if [ "$?" = 0 ]; then
  					logger -s -t policyrouting "Add route: $cmd"
-@@ -33,7 +47,7 @@ if [ "$ACTION" = "ifup" ] && [ "$enable"
+@@ -33,7 +47,7 @@ if [ "$ACTION" = "ifup" ] && [ "$enable" = "1" ]; then
  		fi
 
  		if [ -n "$net6" ]; then
@@ -70,7 +95,7 @@ Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/h
  			$cmd 2>&1 > /dev/null
  			if [ "$?" = 0 ]; then
  				logger -s -t policyrouting "Add route: $cmd (IPv6)"
-@@ -52,51 +66,29 @@ if [ "$ACTION" = "ifup" ] && [ "$enable"
+@@ -52,51 +66,29 @@ if [ "$ACTION" = "ifup" ] && [ "$enable" = "1" ]; then
  		for n in $networks; do
  			if [ "$INTERFACE" = "$n" ]; then
  				for p in $proto; do
@@ -141,10 +166,10 @@ Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/h
  				done
  			fi
  		done
-Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting
-===================================================================
---- openwrt.orig/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting
-+++ openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting
+diff --git a/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting b/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting
+index 4c9172427..18c89f9bb 100755
+--- a/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting
++++ b/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting
 @@ -5,7 +5,7 @@ START=15
  . /lib/functions.sh
 
@@ -154,7 +179,7 @@ Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/i
  [ -f /etc/config/olsrd ] && cfgs="olsrd"
  [ -f /etc/config/olsrd6 ] && cfgs="$cfgs olsrd6"
 
-@@ -92,6 +92,8 @@ add_lookup_rule() {
+@@ -103,6 +103,8 @@ add_lookup_rule() {
  	name=${1/-/_}
  	lookup=$2
  	prio=$3
@@ -163,7 +188,7 @@ Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/i
 
  	if [ -z "$name" -o -z "$lookup" -o -z "$prio" ]; then
  		logger -s -t policyrouting "Missing parameters for add_rule!"
-@@ -102,21 +104,57 @@ add_lookup_rule() {
+@@ -113,21 +115,57 @@ add_lookup_rule() {
  			else
  				rule="rule"
  			fi
@@ -179,19 +204,19 @@ Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/i
 +		done
 +	fi
 +}
-+
-+add_action_rule() {
-+	name=${1/-/_}
-+	action=$2
-+	prio=$3
-+	in=$4
-+	name=$name"_"${in:-allif}"_"
 
 -			uci batch <<- EOF
 -				set network.${name}ipv${p}="$rule"
 -				set network.${name}ipv${p}.lookup="$lookup"
 -				set network.${name}ipv${p}.priority="$prio"
 -			EOF
++add_action_rule() {
++	name=${1/-/_}
++	action=$2
++	prio=$3
++	in=$4
++	name=$name"_"${in:-allif}"_"
++
 +	if [ -z "$name" -o -z "$action" -o -z "$prio" ]; then
 +		logger -s -t policyrouting "Missing parameters for add_action!"
 +	else
@@ -227,7 +252,7 @@ Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/i
  }
 
  start() {
-@@ -124,7 +162,7 @@ start() {
+@@ -135,7 +173,7 @@ start() {
  		logger -s -t policyrouting "Starting policy routing."
  		rt_tables
  		olsrd_intalltables
@@ -236,7 +261,7 @@ Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/i
 
  		add_lookup_rule olsr olsr 1000
  		add_lookup_rule localnets localnets 2000
-@@ -132,6 +170,26 @@ start() {
+@@ -143,6 +181,26 @@ start() {
  		if [ "$fallback" = 1 ]; then
  			add_lookup_rule olsr-default olsr-default 100000
  		fi
@@ -263,7 +288,7 @@ Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/i
  	fi
  	uci commit network
  	if [ ! "$1" = "noservicerestart" ]; then
-@@ -142,20 +200,33 @@ start() {
+@@ -153,20 +211,33 @@ start() {
  stop() {
  	logger -s -t policyrouting "Stopping policy routing"
  	olsrd_rmtables
@@ -306,15 +331,6 @@ Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/i
 -	uci commit network
  	start
  }
-Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/Makefile
-===================================================================
---- openwrt.orig/feeds/freifunk/contrib/package/freifunk-policyrouting/Makefile
-+++ openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/Makefile
-@@ -4,7 +4,7 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=freifunk-policyrouting
--PKG_RELEASE:=6
-+PKG_RELEASE:=7
-
- PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+-- 
+2.20.1
+

patches/packages/freifunk/0703-policyrouting_fix_bypass-vpn.patch

@@ -0,0 +1,21 @@
+From: template <nomail@local>
+Date: Fri, 6 Sep 2019 08:29:50 +0000
+Subject: policyrouting_fix_bypass-vpn
+
+---
+
+
+--- freifunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
++++ freifunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+
++[ "$INTERFACE" = wan ] && exit
++
+ . /lib/functions.sh
+ . /lib/functions/network.sh
+
+-- 
+2.20.1
+
+

patches/packages/freifunk/0704-policyrouting_ignore_ffuplink.patch

@@ -0,0 +1,22 @@
+From: template <nomail@local>
+Date: Fri, 6 Sep 2019 08:29:50 +0000
+Subject: policyrouting_ignore_ffuplink
+
+---
+
+
+diff -ur freifunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting luci/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
+--- freifunk.orig/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting	2017-11-15 03:33:15.000000000 +0100
++++ freifunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting	2017-11-15 03:37:33.930137791 +0100
+@@ -1,6 +1,7 @@
+ #!/bin/sh
+
+ [ "$INTERFACE" = wan ] && exit
++[ "$INTERFACE" = ffuplink ] && exit
+
+ . /lib/functions.sh
+ . /lib/functions/network.sh
+-- 
+2.20.1
+
+