diff options
Diffstat (limited to 'contrib')
13 files changed, 103 insertions, 17 deletions
diff --git a/contrib/package/community-profiles/files/etc/config/profile_berlin b/contrib/package/community-profiles/files/etc/config/profile_berlin index e1e4eda91b..e4388c76e3 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_berlin +++ b/contrib/package/community-profiles/files/etc/config/profile_berlin @@ -3,7 +3,7 @@ config 'community' 'profile' option 'homepage' 'http://berlin.freifunk.net' option 'ssid' 'berlin.freifunk.net' option 'ssid_scheme' 'addchannelbefore' - option 'mesh_network' '104.0.0.0/8' + option 'mesh_network' '10.0.0.0/8' option 'splash_network' '10.104.0.0/16' option 'splash_prefix' '27' option 'latitude' '52.52075' @@ -33,7 +33,7 @@ config 'defaults' 'ssidscheme' config 'defaults' 'interface' option 'netmask' '255.255.255.255' - option 'dns' '85.214.20.141 194.150.168.168 2001:4ce8::53 2001:910:800::12' + option 'dns' '85.214.20.141 80.67.169.40 194.150.168.168 2001:4ce8::53 2001:910:800::12' config 'dhcp' 'dhcp' option leasetime '5m' diff --git a/contrib/package/community-profiles/files/etc/config/profile_cottbus b/contrib/package/community-profiles/files/etc/config/profile_cottbus index 9b08acc256..6c7f4b6966 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_cottbus +++ b/contrib/package/community-profiles/files/etc/config/profile_cottbus @@ -31,7 +31,7 @@ config 'defaults' 'ssidscheme' config 'defaults' 'interface' option 'netmask' '255.255.255.255' - option 'dns' '85.214.20.141 194.150.168.168 2001:4ce8::53 2001:910:800::12' + option 'dns' '85.214.20.141 80.67.169.40 194.150.168.168 2001:4ce8::53 2001:910:800::12' config 'dhcp' 'dhcp' option 'leasetime' '5m' diff --git a/contrib/package/community-profiles/files/etc/config/profile_fuerstenwalde b/contrib/package/community-profiles/files/etc/config/profile_fuerstenwalde new file mode 100644 index 0000000000..f7df7ba650 --- /dev/null +++ b/contrib/package/community-profiles/files/etc/config/profile_fuerstenwalde @@ -0,0 +1,38 @@ +config 'community' 'profile' + option 'name' 'Freifunk Fürstenwalde' + option 'homepage' 'http://fuerstenwalde.freifunk.net' + option 'ssid' 'fuerstenwalde.freifunk.net' + option 'ssid_scheme' 'addchannelbefore' + option 'mesh_network' '10.0.0.0/8' + option 'splash_network' '10.104.0.0/16' + option 'splash_prefix' '27' + option 'latitude' '52.35844' + option 'longitude' '14.063696' + option 'owm_api' 'http://util.berlin.freifunk.net' + +config 'defaults' 'wifi_device' + option 'channel' '13' + +config 'defaults' 'wifi_device_5' + option 'channel' '36' + +config 'defaults' 'wifi_iface' + option 'mcast_rate' '6000' + +config 'defaults' 'wifi_iface_5' + option 'mcast_rate' '12000' + +config 'defaults' 'bssidscheme' + option '13' 'D2:CA:FF:EE:BA:BE' + option '36' '02:36:CA:FF:EE:EE' + +config 'defaults' 'ssidscheme' + option '13' 'intern-ch13.freifunk.net' + option '36' 'intern-ch36.freifunk.net' + +config 'defaults' 'interface' + option 'netmask' '255.255.255.255' + option 'dns' '85.214.20.141 80.67.169.40 194.150.168.168 2001:4ce8::53 2001:910:800::12' + +config 'dhcp' 'dhcp' +option leasetime '5m' diff --git a/contrib/package/community-profiles/files/etc/config/profile_potsdam b/contrib/package/community-profiles/files/etc/config/profile_potsdam index 84bbdfe528..78db579a93 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_potsdam +++ b/contrib/package/community-profiles/files/etc/config/profile_potsdam @@ -11,7 +11,7 @@ config 'community' 'profile' config 'defaults' 'interface' option 'netmask' '255.255.0.0' - option 'dns' '85.214.20.141 194.150.168.168' + option 'dns' '85.214.20.141 80.67.169.40 194.150.168.168' option 'delegate' '0' config 'defaults' 'wifi_device' diff --git a/contrib/package/community-profiles/files/etc/config/profile_tulumlibre b/contrib/package/community-profiles/files/etc/config/profile_tulumlibre index c028a66614..ceaff2a743 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_tulumlibre +++ b/contrib/package/community-profiles/files/etc/config/profile_tulumlibre @@ -7,4 +7,4 @@ config 'community' 'profile' option 'splash_prefix' '28' config 'defaults' 'interface' - option 'dns' '216.87.84.211' + option 'dns' '80.67.169.40 216.87.84.211' diff --git a/contrib/package/csstidy/Makefile b/contrib/package/csstidy/Makefile new file mode 100644 index 0000000000..83f8f08026 --- /dev/null +++ b/contrib/package/csstidy/Makefile @@ -0,0 +1,39 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=csstidy +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL=https://github.com/jow-/csstidy-cpp.git +PKG_SOURCE_DATE:=2018-12-20 +PKG_SOURCE_VERSION:=1d5620149ae35c0d49fb2014d4e63a23ecfb6f69 +PKG_MIRROR_HASH:=3210d475f6ae966d4dfcd3e1f7fcbf0ad9507a37878d50de015ffe795c1d160e + +PKG_LICENSE:=LGPL-2.1 +PKG_LICENSE_FILES:=COPYING + +PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +define Package/csstidy + SECTION:=utils + CATEGORY:=Utilities + TITLE:=CSSTidy parser and optimiser + DEPENDS:=+libstdcpp +endef + +define Package/csstidy/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/csstidy/csstidy $(1)/usr/bin/ +endef + + +define Host/Install + $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/ + $(INSTALL_BIN) $(HOST_BUILD_DIR)/csstidy/csstidy $(1)/bin/ +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,csstidy)) diff --git a/contrib/package/freifunk-common/files/usr/bin/neigh.sh b/contrib/package/freifunk-common/files/usr/bin/neigh.sh index 468ed7a3e0..82589ecfdf 100755 --- a/contrib/package/freifunk-common/files/usr/bin/neigh.sh +++ b/contrib/package/freifunk-common/files/usr/bin/neigh.sh @@ -10,7 +10,7 @@ hostsfile_getname() while value="$( uci -q get $config.@LoadPlugin[$i].library )"; do { case "$value" in - 'olsrd_nameservice.so.'*) + 'olsrd_nameservice'*) file="$( uci -q get $config.@LoadPlugin[$i].hosts_file )" break ;; diff --git a/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog b/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog index 069f4c3217..af1d7ca68d 100755 --- a/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog +++ b/contrib/package/freifunk-common/files/usr/sbin/ff_olsr_watchdog @@ -11,7 +11,7 @@ if fs.access("/var/run/olsrd.pid") or fs.access("/var/run/olsrd4.pid") then x:foreach("olsrd", "LoadPlugin", function(s) - if s.library == "olsrd_watchdog.so.0.1" then + if s.library == "olsrd_watchdog" then intv = tonumber(s.interval) stamp = s.file end @@ -23,6 +23,15 @@ if fs.access("/var/run/olsrd.pid") or fs.access("/var/run/olsrd4.pid") then if not wdgtime or ( systime - wdgtime ) > ( intv * 2 ) then os.execute("logger -t 'OLSR watchdog' 'Process died - restarting!'") + local tnls = io.popen("ip tunnel show | cut -d : -f 1") + while true do + tnl = tnls:read("*line") + if tnl == nil then break end + if string.find(tnl, "tnl_") == 1 then + os.execute(string.format("logger -t 'OLSR watchdog' 'Deleting stale tunnel %s'", tnl)) + os.execute(string.format("ip link del %s", tnl)) + end + end os.execute("/etc/init.d/olsrd restart") end end diff --git a/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh b/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh index 40a077f154..b06e145d65 100755 --- a/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh +++ b/contrib/package/freifunk-mapupdate/files/usr/sbin/ff_mapupdate.sh @@ -8,7 +8,7 @@ MAPSERVER="$(uci -q get freifunk-mapupdate.mapupdate.mapserver)" [ -z "$MAPSERVER" ] && logger -t "freifunk-mapupdate:" "No mapserver configured" && exit 1 #check if nameservice plugin is installed and enabled, else exit -nslib=`uci show olsrd |grep olsrd_nameservice.so |awk {' FS="."; print $1"."$2 '}` +nslib=`uci show olsrd |grep olsrd_nameservice |awk {' FS="."; print $1"."$2 '}` if [ -n "$nslib" ]; then LATLONFILE="$(uci -q get $nslib.latlon_file)" if [ -z "$LATLONFILE" ]; then diff --git a/contrib/package/freifunk-watchdog/src/watchdog.c b/contrib/package/freifunk-watchdog/src/watchdog.c index f546985c9c..4bc3ab0b67 100644 --- a/contrib/package/freifunk-watchdog/src/watchdog.c +++ b/contrib/package/freifunk-watchdog/src/watchdog.c @@ -21,7 +21,7 @@ /* Global watchdog fd, required by signal handler */ int wdfd = -1; -/* Handle finished childs */ +/* Handle finished children */ static void sigchld_handler(int sig) { pid_t pid; @@ -406,7 +406,7 @@ static int do_daemon(void) ioctl(wdfd, WDIOC_SETTIMEOUT, &wdtimeout); } - /* Install signal handler to reap childs */ + /* Install signal handler to reap children */ sa.sa_handler = sigchld_handler; sa.sa_flags = 0; sigaction(SIGCHLD, &sa, NULL); diff --git a/contrib/package/freifunk-watchdog/src/watchdog.h b/contrib/package/freifunk-watchdog/src/watchdog.h index 6f2382de38..c622856dae 100644 --- a/contrib/package/freifunk-watchdog/src/watchdog.h +++ b/contrib/package/freifunk-watchdog/src/watchdog.h @@ -64,7 +64,7 @@ #define WATCH_SHUTDOWN 'V' #define WATCH_KEEPALIVE '\0' -/* System load error action and treshold */ +/* System load error action and threshold */ #define LOAD_TRESHOLD 15.00 #define LOAD_ACTION "/sbin/reboot", "/sbin/reboot" diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh index b0f6cb291e..0b99530a57 100644 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/functions.sh @@ -46,7 +46,7 @@ set_defaults() { b="${b//_/ }" string_contains "$a" "_LENGTH" && continue string_contains "$a" "_ITEM" && { - # special threatment for lists. use add_list and remove the + # special treatment for lists. use add_list and remove the # item index (_ITEMx). uci add_list $2.${a//_ITEM[0-9]*/}="$b" } || { diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh index 9ebcb46b13..a435e4b1b8 100755 --- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh +++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_olsrd.sh @@ -73,7 +73,7 @@ setup_nameservice() { uci batch <<- EOF set $cfg.olsrd_nameservice=LoadPlugin - set $cfg.olsrd_nameservice.library="olsrd_nameservice.so.0.4" + set $cfg.olsrd_nameservice.library="olsrd_nameservice" set $cfg.olsrd_nameservice.latlon_file="$llfile" set $cfg.olsrd_nameservice.hosts_file="$hosts" set $cfg.olsrd_nameservice.sighup_pid_file="/var/run/dnsmasq.pid" @@ -91,7 +91,7 @@ setup_dyngw_plain() { if [ "$general_sharenet" == 1 ]; then uci set $cfg.dyngw_plain=LoadPlugin uci set $cfg.dyngw_plain.ignore=0 - uci set $cfg.dyngw_plain.library="olsrd_dyn_gw_plain.so.0.4" + uci set $cfg.dyngw_plain.library="olsrd_dyn_gw_plain" uci_commitverbose "Setup olsrd_dyngw_plain plugin" $cfg fi @@ -106,7 +106,7 @@ setup_watchdog() { uci batch <<- EOF set $cfg.olsrd_watchdog=LoadPlugin - set $cfg.olsrd_watchdog.library="olsrd_watchdog.so.0.1" + set $cfg.olsrd_watchdog.library="olsrd_watchdog" set $cfg.olsrd_watchdog.file="$watchdogfile" set $cfg.olsrd_watchdog.interval=30 EOF @@ -118,7 +118,7 @@ setup_jsoninfo() { proto="$1" uci batch <<- EOF set $cfg.olsrd_jsoninfo=LoadPlugin - set $cfg.olsrd_jsoninfo.library="olsrd_jsoninfo.so.1.1" + set $cfg.olsrd_jsoninfo.library="olsrd_jsoninfo" EOF if [ "$proto" = "6" ]; then uci set $cfg.olsrd_jsoninfo.ipv6only='1' @@ -130,7 +130,7 @@ setup_txtinfo() { proto="$1" uci batch <<- EOF set $cfg.olsrd_txtinfo=LoadPlugin - set $cfg.olsrd_txtinfo.library="olsrd_txtinfo.so.1.1" + set $cfg.olsrd_txtinfo.library="olsrd_txtinfo" EOF if [ "$proto" = "6" ]; then uci set $cfg.olsrd_txtinfo.ipv6only='1' |