proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

13 files changed, 493 insertions, 0 deletions

diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
new file mode 100644
index 00000000000..68db558ec09
--- /dev/null
+++ b/media-plugins/vdr-live/Manifest
@@ -0,0 +1 @@
+DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 SHA256 edd577580b9e99de88bcd3794fcf792bee7df7ccc41bfebaeebef22bac5c78a7 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1 WHIRLPOOL 7f8d7ff69914d90af41d4c550df6f57a658e8263d320167fed84f4990063a5323c1f5d58d44283682807c673af81c8e32cd44e13a9aa57e849e3640b4ecac936
diff --git a/media-plugins/vdr-live/files/confd b/media-plugins/vdr-live/files/confd
new file mode 100644
index 00000000000..b96f0696c08
--- /dev/null
+++ b/media-plugins/vdr-live/files/confd
@@ -0,0 +1,8 @@
+# configuration of vdr-live
+
+# use this portnumber
+LIVE_PORT="8008"
+
+# bind to these IP addresses
+LIVE_BIND_IPS="127.0.0.1"
+
diff --git a/media-plugins/vdr-live/files/confd-0.2 b/media-plugins/vdr-live/files/confd-0.2
new file mode 100644
index 00000000000..bbbbcb5e9d4
--- /dev/null
+++ b/media-plugins/vdr-live/files/confd-0.2
@@ -0,0 +1,23 @@
+# configuration of media-plugins/vdr-live
+
+# for people who want more secure
+# with ssl access.
+#	on usage, you have to install vdr-live
+#	with USE="ssl"
+#
+#	SSL ADDRESS -->  https://<your-ip>:8443/
+#
+#	allowed values: yes no
+#	default: no
+#LIVE_USE_SSL="yes"
+
+# default given portnumber
+# only changes needed on problems
+#
+#LIVE_PORT="8008"
+#LIVE_SSL_PORT="8443"
+
+# bind to these IP addresses
+# default, your IP will automaticly detected
+#
+LIVE_BIND_IPS="127.0.0.1"
diff --git a/media-plugins/vdr-live/files/confd-0.3 b/media-plugins/vdr-live/files/confd-0.3
new file mode 100644
index 00000000000..cb1dce04dfb
--- /dev/null
+++ b/media-plugins/vdr-live/files/confd-0.3
@@ -0,0 +1,29 @@
+# configuration of media-plugins/vdr-live
+
+# for people who want more secure
+# with ssl access.
+#	on usage, you have to install vdr-live
+#	with USE="ssl"
+#
+#	SSL ADDRESS -->  https://<your-ip>:8443/
+#
+#	allowed values: yes no
+#	default: no
+#LIVE_USE_SSL="yes"
+
+# default given portnumber
+# only changes needed on problems
+#
+#LIVE_PORT="8008"
+#LIVE_SSL_PORT="8443"
+
+# bind to these IP addresses
+# default, your IP will automaticly detected
+#
+LIVE_BIND_IPS="127.0.0.1"
+
+# for people who have epgimges
+# default: /var/cache/vdr/epgimges
+#
+# set this to your own path, if needed
+#EPGIMAGES_DIR=" "
diff --git a/media-plugins/vdr-live/files/rc-addon-0.2.sh b/media-plugins/vdr-live/files/rc-addon-0.2.sh
new file mode 100644
index 00000000000..790fa962e94
--- /dev/null
+++ b/media-plugins/vdr-live/files/rc-addon-0.2.sh
@@ -0,0 +1,26 @@
+# $Id$
+#
+# zzam@g.o
+# hd_brummy@g.o
+
+
+plugin_pre_vdr_start() {
+	if [ "${LIVE_USE_SSL:=no}" = "yes" ]; then
+		if [ -n "${LIVE_SSL_PORT}" ]; then
+			add_plugin_param "-s ${LIVE_SSL_PORT}"
+		fi
+
+		add_plugin_param "--cert=/etc/vdr/plugins/live/live.pem"
+		add_plugin_param "--key=/etc/vdr/plugins/live/live-key.pem"
+
+	else
+		if [ -n "${LIVE_PORT}" ]; then
+			add_plugin_param "-p ${LIVE_PORT}"
+		fi
+	fi
+
+	local ip
+	for ip in ${LIVE_BIND_IPS:=`hostname -i`}; do
+		add_plugin_param "-i ${ip}"
+	done
+}
diff --git a/media-plugins/vdr-live/files/rc-addon-0.3.sh b/media-plugins/vdr-live/files/rc-addon-0.3.sh
new file mode 100644
index 00000000000..74b4738f859
--- /dev/null
+++ b/media-plugins/vdr-live/files/rc-addon-0.3.sh
@@ -0,0 +1,31 @@
+# $Id$
+#
+# zzam@g.o
+# hd_brummy@g.o
+
+EPGIMAGES_DIR="/var/cache/vdr/epgimages"
+
+plugin_pre_vdr_start() {
+	if [ "${LIVE_USE_SSL:=no}" = "yes" ]; then
+		if [ -n "${LIVE_SSL_PORT}" ]; then
+			add_plugin_param "-s ${LIVE_SSL_PORT}"
+		fi
+
+		add_plugin_param "--cert=/etc/vdr/plugins/live/live.pem"
+		add_plugin_param "--key=/etc/vdr/plugins/live/live-key.pem"
+
+	else
+		if [ -n "${LIVE_PORT}" ]; then
+			add_plugin_param "-p ${LIVE_PORT}"
+		fi
+	fi
+
+	if [ -d ${EPGIMAGES_DIR} ]; then
+		add_plugin_param "--epgimages=${EPGIMAGES_DIR}"
+	fi
+
+	local ip
+	for ip in ${LIVE_BIND_IPS:=`hostname -i`}; do
+		add_plugin_param "-i ${ip}"
+	done
+}
diff --git a/media-plugins/vdr-live/files/rc-addon.sh b/media-plugins/vdr-live/files/rc-addon.sh
new file mode 100644
index 00000000000..f637736d49b
--- /dev/null
+++ b/media-plugins/vdr-live/files/rc-addon.sh
@@ -0,0 +1,11 @@
+plugin_pre_vdr_start() {
+	if [ -n "${LIVE_PORT}" ]; then
+		add_plugin_param "-p ${LIVE_PORT}"
+	fi
+
+	local ip
+	for ip in ${LIVE_BIND_IPS}; do
+		add_plugin_param "-i ${ip}"
+	done
+}
+
diff --git a/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch b/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch
new file mode 100644
index 00000000000..d95ebd748c7
--- /dev/null
+++ b/media-plugins/vdr-live/files/vdr-1.7.28-compatibility.patch
@@ -0,0 +1,44 @@
+From e154fec60a27d5a74e6940941f789e17d7169d54 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Mon, 4 Jun 2012 01:42:31 +0200
+Subject: [PATCH] Compile fix for >=vdr-1.7.28
+
+---
+ tasks.cpp |   10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/tasks.cpp b/tasks.cpp
+index 9f20190..2a2b8d5 100644
+--- a/tasks.cpp
++++ b/tasks.cpp
+@@ -60,9 +60,15 @@ void PlayRecordingTask::Action()
+ 
+ 	const char *current = NowReplaying();
+ 	if (!current || (0 != strcmp(current, recording->FileName()))) {
++#if VDRVERSNUM >= 10728
++		cReplayControl::SetRecording( 0 );
++		cControl::Shutdown();
++		cReplayControl::SetRecording( recording->FileName() );
++#else
+ 		cReplayControl::SetRecording( 0, 0 );
+ 		cControl::Shutdown();
+ 		cReplayControl::SetRecording( recording->FileName(), recording->Title() );
++#endif
+ 		cControl::Launch( new cReplayControl );
+ 		cControl::Attach();
+ 	}
+@@ -122,7 +128,11 @@ void StopRecordingTask::Action()
+ 		return;
+ 	}
+ 
++#if VDRVERSNUM >= 10728
++	cReplayControl::SetRecording( 0 );
++#else
+ 	cReplayControl::SetRecording( 0, 0 );
++#endif
+ 	cControl::Shutdown();
+ }
+ 
+-- 
+1.7.3.4
+
diff --git a/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff b/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff
new file mode 100644
index 00000000000..1346c9be611
--- /dev/null
+++ b/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff
@@ -0,0 +1,69 @@
+diff -Naur vdr-live-0.3.0_p20130504.orig/pages/recordings.ecpp vdr-live-0.3.0_p20130504/pages/recordings.ecpp
+--- vdr-live-0.3.0_p20130504.orig/pages/recordings.ecpp	2013-10-23 03:28:13.746493449 +0200
++++ vdr-live-0.3.0_p20130504/pages/recordings.ecpp	2013-10-23 03:29:48.779832793 +0200
+@@ -79,7 +79,11 @@
+ deletions.clear();
+ 
+ int FreeMB, UsedMB;
++#if APIVERSNUM > 20101
++int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
++#else
+ int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
++#endif
+ int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
+ int Hours = Minutes / 60;
+ Minutes %= 60;
+diff -Naur vdr-live-0.3.0_p20130504.orig/recman.cpp vdr-live-0.3.0_p20130504/recman.cpp
+--- vdr-live-0.3.0_p20130504.orig/recman.cpp	2013-10-23 03:28:13.756493450 +0200
++++ vdr-live-0.3.0_p20130504/recman.cpp	2013-10-23 03:31:25.813172263 +0200
+@@ -112,7 +112,11 @@
+ 		if (found == string::npos)
+ 			return false;
+ 
++#if APIVERSNUM > 20101
++		string newname = string(cVideoDirectory::Name()) + "/" + name + oldname.substr(found);
++#else
+ 		string newname = string(VideoDirectory) + "/" + name + oldname.substr(found);
++#endif
+ 
+ 		if (!MoveDirectory(oldname.c_str(), newname.c_str(), copy)) {
+ 			esyslog("[LIVE]: renaming failed from '%s' to '%s'", oldname.c_str(), newname.c_str());
+diff -Naur vdr-live-0.3.0_p20130504.orig/tools.cpp vdr-live-0.3.0_p20130504/tools.cpp
+--- vdr-live-0.3.0_p20130504.orig/tools.cpp	2013-10-23 03:28:13.799826786 +0200
++++ vdr-live-0.3.0_p20130504/tools.cpp	2013-10-23 03:34:29.146517191 +0200
+@@ -365,7 +365,11 @@
+ 			stat(source.c_str(), &st1);
+ 			stat(target.c_str(),&st2);
+ 			if (!copy && (st1.st_dev == st2.st_dev)) {
++#if APIVERSNUM > 20101
++				if (!cVideoDirectory::RenameVideoFile(source.c_str(), target.c_str())) {
++#else
+ 				if (!RenameVideoFile(source.c_str(), target.c_str())) {
++#endif
+ 					esyslog("[LIVE]: rename failed from %s to %s", source.c_str(), target.c_str());
+ 					return false;
+ 				}
+@@ -461,7 +465,11 @@
+ 						size_t found = source.find_last_of(delim);
+ 						if (found != std::string::npos) {
+ 							source = source.substr(0, found);
++#if APIVERSNUM > 20101
++							while (source != cVideoDirectory::Name()) {
++#else
+ 							while (source != VideoDirectory) {
++#endif
+ 								found = source.find_last_of(delim);
+ 								if (found == std::string::npos)
+ 									break;
+@@ -478,7 +486,11 @@
+ 					size_t found = target.find_last_of(delim);
+ 					if (found != std::string::npos) {
+ 						target = target.substr(0, found);
++#if APIVERSNUM > 20101
++						while (target != cVideoDirectory::Name()) {
++#else
+ 						while (target != VideoDirectory) {
++#endif
+ 							found = target.find_last_of(delim);
+ 							if (found == std::string::npos)
+ 								break;
diff --git a/media-plugins/vdr-live/files/vdr-live_pcre.patch b/media-plugins/vdr-live/files/vdr-live_pcre.patch
new file mode 100644
index 00000000000..9767cca173a
--- /dev/null
+++ b/media-plugins/vdr-live/files/vdr-live_pcre.patch
@@ -0,0 +1,26 @@
+From 6b2965a86a20c885fc1fae8d4dea24b29b38805e Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Mon, 4 Jun 2012 02:29:55 +0200
+Subject: [PATCH] Make PCRE optional
+
+---
+ pages/recordings.ecpp |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
+index ebd57e0..8bdad66 100644
+--- a/pages/recordings.ecpp
++++ b/pages/recordings.ecpp
+@@ -1,6 +1,9 @@
+ <%pre>
+ #include <string>
++
++#ifdef HAVE_LIBPCRECPP
+ #include <pcrecpp.h>
++#endif
+ 
+ #include <vdr/plugin.h>
+ #include <vdr/config.h>
+-- 
+1.7.3.4
+
diff --git a/media-plugins/vdr-live/metadata.xml b/media-plugins/vdr-live/metadata.xml
new file mode 100644
index 00000000000..5f9f14619db
--- /dev/null
+++ b/media-plugins/vdr-live/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-tv</herd>
+<maintainer>
+<email>vdr@gentoo.org</email>
+<name>Gentoo VDR Project</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
new file mode 100644
index 00000000000..e7f2941e30d
--- /dev/null
+++ b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vdr-plugin-2 ssl-cert
+
+DESCRIPTION="VDR Plugin: Web Access To Settings"
+HOMEPAGE="http://live.vdr-developer.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="pcre ssl"
+
+DEPEND="media-video/vdr
+	>=dev-libs/tntnet-2.2.1[ssl=]
+	>=dev-libs/cxxtools-2.2.1
+	pcre? ( >=dev-libs/libpcre-8.12[cxx] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+VDR_CONFD_FILE="${FILESDIR}/confd-0.2"
+VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.2.sh"
+
+KEEP_I18NOBJECT="yes"
+
+make_live_cert() {
+	# TODO: still true?
+	# ssl-cert eclass creates a "invalid" cert, create our own one
+	local base=$(get_base 1)
+	local keydir="/etc/vdr/plugins/live"
+
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-VDR Plugin Live}"
+	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+	echo
+	gen_cnf || return 1
+	echo
+	gen_key 1 || return 1
+	gen_csr 1 || return 1
+	gen_crt 1 || return 1
+	echo
+
+	install -d "${ROOT}${keydir}"
+	install -m0400 "${base}.key" "${ROOT}${keydir}/live-key.pem"
+	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.pem"
+	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live{,-key}.pem
+}
+
+src_configure() {
+	# tmp. disabled gcc -std=c++11, due massiv compile errors
+	filter-flags -std=c++11
+}
+
+src_prepare() {
+	# remove untranslated language files
+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
+
+	vdr-plugin-2_src_prepare
+
+	epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
+
+	if ! use pcre; then
+		sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
+	fi
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /usr/share/vdr/plugins/live
+	doins -r live/*
+
+	fowners -R vdr:vdr /usr/share/vdr/plugins/live
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	elog "To be able to use all functions of vdr-live"
+	elog "you should emerge and enable"
+	elog "media-plugins/vdr-epgsearch to search the EPG,"
+	elog "media-plugins/vdr-streamdev for Live-TV streaming"
+
+	elog "The default username/password is:"
+	elog "\tadmin:live"
+
+	if use ssl ; then
+		if path_exists -a "${ROOT}"/etc/vdr/plugins/live/live.pem; then
+			einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
+			einfo "emerge --config ${PN}"
+		else
+			einfo "No SSL cert found, creating a default one now"
+			make_live_cert
+		fi
+	fi
+}
+
+pkg_config() {
+	make_live_cert
+}
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
new file mode 100644
index 00000000000..3b226ddf04a
--- /dev/null
+++ b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vdr-plugin-2 ssl-cert
+
+DESCRIPTION="VDR Plugin: Web Access To Settings"
+HOMEPAGE="http://live.vdr-developer.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pcre ssl"
+
+DEPEND="media-video/vdr
+	>=dev-libs/tntnet-2.2.1[ssl=]
+	>=dev-libs/cxxtools-2.2.1
+	pcre? ( >=dev-libs/libpcre-8.12[cxx] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+VDR_CONFD_FILE="${FILESDIR}/confd-0.3"
+VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.sh"
+
+KEEP_I18NOBJECT="yes"
+
+make_live_cert() {
+	# TODO: still true?
+	# ssl-cert eclass creates a "invalid" cert, create our own one
+	local base=$(get_base 1)
+	local keydir="/etc/vdr/plugins/live"
+
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-VDR Plugin Live}"
+	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+	echo
+	gen_cnf || return 1
+	echo
+	gen_key 1 || return 1
+	gen_csr 1 || return 1
+	gen_crt 1 || return 1
+	echo
+
+	install -d "${ROOT}${keydir}"
+	install -m0400 "${base}.key" "${ROOT}${keydir}/live-key.pem"
+	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.pem"
+	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live{,-key}.pem
+}
+
+src_configure() {
+	# tmp. disabled gcc -std=c++11, due massiv compile errors
+	filter-flags -std=c++11
+}
+
+src_prepare() {
+	# new Makefile handling ToDp
+#	cp "${FILESDIR}/live.mk" "${S}/Makefile"
+
+	# remove untranslated language files
+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
+
+	vdr-plugin-2_src_prepare
+
+	epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
+
+	if ! use pcre; then
+		sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
+	fi
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /usr/share/vdr/plugins/live
+	doins -r live/*
+
+	fowners -R vdr:vdr /usr/share/vdr/plugins/live
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	elog "To be able to use all functions of vdr-live"
+	elog "you should emerge and enable"
+	elog "media-plugins/vdr-epgsearch to search the EPG,"
+	elog "media-plugins/vdr-streamdev for Live-TV streaming"
+
+	elog "The default username/password is:"
+	elog "\tadmin:live"
+
+	if use ssl ; then
+		if path_exists -a "${ROOT}"/etc/vdr/plugins/live/live.pem; then
+			einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
+			einfo "emerge --config ${PN}"
+		else
+			einfo "No SSL cert found, creating a default one now"
+			make_live_cert
+		fi
+	fi
+}
+
+pkg_config() {
+	make_live_cert
+}