diff --git a/srcpkgs/libu2f-server/patches/no-help2man.patch b/srcpkgs/libu2f-server/patches/no-help2man.patch new file mode 100644 index 00000000000..46393cb4412 --- /dev/null +++ b/srcpkgs/libu2f-server/patches/no-help2man.patch @@ -0,0 +1,18 @@ +--- configure.ac.orig 2018-01-31 21:22:40.957541567 -0800 ++++ configure.ac 2018-01-31 21:23:27.838559722 -0800 +@@ -49,15 +49,6 @@ + + LT_INIT([win32-dll]) + +-AM_MISSING_PROG(HELP2ADOC, help2adoc, $missing_dir) +-AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) +-if ! which help2man >/dev/null ; then +- AC_MSG_ERROR([help2man missing]) +-fi +-if ! which gengetopt >/dev/null ; then +- AC_MSG_ERROR([gengetopt missing]) +-fi +- + gl_LD_VERSION_SCRIPT + + PKG_CHECK_MODULES([LIBJSON], [json-c], [], [ diff --git a/srcpkgs/libu2f-server/patches/disable-help2man.patch b/srcpkgs/libu2f-server/patches/src-no-help.patch similarity index 63% rename from srcpkgs/libu2f-server/patches/disable-help2man.patch rename to srcpkgs/libu2f-server/patches/src-no-help.patch index 36ac6e766ba..919a3623a11 100644 --- a/srcpkgs/libu2f-server/patches/disable-help2man.patch +++ b/srcpkgs/libu2f-server/patches/src-no-help.patch @@ -1,13 +1,13 @@ ---- src/Makefile.am.orig 2015-11-09 10:56:00.391780111 -0600 -+++ src/Makefile.am 2015-11-09 10:56:14.510779188 -0600 -@@ -40,21 +40,6 @@ +--- src/Makefile.am.orig 2018-01-31 21:34:44.725821832 -0800 ++++ src/Makefile.am 2018-01-31 21:35:32.885840481 -0800 +@@ -40,24 +40,6 @@ BUILT_SOURCES = cmdline.c cmdline.h MAINTAINERCLEANFILES = $(BUILT_SOURCES) -dist_man_MANS = $(top_srcdir)/man/u2f-server.1 -DISTCLEANFILES = $(dist_man_MANS) - --$(top_srcdir)/man/u2f-server.1: $(srcdir)/u2f-server.c $(srcdir)/cmdline.ggo $(top_srcdir)/configure.ac +-$(top_srcdir)/man/u2f-server.1: $(srcdir)/u2f-server.c $(srcdir)/cmdline.ggo $(top_srcdir)/configure.ac | $(builddir)/u2f-server$(EXEEXT) - $(HELP2MAN) \ - --output=$(top_builddir)/man/$@ $(builddir)/u2f-server$(EXEEXT) \ - --name="Yubico Universal 2nd Factor (U2F) Server Tool" \ @@ -19,6 +19,9 @@ - > $(top_builddir)/man/$@.txt -endif - - clean-local: - rm -f $(top_builddir)/man/*.[1-9] - rm -f $(top_builddir)/man/*.[1-9].txt +-clean-local: +- rm -f $(top_builddir)/man/*.[1-9] +- + if ENABLE_COV + AM_CFLAGS += --coverage + AM_LDFLAGS = --coverage diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template index 4904d722a5a..42a3519786e 100644 --- a/srcpkgs/libu2f-server/template +++ b/srcpkgs/libu2f-server/template @@ -1,10 +1,9 @@ # Template file for 'libu2f-server' pkgname=libu2f-server -version=1.0.1 -revision=4 +version=1.1.0 +revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure -configure_args="--enable-gtk-doc-html=no" hostmakedepends="automake libtool pkg-config gengetopt check" makedepends="json-c-devel hidapi-devel libressl-devel check-devel" short_desc="Yubico Universal 2nd Factor (U2F) Server C Library" @@ -12,7 +11,7 @@ maintainer="Michael Aldridge " license="BSD" homepage="https://developers.yubico.com/libu2f-server/" distfiles="https://github.com/Yubico/libu2f-server/archive/libu2f-server-${version}.tar.gz" -checksum="d87405ab7b271c3f674d64af8c878fdbf74d3b1d76b09de000c0d2cda5b44828" +checksum=6551109e692c9c4fea61e99f1cd8377e8e54e3033e421cc191da6d673311c860 pre_configure() { autoreconf -fi