From: Simon Wunderlich Date: Thu, 27 Aug 2020 08:27:16 +0000 (+0200) Subject: Merge pull request #602 from ecsv/batadv-2020.3 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=741a6b9f7718a02d0e42c1787426fb17de416ab9;hp=c201b00922f0ee92b146bb18d15d8456fbff5ec7;p=feed%2Frouting.git Merge pull request #602 from ecsv/batadv-2020.3 batman-adv: upgrade package to latest release 2020.3 --- diff --git a/bird2/Makefile b/bird2/Makefile index fc3d1c2..6962eed 100644 --- a/bird2/Makefile +++ b/bird2/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bird2 PKG_VERSION:=2.0.7 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird diff --git a/bird2/patches/010-gcc10.patch b/bird2/patches/010-gcc10.patch new file mode 100644 index 0000000..172646b --- /dev/null +++ b/bird2/patches/010-gcc10.patch @@ -0,0 +1,30 @@ +From 4bbc10614f3431c37e6352f5a6ea5c693c31021e Mon Sep 17 00:00:00 2001 +From: Maria Matejka +Date: Tue, 4 Feb 2020 10:11:16 +0100 +Subject: [PATCH] Added missing extern +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thanks to Robert Scheck who reported it +and Toke Høiland-Jørgensen who suggested this patch. +--- + nest/route.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nest/route.h b/nest/route.h +index d2a07f09..b927db5f 100644 +--- a/nest/route.h ++++ b/nest/route.h +@@ -458,7 +458,7 @@ typedef struct rta { + protocol-specific metric is availabe */ + + +-const char * rta_dest_names[RTD_MAX]; ++extern const char * rta_dest_names[RTD_MAX]; + + static inline const char *rta_dest_name(uint n) + { return (n < RTD_MAX) ? rta_dest_names[n] : "???"; } +-- +2.26.2 + diff --git a/bmx7/Makefile b/bmx7/Makefile index 62cc16b..6e71222 100644 --- a/bmx7/Makefile +++ b/bmx7/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bmx7 PKG_VERSION:=7.1.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/bmx-routing/bmx7/tar.gz/v$(PKG_VERSION)? diff --git a/bmx7/patches/010-gcc10.patch b/bmx7/patches/010-gcc10.patch new file mode 100644 index 0000000..d2b9fcb --- /dev/null +++ b/bmx7/patches/010-gcc10.patch @@ -0,0 +1,11 @@ +--- a/src/bmx.h ++++ b/src/bmx.h +@@ -290,7 +290,7 @@ enum ADGSN { + #define SUCCESS 0 + #define FAILURE -1 + +-const void* FAILURE_PTR; ++extern const void* FAILURE_PTR; + + + #define MAX_SELECT_TIMEOUT_MS 1100 /* MUST be smaller than (1000/2) to fit into max tv_usec */ diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile index 777db08..9cce816 100644 --- a/nodogsplash/Makefile +++ b/nodogsplash/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nodogsplash PKG_FIXUP:=autoreconf -PKG_VERSION:=4.4.0 +PKG_VERSION:=5.0.0 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://codeload.github.com/nodogsplash/nodogsplash/tar.gz/v$(PKG_VERSION)? PKG_SOURCE:=nodogsplash-$(PKG_VERSION).tar.gz -PKG_HASH:=6f309847f36be85cdbdd2f940f44791c53c64657fa8253c6318f913da95c1e9c +PKG_HASH:=a7665f4a42997746a31e9217f2f54e360aa7fc4bc72bd89faa08f1ccf7875b5e PKG_BUILD_DIR:=$(BUILD_DIR)/nodogsplash-$(PKG_VERSION) PKG_MAINTAINER:=Moritz Warning @@ -59,10 +59,6 @@ define Package/nodogsplash/install $(CP) $(PKG_BUILD_DIR)/openwrt/nodogsplash/files/etc/init.d/nodogsplash $(1)/etc/init.d/ $(CP) $(PKG_BUILD_DIR)/openwrt/nodogsplash/files/etc/uci-defaults/40_nodogsplash $(1)/etc/uci-defaults/ $(CP) $(PKG_BUILD_DIR)/openwrt/nodogsplash/files/usr/lib/nodogsplash/restart.sh $(1)/usr/lib/nodogsplash/ - $(CP) $(PKG_BUILD_DIR)/forward_authentication_service/PreAuth/demo-preauth.sh $(1)/usr/lib/nodogsplash/login.sh - $(CP) $(PKG_BUILD_DIR)/forward_authentication_service/libs/get_client_interface.sh $(1)/usr/lib/nodogsplash/ - $(CP) $(PKG_BUILD_DIR)/forward_authentication_service/libs/unescape.sh $(1)/usr/lib/nodogsplash/ - $(CP) $(PKG_BUILD_DIR)/forward_authentication_service/fas-aes/fas-aes.php $(1)/etc/nodogsplash/ endef define Package/nodogsplash/postrm diff --git a/olsrd/Makefile b/olsrd/Makefile index 7eb05e9..8a2f33a 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd PKG_SOURCE_DATE:=2020-06-18 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git diff --git a/olsrd/patches/010-musl.patch b/olsrd/patches/010-musl.patch new file mode 100644 index 0000000..3023f43 --- /dev/null +++ b/olsrd/patches/010-musl.patch @@ -0,0 +1,11 @@ +--- a/lib/pud/nmealib/src/info.c ++++ b/lib/pud/nmealib/src/info.c +@@ -172,7 +172,7 @@ bool nmeaTimeParseDate(const char *s, NmeaTime *date) { + void nmeaTimeSet(NmeaTime *utc, uint32_t *present, struct timeval *timeval) { + struct timeval tv; + struct tm tm; +- long usec; ++ time_t usec; + + if (!utc) { + return; diff --git a/opennds/Makefile b/opennds/Makefile index 71e8597..2fb801d 100644 --- a/opennds/Makefile +++ b/opennds/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=opennds PKG_FIXUP:=autoreconf -PKG_VERSION:=5.1.0 +PKG_VERSION:=6.0.0 PKG_RELEASE:=1 PKG_SOURCE_URL:=https://codeload.github.com/opennds/opennds/tar.gz/v$(PKG_VERSION)? PKG_SOURCE:=opennds-$(PKG_VERSION).tar.gz -PKG_HASH:=738c52d3d889edd02cd5935f5fcbc78fed0bd2163449a1947d00e755b7ae5b08 +PKG_HASH:=fff18a2871039a58a12794ecc6dacf77257f4bcc7bfa994ba9de70e0b786f322 PKG_BUILD_DIR:=$(BUILD_DIR)/openNDS-$(PKG_VERSION) PKG_MAINTAINER:=Rob White