From e89dc610f02c0f2d628dc2caf66509192d99f1f9 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 16 Dec 2021 15:15:22 -0800 Subject: [PATCH] tang: update to 11 Remove upstreamed patch. Install tang-show-keys. Signed-off-by: Rosen Penev --- utils/tang/Makefile | 12 +++++++----- utils/tang/patches/010-http.patch | 11 ----------- 2 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 utils/tang/patches/010-http.patch diff --git a/utils/tang/Makefile b/utils/tang/Makefile index 33f5ec4f5..cbd8febec 100644 --- a/utils/tang/Makefile +++ b/utils/tang/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tang -PKG_VERSION:=10 +PKG_VERSION:=11 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/ -PKG_HASH:=082f17e031708ab5e2f88c9b767d228bcf92a0d089fdb164d4ae93845cbd2a48 +PKG_HASH:=ef5d3ae56030f20c290594b9be89ad9ec469dd385676595e1c7a2bfdc3f45d8f PKG_MAINTAINER:=Tibor Dudlák PKG_LICENSE:=GPL-3.0-or-later @@ -41,11 +41,13 @@ define Package/tang/conffiles endef define Package/tang/install + $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/libexec $(INSTALL_DIR) $(1)/etc/xinetd.d/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/tangd* $(1)/usr/libexec/ - $(INSTALL_BIN) ./files/tangdw $(1)/usr/libexec/ - $(CP) ./files/tangdx $(1)/etc/xinetd.d/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tang-show-keys $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/tangd* $(1)/usr/libexec/ + $(INSTALL_BIN) ./files/tangdw $(1)/usr/libexec/ + $(CP) ./files/tangdx $(1)/etc/xinetd.d/ endef define Package/tang/postinst diff --git a/utils/tang/patches/010-http.patch b/utils/tang/patches/010-http.patch deleted file mode 100644 index 12ca66684..000000000 --- a/utils/tang/patches/010-http.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -54,7 +54,7 @@ compiler = meson.get_compiler('c') - if not compiler.has_header('http_parser.h',args : '-I/usr/local/include') - error('http-parser devel files not found.') - endif --http_parser = compiler.find_library('http_parser',dirs:['/usr/lib','/usr/local/lib']) -+http_parser = compiler.find_library('http_parser') - - licenses = ['COPYING'] - libexecbins = []