Re: [LEDE-DEV] [PATCH 1/5] tools/zlib: move zlib build to tools

2018-04-20 Thread Hauke Mehrtens 
On 04/20/2018 01:10 PM, Koen Vandeputte wrote:
> 
> 
> On 2018-04-20 00:15, Hauke Mehrtens wrote:
>> On 04/18/2018 12:24 AM, Koen Vandeputte wrote:
> 
>> 
> 
 I tested the patch series because I have a linking problem with zlib
 and python an I wanted to see if this fixes it (it does not) but on
 i686 I have this error


 make[8]: Entering directory
 '/home/build/proxy/build_dir/hostpkg/glib-2.56.1/gio'
    CCLD libgio-2.0.la
 /usr/bin/ld: /home/build/proxy/staging_dir/host/lib/libz.a(deflate.o):
 relocation R_X86_64_PC32 against symbol `_length_code' can not be used
 when making a shared object; recompile with -fPIC
 /usr/bin/ld: final link failed: Bad value
 collect2: error: ld returned 1 exit status
 Makefile:2183: recipe for target 'libgio-2.0.la' failed


>>> Hi Hauke,
>>>
>>> Probably related to the above?
>>>
>>> When I'm building using this patch series, I'm getting a python build
>>> error.
>>> Please see attached logfile.
>>> Reverting the series fixes the build issue.
>>>
>>>
>>> Do note that I'm also using my own config, which adds all feeds and uses
>>> a lot more packages than default OpenWrt.
>>>
>>> Thanks,
>>>
>>> Koen
>> I am not able to reproduce this problem and it looks strange because you
>> have some compile problems related to OpenSSL functions.
>>
>> Can you provide me with a configuration which triggers this problem
>> please? Are you only using these 5 patches on top of master or do you
>> use also some other patches on top of master?
>>
>> Hauke
> Hi Hauke,
> 
> I'm currently testing the V2 series.
> The fpic addition fixes the build issues.
> 
> 
> Also,
> 
> Previously I mentioned the following issue on imx6 (ubi):
> 
> - Make owrt build
> - Add custom files using imagebuilder
> - Flash (jtag or tftp via uboot)
> - Boot 1st time (all is OK)
> - Boot 2nd time (custom files are corrupt now)
> 
> 
> After testing this a few times using JTAG on the same board (which had a
> repro rate of 100%) .. the issue seems fixed at first glance.
> I wasn't able to reproduce it in the last 5 tests.

Interesting problem, this is fixed now with the v2 patches, so probably
with the update to version 2.0.2, but there are not so many changes in
there.

> There are 2 warnings left:
> 
> WARNING: Makefile 'package/feeds/packages/python/Makefile' has a build
> dependency on 'zlib/host', which does not exist
> WARNING: Makefile 'package/feeds/packages/python3/Makefile' has a build
> dependency on 'zlib/host', which does not exist
> 
> 
> So when applying the series, an extra fix is probably needed in the
> package repo to get rid of the warnings.

I will take care of these later.

> Besides this, no regression seen so far ..

Thanks for testing.

Hauke

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] igmpproxy: bump to 0.2.1

2018-04-20 Thread Kevin Darbyshire-Bryant via Lede-dev 
The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.

To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.--- Begin Message ---
Point at github which is new, maintained location for igmpproxy.
Remove all patches as all have been upstreamed.

Closes FS#1456

Signed-off-by: Kevin Darbyshire-Bryant 
---

This needs a sanity check by nbd.


 package/network/services/igmpproxy/Makefile|   8 +-
 ...ackets-with-IP-Router-Alert-option-RFC-21.patch |  79 --
 ...ult-interface-state-to-disabled-wrt-29458.patch |  43 --
 ...mp-reports-for-downstream-interfaces-wrt-.patch | 164 -
 ...mp-reports-forwarding-to-upstream-interfa.patch |  62 
 .../igmpproxy/patches/010-missing_include.patch|  10 --
 ...ilence-downstream-interface-igmp-messages.patch |  19 ---
 ...-use-monotic-clock-instead-of-time-of-day.patch | 120 ---
 .../patches/200-allow_wildcard_addr.patch  |  24 ---
 .../250-fix_multiple_downlink_interfaces.patch | 154 ---
 10 files changed, 4 insertions(+), 679 deletions(-)
 delete mode 100644 
package/network/services/igmpproxy/patches/001-Send-IGMP-packets-with-IP-Router-Alert-option-RFC-21.patch
 delete mode 100644 
package/network/services/igmpproxy/patches/002-Change-default-interface-state-to-disabled-wrt-29458.patch
 delete mode 100644 
package/network/services/igmpproxy/patches/003-Restrict-igmp-reports-for-downstream-interfaces-wrt-.patch
 delete mode 100644 
package/network/services/igmpproxy/patches/004-Restrict-igmp-reports-forwarding-to-upstream-interfa.patch
 delete mode 100644 
package/network/services/igmpproxy/patches/010-missing_include.patch
 delete mode 100644 
package/network/services/igmpproxy/patches/020-Silence-downstream-interface-igmp-messages.patch
 delete mode 100644 
package/network/services/igmpproxy/patches/100-use-monotic-clock-instead-of-time-of-day.patch
 delete mode 100644 
package/network/services/igmpproxy/patches/200-allow_wildcard_addr.patch
 delete mode 100644 
package/network/services/igmpproxy/patches/250-fix_multiple_downlink_interfaces.patch

diff --git a/package/network/services/igmpproxy/Makefile 
b/package/network/services/igmpproxy/Makefile
index e335b72d6a..b98f3e5947 100644
--- a/package/network/services/igmpproxy/Makefile
+++ b/package/network/services/igmpproxy/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=igmpproxy
-PKG_VERSION:=0.1
-PKG_RELEASE:=11
+PKG_VERSION:=0.2.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/igmpproxy
-PKG_HASH:=ee18ff3d8c3ae3a29dccb7e5eedf332337330020168bd95a11cece8d7d7ee6ae
+PKG_SOURCE_URL:=https://github.com/pali/igmpproxy/releases/download/${PKG_VERSION}/
+PKG_HASH:=d351e623037390f575c1203d9cbb7ba33a8bdef85a3c5e1d2901c5a2a38449a1
 PKG_MAINTAINER:=Felix Fietkau 
 
 include $(INCLUDE_DIR)/package.mk
diff --git 
a/package/network/services/igmpproxy/patches/001-Send-IGMP-packets-with-IP-Router-Alert-option-RFC-21.patch
 
b/package/network/services/igmpproxy/patches/001-Send-IGMP-packets-with-IP-Router-Alert-option-RFC-21.patch
deleted file mode 100644
index ffe1cf15eb..00
--- 
a/package/network/services/igmpproxy/patches/001-Send-IGMP-packets-with-IP-Router-Alert-option-RFC-21.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From fed8c3db10bc9d3a1e799a774924c00522595d0c Mon Sep 17 00:00:00 2001
-From: Evgeny Yurchenko 
-Date: Mon, 4 Jan 2010 05:13:59 +0500
-Subject: [PATCH] Send IGMP packets with IP Router Alert option [RFC 2113] 
included in IP header
-

- src/igmp.c  |   17 -
- src/igmpproxy.h |1 +
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/src/igmp.c b/src/igmp.c
-index a0cd27d..b547688 100644
 a/src/igmp.c
-+++ b/src/igmp.c
-@@ -67,7 +67,7 @@ void initIgmp() {
-  * - Checksum (let the kernel fill it in)
-  */
- ip->ip_v   = IPVERSION;
--ip->ip_hl  = sizeof(struct ip) >> 2;
-+ip->ip_hl  = (sizeof(struct ip) + 4) >> 2; /* +4 for Router Alert option 
*/
- ip->ip_tos = 0xc0;  /* Internet Control */
- ip->ip_ttl = MAXTTL;/* applies to unicasts only */
- ip->ip_p   = IPPROTO_IGMP;
-@@ -213,7 +213,7 @@ void buildIgmp(uint32_t src, uint32_t dst, int type, int 
code, uint32_t group, i
- ip  = (struct ip *)send_buf;
- ip->ip_src.s_addr   = src;
- ip->ip_dst.s_addr   = dst;
--ip_set_len(ip, MIN_IP_HEADER_LEN + IGMP_MINLEN + datalen);
-+ip_set_len(ip, IP_HEADER_RAOPT_LEN + IGMP_MINLEN + datalen);
- 
- if (IN_MULTICAST(ntohl(dst))) {
- ip->ip_ttl = curttl;
-@@ -221,13 +221,20 @@ void buildIgmp(uint32_t src, uint32_t dst, int type, int 
code, uint32_t group, i
- ip->ip_ttl = MAXTTL;
- }
- 
--igmp= (struct igmp

Re: [LEDE-DEV] [PATCH 1/5] tools/zlib: move zlib build to tools

2018-04-20 Thread Koen Vandeputte 



On 2018-04-20 00:15, Hauke Mehrtens wrote:

On 04/18/2018 12:24 AM, Koen Vandeputte wrote:







I tested the patch series because I have a linking problem with zlib
and python an I wanted to see if this fixes it (it does not) but on
i686 I have this error


make[8]: Entering directory
'/home/build/proxy/build_dir/hostpkg/glib-2.56.1/gio'
   CCLD libgio-2.0.la
/usr/bin/ld: /home/build/proxy/staging_dir/host/lib/libz.a(deflate.o):
relocation R_X86_64_PC32 against symbol `_length_code' can not be used
when making a shared object; recompile with -fPIC
/usr/bin/ld: final link failed: Bad value
collect2: error: ld returned 1 exit status
Makefile:2183: recipe for target 'libgio-2.0.la' failed



Hi Hauke,

Probably related to the above?

When I'm building using this patch series, I'm getting a python build
error.
Please see attached logfile.
Reverting the series fixes the build issue.


Do note that I'm also using my own config, which adds all feeds and uses
a lot more packages than default OpenWrt.

Thanks,

Koen

I am not able to reproduce this problem and it looks strange because you
have some compile problems related to OpenSSL functions.

Can you provide me with a configuration which triggers this problem
please? Are you only using these 5 patches on top of master or do you
use also some other patches on top of master?

Hauke

Hi Hauke,

I'm currently testing the V2 series.
The fpic addition fixes the build issues.


Also,

Previously I mentioned the following issue on imx6 (ubi):

- Make owrt build
- Add custom files using imagebuilder
- Flash (jtag or tftp via uboot)
- Boot 1st time (all is OK)
- Boot 2nd time (custom files are corrupt now)


After testing this a few times using JTAG on the same board (which had a 
repro rate of 100%) .. the issue seems fixed at first glance.

I wasn't able to reproduce it in the last 5 tests.



There are 2 warnings left:

WARNING: Makefile 'package/feeds/packages/python/Makefile' has a build 
dependency on 'zlib/host', which does not exist
WARNING: Makefile 'package/feeds/packages/python3/Makefile' has a build 
dependency on 'zlib/host', which does not exist



So when applying the series, an extra fix is probably needed in the 
package repo to get rid of the warnings.


Besides this, no regression seen so far ..


Thank you for the efforts!

Koen

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] wireguard: bump to 20180420

2018-04-20 Thread Kevin Darbyshire-Bryant via Lede-dev 
The sender domain has a DMARC Reject/Quarantine policy which disallows
sending mailing list messages using the original "From" header.

To mitigate this problem, the original message has been wrapped
automatically by the mailing list software.--- Begin Message ---
7cc2668 version: bump snapshot
860c7c7 poly1305: do not place constants in different sections
5f1e4ca compat: remove unused dev_recursion_level backport
7e4b991 blake2s: remove unused helper
13225fc send: simplify skb_padding with nice macro
a1525bf send: account for route-based MTU
bbb2fde wg-quick: account for specified fwmark in auto routing mode
c452105 qemu: bump default version
dbe5223 version: bump snapshot
1d3ef31 chacha20poly1305: put magic constant behind macro
cdc164c chacha20poly1305: add self tests from wycheproof
1060e54 curve25519: add self tests from wycheproof
0e1e127 wg-quick.8: fix typo
2b06b8e curve25519: precomp const correctness
8102664 curve25519: memzero in batches
1f54c43 curve25519: use cmov instead of xor for cswap
fa5326f curve25519: use precomp implementation instead of sandy2x
9b19328 compat: support OpenSUSE 15
3102d28 compat: silence warning on frankenkernels
8f64c61 compat: stable kernels are now receiving b87b619
62127f9 wg-quick: hide errors on save

Signed-off-by: Kevin Darbyshire-Bryant 
---
 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 ba9fafa87f..9ed24ecaa3 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.20180304
+PKG_VERSION:=0.0.20180420
 PKG_RELEASE:=1
 
 PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/
-PKG_HASH:=efb1652f0da67fb2731040439b6abb820a5e2f1bc177aa15c5dce68ea3327787
+PKG_HASH:=b58cd2acf9e8d3fe9044c06c0056bd74da1f5673a456f011d36eee3f6fb1da16
 
 PKG_LICENSE:=GPL-2.0 Apache-2.0
 PKG_LICENSE_FILES:=COPYING
-- 
2.15.1 (Apple Git-101)


--- End Message ---
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev