Remove vulnerable version. Document local ssl USE flag

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

4 files changed, 8 insertions, 356 deletions

diff --git a/www-servers/nginx/ChangeLog b/www-servers/nginx/ChangeLog
index a78797d343e8..0836b4e492da 100644
--- a/www-servers/nginx/ChangeLog
+++ b/www-servers/nginx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/nginx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.317 2012/04/15 17:01:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/ChangeLog,v 1.318 2012/04/18 14:10:07 darkside Exp $
+
+  18 Apr 2012; Jeremy Olexa <darkside@gentoo.org> -nginx-1.0.14.ebuild,
+  metadata.xml:
+  Remove vulnerable version. Document local ssl USE flag
 
   15 Apr 2012; Markus Meier <maekke@gentoo.org> nginx-1.0.15.ebuild:
   x86 stable, bug #411751
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 6923924e4432..4e065485b735 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,10 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nginx.conf 1358 RMD160 a948df249a16be86c114d587cfa5ee570d84a356 SHA1 e9db0447a1beb326a0858cf8189328229d1d3edf SHA256 6ff6c9301ea2a4d74a335b9119d7f9dba87d4e83793cf22d837d49f061763096
 AUX nginx.initd 1937 RMD160 3429c046fc3cc0505e2c7de26226120df3c8c865 SHA1 1674343b6bde753a8d49491e3c68ebaf9be19dcc SHA256 3bf11b5ab89eb933058b57f41058fed6a611f1e32b367f1606430b9337ba782d
 AUX nginx.logrotate 364 RMD160 9fdfd2ea2f49b8dba20a030d893e34779bb32364 SHA1 4ab07992fa5c64f753e3643e1b51fcab4dec6ccf SHA256 9e3e090dfd10861d5f9b279e19113ce8d05caf9f33d488f6aabf9f19ac0cf925
-DIST nginx-1.0.14.tar.gz 692465 RMD160 e6f59ad9126467ef4a2ae580c8976b48840aba90 SHA1 f74cbda4f726327841abe06676c6034198427ce9 SHA256 98e483925dab83683762db32c21a1e2ec685d79a298c2e32e785af0cc4bae3af
 DIST nginx-1.0.15.tar.gz 693025 RMD160 99653499916b81fb0f5842755484983606cea5ec SHA1 e506b301ea849f58f2efb499d77b819fe55eea9a SHA256 1daf3950623c90b084e7eceb104071596060aca5c721bf890549fc2990b1ebe6
 DIST nginx-1.1.19.tar.gz 715741 RMD160 ffa00dc68caa025df5118e05aa426d2e33781f2f SHA1 8d216d340c45c273bfd8ca65a74c8544b45f008a SHA256 9630bd7532d63832edc41e954c0cd5ef8cd00724feeab37f2d793d4de97873f6
 DIST nginx_http_push_module-0.692.tar.gz 29119 RMD160 9d2be16074cf28115af0f1d8f3646937cda649ad SHA1 72103084cad8f4d3d9a49a6b04cf780e4541605d SHA256 64868708071aa21dbc4c7a07d149dd6ec9108fb7eaf2aad5ad069406151f17fe
@@ -18,15 +14,7 @@ DIST ngx_slowfs_cache-1.6.tar.gz 10972 RMD160 e1d10851db4a55fc465665caa3f6989d14
 DIST ngx_slowfs_cache-1.8.tar.gz 11408 RMD160 3f1457df569d33df81d24205f12451cbfb76e97e SHA1 6e37e81ada462189c40c5abf31a7471a9a74bca2 SHA256 3ab8aa47912a3f7a07cda0a4fbf6d2e870b9c9cbf5477014ac109001cdcb3644
 DIST ngx_upload_progress-0.8.3.tar.gz 16694 RMD160 b3c8835a270cda2224f5be35f1afb818821609b3 SHA1 0edae535d1efd50524d9947acaebe3979b06fcfb SHA256 f391da7fd1a89bd65e852182b6cbc746289cd10c83b211be18e703ff3e3986ae
 DIST ngx_upload_progress-0.9.0.tar.gz 17020 RMD160 10ff91748a06afd81abb9fdb203f164ea369463a SHA1 93aadaf6065e1e8afd9f14b9291a66819d3aa4c0 SHA256 3fb903dab595cf6656fa0fc5743a48daffbba2f6b5c554836be630800eaad4e2
-EBUILD nginx-1.0.14.ebuild 11061 RMD160 194f6337b03a74e4f732f7d57052bd8e99e1d74b SHA1 8ed4e73b6f4a717b6f4ba1417c0de2d6917a6282 SHA256 6464288fe11e699e4c85b51b42123318d424d6f1074d7fb55fd2ed0b78f52bc1
 EBUILD nginx-1.0.15.ebuild 11210 RMD160 4c6d954200769baa94aec4b8dcda44cffcf0e2a4 SHA1 6d82edbb7f8cff222950ae2125589099d863eed4 SHA256 085e27faf97246fc49108ac3ee8a1b75abdaee7ac7c984451165276b528c63e5
 EBUILD nginx-1.1.19.ebuild 12236 RMD160 fc90726691d7d33cfadfb2c732da654feda3578f SHA1 4be1adc62fc3a867ada9c60b99eab04a612fb2c4 SHA256 d8770597f019468da5490b0bb0a1f6a7566d1019323d440a3e0f7da52d4aa79b
-MISC ChangeLog 52207 RMD160 d02c84d01aa5c62a813b3d8bf50f400531b50f49 SHA1 e4ce5d3040b829225ce677aad151a2693f2a9527 SHA256 9e4658ac8e640485ce4f4ee3f9fe7b829471e17b78b6b23e9928305178ef9d38
-MISC metadata.xml 813 RMD160 6129b8e993993607dff4f435ac4c4ada063f5e34 SHA1 da42de2e958c528b06219a345861fce542b87831 SHA256 21790da7363732f917d02f7fb30618e2f58aacd9e601c63172bdb4eb6e337e94
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk+K/6UACgkQkKaRLQcq0GJNTACfWCK/9rDg9Lcn2g0vToeExlHq
-3uIAn2HI8V/Y4u5mn3pr6VXh+p645z7l
-=QXN3
------END PGP SIGNATURE-----
+MISC ChangeLog 52355 RMD160 377f19ba53d4d85f761155d07241f00babb77b0a SHA1 97f392c278b785ed32a6217e4ba058778db6fe61 SHA256 f7807419c1b47697d609bc0eb74b3930c96712c4be2317f846fe106d22973bd7
+MISC metadata.xml 921 RMD160 e556afdd4e5777dcb360c6c48c302212fe8b95b7 SHA1 ee5ad4e7ea8e14934193a690f3b215074d453007 SHA256 41bf5d72811a6f86b0e82af6fcbeb35eb4f62c3c94fc105a908341240da22eb1
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index 326deefb50b2..54bfc516be08 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name='http-cache'>Enable HTTP cache support</flag>
 		<flag name='libatomic'>Use libatomic instead of builtin atomic operations</flag>
 		<flag name='pcre-jit'>Enable JIT for pcre</flag>
+		<flag name='ssl'>Enable HTTPS module for http. Enable SSL/TLS support for POP3/IMAP/SMTP for mail.</flag>
 	</use>
 	<upstream>
 		<changelog>http://nginx.org/en/CHANGES</changelog>
diff --git a/www-servers/nginx/nginx-1.0.14.ebuild b/www-servers/nginx/nginx-1.0.14.ebuild
deleted file mode 100644
index 5a7da64c487b..000000000000
--- a/www-servers/nginx/nginx-1.0.14.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.0.14.ebuild,v 1.2 2012/03/15 18:15:57 ago Exp $
-
-EAPI="4"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-#   * alive upstream
-#   * sane packaging
-#   * builds cleanly
-#   * does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.8.3"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-HTTP_UPLOAD_PROGRESS_MODULE_SHA1="c7c663f"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="http://github.com/masterzen/nginx-upload-progress-module/tarball/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (http://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.15"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_SHA1="137855d"
-HTTP_HEADERS_MORE_MODULE_URI="http://github.com/agentzh/headers-more-nginx-module/tarball/v${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_push (http://pushmodule.slact.net/, MIT license)
-HTTP_PUSH_MODULE_PV="0.692"
-HTTP_PUSH_MODULE_P="nginx_http_push_module-${HTTP_PUSH_MODULE_PV}"
-HTTP_PUSH_MODULE_URI="http://pushmodule.slact.net/downloads/${HTTP_PUSH_MODULE_P}.tar.gz"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="1.4"
-HTTP_CACHE_PURGE_MODULE_P="ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/${HTTP_CACHE_PURGE_MODULE_P}.tar.gz"
-
-# HTTP Upload module from Valery Kholodkov
-# (http://www.grid.net.ru/nginx/upload.en.html, BSD license)
-HTTP_UPLOAD_MODULE_PV="2.2.0"
-HTTP_UPLOAD_MODULE_P="nginx_upload_module-${HTTP_UPLOAD_MODULE_PV}"
-HTTP_UPLOAD_MODULE_URI="http://www.grid.net.ru/nginx/download/${HTTP_UPLOAD_MODULE_P}.tar.gz"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.6"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz"
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
-	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
-	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
-	nginx_modules_http_push? ( ${HTTP_PUSH_MODULE_URI} )
-	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} )
-	nginx_modules_http_upload? ( ${HTTP_UPLOAD_MODULE_URI} )
-	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} )"
-
-LICENSE="as-is BSD BSD-2 GPL-2 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_zone map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition dav degradation flv geoip gzip_static image_filter
-mp4 perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
-	http_upload_progress
-	http_headers_more
-	http_passenger
-	http_push
-	http_cache_purge
-	http_upload
-	http_slowfs_cache"
-
-IUSE="aio debug +http +http-cache ipv6 libatomic +pcre ssl vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
-	IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
-	IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
-	IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
-	IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-CDEPEND="
-	pcre? ( >=dev-libs/libpcre-4.2 )
-	ssl? ( dev-libs/openssl )
-	http-cache? ( userland_GNU? ( dev-libs/openssl ) )
-	nginx_modules_http_geo? ( dev-libs/geoip )
-	nginx_modules_http_gzip? ( sys-libs/zlib )
-	nginx_modules_http_gzip_static? ( sys-libs/zlib )
-	nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
-	nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
-	nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
-	nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl ) )
-	nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-pkg_setup() {
-	if use nginx_modules_http_passenger; then
-		einfo
-		einfo "Passenger support has been removed from the nginx ebuild to"
-		einfo "get rid of file collisions, its broken build system and"
-		einfo "incompatibilities between passenger 2 and 3."
-		einfo
-		einfo "Please switch to passenger-3 standalone or use the"
-		einfo "unicorn gem which provides a sane nginx-like architecture"
-		einfo "out of the box."
-		einfo
-		einfo "For more information on sane ruby deployments with"
-		einfo "passenger-3/unicorn go to:"
-		einfo
-		einfo "https://rvm.beginrescueend.com"
-		einfo
-		die "nginx_modules_http_passenger still in IUSE"
-	fi
-
-	ebegin "Creating nginx user and group"
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-	eend $?
-
-	if use libatomic; then
-		ewarn "GCC 4.1+ features built-in atomic operations."
-		ewarn "Using libatomic_ops is only needed if using"
-		ewarn "a different compiler or a GCC prior to 4.1"
-	fi
-
-	if [[ -n $NGINX_ADD_MODULES ]]; then
-		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
-		ewarn "This nginx installation is not supported!"
-		ewarn "Make sure you can reproduce the bug without those modules"
-		ewarn "_before_ reporting bugs."
-	fi
-
-	if use !http; then
-		ewarn "To actually disable all http-functionality you also have to disable"
-		ewarn "all nginx http modules."
-	fi
-}
-
-src_prepare() {
-	sed -i 's/ make/ \\$(MAKE)/' "${S}"/auto/lib/perl/make
-}
-
-src_configure() {
-	local myconf= http_enabled= mail_enabled=
-
-	use aio       && myconf+=" --with-file-aio --with-aio_module"
-	use debug     && myconf+=" --with-debug"
-	use ipv6      && myconf+=" --with-ipv6"
-	use libatomic && myconf+=" --with-libatomic"
-	use pcre      && myconf+=" --with-pcre"
-
-	# HTTP modules
-	for mod in $NGINX_MODULES_STD; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-		else
-			myconf+=" --without-http_${mod}_module"
-		fi
-	done
-
-	for mod in $NGINX_MODULES_OPT; do
-		if use nginx_modules_http_${mod}; then
-			http_enabled=1
-			myconf+=" --with-http_${mod}_module"
-		fi
-	done
-
-	if use nginx_modules_http_fastcgi; then
-		myconf+=" --with-http_realip_module"
-	fi
-
-	# third-party modules
-	if use nginx_modules_http_upload_progress; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/masterzen-nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_SHA1}"
-	fi
-
-	if use nginx_modules_http_headers_more; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/agentzh-headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_SHA1}"
-	fi
-
-	if use nginx_modules_http_push; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_PUSH_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_CACHE_PURGE_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_upload; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_UPLOAD_MODULE_P}"
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		http_enabled=1
-		myconf+=" --add-module=${WORKDIR}/${HTTP_SLOWFS_CACHE_MODULE_P}"
-	fi
-
-	if use http || use http-cache; then
-		http_enabled=1
-	fi
-
-	if [ $http_enabled ]; then
-		use http-cache || myconf+=" --without-http-cache"
-		use ssl && myconf+=" --with-http_ssl_module"
-	else
-		myconf+=" --without-http --without-http-cache"
-	fi
-
-	# MAIL modules
-	for mod in $NGINX_MODULES_MAIL; do
-		if use nginx_modules_mail_${mod}; then
-			mail_enabled=1
-		else
-			myconf+=" --without-mail_${mod}_module"
-		fi
-	done
-
-	if [ $mail_enabled ]; then
-		myconf+=" --with-mail"
-		use ssl && myconf+=" --with-mail_ssl_module"
-	fi
-
-	# custom modules
-	for mod in $NGINX_ADD_MODULES; do
-		myconf+=" --add-module=${mod}"
-	done
-
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	tc-export CC
-
-	./configure \
-		--prefix=/usr \
-		--sbin-path=/usr/sbin/nginx \
-		--conf-path=/etc/${PN}/${PN}.conf \
-		--error-log-path=/var/log/${PN}/error_log \
-		--pid-path=/var/run/${PN}.pid \
-		--lock-path=/var/lock/nginx.lock \
-		--user=${PN} --group=${PN} \
-		--with-cc-opt="-I${ROOT}usr/include" \
-		--with-ld-opt="-L${ROOT}usr/lib" \
-		--http-log-path=/var/log/${PN}/access_log \
-		--http-client-body-temp-path=/var/tmp/${PN}/client \
-		--http-proxy-temp-path=/var/tmp/${PN}/proxy \
-		--http-fastcgi-temp-path=/var/tmp/${PN}/fastcgi \
-		--http-scgi-temp-path=/var/tmp/${PN}/scgi \
-		--http-uwsgi-temp-path=/var/tmp/${PN}/uwsgi \
-		${myconf} || die "configure failed"
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/286772
-	export LANG=C LC_ALL=C
-	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	keepdir /var/log/${PN} /var/tmp/${PN}/{client,proxy,fastcgi,scgi,uwsgi}
-	keepdir /var/www/localhost/htdocs
-
-	dosbin objs/nginx
-	newinitd "${FILESDIR}"/nginx.initd nginx
-
-	cp "${FILESDIR}"/nginx.conf conf/nginx.conf
-	rm conf/win-utf conf/koi-win conf/koi-utf
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins conf/*
-
-	doman man/nginx.8
-	dodoc CHANGES* README
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/nginx.logrotate nginx
-
-	if use nginx_modules_http_perl; then
-		cd "${S}"/objs/src/http/modules/perl/
-		einstall DESTDIR="${D}" INSTALLDIRS=vendor || die "failed to install perl stuff"
-		fixlocalpod
-	fi
-
-	if use nginx_modules_http_push; then
-		docinto ${HTTP_PUSH_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_PUSH_MODULE_P}/{changelog.txt,protocol.txt,README}
-	fi
-
-	if use nginx_modules_http_cache_purge; then
-		docinto ${HTTP_CACHE_PURGE_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_CACHE_PURGE_MODULE_P}/{CHANGES,README.md,TODO.md}
-	fi
-
-	if use nginx_modules_http_upload; then
-		docinto ${HTTP_UPLOAD_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_UPLOAD_MODULE_P}/{Changelog,README}
-	fi
-
-	if use nginx_modules_http_slowfs_cache; then
-		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
-		dodoc "${WORKDIR}"/${HTTP_SLOWFS_CACHE_MODULE_P}/{CHANGES,README}
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		if [ ! -f "${ROOT}"/etc/ssl/${PN}/${PN}.key ]; then
-			install_cert /etc/ssl/${PN}/${PN}
-			chown ${PN}:${PN} "${ROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
-		fi
-	fi
-}