tang: update to 15

Rebase patch

Signed-off-by: Rosen Penev <[email protected]>
(cherry picked from commit b0832919411088a4deedf6b21478fecf3119ee22)

diff --git a/utils/tang/Makefile b/utils/tang/Makefile
index feca121b8eab260c3c107e51876a2d10575679d9..4abb7a65a5e3020b8804210ccf3d0862052fc845 100644 (file)
--- a/utils/tang/Makefile
+++ b/utils/tang/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tang
-PKG_VERSION:=14
-PKG_RELEASE:=4
+PKG_VERSION:=15
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/
-PKG_HASH:=04263ed1cc98d60cab29fe47f908921b7b1aa4d6da5f9de2fcbe543773b75886
+PKG_HASH:=eaf4a2abfea3d05f454a8841e98332be1e1e2432744c70bb7765651ed82c3f7c
 
 PKG_MAINTAINER:=Nikos Mavrogiannopoulos <[email protected]>
 PKG_LICENSE:=GPL-3.0-or-later

diff --git a/utils/tang/patches/100-tang-show-keys-use-wget.patch b/utils/tang/patches/100-tang-show-keys-use-wget.patch
index 1b3b682fb87da4fd063f3a9a8d6d7629b65a238e..e79d2faa8f1abb3c783c113dafb80b19af8dd8ca 100644 (file)
--- a/utils/tang/patches/100-tang-show-keys-use-wget.patch
+++ b/utils/tang/patches/100-tang-show-keys-use-wget.patch
@@ -1,16 +1,24 @@
-diff --git a/src/tang-show-keys b/src/tang-show-keys
-index 0c33c3a..4b64bda 100755
 --- a/src/tang-show-keys
 +++ b/src/tang-show-keys
-@@ -25,9 +25,9 @@ if [ $# -gt 1 ]; then
+@@ -25,17 +25,17 @@ if [ $# -gt 2 ]; then
      exit 1
  fi
  
 -port=${1-80}
 +port=${1-9090}
  
--adv=$(curl -sSf "localhost:$port/adv")
-+adv=$(wget -qO- "http://127.0.0.1:$port/adv")
+ if test -n "$2"; then
+   first_letter=$(printf %.1s "$2")
+   if [ "${first_letter}" = "/" ]; then
+-      adv=$(curl -sSf "localhost:$port$2/adv")
++      adv=$(wget -qO- "http://127.0.0.1:$port$2/adv")
+   else
+-      adv=$(curl -sSf "localhost:$port/$2/adv")
++      adv=$(wget -qO- "http://127.0.0.1:$port/$2/adv")
+   fi
+ else
+-  adv=$(curl -sSf "localhost:$port/adv")
++  adv=$(wget -qO- "http://127.0.0.1:$port/adv")
+ fi
  
  THP_DEFAULT_HASH=S256    # SHA-256.
- jose fmt --json "${adv}" -g payload -y -o- \