Skip to content
Permalink
Browse files

patches: adapt current patches to new folder-layout

  • Loading branch information...
SvenRoederer committed Jul 10, 2019
1 parent 5a27e9a commit 4ec4507fdef974647122d79f36e56d902c22214e

This file was deleted.

File renamed without changes.
File renamed without changes.
@@ -1,17 +1,10 @@
000-ar71xx-tiny_reduce_kernelsize.patch
001-mac80211_mesh_no_fwding_by_default.patch
002-add_ramips-nexx-image.patch
001-rt2x00_allow_adhoc_and_ap.patch
004-openwrt-release_use_configured_revision.patch
005-hostapd_nolegacy_by_default.patch
007-common-feed-mk.patch
008-add-glinet-ar750_for_ath79.patch
200-wifi_nolegacy_rates_by_default.patch
201-wifi_no_meshfwding_by_default.patch
401-common_no_cronjob_for_dhsmasq.patch
402-common_olsrd-watchdig_via_micrond.patch
600-imagebuilder-custom-postinst-script.patch
700-banner-info.patch
701-luci-freifunk-policyrouting-berlin.patch
703-policyrouting_fix_bypass-vpn.patch
704-policyrouting_ignore_ffuplink.patch
800-mbedtls-accept-rsa-1024.patch
@@ -1,7 +1,7 @@
diff --git a/feeds/freifunk/contrib/package/freifunk-common/files/etc/init.d/freifunk b/feeds/freifunk/contrib/package/freifunk-common/files/etc/init.d/freifunk
index dbe648ae5..ef7dd7c16 100755
--- a/feeds/freifunk/contrib/package/freifunk-common/files/etc/init.d/freifunk
+++ b/feeds/freifunk/contrib/package/freifunk-common/files/etc/init.d/freifunk
--- a/contrib/package/freifunk-common/files/etc/init.d/freifunk
+++ b/contrib/package/freifunk-common/files/etc/init.d/freifunk
@@ -7,10 +7,6 @@ START=99
boot() {
test -f /etc/crontabs/root || touch /etc/crontabs/root
@@ -9,8 +9,8 @@ Date: Sun Apr 28 13:09:14 2019 +0200

diff --git a/feeds/freifunk/contrib/package/freifunk-common/Makefile b/feeds/freifunk/contrib/package/freifunk-common/Makefile
index 196f00d0f..78572f6d6 100644
--- a/feeds/freifunk/contrib/package/freifunk-common/Makefile
+++ b/feeds/freifunk/contrib/package/freifunk-common/Makefile
--- a/contrib/package/freifunk-common/Makefile
+++ b/contrib/package/freifunk-common/Makefile
@@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk

@@ -29,10 +29,10 @@ index 196f00d0f..78572f6d6 100644
endef

define Package/freifunk-common/description
diff --git a/feeds/freifunk/contrib/package/freifunk-common/files/etc/init.d/freifunk b/feeds/freifunk/contrib/package/freifunk-common/files/etc/init.d/freifunk
diff --git a/contrib/package/freifunk-common/files/etc/init.d/freifunk b/contrib/package/freifunk-common/files/etc/init.d/freifunk
index ef7dd7c16..56a795ff9 100755
--- a/feeds/freifunk/contrib/package/freifunk-common/files/etc/init.d/freifunk
+++ b/feeds/freifunk/contrib/package/freifunk-common/files/etc/init.d/freifunk
--- a/contrib/package/freifunk-common/files/etc/init.d/freifunk
+++ b/contrib/package/freifunk-common/files/etc/init.d/freifunk
@@ -7,10 +7,6 @@ START=99
boot() {
test -f /etc/crontabs/root || touch /etc/crontabs/root
@@ -44,10 +44,10 @@ index ef7dd7c16..56a795ff9 100755
[ -d /etc/rc.local.d ] && {
for file in /etc/rc.local.d/*; do
test -f "$file" && . "$file"
diff --git a/feeds/freifunk/contrib/package/freifunk-common/files/usr/lib/micron.d/ff_olsr_watchdog b/feeds/freifunk/contrib/package/freifunk-common/files/usr/lib/micron.d/ff_olsr_watchdog
diff --git a/contrib/package/freifunk-common/files/usr/lib/micron.d/ff_olsr_watchdog b/contrib/package/freifunk-common/files/usr/lib/micron.d/ff_olsr_watchdog
new file mode 100644
index 000000000..23d8be696
--- /dev/null
+++ b/feeds/freifunk/contrib/package/freifunk-common/files/usr/lib/micron.d/ff_olsr_watchdog
+++ b/contrib/package/freifunk-common/files/usr/lib/micron.d/ff_olsr_watchdog
@@ -0,0 +1 @@
+*/5 * * * * /usr/sbin/ff_olsr_watchdog
@@ -1,7 +1,7 @@
Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting
Index: openwrt/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
--- openwrt.orig/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting
+++ openwrt/contrib/package/freifunk-policyrouting/files/etc/config/freifunk-policyrouting
@@ -1,7 +1,5 @@
-
config 'settings' 'pr'
@@ -12,10 +12,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
Index: openwrt/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
--- openwrt.orig/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
+++ openwrt/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
@@ -4,7 +4,7 @@
. /lib/functions/network.sh

@@ -141,10 +141,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
Index: openwrt/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
--- openwrt.orig/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting
+++ openwrt/contrib/package/freifunk-policyrouting/files/etc/init.d/freifunk-policyrouting
@@ -5,7 +5,7 @@ START=15
. /lib/functions.sh

@@ -306,10 +306,10 @@ Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/i
- uci commit network
start
}
Index: openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/Makefile
Index: openwrt/contrib/package/freifunk-policyrouting/Makefile
===================================================================
--- openwrt.orig/feeds/freifunk/contrib/package/freifunk-policyrouting/Makefile
+++ openwrt/feeds/freifunk/contrib/package/freifunk-policyrouting/Makefile
--- openwrt.orig/contrib/package/freifunk-policyrouting/Makefile
+++ openwrt/contrib/package/freifunk-policyrouting/Makefile
@@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk

@@ -0,0 +1,10 @@
--- a/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting
+++ b/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

@@ -1,6 +1,6 @@
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
--- a/feeds/freifunk.orig/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting 2017-11-15 03:33:15.000000000 +0100
+++ b/feeds/freifunk/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting 2017-11-15 03:37:33.930137791 +0100
--- a/contrib/package/freifunk-policyrouting/files/etc/hotplug.d/iface/30-policyrouting 2017-11-15 03:33:15.000000000 +0100
+++ b/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

@@ -0,0 +1,5 @@
401-common_no_cronjob_for_dhsmasq.patch
402-common_olsrd-watchdig_via_micrond.patch
701-luci-freifunk-policyrouting-berlin.patch
703-policyrouting_fix_bypass-vpn.patch
704-policyrouting_ignore_ffuplink.patch
@@ -1,7 +1,7 @@
diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
index c0bb38030..877395a36 100644
--- a/feeds/luci/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
+++ b/feeds/luci/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
@@ -230,7 +230,7 @@ if hwtype == "mac80211" then

legacyrates = s:taboption("advanced", Flag, "legacy_rates", translate("Allow legacy 802.11b rates"))
@@ -1,6 +1,6 @@
diff -ur modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua mod-patch/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
--- a/feeds/luci/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua 2018-07-22 03:35:34.309103302 +0200
+++ b/feeds/luci/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua 2018-07-22 13:32:28.000000000 +0200
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua 2018-07-22 03:35:34.309103302 +0200
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua 2018-07-22 13:32:28.000000000 +0200
@@ -370,7 +370,7 @@

meshfwd = s:taboption("advanced", Flag, "mesh_fwding", translate("Forward mesh peer traffic"))
@@ -0,0 +1,2 @@
200-wifi_nolegacy_rates_by_default.patch
201-wifi_no_meshfwding_by_default.patch

0 comments on commit 4ec4507

Please sign in to comment.
You can’t perform that action at this time.