tang: update to 8
Upstream switched to meson. Adjust accordingly. Switch to AUTORELEASE for simplicity. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
c8128df4e4
commit
b9236dc173
4 changed files with 6 additions and 88 deletions
|
@ -8,25 +8,22 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=tang
|
PKG_NAME:=tang
|
||||||
PKG_VERSION:=7
|
PKG_VERSION:=8
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/
|
PKG_SOURCE_URL:=https://github.com/latchset/$(PKG_NAME)/releases/download/v$(PKG_VERSION)/
|
||||||
PKG_HASH:=fbe13e4e3103cd24cada7824b63e510cffd650832ecd075fd49b99475a4f9bfa
|
PKG_HASH:=03958bf27c24aa9892f6138d287d39bcc149e7ad72163c27b529aa3c6b066ede
|
||||||
|
|
||||||
PKG_MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com>
|
PKG_MAINTAINER:=Tibor Dudlák <tibor.dudlak@gmail.com>
|
||||||
PKG_LICENSE:=GPL-3.0-or-later
|
PKG_LICENSE:=GPL-3.0-or-later
|
||||||
PKG_LICENSE_FILES:=COPYING
|
PKG_LICENSE_FILES:=COPYING
|
||||||
|
|
||||||
PKG_FIXUP:=autoreconf
|
|
||||||
PKG_INSTALL:=1
|
PKG_INSTALL:=1
|
||||||
PKG_BUILD_PARALLEL:=1
|
PKG_BUILD_DEPENDS:=meson/host
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
include ../../devel/meson/meson.mk
|
||||||
# This avoids generating man pages
|
|
||||||
CONFIGURE_VARS += ac_cv_prog_A2X=
|
|
||||||
|
|
||||||
define Package/tang
|
define Package/tang
|
||||||
SECTION:=utils
|
SECTION:=utils
|
||||||
|
@ -47,7 +44,7 @@ endef
|
||||||
define Package/tang/install
|
define Package/tang/install
|
||||||
$(INSTALL_DIR) $(1)/usr/libexec
|
$(INSTALL_DIR) $(1)/usr/libexec
|
||||||
$(INSTALL_DIR) $(1)/etc/xinetd.d/
|
$(INSTALL_DIR) $(1)/etc/xinetd.d/
|
||||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/tangd* $(1)/usr/libexec/
|
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/libexec/tangd* $(1)/usr/libexec/
|
||||||
$(INSTALL_BIN) ./files/tangdw $(1)/usr/libexec/
|
$(INSTALL_BIN) ./files/tangdw $(1)/usr/libexec/
|
||||||
$(CP) ./files/tangdx $(1)/etc/xinetd.d/
|
$(CP) ./files/tangdx $(1)/etc/xinetd.d/
|
||||||
endef
|
endef
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
--- a/Makefile.am
|
|
||||||
+++ b/Makefile.am
|
|
||||||
@@ -1,4 +1,3 @@
|
|
||||||
-DISTCHECK_CONFIGURE_FLAGS = --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
|
|
||||||
BUILT_SOURCES=
|
|
||||||
CLEANFILES=
|
|
||||||
man1_MANS=
|
|
||||||
@@ -10,13 +9,6 @@ LDADD = @jose_LIBS@ @http_parser_LIBS@
|
|
||||||
cachedir = $(localstatedir)/cache/$(PACKAGE_NAME)
|
|
||||||
jwkdir = $(localstatedir)/db/$(PACKAGE_NAME)
|
|
||||||
|
|
||||||
-nodist_systemdsystemunit_DATA = \
|
|
||||||
- units/tangd@.service \
|
|
||||||
- units/tangd.socket \
|
|
||||||
- units/tangd-update.path \
|
|
||||||
- units/tangd-update.service \
|
|
||||||
- units/tangd-keygen.service
|
|
||||||
-
|
|
||||||
dist_libexec_SCRIPTS = src/tangd-update src/tangd-keygen
|
|
||||||
dist_bin_SCRIPTS = src/tang-show-keys
|
|
||||||
libexec_PROGRAMS = src/tangd
|
|
||||||
@@ -52,9 +44,7 @@ src_tangd_SOURCES = src/http.c src/http.
|
|
||||||
AM_TESTS_ENVIRONMENT = SD_ACTIVATE="@SD_ACTIVATE@" PATH=$(srcdir)/src:$(builddir)/src:$(PATH)
|
|
||||||
TESTS = tests/adv tests/rec
|
|
||||||
|
|
||||||
-CLEANFILES += $(nodist_systemdsystemunit_DATA)
|
|
||||||
EXTRA_DIST = \
|
|
||||||
- $(foreach unit,$(nodist_systemdsystemunit_DATA),$(unit).in) \
|
|
||||||
COPYING \
|
|
||||||
$(TESTS) \
|
|
||||||
$(man_ADOC_FILES)
|
|
|
@ -1,35 +0,0 @@
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -27,32 +27,6 @@ AC_CHECK_LIB([http_parser], [http_parser
|
|
||||||
[AC_MSG_ERROR([http-parser required!])])
|
|
||||||
|
|
||||||
PKG_CHECK_MODULES([jose], [jose >= 8])
|
|
||||||
-PKG_CHECK_MODULES([systemd], [systemd])
|
|
||||||
-
|
|
||||||
-AC_ARG_WITH([systemdsystemunitdir],
|
|
||||||
- [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],
|
|
||||||
- [],
|
|
||||||
- [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
|
|
||||||
-
|
|
||||||
-AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
|
|
||||||
-
|
|
||||||
-for ac_prog in systemd-socket-activate systemd-activate; do
|
|
||||||
- AC_CHECK_PROG([SD_ACTIVATE], [$ac_prog], [$as_dir/$ac_prog], [],
|
|
||||||
- [$PATH$PATH_SEPARATOR$($PKG_CONFIG --variable=systemdutildir systemd)])
|
|
||||||
- test -n "$SD_ACTIVATE" && break
|
|
||||||
-done
|
|
||||||
-
|
|
||||||
-test -n "$SD_ACTIVATE" || AC_MSG_ERROR([systemd-socket-activate required!])
|
|
||||||
-
|
|
||||||
-AC_MSG_CHECKING([systemd-socket-activate inetd flag])
|
|
||||||
-if $SD_ACTIVATE --help | grep -q inetd; then
|
|
||||||
- SD_ACTIVATE="$SD_ACTIVATE --inetd"
|
|
||||||
- AC_MSG_RESULT([--inetd])
|
|
||||||
-else
|
|
||||||
- AC_MSG_RESULT([(default)])
|
|
||||||
-fi
|
|
||||||
-
|
|
||||||
-AC_SUBST(SD_ACTIVATE)
|
|
||||||
|
|
||||||
TANG_CFLAGS="\
|
|
||||||
-Wall \
|
|
|
@ -1,13 +0,0 @@
|
||||||
--- a/src/tangd-update
|
|
||||||
+++ b/src/tangd-update
|
|
||||||
@@ -33,8 +33,8 @@ fi
|
|
||||||
|
|
||||||
[ ! -d "$2" ] && mkdir -p -m 0700 "$2"
|
|
||||||
|
|
||||||
-src=`realpath "$1"`
|
|
||||||
-dst=`realpath "$2"`
|
|
||||||
+src=`readlink -f "$1"`
|
|
||||||
+dst=`readlink -f "$2"`
|
|
||||||
|
|
||||||
payl=()
|
|
||||||
sign=()
|
|
Loading…
Reference in a new issue