gentoo resync : 14.07.2018

6 files changed, 211 insertions, 0 deletions

diff --git a/app-crypt/libu2f-server/Manifest b/app-crypt/libu2f-server/Manifest
new file mode 100644
index 000000000000..776ac4524d59
--- /dev/null
+++ b/app-crypt/libu2f-server/Manifest
@@ -0,0 +1,7 @@
+AUX libu2f-server-1.0.1-tests-fix.patch 1486 BLAKE2B 19b37973a2efcbdbca285e59baf7f1d4c03abd4592f9ed988cd02c6bfea892c2ee3db1cf36621f685da1ab5075219e05ff2dc6752dcec30576aac271ec57b0b6 SHA512 3283f95308f72a13ce8575969992c633705eacacf3c01546d1fd8c35c3a5499a1229d8dd34f493075b4f145f2e722fed6568d75c8f37729f6b18d5b9bb553e45
+AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1d8287d590acf1385747091195e4401f9c3cba2ad6c0911f2ca549504569250567ef5e1b64124b5545460ba53e7e61354c4393051c275212b40c5a70764dd9 SHA512 cae13f6c9738be740055d0d26a7913f84bee0edf3df06d8a4e3da39dbcd7dd24ca19af638c1f00c3e45d68389e9ae842ab2a92ccd690a04af610646705edd498
+DIST libu2f-server-1.0.1.tar.xz 268648 BLAKE2B 9c6c2e5bafb2a95fcc5c2773de49b4db197ee6283e90cf0e4e62ff3982bdde8a51635cd9771e4dd35d27c71634367197d3b01b9c26d8a3847fccf1daf676f04b SHA512 51020722f49f787c793808b667e91923bde46e9137bfe5065106f83bcdb678e8d11cca12cb605d9622cafc15a9794c9080cf08e2a704293a791ab6f27ac47f47
+DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9
+EBUILD libu2f-server-1.0.1.ebuild 1141 BLAKE2B 940d5c772e94a0e77a72b56330a1c013da2588d573edb999a2d0af4cda5c8b62f07ea92eba0b45fb763200f6c7edf7f47bd115cf8bd4972e1681a6b0d9145bcc SHA512 6050266c78936ca416549483ded7beeb8866a23ca7cdebf0b5a973191bf27af0ece5cecf27c784c4abe8d1edbcd073baa7150236531d45dba18036dd20315459
+EBUILD libu2f-server-1.1.0.ebuild 1187 BLAKE2B 27ec974968e6717e3c17d2b89bc616ccf393509e9e247613ab638393d7c1efce5ca3643981c164788b10979b17180c9a87b6c338c0a44ffd58172502e4708fcd SHA512 85d9d2c8170c9566f614247aad94e177ffcea29b7c4e22df52085b5cbf3a65c2f733db20bd6168dc28ec2a0aacc4bb328c296df3d543163a0ce026538f9e08db
+MISC metadata.xml 351 BLAKE2B 9b08643cd9cfab47436281dd57bca31e713980d3cb0b5d20fcd9a915bc5adbcf589ac4df9f03929a8f57e7a11393602afe05d025d10bb04d425bacc1f4765324 SHA512 6a1aeb9117473d5c2ea5de3a3043de7926bb70e2cc00ac8c13b4d3a27b7fd3c7ca6611bc4f4ed9faeb611f228f5a8ffc657e924fdf800133d62a70b48e408f22
diff --git a/app-crypt/libu2f-server/files/libu2f-server-1.0.1-tests-fix.patch b/app-crypt/libu2f-server/files/libu2f-server-1.0.1-tests-fix.patch
new file mode 100644
index 000000000000..3cbb9c93868c
--- /dev/null
+++ b/app-crypt/libu2f-server/files/libu2f-server-1.0.1-tests-fix.patch
@@ -0,0 +1,54 @@
+From: Gokturk Yuksek <gokturk@gentoo.org>
+Subject: [PATCH] Make tests with CHECK optional at configure time
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,7 +63,15 @@
+ 
+ PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto], [], [])
+ 
+-PKG_CHECK_MODULES([CHECK], [check], [], [])
++AC_ARG_ENABLE([tests],
++              [AS_HELP_STRING([--enable-tests],
++                              [use check to run the unit tests])],
++                              [enable_tests=$enableval],
++                              [enable_tests=no])
++AM_CONDITIONAL([ENABLE_TESTS],[test '!' "$enable_tests" = no])
++if test '!' "$enable_tests" = no; then
++  PKG_CHECK_MODULES([CHECK], [check], [], [AC_MSG_NOTICE(Check package not found `make check` won't work)])
++fi
+ 
+ AC_ARG_ENABLE([coverage],
+               [AS_HELP_STRING([--enable-coverage],
+@@ -123,11 +131,15 @@
+   Makefile
+   gtk-doc/Makefile
+   src/Makefile
+-  tests/Makefile
+   u2f-server/Makefile
+   u2f-server/u2f-server-version.h
+   u2f-server/u2f-server.pc
+ ])
++if test '!' "$enable_tests" = no; then
++  AC_CONFIG_FILES([
++    tests/Makefile
++  ])
++fi
+ AC_OUTPUT
+ 
+ AC_MSG_NOTICE([summary of build options:
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -25,7 +25,11 @@
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+-SUBDIRS = u2f-server src tests gtk-doc
++SUBDIRS = u2f-server src gtk-doc
++
++if ENABLE_TESTS
++SUBDIRS+=tests
++endif
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
diff --git a/app-crypt/libu2f-server/files/libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch b/app-crypt/libu2f-server/files/libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch
new file mode 100644
index 000000000000..2dbe28b5aa68
--- /dev/null
+++ b/app-crypt/libu2f-server/files/libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch
@@ -0,0 +1,37 @@
+Reverted, removed the second hunk about dev-libs/check, and further
+adjusted. The tarball already contains the man page and gengetopt
+generated command line parsing, so these checks are useless to us.
+
+From fbd340d1c777e23b66ef27ce1c03c4eb3bafc511 Mon Sep 17 00:00:00 2001
+From: Thordur Bjornsson <thorduri@yubico.com>
+Date: Thu, 12 Jan 2017 14:28:31 +0100
+Subject: [PATCH] auto: Check for help2man/gengetopt, and bail out if not
+ found.
+
+Both are required to build.
+
+While here, if `--enable-tests` passed, check for `check` and
+if not found, bail out as well.
+---
+ configure.ac | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ad409a2..6decb78 100644
+--- b/configure.ac
++++ a/configure.ac
+@@ -43,14 +43,7 @@
+ 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/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild b/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
new file mode 100644
index 000000000000..823be1308e3d
--- /dev/null
+++ b/app-crypt/libu2f-server/libu2f-server-1.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) server C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-server/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl static-libs test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	dev-libs/hidapi[${MULTILIB_USEDEP}]
+	dev-libs/json-c:=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-tests-fix.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	touch man/u2f-server.1 || die # do not rebuild the man page
+}
+
+multilib_src_configure() {
+	myeconfargs=(
+		--disable-h2a # tarball already contains the manpage
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	prune_libtool_files
+}
diff --git a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
new file mode 100644
index 000000000000..d6f5837efa5a
--- /dev/null
+++ b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) server C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-server/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0/0.1"
+KEYWORDS="amd64 x86"
+IUSE="libressl static-libs test"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	dev-libs/hidapi[${MULTILIB_USEDEP}]
+	dev-libs/json-c:=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-disable-help2man-gengetopt-checks.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	touch man/u2f-server.1 || die # do not rebuild the man page
+}
+
+multilib_src_configure() {
+	myeconfargs=(
+		--disable-h2a # tarball already contains the manpage
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/libu2f-server/metadata.xml b/app-crypt/libu2f-server/metadata.xml
new file mode 100644
index 000000000000..6c2feb84a0e0
--- /dev/null
+++ b/app-crypt/libu2f-server/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>gokturk@gentoo.org</email>
+    <name>Göktürk Yüksek</name>
+  </maintainer>
+  <slots>
+    <subslots>Reflects ABI compatibility for libu2f-server.so</subslots>
+  </slots>
+</pkgmetadata>