tayga: update to 0.9.6

Release notes: https://github.com/apalrd/tayga/releases/tag/0.9.6

Manually refreshed patch 002-bigendian_wrong_checksum.patch

Signed-off-by: Goetz Goerisch <redacted>

diff --git a/net/tayga/Makefile b/net/tayga/Makefile
index 49b4de1bb38e50714f0d7e9e1a3b4308f37de6d7..fc6075471407e4f8f505cd2d0293fdf81f014bfd 100644 (file)
--- a/net/tayga/Makefile
+++ b/net/tayga/Makefile
@@ -3,12 +3,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tayga
-PKG_VERSION:=0.9.5
+PKG_VERSION:=0.9.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/apalrd/tayga/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=d44cc1158f60623d1bcd245f811957a162092c8f5e725489438de12e5500ae49
+PKG_HASH:=64da04887e59207be0f62082e63dca98b1e770283fa37102ccb0a3e8d2acedc5
 PKG_LICENSE:=GPL-2.0-or-later
 PKG_LICENSE_FILES:=COPYING
 

diff --git a/net/tayga/patches/002-bigendian_wrong_checksum.patch b/net/tayga/patches/002-bigendian_wrong_checksum.patch
index 9bec5f24658adc826350a2ff451c12175b4e632b..639c0959d32851a9e1eb918a93651cc12c84e50f 100644 (file)
--- a/net/tayga/patches/002-bigendian_wrong_checksum.patch
+++ b/net/tayga/patches/002-bigendian_wrong_checksum.patch
@@ -1,6 +1,6 @@
 --- a/nat64.c
 +++ b/nat64.c
-@@ -129,6 +129,11 @@ static void log_pkt6(int err, struct pkt
+@@ -127,6 +127,11 @@ static void log_pkt6(int err, struct pkt
                type, saddr, daddr, (p->header_len + p->data_len),p->data_proto,msg);
  }
  
@@ -9,10 +9,10 @@
 +      return htons(b << 8);
 +}
 +
- static uint16_t ip_checksum(void *d, int c)
+ static uint16_t ip_checksum(void *d, uint32_t c)
  {
        uint32_t sum = 0xffff;
-@@ -140,7 +145,7 @@ static uint16_t ip_checksum(void *d, int
+@@ -138,7 +143,7 @@ static uint16_t ip_checksum(void *d, uin
        }
  
        if (c)
@@ -21,7 +21,7 @@
  
        while (sum > 0xffff)
                sum = (sum & 0xffff) + (sum >> 16);
-@@ -296,10 +301,12 @@ static int xlate_payload_4to6(struct pkt
+@@ -294,10 +299,12 @@ static int xlate_payload_4to6(struct pkt
                cksum = ones_add(p->icmp->cksum, cksum);
                if (p->icmp->type == 8) {
                        p->icmp->type = 128;
@@ -36,7 +36,7 @@
                }
                return ERROR_NONE;
        /* UDP */
-@@ -892,10 +899,12 @@ static int xlate_payload_6to4(struct pkt
+@@ -889,10 +896,12 @@ static int xlate_payload_6to4(struct pkt
                cksum = ones_add(p->icmp->cksum, cksum);
                if (p->icmp->type == 128) {
                        p->icmp->type = 8;