From: Alexys Jacob Date: Tue, 16 Dec 2014 14:18:48 +0000 (+0000) Subject: version bump wrt #532400 by Thomas D. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8d2a0b5ca01869fb3933c552d0f6df2b40b5ba80;p=gentoo.git version bump wrt #532400 by Thomas D. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xB658FA13 --- diff --git a/app-admin/rsyslog/ChangeLog b/app-admin/rsyslog/ChangeLog index cd0931cffe00..b55aae89efa2 100644 --- a/app-admin/rsyslog/ChangeLog +++ b/app-admin/rsyslog/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/rsyslog # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.129 2014/11/03 11:01:46 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/ChangeLog,v 1.130 2014/12/16 14:18:41 ultrabug Exp $ + +*rsyslog-8.6.0 (16 Dec 2014) + + 16 Dec 2014; Ultrabug +rsyslog-8.6.0.ebuild, + +files/8-stable/10-respect_CFLAGS-r1.patch: + version bump wrt #532400 by Thomas D. 03 Nov 2014; Aaron W. Swenson rsyslog-8.4.2.ebuild: Update PostgreSQL dependencies and/or checks to virtual/postgresql. diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest index cd2099e13353..9fbfc6b2b33f 100644 --- a/app-admin/rsyslog/Manifest +++ b/app-admin/rsyslog/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX 8-stable/10-respect_CFLAGS-r1.patch 781 SHA256 14d8f77bbab2e77e177f357e93766b599c06e70ccc9c1ff0d74fc18a463a995b SHA512 a3db26c106e83805d4fe066fff1abfc6c04031933528f61ddda95098c1199e53deebada98834e06f202656f1b2ab06f3a7e765ee58d37407b9fbd96d2b4deb66 WHIRLPOOL aa64b9aa2014b217004a13abae429c2b11e3dc8c056e0206be3d69f3e45e888404adcc208348db35c4d4ced986310b453984ce6d3b585fe60fc419d5f02e2eb6 AUX 8-stable/10-respect_CFLAGS.patch 646 SHA256 e1c28e8088a9237d3987da5b6902235eb11de3343f3d3516cb4f011d25f70cac SHA512 446ae1bd61817ed20012b504db81daeb2b8e121d82ca4c6dc561a3e468e740d676ac695dfc46c4417b62c3d97fcd4b2db9e9207ef65017eda2a090a9fc209594 WHIRLPOOL 2bc4c4800c9f0650f181fa1095cc4b5c495936a5a3bd82b50281b4d23dbf76fdd2d10d0419c13284f345496ca0006781efe7a0f51edc1d6f858b04ad63b7453f AUX 8-stable/50-default.conf 1701 SHA256 61c1dd1450f574a21a8d8375faaf3e42f9856df91011150ff13c0cfddc86ed41 SHA512 33e4e63239b9112fec1a37115ac80ab8dbd6e7189d9d29b1bc743c433e0124ea0d1a4cf6f7ada9e5b92e9b0025b6617a1a16f4c491e743bbf4327a5f376a1ea9 WHIRLPOOL d33b83bb690e78b5e5f7cfc090d21da03615c891a287b1f3a92a51514dcad1f5dfe8d2ceed867b3007768d47f48d207fac43a1ff33a85b24c21a5531cdf9d311 AUX 8-stable/README.gentoo 1126 SHA256 29b4c68f521f2f1f138f44c4635da1a270fed9cbd4a780569754080987aa777c SHA512 46fdf3350e2005d3ef588d50dfc6d474a1b5d3010329b656879a43cbbd7be0cd91944b88d3838f45f69c830fc28c42e7fac2cd52e0a4b24bb6780562d59ae384 WHIRLPOOL a1a3ec8b887110a01e8c1c1320f25493dd8ff343e4b08780c30c9bc3bb842afa0ef79db08195db876697c1a69807f49a8b3793609d25f78559fa534507fc195e @@ -9,14 +10,17 @@ AUX 8-stable/rsyslog.confd 1140 SHA256 f0b15a0334f6177a6cf23cb9b169302c75745dc30 AUX 8-stable/rsyslog.initd 1711 SHA256 204c66d2b7d4d20115acc7499708cf538538fe1c100281ad55f909508041fb19 SHA512 fa0c447243c7aa539a6a0877a4dbfc3b7111e9e0fb3df29d866eb39388c074b7452b644fa25da4311c1513180e11f2929408833f430f03a1835b6d36e19e5a78 WHIRLPOOL d4004080a86739121d82aae33bb0634e074c9bcc3764e7cac0da52433e61450e706367f95378ed8b135a28b9c9fd3041cabefec30ca607770bae47ca53dec72e 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-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 EBUILD rsyslog-8.4.2.ebuild 9554 SHA256 1b1be7feacb02f6a84f847cf52cc6d8ae3a22186bffda9b384a61adf25561738 SHA512 e2ea42596ae32f17232c969e43e2527f0c58514502c5a18b1ff42cccec3057788cccca5b788cb7509bacdd465da51c40ba55c66b536195aea0e27ea23b204c55 WHIRLPOOL 4fb11845e2632bee59b839338f2dd51a13d106f9f0cbfae840064a069d187046b5aa03926c13c0029f7b1b413608acdb112d0bb9cdcfb9bf260700fa0ff8a23f -MISC ChangeLog 24998 SHA256 04c8f797ea9408dbe96e422eafc4ba7877dfbb0b5896e85fb7ac2632b64260f8 SHA512 bf84d798b1036271168b6f549de93b38f0d3ca866a26aec654e8fa44db854d1a4bec7577ac125fd827f271b88ed72eed564e7e79792dd2fc5cf60c5e1308fe36 WHIRLPOOL 419f4fe0374bd79080c4305d5ed1dc4aac402a401b66157221b490a3e8e1d08bc6d8f05e60ae89b03deab4ca6c8f51fdd61e3bd5c1954bdeed7af51b29dd0e3f +EBUILD rsyslog-8.6.0.ebuild 10929 SHA256 d86aeeadf00a9d360403831f52aef024d18e70135f2db955a4255210ddbdd3fe SHA512 8f5a1b5222dbe9504fea866e4fdfe4191a98bd18f9ee0a39d31572e7079568c2acc64689db3ccc57e8467a3a54b097c4a65766a4db7f513339deec203ce1d8b6 WHIRLPOOL 2f3374804ef8bd127ebd0ce92ae253f7ba02183ad397d70a36efcf6398368abf774d3d4b6a928cf6a18ec22b4ed1ce3a20554b3997f98b210a54fbff25f52650 +MISC ChangeLog 25182 SHA256 796d7ea74fe10f48e66f6340fca3147318c374c05384640b6f524f2fd144d544 SHA512 e7b87886809ffa41321ebbc3288ab7748d6d5f9624b8b049450084b90858b8fc6b725bcca3ef805bdab477ba3fc17161534274c5e3a40bd91a87b67f9628ab84 WHIRLPOOL b3d725995b70c9620195c294ae7dc6b23f927511fa6fe1b1b1822e4c845640da97b1615119eae040a0e0d8f78c4322666c877950937385bcae67f37477f56126 MISC metadata.xml 2907 SHA256 34ee0914c446e0c687bf670dd78f9a5d622db4e119717e6ac2a0376202a7dc68 SHA512 4dadaaaf210a50813311bfa8b25136bb39ef963f19120ed006e49eb91ef81941790dd51394f13fd9f84fba5bf2e42d456ecac3083cdd7124d1ed1cbd32e2e770 WHIRLPOOL bd06001a2a33427ac323c95c4dda9de66e19b81645ac4c9f428d9cedaa7ba95c819db1208c4ff0d39540c9117f958dc268da55402004a0d4d3262c485d4f2a2b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlRXYJwACgkQVxOqA9G7/aC3RgEAiLpeo0xQzhrXHEj2RLEOMxwU -Mgau72YnWII0CDw7/hMA/1ddidl8HaVtfTu+c1X8nPS/sC1DOBwt2tZiFZSYXVYY -=D437 +iF4EAREIAAYFAlSQP0YACgkQKiQSS7ZY+hNK0QD+LdpFQ0kTBzxZGPLxlqZP/jD8 +bxBPzAi5cWHbMB4pH2EBANRzXZ+q1s/tEXcOFwYkHX/DhhA3E6rfcano1JYplhA9 +=cTjv -----END PGP SIGNATURE----- diff --git a/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS-r1.patch b/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS-r1.patch new file mode 100644 index 000000000000..de89e6708c1f --- /dev/null +++ b/app-admin/rsyslog/files/8-stable/10-respect_CFLAGS-r1.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index bebb399..5003f10 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -792,8 +792,8 @@ if test "x$enable_rsyslogrt" = "xyes"; then + fi + AM_CONDITIONAL(ENABLE_RSYSLOGRT, test x$enable_rsyslogrt = xyes) + RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_CFLAGS)" +-if test "$GCC" = "yes" +-then RSRT_CFLAGS="$RSRT_CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -Werror=implicit-function-declaration -g" ++if test "$GCC" = "yes"; then ++ RSRT_CFLAGS="$RSRT_CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -Werror=implicit-function-declaration" + fi + RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)" + AC_SUBST(RSRT_CFLAGS1) diff --git a/app-admin/rsyslog/rsyslog-8.6.0.ebuild b/app-admin/rsyslog/rsyslog-8.6.0.ebuild new file mode 100644 index 000000000000..310e3bcd9849 --- /dev/null +++ b/app-admin/rsyslog/rsyslog-8.6.0.ebuild @@ -0,0 +1,407 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.6.0.ebuild,v 1.1 2014/12/16 14:18:41 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.0.0:= + ) + omudpspoof? ( >=net-libs/libnet-1.1.6 ) + postgres? ( >=virtual/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" + +if [[ ${PV} < "8.7" ]]; then + # Test suite is broken in v8.6.0 release tarball + # Upstream is notified; Will be fixed with v8.7.0 in January + RESTRICT="test" +fi + +# 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,contrib/delete_mysql} + 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" +}