mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
tang: Update to version 7
Added License information. Cleaned up Makefile for consistency between packages. Added numerical prefixes to the patches for clarity. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
@@ -1,14 +1,11 @@
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 14bf91d..dfa6d07 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,5 +1,3 @@
|
||||
@@ -1,4 +1,3 @@
|
||||
-DISTCHECK_CONFIGURE_FLAGS = --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
|
||||
-
|
||||
AM_CFLAGS = @TANG_CFLAGS@ @jose_CFLAGS@
|
||||
LDADD = @jose_LIBS@ @http_parser_LIBS@
|
||||
|
||||
@@ -7,21 +5,11 @@ nagiosdir = $(libdir)/nagios/plugins
|
||||
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)
|
||||
|
||||
@@ -20,26 +17,15 @@ index 14bf91d..dfa6d07 100644
|
||||
- units/tangd-keygen.service
|
||||
-
|
||||
dist_libexec_SCRIPTS = src/tangd-update src/tangd-keygen
|
||||
dist_bin_SCRIPTS = src/tang-show-keys
|
||||
libexec_PROGRAMS = src/tangd
|
||||
-nagios_PROGRAMS = src/tang
|
||||
-man1_MANS = doc/tang-nagios.1
|
||||
man8_MANS = doc/tang.8
|
||||
|
||||
src_tangd_SOURCES = src/http.c src/http.h src/tangd.c
|
||||
-src_tang_SOURCES = src/nagios.c
|
||||
|
||||
%: %.in
|
||||
$(AM_V_GEN)mkdir -p "`dirname "$@"`"
|
||||
@@ -32,11 +20,9 @@ src_tang_SOURCES = src/nagios.c
|
||||
$(srcdir)/$@.in > $@
|
||||
|
||||
@@ -52,9 +44,7 @@ src_tangd_SOURCES = src/http.c src/http.h src/tangd.c
|
||||
AM_TESTS_ENVIRONMENT = SD_ACTIVATE="@SD_ACTIVATE@" PATH=$(srcdir)/src:$(builddir)/src:$(PATH)
|
||||
-TESTS = tests/adv tests/rec tests/nagios
|
||||
+TESTS = tests/adv tests/rec
|
||||
TESTS = tests/adv tests/rec
|
||||
|
||||
-CLEANFILES = $(nodist_systemdsystemunit_DATA)
|
||||
-CLEANFILES += $(nodist_systemdsystemunit_DATA)
|
||||
EXTRA_DIST = \
|
||||
- $(foreach unit,$(nodist_systemdsystemunit_DATA),$(unit).in) \
|
||||
COPYING \
|
||||
$(TESTS) \
|
||||
$(man1_MANS) \
|
||||
$(man_ADOC_FILES)
|
||||
-2
@@ -1,5 +1,3 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b51bb31..4b37d30 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -27,32 +27,6 @@ AC_CHECK_LIB([http_parser], [http_parser_execute],
|
||||
-2
@@ -1,5 +1,3 @@
|
||||
diff --git a/src/tangd-update b/src/tangd-update
|
||||
index 652dbef..01aa842 100755
|
||||
--- a/src/tangd-update
|
||||
+++ b/src/tangd-update
|
||||
@@ -33,8 +33,8 @@ fi
|
||||
Reference in New Issue
Block a user