Re: [OpenWrt-Devel] [PATCH] openssl: update to 1.0.2r
Stijn Segers schreef op 6 april 2019 23:16:31 CEST: >This bump contains bug and security fixes. > >Compile-tested on ar71xx, ramips/mt7621 and x86/64. >Run-tested on ramips/mt7621. > >Signed-off-by: Stijn Segers >--- > package/libs/openssl/Makefile | 4 ++-- > package/libs/openssl/patches/200-parallel_build.patch | 8 > 2 files changed, 6 insertions(+), 6 deletions(-) > >diff --git a/package/libs/openssl/Makefile >b/package/libs/openssl/Makefile >index a4781e9eee..1eaf273468 100644 >--- a/package/libs/openssl/Makefile >+++ b/package/libs/openssl/Makefile >@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk > > PKG_NAME:=openssl > PKG_BASE:=1.0.2 >-PKG_BUGFIX:=q >+PKG_BUGFIX:=r > PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX) > PKG_RELEASE:=1 > PKG_USE_MIPS16:=0 >@@ -24,7 +24,7 @@ PKG_SOURCE_URL:= \ > http://gd.tuwien.ac.at/infosys/security/openssl/source/ \ > http://www.openssl.org/source/ \ > http://www.openssl.org/source/old/$(PKG_BASE)/ >-PKG_HASH:=5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684 >+PKG_HASH:=e51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6 > > PKG_LICENSE:=OpenSSL > PKG_LICENSE_FILES:=LICENSE >diff --git a/package/libs/openssl/patches/200-parallel_build.patch >b/package/libs/openssl/patches/200-parallel_build.patch >index 37134e4030..cbe5d51241 100644 >--- a/package/libs/openssl/patches/200-parallel_build.patch >+++ b/package/libs/openssl/patches/200-parallel_build.patch >@@ -92,7 +92,7 @@ > fi; \ > --- a/crypto/Makefile > +++ b/crypto/Makefile >-@@ -85,11 +85,11 @@ testapps: >+@@ -87,11 +87,11 @@ testapps: > @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; >fi > > subdirs: >@@ -106,7 +106,7 @@ > > links: > @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) >-@@ -100,7 +100,7 @@ links: >+@@ -102,7 +102,7 @@ links: > # lib: $(LIB): are splitted to avoid end-less loop > lib: $(LIB) > @touch lib >@@ -115,7 +115,7 @@ > $(AR) $(LIB) $(LIBOBJ) > test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o > $(RANLIB) $(LIB) || echo Never mind. >-@@ -111,7 +111,7 @@ shared: buildinf.h lib subdirs >+@@ -113,7 +113,7 @@ shared: buildinf.h lib subdirs > fi > > libs: >@@ -124,7 +124,7 @@ > > install: > @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... >-@@ -120,7 +120,7 @@ install: >+@@ -122,7 +122,7 @@ install: > (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ > chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ > done; This is a bump for 18.06; my apologies. Stijn ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] openssl: update to 1.0.2r
This bump contains bug and security fixes. Compile-tested on ar71xx, ramips/mt7621 and x86/64. Run-tested on ramips/mt7621. Signed-off-by: Stijn Segers --- package/libs/openssl/Makefile | 4 ++-- package/libs/openssl/patches/200-parallel_build.patch | 8 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index a4781e9eee..1eaf273468 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openssl PKG_BASE:=1.0.2 -PKG_BUGFIX:=q +PKG_BUGFIX:=r PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX) PKG_RELEASE:=1 PKG_USE_MIPS16:=0 @@ -24,7 +24,7 @@ PKG_SOURCE_URL:= \ http://gd.tuwien.ac.at/infosys/security/openssl/source/ \ http://www.openssl.org/source/ \ http://www.openssl.org/source/old/$(PKG_BASE)/ -PKG_HASH:=5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684 +PKG_HASH:=e51d08bba8a83958e894946f15303ff894d75c2b8bbd44a852b64e3fe11d0d6 PKG_LICENSE:=OpenSSL PKG_LICENSE_FILES:=LICENSE diff --git a/package/libs/openssl/patches/200-parallel_build.patch b/package/libs/openssl/patches/200-parallel_build.patch index 37134e4030..cbe5d51241 100644 --- a/package/libs/openssl/patches/200-parallel_build.patch +++ b/package/libs/openssl/patches/200-parallel_build.patch @@ -92,7 +92,7 @@ fi; \ --- a/crypto/Makefile +++ b/crypto/Makefile -@@ -85,11 +85,11 @@ testapps: +@@ -87,11 +87,11 @@ testapps: @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi subdirs: @@ -106,7 +106,7 @@ links: @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) -@@ -100,7 +100,7 @@ links: +@@ -102,7 +102,7 @@ links: # lib: $(LIB): are splitted to avoid end-less loop lib: $(LIB) @touch lib @@ -115,7 +115,7 @@ $(AR) $(LIB) $(LIBOBJ) test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o $(RANLIB) $(LIB) || echo Never mind. -@@ -111,7 +111,7 @@ shared: buildinf.h lib subdirs +@@ -113,7 +113,7 @@ shared: buildinf.h lib subdirs fi libs: @@ -124,7 +124,7 @@ install: @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... -@@ -120,7 +120,7 @@ install: +@@ -122,7 +122,7 @@ install: (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ done; -- 2.20.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] mfloat-abi=soft
According to rules.mk, -mfloat-abi=soft is used. This is causing build failures with the botan library: https://downloads.openwrt.org/snapshots/faillogs/armeb_xscale/packages/botan/compile.txt Is it sensical to change the default to softfp, as the error message suggests? ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2] ath79: add support for OCEDO Ursus
Hello Petr, sorry for the late reply, I was very busy last week. On 03.04.19 09:35, Petr Štetiar wrote: > ok, so it seems like this patch is fine with you and you've already tested it > as it is, so can I add your Tested-by or Reviewed-by as well? Tested-by: David Bauer Maybe you can alter the LED names and the newline issue on your side avoiding a v2 :) Best wishes David > > -- ynezz > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] wireguard: bump to 0.0.20190406
On Sat, Apr 6, 2019 at 1:24 PM Jason A. Donenfeld wrote: > > * allowedips: initialize list head when removing intermediate nodes > > Fix for an important regression in removing allowed IPs from the last > snapshot. We have new test cases to catch these in the future as well. > > * tools: warn if an AllowedIP has a nonzero host part > > If you try to run `wg set wg0 peer ... allowed-ips 192.168.1.82/24`, wg(8) > will now print a warning. Even though we mask this automatically down to > 192.168.1.0/24, usually when people specify it like this, it's a mistake. > > * wg-quick: add 'strip' subcommand > > The new strip subcommand prints the config file to stdout after stripping > it of all wg-quick-specific options. This enables tricks such as: > `wg addconf $DEV <(wg-quick strip $DEV)`. > > * tools: avoid unneccessary next_peer assignments in sort_peers() > > Small C optimization the compiler was probably already doing. > > * peerlookup: rename from hashtables > * allowedips: do not use __always_inline > * device: use skb accessor functions where possible > > Suggested tweaks from Dave Miller. > > * blake2s: simplify > * blake2s: remove outlen parameter from final > > The blake2s implementation has been simplified, since we don't use any of the > fancy tree hashing parameters or the like. We also no longer separate the > output length at initialization time from the output length at finalization > time. > > * global: the _bh variety of rcu helpers have been unified > * compat: nf_nat_core.h was removed upstream > * compat: backport skb_mark_not_on_list > > The usual assortment of compat fixes for Linux 5.1. > > Signed-off-by: Jason A. Donenfeld Patch applied to master; thx Hans > --- > package/network/services/wireguard/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/network/services/wireguard/Makefile > b/package/network/services/wireguard/Makefile > index aab3e59..c04762b 100644 > --- a/package/network/services/wireguard/Makefile > +++ b/package/network/services/wireguard/Makefile > @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk > > PKG_NAME:=wireguard > > -PKG_VERSION:=0.0.20190227 > +PKG_VERSION:=0.0.20190406 > PKG_RELEASE:=1 > > PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz > PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/ > -PKG_HASH:=fcdb26fd2692d9e1dee54d14418603c38fbb973a06ce89d08fbe45292ff37f79 > +PKG_HASH:=2f06f3adf70b95e74a7736a22dcf6e9ef623b311a15b7d55b5474e57c3d0415b > > PKG_LICENSE:=GPL-2.0 Apache-2.0 > PKG_LICENSE_FILES:=COPYING > -- > 2.21.0 > > > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 5/7] kernel: can: add Xilinx CAN IP kernel module package
On 4/6/19 2:37 PM, Hauke Mehrtens wrote: > On 4/1/19 5:33 AM, Luis Araneda wrote: >> This driver is required to use the CAN IP on devices >> from the zynq target >> >> Signed-off-by: Luis Araneda >> --- >> package/kernel/linux/modules/can.mk | 14 +- >> 1 file changed, 13 insertions(+), 1 deletion(-) >> >> diff --git a/package/kernel/linux/modules/can.mk >> b/package/kernel/linux/modules/can.mk >> index b0d254511b..85700eabad 100644 >> --- a/package/kernel/linux/modules/can.mk >> +++ b/package/kernel/linux/modules/can.mk >> @@ -26,7 +26,6 @@ define KernelPackage/can >> CONFIG_CAN_MSCAN=n \ >> CONFIG_CAN_SJA1000=n \ >> CONFIG_CAN_SOFTING=n \ >> -CONFIG_CAN_XILINXCAN=n \ > > You will probably run into a problem when you only select kmod-can and > not kmod-can-xilinx-can on this target. > > I would suggest to add CONFIG_CAN_XILINXCAN to > target/linux/generic/config4.* > This looks good, I applied it to master. Hauke ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 5/7] kernel: can: add Xilinx CAN IP kernel module package
On 4/1/19 5:33 AM, Luis Araneda wrote: > This driver is required to use the CAN IP on devices > from the zynq target > > Signed-off-by: Luis Araneda > --- > package/kernel/linux/modules/can.mk | 14 +- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/package/kernel/linux/modules/can.mk > b/package/kernel/linux/modules/can.mk > index b0d254511b..85700eabad 100644 > --- a/package/kernel/linux/modules/can.mk > +++ b/package/kernel/linux/modules/can.mk > @@ -26,7 +26,6 @@ define KernelPackage/can > CONFIG_CAN_MSCAN=n \ > CONFIG_CAN_SJA1000=n \ > CONFIG_CAN_SOFTING=n \ > - CONFIG_CAN_XILINXCAN=n \ You will probably run into a problem when you only select kmod-can and not kmod-can-xilinx-can on this target. I would suggest to add CONFIG_CAN_XILINXCAN to target/linux/generic/config4.* > CONFIG_NET_EMATCH_CANID=n \ > CONFIG_CAN_DEBUG_DEVICES=n >FILES:=$(LINUX_DIR)/drivers/net/can/can-dev.ko \ > @@ -277,4 +276,17 @@ endef > > $(eval $(call KernelPackage,can-vcan)) > > +define KernelPackage/can-xilinx-can > + TITLE:=Xilinx CAN IP > + KCONFIG:=CONFIG_CAN_XILINXCAN > + FILES:=$(LINUX_DIR)/drivers/net/can/xilinx_can.ko > + AUTOLOAD:=$(call AutoProbe,xilinx_can) > + $(call AddDepends/can,@TARGET_zynq) > +endef > + > +define KernelPackage/can-xilinx-can/description > + Xilinx CAN driver. This driver supports both > + soft AXI CAN IP and Zynq CANPS IP. > +endef > > +$(eval $(call KernelPackage,can-xilinx-can)) > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH V2] procd: instance: Support deleting stopped instances
procd currently does not support deleting a stopped instance. The reason
is that we return in instance_stop(), if pending is set to false. This
patch adds a new function, instance_delete(), which does the necessary
clean-up of an instance. instance_delete() is called before we return in
instance_stop(), as well as when a process that should not be restarted
has exited in instance_exit().
v1->v2:
- Only call instance_delete() in instance_stop() if halt is true (thanks
Hans Dedecker).
Signed-off-by: Kristian Evensen
---
service/instance.c | 24
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/service/instance.c b/service/instance.c
index a5742b7..3512f66 100644
--- a/service/instance.c
+++ b/service/instance.c
@@ -518,6 +518,16 @@ instance_timeout(struct uloop_timeout *t)
instance_start(in);
}
+static void
+instance_delete(struct service_instance *in)
+{
+ struct service *s = in->srv;
+
+ avl_delete(>instances.avl, >node.avl);
+ instance_free(in);
+ service_stopped(s);
+}
+
static void
instance_exit(struct uloop_process *p, int ret)
{
@@ -539,13 +549,8 @@ instance_exit(struct uloop_process *p, int ret)
instance_removepid(in);
if (in->restart)
instance_start(in);
- else {
- struct service *s = in->srv;
-
- avl_delete(>instances.avl, >node.avl);
- instance_free(in);
- service_stopped(s);
- }
+ else
+ instance_delete(in);
} else if (in->restart) {
instance_start(in);
} else if (in->respawn) {
@@ -569,8 +574,11 @@ instance_exit(struct uloop_process *p, int ret)
void
instance_stop(struct service_instance *in, bool halt)
{
- if (!in->proc.pending)
+ if (!in->proc.pending) {
+ if (halt)
+ instance_delete(in);
return;
+ }
in->halt = halt;
in->restart = in->respawn = false;
kill(in->proc.pid, SIGTERM);
--
2.19.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] procd: instance: Support deleting stopped instances
On Sat, Apr 6, 2019 at 12:27 PM Kristian Evensen
wrote:
>
> Hi Hans,
>
> On Thu, Apr 4, 2019 at 10:59 PM Hans Dedecker wrote:
> > instance_delete should only be called when halt is set to true similar
> > as in instance_exit
>
> Thanks for the feedback. Just so I make sure I understand correctly,
> do you mean that the conditional should look something like this?
>
> 577 if (!in->proc.pending) {
> 578 if (halt)
> 579 instance_delete(in);
> 580 return;
> 581 }
Indeed I meant there should be a conditional halt check before calling
instance_delete
Hans
>
> BR,
> Kristian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] wireguard: bump to 0.0.20190406
* allowedips: initialize list head when removing intermediate nodes Fix for an important regression in removing allowed IPs from the last snapshot. We have new test cases to catch these in the future as well. * tools: warn if an AllowedIP has a nonzero host part If you try to run `wg set wg0 peer ... allowed-ips 192.168.1.82/24`, wg(8) will now print a warning. Even though we mask this automatically down to 192.168.1.0/24, usually when people specify it like this, it's a mistake. * wg-quick: add 'strip' subcommand The new strip subcommand prints the config file to stdout after stripping it of all wg-quick-specific options. This enables tricks such as: `wg addconf $DEV <(wg-quick strip $DEV)`. * tools: avoid unneccessary next_peer assignments in sort_peers() Small C optimization the compiler was probably already doing. * peerlookup: rename from hashtables * allowedips: do not use __always_inline * device: use skb accessor functions where possible Suggested tweaks from Dave Miller. * blake2s: simplify * blake2s: remove outlen parameter from final The blake2s implementation has been simplified, since we don't use any of the fancy tree hashing parameters or the like. We also no longer separate the output length at initialization time from the output length at finalization time. * global: the _bh variety of rcu helpers have been unified * compat: nf_nat_core.h was removed upstream * compat: backport skb_mark_not_on_list The usual assortment of compat fixes for Linux 5.1. Signed-off-by: Jason A. Donenfeld --- package/network/services/wireguard/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index aab3e59..c04762b 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=0.0.20190227 +PKG_VERSION:=0.0.20190406 PKG_RELEASE:=1 PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/ -PKG_HASH:=fcdb26fd2692d9e1dee54d14418603c38fbb973a06ce89d08fbe45292ff37f79 +PKG_HASH:=2f06f3adf70b95e74a7736a22dcf6e9ef623b311a15b7d55b5474e57c3d0415b PKG_LICENSE:=GPL-2.0 Apache-2.0 PKG_LICENSE_FILES:=COPYING -- 2.21.0 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] procd: instance: Support deleting stopped instances
Hi Hans,
On Thu, Apr 4, 2019 at 10:59 PM Hans Dedecker wrote:
> instance_delete should only be called when halt is set to true similar
> as in instance_exit
Thanks for the feedback. Just so I make sure I understand correctly,
do you mean that the conditional should look something like this?
577 if (!in->proc.pending) {
578 if (halt)
579 instance_delete(in);
580 return;
581 }
BR,
Kristian
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] mac80211: update to version 4.19.32-1
Hi, Tested fine on ipq40xx, Linksys EA6350v3, OpenWrt master Best regards, Daniel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] mbedtls: update to version 2.16.1
Hi, Tested fine on ipq40xx, Linksys EA6350v3, OpenWrt master Best regards, Daniel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
