version bump fix #536784
authorAlexys Jacob <ultrabug@gentoo.org>
Mon, 23 Feb 2015 14:46:10 +0000 (14:46 +0000)
committerAlexys Jacob <ultrabug@gentoo.org>
Mon, 23 Feb 2015 14:46:10 +0000 (14:46 +0000)
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

app-admin/rsyslog/ChangeLog
app-admin/rsyslog/Manifest
app-admin/rsyslog/rsyslog-8.7.0.ebuild [new file with mode: 0644]

index d0661a1c0b8504418375d8498f19c9887cefa672..a489a96bc1dd4e507cc5335ef8649d6a110f4f42 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/rsyslog
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.132 2015/02/23 11:19:30 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.133 2015/02/23 14:46:03 ultrabug Exp $
+
+*rsyslog-8.7.0 (23 Feb 2015)
+
+  23 Feb 2015; Ultrabug <ultrabug@gentoo.org> +rsyslog-8.7.0.ebuild:
+  version bump thx to Thomas D. fix #536784
 
   23 Feb 2015; Ultrabug <ultrabug@gentoo.org> rsyslog-8.6.0.ebuild:
   fix #533020
index 75627390eefc54da2cb160e3822c3afef9158c4c..8e1ac3802135d259e48f2ae1d8c2ca192bf25365 100644 (file)
@@ -11,16 +11,19 @@ AUX 8-stable/rsyslog.initd 1711 SHA256 204c66d2b7d4d20115acc7499708cf538538fe1c1
 AUX 8-stable/rsyslog.logrotate 682 SHA256 89cc8f13c1f7a3ae446b40da7b31cdf471e2c9e2d3d5b8f48e524f7a82fbff89 SHA512 6c58abd2f02157177a61695f53eccbf201c514821b0c551a4812621e8d3dd2da9b5cd651d93860cb51ebdbdc7056d0ef0dde99c2a57ac3c43aa968a141805912 WHIRLPOOL 9d29c2c9351252887c3dad78962df942bb1cd7387eb44e3c98764319f82d90c42d255a5642c55bb37811fb903e1c5314ca536bc9d32ccfd0535f0579f4e25ff0
 DIST rsyslog-8.4.2.tar.gz 1938563 SHA256 71c3c6dac74fba2692f9fefb092cd3d22e2bd71eb702e0da06648de51b8b7b9a SHA512 f3a8af9c859fac4f490d8836f2083125c2daddf0647df06318628ad92cb63538612ecdc78f725bd3e3725a3c79f0c06a67fafe6a2fd5c9194fa18020de6d3847 WHIRLPOOL b4a17389215202158721739b216f43602668c62d52f169362a548f8db0fdc2c8e8114eb8b12727f638ede3077f1172d5077eb9dc64c5f29e28282cee145e098e
 DIST rsyslog-8.6.0.tar.gz 1975854 SHA256 759f836be460c794a7649f2b5b5ef8d423388ec599bf3b49f51fded3f8c02431 SHA512 e7ca2c0dac249aaee8af8d647dff222b8042b4f2cb0985a7d6748066f03643efbf0d66bcaac4193b1a63a93c86b12b6dbf866ba305d3e1015b82b2009ae3770d WHIRLPOOL 442075d126752260980091c4ea13b3724dd4e6113092e31bcc563fe395315153691bfafacf58c586aea0cf21be1b9f03a9a680d14751373f4c61c22f7c83c614
+DIST rsyslog-8.7.0.tar.gz 2003365 SHA256 c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c SHA512 53feac42c14134d76f5592ee491bb56fb2c4c33822a7a5609a5267b6911a5c5c4e73c5d66a913a666967d8826ee3077b91d8d2a1d1b60bcb3d425b35ec4677b0 WHIRLPOOL c74c401de68bb59310e307a0d9859d2f58bcbf8126d637d23d4f3979a0d6c69bce8ca850c2942b43f311ea83f47c9554f34e5dc10623d32324da1b18023d357d
 DIST rsyslog-doc-8.4.2.tar.gz 4066598 SHA256 21862b046b3504f136f9b8961466f2b248ac315c67de8742bd4a35c599f3dd48 SHA512 cbb46e219af5a7b9c60e3a60a75713f88405f7a4036f9d308f17a06ae8e8db0bdff9eae5807a067b9347a0aad264ef9ed73e6587502df2de412569f6d13b7ff6 WHIRLPOOL 97f4de085bf388523df8fa245607c965b0bfdeb13f28c6659f4a267fccaa9f6f7a898cc2f68822796ad69266e5593297db572a9679c8e20e5bc5fd6d26d067f5
 DIST rsyslog-doc-8.6.0.tar.gz 4056307 SHA256 515a33c2aabeb64b0fee3096aa6544a3b4a7e8b2c63963b535090d3ce9d37909 SHA512 c40edd8531ea857ff183db06c7c57b0ffbb940522da485400591741d1ce998642309c4b8596315b0d20bde895d704f71929178f154b76d4ec65800b5082b0e5c WHIRLPOOL 19e1d8d57e473a2b00138146a1b754887c65db326b936a79b86baefb1c2f891ffe4760322e177ee710c589cf93c060917aec027bf265322a7c28a34ce6993208
+DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c
 EBUILD rsyslog-8.4.2.ebuild 9553 SHA256 7a4c84cef6a9dfd89be22ca8736487597acf5ebe022ab6e7fbadd0f30f1e3c44 SHA512 29c00a2bc9c879e75a14af69f82c0a4eb734d82862a5e02c1c194a3aff8191f22ba32afb256683a3e2d68374d89a30b1a16446180f35a6f2ec53d6b1a326ca1f WHIRLPOOL c1624c6f3fe27c233a8193b1ce7010be36f8c8c3ac2c4a4115cd1ff5da78b5b17924ce3a9a72d4190abb9a1415b184da84427c3f2f5b74de99b04ef586d16993
 EBUILD rsyslog-8.6.0.ebuild 10905 SHA256 6874ab8f77c0d553e41936b76afc7d8c9db5006aa86b7e7b7873c6dcbee35096 SHA512 e693d3e15d470a7badf100ba563294effffad179c5df64aafa1c6a372904c755c9aa4c6f201a956167ffffb6e6a51ab732cf84bce2dafbde21c4848a4d447df7 WHIRLPOOL fcb4d11a84feeb8ae28da28b4294888031c8ede7965edf8b10badb47a68227b09c025f11946fa8701645819ef8973088b7eafdc268f22c82bb1452d6bee9a705
-MISC ChangeLog 25417 SHA256 2b685b8e747bfb3679f8897f0e800d1b4feb6506eafa74db977b63f9b974e399 SHA512 ee8dfefd4f33b4d4d8b257da6773857123d877dcaa5c6ec22b80dc67fdf3c8dcdab3f52b62be51bc33ca39a652dfae727b6e813cc6564dcf742a4514c629ca14 WHIRLPOOL 189e5ff93f2af64b1f4e392b20c99447a3878974fc10ff80ce6efa6417a4934f95f9871ea4f3d2b0c84ebdf360f2d30705ef6aa7e797c1fc69e5af5bf6edb35d
+EBUILD rsyslog-8.7.0.ebuild 10743 SHA256 a5b2f914b526472c5783ce6cb54a96aa4003fac27529f0550e287241f801d689 SHA512 43a473db9d2bbb8254aadc238bf948b1f5be41bb6d40e3b5afb32ed1313f0df9d348813590626b5a19667b156f8bd3383bc0bf6ed0ea1a5846ce98a3812a3c43 WHIRLPOOL 586698f9d3a6f72627d3e86e14c47860f0a5f7016d97a51e041146a3aa8d0cc07b85e8894fc780fd3fe142c98d457e652329ebc13898fabaec4e0adaaf7dcff5
+MISC ChangeLog 25561 SHA256 cc0d303bf83b888b4b59239ff4fd304efefdbdc582a760ecc0d922cc1532ab15 SHA512 1a5063ff2eb80046e635ab68b88c945006c3e940a4ccf14f7a36f3a55398f396b4bb2f2895dfdf803dcd91686cea6cd645714629af2227116ea5d8266d6571d1 WHIRLPOOL b02d0edfbda0ef9a9a865128f774552b26476b7e6807fa4103768249ed3ab867680bed3215af326dbdb672bcc597e17b0f854522fd6c97ed7e30382cb6eddb69
 MISC metadata.xml 2907 SHA256 34ee0914c446e0c687bf670dd78f9a5d622db4e119717e6ac2a0376202a7dc68 SHA512 4dadaaaf210a50813311bfa8b25136bb39ef963f19120ed006e49eb91ef81941790dd51394f13fd9f84fba5bf2e42d456ecac3083cdd7124d1ed1cbd32e2e770 WHIRLPOOL bd06001a2a33427ac323c95c4dda9de66e19b81645ac4c9f428d9cedaa7ba95c819db1208c4ff0d39540c9117f958dc268da55402004a0d4d3262c485d4f2a2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTrDMYACgkQKiQSS7ZY+hMpQgEAta0AGswrocPHTK5wiXvJCT36
-ebOf2+dbu7+TIJ4XeNQBAOfJV0DJY6whsZ1TTm7D0nwf5XClvYtVY/HHFESqrLxC
-=hB9T
+iF4EAREIAAYFAlTrPS8ACgkQKiQSS7ZY+hOBIwEArjar0ATzgt3PhuVn19TgDR84
+7tXlqH5j6fPFzngmxGMA/j5MtK2jsOo4LGiowrMq92d+ZV7VpDd4kxHDVd5irbS1
+=ZXDM
 -----END PGP SIGNATURE-----
diff --git a/app-admin/rsyslog/rsyslog-8.7.0.ebuild b/app-admin/rsyslog/rsyslog-8.7.0.ebuild
new file mode 100644 (file)
index 0000000..6deca91
--- /dev/null
@@ -0,0 +1,401 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.7.0.ebuild,v 1.1 2015/02/23 14:46:03 ultrabug Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+       EGIT_REPO_URI="
+               git://github.com/rsyslog/${PN}.git
+               https://github.com/rsyslog/${PN}.git
+       "
+
+       DOC_REPO_URI="
+               git://github.com/rsyslog/${PN}-doc.git
+               https://github.com/rsyslog/${PN}-doc.git
+       "
+
+       inherit git-r3
+       KEYWORDS=""
+else
+       SRC_URI="
+               http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+               doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+       "
+       KEYWORDS="~amd64 ~arm ~hppa ~x86"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"
+
+RDEPEND="
+       >=dev-libs/json-c-0.11:=
+       >=dev-libs/libestr-0.1.9
+       >=dev-libs/liblogging-1.0.1:=[stdlog]
+       >=sys-libs/zlib-1.2.5
+       dbi? ( >=dev-db/libdbi-0.8.3 )
+       elasticsearch? ( >=net-misc/curl-7.35.0 )
+       gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+       jemalloc? ( >=dev-libs/jemalloc-3.3.1 )
+       kerberos? ( virtual/krb5 )
+       mongodb? ( >=dev-libs/libmongo-client-0.1.4 )
+       mysql? ( virtual/mysql )
+       normalize? (
+               >=dev-libs/libee-0.4.0
+               >=dev-libs/liblognorm-1.1.0:=
+       )
+       omudpspoof? ( >=net-libs/libnet-1.1.6 )
+       postgres? ( >=dev-db/postgresql-8.4.20 )
+       rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
+       redis? ( >=dev-libs/hiredis-0.11.0 )
+       relp? ( >=dev-libs/librelp-1.2.5 )
+       rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+       rfc5424hmac? ( >=dev-libs/openssl-0.9.8y )
+       snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+       ssl? ( >=net-libs/gnutls-2.12.23 )
+       systemd? ( >=sys-apps/systemd-208 )
+       zeromq? ( >=net-libs/czmq-1.2.0 )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig"
+
+if [[ ${PV} == "9999" ]]; then
+       RDEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+fi
+
+BRANCH="8-stable"
+
+# Maitainer note : open a bug to upstream
+# showing that building in a separate dir fails
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
+
+DOCS=(
+       AUTHORS
+       ChangeLog
+       "${FILESDIR}"/${BRANCH}/README.gentoo
+)
+
+src_unpack() {
+       if [[ ${PV} == "9999" ]]; then
+               git-r3_fetch
+               git-r3_checkout
+       else
+               unpack ${P}.tar.gz
+       fi
+
+       if use doc; then
+               if [[ ${PV} == "9999" ]]; then
+                       git-r3_fetch "${DOC_REPO_URI}"
+                       git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+               else
+                       local doc_tarball="${PN}-doc-${PV}.tar.gz"
+
+                       cd "${S}" || die "Cannot change dir into '$S'"
+                       mkdir docs || die "Failed to create docs directory"
+                       cd docs || die "Failed to change dir into '${S}/docs'"
+                       unpack ${doc_tarball}
+               fi
+       fi
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${BRANCH}/10-respect_CFLAGS-r1.patch
+
+       epatch_user
+
+       autotools-utils_src_prepare
+}
+
+src_configure() {
+       # Maintainer notes:
+       # * Guardtime support is missing because libgt isn't yet available
+       #   in portage.
+       # * Hadoop's HDFS file system output module is currently not
+       #   supported in Gentoo because nobody is able to test it
+       #   (JAVA dependency).
+       # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+       #   upstream PR 129 and 136) so we need to export HIREDIS_*
+       #   variables because rsyslog's build system depends on pkg-config.
+
+       if use redis; then
+               export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+               export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+       fi
+
+       local myeconfargs=(
+               --disable-generate-man-pages
+               $(use_enable test testbench)
+               # Input Plugins without depedencies
+               --enable-imdiag
+               --enable-imfile
+               --enable-impstats
+               --enable-imptcp
+               # Message Modificiation Plugins without depedencies
+               --enable-mmanon
+               --enable-mmaudit
+               --enable-mmfields
+               --enable-mmjsonparse
+               --enable-mmpstrucdata
+               --enable-mmsequence
+               --enable-mmutf8fix
+               # Output Modification Plugins without dependencies
+               --enable-mail
+               --enable-omprog
+               --enable-omruleset
+               --enable-omstdout
+               --enable-omuxsock
+               # Misc
+               --enable-pmaixforwardedfrom
+               --enable-pmciscoios
+               --enable-pmcisconames
+               --enable-pmlastmsg
+               --enable-pmsnare
+               # DB
+               $(use_enable dbi libdbi)
+               $(use_enable mongodb ommongodb)
+               $(use_enable mysql)
+               $(use_enable postgres pgsql)
+               $(use_enable redis omhiredis)
+               # Debug
+               $(use_enable debug)
+               $(use_enable debug diagtools)
+               $(use_enable debug memcheck)
+               $(use_enable debug rtinst)
+               $(use_enable debug valgrind)
+               # Misc
+               $(use_enable elasticsearch)
+               $(use_enable gcrypt libgcrypt)
+               $(use_enable jemalloc)
+               $(use_enable kerberos gssapi-krb5)
+               $(use_enable normalize mmnormalize)
+               $(use_enable omudpspoof)
+               $(use_enable rabbitmq omrabbitmq)
+               $(use_enable relp)
+               $(use_enable rfc3195)
+               $(use_enable rfc5424hmac mmrfc5424addhmac)
+               $(use_enable snmp)
+               $(use_enable snmp mmsnmptrapd)
+               $(use_enable ssl gnutls)
+               $(use_enable systemd imjournal)
+               $(use_enable systemd omjournal)
+               $(use_enable usertools)
+               $(use_enable zeromq imzmq3)
+               $(use_enable zeromq omzmq3)
+               "$(systemd_with_unitdir)"
+       )
+
+       autotools-utils_src_configure
+}
+
+src_compile() {
+       autotools-utils_src_compile
+
+       if use doc -a ${PV} == "9999"; then
+               einfo "Building documentation ..."
+               local doc_dir="${S}/docs"
+               cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+               sphinx-build -b html source build || die "Building documentation failed!"
+       fi
+}
+
+src_test() {
+       local _has_increased_ulimit=
+
+       if ulimit -n 3072; then
+               _has_increased_ulimit="true"
+       fi
+
+       if ! emake --jobs 1 check; then
+               eerror "Test suite failed! :("
+
+               if [ -z "${_has_increased_ulimit}" ]; then
+                       eerror "Probably because open file limit couldn't be set to 3072."
+               fi
+
+               if has userpriv $FEATURES; then
+                       eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+                               "before you submit a bug report."
+               fi
+
+       fi
+}
+
+src_install() {
+       use doc && HTML_DOCS=( "${S}/docs/build/" )
+       autotools-utils_src_install
+
+       newconfd "${FILESDIR}/${BRANCH}/${PN}.confd" ${PN}
+       newinitd "${FILESDIR}/${BRANCH}/${PN}.initd" ${PN}
+
+       keepdir /var/empty/dev
+       keepdir /var/spool/${PN}
+       keepdir /etc/ssl/${PN}
+       keepdir /etc/${PN}.d
+
+       insinto /etc
+       newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+       insinto /etc/rsyslog.d/
+       doins "${FILESDIR}/${BRANCH}/50-default.conf"
+
+       insinto /etc/logrotate.d/
+       newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+       if use mysql; then
+               insinto /usr/share/doc/${PF}/scripts/mysql
+               doins plugins/ommysql/createDB.sql
+       fi
+
+       if use postgres; then
+               insinto /usr/share/doc/${PF}/scripts/pgsql
+               doins plugins/ompgsql/createDB.sql
+       fi
+}
+
+pkg_postinst() {
+       local advertise_readme=0
+
+       if [[ -z "${REPLACING_VERSIONS}" ]]; then
+               # This is a new installation
+
+               advertise_readme=1
+
+               if use mysql || use postgres; then
+                       echo
+                       elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+                       elog "  /usr/share/doc/${PF}/scripts"
+               fi
+
+               if use ssl; then
+                       echo
+                       elog "To create a default CA and certificates for your server and clients, run:"
+                       elog "  emerge --config =${PF}"
+                       elog "on your logging server. You can run it several times,"
+                       elog "once for each logging client. The client certificates will be signed"
+                       elog "using the CA certificate generated during the first run."
+               fi
+       fi
+
+       if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 8.0 ]]; then
+               # Show this message until rsyslog-8.x
+               echo
+               elog "Since ${PN}-7.6.3 we no longer use the catch-all log target"
+               elog "\"/var/log/syslog\" due to its redundancy to the other log targets."
+
+               advertise_readme=1
+       fi
+
+       if [[ ${advertise_readme} -gt 0 ]]; then
+               # We need to show the README file location
+
+               echo ""
+               elog "Please read"
+               elog ""
+               elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+               elog ""
+               elog "for more details."
+       fi
+}
+
+pkg_config() {
+       if ! use ssl ; then
+               einfo "There is nothing to configure for rsyslog unless you"
+               einfo "used USE=ssl to build it."
+               return 0
+       fi
+
+       # Make sure the certificates directory exists
+       CERTDIR="${EROOT}/etc/ssl/${PN}"
+       if [ ! -d "${CERTDIR}" ]; then
+               mkdir "${CERTDIR}" || die
+       fi
+       einfo "Your certificates will be stored in ${CERTDIR}"
+
+       # Create a default CA if needed
+       if [ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]; then
+               einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+               certtool --generate-privkey \
+                       --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+               chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+               cat > "${T}/${PF}.$$" <<- _EOF
+               cn = Portage automated CA
+               ca
+               cert_signing_key
+               expiration_days = 3650
+               _EOF
+
+               certtool --generate-self-signed \
+                       --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+                       --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+                       --template "${T}/${PF}.$$" &>/dev/null
+               chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+               # Create the server certificate
+               echo
+               einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+               read -r CN
+
+               einfo "Creating private key and certificate for server ${CN}..."
+               certtool --generate-privkey \
+                       --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+               chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+               cat > "${T}/${PF}.$$" <<- _EOF
+               cn = ${CN}
+               tls_www_server
+               dns_name = ${CN}
+               expiration_days = 3650
+               _EOF
+
+               certtool --generate-certificate \
+                       --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+                       --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+                       --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+                       --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+                       --template "${T}/${PF}.$$" &>/dev/null
+               chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+       else
+               einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+       fi
+
+       # Create a client certificate
+       echo
+       einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+       read -r CN
+
+       einfo "Creating private key and certificate for client ${CN}..."
+       certtool --generate-privkey \
+               --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+       chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+       cat > "${T}/${PF}.$$" <<- _EOF
+       cn = ${CN}
+       tls_www_client
+       dns_name = ${CN}
+       expiration_days = 3650
+       _EOF
+
+       certtool --generate-certificate \
+               --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+               --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+               --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+               --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+               --template "${T}/${PF}.$$" &>/dev/null
+       chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+       rm -f "${T}/${PF}.$$"
+
+       echo
+       einfo "Here is the documentation on how to encrypt your log traffic:"
+       einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}