Sync with portage [Fri Sep 30 09:46:30 MSK 2016].

mhiretskiy 557
root 8 years ago
parent 5dc8feed4f
commit 1589334996

@ -1,2 +0,0 @@
DIST gobby-0.4.13.tar.gz 507676 SHA256 8cbd89ffbe3e056160a8d76e11d641f3b045793e35897546f98d2de368001871 SHA512 15017de52c8e627b2c1999b68e53862ca6387b83c1486c5bf7c98e9abba5ea73c9f001077518458883d82c1af0f756da50428a8707fd05260715df13ed0cc978 WHIRLPOOL 6b4826cd838d4841cc59a0d05e77f27906ba85f27e6ebeac87b8c5aa9739aceb3b369803194ed732be7066505cbcf0762fdedd9f2b2f3991fadaf01dc2416403
DIST gobby-0.4.94.tar.gz 645815 SHA256 b9798808447cd94178430f0fb273d0e45d0ca30ab04560e3790bac469e03bb00 SHA512 62089e4f21c3eb6d822b7e240f694473b3f5b1585ddc3e42593503d68f8058645b04be137eb70a59c841b766f69791cbdfcfd82be1c9d126fca0ffd49ee7fe07 WHIRLPOOL 519d8b3ff8dacb3749a157c2fd641b33122751fe28ad0bc35ea5bb0cb6096dbbb89072799d14a1c2ee53a029a8f3f12b496052f27ffccc87cfa9ae6fc011dd02

@ -1,222 +0,0 @@
From 5932bfb4cf653b0588872fd6f8cc106b248ad964 Mon Sep 17 00:00:00 2001
From: Armin Burgmeier <armin@arbur.net>
Date: Sun, 29 Apr 2012 14:43:06 +0200
Subject: [PATCH] Fix build against recent gtkmm3 versions
2012-04-29 Armin Burgmeier <armin@arbur.net>
* code/commands/autosave-commands.cpp:
* code/commands/folder-commands.cpp:
* code/commands/user-join-commands.cpp:
* code/core/filechooser.cpp:
* code/core/folder.cpp:
* code/core/header.cpp:
* code/core/preferences.cpp:
* code/core/statusbar.cpp:
* code/core/textsessionview.cpp:
* code/dialogs/initial-dialog.cpp:
* code/dialogs/preferences-dialog.cpp:
* code/operations/operation-open.cpp:
* code/operations/operation-open.hpp:
* code/operations/operation-save.hpp: Add some missing glibmm includes
that are no longer pulled in by gtkmm since recent gtkmm3 versions.
---
ChangeLog | 18 ++++++++++++++++++
code/commands/autosave-commands.cpp | 2 ++
code/commands/folder-commands.cpp | 2 ++
code/commands/user-join-commands.cpp | 2 ++
code/core/filechooser.cpp | 2 ++
code/core/folder.cpp | 2 ++
code/core/header.cpp | 1 +
code/core/preferences.cpp | 4 ++++
code/core/statusbar.cpp | 1 +
code/core/textsessionview.cpp | 3 +++
code/dialogs/initial-dialog.cpp | 1 +
code/dialogs/preferences-dialog.cpp | 1 +
code/operations/operation-open.cpp | 2 ++
code/operations/operation-open.hpp | 1 +
code/operations/operation-save.hpp | 1 +
15 files changed, 43 insertions(+)
diff --git a/code/commands/autosave-commands.cpp b/code/commands/autosave-commands.cpp
index 0759b0d..827ffaf 100644
--- a/code/commands/autosave-commands.cpp
+++ b/code/commands/autosave-commands.cpp
@@ -23,6 +23,8 @@
#include "core/sessionuserview.hpp"
+#include <glibmm/main.h>
+
#include <ctime>
class Gobby::AutosaveCommands::Info
diff --git a/code/commands/folder-commands.cpp b/code/commands/folder-commands.cpp
index 92b7d71..8cc2bee 100644
--- a/code/commands/folder-commands.cpp
+++ b/code/commands/folder-commands.cpp
@@ -20,6 +20,8 @@
#include "commands/folder-commands.hpp"
#include "core/sessionuserview.hpp"
+#include <glibmm/main.h>
+
#include <libinftextgtk/inf-text-gtk-buffer.h>
// TODO: Make this work with non-text documents also... maybe split &
diff --git a/code/commands/user-join-commands.cpp b/code/commands/user-join-commands.cpp
index ebb0810..89ffdf2 100644
--- a/code/commands/user-join-commands.cpp
+++ b/code/commands/user-join-commands.cpp
@@ -20,6 +20,8 @@
#include "commands/user-join-commands.hpp"
#include "util/i18n.hpp"
+#include <glibmm/main.h>
+
#include <libinfinity/common/inf-error.h>
namespace
diff --git a/code/core/filechooser.cpp b/code/core/filechooser.cpp
index fbd7a67..23b85cf 100644
--- a/code/core/filechooser.cpp
+++ b/code/core/filechooser.cpp
@@ -19,6 +19,8 @@
#include "core/filechooser.hpp"
+#include <glibmm/miscutils.h>
+#include <glibmm/convert.h>
#include <gtkmm/stock.h>
Gobby::FileChooser::Dialog::Dialog(Gobby::FileChooser& chooser,
diff --git a/code/core/folder.cpp b/code/core/folder.cpp
index f9ebadc..7c84206 100644
--- a/code/core/folder.cpp
+++ b/code/core/folder.cpp
@@ -24,6 +24,8 @@
#include "core/texttablabel.hpp"
#include "util/file.hpp"
+#include <glibmm/miscutils.h>
+
#include <gdk/gdkkeysyms.h>
#include <stdexcept>
#include <iostream> // For std::cerr
diff --git a/code/core/header.cpp b/code/core/header.cpp
index d5d0c94..8f7f9f4 100644
--- a/code/core/header.cpp
+++ b/code/core/header.cpp
@@ -22,6 +22,7 @@
#include "util/i18n.hpp"
#include "features.hpp" // For PLATFORM_OSX_NATIVE
+#include <glibmm/markup.h>
#include <gtkmm/stock.h>
#ifdef PLATFORM_OSX_NATIVE
diff --git a/code/core/preferences.cpp b/code/core/preferences.cpp
index 9b8bfb3..a2952c6 100644
--- a/code/core/preferences.cpp
+++ b/code/core/preferences.cpp
@@ -20,6 +20,10 @@
#include "features.hpp"
#include "core/preferences.hpp"
+#include <glibmm/miscutils.h>
+#include <glibmm/fileutils.h>
+#include <glibmm/random.h>
+
// TODO: Support direct enum config storage via context specialization for
// enums.
Gobby::Preferences::User::User(Config::ParentEntry& entry):
diff --git a/code/core/statusbar.cpp b/code/core/statusbar.cpp
index 9b302b8..0a06a33 100644
--- a/code/core/statusbar.cpp
+++ b/code/core/statusbar.cpp
@@ -21,6 +21,7 @@
#include "util/gtk-compat.hpp"
#include "util/i18n.hpp"
+#include <glibmm/main.h>
#include <gtkmm/frame.h>
#include <gtkmm/stock.h>
diff --git a/code/core/textsessionview.cpp b/code/core/textsessionview.cpp
index 2246957..45eae14 100644
--- a/code/core/textsessionview.cpp
+++ b/code/core/textsessionview.cpp
@@ -21,6 +21,9 @@
#include "util/i18n.hpp"
#include "util/color.hpp"
+#include <glibmm/main.h>
+#include <glibmm/markup.h>
+#include <glibmm/pattern.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/textiter.h>
diff --git a/code/dialogs/initial-dialog.cpp b/code/dialogs/initial-dialog.cpp
index 031bc2c..494c859 100644
--- a/code/dialogs/initial-dialog.cpp
+++ b/code/dialogs/initial-dialog.cpp
@@ -24,6 +24,7 @@
#include "util/gtk-compat.hpp"
#include "features.hpp"
+#include <glibmm/markup.h>
#include <gtkmm/stock.h>
#include <gtkmm/alignment.h>
diff --git a/code/dialogs/preferences-dialog.cpp b/code/dialogs/preferences-dialog.cpp
index d0af7a0..be3690a 100644
--- a/code/dialogs/preferences-dialog.cpp
+++ b/code/dialogs/preferences-dialog.cpp
@@ -22,6 +22,7 @@
#include "util/i18n.hpp"
#include "util/gtk-compat.hpp"
+#include <glibmm/markup.h>
#include <gtkmm/messagedialog.h>
#include <gtkmm/scrolledwindow.h>
#include <gtkmm/stock.h>
diff --git a/code/operations/operation-open.cpp b/code/operations/operation-open.cpp
index 80b795f..26c53fd 100644
--- a/code/operations/operation-open.cpp
+++ b/code/operations/operation-open.cpp
@@ -22,6 +22,8 @@
#include "core/noteplugin.hpp"
#include "util/i18n.hpp"
+#include <glibmm/main.h>
+
#include <libinftextgtk/inf-text-gtk-buffer.h>
#include <gtksourceview/gtksourcebuffer.h>
diff --git a/code/operations/operation-open.hpp b/code/operations/operation-open.hpp
index 3e0e6f5..acf63ed 100644
--- a/code/operations/operation-open.hpp
+++ b/code/operations/operation-open.hpp
@@ -26,6 +26,7 @@
#include <giomm/file.h>
#include <giomm/inputstream.h>
+#include <glibmm/convert.h>
namespace Gobby
{
diff --git a/code/operations/operation-save.hpp b/code/operations/operation-save.hpp
index f7f2eb7..8fed55d 100644
--- a/code/operations/operation-save.hpp
+++ b/code/operations/operation-save.hpp
@@ -25,6 +25,7 @@
#include <giomm/file.h>
#include <giomm/outputstream.h>
+#include <glibmm/convert.h>
#include <ctime>
--
1.7.10

@ -1,44 +0,0 @@
From ba98f5e531f915637c535e0a0f90e4cd87ac4f74 Mon Sep 17 00:00:00 2001
From: Philipp Kern <pkern@debian.org>
Date: Sun, 18 Mar 2012 19:01:44 +0100
Subject: [PATCH 2/2] code/util/gtk-compat.hpp: fix render_icon with missing
icons and Gtk3
2012-03-18 Philipp Kern <phil@0x539.de>
* code/util/gtk-compat.hpp: Fix the call of
gtk-widget-render-icon-pixbuf, which is allowed to return NULL if
the stock icon does not exist. Guard it with MISSING_IMAGE.
---
ChangeLog | 6 ++++++
code/util/gtk-compat.hpp | 7 ++++++-
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/code/util/gtk-compat.hpp b/code/util/gtk-compat.hpp
index 1de7383..73332ab 100644
--- a/code/util/gtk-compat.hpp
+++ b/code/util/gtk-compat.hpp
@@ -27,6 +27,7 @@
# define USE_GTKMM3
#endif
+#include <gtkmm/stock.h>
#include <gtkmm/combobox.h>
#include <gtkmm/notebook.h>
#ifndef USE_GTKMM3
@@ -122,7 +123,11 @@ inline Glib::RefPtr<Gdk::Pixbuf> render_icon(Gtk::Widget& widget,
Gtk::IconSize size)
{
#ifdef USE_GTKMM3
- return widget.render_icon_pixbuf(stock_id, size);
+ Glib::RefPtr<Gdk::Pixbuf> pixbuf = widget.render_icon_pixbuf(stock_id, size);
+ if(!pixbuf) // icon not found
+ pixbuf = widget.render_icon_pixbuf(Gtk::Stock::MISSING_IMAGE, size);
+ g_assert(pixbuf);
+ return pixbuf;
#else
return widget.render_icon(stock_id, size);
#endif
--
1.7.9.1

@ -1,42 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils flag-o-matic
DESCRIPTION="GTK-based collaborative editor"
HOMEPAGE="http://gobby.0x539.de/"
SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE="gnome zeroconf"
RDEPEND="
dev-cpp/glibmm:2
dev-cpp/gtkmm:2.4
dev-libs/libsigc++:2
>=net-libs/obby-0.4.6[zeroconf?]
dev-cpp/libxmlpp:2.6
x11-libs/gtksourceview:2.0
gnome? ( gnome-base/gnome-vfs )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
"
# There's only one test and it needs X
RESTRICT="test"
src_configure() {
append-cxxflags -std=c++11
econf \
--with-gtksourceview2 \
$(use_with gnome)
}
src_install() {
default
domenu contrib/gobby.desktop
}

@ -1,39 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=4
inherit eutils
DESCRIPTION="GTK-based collaborative editor"
HOMEPAGE="http://gobby.0x539.de/"
SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE="avahi gnome"
RDEPEND="dev-cpp/glibmm:2
dev-cpp/gtkmm:2.4
dev-libs/libsigc++:2
>=net-libs/obby-0.4.6[avahi?]
dev-cpp/libxmlpp:2.6
x11-libs/gtksourceview:2.0
gnome? ( gnome-base/gnome-vfs )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
# There's only one test and it needs X
RESTRICT="test"
src_configure() {
econf \
--with-gtksourceview2 \
$(use_with gnome)
}
src_install() {
default
domenu contrib/gobby.desktop
}

@ -1,58 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=2
inherit eutils gnome2-utils toolchain-funcs
DESCRIPTION="GTK-based collaborative editor"
HOMEPAGE="http://gobby.0x539.de/"
SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0.5"
KEYWORDS="~amd64 ~x86"
IUSE="avahi doc nls"
RDEPEND="dev-cpp/glibmm:2
dev-cpp/gtkmm:3.0
dev-libs/libsigc++:2
>=net-libs/libinfinity-0.4[gtk,avahi?]
x11-libs/gtk+:3
dev-cpp/libxmlpp:2.6
x11-libs/gtksourceview:3.0"
DEPEND="${RDEPEND}
virtual/pkgconfig
doc? (
app-text/gnome-doc-utils
app-text/scrollkeeper
)
nls? ( >=sys-devel/gettext-0.12.1 )"
src_prepare() {
epatch "${FILESDIR}"/${P}-missing-icon.patch \
"${FILESDIR}"/${P}-gtkmm3.patch
}
src_configure() {
econf $(use_enable nls) \
--with-gtk3
}
src_install() {
emake DESTDIR="${D}" install || die
domenu contrib/gobby-0.5.desktop
doicon gobby-0.5.xpm
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
}
pkg_postrm() {
gnome2_icon_cache_update
}

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<longdescription>Multiuser text editor.</longdescription>
</pkgmetadata>

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -6,7 +6,7 @@ EAPI="5"
inherit eutils autotools
DESCRIPTION="C++ framework offering portable support for threading, sockets, file access, daemons, persistence, serial I/O, XML parsing, and system services"
DESCRIPTION="C++ library offering portable support for system-related services"
SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
HOMEPAGE="https://www.gnu.org/software/commoncpp/"
LICENSE="GPL-2"

@ -0,0 +1,71 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit autotools
DESCRIPTION="C++ library offering portable support for system-related services"
SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
HOMEPAGE="https://www.gnu.org/software/commoncpp/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="debug doc examples ipv6 gnutls ssl static-libs"
REQUIRED_USE="gnutls? ( ssl )"
RDEPEND="ssl? ( gnutls? ( dev-libs/libgcrypt:0
net-libs/gnutls )
!gnutls? ( dev-libs/openssl:0 ) )
sys-libs/zlib"
DEPEND="doc? ( >=app-doc/doxygen-1.3.6 )
${RDEPEND}"
PATCHES=(
"${FILESDIR}/1.8.1-configure_detect_netfilter.patch"
"${FILESDIR}/1.8.0-glibc212.patch"
"${FILESDIR}/1.8.1-autoconf-update.patch"
"${FILESDIR}/1.8.1-fix-buffer-overflow.patch"
"${FILESDIR}/1.8.1-parallel-build.patch"
"${FILESDIR}/1.8.1-libgcrypt.patch"
"${FILESDIR}/1.8.1-fix-c++14.patch"
)
src_prepare() {
default
eautoreconf
}
src_configure() {
local myconf
if use gnutls; then
myconf+="--with-gnutls"
else
use ssl && myconf+="--with-openssl"
fi
econf \
$(use_enable debug) \
$(use_with ipv6) \
$(use_enable static-libs static) \
$(use_with doc doxygen) \
${myconf}
}
src_install () {
# Only install html docs
# man and latex available, but seems a little wasteful
use doc && HTML_DOCS=( doc/html/. )
default
dodoc COPYING.addendum
if use examples; then
docinto examples
dodoc demo/{*.cpp,*.h,*.xml,README}
docompress -x /usr/share/doc/${PF}/examples
fi
# package provides .pc files
find "${D}" -name '*.la' -delete || die
}

@ -1,7 +1,7 @@
http://bugs.gentoo.org/334135
--- src/applog.cpp
+++ src/applog.cpp
--- a/src/applog.cpp
+++ b/src/applog.cpp
@@ -44,6 +44,7 @@
#include <cstdio>
#include <stdarg.h>

@ -1,5 +1,3 @@
diff --git a/configure.ac b/configure.ac
index 80518db..64221e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,8 @@
@ -12,7 +10,7 @@ index 80518db..64221e0 100644
AC_CONFIG_MACRO_DIR([m4])
m4_pattern_allow(LT_VERSION)
@@ -81,17 +82,17 @@ fi
@@ -81,17 +82,17 @@
AC_SUBST(ccincludedir)
AC_CONFIG_AUX_DIR(autoconf)
@ -34,7 +32,21 @@ index 80518db..64221e0 100644
AC_C_RESTRICT
AC_C_VOLATILE
@@ -408,10 +409,11 @@ LIB_MAJOR=`echo $LT_VERSION | sed -e 's/[:].*$//'`
@@ -395,10 +396,11 @@
#endif
])
-
+AC_ARG_WITH([doxygen],
+ AS_HELP_STRING([--without-doxygen], [Do not build documentation]))
AC_PATH_PROG(DOXYGEN, doxygen, no)
AC_SUBST(DOXYGEN)
-AM_CONDITIONAL(DOXY, test "$DOXYGEN" != "no")
+AM_CONDITIONAL([DOXY], [test "x$with_doxygen" != "xno"])
AM_CONDITIONAL(GETOPT_LONG, [test ! -z "$LIBGETOPTOBJS"])
@@ -408,10 +410,11 @@
AC_SUBST(LIB_VERSION)
AC_SUBST(LIB_MAJOR)

@ -0,0 +1,52 @@
Fix building with C++14, which errors out due changed noexcept()
semantics for dtors caught by -Werror=terminate.
See also: https://bugs.gentoo.org/show_bug.cgi?id=595422
--- a/src/nat.cpp
+++ b/src/nat.cpp
@@ -145,11 +145,11 @@
"nat lookup successful",
"nat address not in table",
"nat not supported/implemented",
- "unable to open device "NAT_DEVICE,
+ "unable to open device " NAT_DEVICE,
"unable to get socket name",
"unable to get peer name",
"unable to get socket type",
- "unable to lookup, nat "NAT_SYSCALL" failed",
+ "unable to lookup, nat " NAT_SYSCALL " failed",
"unkown nat error code"
};
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -2971,12 +2971,7 @@
TCPStream::~TCPStream()
{
-#ifdef CCXX_EXCEPTIONS
- try { endStream(); }
- catch( ... ) { if ( ! std::uncaught_exception()) throw;};
-#else
- endStream();
-#endif
+ endStream();
}
#ifdef HAVE_GETADDRINFO
--- a/src/ssl.cpp
+++ b/src/ssl.cpp
@@ -441,12 +441,7 @@
SSLStream::~SSLStream()
{
-#ifdef CCXX_EXCEPTIONS
- try { endStream(); }
- catch( ...) { if ( ! std::uncaught_exception()) throw;};
-#else
endStream();
-#endif
}
#ifdef CCXX_NAMESPACES

@ -1,5 +1,5 @@
--- src/ssl.cpp.orig 2010-11-01 03:42:51.000000000 +0300
+++ src/ssl.cpp 2015-11-25 15:32:23.923057317 +0300
--- a/src/ssl.cpp
+++ b/src/ssl.cpp
@@ -99,35 +99,7 @@
return 0;
}

@ -1,5 +1,5 @@
--- src/Makefile.am
+++ src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,6 +47,7 @@
if EXTRAS

@ -1,53 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=3
inherit eutils multilib toolchain-funcs
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
HOMEPAGE="http://cr.yp.to/cdb.html"
SRC_URI="http://cr.yp.to/cdb/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
IUSE=""
DEPEND=">=sys-apps/sed-4
!dev-db/tinycdb"
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${P}-errno.diff
epatch "${FILESDIR}"/${P}-stdint.diff
sed -i -e 's/head -1/head -n 1/g' Makefile \
|| die "sed Makefile failed"
}
src_configure() {
echo "$(tc-getCC) ${CFLAGS}" > conf-cc
echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
echo "${EPREFIX}/usr" > conf-home
}
src_install() {
dobin cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest \
|| die "dobin failed"
# ok so ... first off, some automakes fail at finding
# cdb.a, so install that now
dolib *.a || die "dolib failed"
# then do this pretty little symlinking to solve the somewhat
# cosmetic library issue at hand
dosym cdb.a /usr/$(get_libdir)/libcdb.a || die "dosym failed"
# uint32.h needs installation too, otherwise compiles depending
# on it will fail
insinto /usr/include/cdb
doins cdb*.h buffer.h alloc.h uint32.h || die "doins failed"
dodoc CHANGES FILES README SYSDEPS TODO VERSION
}

@ -1,3 +1 @@
DIST LMDB_0.9.17.tar.gz 135816 SHA256 80a08218e40f76a0485ec18c42de6f1e020b1ed0268f7cb34c69746e8d98c72c SHA512 2f6108364973e01f6379613c02b9fa11933d6c91eadc5ae0cad55818bc0205041d0663a5dd936d89ec651eb1de0257390d48d549d1bc24ef29d7ee57c9fcb941 WHIRLPOOL 9ed1ed2857cc1282e30fa5a6ecab710bbb00f88f973a90228004194f7f52fe21053e27692e9ec9d0dedd33c6e204bd9f66702fd63e60c8a8a23f655acfbda474
DIST LMDB_0.9.18.tar.gz 139156 SHA256 dd35b471d6eea84f48f2feece13d121abf59ef255308b8624a36223ffbdf9989 SHA512 394e88d99d446eb30771d7cf7a661584683a0d6d8e976cc561b5eecbb2a5d0817bbd59994002afa4eae6c86a39f05f50ebc2eff77cd70dd8c67225df4611f5e6 WHIRLPOOL 067fdb080edfc338885358c5cfef39a6ca9cdab8f49fd0f62bc68005e1f7dac9cd69fc87d130cf19f818906d090b906ea8b9716440358f33982e96e91ae4c049
DIST lmdb-0.9.14.tar.gz 128170 SHA256 3b14dfe2134521cfebd98168b925f7327b9bd07c715640b79f3526e54f0ccb1f SHA512 d5bde616fb22631fe1689e2c77babfbf5098833cf313bce59a5daab1e450d2998a65f087929879e73e0a897b934ff40b8e340c79ec7b2b1c1fe7e1eea7da6267 WHIRLPOOL 0ebda52fd50d9d73bc079e6a613b2e2cdaa1032665d91e499dea9dcf1698095bfe84b03a931118baae8048c616e9bae7153972446502d368e7dc9ee33105e777

@ -1,51 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit toolchain-funcs
DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
HOMEPAGE="http://symas.com/mdb/"
SRC_URI="https://gitorious.org/mdb/mdb/archive/2f587ae081d076e3707360c5db086520c219d3ea.tar.gz
-> lmdb-0.9.14.tar.gz"
LICENSE="OPENLDAP"
SLOT="0/${PV}"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="static-libs"
DEPEND=""
# =net-nds/openldap-2.4.40 installs lmdb files.
RDEPEND="!=net-nds/openldap-2.4.40"
S="${WORKDIR}/mdb-mdb/libraries/liblmdb"
src_prepare() {
sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
-e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
-e "s!ar rs!$(tc-getAR) rs!" \
-e "s!^prefix.*!prefix = /usr!" \
-e "s!/man/!/share/man/!" \
-e "/for f/s!lib!$(get_libdir)!" \
-e "s!shared!shared -Wl,-soname,liblmdb.so.0!" \
"${S}/Makefile" || die
}
src_configure() {
:
}
src_compile() {
emake LDLIBS+=" -pthread" || die
}
src_install() {
mkdir -p "${D}"/usr/{bin,$(get_libdir),include,share/man/man1} || die
default
mv "${D}"/usr/$(get_libdir)/liblmdb.so{,.0} || die
dosym liblmdb.so.0 /usr/$(get_libdir)/liblmdb.so
use static-libs || rm "${D}"/usr/$(get_libdir)/liblmdb.a || die
}

@ -1,49 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit toolchain-funcs
DESCRIPTION="An ultra-fast, ultra-compact key-value embedded data store"
HOMEPAGE="http://symas.com/mdb/"
SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
LICENSE="OPENLDAP"
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="static-libs"
DEPEND=""
# =net-nds/openldap-2.4.40 installs lmdb files.
RDEPEND="!=net-nds/openldap-2.4.40"
S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb"
src_prepare() {
sed -i -e "s!^CC.*!CC = $(tc-getCC)!" \
-e "s!^CFLAGS.*!CFLAGS = ${CFLAGS}!" \
-e "s!^AR.*!AR = $(tc-getAR)!" \
-e "/mkdir/s!lib!$(get_libdir)!" \
-e "/for f/s!lib!$(get_libdir)!" \
-e "s!prefix)/man!mandir)!" \
-e "s!shared!shared -Wl,-soname,liblmdb.so.0!" \
"${S}/Makefile" || die
}
src_configure() {
:
}
src_compile() {
emake LDLIBS+=" -pthread" || die
}
src_install() {
emake DESTDIR="${ED}" prefix="${EROOT}usr" mandir="${EROOT}usr/share/man" install || die
mv "${ED}"usr/$(get_libdir)/liblmdb.so{,.0} || die
dosym liblmdb.so.0 "${EROOT}"usr/$(get_libdir)/liblmdb.so
use static-libs || rm "${ED}"usr/$(get_libdir)/liblmdb.a || die
}

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -49,7 +49,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -49,7 +49,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -49,7 +49,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -49,7 +49,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -49,7 +49,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -49,7 +49,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -45,7 +45,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -48,7 +48,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -46,7 +46,7 @@ virtual/libintl
kerberos? ( virtual/krb5 )
ldap? ( net-nds/openldap )
pam? ( virtual/pam )
perl? ( >=dev-lang/perl-5.8 )
perl? ( >=dev-lang/perl-5.8:= )
python? ( ${PYTHON_DEPS} )
readline? ( sys-libs/readline:0= )
ssl? (

@ -1,22 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=HAARG
MODULE_VERSION=0.09
inherit perl-module
DESCRIPTION="A module for merging hierarchies using the C3 algorithm"
SLOT="0"
KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-aix ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="test"
RDEPEND=""
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? ( virtual/perl-Test-Simple )"
SRC_TEST=do

@ -1,2 +1 @@
DIST Algorithm-C3-0.09.tar.gz 12430 SHA256 0fe9b5f806c8679dd70fe8eeeaaa570d70a34d449f844759b16e805bbf7322a0 SHA512 f3c0ecd703217158fae481c54e9d38860f51dc411b9238a01da5fa13c5d84f5e5ee5a41d683b2c05ae1322ce909ed40e0b4127d72a456c88e1081276c9aac5ee WHIRLPOOL ac63d6744b9fbab31aa4d9ff5d427cfe81898a348b5478078d2ff5b66b3abc7a1fcfb459cb01a1e7197a7c709485af7dd67a7183dfaa5f2e5b25881d1fa3a42d
DIST Algorithm-C3-0.10.tar.gz 12523 SHA256 5acf3a074025e9be10da352adc6d1ccadde4b61b6d6691e83248d366bb621406 SHA512 2ace81679e8ff2f3f3fbe8028741aef0833b1415a7cde0d1b20c90557889347685d1135029cd849324b6d40c435a80b228549bf669bbf43f9a1b2ed7075b605e WHIRLPOOL c586a550df0d336ad7ee76419d4fa1d28c38c28e7838d042c68b5493a3d4ffdb766a8b4ae95615baef3c82b2a8ecc6091398f0ef193a324f7e51abe5995461db

@ -0,0 +1,23 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DIST_AUTHOR=MLEHMANN
DIST_VERSION=2.23
inherit perl-module
DESCRIPTION="Simple but non-blocking HTTP/HTTPS client"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="
>=dev-perl/AnyEvent-5.330.0
>=dev-perl/common-sense-3.300.0
"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
"

@ -1 +1,2 @@
DIST AnyEvent-HTTP-2.22.tar.gz 27965 SHA256 864544a4f35b3f14b59f42a26d338d98cfe8fae726eb3578dcf36eed0df5aa6e SHA512 3408b5339cc85e8d37dc6c4f40a0f1ad9436fb9b261e6a14b5a7913f8ee6c2ba7e80aec376af48190c76219fbcadf9c68c2d67c4ab60c77044093f6ec70f4aac WHIRLPOOL b8c92e89a9a22a1a2376c2893c190e3f5fe83f8017b1da6b3d33fc1807d3a24243f2048f904df682683fe22629aa875efb157e176b072f7f9ab0f2da9a4e22ae
DIST AnyEvent-HTTP-2.23.tar.gz 27351 SHA256 2e3376d03bfa5f172f43d4c615ba496281c9ffe3093a828c539683e17e2fbbcb SHA512 ba28bb01c042c6fbf51c7055ddf38dbea1b6a7e84a8a8c8ec845bf63f16f9919a388e092c59f07a9588972da45b87de3627dc66dd2b2b958b731c6b699197d90 WHIRLPOOL c471c4184f26a7b0d18d338fa01933e041199b30651a2d98ed92325cc5a102e57ba0b8c86dd9b02cad9bfb69e317cbfd6143f3b828f8c0b15ba63b9412746755

@ -0,0 +1,21 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DIST_AUTHOR=MLEHMANN
DIST_VERSION=7.13
inherit perl-module
DESCRIPTION="Provides a uniform interface to various event loops"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
>=virtual/perl-ExtUtils-MakeMaker-6.520.0
dev-perl/Canary-Stability
"

@ -1,2 +1,3 @@
DIST AnyEvent-7.07.tar.gz 292938 SHA256 4c4cc8e877bc8812e17aad29ae8d6364066bf2a0d1e4de9de14fb01e02a43106 SHA512 db02fd12aa64f7d253509f701dde5af67b58e43f7df052f8b1e23fc6f45327bec7668ed0ead8407ce72578d2d8544bab4a688f739bcc2fb5aaac3a431aeaeb6c WHIRLPOOL 569fd392192a2718603500cae0ce0bf8a4a31b37e9343259e449f68ac2c14c15711ca82196b2c9069a96697a9d7b2c3195735dfa4c4a3a4835dfec38eec8f172
DIST AnyEvent-7.12.tar.gz 296712 SHA256 7893a7e5d65e6bc34479712235baccb739837c336fb9eb70193141532e95737d SHA512 a508024ee207dd227d81544d0796672587125698034317d6d1e50a22395358fbf62001b17d0e7f3bc7ea4be69b1004f563cdf7097ac67b10a4a43545a9d2273c WHIRLPOOL 9024dcf667e3628905b2f24b8d730fb79d4cebb7dd26e5775ce8a19f62ce355f23aee65526d76e6afea51857b96fd447e099f1ee33102459a9bfd2f2582130c5
DIST AnyEvent-7.13.tar.gz 299596 SHA256 a4103f4def9687b5545b3e6be1f29a5a24b59ff9a817b1afc27fb9bc268d04ad SHA512 7a3b10028641358cb5a7c09c01583ee7a7d7c8d02529a0e4682ff426246f3675a1e82cb46c31d0b7ea1c130c11b4f4f392be2592d961f1c03d66803287ddb089 WHIRLPOOL 4f4448c6f4a30c890b0285d82f41cd429585b58da94ec6543ae275924b8c66a455e2760899f8473d2221c712dc7e059aa219898ec36d51af778fc5ed54603991

@ -0,0 +1,28 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DIST_AUTHOR=MSCHOUT
DIST_VERSION=3.25
inherit perl-module
DESCRIPTION="Perl Authentication and Authorization via cookies"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="
>=www-apache/mod_perl-2
>=dev-perl/CGI-3.120.0
>=dev-perl/Class-Load-0.30.0
"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? (
>=dev-perl/Apache-Test-1.390.0
>=virtual/perl-Test-Simple-0.940.0
)
"

@ -1,2 +1,3 @@
DIST Apache-AuthCookie-3.23.tar.gz 45053 SHA256 c40c7f28447ad1e17f00ac63c0855d0af41b31d212fcc72ae91cc284e5aee9a7 SHA512 e8948725c1f2ae3631004ec666ecd20b9c3b5fda86408b980e5d0a3e0d36a8780d905718b1c7b5ca117fc15e130bf35f59ef83c598870dc5b874ee362a4fdcb7 WHIRLPOOL 016a518371301209d4c81370e95afb071e013b4b85ad26b6b544f0a9e7383aae3b23fbfb0de446f84d55cf928eda7c64ab705698b636710bdd1460d53f5b7e13
DIST Apache-AuthCookie-3.24.tar.gz 48349 SHA256 af153ba6ad362d5834565b4484b0e06e2eca64a5d3e8d83eda6be03e23f9b5f9 SHA512 023cc9c695d5b43a92a46b80a2c8ce556d89f0f3ed83d05cb068db5b50d96e1a0e4cd52491d2eb5f0e680e073bc16b36c214b2527a5c5d31eee1a37ed6cd2f60 WHIRLPOOL f8f024bf663ad420057897763d034680366eeefe856b3512189dfbe1fea72c511c303b1adda01c84b934563980395520b7474a8cbddd15247da1478645456c05
DIST Apache-AuthCookie-3.25.tar.gz 50318 SHA256 30e8066eed5518fd7f686c621aefb2db0c7d22221a6d7e2b926dcf8f2a20d008 SHA512 73eb4c20170629e71663df7ef0cf9bcf780d25795e007674e797e78de2540a2eef04e9afa6e31cc1d372348c23af718750d610f67851ef17c8d39e8d6ae6ca42 WHIRLPOOL 9b749e631c811003f2f8318128eb05267a0f2187ce0cff5860c0d4382092dd1cc8b492eaa91736d441ad6ff4f315f3c9fd047ad3eca2a8590f91914b7ca0d360

@ -1,40 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=KAZEBURO
MODULE_VERSION=0.32
inherit perl-module
DESCRIPTION="Compile an Apache log format string to perl-code"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
# POSIX -> perl
RDEPEND="
>=dev-perl/POSIX-strftime-Compiler-0.300.0
virtual/perl-Time-Local
>=dev-lang/perl-5.8.4"
# CPAN::Meta::Prereqs -> perl-CPAN-Meta
# HTTP::Request::Common -> HTTP-Message
# Test::More -> perl-Test-Simple
# URI::Escape -> URI
DEPEND="${RDEPEND}
>=dev-perl/Module-Build-0.380.0
virtual/perl-CPAN-Meta
test? (
dev-perl/HTTP-Message
dev-perl/Test-MockTime
>=virtual/perl-Test-Simple-0.980.0
dev-perl/Test-Requires
>=dev-perl/Try-Tiny-0.120.0
>=dev-perl/URI-1.600.0
)
"
SRC_TEST="do parallel"

@ -1,2 +1 @@
DIST Apache-LogFormat-Compiler-0.32.tar.gz 16354 SHA256 bc112cdbc32f2e93c10bf661f39de509036e01c20c3a702a22cdb0be4426dd7f SHA512 aee9443bd067dc9a623b8f694e3d0c8fd2d3b7e4fe6a547153eff0c2046f22a4503a9b999df2df92bee1eb06c17cbbe626555bd70018891784af51d7623ac27f WHIRLPOOL 00bfe93bab32fb1b9030b5016183ed152fb72ead46e441a49800d9588e417ad54d2ea90990a5aa0410ffbf419d56e75137cfe5ac1a845db8cd4c11838e50c9bb
DIST Apache-LogFormat-Compiler-0.33.tar.gz 16431 SHA256 1bf36d92aa184236fbd9d1f795f273de9d365c6fbe087bfdfbaa800bff98749d SHA512 2d098316d02dd9d81dbdb9b4852917430fad0e8e8599464500ee838b5eb6b26ec30fff04f1a9d0fad87141f38b6262c0a0a9bb14c13c559c9b92b53649225e21 WHIRLPOOL d5da1f1c6ee993fe666c612fffc5ef6e98eb4beed2d97a3a0e4fcd06f7daf1cf7f545ce012a256c8da4f45a82ca9a46f1ac4a1d5aa3b834293a53fa2a4fb2721

@ -0,0 +1,37 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DIST_AUTHOR=SHAY
DIST_VERSION=1.40
inherit depend.apache perl-module
DESCRIPTION="Test.pm wrapper with helpers for testing Apache"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
# interactive, requires interaction with the live filesystem
DIST_TEST="skip"
need_apache
pkg_setup() {
perl_set_version
}
src_install() {
# This is to avoid conflicts with a deprecated Apache::Test stepping
# in and causing problems/install errors
if [ -f "${S}"/.mypacklist ];
then
rm -f "${S}"/.mypacklist
fi
perl-module_src_install
}

@ -1,2 +1,3 @@
DIST Apache-Test-1.38.tar.gz 150863 SHA256 321717f58636ed0aa85cba6d69fc01e2ccbc90ba71ec2dcc2134d8401af65145 SHA512 416a89990e1947dfd970b806a28b52197165bbe1a482402aa5649f6e2692866a54cc8a4a7adcce83350e2f16aada409fd6c506c0d139b624319c5ebaa58604cc WHIRLPOOL 6f5724b9e56dcd268c8dfa3469b85e6f3f9ef02e9e524386d0af12377d9e560831155913392f04ef9e7b130b0b495e1e5e013a52cd0f4c747507f8f845665e6c
DIST Apache-Test-1.39.tar.gz 151240 SHA256 d8543864ff29e8ac3d4004c5c7014b1fe490b2024104ac4c24683a74bba62089 SHA512 4f10b0ed856d03aff27aa80d9788f0a2f50eac3523cc7ecf74fec2cda4c881fda2ec096ca238539eb8c4aa2caa4daaa192456f34d00ad8012276c1d87fcc3533 WHIRLPOOL 01a77e14a1464a0caa8154dd4ff68b6b6dc5e7220ae1d4efe63e2a9eb2134ec94d0d5b73c6701de21c0a7d620d1e4bfe2db768c2cd08d9a984609bb7186beaea
DIST Apache-Test-1.40.tar.gz 151801 SHA256 3cf537f1c81deb549d62be7fd5ee1af439283a9e93f3d13465d01a1d41d4ae40 SHA512 f48a1b93c4d61181670ec59bb8bb2231122b22ec9725d8899a3b2f82d2918fdc48a09494c2f45b0e6a603546481892a948eac3494e06c8eb219a9213e1faadb8 WHIRLPOOL 9456d81354cf4fc22fb67d35053daba43fb0fcdcc6c3ef2c537a6996268371db988bbc335635e3557104430c35ddefbb6a455a8da83eb00fba648fb7cfb17656

@ -1,3 +1,2 @@
DIST XML-DOM-1.44.tar.gz 117024 SHA256 f6af32c74c84b3b173eca9baac521a0f9b030c9a0395fcafd4235a84d8ad0ae4 SHA512 fa4e4534971683281a3b7adf0a322fa98569bf3fc4f18c7a1e2c1bd13a2c44d3d3b985038c006ecc61c755580992c9085d6dce1551e7425db77aadafaadf4437 WHIRLPOOL b7ed7a5e1d14751b2b87afdbdbd4a42f6d8878055cfc830ca82a18054df859f3d255cfce10618e59e59b5d3d490466299996b2f6d204e5976f5f60e6a6381d0f
DIST XML-DOM-1.45.tar.gz 116855 SHA256 bed14e6ba8d970345946927b19faa1282b26ce1c2cc1d2324090a32a417478cb SHA512 559082f36d96dee28fd8ade7867b56abbd904e8fd6f585a4a2b348b2a6ae7e7892a2974b3d1983a296044e08ce346fdd006999aab364638d8c998dcee441fccf WHIRLPOOL 9833256b82d59b1eab9792e12d4132d02f1ed0d46ee3f22d536bffe94c12becc6c8f99e486e97dfaf5ead03fd33dfcab190471426a43b12f1ea85b57c06fcf8e
DIST XML-DOM-1.46.tar.gz 117291 SHA256 8ba24b0b459b01d6c5e5b0408829c7d5dfe47ff79b3548c813759048099b175e SHA512 0fc96571996262bb0a99bd5f85e5d9e0f9c71c604c46c74129f0f560aa2749f7b945c591bfc13b9178d2b8d83826d5306f4ac71db33b51c55ce4d76398bab13d WHIRLPOOL feb3256486d19ceb552d652549f2cb252a1e7920baf5b06eb25d4856efe6004e345c64891599d9d9708fbb6571d35110dc574bf909a69c2f0b2e05313610f983

@ -1,21 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=TJMATHER
MODULE_VERSION=1.44
inherit perl-module
DESCRIPTION="A Perl module for an DOM Level 1 compliant interface"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="dev-perl/libwww-perl
>=dev-perl/libxml-perl-0.07
>=dev-perl/XML-Parser-2.30
dev-perl/XML-RegExp"
DEPEND="${RDEPEND}"

@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A Perl module for an DOM Level 1 compliant interface"
SLOT="0"
KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RDEPEND="dev-perl/libwww-perl

@ -1 +1,2 @@
DIST XML-Simple-2.20.tar.gz 75993 SHA256 5cff13d0802792da1eb45895ce1be461903d98ec97c9c953bc8406af7294434a SHA512 f953a0b9082c509c4616b92529da94a289b1e0300b18a5b88c08d0826bb4fd18e51f1e3854e6f870ef3cfb506366c0b47b9dd302433b63270a18b45f068d4658 WHIRLPOOL 5c4473ed30a48a0f0d966ea0dc1c73e7d66411b1f16e0109e835d4a50dd5d37e007430bf1c550f5a7ddf921518f45899321af346341474125925b97d9d5a4c52
DIST XML-Simple-2.22.tar.gz 77937 SHA256 b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49 SHA512 b5e5d36726b8a0efcf7200522d802a7f733c883526db2dba64ce23bf7e044d20d9186fac3bb2f2940807a30f746301f690129c4c542341c8a57a735471b5f4d7 WHIRLPOOL 6c7afa1178d94177979f377782d63f6215acb1859bd985254ee12697e16c14f531e4a003267947b59b8fd41fef9bd44efccb3c1961865854da2b6f002bad8293

@ -0,0 +1,26 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DIST_AUTHOR=GRANTM
DIST_VERSION=2.22
inherit perl-module
DESCRIPTION="An API for simple XML files"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="
virtual/perl-Storable
>=dev-perl/XML-NamespaceSupport-1.40.0
>=dev-perl/XML-SAX-0.150.0
dev-perl/XML-SAX-Expat
"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? ( >=virtual/perl-Test-Simple-0.880.0 )
"

@ -1,3 +1,2 @@
DIST XML-Twig-3.46.tar.gz 400352 SHA256 e89e7062074d6b7a1171c9e31a0f1adb7ef25a936c52a4312869b309c1ff692b SHA512 6a0a580d8659ddf5a6f6640911ca4b8a74688bdf546809a4b8d2e077813cb3d67513f654eaa30944641a5423c3373231f8452558baebb7517c1ece1b9dfee46d WHIRLPOOL 3cca5ff84846ff0453c818ec3031186037fec73d4049f60265c3455b85c5c148c3d65798d6d9a799bf5729c3f4a8aba26eb4c8e2cea55dc623d188eda7025b04
DIST XML-Twig-3.48.tar.gz 401255 SHA256 35472542ba6cecea6b091f00d9784d8979567e2e781d95b7216049958b9c997b SHA512 9541ab4b4b94703b3085686d8f0ab962b60ae968e2a77cc2a1a944451825b5e534117fcf4b4e462048a6a1717df49c366ee0d7eea80471cbebb08e37e173d509 WHIRLPOOL e5efcc12f4f2ca0a4d67f89be20fea98d6d80e021016fd0f9b3b1ff99d8d09d3c2761f54604d8e5e5e048792a5958095d14cfcc3e1ea1900ed6d91edfca1cea2
DIST XML-Twig-3.49.tar.gz 402874 SHA256 3e0def8a7477fefa8c27fabf11899a459c8b793909182d016ba26749e9354e01 SHA512 162c07f912062723f225e9620cf18a8a8ad1282abeab6c981c9acb9f638f6fbc70476811533c7c739e861e0cce4ccbc7f44ce0cbe8a9b6b4947e60cffacce23c WHIRLPOOL 6dac6b7e40a8ba7b68f613dfd4d24cad754f8d5be9d7b7c1bb580d177b5c903ed95dc64d06933a48122e458ae987ae1c84a3ea21d7570cda8ab39709ebe95f32

@ -1,32 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=MIROD
MODULE_VERSION=3.48
inherit perl-module
DESCRIPTION="Process huge XML documents in tree mode"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="nls"
RDEPEND="
>=dev-perl/XML-Parser-2.31
virtual/perl-Scalar-List-Utils
>=dev-libs/expat-1.95.5
dev-perl/Tie-IxHash
dev-perl/XML-SAX-Writer
dev-perl/XML-Handler-YAWriter
dev-perl/XML-XPath
dev-perl/libwww-perl
nls? (
>=dev-perl/Text-Iconv-1.2-r1
)
"
DEPEND="${RDEPEND}"
SRC_TEST="do"

@ -1,3 +1,2 @@
DIST XML-Writer-0.623.tar.gz 28683 SHA256 0b409ab1d7b4fbcf5afd47df3d09bac16cef521953fb04158dc418ca8ef56727 SHA512 5fe257ad92f3e557fda376b0bee1525c42c1a3c653eca756828d8407482b3a771cbc3f83b94585f02c8f4eb6d2c0fcf6ae885c1ed608af71989c52c061000d0f WHIRLPOOL 483cbb383401c4075cf7eda00c8d16419205017a724b05033178fa428c237c8c73fbf30b503406c0374272d5058ec38aab61078756b57436d6627e44fc128858
DIST XML-Writer-0.624.tar.gz 28775 SHA256 86ccee2fb5fef459b1f9b5e673fc35cc5f9c5d0329fabe68549491956003df7b SHA512 7d8c5cee8cfca8a4d780f465b6a94f90c16791bfde5b5b3f32db80c3e916f1ba9cbc9ea382424c36018f5754e9109b9309c73ce2f603785a96be81ccc2010fce WHIRLPOOL df088c1b4274efe589588ccfed15209bc29087f59b27188cddd0db7d2d87771e555ade7cec1c451e70aba4567f974c910cca7aa715fd737b841238328ed2baa1
DIST XML-Writer-0.625.tar.gz 28930 SHA256 e080522c6ce050397af482665f3965a93c5d16f5e81d93f6e2fe98084ed15fbe SHA512 30ad348e7f1423ce82dc0709e767d4ae384ad6e76f6444c8a12d97b1dc9c2b39e2c5bec43779bc35891942fa75f852cd26e8831dd6b5cfb9c72bc8512ca55923 WHIRLPOOL b14c5c8956dfede01845a98713ada29fa39f1e7f5c53add09e0b389864e2f35c5e8f0873eed9b7580689d1872ff09d30c6d3182378a3b1f86030d7ff06aec5eb

@ -1,28 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=JOSEPHW
MODULE_VERSION=0.623
inherit perl-module
DESCRIPTION="XML Writer Perl Module"
LICENSE="MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-linux ~x86-solaris"
IUSE="test"
RDEPEND=""
DEPEND="${RDEPEND}
test? ( virtual/perl-Test-Simple )
"
SRC_TEST="do"
src_test() {
perl_rm_files t/pod-coverage.t t/pod.t
perl-module_src_test
}

@ -1,2 +1,3 @@
DIST XML-XPath-1.13.tar.gz 39832 SHA256 2a49c2df34007588397bdf7ae5f122df72a9499df5cbec8fbc6ad4a31a775576 SHA512 c5af746f36562803e42c5afb63b533b59ecaa263977c5ef4bf6488b7597cae334bb3b0c644acdfbb453e87a22ba9a785df3f81b95faec89d974704d6f04f6503 WHIRLPOOL 7b2cc2c3484826a426a686e7dfe516e1bcc47521002197b9d2e1172fb6a0d554ee803a52227e692b32b4a644cba535c5e73528f82bc65bb5a44db4ee5080d77a
DIST XML-XPath-1.36.tar.gz 54662 SHA256 5391208078b4a7854ce3188d3493dc7877ee7ffc22279b19110f8bee419b1f46 SHA512 e419ac647192ca813687e211d87f59ff6cc3d0976242f4a179fb3039b4fdf1fb5b8865c62153be5795100abb8fb5efb1dc320099a55d41de7f90e94f7adad254 WHIRLPOOL 43820c4f834db5fade7e766dcba77e4cd25f562afb78eee1de887d15581ef2fe3f23fcf40cdab48bcb017942959ec8aaa7d2c4af3ce397cce1831395be9901d9
DIST XML-XPath-1.37.tar.gz 54747 SHA256 b8ae1196184f794528a9727988dce944ecec7155e6ee1c433b17e12737a22725 SHA512 37531049cb7d029d8777b21368404af17cee32328a6426a6470b43d050dc2bb605ac6cfefd51fe1614fe76bbb9306986a50960ea8e106232c209d9efe8c6dac0 WHIRLPOOL 07bad97f8aedca302a5133f126a8b71c73f9c77d40297841009bdf741747ef640cbf13f574f3b0e644599ebce927d73ae458e017f31c6fb075cfdd5b2fa32c38

@ -0,0 +1,29 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DIST_AUTHOR=MANWAR
DIST_VERSION=1.37
DIST_EXAMPLES=("examples/*")
inherit perl-module
DESCRIPTION="A XPath Perl Module"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="test"
RDEPEND=">=dev-perl/XML-Parser-2.230.0"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? (
>=dev-perl/Path-Tiny-0.76.0
virtual/perl-Test-Simple
)
"
src_test() {
perl_rm_files t/meta-json.t t/meta-yml.t
perl-module_src_test
}

@ -1,2 +1,2 @@
DIST YAML-LibYAML-0.59.tar.gz 140949 SHA256 9df424ef5e968054042cacafa2f44354a662329df974d178dffce7529fc99f54 SHA512 0c0bdbd7d93352b1e60f41f185f2947b163a9ea7074945c933850a3d165f75dd202403406f9e355e78535ae7d1726f2328dc006af7a01a6f30c48999013da3bc WHIRLPOOL ea881b3fdc37a3d8a641985f93fcd00d224940ce612962d48488c3195e2085cf6b41ac4d076dd0eda01ef331f560a437aa000ac56ef85b5ea0ae1e3ce9d56cff
DIST YAML-LibYAML-0.62.tar.gz 142911 SHA256 1a334a7ea9fe444ddb384a378b9f6eb2b77f4564fe481a778b48fb48b82d31db SHA512 05d2fa1e656034da0c903a267037a08855040843dc6ec68d91e99df5c64f6896d29be0d170b5c08c0d601a1c87b595c90786a7ff1a12a33fa2bfff21f86aec81 WHIRLPOOL 899f316f1319f081512e7086a230e1a61d948cafa98517db7a6c6e6bbcbd56c5679450cc0c1e3703d6f5105dcf9c395267b3eab662aecd7864e0007ef83936fe
DIST YAML-LibYAML-0.63.tar.gz 143075 SHA256 3cf0044a8838966f63c850a442e36039b8aec2db291089fffa11b786d1d164c8 SHA512 c1161ac72f678e4531f8fe5daf09553ba946513c3d1efa1d354ea17ef4dfefd4281a2d77e2fe49960388d338681a24d7547b36dc08ad8993651e807a303df954 WHIRLPOOL 1772e3416c045d7fd13fede6488ab4c6cb6f7ec7742e80f4fad6a062fed9f95d0008e59731316443010652216e8dd98754f7d51f2aa38ad7cb09626e2f24ac2e

@ -1,17 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=INGY
MODULE_VERSION=0.59
inherit perl-module
DESCRIPTION='Perl YAML Serialization using XS and libyaml'
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
SRC_TEST="do"
export OPTIMIZE="$CFLAGS"

@ -0,0 +1,24 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DIST_AUTHOR=TINITA
DIST_VERSION=0.63
inherit perl-module
DESCRIPTION="Perl YAML Serialization using XS and libyaml"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~x86"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker"
export OPTIMIZE="$CFLAGS"
src_test() {
perl_rm_files t/author-pod-syntax.t
perl-module_src_test
}

@ -1,3 +1,2 @@
DIST YAML-Syck-1.20.tar.gz 164384 SHA256 5a23dafeb76b04a536f7ad59499ff54a986d20ab4ac659d238304fac013e9d6f SHA512 a49cd972015e05aac22cf0414e9b6a85fa3f05d54e1855fae72869a8f2209a7cd5f1007350b372be6feaebed015dfd2c43e2345b27b6d84a56717802a5423c17 WHIRLPOOL eb64b3a7104970cd523964aeff25be15f9546f1f25d62180b6f2d1ee361b2d8c4d359d33725a3d2bfa605535c2d10c912463f9b94220316db6c6c4c7f484e007
DIST YAML-Syck-1.27.tar.gz 173024 SHA256 de74e534a0e21b05cc7e7af322d45754122c192ac871802cd9488fef50e02df9 SHA512 c54c8d2b0cb73a0bcc5c377ce91eb50c706429832a6f3190fcdc8b4eedec2b6f8e7add53f578bc9795d8600bd5cd9a000d491077be5851a15493df6993e469fc WHIRLPOOL 29b397ba3cc91f9ed259048b5c304d7a588bf68af953e5054f32a938592050fc9f82357737735654da03f547b83e388baea0bd086d54473532db55294930ca76
DIST YAML-Syck-1.29.tar.gz 173181 SHA256 d3567b3653e610a2a0fd28286ddc7869ccdeba5e6663f9638c22bc17d6cfc939 SHA512 5e6326375ab4498cddee9f54d09a6d62569cb3f68dd2015e5ccda38fedb9b3d22b8f07fc3bd2536feedb61c0cc1d86f91640c5bb03374351e341ec5c1495b991 WHIRLPOOL 161d6204f555db0171d26d6e17c8fb3369f51fca508262b7e775bba1d1e876a6bd0312d878d47cec37f7edef485985f4db91c13288cfec3d38607035d4fddfa1

@ -1,18 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=TODDR
MODULE_VERSION=1.27
inherit perl-module
DESCRIPTION="Fast, lightweight YAML loader and dumper"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"

@ -1,4 +1,2 @@
DIST YAML-Tiny-1.51.tar.gz 43342 SHA256 5c6e9b3d9e558fc428d8b8710da49ff3bcb9fb606decb63c24816da01c9f8b4d SHA512 7e40871458f538909df0192a3da2d44efda593fd05305f77c30647abe3ad4acbc50fa2dd4aac2b2264dc711c6472b788326bc396f828b4ab2c8891d4692c3af7 WHIRLPOOL da1a37b9afccb5ee726dd339f674adeb9b005f5c54b3ac1b1400c6d1e583928ed05751ce0115a65d22fb8fcaf0fe7758cdb2ea5bd927bd752c9c8a5d26936d2b
DIST YAML-Tiny-1.66.tar.gz 69762 SHA256 fb79cb06a5d80b80871e77c3869e469c7bda39c995d930d6b55fe5bb2fa22730 SHA512 cfca31fc9ec47c3797fb03415d2419b74b35b454da1dd44959a4b68eaa96c2daf422b7641053386dee077f6c483e70790c73b981cc72dbb00286377e538d07d9 WHIRLPOOL 8894054d4944b8dc063f43dbf1f035ca55fde817146c006a04b0d612388016adddc0a899962ff20bc74a44b6c4066e070058f45e8637edcf43f0d8e47a517185
DIST YAML-Tiny-1.67.tar.gz 70902 SHA256 4f54e6e5ae08f0765801e3c3edc44d29a21e54c1789d12b44250cda19aba8d4b SHA512 78032781bdcd6eced5e71ca3fb92edc13bd032d17fdba4e0b830e3ad08fb8404dc680352b019ac3af00ef9003dce0503c4d936806b021208382b02496f0462b1 WHIRLPOOL 5fb346b62985868948e1e2c42e62ce846db88bfe52d9da8c2cda259ba88c4ac945f6a6534520e68c1a699ce7c2c1cb2e174c9fca1dc2c4f6b15c808e17ea1673
DIST YAML-Tiny-1.69.tar.gz 71513 SHA256 bc8cb059492b9e4f7be1bcefd99dfa834b13438d48fd465c1e312223f584f592 SHA512 64c3428691f78d94bedf7f3b3276f7868d7280ca6d3c9a7a2e8137568d0da2fc94c766f9873f2796898386d6e7d3d1010c790fcc119f3d4d743becfa39d56a2c WHIRLPOOL 80b04001aa6f1c5fb802d2fdae7d3ce5ca66469c0bdcd01e303347aac573b468d5f3f846db1131855664ce8e5a2a5f0b11646f78a03520b2b7e41fb8d063d0e7

@ -1,34 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=ETHER
MODULE_VERSION=1.66
inherit perl-module
DESCRIPTION="Read/Write YAML files with as little code as possible"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
virtual/perl-Carp
virtual/perl-Exporter
virtual/perl-Scalar-List-Utils
"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? (
>=virtual/perl-File-Spec-0.80.0
>=virtual/perl-File-Temp-0.180.0
virtual/perl-Getopt-Long
virtual/perl-IO
virtual/perl-JSON-PP
>=virtual/perl-Test-Simple-0.990.0
)
"
SRC_TEST=do

@ -1,34 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=ETHER
MODULE_VERSION=1.67
inherit perl-module
DESCRIPTION="Read/Write YAML files with as little code as possible"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
virtual/perl-Carp
virtual/perl-Exporter
virtual/perl-Scalar-List-Utils
"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? (
>=virtual/perl-File-Spec-0.80.0
>=virtual/perl-File-Temp-0.180.0
virtual/perl-Getopt-Long
virtual/perl-IO
virtual/perl-JSON-PP
>=virtual/perl-Test-Simple-0.990.0
)
"
SRC_TEST=do

@ -1,2 +1,3 @@
DIST YAML-0.84.tar.gz 121150 SHA256 0a351f0a771526ca4a448c573a781614debdd5296fd0832396fc89f1854d640c SHA512 e892db21b94e374fdada74c8cb36a4c7a565fc935c8e1a81301f4820d34a26990e6aefe6e3e3d5386a54f29a1a758695bcd1e151b8d6f82fe8f558005a669f0f WHIRLPOOL 6639676718a4ce5d2b62f6326eeec9502e02c71cdfa12e65e143f8f75406bf1daa058702ef354caae2d47d1c07858ba544575c29e07ca4f4957b08346c79225f
DIST YAML-1.15.tar.gz 80702 SHA256 80f495322fa7bde590940f198c203be5e71c420fef844b5bdc6769c1fe0d9d1b SHA512 c1b715c46186009e27e25857c99cbd729fc49a1854dd987dcab53e4279528f19a1b9822dd1ca95162aa2a0b6627cf15ef6a692ad22c659dbd5c251fc3f898b7b WHIRLPOOL 245911e22ceeb88c263a61809c7ce4f3a0817e893fb25204933d3b2ea39a73d1a64a717c2465d2db2a921c0a144895e0321d7b14b709645fd8ebd05ac3a7087f
DIST YAML-1.18.tar.gz 80678 SHA256 c8c4ebf538b5c9b4f53bf3c80a436229b2f28ecd4dbde54e22b470791d04fd39 SHA512 6656ed5a9906e3b7888c3a014e8ab459adb8eee471a31b6c1209ff79c72f7ffda7fadb729ac334bf338ba264068f060a83ca31664f3c1d720fc8195231e459f4 WHIRLPOOL bd8318bff2f38b11d533043e48e915f20a320744ac20393233e5a66e8d70d2f592c7a48f6415d46a937d7c77084c95d5e4e254b1eab480a2f924da8fadb754be

@ -0,0 +1,24 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DIST_AUTHOR=TINITA
DIST_VERSION=1.18
inherit perl-module
DESCRIPTION="YAML Ain't Markup Language (tm)"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND=""
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? (
>=virtual/perl-Test-Simple-0.880.0
>=dev-perl/Test-YAML-1.50.0
)
"

@ -1,3 +1,2 @@
DIST ZMQ-Constants-1.02.tar.gz 23649 SHA256 c00fb49af22ecb903deb37130038b7ba283baaedd3fdc11bb10ef55bca4fb65a SHA512 db3d53bc248742ddea7d0bdf58972f26470e071169d1cdba8a05b62bd415705fd9c3f74c8e2defce5a34add5e999dbba677736c6032583a3d2dce15f9b5e8d2f WHIRLPOOL e8a79e9b6a4fb824372a9e3618d50a29093b8d62b07a8ece93b5a8c5acb6cd50603dbb01d497ba6fc119aed876bbf42bcfdaccf2e1a2f1aaa46ba3bdd7198261
DIST ZMQ-Constants-1.03.tar.gz 22739 SHA256 5ad4354b28b1a25e8bc9a7b28c8964962b54897c59f01f123934a5ba92618634 SHA512 123489bf7887cb47b581607763e544a683d577bd2ba54cdb87f4d7fc69090ee48ad9ffb1a8a729e5cb2bb413f752788c22158bf8da8bd053ddc3c818d0aa0092 WHIRLPOOL 01cbb9fac01ca326833df9c038dc6ea51c44e9c43abeb046df09b752b5f48dc479688b5c0cd52e22f5781cf105c1b90dc526442efec29631bf21345d45196b7d
DIST ZMQ-Constants-1.04.tar.gz 23382 SHA256 bec3d17d924b8a3fc90505d22ab8154006acc3bac7ad66372470e715165f4b93 SHA512 a6ada74282c82713b724c5592606cc836a46e0e480477355d6cd7b27fe9afcbe0ce46dda28bf8ea184cc12a4d6a2ec7d9ba6870db59a88c69f37ac1f8f7c726f WHIRLPOOL 394637e60c7ca56d7f987cbcb8228deedb1f4a36fd526ff9c08ba4375f30a941ebf7ee6906f0d4c929692f02706ce99dbf7fd6962d3518f1bf322544b69839dd

@ -1,22 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=DMAKI
MODULE_VERSION=1.02
inherit perl-module
DESCRIPTION="Constants for libzmq"
SLOT="0"
KEYWORDS="amd64 hppa ppc ppc64 x86"
IUSE=""
RDEPEND="
net-libs/zeromq
"
DEPEND="${RDEPEND}"
SRC_TEST=do

@ -1,2 +1,3 @@
DIST bandit-0.13.2.tar.gz 68888 SHA256 ef78c4dda20f758f95aca467fbb6609a696b6df13104d324b329b1bca963e30d SHA512 0809b7bca2f88e579760c7dcd3fedd1bdd394930eb0cd203ec24d75a18cc8007fa0db304a378f2d99d9cfd5e8b1f34a4ebe427a4bcb5daadf3d29acf0a26da42 WHIRLPOOL c91c140a79816d55f46b4b81e8554e2e36ff47b217da0258cc8ca220b59fd1b0622bd938956280ee111ee994cee81a442da3148fc1be9f0ff8c7d1ea2cdc305d
DIST bandit-1.0.1.tar.gz 130662 SHA256 3d3a88bf82375cd18ab889c2bf86dcf840798c74a1a6b8d3015071d9ebf2dcd7 SHA512 47e82de934d1f7b28d4d9acbc33b7cd704bab9332b1ef5815e8f6f8b6c99763b758716782ae0a6b0a7db393e0ec6d619c9c3c70e2e645f23dff28b0de04250d2 WHIRLPOOL f0df1e05bce8c6ee0909ceae6bba0c5f7591a229f99c7c38a726460fb363720a28d87fc47aaa197d00b84c01b3b570a61da82c1902f4b4611b332e2b6d0fb9ad
DIST bandit-1.1.0.tar.gz 135333 SHA256 b5a011ab77bb9d9f7aca349732db7b9789ebe86a57a9cb49314abcb41161a15e SHA512 0344be4c98b4f1df056761f7735fa0b23dc234c64ca0090d3e665899905eaac9d49750a7ebe6f7f9e4c39d07f3c2cb0d653cc65c0e56dfadac0caeac5799af94 WHIRLPOOL 3df6eb26693d2d0b40ebbcb6774e2a0bba2cda8fad62952467a3b18b1cf538758fefeb2b2281c0c3c5d5de5674ab177ed38263c50451c250502b740df8f1545b

@ -0,0 +1,53 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="A security linter from OpenStack Security"
HOMEPAGE="https://openstack.org"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}
test? (
>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
<dev-python/hacking-0.10[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
)"
RDEPEND="
${CDEPEND}
>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]"
python_test() {
testr init
testr run || die
}

@ -1 +1,2 @@
DIST dogpile.cache-0.6.1.tar.gz 324046 SHA256 69b52dc56bb52d974e9e9fb2764e1311abcd1fd625de07b4e5c05550ac9b40c0 SHA512 c4743a88688d8f596469f2b3adf0cd862dd32891ae8c50d0c0421a984dfec872cbbecf936f704cf4351ae26b3ab4a26ae3b416f7c7f2ce3c41f8da2c9223178b WHIRLPOOL 3e9d4f8475efd34786f8722a9073cbb434bef8a8f5ada22e0309b143fda2a3909af91d69fb2092f6443a1e4ede9650529afbae2514c1374739582eecf05e1ffc
DIST dogpile.cache-0.6.2.tar.gz 329762 SHA256 73793471af07af6dc5b3ee015abfaca4220caaa34c615537f5ab007ed150726d SHA512 5882e0a355db0bec9c1a0836034481d39008051ff42f48c85679ac70a42c6366d1bcbd01ecd3ca868d7ad725197e626e52b004d62269827e2605a4ecd491ce99 WHIRLPOOL c88f0c503b157c65aae4881b7339c7af7f5b5b045d812220e59736fc78737ae7004bbc0595b5cfed590e5b7d76331b156fa0f28805981bee49ff666a3172ee78

@ -0,0 +1,36 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
HOMEPAGE="https://bitbucket.org/zzzeek/dogpile.cache"
SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
S="${WORKDIR}/dogpile.cache-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
RDEPEND=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/pytest[${PYTHON_USEDEP}]
dev-python/pytest-cov[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
dev-python/mako[${PYTHON_USEDEP}] )"
# This time half the doc files are missing; Do you want them? toss a coin
python_test() {
# crikey. testsuite written for py3, 5 tests fail under py2.7
if [[ "${EPYTHON}" != "python2.7" ]]; then
nosetests || die "test failed under ${EPYTHON}"
else
einfo "testsuite restricted for python2.7"
fi
}

@ -1,4 +1,2 @@
DIST elasticsearch-2.2.1.tar.gz 29424648 SHA256 7d43d18a8ee8d715d827ed26b4ff3d939628f5a5b654c6e8de9d99bf3a9b2e03 SHA512 9254175afff5c002625465fb5f398e4e53d121925a656af13e65d90eb3b3ef7507ef094cf44002f104a84e5147a8677a05f4071248140d6b48179b9057867cb5 WHIRLPOOL a470a663b8ec1b8cb7a8daf6bfc02ed7d5d0f23caab063ac2e6c7456bda449bad3e81237699fa434f077d4f86ee09dac7d007b554acc6428f2b436cf8448b210
DIST elasticsearch-2.3.5.tar.gz 27547995 SHA256 1119a8c18620b98c4b85261318663a1f26dea92a26f34dfeb7f813fb7cbb468a SHA512 9c0cc8a9ae0fa2b52db583a5c006b05a84c1f84e1b8dbbafa88bec111190d056a23bd384d4241ce00dc8b56a6840857b296e4c0d2bf911f352ef67f128a87ca7 WHIRLPOOL de2aee3773d14c9b4abc0f20c3c8df1fe374a91ea54493f2c1df59fb8c02c97d684fd94b6bfaf140eebcfea4913197b10469b5aef34f62db89d825ae508a5095
DIST elasticsearch-curator-3.5.1.tar.gz 93121 SHA256 3b578c1d8a88da22501a79346792288478f3191d75058e4c43d05fc261c9b874 SHA512 59ddc5feb575f626afcbce9c80b113827d9752bb4ba1bc8f7e7f110f8be661314dbf0421310cb07ce1b15c9d6dba2f181718befb5cfa93803ad5e63226ac9556 WHIRLPOOL 8b0529116cf735cb45872073a7668bdb94e0e61306bcbd6d3609a73616f75f74747847cbf8a860d5727fe3f475ab59c66f1382a04d543cdb3c22de4edfd068e2
DIST elasticsearch-curator-4.0.5.tar.gz 110573 SHA256 84f9df5fb19e59e734b224cba35d7c48c6dbdbe6317d8274276f5ad81cfbfd12 SHA512 08270cd53510e4356e1f01bb27c9202dcf2ac7d66c9852c2bc5d93de7c701802f67bf0b0117d4a155b9a930a4842d021a08f85436007654a812e47a0de8d870d WHIRLPOOL a80fdbdd30d82d1b189eba97e07779a6c632f58a5d242aef8fc3a450be0c93c64ec02651793fea8475936934f6ea8ed227d18c22f32e9a9d7d5e8506e9c2679e
DIST elasticsearch-2.4.0.tar.gz 27364449 SHA256 3ae01140ae7bcbb91436feef381fbed774e36ef6d1e8e6a3153640db82acf4c9 SHA512 931f4d42cba43131718ec7480439b5fda0b9222a51cf9639d99ab4c00bdbedbe7e8da7a6016d88b848772cd416bc49fe7af09202160cecf839e39d803b45e869 WHIRLPOOL e03a2f7a6ea5913ce112b82e8578183c401f2d5901070a77c509ddbe7333fe62622fb2bb3e0f786a914bb15c56793e8b13220ae4588271baa3bbbcdf86223f47
DIST elasticsearch-curator-4.0.6.tar.gz 110804 SHA256 e60f671dfa003f45f68320599cb15cee38cc61cb25899d903c2b29f2e3892e09 SHA512 b52af17d7d58bb9599095a00d03e5fda6bc7d9b401d100379f2a6969e5f995367192f33c045251518345abd86f2b143b1b086aab2c165d7e66efccb02dab8698 WHIRLPOOL 7621d883d59202882f455393ca7a87b39292667890dd2c5e3841ffb8a62e823d775794173a0205b02da24b7016509759c302bfabee5fc77a8000c961f853466f

@ -1,105 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
MY_PN="curator"
ES_VERSION="2.2.1"
inherit distutils-r1
DESCRIPTION="Tending time-series indices in Elasticsearch"
HOMEPAGE="https://github.com/elasticsearch/curator"
SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
test? ( https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-${ES_VERSION}.tar.gz )"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc test"
RDEPEND="
>=dev-python/elasticsearch-py-2.3.0[${PYTHON_USEDEP}]
<dev-python/elasticsearch-py-3.0.0[${PYTHON_USEDEP}]
>=dev-python/click-3.3[${PYTHON_USEDEP}]
dev-python/certifi[${PYTHON_USEDEP}]
>=dev-python/urllib3-1.8.3[${PYTHON_USEDEP}]"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/sphinx[${PYTHON_USEDEP}]
test? ( ${RDEPEND}
|| ( virtual/jre:1.8 virtual/jre:1.7 )
~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
dev-python/coverage[${PYTHON_USEDEP}]
dev-python/nosexcover[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}] )"
S="${WORKDIR}/${MY_PN}-${PV}"
python_test() {
ES="${WORKDIR}/elasticsearch-${ES_VERSION}"
ES_PORT="25123"
ES_LOG="${ES}/logs/elasticsearch.log"
PID="${ES}/elasticsearch.pid"
# run Elasticsearch instance on custom port
sed -i "s/# http.port: 9200/http.port: ${ES_PORT}/g; \
s/# cluster.name: my-application/cluster.name: gentoo-es-curator-test/g" \
${ES}/config/elasticsearch.yml
# Elasticsearch 1.6+ needs to set path.repo
grep -q "^path.repo" "${ES}/config/elasticsearch.yml"
if [ $? -ne 0 ]; then
echo "path.repo: /" >> "${ES}/config/elasticsearch.yml"
fi
# start local instance of elasticsearch
${ES}/bin/elasticsearch -d -p ${PID}
for i in {1..10}; do
grep -q "started" ${ES_LOG} 2> /dev/null
if [ $? -eq 0 ]; then
einfo "Elasticsearch started"
eend 0
break
elif grep -q 'BindException\[Address already in use\]' "${ES_LOG}" 2>/dev/null; then
eend 1
eerror "Elasticsearch already running"
die "Cannot start Elasticsearch for tests"
else
einfo "Waiting for Elasticsearch"
eend 1
sleep 2
continue
fi
done
export TEST_ES_SERVER="localhost:${ES_PORT}"
esetup.py test
pkill -F ${PID}
}
python_compile_all() {
cd docs || die
emake man $(usex doc html "")
}
python_install_all() {
use doc && local HTML_DOCS=( docs/_build/html/. )
doman docs/_build/man/*
distutils-r1_python_install_all
}
pkg_postinst() {
ewarn ""
ewarn "For Python 3 support information please read: http://click.pocoo.org/3/python3/"
ewarn ""
ewarn "Example usage on Python 3:"
ewarn "export LC_ALL=en_US.UTF-8"
ewarn "export LANG=en_US.UTF-8"
ewarn "curator ..."
}

@ -7,7 +7,7 @@ EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
MY_PN="curator"
ES_VERSION="2.3.5"
ES_VERSION="2.4.0"
inherit distutils-r1

@ -1 +1,2 @@
DIST fixtures-1.4.0.tar.gz 50411 SHA256 3e1c61753d0fafc1429591d33ad6b828a0673a200eae63dd6ac0685479db5d36 SHA512 62e314821ea507ab5c1465fb626c29c91430b36ae4670fd05a3aa7180452989c393d35ab623da3646b25cf671a84861ab68d9529d04ae759c0d38efca7c7d8cf WHIRLPOOL ad2b0ebf50a01aad4ec6924511eb3d174ebf4ac11306ed2873896380456a20e3fc5b7d84791035cffdc77561664f09f04935ef73246554110df756d8213d469a
DIST fixtures-3.0.0.tar.gz 56629 SHA256 fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef SHA512 e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695 WHIRLPOOL 93f92dc2da126cfd175ec44a783d94b57d0ecfb168887d5117fc723129ecf6dca04ce3aa7186ff9f1c6053b3b7615b1cd961c9d365fca44557fe43f29e87b19e

@ -0,0 +1,32 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 BSD )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
# nose not listed but provides coverage output of tests
# run of test files by python lacks any output except on fail
RDEPEND="
>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? ( dev-python/mock[${PYTHON_USEDEP}] )"
#DISTUTILS_IN_SOURCE_BUILD=1
python_test() {
emake check
}

@ -1,3 +1,3 @@
DIST irc-11.0.1.zip 120409 SHA256 25d818003780fd6d62e93d3ff32580e74c0e527c6290ae14b47af50b58339233 SHA512 fca2fe653d921c9ec65dfb2b072c16658d88d4a22ae91568b1eaf722a90179920808db157f587afe6de0055af3a04a528eb9022122e539150e5635f05b58f466 WHIRLPOOL dd9b9e8624e6bd86d27fead1f3006a2b80832d236ad21f50c147c07a27b2cc4933d68efd951dece44398dbc0299b73ba7a98e4eff2061d0e3a8a01833518113b
DIST irc-14.2.2.tar.gz 86511 SHA256 4844413b09c8bba226bb86c7269b07ea6c925ecfc5a98758e72849e90895d828 SHA512 daa5f6ed2a5b3f0bdbd58f638d1f90a8b06769c9b7874c577cdb0753aea4a7947c82857aa1ebe6b396ea605756fa176bcca4a9d8e4bf28ef53609f96fccd0e7b WHIRLPOOL 85609370a800b82d59c46595eb5f18dcd33936469cd10692f13a6e2a519406e3725239fbddb5dc0f8d20ad7ab0c6bdb7c8770a9b5f44a86e67c430b3e5287710
DIST irc-15.0.1.tar.gz 81773 SHA256 ea2ee4b27f821f10423790f1e87d0d3b81e1b81a23cc1f6c2f005a4236583a88 SHA512 249071491c96001344081d3b7b93dcc9d8360a0b03d73d2e1bee1f046c9a82762fd4d51c00fc358843629d17e16b9533228bea09787ea41e3ffc7fc03164fe8f WHIRLPOOL f5aff2f506778c45b826380581e367e1a026f3faee5329756feb9d612c19821f3eeab222ab28c1559f0044644e92bf23e89d15de45c91f34eee4da2e7219fab6
DIST irc-15.0.2.tar.gz 81790 SHA256 23893c1fb21826fd9b3edf6ef49b0e1080c846761900ab06b4f1980f5cb8e2e3 SHA512 5f6daa539a9ae665b0153d97ab11f246040963d9109d84efde0a92cbe200c2a6e8126120eee11b4bc92d65d415946627116b62cde07bebeb68a7105af40f98ab WHIRLPOOL 1f28b3e343328a2c78af406944fcfac4be25a61834e1807d7a1636834a2ea9fa9775856380e8ea75df7917913756a4b971e76ab47a06e0379304dfd2e5d81e61

@ -1 +1,2 @@
DIST keystoneauth1-2.12.1.tar.gz 174620 SHA256 939d89d2998368670f3aad736b7489b6186cceacc5e36623daebab2c07baacf0 SHA512 ce8ecbbc246bf68d1c256754c6637f5477ebac0648065e54e3a63f921349c61c18bbe5f81c817b1fbb7eaed01948ef3b73f0f1e214f1af75f0203be4a8011508 WHIRLPOOL 2f75d5b52499129621268011c22572496704c6796c973d7f627fff6fc4ab2a05b3cf8f67edd8299b1cbc8529352a86cf7e6f71a0b89bdc1da24b4fa7cd5465df
DIST keystoneauth1-2.4.1.tar.gz 150586 SHA256 61a2f4cf374b55f10a0d8250a532ccb93dff2ea81994ced15b2a34af055d4e78 SHA512 f9e8fcea7b23001b907d643d5bf67fc4779c8729cca213b3240ef988eda9de1212b15c2031f6fd8b431aafac85e773346eda71e0b414fe967728611b6817fb05 WHIRLPOOL 42644ede5c0db10ffe77ef106d78764dcb49d455dbc09e3660160b9d7a9eb3453118f6777469f9779e2fca34eb9e09cf3ef759f2f27cc38b8dca8520b9febd43

@ -0,0 +1,28 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
HOMEPAGE="https://github.com/openstack/keystoneauth"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
S="${WORKDIR}/${PN}1-${PV}"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}"
RDEPEND="${CDEPEND}
>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]"

@ -1 +1,2 @@
DIST keystonemiddleware-4.4.1.tar.gz 194711 SHA256 dff35f0e4acb77f34c9c880bd4f456bbe26a1c4701815d82e8c27ff74a5dfb52 SHA512 c04383836740222d49324cb5f25f8b156424abaa74ac9482a2deb2e1d54cc6d990a864451a075bc12c3d7d38da7235f236e8a8cfb4c3748953c14a4505eeb99f WHIRLPOOL 76a96e6140752cd8eb1d060591c5dec1181abf873c82595be89d9597e3c3e5d3344739fab6b8d0058ae2ab47863e5169d4bbcb4a83f46a24dea042c0ccfac8d0
DIST keystonemiddleware-4.9.0.tar.gz 198244 SHA256 5d92ef9321a49f06c59d53a92fecc572c559d054abd7f5b7ce5945916770b993 SHA512 0b8870e93bfba3c385cac4515f86a15cc72371f1274db284560d4ecb0e6f4f50064b093a91060728051a2d0732ae7c40a9d2d2dd8b0cfa29ca527b6dceba9e80 WHIRLPOOL 6fd48a653bbe6d5d7d2c40a97dd46310489a153a55e5096d007a54dfd944e22c0f758715e100138f46fbbada241cce5da94338c89be3b293c2142f6cc328ac54

@ -1,596 +0,0 @@
From 9167afaafc216c63fdc875e737bc379400e94059 Mon Sep 17 00:00:00 2001
From: Brant Knudson <bknudson@us.ibm.com>
Date: Tue, 1 Dec 2015 16:08:00 -0600
Subject: [PATCH] auth_token verify revocation by audit_id
If the revocation list includes audit_ids, then when doing offline
validation also validate the token isn't revoked by audit_id.
Backport notes:
- test_auth_token_middleware was refactored with commit 9cbd47b to
check responses differently, so the test changed to use the old
method.
- reno was not supported so the release note is removed.
Closes-Bug: 1490804
Change-Id: I483bc57bd38eb81a0905bcaf94e4ea82604919d6
(cherry picked from commit 96ab58e6863c92575ada57615b19652e502adfd8)
---
examples/pki/cms/auth_token_scoped.json | 5 +-
examples/pki/cms/auth_token_scoped.pem | 148 ++++++++--------
examples/pki/cms/auth_token_scoped.pkiz | 2 +-
examples/pki/cms/auth_v3_token_scoped.json | 3 +
examples/pki/cms/auth_v3_token_scoped.pem | 190 +++++++++++----------
examples/pki/cms/auth_v3_token_scoped.pkiz | 2 +-
keystonemiddleware/auth_token/__init__.py | 12 ++
keystonemiddleware/auth_token/_revocations.py | 22 +++
.../unit/auth_token/test_auth_token_middleware.py | 24 +++
.../tests/unit/auth_token/test_revocations.py | 47 ++++-
10 files changed, 281 insertions(+), 174 deletions(-)
diff --git a/examples/pki/cms/auth_token_scoped.json b/examples/pki/cms/auth_token_scoped.json
index 698e01d..cf18fa1 100644
--- a/examples/pki/cms/auth_token_scoped.json
+++ b/examples/pki/cms/auth_token_scoped.json
@@ -8,7 +8,10 @@
"enabled": true,
"description": null,
"name": "tenant_name1"
- }
+ },
+ "audit_ids": [
+ "SLIXlXQUQZWUi9VJrqdXqA"
+ ]
},
"serviceCatalog": [
{
diff --git a/examples/pki/cms/auth_token_scoped.pem b/examples/pki/cms/auth_token_scoped.pem
index 4a5b3a2..68f5049 100644
--- a/examples/pki/cms/auth_token_scoped.pem
+++ b/examples/pki/cms/auth_token_scoped.pem
@@ -1,75 +1,77 @@
-----BEGIN CMS-----
-MIINhwYJKoZIhvcNAQcCoIINeDCCDXQCAQExCTAHBgUrDgMCGjCCC5QGCSqGSIb3
-DQEHAaCCC4UEgguBew0KICAgICJhY2Nlc3MiOiB7DQogICAgICAgICJ0b2tlbiI6
-IHsNCiAgICAgICAgICAgICJleHBpcmVzIjogIjIwMzgtMDEtMThUMjE6MTQ6MDda
-IiwNCiAgICAgICAgICAgICJpZCI6ICJwbGFjZWhvbGRlciIsDQogICAgICAgICAg
-ICAidGVuYW50Ijogew0KICAgICAgICAgICAgICAgICJpZCI6ICJ0ZW5hbnRfaWQx
-IiwNCiAgICAgICAgICAgICAgICAiZW5hYmxlZCI6IHRydWUsDQogICAgICAgICAg
-ICAgICAgImRlc2NyaXB0aW9uIjogbnVsbCwNCiAgICAgICAgICAgICAgICAibmFt
-ZSI6ICJ0ZW5hbnRfbmFtZTEiDQogICAgICAgICAgICB9DQogICAgICAgIH0sDQog
-ICAgICAgICJzZXJ2aWNlQ2F0YWxvZyI6IFsNCiAgICAgICAgICAgIHsNCiAgICAg
-ICAgICAgICAgICAiZW5kcG9pbnRzX2xpbmtzIjogW10sDQogICAgICAgICAgICAg
-ICAgImVuZHBvaW50cyI6IFsNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAg
-ICAgICAgICAgICAgICAgICAgImFkbWluVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6
-ODc3Ni92MS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsDQogICAg
-ICAgICAgICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lvbk9uZSIsDQogICAg
-ICAgICAgICAgICAgICAgICAgICAiaW50ZXJuYWxVUkwiOiAiaHR0cDovLzEyNy4w
-LjAuMTo4Nzc2L3YxLzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwN
-CiAgICAgICAgICAgICAgICAgICAgICAgICJwdWJsaWNVUkwiOiAiaHR0cDovLzEy
-Ny4wLjAuMTo4Nzc2L3YxLzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdh
-Ig0KICAgICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgXSwNCiAg
-ICAgICAgICAgICAgICAidHlwZSI6ICJ2b2x1bWUiLA0KICAgICAgICAgICAgICAg
-ICJuYW1lIjogInZvbHVtZSINCiAgICAgICAgICAgIH0sDQogICAgICAgICAgICB7
-DQogICAgICAgICAgICAgICAgImVuZHBvaW50c19saW5rcyI6IFtdLA0KICAgICAg
-ICAgICAgICAgICJlbmRwb2ludHMiOiBbDQogICAgICAgICAgICAgICAgICAgIHsN
-CiAgICAgICAgICAgICAgICAgICAgICAgICJhZG1pblVSTCI6ICJodHRwOi8vMTI3
-LjAuMC4xOjkyOTIvdjEiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInJlZ2lv
-biI6ICJyZWdpb25PbmUiLA0KICAgICAgICAgICAgICAgICAgICAgICAgImludGVy
-bmFsVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6OTI5Mi92MSIsDQogICAgICAgICAg
-ICAgICAgICAgICAgICAicHVibGljVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6OTI5
-Mi92MSINCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIF0s
-DQogICAgICAgICAgICAgICAgInR5cGUiOiAiaW1hZ2UiLA0KICAgICAgICAgICAg
-ICAgICJuYW1lIjogImdsYW5jZSINCiAgICAgICAgICAgIH0sDQogICAgICAgICAg
-ICB7DQogICAgICAgICAgICAgICAgImVuZHBvaW50c19saW5rcyI6IFtdLA0KICAg
-ICAgICAgICAgICAgICJlbmRwb2ludHMiOiBbDQogICAgICAgICAgICAgICAgICAg
-IHsNCiAgICAgICAgICAgICAgICAgICAgICAgICJhZG1pblVSTCI6ICJodHRwOi8v
-MTI3LjAuMC4xOjg3NzQvdjEuMS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2
-NjE3YSIsDQogICAgICAgICAgICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lv
-bk9uZSIsDQogICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJuYWxVUkwiOiAi
-aHR0cDovLzEyNy4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJjYzUzNDM1ZThhNjBm
-Y2Y4OWJiNjYxN2EiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInB1YmxpY1VS
-TCI6ICJodHRwOi8vMTI3LjAuMC4xOjg3NzQvdjEuMS82NGI2ZjNmYmNjNTM0MzVl
-OGE2MGZjZjg5YmI2NjE3YSINCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAg
-ICAgICAgICAgIF0sDQogICAgICAgICAgICAgICAgInR5cGUiOiAiY29tcHV0ZSIs
-DQogICAgICAgICAgICAgICAgIm5hbWUiOiAibm92YSINCiAgICAgICAgICAgIH0s
-DQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgImVuZHBvaW50c19saW5r
-cyI6IFtdLA0KICAgICAgICAgICAgICAgICJlbmRwb2ludHMiOiBbDQogICAgICAg
-ICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAgICJhZG1pblVS
-TCI6ICJodHRwOi8vMTI3LjAuMC4xOjM1MzU3L3YyLjAiLA0KICAgICAgICAgICAg
-ICAgICAgICAgICAgInJlZ2lvbiI6ICJSZWdpb25PbmUiLA0KICAgICAgICAgICAg
-ICAgICAgICAgICAgImludGVybmFsVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6MzUz
-NTcvdjIuMCIsDQogICAgICAgICAgICAgICAgICAgICAgICAicHVibGljVVJMIjog
-Imh0dHA6Ly8xMjcuMC4wLjE6NTAwMC92Mi4wIg0KICAgICAgICAgICAgICAgICAg
-ICB9DQogICAgICAgICAgICAgICAgXSwNCiAgICAgICAgICAgICAgICAidHlwZSI6
-ICJpZGVudGl0eSIsDQogICAgICAgICAgICAgICAgIm5hbWUiOiAia2V5c3RvbmUi
-DQogICAgICAgICAgICB9DQogICAgICAgIF0sDQogICAgICAgICJ1c2VyIjogew0K
-ICAgICAgICAgICAgInVzZXJuYW1lIjogInVzZXJfbmFtZTEiLA0KICAgICAgICAg
-ICAgInJvbGVzX2xpbmtzIjogWw0KICAgICAgICAgICAgICAgICJyb2xlMSIsDQog
-ICAgICAgICAgICAgICAgInJvbGUyIg0KICAgICAgICAgICAgXSwNCiAgICAgICAg
-ICAgICJpZCI6ICJ1c2VyX2lkMSIsDQogICAgICAgICAgICAicm9sZXMiOiBbDQog
-ICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJy
-b2xlMSINCiAgICAgICAgICAgICAgICB9LA0KICAgICAgICAgICAgICAgIHsNCiAg
-ICAgICAgICAgICAgICAgICAgIm5hbWUiOiAicm9sZTIiDQogICAgICAgICAgICAg
-ICAgfQ0KICAgICAgICAgICAgXSwNCiAgICAgICAgICAgICJuYW1lIjogInVzZXJf
-bmFtZTEiDQogICAgICAgIH0NCiAgICB9DQp9DQoxggHKMIIBxgIBATCBpDCBnjEK
-MAgGA1UEBRMBNTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlT
-dW5ueXZhbGUxEjAQBgNVBAoTCU9wZW5TdGFjazERMA8GA1UECxMIS2V5c3RvbmUx
-JTAjBgkqhkiG9w0BCQEWFmtleXN0b25lQG9wZW5zdGFjay5vcmcxFDASBgNVBAMT
-C1NlbGYgU2lnbmVkAgERMAcGBSsOAwIaMA0GCSqGSIb3DQEBAQUABIIBAGFaC8Po
-svBez6wHfGxgqtX+Zk7kFH0xu/JA7fWp8L5e1k1q+wsSII/P6rATOXR8BSPwifat
-mKRan9kzerLeb3A5g07VphvHfVkDEVaeihi33bpt7140ELSKu/ogWQPtasjBM9Eb
-M9pS4N5NCtZ0erE5DgX//IRfrHFdZuhIbwlmei72692PV7Q70t/rbaH8ofIrH7Rz
-Z1Kuvj0+7tELgd52wy5YnU0e879OEj+2qUk30TvqRG9jdKxLSanmR/8dSA2eNNgO
-oHrtXc4EmpWFbP6yVxNwK3dQ6OvU4virV1YW5+De2ApLt+IeojaVPGnDPfsRvY5x
-t0eIwpDqkgvkRP8=
+MIIN5QYJKoZIhvcNAQcCoIIN1jCCDdICAQExDTALBglghkgBZQMEAgEwggvqBgkq
+hkiG9w0BBwGgggvbBIIL13sNCiAgICAiYWNjZXNzIjogew0KICAgICAgICAidG9r
+ZW4iOiB7DQogICAgICAgICAgICAiZXhwaXJlcyI6ICIyMDM4LTAxLTE4VDIxOjE0
+OjA3WiIsDQogICAgICAgICAgICAiaWQiOiAicGxhY2Vob2xkZXIiLA0KICAgICAg
+ICAgICAgInRlbmFudCI6IHsNCiAgICAgICAgICAgICAgICAiaWQiOiAidGVuYW50
+X2lkMSIsDQogICAgICAgICAgICAgICAgImVuYWJsZWQiOiB0cnVlLA0KICAgICAg
+ICAgICAgICAgICJkZXNjcmlwdGlvbiI6IG51bGwsDQogICAgICAgICAgICAgICAg
+Im5hbWUiOiAidGVuYW50X25hbWUxIg0KICAgICAgICAgICAgfSwNCiAgICAgICAg
+ICAgICJhdWRpdF9pZHMiOiBbDQogICAgICAgICAgICAgICAgIlNMSVhsWFFVUVpX
+VWk5VkpycWRYcUEiDQogICAgICAgICAgICBdDQogICAgICAgIH0sDQogICAgICAg
+ICJzZXJ2aWNlQ2F0YWxvZyI6IFsNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAg
+ICAgICAiZW5kcG9pbnRzX2xpbmtzIjogW10sDQogICAgICAgICAgICAgICAgImVu
+ZHBvaW50cyI6IFsNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAg
+ICAgICAgICAgICAgImFkbWluVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3Ni92
+MS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsDQogICAgICAgICAg
+ICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lvbk9uZSIsDQogICAgICAgICAg
+ICAgICAgICAgICAgICAiaW50ZXJuYWxVUkwiOiAiaHR0cDovLzEyNy4wLjAuMTo4
+Nzc2L3YxLzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwNCiAgICAg
+ICAgICAgICAgICAgICAgICAgICJwdWJsaWNVUkwiOiAiaHR0cDovLzEyNy4wLjAu
+MTo4Nzc2L3YxLzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIg0KICAg
+ICAgICAgICAgICAgICAgICB9DQogICAgICAgICAgICAgICAgXSwNCiAgICAgICAg
+ICAgICAgICAidHlwZSI6ICJ2b2x1bWUiLA0KICAgICAgICAgICAgICAgICJuYW1l
+IjogInZvbHVtZSINCiAgICAgICAgICAgIH0sDQogICAgICAgICAgICB7DQogICAg
+ICAgICAgICAgICAgImVuZHBvaW50c19saW5rcyI6IFtdLA0KICAgICAgICAgICAg
+ICAgICJlbmRwb2ludHMiOiBbDQogICAgICAgICAgICAgICAgICAgIHsNCiAgICAg
+ICAgICAgICAgICAgICAgICAgICJhZG1pblVSTCI6ICJodHRwOi8vMTI3LjAuMC4x
+OjkyOTIvdjEiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInJlZ2lvbiI6ICJy
+ZWdpb25PbmUiLA0KICAgICAgICAgICAgICAgICAgICAgICAgImludGVybmFsVVJM
+IjogImh0dHA6Ly8xMjcuMC4wLjE6OTI5Mi92MSIsDQogICAgICAgICAgICAgICAg
+ICAgICAgICAicHVibGljVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6OTI5Mi92MSIN
+CiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIF0sDQogICAg
+ICAgICAgICAgICAgInR5cGUiOiAiaW1hZ2UiLA0KICAgICAgICAgICAgICAgICJu
+YW1lIjogImdsYW5jZSINCiAgICAgICAgICAgIH0sDQogICAgICAgICAgICB7DQog
+ICAgICAgICAgICAgICAgImVuZHBvaW50c19saW5rcyI6IFtdLA0KICAgICAgICAg
+ICAgICAgICJlbmRwb2ludHMiOiBbDQogICAgICAgICAgICAgICAgICAgIHsNCiAg
+ICAgICAgICAgICAgICAgICAgICAgICJhZG1pblVSTCI6ICJodHRwOi8vMTI3LjAu
+MC4xOjg3NzQvdjEuMS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIs
+DQogICAgICAgICAgICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lvbk9uZSIs
+DQogICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJuYWxVUkwiOiAiaHR0cDov
+LzEyNy4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJjYzUzNDM1ZThhNjBmY2Y4OWJi
+NjYxN2EiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInB1YmxpY1VSTCI6ICJo
+dHRwOi8vMTI3LjAuMC4xOjg3NzQvdjEuMS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZj
+Zjg5YmI2NjE3YSINCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAg
+ICAgIF0sDQogICAgICAgICAgICAgICAgInR5cGUiOiAiY29tcHV0ZSIsDQogICAg
+ICAgICAgICAgICAgIm5hbWUiOiAibm92YSINCiAgICAgICAgICAgIH0sDQogICAg
+ICAgICAgICB7DQogICAgICAgICAgICAgICAgImVuZHBvaW50c19saW5rcyI6IFtd
+LA0KICAgICAgICAgICAgICAgICJlbmRwb2ludHMiOiBbDQogICAgICAgICAgICAg
+ICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAgICJhZG1pblVSTCI6ICJo
+dHRwOi8vMTI3LjAuMC4xOjM1MzU3L3YyLjAiLA0KICAgICAgICAgICAgICAgICAg
+ICAgICAgInJlZ2lvbiI6ICJSZWdpb25PbmUiLA0KICAgICAgICAgICAgICAgICAg
+ICAgICAgImludGVybmFsVVJMIjogImh0dHA6Ly8xMjcuMC4wLjE6MzUzNTcvdjIu
+MCIsDQogICAgICAgICAgICAgICAgICAgICAgICAicHVibGljVVJMIjogImh0dHA6
+Ly8xMjcuMC4wLjE6NTAwMC92Mi4wIg0KICAgICAgICAgICAgICAgICAgICB9DQog
+ICAgICAgICAgICAgICAgXSwNCiAgICAgICAgICAgICAgICAidHlwZSI6ICJpZGVu
+dGl0eSIsDQogICAgICAgICAgICAgICAgIm5hbWUiOiAia2V5c3RvbmUiDQogICAg
+ICAgICAgICB9DQogICAgICAgIF0sDQogICAgICAgICJ1c2VyIjogew0KICAgICAg
+ICAgICAgInVzZXJuYW1lIjogInVzZXJfbmFtZTEiLA0KICAgICAgICAgICAgInJv
+bGVzX2xpbmtzIjogWw0KICAgICAgICAgICAgICAgICJyb2xlMSIsDQogICAgICAg
+ICAgICAgICAgInJvbGUyIg0KICAgICAgICAgICAgXSwNCiAgICAgICAgICAgICJp
+ZCI6ICJ1c2VyX2lkMSIsDQogICAgICAgICAgICAicm9sZXMiOiBbDQogICAgICAg
+ICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAibmFtZSI6ICJyb2xlMSIN
+CiAgICAgICAgICAgICAgICB9LA0KICAgICAgICAgICAgICAgIHsNCiAgICAgICAg
+ICAgICAgICAgICAgIm5hbWUiOiAicm9sZTIiDQogICAgICAgICAgICAgICAgfQ0K
+ICAgICAgICAgICAgXSwNCiAgICAgICAgICAgICJuYW1lIjogInVzZXJfbmFtZTEi
+DQogICAgICAgIH0NCiAgICB9DQp9DQoxggHOMIIBygIBATCBpDCBnjEKMAgGA1UE
+BRMBNTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlTdW5ueXZh
+bGUxEjAQBgNVBAoTCU9wZW5TdGFjazERMA8GA1UECxMIS2V5c3RvbmUxJTAjBgkq
+hkiG9w0BCQEWFmtleXN0b25lQG9wZW5zdGFjay5vcmcxFDASBgNVBAMTC1NlbGYg
+U2lnbmVkAgERMAsGCWCGSAFlAwQCATANBgkqhkiG9w0BAQEFAASCAQCgtkCXRzS8
+s7WjZCsKDhMt6q5JQIm7x6EMKCBaOABQG9EOVIAyqfoJDdjDtz9rZEPO3UVTpPkg
+VjtA0QV97qT8bX55AcCkk7kBRDOKTtco5GOGwjMxL+GWbIwWiB7DKIP4RA6NLZtF
+WxUbLBY+OgBSiayuHqSx+Rd08QC9oHf25wRkTNp3VFPxtAleDmASzdAoIafoS+FB
+Po+9WuTaGdeya7S+ms4SSyXf9cdMKGv010R/aMINWUWaBrkB4wlespYLmKH/XzwS
+pENRIdbI9XHEOYTWKqul5tucA3p21IA24ND6acl9CXHr3KeqXpRwclSZ38Kg/23T
+92D+SowEjlGf
-----END CMS-----
diff --git a/examples/pki/cms/auth_token_scoped.pkiz b/examples/pki/cms/auth_token_scoped.pkiz
index 34d7706..cbfc082 100644
--- a/examples/pki/cms/auth_token_scoped.pkiz
+++ b/examples/pki/cms/auth_token_scoped.pkiz
@@ -1 +1 @@
-PKIZ_eJylVst2ozgU3OsrZp_Tx4CNY5biaRFLGMx7ZyDGYMBObJ5fPwInpyedzkxmhhUIqVS36t4r_fhBH1HREPlDwrvx4wfACK1bM9CfziE6NjGBZiyd6dg1lyRxuZCgqXSSDddi6rzKKZa0cTxeaNLuRduhaA5kU1nDPR2MVkqaeo_PvX4MOFLEc5wZmfiIKvpehZeAc-XAt46RJlQoP6fe_JpFpXoD4Q4tkaRzEdexkedkGwlmocefYk24RJU1vE8OPOu293jXObUUGGb7tcXE8rkBm0HpSb9oNzmssX1ekCHmNvOg2wwBE-RhibkwCzjM4sEciOcsAjtow5KUhlxkQR5wANvJEWVtiiq9CLmiibKJUR96ySXi-G1U3lnR3ZnQ1-vA6z6wACON_8MCjDR-shDZoOwuAevubGlick7WVmtkqwbbaD5tIC06I0_nZAiaJFcaQHIrI2UwhKWeB4MzEBmzoX08klwsAy5YGJ6ekTzoCKdkB5e5UlDm2ReLUVxUhQ2I1u6NOjH-KKLSaiOuqJM1OURaUe_vVka-Txeu77a9uVZFmloHnJOBf2vbL3rxAOenfhTsvzoBvkL-CPy1uOCjuqfesNGo7mfByuIWeEkxAZZuHa7FZmQEYla40pfXuKfI6i057NqU1gOlyb4t5JukVL5McfBNscbkYqbkot7_1XrwT96PO8elW-09ob57_yb0SahH-wGNc6RUxCV_jNTvZKA5alTj3YojGuJAmFMyJcmJjRk8uIWhKRzWwjzMUz4oEUdyZR7cE61NPJ3qRb5VTL-N93fhgr_N9ZI0kS-yifa50fhcd4nK2wAmO1hW2Ei0fY060K400eNcPp5bzXsWfpXu4BsWDlQflvQCh7NF-2vKjy7svtt9fgcOPqN_t6k4LZZhA5Ic0QFd8HfjYouPtTcNPKug8V6S9elLAUctwCjg2-KGCjdlG62F4nktXmgGTpNQjlo8pDcsKzdsHx2cK0tsm0ssJ3twp013K9U6GSnTzkN3O9IwinD6tvrEc0Z7fxbY-3xVqME4iO-Zdgp9ksdl0SbaW1PReDbS2vHfJbzrwYzgNIzD3jM7VDH3Wnj72dI-l4fesYk0WhuZLoyxJz492rI7s7gUrnSTD_0SUE_pAue9pY3vPSqYXyi7A7X1MDVV-71CRzCcgRHlQwN5B6w-deKenp8Fzt4dm0DvGny1C41zsnQKoxAuoUzrxWcFHCCxp8c8jAMJ0PO_Tfdmm4aLTsohElPiitCxoe100gD1-3dgw8K1sXltJTOQXdNESqvLpq3sABahBllHETusO3O3jqqCoylcYAu1CpwmPyltsY01t3bmFr07XDvFhts78NUGknIrnn3C0Fqgdjotav96WzmJ6jF8Df1iSDTawhyxGYHiO1AdzfUKYMtslXTaSVbamx16XYlUcgkpYEgjUj5cbyAR09PL8ZRpQsuINHwVQLij9yBp74o5-3C9beMjRm4RGubu5K2F9HGJocPh_HJ7OM-zk36Nb-eHw2sxnGZ74rvrAqi2wSpx1jJyNWd7CHM1LftoqJiSh-nGUy32Js_OzhI1jmuXPJJmF9hh5aytDpquHbdgGGbIvIVPr71BcFdDy7fk2ZFJ92m33szIIMlu-IIEf-UzJFJOwolZRZ1hz-ONETD7_AwstzFmO7fpltxy63KH5wd0qXbBIt7HrOs-YWgF-_PT7CF9KnouPykraZg9YN1WOdW_7O0ckPm5UMNs268OL8QpD24qFNvu8eHFEjtI2uct79Qmn3P8cWWacap2kXw1ZCHP4Gzj16QE2-r1YrVQqwweOk_ybmMdDF83-GVNIJjuogqRf95L_wRcTpJ3
\ No newline at end of file
+PKIZ_eJylVkuXojgY3edXzL5OnwLUKlnMgrdBwAJDgOx4KK-gVimC_PoJWFVdM93z6DNuNEFu7nfv98i3b-wjawZ0flPs7bj4BmwIV8s8MtdHAotr6khuqhzZ3nxQFFlcKpKr9SqSLDmneVHnMnFtTcq1Ls_DmZzXr6CoS0PsOFnujJxtHmUI9cXqXEaBU5HQGWB1zHc3k0uEC01K-ATZMxIWXRyaNL3BJwAVeLNVe24hqbeQNscq7DeVxm0qaRaU8AwV80QU9qJidomhVyQoronh0fT-jAMkWBTJwS03pfwMG9xGgXkmwbTm0gOmliKV8bSWyswYny-4UKC1vZ0AWhAFPB1pwoNHk0ZvM11sx733P9QsjCptaJcZ9DqFYCz4xOjFETgKcQ3i0NvHgTfFGtxMhDQaJXrhYazHmMenDSbr9KDXwUqXIeWnF1MB37KGVsR3CpAZ-jkR0pFywsRiLLwuEWibreyPvYIY_CmheIvuWhyzlddtyuXVRnAGrEpqbWXOhMtnzhBds0q7OpVXOk00kMasosEfHNXmCSoKp5KbSIjmm8AsnSrqHUErwUSpwYc4ENu7FiYlAou3Flty1-GUMH3Shomt_8gCjDT-Dwsw0phYrHCZGLTC2LQnJk3BZSvpybote7tKxwM6q9KeNmo6c0pRsLdLwTGgAEjFzmmcykE2Zw-YbgxNsA1SkSpfRA0UnEqbRVtTDLddPuYJWcnXmOVCyotn9v0GxnSE-iUbWWQr2rG4xxiFROj5JPAndiw_Ln_d3zPA0TXwq7Z916u-bRC8AiZY-X-cAH-H_An8L-KCT3URXNiTun8v2M_0AhO9QD-8U20_i6vJzqzyKsIALeVeqZ-AdyC2p9cgCWj7n7xXRnbz3hoiLqpIYwukjASbB_bgDk7gzyMUdaRxmo1Ky6hij1BWwLL7Lmg5CXcjQXZKhMVL0twtBiMlEo7Ue-zX3dQ44pXHperxag3azbmNLJjA6Dh3hpSzZlFvfUl18F8q7p_cAL8S78_CBZ_xHvjJHtYj69QQx8QZQqE_Jc3l3q14bmqiu1B-d8m5JqHMs470Q763yYwwQPbC2MK_AE5As7Hlexem3aQZ-AfRBlahvHNj4ZTz7ieObEdHwFdLfsGRT3DwHV3mo6Y_Rfy_VaHf2arEagWytSmCX8n7aUqx4cJmBLf7YbA0F7oLHTYDF_TDkSx0xhE2zcPp91jOrJlMU2pcU_EO8D6Fbqzb0D8zOLM-IZ4J-ugZ429Y3lnTejwYwAMemHBsOrn9u9JseOJPy77YOx1gf1bnnc1k4wfyHnN_Lul38AmEsdiHvGhHUB4qRZHS43h36EAeu11O5r1SSVDOHSxLPpKQ3yuDZN7XEZIoRrZ77hQ3UrHrQq0zVRdpW1uWDCDxvib3tunPcJscqMBygNoe7DRp-vNa6-hLypT3Z14RCedeQ9LLHfiMFO1CwYfy9tbvYPf1qlPLekHeSEiHzGDN1ZevI1B6B2Lpbh5sz-2Alk8nqVp3QSToG6g7J8IACYtI-8ndSHW_HqLJQHYlLc81aX3lauEoClh6VuT6CVmW_Xx4cUKMVpistrF-8znERbl2fHvMwv1Zg7ipXuENxJolYFGlM8EwxIGkw0pI51zZPri711NwFfOy9-h2eDMzXGe6HAtPSqjDtyZSZq0lXBUA-dVBNQ9FszxyDqe-1DG0sq2P0nb_-vCoLDptv3s43RpcnC1-vVPWh6J_uR7D1-xVklHsgVJt1t5DSq3mbKql9HradSuMTCoWQ_HywKdLk7-01l5nbWlbqI8WXjxrwgYhdFwe0MF9AUVO9lb9XD9JQ2Ku-TjaCYawm8_np5i1w2pmP9qSdKH5rttzT12SxPlSXOs3xXe0U6N6BnD2jNsSSlK1ffBnwirm-se3_a7NcLsk-e-_g-lCqznq98vtH9MPoOI=
\ No newline at end of file
diff --git a/examples/pki/cms/auth_v3_token_scoped.json b/examples/pki/cms/auth_v3_token_scoped.json
index 082c1b1..9020745 100644
--- a/examples/pki/cms/auth_v3_token_scoped.json
+++ b/examples/pki/cms/auth_v3_token_scoped.json
@@ -1,5 +1,8 @@
{
"token": {
+ "audit_ids": [
+ "SLIXlXQUQZWUi9VJrqdXqA"
+ ],
"methods": [
"password"
],
diff --git a/examples/pki/cms/auth_v3_token_scoped.pem b/examples/pki/cms/auth_v3_token_scoped.pem
index e11cf03..e83e7a0 100644
--- a/examples/pki/cms/auth_v3_token_scoped.pem
+++ b/examples/pki/cms/auth_v3_token_scoped.pem
@@ -1,98 +1,100 @@
-----BEGIN CMS-----
-MIIR5gYJKoZIhvcNAQcCoIIR1zCCEdMCAQExCTAHBgUrDgMCGjCCD/MGCSqGSIb3
-DQEHAaCCD+QEgg/gew0KICAgICJ0b2tlbiI6IHsNCiAgICAgICAgIm1ldGhvZHMi
-OiBbDQogICAgICAgICAgICAicGFzc3dvcmQiDQogICAgICAgIF0sDQogICAgICAg
-ICJyb2xlcyI6IFsNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAibmFt
-ZSI6ICJyb2xlMSINCiAgICAgICAgICAgIH0sDQogICAgICAgICAgICB7DQogICAg
-ICAgICAgICAgICAgIm5hbWUiOiAicm9sZTIiDQogICAgICAgICAgICB9DQogICAg
-ICAgIF0sDQogICAgICAgICJleHBpcmVzX2F0IjogIjIwMzgtMDEtMThUMjE6MTQ6
-MDdaIiwNCiAgICAgICAgInByb2plY3QiOiB7DQogICAgICAgICAgICAiaWQiOiAi
-dGVuYW50X2lkMSIsDQogICAgICAgICAgICAiZG9tYWluIjogew0KICAgICAgICAg
-ICAgICAgICJpZCI6ICJkb21haW5faWQxIiwNCiAgICAgICAgICAgICAgICAibmFt
-ZSI6ICJkb21haW5fbmFtZTEiDQogICAgICAgICAgICB9LA0KICAgICAgICAgICAg
-ImVuYWJsZWQiOiB0cnVlLA0KICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogbnVs
-bCwNCiAgICAgICAgICAgICJuYW1lIjogInRlbmFudF9uYW1lMSINCiAgICAgICAg
-fSwNCiAgICAgICAgImNhdGFsb2ciOiBbDQogICAgICAgICAgICB7DQogICAgICAg
-ICAgICAgICAgImVuZHBvaW50cyI6IFsNCiAgICAgICAgICAgICAgICAgICAgew0K
-ICAgICAgICAgICAgICAgICAgICAgICAgImludGVyZmFjZSI6ICJhZG1pbiIsDQog
-ICAgICAgICAgICAgICAgICAgICAgICAidXJsIjogImh0dHA6Ly8xMjcuMC4wLjE6
-ODc3Ni92MS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsDQogICAg
-ICAgICAgICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lvbk9uZSINCiAgICAg
-ICAgICAgICAgICAgICAgfSwNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAg
-ICAgICAgICAgICAgICAgICAgImludGVyZmFjZSI6ICJpbnRlcm5hbCIsDQogICAg
-ICAgICAgICAgICAgICAgICAgICAidXJsIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3
-Ni92MS82NGI2ZjNmYmNjNTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsDQogICAgICAg
-ICAgICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lvbk9uZSINCiAgICAgICAg
-ICAgICAgICAgICAgfSwNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAg
-ICAgICAgICAgICAgICAgImludGVyZmFjZSI6ICJwdWJsaWMiLA0KICAgICAgICAg
-ICAgICAgICAgICAgICAgInVybCI6ICJodHRwOi8vMTI3LjAuMC4xOjg3NzYvdjEv
-NjRiNmYzZmJjYzUzNDM1ZThhNjBmY2Y4OWJiNjYxN2EiLA0KICAgICAgICAgICAg
-ICAgICAgICAgICAgInJlZ2lvbiI6ICJyZWdpb25PbmUiDQogICAgICAgICAgICAg
-ICAgICAgIH0NCiAgICAgICAgICAgICAgICBdLA0KICAgICAgICAgICAgICAgICJ0
-eXBlIjogInZvbHVtZSIsDQogICAgICAgICAgICAgICAgIm5hbWUiOiAidm9sdW1l
-Ig0KICAgICAgICAgICAgfSwNCiAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAg
-ICAiZW5kcG9pbnRzIjogWw0KICAgICAgICAgICAgICAgICAgICB7DQogICAgICAg
-ICAgICAgICAgICAgICAgICAiaW50ZXJmYWNlIjogImFkbWluIiwNCiAgICAgICAg
-ICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovLzEyNy4wLjAuMTo5MjkyL3Yx
-IiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJyZWdpb24iOiAicmVnaW9uT25l
-Ig0KICAgICAgICAgICAgICAgICAgICB9LA0KICAgICAgICAgICAgICAgICAgICB7
-DQogICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJmYWNlIjogImludGVybmFs
-IiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovLzEyNy4w
-LjAuMTo5MjkyL3YxIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJyZWdpb24i
-OiAicmVnaW9uT25lIg0KICAgICAgICAgICAgICAgICAgICB9LA0KICAgICAgICAg
-ICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJmYWNl
-IjogInB1YmxpYyIsDQogICAgICAgICAgICAgICAgICAgICAgICAidXJsIjogImh0
-dHA6Ly8xMjcuMC4wLjE6OTI5Mi92MSIsDQogICAgICAgICAgICAgICAgICAgICAg
-ICAicmVnaW9uIjogInJlZ2lvbk9uZSINCiAgICAgICAgICAgICAgICAgICAgfQ0K
-ICAgICAgICAgICAgICAgIF0sDQogICAgICAgICAgICAgICAgInR5cGUiOiAiaW1h
-Z2UiLA0KICAgICAgICAgICAgICAgICJuYW1lIjogImdsYW5jZSINCiAgICAgICAg
-ICAgIH0sDQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgImVuZHBvaW50
+MIISOAYJKoZIhvcNAQcCoIISKTCCEiUCAQExDTALBglghkgBZQMEAgEwghA9Bgkq
+hkiG9w0BBwGgghAuBIIQKnsNCiAgICAidG9rZW4iOiB7DQogICAgICAgICJhdWRp
+dF9pZHMiOiBbDQogICAgICAgICAgICAiU0xJWGxYUVVRWldVaTlWSnJxZFhxQSIN
+CiAgICAgICAgXSwNCiAgICAgICAgIm1ldGhvZHMiOiBbDQogICAgICAgICAgICAi
+cGFzc3dvcmQiDQogICAgICAgIF0sDQogICAgICAgICJyb2xlcyI6IFsNCiAgICAg
+ICAgICAgIHsNCiAgICAgICAgICAgICAgICAibmFtZSI6ICJyb2xlMSINCiAgICAg
+ICAgICAgIH0sDQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgIm5hbWUi
+OiAicm9sZTIiDQogICAgICAgICAgICB9DQogICAgICAgIF0sDQogICAgICAgICJl
+eHBpcmVzX2F0IjogIjIwMzgtMDEtMThUMjE6MTQ6MDdaIiwNCiAgICAgICAgInBy
+b2plY3QiOiB7DQogICAgICAgICAgICAiaWQiOiAidGVuYW50X2lkMSIsDQogICAg
+ICAgICAgICAiZG9tYWluIjogew0KICAgICAgICAgICAgICAgICJpZCI6ICJkb21h
+aW5faWQxIiwNCiAgICAgICAgICAgICAgICAibmFtZSI6ICJkb21haW5fbmFtZTEi
+DQogICAgICAgICAgICB9LA0KICAgICAgICAgICAgImVuYWJsZWQiOiB0cnVlLA0K
+ICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogbnVsbCwNCiAgICAgICAgICAgICJu
+YW1lIjogInRlbmFudF9uYW1lMSINCiAgICAgICAgfSwNCiAgICAgICAgImNhdGFs
+b2ciOiBbDQogICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgImVuZHBvaW50
cyI6IFsNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAg
ICAgICAgImludGVyZmFjZSI6ICJhZG1pbiIsDQogICAgICAgICAgICAgICAgICAg
-ICAgICAidXJsIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3NC92MS4xLzY0YjZmM2Zi
-Y2M1MzQzNWU4YTYwZmNmODliYjY2MTdhIiwNCiAgICAgICAgICAgICAgICAgICAg
-ICAgICJyZWdpb24iOiAicmVnaW9uT25lIg0KICAgICAgICAgICAgICAgICAgICB9
-LA0KICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAg
-ICAiaW50ZXJmYWNlIjogImludGVybmFsIiwNCiAgICAgICAgICAgICAgICAgICAg
-ICAgICJ1cmwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJj
-YzUzNDM1ZThhNjBmY2Y4OWJiNjYxN2EiLA0KICAgICAgICAgICAgICAgICAgICAg
-ICAgInJlZ2lvbiI6ICJyZWdpb25PbmUiDQogICAgICAgICAgICAgICAgICAgIH0s
-DQogICAgICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAg
-ICJpbnRlcmZhY2UiOiAicHVibGljIiwNCiAgICAgICAgICAgICAgICAgICAgICAg
-ICJ1cmwiOiAiaHR0cDovLzEyNy4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJjYzUz
-NDM1ZThhNjBmY2Y4OWJiNjYxN2EiLA0KICAgICAgICAgICAgICAgICAgICAgICAg
-InJlZ2lvbiI6ICJyZWdpb25PbmUiDQogICAgICAgICAgICAgICAgICAgIH0NCiAg
-ICAgICAgICAgICAgICBdLA0KICAgICAgICAgICAgICAgICJ0eXBlIjogImNvbXB1
-dGUiLA0KICAgICAgICAgICAgICAgICJuYW1lIjogIm5vdmEiDQogICAgICAgICAg
-ICB9LA0KICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICJlbmRwb2ludHMi
-OiBbDQogICAgICAgICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAg
-ICAgICJpbnRlcmZhY2UiOiAiYWRtaW4iLA0KICAgICAgICAgICAgICAgICAgICAg
-ICAgInVybCI6ICJodHRwOi8vMTI3LjAuMC4xOjM1MzU3L3YzIiwNCiAgICAgICAg
-ICAgICAgICAgICAgICAgICJyZWdpb24iOiAiUmVnaW9uT25lIg0KICAgICAgICAg
-ICAgICAgICAgICB9LA0KICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAg
-ICAgICAgICAgICAgICAiaW50ZXJmYWNlIjogImludGVybmFsIiwNCiAgICAgICAg
-ICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovLzEyNy4wLjAuMTozNTM1Ny92
-MyIsDQogICAgICAgICAgICAgICAgICAgICAgICAicmVnaW9uIjogIlJlZ2lvbk9u
-ZSINCiAgICAgICAgICAgICAgICAgICAgfSwNCiAgICAgICAgICAgICAgICAgICAg
-ew0KICAgICAgICAgICAgICAgICAgICAgICAgImludGVyZmFjZSI6ICJwdWJsaWMi
-LA0KICAgICAgICAgICAgICAgICAgICAgICAgInVybCI6ICJodHRwOi8vMTI3LjAu
-MC4xOjUwMDAvdjMiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInJlZ2lvbiI6
-ICJSZWdpb25PbmUiDQogICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAg
-ICAgICBdLA0KICAgICAgICAgICAgICAgICJ0eXBlIjogImlkZW50aXR5IiwNCiAg
-ICAgICAgICAgICAgICAibmFtZSI6ICJrZXlzdG9uZSINCiAgICAgICAgICAgIH0N
-CiAgICAgICAgXSwNCiAgICAgICAgInVzZXIiOiB7DQogICAgICAgICAgICAiZG9t
-YWluIjogew0KICAgICAgICAgICAgICAgICJpZCI6ICJkb21haW5faWQxIiwNCiAg
-ICAgICAgICAgICAgICAibmFtZSI6ICJkb21haW5fbmFtZTEiDQogICAgICAgICAg
-ICB9LA0KICAgICAgICAgICAgIm5hbWUiOiAidXNlcl9uYW1lMSIsDQogICAgICAg
-ICAgICAiaWQiOiAidXNlcl9pZDEiDQogICAgICAgIH0NCiAgICB9DQp9DQoxggHK
-MIIBxgIBATCBpDCBnjEKMAgGA1UEBRMBNTELMAkGA1UEBhMCVVMxCzAJBgNVBAgT
-AkNBMRIwEAYDVQQHEwlTdW5ueXZhbGUxEjAQBgNVBAoTCU9wZW5TdGFjazERMA8G
-A1UECxMIS2V5c3RvbmUxJTAjBgkqhkiG9w0BCQEWFmtleXN0b25lQG9wZW5zdGFj
-ay5vcmcxFDASBgNVBAMTC1NlbGYgU2lnbmVkAgERMAcGBSsOAwIaMA0GCSqGSIb3
-DQEBAQUABIIBAMq7ffe3ft88hD0EXJfWqkoEGcnal6NmTuLAiCOeQjDxR5TEIx0x
-HanKHWAG7Ko/97KgKAAFwOq3hhnbbKbKq7Z3brUNPXNRwBd3RusUrsLQOWwwKAsF
-acD8a4XXx6oC8dTsuFivDtMNb1JvBRIWcZXznOtn/bkFcvVhOQ+Af93c9xPBUpMq
-1667DbVKWRJEsMrcf5r7wYRQBtAKZU3CAjbNDighdTJWwF7TIWZycnF3OHYmu5J2
-wvcuB8ex+xRvf1lw1qnb3lC43A4M1KqhnHPpWUrpmAFnzAcYwc7ts2iCqD/UwVBP
-YcXU8kk8bY6leNJKR9xjHcIfW8SnREZVbXA=
+ICAgICAidXJsIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3Ni92MS82NGI2ZjNmYmNj
+NTM0MzVlOGE2MGZjZjg5YmI2NjE3YSIsDQogICAgICAgICAgICAgICAgICAgICAg
+ICAicmVnaW9uIjogInJlZ2lvbk9uZSINCiAgICAgICAgICAgICAgICAgICAgfSwN
+CiAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAgICAg
+ImludGVyZmFjZSI6ICJpbnRlcm5hbCIsDQogICAgICAgICAgICAgICAgICAgICAg
+ICAidXJsIjogImh0dHA6Ly8xMjcuMC4wLjE6ODc3Ni92MS82NGI2ZjNmYmNjNTM0
+MzVlOGE2MGZjZjg5YmI2NjE3YSIsDQogICAgICAgICAgICAgICAgICAgICAgICAi
+cmVnaW9uIjogInJlZ2lvbk9uZSINCiAgICAgICAgICAgICAgICAgICAgfSwNCiAg
+ICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAgICAgImlu
+dGVyZmFjZSI6ICJwdWJsaWMiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInVy
+bCI6ICJodHRwOi8vMTI3LjAuMC4xOjg3NzYvdjEvNjRiNmYzZmJjYzUzNDM1ZThh
+NjBmY2Y4OWJiNjYxN2EiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInJlZ2lv
+biI6ICJyZWdpb25PbmUiDQogICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAg
+ICAgICAgICBdLA0KICAgICAgICAgICAgICAgICJ0eXBlIjogInZvbHVtZSIsDQog
+ICAgICAgICAgICAgICAgIm5hbWUiOiAidm9sdW1lIg0KICAgICAgICAgICAgfSwN
+CiAgICAgICAgICAgIHsNCiAgICAgICAgICAgICAgICAiZW5kcG9pbnRzIjogWw0K
+ICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAi
+aW50ZXJmYWNlIjogImFkbWluIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJ1
+cmwiOiAiaHR0cDovLzEyNy4wLjAuMTo5MjkyL3YxIiwNCiAgICAgICAgICAgICAg
+ICAgICAgICAgICJyZWdpb24iOiAicmVnaW9uT25lIg0KICAgICAgICAgICAgICAg
+ICAgICB9LA0KICAgICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAg
+ICAgICAgICAiaW50ZXJmYWNlIjogImludGVybmFsIiwNCiAgICAgICAgICAgICAg
+ICAgICAgICAgICJ1cmwiOiAiaHR0cDovLzEyNy4wLjAuMTo5MjkyL3YxIiwNCiAg
+ICAgICAgICAgICAgICAgICAgICAgICJyZWdpb24iOiAicmVnaW9uT25lIg0KICAg
+ICAgICAgICAgICAgICAgICB9LA0KICAgICAgICAgICAgICAgICAgICB7DQogICAg
+ICAgICAgICAgICAgICAgICAgICAiaW50ZXJmYWNlIjogInB1YmxpYyIsDQogICAg
+ICAgICAgICAgICAgICAgICAgICAidXJsIjogImh0dHA6Ly8xMjcuMC4wLjE6OTI5
+Mi92MSIsDQogICAgICAgICAgICAgICAgICAgICAgICAicmVnaW9uIjogInJlZ2lv
+bk9uZSINCiAgICAgICAgICAgICAgICAgICAgfQ0KICAgICAgICAgICAgICAgIF0s
+DQogICAgICAgICAgICAgICAgInR5cGUiOiAiaW1hZ2UiLA0KICAgICAgICAgICAg
+ICAgICJuYW1lIjogImdsYW5jZSINCiAgICAgICAgICAgIH0sDQogICAgICAgICAg
+ICB7DQogICAgICAgICAgICAgICAgImVuZHBvaW50cyI6IFsNCiAgICAgICAgICAg
+ICAgICAgICAgew0KICAgICAgICAgICAgICAgICAgICAgICAgImludGVyZmFjZSI6
+ICJhZG1pbiIsDQogICAgICAgICAgICAgICAgICAgICAgICAidXJsIjogImh0dHA6
+Ly8xMjcuMC4wLjE6ODc3NC92MS4xLzY0YjZmM2ZiY2M1MzQzNWU4YTYwZmNmODli
+YjY2MTdhIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJyZWdpb24iOiAicmVn
+aW9uT25lIg0KICAgICAgICAgICAgICAgICAgICB9LA0KICAgICAgICAgICAgICAg
+ICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAiaW50ZXJmYWNlIjogImlu
+dGVybmFsIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cDov
+LzEyNy4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJjYzUzNDM1ZThhNjBmY2Y4OWJi
+NjYxN2EiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInJlZ2lvbiI6ICJyZWdp
+b25PbmUiDQogICAgICAgICAgICAgICAgICAgIH0sDQogICAgICAgICAgICAgICAg
+ICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAgICJpbnRlcmZhY2UiOiAicHVi
+bGljIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJ1cmwiOiAiaHR0cDovLzEy
+Ny4wLjAuMTo4Nzc0L3YxLjEvNjRiNmYzZmJjYzUzNDM1ZThhNjBmY2Y4OWJiNjYx
+N2EiLA0KICAgICAgICAgICAgICAgICAgICAgICAgInJlZ2lvbiI6ICJyZWdpb25P
+bmUiDQogICAgICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICBdLA0K
+ICAgICAgICAgICAgICAgICJ0eXBlIjogImNvbXB1dGUiLA0KICAgICAgICAgICAg
+ICAgICJuYW1lIjogIm5vdmEiDQogICAgICAgICAgICB9LA0KICAgICAgICAgICAg
+ew0KICAgICAgICAgICAgICAgICJlbmRwb2ludHMiOiBbDQogICAgICAgICAgICAg
+ICAgICAgIHsNCiAgICAgICAgICAgICAgICAgICAgICAgICJpbnRlcmZhY2UiOiAi
+YWRtaW4iLA0KICAgICAgICAgICAgICAgICAgICAgICAgInVybCI6ICJodHRwOi8v
+MTI3LjAuMC4xOjM1MzU3L3YzIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJy
+ZWdpb24iOiAiUmVnaW9uT25lIg0KICAgICAgICAgICAgICAgICAgICB9LA0KICAg
+ICAgICAgICAgICAgICAgICB7DQogICAgICAgICAgICAgICAgICAgICAgICAiaW50
+ZXJmYWNlIjogImludGVybmFsIiwNCiAgICAgICAgICAgICAgICAgICAgICAgICJ1
+cmwiOiAiaHR0cDovLzEyNy4wLjAuMTozNTM1Ny92MyIsDQogICAgICAgICAgICAg
+ICAgICAgICAgICAicmVnaW9uIjogIlJlZ2lvbk9uZSINCiAgICAgICAgICAgICAg
+ICAgICAgfSwNCiAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAg
+ICAgICAgICAgImludGVyZmFjZSI6ICJwdWJsaWMiLA0KICAgICAgICAgICAgICAg
+ICAgICAgICAgInVybCI6ICJodHRwOi8vMTI3LjAuMC4xOjUwMDAvdjMiLA0KICAg
+ICAgICAgICAgICAgICAgICAgICAgInJlZ2lvbiI6ICJSZWdpb25PbmUiDQogICAg
+ICAgICAgICAgICAgICAgIH0NCiAgICAgICAgICAgICAgICBdLA0KICAgICAgICAg
+ICAgICAgICJ0eXBlIjogImlkZW50aXR5IiwNCiAgICAgICAgICAgICAgICAibmFt
+ZSI6ICJrZXlzdG9uZSINCiAgICAgICAgICAgIH0NCiAgICAgICAgXSwNCiAgICAg
+ICAgInVzZXIiOiB7DQogICAgICAgICAgICAiZG9tYWluIjogew0KICAgICAgICAg
+ICAgICAgICJpZCI6ICJkb21haW5faWQxIiwNCiAgICAgICAgICAgICAgICAibmFt
+ZSI6ICJkb21haW5fbmFtZTEiDQogICAgICAgICAgICB9LA0KICAgICAgICAgICAg
+Im5hbWUiOiAidXNlcl9uYW1lMSIsDQogICAgICAgICAgICAiaWQiOiAidXNlcl9p
+ZDEiDQogICAgICAgIH0NCiAgICB9DQp9DQoxggHOMIIBygIBATCBpDCBnjEKMAgG
+A1UEBRMBNTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlTdW5u
+eXZhbGUxEjAQBgNVBAoTCU9wZW5TdGFjazERMA8GA1UECxMIS2V5c3RvbmUxJTAj
+BgkqhkiG9w0BCQEWFmtleXN0b25lQG9wZW5zdGFjay5vcmcxFDASBgNVBAMTC1Nl
+bGYgU2lnbmVkAgERMAsGCWCGSAFlAwQCATANBgkqhkiG9w0BAQEFAASCAQBBvzoh
+0iSPMQhuRCAtTG3cPhyewvf554MPjbGQnu8mYmmfyxl7gMmWkTAmyckAsSv4mS6/
+4SQj9WCn4T1lFkhUz7WWjCwt6fWWp3mzF8Nl/kMsJKDwlxDGbPzsyewXIUsw11sz
+q/Qxs7qGxQ1vYWnaWQ3hC3oZw7cOswKRJicdP439iVPvfqR9CDbK55sPP+ewZRgQ
+YJ3Uc/xDizxepudFJj9+VHKceA37/sVK0ataNe2uHLHwVBYPwOppMckP169QBw8x
+QYh9h+kcOAyZ5psiUzCpLKnlMiYDrVcTGxnTeiVHxKXxj/MERNhR1Y4lEr0ZHJ+p
+Y6p3FBP2VUCefaRh
-----END CMS-----
diff --git a/examples/pki/cms/auth_v3_token_scoped.pkiz b/examples/pki/cms/auth_v3_token_scoped.pkiz
index d687c03..74f8f63 100644
--- a/examples/pki/cms/auth_v3_token_scoped.pkiz
+++ b/examples/pki/cms/auth_v3_token_scoped.pkiz
@@ -1 +1 @@
-PKIZ_eJy9V8lyo0gQvddXzN3RYUCgNoc-FItYTCGBEEvdWCwWscjWwvL1UyDJ3W577J6YiFGEDlUFmS_zvcxKvn0jP0FWNPMvEa3HxTeANE1X2kB_bLCWnWMTWrHYkD1JEkXRSkVoyZ3oQFVINy9SikSlEEWhTxVx_aystWgGJEtWYUg2u52cprH71OtUxBzLKNfmmnrIY1U_h5VbJOJljRX-GHjlSSualDx7AoFHl-NCq-xz5C32Ucmfxj201g6aqO_x-KKo7yKGzkKP24ae1Wk1NZ6VUbXIQaS4u9FAouo0XrfEEJdF3iZf5jBPFJcY4yifmfY6LR_P7TJmzD70BSr0-BMYX45q9xCJ42E5GdNqe7R-Shb8Hktyvh0N1_qZOBvGc292yMn5Ea-1OSBQ-ojpCGSdN0Th-68I4oo_YEfLt-4E-Yh9u4kY-2Kk19vANweQMHyPRT0xRJhjP2tDXy9jms-mpIlajyTEGg7sDEdmXUnrloVMLQs48_IpRwUIfDuLFL7-HRo5ZAgyekQzGfe4Xazw-6i2X8NIfP0ALgxkVKLCudE_dKiIT0hkW6OQ50spnpk5z6D1A2MqGoMLswoqszAdRKHBLZeKzACk4AIXKRdUGmMW8iy40kc8lXGFs4C55CPw7GPosROauHLrkYHROSDZLTFTnqMdf8K3RNZuH134bxLVbpf5wxk52swo4IiO5CGdmUNwTgr5DMzCzgmwAVd6EQybwZQQjZ0sMwuhCpiAXXp6bhZBZzLy5J2IicK-XgWeWV4QVOWJCKYnyTtMQrkhyicEPfaSfcRwq6jaTHog8qXjqp3CClWbArHUnI1B7s1-TByB6DSsOcSMMQs6YwiooMAVYnAeMIhGgzWY3oYNnKDFlVktpTIHQUGOnCS7yPSCBleL4kplm3j6IfTQu-TdkIJb8vxJrjYXK9c6ICpMxkIbC0d9o486UhankZ3RKPgngXyqD0fj0KQP7QD-DecfUQ6-5nzXE48j5_8fjRwiXkca_4QZ8FmMvzMTenSGmVckU-u7ViN3Tir507L9J1bAa9mKIy3sH6nvV_GBD2LMsELvo0vHuSaRvba4S7gOw70KDHwpmi_Qgc_gfYDuKjrSeMULQvAVxK8Qgv-SwBEh-Lfl-7tGwE0kAcMfY9Wl8AcXTMi4XDwjd2f1vsWDPy1hNPZLJyZFhd4UFbhVlVYtdtF4bb8vqPVnBQXGivqgoIg3RJs9SW7_8T1xRTDOB-37hJV_fleAn41j0yIJvovxNcRaoIOq2wf9W4mDEc7mjYDo6aZO1LK9qQ-TQSNRSurplT53wL5GQhlb2m20uc5Ev3Tf17Fm2nNuLc2acnCblYDPlLvLcAF_fZmOGbd_O9rcppfRu36dlWgebB1FhHHTpqmqwFQWkKbsyP8JWU0rwkByLWshtzKNrEMrWtNakVvd3QyygeBOAZDeyKKARIuSO7mAlpCargBjR3RNOqo4LiHNlsBfIwEq07MZ0p2ZUEalSZEEvwBky63UTpYNuc0M7JdDohD6HLlEInodKMk8qUM78H7K2oURMQSi-mLJqMisNMgbJGiTJ9ghY8O4B5wLTuglJ-xZIiTOhDZYPLasBLOmlaxABz9HXFkQLEimVRnmJ3OlLmcvbKSdqMYrmzCrm95WXJ12CpbiH4Ln1O5ZzC2aZ6DndyU-zU7DXS1QL_Ndjdd-JsAIqbs9v3To5N5fB9zLshOf-uql6beRHX3H4Xy_hxWW6AqsHh-d7_NktVXtxxXTR2yhoe3cWAcs_bxqnxTBqRUha-onmROWuZpIXC05Em0v1vaB1bI50P2ZKjyrfXi33B4XFO47K4lXsKyFx7vW2Id3ZyKK9OUQMH7ztHPNY-vcQ38ZZliW5ORlDQYlpPYnVmg1NNNgWvIzt33g7oXy0LVwkMU8rNSu3g6ORWFa9GAxHL1NWqSxkdqqeL4HK0GEBs73RVma-_uGClnlMehWZR49Gdvvq8UiiqvZ1jZ0-OMHmD4xZFP6-bnxN6RCLsw=
\ No newline at end of file
+PKIZ_eJy9V0tzozoT3etX3H1qKoBNEhbfgpexMJKNjXloZyDmJWwnNs9f_wnsSWYyuXUzc6uuq7yQQN2n-_RpNd--sZ-iGxD_paLNsPgGEISmIwfm4khgWkdYtiP1yPZWjqqqTqHKtt5qjmwpCU3SIlGIjXQ50ZskiddKUryAtMgMqeEUpTEStqkqEM5Xh3MWG9Ir8abZMlMeYcnT2EhrMkfDOoQHJY0meBJOzAJAyp2hanah0NKogw9wdmEHxDT0tuxlOYtK6UwcPdtvmuS5M6vA4ynMjwk8mHVobDsAD3xsqXJG_LTZ-SaNeCmNVWZIhR3S0NRy5NZy9KmrwXaZ69wylydeBgenDTP-AoiHucEis16EAp_u3mDTYvRUruvQm51CKp2IpmeDs7CcXchmcMJCuB4S9-PmDSosXQbVPBPPHoxx0cGlw8HduJZZfobnIucLtABoM8L5IbY1ZcaqeCaNe7fnBfFxHpW0iQ1ahxnzboh8aLQSGCwHwowLvLYmb0l0KzJXaoaMe08srZjnjpSz_AY_JQZ_AuE1IXxUNiO83XzNRdqxtnq9w920sXK5Qs5xivtIsCZBa_UBF-SkRAJhjhEPUG_32NtOAydoSInLpUazIGePnDiFWTPQRYlwg83oJl58CgVxFZbbMV-AZf8UsrijkqSBcOV-gE78IS_NmPXYN89XRlIunssPVvfUojyqkDptgJXrD0uN1VUmCWjzJGADCiTHZVDiHDuIQ71Ll4YuIIPkJE_EoIQCzvVJcE1uB66Qpreqcw87T6ocQaTwwCp0fv6Opgw8fGNJ4YOyPQXdNXfgT5P3PXfgj5Lnjvrhnn2FgissUodzdyjPD0X1fd-ULFX5tD7A3xXIF-tDBCgvuiHGr3D-GeXgdzgfKXegiEbK_yMaxX8KEXxGzTUEegm8mI4Hf2hxRGjTsMRvCFkIYhEZ0pCcfjjoTT6BXc6K0KPVFYXbhWPLM4_xfN2AZfZUIwdORsjqlPW9ZIJ7u45zvfqKNsBHcfxuUt8KibWx82cQ_wkh-F35fkQIfpf3j7SDT-TLjfLN9Rrn64xh60lp5kG_7bGGeOKkKc6VMhCC6dIzM4DzoMXC9cL4nrTb1XUtmkKqBjX6w31xWIuRca2HQJAu0dzlwC8SLsU6Lt_uQnZHrJtQYIm-XawfBQVGa976MlxpXxETGkJxIsYCGt8HP8GmP8O-NpFf-sUNAStvFZ7BF5oG84h43DEJd79SCbZ_IOEfHYJPPPJIkxtGZf-JhDcfmyv4IOGCqZPb-Wvxo4x3gitGEzYrvEufjwS3A_9muBjOgF-Hi3evsY9pRH-aE07kKrTR-23AGOhiteC7BYO-33m3xtKZjqPTIJyla9ed7VzePS1dsogOs8KbzxRIeWnvGCqQoymb-eYLNvspCBoF-z8j-9iocqC5tj3TG51H9rlR7XFt6I3pbnvdQnJhyPxWB6qCVJvTWz2XbSXBriJHjupiPixFMWY9goW2QYo8vqymyHQmCg0pZhMNfkVrvQFaM1q29Ca1iE97NmBW7BBFKjLUzYuxgeFEs3VTXgfeOxOuHA6GDpgDgyWrlDrS61ukwNGT3CJrK7hnkinOzosrNq2pMvOmNoEZQAJlb6spMlSQzBngBy-KbG9lNuoqsl45jyd9AeeC-HheWe3ZcDV83l82hJcKyxTugoXTmR29W7ggfMi9NIj3U057PbLunu_O-6Pf76PznSIHxJRq4e7OOIWL7KTwPgcP9f2rd7_dRKUwebBCDmgngUi2KFhknc5gFhThttK4Je6NbWFO4GIz0T3rsfJW4mql2yo1yqqtlZnzjLO21O874K2f7p-3F08ISRVMDf_iXbz5PD_K8sTuT0er8oTnKn5NWsdHyHVR99DQbfas-vv01XjSVsATVN47Wg1furyTLmYXI0p8ob7Xl6tjv6sXjplX6K40Nz4WV013XF_UIgmX3fSurGfTwwJ0j4vLEa_um-eE7-4VWqYvq8eX-zbZTFYPl2htaOZRdlYzh4P_A-M3io619--V_wMk2UFA
\ No newline at end of file
diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py
index a8afeb2..be268da 100644
--- a/keystonemiddleware/auth_token/__init__.py
+++ b/keystonemiddleware/auth_token/__init__.py
@@ -883,6 +883,18 @@ class AuthProtocol(_BaseAuthProtocol):
'fallback to online validation.'))
else:
data = jsonutils.loads(verified)
+
+ audit_ids = None
+ if 'access' in data:
+ # It's a v2 token.
+ audit_ids = data['access']['token'].get('audit_ids')
+ else:
+ # It's a v3 token
+ audit_ids = data['token'].get('audit_ids')
+
+ if audit_ids:
+ self._revocations.check_by_audit_id(audit_ids)
+
return data
def _validate_token(self, auth_ref):
diff --git a/keystonemiddleware/auth_token/_revocations.py b/keystonemiddleware/auth_token/_revocations.py
index 8cc449a..a68356a 100644
--- a/keystonemiddleware/auth_token/_revocations.py
+++ b/keystonemiddleware/auth_token/_revocations.py
@@ -104,3 +104,25 @@ class Revocations(object):
if self._any_revoked(token_ids):
self._log.debug('Token is marked as having been revoked')
raise exc.InvalidToken(_('Token has been revoked'))
+
+ def check_by_audit_id(self, audit_ids):
+ """Check whether the audit_id appears in the revocation list.
+
+ :raises keystonemiddleware.auth_token._exceptions.InvalidToken:
+ if the audit ID(s) appear in the revocation list.
+
+ """
+ revoked_tokens = self._list.get('revoked', None)
+ if not revoked_tokens:
+ # There's no revoked tokens, so nothing to do.
+ return
+
+ # The audit_id may not be present in the revocation events because
+ # earlier versions of the identity server didn't provide them.
+ revoked_ids = set(
+ x['audit_id'] for x in revoked_tokens if 'audit_id' in x)
+ for audit_id in audit_ids:
+ if audit_id in revoked_ids:
+ self._log.debug(
+ 'Token is marked as having been revoked by audit id')
+ raise exc.InvalidToken(_('Token has been revoked'))
diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
index 3fdd4a9..e729735 100644
--- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
+++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
@@ -896,6 +896,30 @@ class CommonAuthTokenMiddlewareTest(object):
def test_revoked_hashed_pkiz_token(self):
self._test_revoked_hashed_token('signed_token_scoped_pkiz')
+ def test_revoked_pki_token_by_audit_id(self):
+ # When the audit ID is in the revocation list, the token is invalid.
+ self.set_middleware()
+ token = self.token_dict['signed_token_scoped']
+
+ # Put the token audit ID in the revocation list,
+ # the entry will have a false token ID so the token ID doesn't match.
+ fake_token_id = uuid.uuid4().hex
+ # The audit_id value is in examples/pki/cms/auth_*_token_scoped.json.
+ audit_id = 'SLIXlXQUQZWUi9VJrqdXqA'
+ revocation_list_data = {
+ 'revoked': [
+ {
+ 'id': fake_token_id,
+ 'audit_id': audit_id
+ },
+ ]
+ }
+ self.middleware._revocations._list = jsonutils.dumps(
+ revocation_list_data)
+
+ resp = self.call_middleware(headers={'X-Auth-Token': token})
+ self.assertEqual(401, resp.status_int)
+
def get_revocation_list_json(self, token_ids=None, mode=None):
if token_ids is None:
key = 'revoked_token_hash' + (('_' + mode) if mode else '')
diff --git a/keystonemiddleware/tests/unit/auth_token/test_revocations.py b/keystonemiddleware/tests/unit/auth_token/test_revocations.py
index cef65b8..258e195 100644
--- a/keystonemiddleware/tests/unit/auth_token/test_revocations.py
+++ b/keystonemiddleware/tests/unit/auth_token/test_revocations.py
@@ -27,22 +27,24 @@ from keystonemiddleware.tests.unit import utils
class RevocationsTests(utils.BaseTestCase):
- def _check_with_list(self, revoked_list, token_ids):
+ def _setup_revocations(self, revoked_list):
directory_name = '/tmp/%s' % uuid.uuid4().hex
signing_directory = _signing_dir.SigningDirectory(directory_name)
self.addCleanup(shutil.rmtree, directory_name)
identity_server = mock.Mock()
- verify_result_obj = {
- 'revoked': list({'id': r} for r in revoked_list)
- }
+ verify_result_obj = {'revoked': revoked_list}
cms_verify = mock.Mock(return_value=json.dumps(verify_result_obj))
revocations = _revocations.Revocations(
timeout=datetime.timedelta(1), signing_directory=signing_directory,
identity_server=identity_server, cms_verify=cms_verify)
+ return revocations
+ def _check_with_list(self, revoked_list, token_ids):
+ revoked_list = list({'id': r} for r in revoked_list)
+ revocations = self._setup_revocations(revoked_list)
revocations.check(token_ids)
def test_check_empty_list(self):
@@ -63,3 +65,40 @@ class RevocationsTests(utils.BaseTestCase):
token_ids = [token_id]
self.assertRaises(exc.InvalidToken,
self._check_with_list, revoked_tokens, token_ids)
+
+ def test_check_by_audit_id_revoked(self):
+ # When the audit ID is in the revocation list, InvalidToken is raised.
+ audit_id = uuid.uuid4().hex
+ revoked_list = [{'id': uuid.uuid4().hex, 'audit_id': audit_id}]
+ revocations = self._setup_revocations(revoked_list)
+ self.assertRaises(exc.InvalidToken,
+ revocations.check_by_audit_id, [audit_id])
+
+ def test_check_by_audit_id_chain_revoked(self):
+ # When the token's audit chain ID is in the revocation list,
+ # InvalidToken is raised.
+ revoked_audit_id = uuid.uuid4().hex
+ revoked_list = [{'id': uuid.uuid4().hex, 'audit_id': revoked_audit_id}]
+ revocations = self._setup_revocations(revoked_list)
+
+ token_audit_ids = [uuid.uuid4().hex, revoked_audit_id]
+ self.assertRaises(exc.InvalidToken,
+ revocations.check_by_audit_id, token_audit_ids)
+
+ def test_check_by_audit_id_not_revoked(self):
+ # When the audit ID is not in the revocation list no exception.
+ revoked_list = [{'id': uuid.uuid4().hex, 'audit_id': uuid.uuid4().hex}]
+ revocations = self._setup_revocations(revoked_list)
+
+ audit_id = uuid.uuid4().hex
+ revocations.check_by_audit_id([audit_id])
+
+ def test_check_by_audit_id_no_audit_ids(self):
+ # Older identity servers don't send audit_ids in the revocation list.
+ # When this happens, check_by_audit_id still works, just doesn't
+ # verify anything.
+ revoked_list = [{'id': uuid.uuid4().hex}]
+ revocations = self._setup_revocations(revoked_list)
+
+ audit_id = uuid.uuid4().hex
+ revocations.check_by_audit_id([audit_id])
--
1.9.1

@ -0,0 +1,84 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
inherit distutils-r1
DESCRIPTION="A middleware for the OpenStack Keystone API"
HOMEPAGE="https://github.com/openstack/keystonemiddleware"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}
test? (
>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
)"
RDEPEND="
${CDEPEND}
>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-2.6.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
>=dev-python/positional-1.0.1[${PYTHON_USEDEP}]
>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
<dev-python/python-keystoneclient-3.0.0[${PYTHON_USEDEP}]
>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
PATCHES=(
)
python_prepare_all() {
sed -i '/^hacking/d' test-requirements.txt || die
distutils-r1_python_prepare_all
}
python_compile_all() {
use doc && emake -C doc html
}
python_test() {
testr init
testr run || die "testsuite failed under python2.7"
flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
}
python_install_all() {
use doc && local HTML_DOCS=( doc/build/html/. )
use examples && local EXAMPLES=( examples/.)
distutils-r1_python_install_all
}

@ -1 +1,2 @@
DIST ldappool-1.0.tar.gz 6795 SHA256 1fc36c617ffa6195a738ca99ae7f2178271ebe30a5ee6d41abdb49168afb75aa SHA512 081dc08833d95bb0d3ce396cbbe697252e2b483cc3703e87f00f8af0513f9fdca4ff9c97295fb439ff1fcd404027d5922c2a6337665cfad526be3c6b83acfa53 WHIRLPOOL e5cb9b61848cb3fa7314eeeb25fd9bed89ec7e4dca50eb501f80f952ca3aab78017962c85359efbe6d741ec9b38450d78a06a287aee8e7e935db391c3856a68a
DIST ldappool-2.0.0.tar.gz 15089 SHA256 2850274c16b3108fae9f0ce2bc327e7712f78578677c08336225b75edeb1c5f1 SHA512 824243cca712d6aef8929c74cb15f0cefbc8795cdb599d3b0cc48e8eee4a58d3db94a6642379f87ba011784c289f936a62f2aed637bb005985bbee2118d3b6ea WHIRLPOOL 9a54e41a9ff5c5236b9fcf16f61d11bd121c49f9122866c00fc82fc2e6fa2c72d4c45386f613b14ea2d20c58bd40750a90ad3c5384c8d8df6d665c7b7ccb07e0

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save